From b3fac02b73289d5aa576562b7ab4ec0532abd652 Mon Sep 17 00:00:00 2001
From: Amneesh Singh <natto@weirdnatto.in>
Date: Mon, 23 Jan 2023 20:48:59 +0530
Subject: [PATCH] hosts/modules: combine minzsh and minpkgs into server.nix

Signed-off-by: Amneesh Singh <natto@weirdnatto.in>
---
 hosts/default.nix                        |  9 ++-------
 hosts/modules/minpkgs.nix                | 16 ----------------
 hosts/modules/{minzsh.nix => server.nix} | 13 ++++++++++++-
 3 files changed, 14 insertions(+), 24 deletions(-)
 delete mode 100644 hosts/modules/minpkgs.nix
 rename hosts/modules/{minzsh.nix => server.nix} (72%)

diff --git a/hosts/default.nix b/hosts/default.nix
index bf8ff0d..242fded 100644
--- a/hosts/default.nix
+++ b/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 = {
diff --git a/hosts/modules/minpkgs.nix b/hosts/modules/minpkgs.nix
deleted file mode 100644
index baffe59..0000000
--- a/hosts/modules/minpkgs.nix
+++ /dev/null
@@ -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
-  ];
-}
diff --git a/hosts/modules/minzsh.nix b/hosts/modules/server.nix
similarity index 72%
rename from hosts/modules/minzsh.nix
rename to hosts/modules/server.nix
index e07ff54..16803fa 100644
--- a/hosts/modules/minzsh.nix
+++ b/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;