diff --git a/homes/x86_64-linux/julian@aspi/default.nix b/homes/x86_64-linux/julian@aspi/default.nix index 5043cc6..4940755 100644 --- a/homes/x86_64-linux/julian@aspi/default.nix +++ b/homes/x86_64-linux/julian@aspi/default.nix @@ -32,8 +32,18 @@ }; topgrade.enable = true; neovim.enable = true; - # kitty.enable = true; - wezterm.enable = true; + kitty = { + enable = true; + mkDefault = false; + }; + wezterm = { + enable = true; + mkDefault = true; + }; + alacritty = { + enable = true; + mkDefault = false; + }; yazi.enable = true; emacs.enable = true; diff --git a/modules/home/alacritty/default.nix b/modules/home/alacritty/default.nix index b3ef74e..1b7850b 100644 --- a/modules/home/alacritty/default.nix +++ b/modules/home/alacritty/default.nix @@ -25,6 +25,7 @@ in { options.modules.alacritty = { enable = lib.mkOption { default = false; }; + mkDefault = lib.mkOption { default = true; }; }; config = lib.mkIf cfg.enable { @@ -35,6 +36,6 @@ in ".config/alacritty/alacritty.toml".source = ./alacritty.toml; }; - home.sessionVariables.TERMINAL = "alacritty"; + home.sessionVariables.TERMINAL = lib.mkIf cfg.mkDefault "alacritty"; }; } diff --git a/modules/home/kitty/default.nix b/modules/home/kitty/default.nix index a67a2e8..8760263 100644 --- a/modules/home/kitty/default.nix +++ b/modules/home/kitty/default.nix @@ -25,6 +25,7 @@ in { options.modules.kitty = { enable = lib.mkOption { default = false; }; + mkDefault = lib.mkOption { default = true; }; }; config = lib.mkIf cfg.enable { @@ -43,6 +44,10 @@ in }; }; - home.sessionVariables.TERMINAL = "kitty"; + # home.shellAliases = { + # ssh = "kitten ssh"; # Copy kitten terminfo to remote + # }; + + home.sessionVariables.TERMINAL = lib.mkIf cfg.mkDefault "kitty"; }; } diff --git a/modules/home/suites/desktop/default.nix b/modules/home/suites/desktop/default.nix index 3f68780..ef9d1ef 100644 --- a/modules/home/suites/desktop/default.nix +++ b/modules/home/suites/desktop/default.nix @@ -80,7 +80,6 @@ in unstable.path-of-building # Path of Building # frajul.pob-dev-version # Path of Building vlc - wezterm # Terminal wine winetricks xclip # x11 clipboard access from terminal diff --git a/modules/home/wezterm/default.nix b/modules/home/wezterm/default.nix index 850d406..e592c9d 100644 --- a/modules/home/wezterm/default.nix +++ b/modules/home/wezterm/default.nix @@ -25,6 +25,7 @@ in { options.modules.wezterm = { enable = lib.mkOption { default = false; }; + mkDefault = lib.mkOption { default = true; }; }; config = lib.mkIf cfg.enable { @@ -35,7 +36,7 @@ in local config = {} config.color_scheme = 'Catppuccin Mocha' - -- config.font = wezterm.font 'DejaVu Sans' + -- config.font = wezterm.font 'JetBrains Mono' -- config.font_size = 12.0 config.hide_tab_bar_if_only_one_tab = true config.audible_bell = 'Disabled' @@ -47,7 +48,7 @@ in ''; }; - home.sessionVariables.TERMINAL = "wezterm-start-here"; + home.sessionVariables.TERMINAL = lib.mkIf cfg.mkDefault "wezterm-start-here"; # Otherwise wezterm does not start in directory of parent process home.packages = [