From 6ce74cad84a63f600ea338c5479c5f8eef895480 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Attila=20Ol=C3=A1h?= Date: Sun, 2 Mar 2025 15:44:23 +0000 Subject: [PATCH 1/3] Match any prefix, not just templates. --- home-manager/xdg/nvim/lua/autocmds.lua | 2 ++ 1 file changed, 2 insertions(+) diff --git a/home-manager/xdg/nvim/lua/autocmds.lua b/home-manager/xdg/nvim/lua/autocmds.lua index ebe3b13..0a715ed 100644 --- a/home-manager/xdg/nvim/lua/autocmds.lua +++ b/home-manager/xdg/nvim/lua/autocmds.lua @@ -1,6 +1,8 @@ vim.filetype.add { pattern = { ["templates/.*%.ya?ml"] = "helm", + [".*/templates/.*%.ya?ml"] = "helm", ["templates/.*%.tpl"] = "gotmpl", + [".*/templates/.*%.tpl"] = "gotmpl", }, } From c5e7a558e280ba94cb890e447d486175c214c6e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Attila=20Ol=C3=A1h?= Date: Sun, 2 Mar 2025 18:48:41 +0000 Subject: [PATCH 2/3] Clean up tmux status bar. --- home-manager/programs/tmux.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/home-manager/programs/tmux.nix b/home-manager/programs/tmux.nix index 15aa514..388c6cb 100644 --- a/home-manager/programs/tmux.nix +++ b/home-manager/programs/tmux.nix @@ -18,6 +18,11 @@ extraConfig = '' set -g @catppuccin_status_left_separator "█" set -g @catppuccin_status_right_separator "█" + + set -g status-left "" + + set -g status-right "#{E:@catppuccin_status_application}" + set -ag status-right "#{E:@catppuccin_status_session}" ''; } ]; From 70a476212ae8e06bdcd70ececba3d9f1bfe9ed52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Attila=20Ol=C3=A1h?= Date: Thu, 6 Mar 2025 06:38:35 +0000 Subject: [PATCH 3/3] Fix TMux window status, the option has renamed in v2. --- home-manager/programs/tmux.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/home-manager/programs/tmux.nix b/home-manager/programs/tmux.nix index 388c6cb..5145194 100644 --- a/home-manager/programs/tmux.nix +++ b/home-manager/programs/tmux.nix @@ -19,10 +19,13 @@ set -g @catppuccin_status_left_separator "█" set -g @catppuccin_status_right_separator "█" - set -g status-left "" + set-option -g @catppuccin_window_text " #{=2:pane_current_command}|#{b:pane_current_path}" + set-option -g @catppuccin_window_current_text " #{=2:pane_current_command}|#{b:pane_current_path}" - set -g status-right "#{E:@catppuccin_status_application}" + set -g status-left "" + set -g status-right "#{E:@catppuccin_status_application}" set -ag status-right "#{E:@catppuccin_status_session}" + set -ag status-right "#{E:@catppuccin_status_host}" ''; } ];