3 files changed, 9 insertions, 9 deletions
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"