diff --git a/.#programs.nix b/.#programs.nix
new file mode 120000
index 0000000..75cbfbe
--- /dev/null
+++ b/.#programs.nix
@@ -0,0 +1 @@
+willem@zeus.44981
\ No newline at end of file
diff --git a/home.nix b/home.nix
index c30b9d6..6a2558e 100644
--- a/home.nix
+++ b/home.nix
@@ -1,9 +1,41 @@
 { config, pkgs, lib, inputs, ... }:
 
 let
-  homeDirectory = config.home.homeDirectory;
   emacsCommand = "emacsclient -c -nw";
+  homeDirectory = config.home.homeDirectory;
 in {
+  home = {
+    username = "willem";
+    homeDirectory = "/Users/willem";
+    stateVersion = "22.11";
+  };
+
+  home.file.".config/nix/nix.conf".text = ''
+    allow-dirty = true
+    experimental-features = flakes nix-command
+    builders-use-substitutes = true
+  '';
+
+  home.file.".gnupg/gpg-agent.conf".text = ''
+    pinentry-program "${pkgs.pinentry_mac}/Applications/pinentry-mac.app/Contents/MacOS/pinentry-mac"
+  '';
+
+  home.keyboard = {
+    layout = "us";
+    variant = "colemak";
+  };
+
+  home.language = {
+    base = "en_CA.UTF-8";
+    messages = "en_US.UTF-8";
+    ctype = "en_US.UTF-8";
+  };
+
+  home.sessionVariables = {
+    EDITOR = emacsCommand;
+    VISUAL = emacsCommand;
+  };
+
   imports =
     [ ./emacs.nix ./launchd.nix ./packages.nix ./programs.nix ./apps.nix ];
 
@@ -13,35 +45,4 @@ in {
       builtins.elem (lib.getName pkg) [ "discord" "unrar" "zoom" ];
   };
 
-  home = {
-    username = "willem";
-    homeDirectory = "/Users/willem";
-    stateVersion = "22.11";
-  };
-
-  home.language = {
-    base = "en_CA.UTF-8";
-    messages = "en_US.UTF-8";
-    ctype = "en_US.UTF-8";
-  };
-
-  home.keyboard = {
-    layout = "us";
-    variant = "colemak";
-  };
-
-  home.sessionVariables = {
-    EDITOR = emacsCommand;
-    VISUAL = emacsCommand;
-  };
-
-  home.file.".gnupg/gpg-agent.conf".text = ''
-    pinentry-program "${pkgs.pinentry_mac}/Applications/pinentry-mac.app/Contents/MacOS/pinentry-mac"
-  '';
-
-  home.file.".config/nix/nix.conf".text = ''
-    allow-dirty = true
-    experimental-features = flakes nix-command
-    builders-use-substitutes = true
-  '';
 }
diff --git a/packages.nix b/packages.nix
index 119b748..bab7b66 100644
--- a/packages.nix
+++ b/packages.nix
@@ -3,39 +3,40 @@
 {
   home.packages = with pkgs;
     [
+      colima
       coreutils
       gnused
-      spoof-mac
-      colima
-      pinentry_mac
       iterm2
-      zoom-us
       karabiner-elements
+      pinentry_mac
+      spoof-mac
+      zoom-us
       (pkgs.callPackage ./spotify-mac.nix { inherit config lib pkgs; })
     ] ++ [ discord pkgsCustom.vlc pkgsCustom.qbittorrent ]
     ++ [ docker docker-compose ] ++ [
-      comma
-      automake
       autoconf
-      cmake
+      automake
       bash
-      rustup
-      curl
-      pv
-      wget
-      htop
       bat
+      cmake
+      comma
+      curl
       fd
       gawk
-      ripgrep
+      htop
       jq
+      nix-review
       nmap
-      unzip
+      openssh
+      pv
+      ripgrep
+      rsync
+      rustup
+      tldr
       unp
       unrar
-      rsync
-      openssh
-      tldr
-      nix-review
+      unzip
+      wget
+      yq
     ];
 }
diff --git a/programs.nix b/programs.nix
index bd0eb3d..aa3178f 100644
--- a/programs.nix
+++ b/programs.nix
@@ -2,26 +2,14 @@
 
 {
   programs = {
-    home-manager.enable = true;
-
     direnv = {
       enable = true;
       nix-direnv = { enable = true; };
     };
 
-    gpg = {
+    exa = {
       enable = true;
-      package = pkgs.gnupg;
-      homedir = "${config.home.homeDirectory}/.gnupg";
-      settings = {
-        use-agent = true;
-        default-key = "860B5C62BF1FCE4272D26BF8C3DE5DF6198DACBD";
-      };
-    };
-
-    java = {
-      enable = true;
-      package = pkgs.jdk;
+      enableAliases = true;
     };
 
     git = {
@@ -42,14 +30,19 @@
       userEmail = "willem@leit.so";
     };
 
-    zoxide = {
+    gpg = {
       enable = true;
-      enableZshIntegration = true;
+      package = pkgs.gnupg;
+      homedir = "${config.home.homeDirectory}/.gnupg";
+      settings = {
+        use-agent = true;
+        default-key = "860B5C62BF1FCE4272D26BF8C3DE5DF6198DACBD";
+      };
     };
 
-    exa = {
+    java = {
       enable = true;
-      enableAliases = true;
+      package = pkgs.jdk;
     };
 
     starship = {
@@ -103,6 +96,11 @@
       };
     };
 
+    zoxide = {
+      enable = true;
+      enableZshIntegration = true;
+    };
+
     zsh = {
       enable = true;
       enableCompletion = true;
@@ -113,7 +111,6 @@
       envExtra = ''
         export PATH=${pkgs.pinentry_mac.out}/Applications/pinentry-mac.app/Contents/MacOS:$PATH
         export GPG_TTY=$(tty)
-
         eval $(gpg-agent --daemon -q 2>/dev/null)
       '';
       dotDir = ".config/zsh";
@@ -133,5 +130,8 @@
         l = "ls -1";
       };
     };
+
+    home-manager.enable = true;
+
   };
 }