diff --git a/hosts/laptop-server/modules/default.nix b/hosts/laptop-server/modules/default.nix
index 93dd9db..cb562aa 100644
--- a/hosts/laptop-server/modules/default.nix
+++ b/hosts/laptop-server/modules/default.nix
@@ -5,6 +5,8 @@
         ./display.nix
         ./locale.nix
         ./networking.nix
+        ./nixpkgs.nix
+        ./programs.nix
         ./users.nix
     ];
 }
\ No newline at end of file
diff --git a/hosts/laptop-server/modules/nixpkgs.nix b/hosts/laptop-server/modules/nixpkgs.nix
new file mode 100644
index 0000000..1b43972
--- /dev/null
+++ b/hosts/laptop-server/modules/nixpkgs.nix
@@ -0,0 +1,5 @@
+{ inputs, ... }:
+{
+    # Allow closed source packages
+    nixpkgs.config.allowUnfree = true;
+}
\ No newline at end of file
diff --git a/hosts/laptop-server/modules/programs.nix b/hosts/laptop-server/modules/programs.nix
new file mode 100644
index 0000000..fcc4d78
--- /dev/null
+++ b/hosts/laptop-server/modules/programs.nix
@@ -0,0 +1,21 @@
+{ pkgs, ... }:
+{
+    # Install system packages
+    environment.systemPackages = with pkgs; [
+        # Basic necessities
+        wget
+        curl
+        neovim
+        home-manager
+        # VCS
+        git
+        jujutsu
+    ];
+
+    # Install zsh
+    programs.zsh.enable = true;
+
+    # Disable default command-not-found (it doesn't work with flakes)
+    programs.command-not-found.enable = false;
+    programs.nix-index.enable = true;
+}