diff --git a/system/default.nix b/system/default.nix
index fbeebdd..a53f48c 100644
--- a/system/default.nix
+++ b/system/default.nix
@@ -1,7 +1,7 @@
 { config, lib, pkgs, ... }: {
   imports = [
     ./hardware
-    ./packages.nix
+    ./programs
     ./persistence.nix
     ./plymouth.nix
     ./secureboot.nix
diff --git a/system/packages.nix b/system/packages.nix
deleted file mode 100644
index 92391ce..0000000
--- a/system/packages.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ pkgs, ... }: {
-
-  programs = {
-    dconf.enable = true;
-    git.enable = true;
-    gnupg.agent = {
-      enable = true;
-      enableExtraSocket = true;
-      enableSSHSupport = true;
-      pinentryFlavor = "gnome3";
-    };
-    neovim = {
-      enable = true;
-      defaultEditor = true;
-      viAlias = true;
-      vimAlias = true;
-    };
-    seahorse.enable = true;
-    xwayland.enable = true;
-    zsh.enable = true;
-  };
-  environment.pathsToLink = [ "/share/zsh" ];
-}
diff --git a/system/programs/default.nix b/system/programs/default.nix
new file mode 100644
index 0000000..ae94583
--- /dev/null
+++ b/system/programs/default.nix
@@ -0,0 +1,16 @@
+{ ... }: {
+
+  imports = [
+    ./gnupg.nix
+    ./neovim.nix
+  ];
+
+  programs = {
+    dconf.enable = true;
+    git.enable = true;
+    seahorse.enable = true;
+    xwayland.enable = true;
+    zsh.enable = true;
+  };
+  environment.pathsToLink = [ "/share/zsh" ];
+}
diff --git a/system/programs/gnupg.nix b/system/programs/gnupg.nix
new file mode 100644
index 0000000..893724d
--- /dev/null
+++ b/system/programs/gnupg.nix
@@ -0,0 +1,9 @@
+{ ... }: {
+    programs.gnupg.agent = {
+      enable = true;
+      enableExtraSocket = true;
+      enableSSHSupport = true;
+      pinentryFlavor = "gnome3";
+    };
+
+}
diff --git a/system/programs/neovim.nix b/system/programs/neovim.nix
new file mode 100644
index 0000000..0883e0b
--- /dev/null
+++ b/system/programs/neovim.nix
@@ -0,0 +1,9 @@
+{ ... }: {
+
+    programs.neovim = {
+      enable = true;
+      defaultEditor = true;
+      viAlias = true;
+      vimAlias = true;
+    };
+}