15 files changed, 58 insertions, 40 deletions
diff --git a/modules/desktop/default.nix b/modules/desktop/default.nix
index e15cd53..b4ff4c5 100644
--- a/modules/desktop/default.nix
+++ b/modules/desktop/default.nix
@@ -1,11 +1,11 @@
-{ lib, config, ... }:
+{ ... }:
 
 {
 	imports = [
+		./display-server
 		./popup-manager
 		./status-bar
 		./terminal
 		./window-manager
-		./xresources
 	];
 }
diff --git a/modules/desktop/display-server/default.nix b/modules/desktop/display-server/default.nix
new file mode 100644
index 0000000..f81358d
--- /dev/null
+++ b/modules/desktop/display-server/default.nix
@@ -0,0 +1,7 @@
+{ ... }:
+
+{
+	imports = [
+		./x11
+	];
+}
diff --git a/modules/desktop/xresources/default.nix b/modules/desktop/display-server/x11/default.nix
index 65eb812..b589c35 100644
--- a/modules/desktop/xresources/default.nix
+++ b/modules/desktop/display-server/x11/default.nix
@@ -1,4 +1,4 @@
-{ lib, ... }:
+{ ... }:
 
 {
 	imports = [
diff --git a/modules/desktop/display-server/x11/xinit/default.nix b/modules/desktop/display-server/x11/xinit/default.nix
new file mode 100644
index 0000000..a064f36
--- /dev/null
+++ b/modules/desktop/display-server/x11/xinit/default.nix
@@ -0,0 +1,14 @@
+{ lib, config, ... }:
+
+{
+	options = {
+		desktop.display-server.x11.xinit.enable = lib.mkEnableOption "Enables xinit.";
+	};
+
+	config = lib.mkIf config.desktop.display-server.x11.xinit.enable {
+		home.file.".xinitrc" = {
+			source = ./xinitrc;
+			executable = true;
+		};
+	};
+}
diff --git a/modules/desktop/xresources/xinit/xinitrc b/modules/desktop/display-server/x11/xinit/xinitrc
index 2ac4486..2ac4486 100644
--- a/modules/desktop/xresources/xinit/xinitrc
+++ b/modules/desktop/display-server/x11/xinit/xinitrc
diff --git a/modules/desktop/popup-manager/default.nix b/modules/desktop/popup-manager/default.nix
index 8c82ea7..3eacbf6 100644
--- a/modules/desktop/popup-manager/default.nix
+++ b/modules/desktop/popup-manager/default.nix
@@ -1,4 +1,4 @@
-{ lib, ... }:
+{ ... }:
 
 {
 	imports = [
diff --git a/modules/desktop/popup-manager/rofi/default.nix b/modules/desktop/popup-manager/rofi/default.nix
index fdf7d3e..5c839e1 100644
--- a/modules/desktop/popup-manager/rofi/default.nix
+++ b/modules/desktop/popup-manager/rofi/default.nix
@@ -1,13 +1,13 @@
 { config, lib, ... }:
 
 {
-	options = {
-		rofi.enable = lib.mkEnableOption "Enables rofi.";
+	options.desktop.popup-manager.rofi = {
+		enable = lib.mkEnableOption "Enables rofi.";
 	};
 
-	config = lib.mkIf config.rofi.enable {
+	config = lib.mkIf config.desktop.popup-manager.rofi.enable {
 		programs.rofi.enable = true;
 		programs.rofi.font = "FiraCode Nerd Font 16";
-		programs.rofi.theme = import ./theme/default.nix config;
+		programs.rofi.theme = import ./theme config;
 	};
 }
diff --git a/modules/desktop/status-bar/default.nix b/modules/desktop/status-bar/default.nix
index 124c830..45cb3a0 100644
--- a/modules/desktop/status-bar/default.nix
+++ b/modules/desktop/status-bar/default.nix
@@ -1,4 +1,4 @@
-{ lib, ... }:
+{ ... }:
 
 {
 	imports = [
diff --git a/modules/desktop/status-bar/polybar/default.nix b/modules/desktop/status-bar/polybar/default.nix
index 11f4f1a..7608c38 100644
--- a/modules/desktop/status-bar/polybar/default.nix
+++ b/modules/desktop/status-bar/polybar/default.nix
@@ -1,18 +1,21 @@
 { config, lib, ... }:
 
 {
-	options = {
-		polybar.enable = lib.mkEnableOption "Enables polybar.";
+	options.desktop.status-bar.polybar = {
+		enable = lib.mkEnableOption "Enables polybar.";
 	};
 
-	config = lib.mkIf config.polybar.enable {
+	config = lib.mkIf config.desktop.status-bar.polybar.enable {
 		services.polybar.enable = true;
 		services.polybar.script = "polybar main &";
 
 		services.polybar.config = {
 			"bar/main" = import ./bars/main.nix config;
 			"module/xwindow" = import ./modules/xwindow.nix config;
-			"module/bspwm" = import ./modules/bspwm.nix config;
+			"module/bspwm" =
+				if config.desktop.window-manager.bspwm.enable then
+					import ./modules/bspwm.nix config
+				else null;
 			"module/cpu" = import ./modules/cpu.nix config;
 			"module/memory" = import ./modules/memory.nix config;
 			"module/date" = import ./modules/date.nix config;
diff --git a/modules/desktop/terminal/alacritty/default.nix b/modules/desktop/terminal/alacritty/default.nix
index 0fe56e0..a1f521a 100644
--- a/modules/desktop/terminal/alacritty/default.nix
+++ b/modules/desktop/terminal/alacritty/default.nix
@@ -1,12 +1,13 @@
 { pkgs, config, lib, ... }:
 
 {
-	options = {
-		alacritty.enable = lib.mkEnableOption "Enables alacritty.";
+	options.desktop.terminal.alacritty = {
+		enable = lib.mkEnableOption "Enables alacritty.";
 	};
 
-	config = lib.mkIf config.alacritty.enable {
+	config = lib.mkIf config.desktop.terminal.alacritty.enable {
 		programs.alacritty.enable = true;
+		desktop.terminal.default = "${pkgs.alacritty}/bin/alacritty";
 
 		programs.alacritty.settings = {
 			window = {
@@ -71,7 +72,7 @@
 			};
 
 			shell = {
-				program = "${pkgs.zsh}/bin/zsh";
+				program = config.shell.default;
 			};
 		};
 	};
diff --git a/modules/desktop/terminal/default.nix b/modules/desktop/terminal/default.nix
index 6a0cfc8..534b742 100644
--- a/modules/desktop/terminal/default.nix
+++ b/modules/desktop/terminal/default.nix
@@ -4,4 +4,11 @@
 	imports = [
 		./alacritty
 	];
+
+	options = {
+		desktop.terminal.default = lib.mkOption {
+			type = lib.types.string;
+			description = "Path to the default terminal program.";
+		};
+	};
 }
diff --git a/modules/desktop/window-manager/bspwm/default.nix b/modules/desktop/window-manager/bspwm/default.nix
index 643d78b..da9aa12 100644
--- a/modules/desktop/window-manager/bspwm/default.nix
+++ b/modules/desktop/window-manager/bspwm/default.nix
@@ -1,11 +1,11 @@
 { config, lib, ... }:
 
 {
-	options = {
-		bspwm.enable = lib.mkEnableOption "Enables bspwm.";
+	options.desktop.window-manager.bspwm = {
+		enable = lib.mkEnableOption "Enables bspwm.";
 	};
 
-	config = lib.mkIf config.bspwm.enable {
+	config = lib.mkIf config.desktop.window-manager.bspwm.enable {
 		xsession.windowManager.bspwm.enable = true;
 
 		xsession.windowManager.bspwm.settings = with config.scheme.withHashtag; {
diff --git a/modules/desktop/window-manager/default.nix b/modules/desktop/window-manager/default.nix
index 6e9b9f8..c1de8c5 100644
--- a/modules/desktop/window-manager/default.nix
+++ b/modules/desktop/window-manager/default.nix
@@ -1,4 +1,4 @@
-{ lib, ... }:
+{ ... }:
 
 {
 	imports = [
diff --git a/modules/desktop/window-manager/sxhkd/default.nix b/modules/desktop/window-manager/sxhkd/default.nix
index 29261b9..3673b48 100644
--- a/modules/desktop/window-manager/sxhkd/default.nix
+++ b/modules/desktop/window-manager/sxhkd/default.nix
@@ -1,11 +1,11 @@
 { pkgs, config, lib, ... }:
 
 {
-	options = {
-		sxhkd.enable = lib.mkEnableOption "Enables sxhkd.";
+	options.desktop.window-manager.sxhkd = {
+		enable = lib.mkEnableOption "Enables sxhkd.";
 	};
 
-	config = lib.mkIf config.sxhkd.enable {
+	config = lib.mkIf config.desktop.window-manager.sxhkd.enable {
 		services.sxhkd.enable = true;
 
 		services.sxhkd.keybindings =
@@ -28,12 +28,12 @@
 			${(createKeybinding
 				"t"
 				"Launch terminal.")}
-					= "alacritty";
+					= config.desktop.terminal.default;
 
 			${(createKeybinding
 				"f"
 				"Launch File Explorer.")}
-					= "alacritty -t 'File Explorer' --class 'popup' -e lf";
+					= "${config.desktop.terminal.default} -t 'File Explorer' --class 'popup' -e lf";
 
 			${(createKeybinding
 				"q"
diff --git a/modules/desktop/xresources/xinit/default.nix b/modules/desktop/xresources/xinit/default.nix
deleted file mode 100644
index f5069fa..0000000
--- a/modules/desktop/xresources/xinit/default.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{ lib, config, ... }:
-
-{
-	options = {
-		xinit.enable = lib.mkEnableOption "Enables xinit.";
-	};
-
-	config = lib.mkIf config.xinit.enable {
-		home.file.".xinitrc" = {
-			source = ./xinitrc;
-			executable = true;
-		};
-	};
-}