From 529eaa5dab35c364e04b758eb1624fc45ca3c9d1 Mon Sep 17 00:00:00 2001 From: Yorick Barbanneau Date: Wed, 5 Mar 2025 00:56:12 +0100 Subject: [PATCH 1/2] chore(zsh): update configuration * Remove useless plugins * load base16 theme at startup --- modules/home-manager/cli/zsh/default.nix | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/modules/home-manager/cli/zsh/default.nix b/modules/home-manager/cli/zsh/default.nix index 69ce68c..f8e5977 100644 --- a/modules/home-manager/cli/zsh/default.nix +++ b/modules/home-manager/cli/zsh/default.nix @@ -88,6 +88,7 @@ in } precmd_functions+=(zle-keymap-select) zle -N zle-keymap-select + base16_default-dark ''; completionInit = '' autoload -Uz compinit @@ -105,15 +106,6 @@ in rev = "588691ba71b47e75793ed9edfcfaa058326a6f41"; hash = "sha256-X89FsG9QICDw3jZvOCB/KsPBVOLUeE7xN3VCtf0DD3E="; }; - } - { - name = "history-search-multi-word"; - src = pkgs.fetchFromGitHub { - owner = "zdharma-continuum"; - repo = "history-search-multi-word"; - rev = "c4dcddc1cd17e7e0909471703f3526170db0f475"; - hash = "sha256-KgKm9qzFnwXDXwmTruPgC0tjmiTY5AiGdrWW4zDWUF4="; - }; }]; localVariables = { BASE16_THEME = "$HOME/.config/zsh/plugins/base16"; From 4881b34fa63e655cddc569c88d26014390644afd Mon Sep 17 00:00:00 2001 From: Yorick Barbanneau Date: Wed, 5 Mar 2025 00:58:05 +0100 Subject: [PATCH 2/2] fix(tmux): bad colors on hosts with base16 theme loaded --- modules/home-manager/cli/tmux/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/home-manager/cli/tmux/default.nix b/modules/home-manager/cli/tmux/default.nix index c52da09..3a9ed4c 100644 --- a/modules/home-manager/cli/tmux/default.nix +++ b/modules/home-manager/cli/tmux/default.nix @@ -43,17 +43,17 @@ in set -g set-titles-string "#T" set -g status-bg colour0 set -g status-fg colour7 - set -g message-style bg=colour10,fg=colour7 + set -g message-style bg=colour19,fg=colour7 - setw -g window-status-current-format '#[fg=colour10,bg=colour3] #I\ - #[bg=colour10,fg=colour7,bold] #W\ + setw -g window-status-current-format '#[fg=colour18,bg=colour11] #I\ + #[bg=colour19,fg=colour7,bold] #W\ #{?window_active,󰎂 ,}#{?window_marked_flag,󰃃 ,}#{?window_activity_flag, ,}#{?window_silence_flag,󰝟 ,}#{?window_zoomed_flag,󱀅 ,}#{?window_bell_flag,#[fg=colour1]󱈸 ,}' - set -g pane-border-style fg=colour11 + set -g pane-border-style fg=colour19 set -g pane-active-border-style fg=colour4 - setw -g window-status-format '#[bg=color4,fg=colour10] #I\ - #[bg=colour10,fg=colour12] #W\ + setw -g window-status-format '#[bg=color12,fg=colour18] #I\ + #[bg=colour19,fg=colour7] #W\ #{?window_last_flag, ,}#{?window_marked_flag,󰃃 ,}#{?window_activity_flag, ,}#{?window_silence_flag,󰝟 ,}#{?window_zoomed_flag,󱀅 ,}#{?window_bell_flag,#[fg=colour1]󱈸 ,}' set -g status-left "#[bg=colour0, fg=colour6]  #S " set -g status-right ""