feat(modules)!: Complete reorganisation and renaming of module groups

1 files changed, 45 insertions, 14 deletions

diff --git a/module-groups.nix b/module-groups.nix
index 7bf9755..6f2f634 100644
--- a/module-groups.nix
+++ b/module-groups.nix
@@ -1,34 +1,65 @@
+# default.nix is always included by autoconfig
 rec {
   all = {
-    barebones = [ "cli-essential" "fonts" "users-standard" ];
+    barebones = [
+      "cli-posix"
+      "cli-linux"
+      "fonts"
+      "users-standard"
+    ];
   };
 
   server = rec {
     minimal-server = all.barebones ++ [
-      "dnsmasq" "httpd"
+      "dnsmasq"
+      "httpd"
     ];
 
     home-server = minimal-server ++ [
-      "samba" "ftp"
+      "samba"
+      "ftp"
     ];
   };
 
   personal = rec {
-    personal = all.barebones ++ [ # default.nix is always included by autoconfig
-      "hardware-general" "virtualization"
-      # GUI
-      "gui-essential" "xserver" "openbox-de"
-      # Work/development
-      "cli-powerful" "dev-cli" "tex" "web-server"
-      # Custom hardware
-      "keyboards-custom" "rtl-sdr"
+    dev = [
+      "dev"
+      "dev-db"
+      "dev-tex"
+      "dev-c"
+      "dev-android"
+      "dev-other"
+    ];
+
+    desktop = [
+      "desktop-basics"
+      "desktop-x11"
+      "de-openbox-syndamia.nix"
+    ];
+
+    hw = [
+      "hw-audio"
+      "hw-bluetooth"
+      "hw-printers-scanners"
+      "hw-video-accel"
+    ];
+
+    personal = all.barebones ++ hw ++ desktop ++ hw ++ dev ++ [
+      "cli-other"
+      "hw-rtl-sdr"
+      "hw-wacom"
+      "keyboards-custom"
+      "virtualization"
+      "web-server"
     ];
 
-    desktop = personal ++ [
-      "dev-gui" "gui-powerful"
+    pc = personal ++ [
+      "desktop-media-creation"
     ];
     laptop = personal ++ [
-      "battery" "hardware-laptop"
+      "hw-battery"
+      "hw-brightness"
+      "hw-touchpad"
     ];
   };
 }