From 9d9075653801fb3c6645329eb404bed38108c527 Mon Sep 17 00:00:00 2001
From: caem <me@caem.dev>
Date: Thu, 25 Jul 2024 22:19:16 +0200
Subject: [PATCH] Refactor: Remove unclean modules/packages directive

---
 hosts/workstation/default.nix                            | 4 +---
 modules/packages/nh.nix                                  | 9 ---------
 modules/packages/zsh.nix                                 | 6 ------
 modules/system/basic.nix                                 | 7 +++++++
 .../virt-manager.nix => system/virtualisation.nix}       | 1 -
 5 files changed, 8 insertions(+), 19 deletions(-)
 delete mode 100644 modules/packages/nh.nix
 delete mode 100644 modules/packages/zsh.nix
 rename modules/{packages/virt-manager.nix => system/virtualisation.nix} (98%)

diff --git a/hosts/workstation/default.nix b/hosts/workstation/default.nix
index 111aa02..eda7371 100644
--- a/hosts/workstation/default.nix
+++ b/hosts/workstation/default.nix
@@ -11,9 +11,7 @@
     ../../modules/desktop/apps/communication.nix
     ../../modules/desktop/apps/games.nix
     ../../modules/desktop/apps/multimedia.nix
-    ../../modules/packages/nh.nix
-    ../../modules/packages/zsh.nix
-    ../../modules/packages/virt-manager.nix
+    ../../modules/system/virtualisation.nix
 
     ../../home/default.nix
   ];
diff --git a/modules/packages/nh.nix b/modules/packages/nh.nix
deleted file mode 100644
index 95a7dea..0000000
--- a/modules/packages/nh.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ ... }:
-
-{
-  programs.nh = {
-    enable = true;
-    flake = "/nix/config";
-  };
-}
-
diff --git a/modules/packages/zsh.nix b/modules/packages/zsh.nix
deleted file mode 100644
index 9ba2c0b..0000000
--- a/modules/packages/zsh.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ ... }:
-
-{
-  programs.zsh.enable = true;
-}
-
diff --git a/modules/system/basic.nix b/modules/system/basic.nix
index bfad573..c72991f 100644
--- a/modules/system/basic.nix
+++ b/modules/system/basic.nix
@@ -1,6 +1,13 @@
 { pkgs, ... }:
 
 {
+  programs.zsh.enable = true;
+
+  programs.nh = {
+    enable = true;
+    flake = "/nix/config";
+  };
+
   environment.systemPackages = with pkgs; [
     fastfetch
     wget
diff --git a/modules/packages/virt-manager.nix b/modules/system/virtualisation.nix
similarity index 98%
rename from modules/packages/virt-manager.nix
rename to modules/system/virtualisation.nix
index 492d1aa..0528c47 100644
--- a/modules/packages/virt-manager.nix
+++ b/modules/system/virtualisation.nix
@@ -4,4 +4,3 @@
   virtualisation.libvirtd.enable = true;
   programs.virt-manager.enable = true;
 }
-