move modules to use default.nix

this way, instead of listing out each file manually, we can just list the directory.
DirectXMan12 · Dec 25, 2024 · ba47bf3 · ba47bf3
1 parent c5c75d3
commit ba47bf3
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 9 deletions.
diff --git a/flake.nix b/flake.nix
@@ -31,18 +31,12 @@
 				inherit system;
 				modules = [
 					./modules/utils/allowedUnfree-polyfill.nix
-					./modules/common/boot.nix
-					./modules/common/base.nix
-					./modules/common/users.nix
-					./systems/${name}/configuration.nix
-					./systems/${name}/hardware.nix
+					./modules/common
+					./systems/${name}
 				] ++ modules ++ nixpkgs.lib.optionals (userFacing) [
 					# make pkgs.unstable available in modules
 					({ config, pkgs, ... }: { nixpkgs.overlays = [ overlay-unstable-with-sway ]; })
-					./modules/user-facing/boot.nix
-					./modules/user-facing/home-manager-systems.nix
-					./modules/user-facing/sway-and-friends.nix
-					./modules/user-facing/common-system-apps.nix
+					./modules/user-facing
 				];
 			} // extra;
 		in rec {

diff --git a/modules/common/default.nix b/modules/common/default.nix
@@ -0,0 +1,9 @@
+{ ... }:
+
+{
+	imports = [
+		./boot.nix
+		./base.nix
+		./users.nix
+	];
+}
diff --git a/modules/user-facing/default.nix b/modules/user-facing/default.nix
@@ -0,0 +1,10 @@
+{ ... }:
+
+{
+	imports = [
+		./boot.nix
+		./home-manager-systems.nix
+		./sway-and-friends.nix
+		./common-system-apps.nix
+	];
+}
diff --git a/systems/music/configuration.nix → systems/music/default.nix b/systems/music/configuration.nix → systems/music/default.nix
@@ -1,6 +1,10 @@
 { config, pkgs, lib, ... }:
 
 {
+	imports = [
+		./hardware.nix
+	];
+
 	networking.hostName = "music";
 
 	#### roon & plex

diff --git a/systems/yasamin/configuration.nix → systems/yasamin/default.nix b/systems/yasamin/configuration.nix → systems/yasamin/default.nix
@@ -1,6 +1,10 @@
 { config, pkgs, ... }:
 
 {
+	imports = [
+		./hardware.nix
+	];
+
 	networking.hostName = "yasamin"; # Define your hostname.
 
 	# mimic the old 22.11 hidpi settings (fontconfig & console settings)