diff --git a/.config/home-manager/hosts/work/default.nix b/.config/home-manager/hosts/work/default.nix
index 5e34819..95cb784 100644
--- a/.config/home-manager/hosts/work/default.nix
+++ b/.config/home-manager/hosts/work/default.nix
@@ -20,15 +20,8 @@
     inherit inputs;
     inherit pkgs;
   };
-
-  programs.git.enable = true;
-  programs.neovim = {
-    enable = true;
-    defaultEditor = true;
-    viAlias = true;
-    vimAlias = true;
-    vimdiffAlias = true;
-  };
+  programs.git = import ../../modules/git.nix;
+  programs.neovim = import ../../modules/neovim.nix;
   home.packages = import ./packages.nix {
     inherit pkgs;
     inherit config;
diff --git a/.config/home-manager/modules/git.nix b/.config/home-manager/modules/git.nix
new file mode 100644
index 0000000..7dc2601
--- /dev/null
+++ b/.config/home-manager/modules/git.nix
@@ -0,0 +1,3 @@
+{
+  enable = true;
+}
diff --git a/.config/home-manager/modules/neovim.nix b/.config/home-manager/modules/neovim.nix
new file mode 100644
index 0000000..fbd1d69
--- /dev/null
+++ b/.config/home-manager/modules/neovim.nix
@@ -0,0 +1,7 @@
+{
+  enable = true;
+  defaultEditor = true;
+  viAlias = true;
+  vimAlias = true;
+  vimdiffAlias = true;
+}