diff options
Diffstat (limited to 'modules/desktop')
| -rw-r--r-- | modules/desktop/terminal/alacritty/default.nix | 8 | ||||
| -rw-r--r-- | modules/desktop/terminal/default.nix | 12 | ||||
| -rw-r--r-- | modules/desktop/terminal/kitty/default.nix | 8 | ||||
| -rw-r--r-- | modules/desktop/window-manager/sxhkd/default.nix | 4 |
4 files changed, 24 insertions, 8 deletions
diff --git a/modules/desktop/terminal/alacritty/default.nix b/modules/desktop/terminal/alacritty/default.nix index 575fe4e..151e098 100644 --- a/modules/desktop/terminal/alacritty/default.nix +++ b/modules/desktop/terminal/alacritty/default.nix @@ -7,7 +7,11 @@ config = lib.mkIf config.desktop.terminal.alacritty.enable { programs.alacritty.enable = true; - desktop.terminal.default = lib.mkDefault "${pkgs.alacritty}/bin/alacritty"; + desktop.terminal.default = lib.mkDefault "alacritty"; + desktop.terminal.command = + if config.desktop.terminal.default == "alacritty" then + lib.mkForce "${pkgs.kitty}/bin/alacritty" + else ""; programs.alacritty.settings = { window = { @@ -72,7 +76,7 @@ }; shell = { - program = config.shell.default; + program = config.shell.command; }; }; }; diff --git a/modules/desktop/terminal/default.nix b/modules/desktop/terminal/default.nix index ac84471..189c794 100644 --- a/modules/desktop/terminal/default.nix +++ b/modules/desktop/terminal/default.nix @@ -7,9 +7,17 @@ ]; options.desktop.terminal = { - default = lib.mkOption { + command = lib.mkOption { type = lib.types.str; - description = "Path to the default terminal program."; + description = "Command for the terminal."; + }; + + default = lib.mkOption { + type = lib.types.enum [ + "kitty" + "alacritty" + ]; + description = "Default terminal."; }; }; } diff --git a/modules/desktop/terminal/kitty/default.nix b/modules/desktop/terminal/kitty/default.nix index 8950a46..a34e58a 100644 --- a/modules/desktop/terminal/kitty/default.nix +++ b/modules/desktop/terminal/kitty/default.nix @@ -13,7 +13,11 @@ } ]; programs.kitty.enable = true; - desktop.terminal.default = lib.mkDefault "${pkgs.kitty}/bin/kitty"; + desktop.terminal.default = lib.mkDefault "kitty"; + desktop.terminal.command = + if config.desktop.terminal.default == "kitty" then + lib.mkForce "${pkgs.kitty}/bin/kitty" + else ""; programs.kitty.settings = with config.scheme.withHashtag; { window_padding_width = config.desktop.window-manager.gap; @@ -42,7 +46,7 @@ selection_background = base03; selection_foreground = base00; - shell = config.shell.default; + shell = config.shell.command; }; }; } diff --git a/modules/desktop/window-manager/sxhkd/default.nix b/modules/desktop/window-manager/sxhkd/default.nix index 04fb0cc..c31604b 100644 --- a/modules/desktop/window-manager/sxhkd/default.nix +++ b/modules/desktop/window-manager/sxhkd/default.nix @@ -34,12 +34,12 @@ ${(createKeybinding "t" "Launch terminal.")} - = config.desktop.terminal.default; + = config.desktop.terminal.command; ${(createKeybinding "f" "Launch File Manager.")} - = "${config.desktop.terminal.default} --title 'File Manager' --class popup -e ${config.tools.file-manager.default}"; + = "${config.desktop.terminal.command} --title 'File Manager' --class popup -e ${config.tools.file-manager.command}"; } ]; }; |