diff --git a/home/default.nix b/home/default.nix
index 6c9b243..efcbb35 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -1,5 +1,7 @@
 { pkgs, profile ? "cli", ... }:
 {
+  imports = [ ./programs/${profile}.nix ];
+
   home = {
     packages = (import ./packages.nix { inherit pkgs profile; }).packages;
     stateVersion = "24.05"; # TODO: unify this with the references in flake.nix:inputs
@@ -42,6 +44,4 @@
       allowOther = true;
     };
   };
-
-  programs = import ./programs/${profile}.nix { inherit pkgs; };
 }
diff --git a/home/programs/server.nix b/home/programs/server.nix
index 4cac8b9..2003493 100644
--- a/home/programs/server.nix
+++ b/home/programs/server.nix
@@ -1,6 +1,7 @@
 { pkgs, ... }:
 {
-  dircolors = {
+  programs = {
+    dircolors = {
     enable = true;
     extraConfig = ''
       # Dark 256 color solarized theme for the color GNU ls utility.
@@ -315,88 +316,89 @@
       .ogx 01;38;5;166
     '';
     settings = pkgs.lib.mkForce { };
-  };
-
-  direnv = {
-    enable = true;
-    nix-direnv.enable = true;
-  };
-
-  fish = {
-    enable = true;
-
-    shellAbbrs = {
-      fix-ssh = "eval $(tmux show-env | grep ^SSH_AUTH_SOCK | sed 's/=/ /;s/^/set /')";
-      diff-persist = "sudo rsync -amvxx --dry-run --no-links --exclude '/tmp/*' --exclude '/root/*' / /persist/ | rg -v '^skipping|/$'";
     };
 
-    shellInit = ''
-      set fish_greeting
-
-      set pure_color_mute green
-      set pure_check_for_new_release false
-      set pure_enable_nixdevshell true
-      set pure_show_prefix_root_prompt true
-      set sponge_regex_patterns 'password|passwd'
-    '';
-  };
-
-  fzf = {
-    enable = true;
-  };
-
-  git = {
-    enable = true;
-    userEmail = "petru@paler.net";
-    userName = "Petru Paler";
-  };
-
-  home-manager = {
-    enable = true;
-  };
-
-  less.enable = true;
-
-  lesspipe.enable = false;
-
-  nix-index-database.comma.enable = true;
-
-  nixvim = {
-    enable = true;
-
-    defaultEditor = true;
-    viAlias = true;
-    # makes lessopen complain sometimes
-    vimAlias = false;
-
-    opts = {
-      tabstop = 4;
-      softtabstop = 4;
-      shiftwidth = 4;
-      expandtab = true;
-      shiftround = true;
+    direnv = {
+      enable = true;
+      nix-direnv.enable = true;
     };
 
-    plugins = {
-      nix.enable = true;
+    fish = {
+      enable = true;
+
+      shellAbbrs = {
+        fix-ssh = "eval $(tmux show-env | grep ^SSH_AUTH_SOCK | sed 's/=/ /;s/^/set /')";
+        diff-persist = "sudo rsync -amvxx --dry-run --no-links --exclude '/tmp/*' --exclude '/root/*' / /persist/ | rg -v '^skipping|/$'";
+      };
+
+      shellInit = ''
+        set fish_greeting
+
+        set pure_color_mute green
+        set pure_check_for_new_release false
+        set pure_enable_nixdevshell true
+        set pure_show_prefix_root_prompt true
+        set sponge_regex_patterns 'password|passwd'
+      '';
     };
-  };
 
-  tmux = {
-    enable = true;
-    prefix = "C-t";
-    terminal = "screen-256color";
-    historyLimit = 20000;
-    keyMode = "vi";
-    extraConfig = ''
-      bind-key t send-prefix
-      bind-key C-t last-window
+    fzf = {
+      enable = true;
+    };
 
-      set -g status-left ""
-      set -g status-right ""
+    git = {
+      enable = true;
+      userEmail = "petru@paler.net";
+      userName = "Petru Paler";
+    };
 
-      setw -g automatic-rename on
-      set -g set-titles on
-    '';
+    home-manager = {
+      enable = true;
+    };
+
+    less.enable = true;
+
+    lesspipe.enable = false;
+
+    nix-index-database.comma.enable = true;
+
+    nixvim = {
+      enable = true;
+
+      defaultEditor = true;
+      viAlias = true;
+      # makes lessopen complain sometimes
+      vimAlias = false;
+
+      opts = {
+        tabstop = 4;
+        softtabstop = 4;
+        shiftwidth = 4;
+        expandtab = true;
+        shiftround = true;
+      };
+
+      plugins = {
+        nix.enable = true;
+      };
+    };
+
+    tmux = {
+      enable = true;
+      prefix = "C-t";
+      terminal = "screen-256color";
+      historyLimit = 20000;
+      keyMode = "vi";
+      extraConfig = ''
+        bind-key t send-prefix
+        bind-key C-t last-window
+
+        set -g status-left ""
+        set -g status-right ""
+
+        setw -g automatic-rename on
+        set -g set-titles on
+      '';
+    };
   };
 }