chunk flake into modules (part 1)

hosts/base-configuration.nix

@@ -4,12 +4,6 @@
   	# DO NOT change this unless you know what you're doing!
   	system.stateVersion = "24.11";
 
-  	environment.variables = {
-    	XDG_SESSION_TYPE = "wayland";
-    	XDG_CURRENT_DESKTOP = "Hyprland";
-    	NIXPKGS_ALLOW_INSECURE = 1;
-  	};
-
   	nixpkgs.config = {
     	allowInsecurePredicate = pkg: builtins.elem (pkgs.lib.getName pkg) [
       		"fluffychat-linux"
@@ -21,8 +15,6 @@
   	environment.systemPackages = with pkgs; [
     	alacritty
     	vim
-    	bluez
-    	xwayland
     	unzip
 		networkmanager
   	];
@@ -31,6 +23,4 @@
 
   	boot.loader.grub.enable = false;
 	boot.loader.systemd-boot.enable = true;
-
-	programs.xwayland.enable = true;
 }

hosts/hulk/default.nix

@@ -2,8 +2,6 @@
   	imports = [
     	./hardware-configuration.nix
     	./modules.nix
-    	./services.nix
-    	./programs.nix
     	./users.nix
 		./networking.nix
 	];

hosts/hulk/modules.nix

@@ -1,12 +1,51 @@
-{ inputs, ... }:
+{ pkgs, inputs, ... }: 
 
 {
 	imports = [
-    	../../modules/nvidia-support.nix
-    	../../modules/fingerprint.nix
-		../../modules/apple-style.nix
-		../../modules/bluetooth.nix
-		../../modules/greetd.nix
-		inputs.nordvpn.nixosModules.nordvpn
-  	];
+    	# DEs
+    	../../modules/desktop-environments/hyprland.nix
+ 
+    	# Utilities
+    	../../modules/nixos/nvidia-support.nix
+    	../../modules/nixos/fingerprint.nix
+    	../../modules/nixos/apple-style.nix
+    	../../modules/nixos/bluetooth.nix
+    	../../modules/nixos/greetd.nix
+    	../../modules/nixos/audio.nix
+
+		# Apps
+    	inputs.nordvpn.nixosModules.nordvpn
+    ];
+
+  	modules.hyprland = {
+		enable = true;
+		additionalPackages = with pkgs; [ hyprshot ];
+	};
+
+	modules.apple-style.enable = true;
+  	modules.bluetooth.enable = true;
+	modules.nvidia.enable = true;
+  	modules.audio.enable = true;
+	modules.fingerprint-fix = {
+		enable = true;
+		calibDataFile = ./calib-data.bin;
+	};
+
+	services = {
+		nordvpn.enable = true;
+  		printing = {
+    		enable = true;
+    		drivers = with pkgs; [ hplipWithPlugin ];
+  		};
+	};
+
+	programs = {
+		adb.enable = true;
+       	thunar.enable = true;
+  
+       	thunar.plugins = with pkgs.xfce; [
+           thunar-archive-plugin
+           thunar-volman
+      	];
+	};
 }

hosts/hulk/programs.nix

@@ -1,11 +0,0 @@
-{ pkgs, ... }:
-
-{
-	programs.adb.enable = true;
-	programs.thunar.enable = true;
-	
-	programs.thunar.plugins = with pkgs.xfce; [
-  		thunar-archive-plugin
-  		thunar-volman
-	];
-}

hosts/hulk/services.nix

@@ -1,37 +0,0 @@
-{ pkgs, ... }: 
-
-{
-  	services.greetd-hyprland.enable = true;
-	services.apple-style.enable = true;
-  	services.bluetooth.enable = true;
-	services.nvidia.enable = true;
-  	services.fingerprint-fix = {
-		enable = true;
-		calibDataFile = ./calib-data.bin;
-	};
-
-	services.nordvpn.enable = true;
-  	services.upower.enable = true;
-  	services.udev.enable = true;
-  	services.udev.packages = [ pkgs.hyprland ];
-
-  	services.printing = {
-    	enable = true;
-    	drivers = with pkgs; [ hplipWithPlugin ];
-  	};
-
-	services.gvfs.enable = true;
-	services.geoclue2 = {
-    	enableWifi = true;
-    	geoProviderUrl = "https://api.beacondb.net/v1/geolocate";
-	};
-
-	services.dbus.enable = true;
-	services.pipewire = {
-    	enable = true;
-    	alsa.enable = true;
-    	alsa.support32Bit = true;
-    	pulse.enable = true;
-    	jack.enable = true;
-	};
-}

hosts/hulk/users.nix

@@ -13,6 +13,4 @@ in {
     	shell = preferredShell;
     	ignoreShellProgramCheck = true; # Will do it later in profile configuration
   	};
-
-	users.users.nordvpn.extraGroups = [ "networkmanager" ];
 }