diff --git a/config/etc.nix b/config/etc.nix
index e52cdd0..05c5631 100644
--- a/config/etc.nix
+++ b/config/etc.nix
@@ -4,7 +4,6 @@ with lib;
 
 {
   environment.etc = mkIf (elem "etcfiles" config.machine.conffiles) {
-    "i3/config".source = ./etc/i3/config;
     "i3/py3status".source = ./etc/i3/py3status;
     "sway/config".source = mkDefault ./etc/sway/config;
     "mpv/input.conf".source = ./etc/mpv/input.conf;
diff --git a/pkgs/pkgsets.nix b/pkgs/pkgsets.nix
index 692471c..e2ebc98 100644
--- a/pkgs/pkgsets.nix
+++ b/pkgs/pkgsets.nix
@@ -6,7 +6,8 @@
 with lib;
 
 let
-  optPkgs = package: pkgstring: optionals (elem pkgstring config.machine.pkgs) package;
+  cfg = config.machine;
+  optPkgs = package: pkgstring: optionals (elem pkgstring cfg.pkgs) package;
   gitpkgs = import /nixpkgs/default.nix {};
 
   # Programms I'm likely to want on every machine and/or may execute as root
@@ -20,17 +21,20 @@ let
     git
     gnupg
     gptfdisk
+    haskellPackages.nix-derivation
     home-manager
     htop
     hwinfo
     indent
     iptables
+    jp
     lrzip
     lsof
     lshw
     macchanger
     mkpasswd
     netcat
+    nix-diff
     nix-index
     nix-plugins
     nix-prefetch-git
@@ -109,7 +113,7 @@ let
     pkgs.ledger
     yaml-mode
     company
-    /* C/C++ */ irony company-irony  company-irony-c-headers flycheck-irony clang-format
+    /* C/C++ */ irony company-irony  company-irony-c-headers flycheck-irony clang-format pkgs.clang-tools
     /* Haskell */ haskell-mode flycheck-haskell
     /* Org */ org org-ref pdf-tools org-bullets org-caldav
     /* Rust */ rust-mode flycheck-rust racer
@@ -214,10 +218,8 @@ let
 #    flask_sqlalchemy
 #    flask_testing    
 #    flask_wtf
-#    flaskbabel   
-    /* temporarily fix python stuff */
-    py3status pytz tzlocal
-  ]);
+#    flaskbabel
+    ] ++ optionals (elem "i3" cfg.desktop.wms) [ py3status pytz tzlocal ]);
 
   rustpkgs = with pkgs; [ 
     rustup
@@ -270,8 +272,8 @@ in {
                             ++ (optPkgs xpkgs "xpkgs");
 
   services.emacs = {
-    enable = (elem "emacs" config.machine.pkgs);
-    install = (elem "emacs" config.machine.pkgs);
+    enable = (elem "emacs" cfg.pkgs);
+    install = (elem "emacs" cfg.pkgs);
     package = emacs;
   };
 }
diff --git a/services/udev.nix b/services/udev.nix
index 475a5aa..8dda732 100644
--- a/services/udev.nix
+++ b/services/udev.nix
@@ -4,7 +4,7 @@ with lib;
 
 mkIf (elem "udev" config.machine.services) {
   services.udev.extraRules = ''
- Valve USB devices
+# Valve USB devices
 SUBSYSTEM=="usb", ATTRS{idVendor}=="28de", TAG+="uaccess", TAG+="udev-acl"
 
 # Steam Controller udev write access