From d80ce3a00bdc2d4af8721accdb7153bf77034236 Mon Sep 17 00:00:00 2001
From: Dustin Swan <dustinswan@gmail.com>
Date: Tue, 7 Oct 2014 10:55:31 -0500
Subject: [PATCH 1/2] Adding configuration.nix

---
 configuration.nix | 85 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 85 insertions(+)
 create mode 100644 configuration.nix

diff --git a/configuration.nix b/configuration.nix
new file mode 100644
index 0000000..07ccd67
--- /dev/null
+++ b/configuration.nix
@@ -0,0 +1,85 @@
+# Edit this configuration file to define what should be installed on
+# your system.  Help is available in the configuration.nix(5) man page
+# and in the NixOS manual (accessible by running ‘nixos-help’).
+
+{ config, pkgs, ... }:
+
+{
+  imports =
+    [ # Include the results of the hardware scan.
+      ./hardware-configuration.nix
+    ];
+
+  # Use the GRUB 2 boot loader.
+  boot.loader.grub.enable = true;
+  boot.loader.grub.version = 2;
+  # Define on which hard drive you want to install Grub.
+  boot.loader.grub.device = "/dev/sda";
+
+  networking.hostName = "swan-nixos"; # Define your hostname.
+  # networking.wireless.enable = true;  # Enables wireless.
+
+  # Select internationalisation properties.
+  i18n = {
+    consoleFont = "lat9w-16";
+    consoleKeyMap = "dvorak";
+    defaultLocale = "en_US.UTF-8";
+  };
+
+  nixpkgs.config.allowUnfree = true;
+
+  # List packages installed in system profile. To search by name, run:
+  # -env -qaP | grep wget
+  environment.systemPackages = with pkgs; [
+    fish
+    i3
+    i3status
+    dmenu
+    wget
+  ];
+
+  environment.shells = [ "/run/current-system/sw/bin/zsh" ];
+
+  # List services that you want to enable:
+
+  # Enable the OpenSSH daemon.
+  services.openssh.enable = true;
+
+  time.timeZone = "America/Chicago";
+  services.ntp.enable = false;
+  services.chrony.enable = true;
+
+  # Enable CUPS to print documents.
+  # services.printing.enable = true;
+
+  # Enable the X11 windowing system.
+  services.xserver.enable = true;
+  services.xserver.layout = "dvorak";
+  # services.xserver.xkbOptions = "eurosign:e";
+
+  services.xserver.desktopManager.default = "none";
+  services.xserver.desktopManager.xterm.enable = false;
+
+  services.xserver.displayManager.slim.enable = true;
+
+  services.xserver.windowManager.i3.enable = true;
+  services.xserver.windowManager.default = "i3";
+
+  services.xserver.resolutions = [ { x = 1440; y = 900; } ];
+
+  services.xserver.synaptics.enable = true;
+  services.xserver.synaptics.twoFingerScroll = true;
+
+  users.defaultUserShell = "/var/run/current-system/sw/bin/zsh";
+
+  # Define a user account. Don't forget to set a password with ‘passwd’.
+  users.extraUsers.dustinswan = {
+    name = "dustinswan";
+    group = "users";
+    extraGroups = [ "wheel" ];
+    createHome = true;
+    home = "/home/dustinswan";
+    useDefaultShell = true;
+  };
+
+}

From 744c0bdd437ba0618af3edfb214b4324b4a937fc Mon Sep 17 00:00:00 2001
From: root <root@dswan.insors.net>
Date: Thu, 23 Oct 2014 17:28:33 -0500
Subject: [PATCH 2/2] Updating watch files for webclient auto concat script

---
 bin/watch_for_webclient_file_changes | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/watch_for_webclient_file_changes b/bin/watch_for_webclient_file_changes
index a8d7e23..1c745c1 100755
--- a/bin/watch_for_webclient_file_changes
+++ b/bin/watch_for_webclient_file_changes
@@ -1,3 +1,3 @@
 #!/bin/bash
 pushd /opt/iocom/user/webclient/
-ffind -v "appcache|all_desktop" | peat 'webclient_files_have_changed'
+ffind -v "appcache|all_desktop|visiwebrtc.js" | peat 'webclient_files_have_changed'