flake.nix

@@ -35,27 +35,24 @@
         modules = [
           ./hosts/slab/configuration.nix
           ./hosts/slab/nvidia-optimus.nix
-          ./system/remote.nix
+          ./roles/remote.nix
-          ./system/plasma.nix
+          ./roles/plasma.nix
-          ./system/fragments/opengl.nix
+          ./fragments/opengl.nix
-          ./system/gaming.nix
+          ./roles/gaming.nix
-          ./system/hyprland.nix
+          ./roles/hyprland.nix
-          hmModule (hmModuleDefaults // {
-            home-manager.users."${username}" = import ./hosts/slab/home.nix;
-          })
         ];
       };
       nullbox = lib.nixosSystem {
         system = "x86_64-linux";
         modules = [
           ./hosts/nullbox/configuration.nix
-          ./system/remote.nix
+          ./roles/remote.nix
-          ./system/plasma.nix
+          ./roles/plasma.nix
-          ./system/fragments/hardware/nvidia-modeset.nix
+          ./fragments/hardware/nvidia-modeset.nix
-          ./system/gaming.nix
+          ./roles/gaming.nix
 
           hmModule (hmModuleDefaults // {
-            home-manager.users."${username}" = import ./hosts/nullbox/home.nix;
+            home-manager.users."${username}" = import ./home.nix;
           })
 
         ];

fragments/base.nix

@@ -41,7 +41,6 @@
     inetutils
     socat
     nmap
-    hping
 
     # system utilities
     htop

home.nix

@@ -7,4 +7,6 @@
   home.packages = with pkgs; [
     btop
   ];
+
+  home.stateVersion = "23.11";
 }

hosts/nullbox/home.nix

@@ -1,8 +0,0 @@
-{ lib, pkgs, osConfig, ... }:
-{
-  imports = [
-    ../../home/common.nix
-  ];
-  
-  home.stateVersion = "23.11";
-}

hosts/slab/home.nix

@@ -1,8 +0,0 @@
-{ lib, pkgs, osConfig, ... }:
-{
-  imports = [
-    ../../home/common.nix
-  ];
-  
-  home.stateVersion = "23.11";
-}

roles/base.nix

@@ -1,7 +1,7 @@
 { config, lib, pkgs, ...}:
 {
   imports = [
-    ./fragments/base.nix
+    ../fragments/base.nix
-    ./fragments/me.nix
+    ../fragments/me.nix
   ];
 }

roles/desktop-common.nix

@@ -3,10 +3,10 @@
 {
   imports = [
     ./base.nix
-    ./fragments/sound.nix
+    ../fragments/sound.nix
-    ./fragments/multimedia.nix
+    ../fragments/multimedia.nix
-    ./fragments/software/syncthing.nix
+    ../fragments/software/syncthing.nix
-    ./fragments/hardware/bluetooth.nix
+    ../fragments/hardware/bluetooth.nix
   ];
   
   # Enable the X11 windowing system.