From f36491c92269d3e1dd241e67c292af762ac498c3 Mon Sep 17 00:00:00 2001 From: Arpit Chakladar Date: Thu, 24 Sep 2026 19:16:14 +0530 Subject: refactor: some more minor refactoring --- modules/terminal/fzf/assertions.nix | 5 ++++- modules/terminal/kitty/colors.nix | 5 ++++- modules/terminal/kitty/keybindings.nix | 5 ++++- 3 files changed, 12 insertions(+), 3 deletions(-) (limited to 'modules/terminal') diff --git a/modules/terminal/fzf/assertions.nix b/modules/terminal/fzf/assertions.nix index 75006fe..3436126 100644 --- a/modules/terminal/fzf/assertions.nix +++ b/modules/terminal/fzf/assertions.nix @@ -1,10 +1,13 @@ # fzf shell integration is only provided for zsh. bash is scripting-only # (not a login shell), so it does not receive fzf integration. { config, ... }: +let + cfg = config.terminal.fzf; +in { assertions = [ { - assertion = !config.terminal.fzf.enable || config.terminal.zsh.enable; + assertion = !cfg.enable || config.terminal.zsh.enable; message = '' terminal.fzf is enabled but terminal.zsh.enable is not set. fzf shell integration requires zsh. Please enable zsh. diff --git a/modules/terminal/kitty/colors.nix b/modules/terminal/kitty/colors.nix index a91b0b2..fbc36d1 100644 --- a/modules/terminal/kitty/colors.nix +++ b/modules/terminal/kitty/colors.nix @@ -5,8 +5,11 @@ pkgs, ... }: +let + cfg = config.terminal.kitty; +in { - config.programs.kitty.settings = lib.mkIf config.terminal.kitty.enable ( + config.programs.kitty.settings = lib.mkIf cfg.enable ( let base16Colors = import ../../colors/base16 { inherit config lib pkgs; }; in diff --git a/modules/terminal/kitty/keybindings.nix b/modules/terminal/kitty/keybindings.nix index 728595d..311318a 100644 --- a/modules/terminal/kitty/keybindings.nix +++ b/modules/terminal/kitty/keybindings.nix @@ -1,7 +1,10 @@ # Keybindings for kitty { config, lib, ... }: +let + cfg = config.terminal.kitty; +in { - config.programs.kitty.keybindings = lib.mkIf config.terminal.kitty.enable { + config.programs.kitty.keybindings = lib.mkIf cfg.enable { "ctrl+shift+k" = "scroll_line_up"; "ctrl+shift+j" = "scroll_line_down"; "ctrl+shift+u" = "scroll_page_up"; -- cgit v1.2.3