diff --git a/configuration.nix b/configuration.nix
index b89b8f0..e171d59 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -14,39 +14,11 @@
     '';
   };
 
-  environment.systemPackages = with pkgs; [
-    vim nano
-    wget curl
-    neofetch
-    screen tmux fff
-    bash dash git
-    docker-compose
-    nodejs
-  ];
-
-  virtualisation.docker.enable = true;
   programs.gnupg.agent = {
     enable = true;
     enableSSHSupport = true;
   };
 
-  programs.zsh.enable = true;
-  programs.zsh.ohMyZsh.enable = true;
-  programs.zsh.autosuggestions.enable = true;
-  programs.zsh.shellAliases = {
-    "gac" = "git add . && git commit";
-    "v" = "nvim";
-    "c" = "clear";
-    "s" = "ls";
-    "e" = "exit";
-    "sy" = "systemctl";
-    "cp" = "cp -r";
-  };
-  programs.zsh.ohMyZsh.plugins = [ "git" "command-not-found" ];
-  programs.zsh.syntaxHighlighting.enable = true;
-
-  programs.starship.enable = true;
-
   # List services that you want to enable:
 
   # Enable the OpenSSH daemon.
@@ -57,5 +29,5 @@
   # networking.firewall.allowedUDPPorts = [ ... ];
   # Or disable the firewall altogether.
   networking.firewall.enable = false;
-  system.copySystemConfiguration = true;
+  system.stateVersion = "22.05";
 }
diff --git a/flake.nix b/flake.nix
index e16a865..90cb5ae 100644
--- a/flake.nix
+++ b/flake.nix
@@ -12,6 +12,7 @@
         ./hardware.nix
         ./configuration.nix
         ./users.nix
+        ./programs.nix
       ];
     };
   };
diff --git a/programs.nix b/programs.nix
new file mode 100644
index 0000000..07d110f
--- /dev/null
+++ b/programs.nix
@@ -0,0 +1,36 @@
+{ config, pkgs, ... }:
+{
+
+  environment.systemPackages = with pkgs; [
+    vim nano
+    wget curl
+    neofetch
+    screen tmux fff
+    bash dash git
+    docker-compose
+    nodejs
+  ];
+
+  virtualisation.docker.enable = true;
+  programs.gnupg.agent = {
+    enable = true;
+    enableSSHSupport = true;
+  };
+
+  programs.zsh.enable = true;
+  programs.zsh.ohMyZsh.enable = true;
+  programs.zsh.autosuggestions.enable = true;
+  programs.zsh.shellAliases = {
+    "gac" = "git add . && git commit";
+    "v" = "nvim";
+    "c" = "clear";
+    "s" = "ls";
+    "e" = "exit";
+    "sy" = "systemctl";
+    "cp" = "cp -r";
+  };
+  programs.zsh.ohMyZsh.plugins = [ "git" "command-not-found" ];
+  programs.zsh.syntaxHighlighting.enable = true;
+
+  programs.starship.enable = true;
+}