hosts/modules: combine minzsh and minpkgs into server.nix

Signed-off-by: Amneesh Singh <natto@weirdnatto.in>

hosts/default.nix

@@ -4,13 +4,8 @@ let
 
   commonModules = [ ./modules/nvim ];
   personalModules = [ ./modules/sound.nix ];
-  serverModules = [
-    ./modules/minpkgs.nix
-    ./modules/minzsh.nix
-  ];
-  builders = [
-    ./modules/x86builder.nix
-  ];
+  serverModules = [ ./modules/server.nix ];
+  builders = [ ./modules/x86builder.nix ];
 in
 {
   flake.nixosConfigurations = {

hosts/modules/minpkgs.nix

@@ -1,16 +0,0 @@
-{ config, pkgs, ... }:
-{
-  environment.systemPackages = with pkgs; [
-    git
-    htop
-    vim
-    wireguard-tools
-    vault
-    tree-sitter
-    rnix-lsp
-    nmap
-    gcc
-    fly
-    postgresql #for the client cli
-  ];
-}

hosts/modules/server.nix

@@ -1,5 +1,16 @@
-{ config, ... }:
+{ config, pkgs, ... }:
 {
+  environment.systemPackages = with pkgs; [
+    git
+    htop
+    vim
+    wireguard-tools
+    rnix-lsp
+    nmap
+    gcc
+    postgresql #for the client cli
+  ];
+
   programs = {
     zsh = {
       enable = true;