diff --git a/nix/home-manager/alex.home.nix b/nix/home-manager/alex.home.nix
new file mode 100644
index 0000000..a6ce7e8
--- /dev/null
+++ b/nix/home-manager/alex.home.nix
@@ -0,0 +1,99 @@
+{ pgks, ...}: 
+{
+  home.stateVersion = "24.05";
+  home.packages = with pkgs; [
+    openldap
+    k9s
+    jwt-cli
+    fish
+    kubectl
+    lazydocker
+    btop
+    nix-index
+    usbutils
+    makemkv
+    mbuffer
+    lzop
+    lsof
+    code-server
+  ];
+  programs.fish = {
+    enable = true;
+    shellInit = ''
+function commit
+  git add --all
+  git commit -m "$argv"
+  git push
+end
+
+# have ctrl+backspace delete previous word
+bind \e\[3\;5~ kill-word
+# have ctrl+delete delete following word
+bind \b  backward-kill-word
+
+set -U fish_user_paths ~/.local/bin $fish_user_paths
+#set -U fish_user_paths ~/.dotnet $fish_user_paths
+#set -U fish_user_paths ~/.dotnet/tools $fish_user_paths
+
+export VISUAL=vim
+export EDITOR="$VISUAL"
+export DOTNET_WATCH_RESTART_ON_RUDE_EDIT=1
+export DOTNET_CLI_TELEMETRY_OPTOUT=1
+set -x LIBVIRT_DEFAULT_URI qemu:///system
+     '';
+    };
+    home.file = {
+    ".config/lazydocker/config.yml".text = ''
+gui:
+  returnImmediately: true
+    '';
+    ".config/k9s/config.yaml".text = ''
+k9s:
+  liveViewAutoRefresh: true
+  screenDumpDir: /home/alexm/.local/state/k9s/screen-dumps
+  refreshRate: 2
+  maxConnRetry: 5
+  readOnly: false
+  noExitOnCtrlC: false
+  ui:
+    enableMouse: false
+    headless: false
+    logoless: false
+    crumbsless: false
+    reactive: false
+    noIcons: false
+    defaultsToFullScreen: false
+  skipLatestRevCheck: false
+  disablePodCounting: false
+  shellPod:
+    image: busybox:1.35.0
+    namespace: default
+    limits:
+      cpu: 100m
+      memory: 100Mi
+  imageScans:
+    enable: false
+    exclusions:
+      namespaces: []
+      labels: {}
+  logger:
+    tail: 1000
+    buffer: 5000
+    sinceSeconds: -1
+    textWrap: false
+    showTime: false
+  thresholds:
+    cpu:
+      critical: 90
+      warn: 70
+    memory:
+      critical: 90
+      warn: 70
+  namespace:
+    lockFavorites: false
+    '';
+  };
+  home.sessionVariables = {
+    EDITOR = "vim";
+  };
+};
\ No newline at end of file
diff --git a/nix/home-server.nix b/nix/home-server.nix
index de00ee7..8bfa1b0 100644
--- a/nix/home-server.nix
+++ b/nix/home-server.nix
@@ -50,104 +50,7 @@
     extraGroups = [ "networkmanager" "wheel" "docker" "users" "libvirtd" "cdrom" ];
     shell = pkgs.fish;
   };
-  home-manager.users.alex = { pgks, ...}: {
-    home.stateVersion = "24.05";
-    home.packages = with pkgs; [
-      openldap
-      k9s
-      jwt-cli
-      fish
-      kubectl
-      lazydocker
-      btop
-      nix-index
-      usbutils
-      makemkv
-      mbuffer
-      lzop
-      lsof
-      code-server
-    ];
-    programs.fish = {
-      enable = true;
-      shellInit = ''
-function commit
-  git add --all
-  git commit -m "$argv"
-  git push
-end
-
-# have ctrl+backspace delete previous word
-bind \e\[3\;5~ kill-word
-# have ctrl+delete delete following word
-bind \b  backward-kill-word
-
-set -U fish_user_paths ~/.local/bin $fish_user_paths
-#set -U fish_user_paths ~/.dotnet $fish_user_paths
-#set -U fish_user_paths ~/.dotnet/tools $fish_user_paths
-
-export VISUAL=vim
-export EDITOR="$VISUAL"
-export DOTNET_WATCH_RESTART_ON_RUDE_EDIT=1
-export DOTNET_CLI_TELEMETRY_OPTOUT=1
-set -x LIBVIRT_DEFAULT_URI qemu:///system
-     '';
-    };
-    home.file = {
-    ".config/lazydocker/config.yml".text = ''
-gui:
-  returnImmediately: true
-    '';
-    ".config/k9s/config.yaml".text = ''
-k9s:
-  liveViewAutoRefresh: true
-  screenDumpDir: /home/alexm/.local/state/k9s/screen-dumps
-  refreshRate: 2
-  maxConnRetry: 5
-  readOnly: false
-  noExitOnCtrlC: false
-  ui:
-    enableMouse: false
-    headless: false
-    logoless: false
-    crumbsless: false
-    reactive: false
-    noIcons: false
-    defaultsToFullScreen: false
-  skipLatestRevCheck: false
-  disablePodCounting: false
-  shellPod:
-    image: busybox:1.35.0
-    namespace: default
-    limits:
-      cpu: 100m
-      memory: 100Mi
-  imageScans:
-    enable: false
-    exclusions:
-      namespaces: []
-      labels: {}
-  logger:
-    tail: 1000
-    buffer: 5000
-    sinceSeconds: -1
-    textWrap: false
-    showTime: false
-  thresholds:
-    cpu:
-      critical: 90
-      warn: 70
-    memory:
-      critical: 90
-      warn: 70
-  namespace:
-    lockFavorites: false
-      '';
-    };
-    home.sessionVariables = {
-      EDITOR = "vim";
-    };
-  };
+  home-manager.users.alex = ./home-manager/alex.home.nix;
   home-manager.useGlobalPkgs = true;
 
   nixpkgs.config.allowUnfree = true;