diff --git a/home/mixins/workstation.nix b/home/mixins/workstation.nix index 03be8bd8..0cb6f574 100644 --- a/home/mixins/workstation.nix +++ b/home/mixins/workstation.nix @@ -6,7 +6,6 @@ ./trusted.nix ../profiles/graphical/applications/ghostty/default.nix - ../profiles/graphical/applications/kitty/default.nix ../profiles/graphical/applications/obs-studio.nix ../profiles/graphical/applications/okular.nix ../profiles/graphical/applications/xournal.nix diff --git a/home/profiles/graphical/applications/ghostty/default.nix b/home/profiles/graphical/applications/ghostty/default.nix index 3365f29a..966afa70 100644 --- a/home/profiles/graphical/applications/ghostty/default.nix +++ b/home/profiles/graphical/applications/ghostty/default.nix @@ -6,9 +6,11 @@ enableZshIntegration = true; installBatSyntax = true; settings = { - font-size = 13; + font-size = 11; theme = "dark:catppuccin-frappe,light:catppuccin-latte"; window-decoration = false; }; }; + programs.fuzzel.settings.main.terminal = "ghostty"; + wayland.windowManager.sway.config.terminal = "ghostty"; } diff --git a/home/profiles/graphical/applications/kitty/default.nix b/home/profiles/graphical/applications/kitty/default.nix index a0d8df79..48613b0e 100644 --- a/home/profiles/graphical/applications/kitty/default.nix +++ b/home/profiles/graphical/applications/kitty/default.nix @@ -43,4 +43,7 @@ in "kitty_mod+enter" = "new_window_with_cwd"; }; }; + + programs.fuzzel.settings.main.terminal = "kitty"; + wayland.windowManager.sway.config.terminal = "kitty"; } diff --git a/home/profiles/graphical/launchers/fuzzel.nix b/home/profiles/graphical/launchers/fuzzel.nix index 4c2878c4..1a90fce6 100644 --- a/home/profiles/graphical/launchers/fuzzel.nix +++ b/home/profiles/graphical/launchers/fuzzel.nix @@ -5,13 +5,17 @@ ... }: let + inherit (config.theme) fonts; cfg = config.programs.fuzzel.package; in { programs.fuzzel.enable = true; + # FIXME: dark-mode support (manual color palette specification) programs.fuzzel.settings = { main = { - terminal = "kitty"; + font = "${fonts.monospace.name}:size=10"; + use-bold = true; + terminal = lib.mkDefault "foot"; layer = "overlay"; }; }; diff --git a/home/profiles/graphical/mako.nix b/home/profiles/graphical/mako.nix index ca283aff..4b2a3bd9 100644 --- a/home/profiles/graphical/mako.nix +++ b/home/profiles/graphical/mako.nix @@ -1,4 +1,7 @@ { pkgs, config, ... }: +let + theme = config.theme; +in { home.packages = [ pkgs.mako ]; services.mako = { diff --git a/home/profiles/graphical/sessions/sway/default.nix b/home/profiles/graphical/sessions/sway/default.nix index 2a7e6947..66c1d5d2 100644 --- a/home/profiles/graphical/sessions/sway/default.nix +++ b/home/profiles/graphical/sessions/sway/default.nix @@ -26,7 +26,7 @@ in ''; config = { modifier = "Mod4"; - terminal = "ghostty"; + terminal = lib.mkDefault "foot"; startup = [ { command = "firefox --profile ~/.mozilla/firefox/home"; diff --git a/home/profiles/nnn.nix b/home/profiles/nnn.nix index a00f2bd9..15b04ea0 100644 --- a/home/profiles/nnn.nix +++ b/home/profiles/nnn.nix @@ -19,8 +19,7 @@ let # FIXME: false negative depending on osConfig isGraphical = (moduleArgs.osConfig.services.xserver.enable or false); - # TODO: add wezterm support; and whatabout zellij? - enablePreviews = config.programs.tmux.enable || kittyCfg.enable; + enablePreviews = true; # FIXME: make sure the wrapped package can access these # currently no syntax highlighting in previews