diff options
Diffstat (limited to 'modules/desktop')
5 files changed, 23 insertions, 3 deletions
diff --git a/modules/desktop/display-server/x11/default.nix b/modules/desktop/display-server/x11/default.nix index b589c35..f1fd52a 100644 --- a/modules/desktop/display-server/x11/default.nix +++ b/modules/desktop/display-server/x11/default.nix @@ -2,6 +2,7 @@ { imports = [ + ./xclip ./xinit ]; } diff --git a/modules/desktop/display-server/x11/xclip/default.nix b/modules/desktop/display-server/x11/xclip/default.nix new file mode 100644 index 0000000..7c97d60 --- /dev/null +++ b/modules/desktop/display-server/x11/xclip/default.nix @@ -0,0 +1,13 @@ +{ lib, config, pkgs, ... }: + +{ + options.desktop.display-server.x11.xclip = { + enable = lib.mkEnableOption "Enables xclip."; + }; + + config = lib.mkIf config.desktop.display-server.x11.xclip.enable { + home.packages = with pkgs; [ + xclip + ]; + }; +} diff --git a/modules/desktop/display-server/x11/xinit/default.nix b/modules/desktop/display-server/x11/xinit/default.nix index 7078ca2..6e82e2c 100644 --- a/modules/desktop/display-server/x11/xinit/default.nix +++ b/modules/desktop/display-server/x11/xinit/default.nix @@ -19,7 +19,7 @@ ${if config.desktop.status-bar.polybar.enable then config.desktop.status-bar.polybar.command else ""} ${if config.desktop.window-manager.sxhkd.enable then "sxhkd &" else ""} -exec ${config.desktop.window-manager.default} +exec ${config.desktop.window-manager.command} ''; }; }; diff --git a/modules/desktop/window-manager/bspwm/default.nix b/modules/desktop/window-manager/bspwm/default.nix index c69a54b..e275135 100644 --- a/modules/desktop/window-manager/bspwm/default.nix +++ b/modules/desktop/window-manager/bspwm/default.nix @@ -6,6 +6,13 @@ }; config = lib.mkIf config.desktop.window-manager.bspwm.enable { + assertions = [ + { + assertion = config.desktop.window-manager.sxhkd.enable; + message ="Module desktop.window-manager.bspwm requires desktop.window-manager.sxhkd module to be enabled."; + } + ]; + desktop.window-manager.default = lib.mkDefault "bspwm"; desktop.window-manager.command = if config.desktop.window-manager.default == "bspwm" then diff --git a/modules/desktop/window-manager/sxhkd/default.nix b/modules/desktop/window-manager/sxhkd/default.nix index f4678c3..63a1cf5 100644 --- a/modules/desktop/window-manager/sxhkd/default.nix +++ b/modules/desktop/window-manager/sxhkd/default.nix @@ -7,7 +7,6 @@ config = lib.mkIf config.desktop.window-manager.sxhkd.enable { services.sxhkd.enable = true; - services.sxhkd.keybindings = let modKey = "alt"; @@ -27,7 +26,7 @@ (pkgs.writeShellScript "keybindings.sh" (builtins.readFile ./scripts/keybindings.sh))) (createKeybinding - "space" + "r" "Application launcher." config.desktop.application-launcher.command) |