From 894320aa4d585e358867a32daa20a38d9d05422f Mon Sep 17 00:00:00 2001 From: Ade Attwood Date: Tue, 25 Apr 2023 20:56:48 +0100 Subject: [PATCH] chore(tmux): move themes to base16-tmux This requires no extra config other than what I already have in the base-16-shell. If this is installed then its automatically loaded. --- site-modules/core/files/tmux.conf | 59 ------------------- site-modules/core/manifests/tmux.pp | 7 +++ site-modules/core/templates/git/gitconfig.erb | 2 +- 3 files changed, 8 insertions(+), 60 deletions(-) diff --git a/site-modules/core/files/tmux.conf b/site-modules/core/files/tmux.conf index 713b77d..7c4b4ef 100644 --- a/site-modules/core/files/tmux.conf +++ b/site-modules/core/files/tmux.conf @@ -84,62 +84,3 @@ set -g pane-base-index 1 # Also need by vim plugin tmux-focus-events.vim set -g focus-events on -# Github colors for Tmux -#https://github.com/projekt0n/github-theme-contrib/blob/main/tmux/github_light.confhttps://github.com/projekt0n/github-theme-contrib/blob/main/tmux/github_light.confhttps://github.com/projekt0n/github-theme-contrib/blob/main/tmux/github_light.conf - -## set status bar -set -g status-style bg=default -setw -g window-status-current-style bg="#282a2e" -setw -g window-status-current-style fg="#81a2be" - -## highlight active window -setw -g window-style 'bg=#282a2e' -setw -g window-active-style 'bg=#1d1f21' -setw -g pane-active-border-style '' - -## highlight activity in status bar -setw -g window-status-activity-style fg="#8abeb7" -setw -g window-status-activity-style bg="#1d1f21" - -## pane border and colors -set -g pane-active-border-style bg=default -set -g pane-active-border-style fg="#373b41" -set -g pane-border-style bg=default -set -g pane-border-style fg="#373b41" - -set -g clock-mode-colour "#81a2be" -set -g clock-mode-style 24 - -set -g message-style bg="#8abeb7" -set -g message-style fg="#000000" - -set -g message-command-style bg="#8abeb7" -set -g message-command-style fg="#000000" - -# message bar or "prompt" -set -g message-style bg="#2d2d2d" -set -g message-style fg="#cc99cc" - -set -g mode-style bg="#1d1f21" -set -g mode-style fg="#de935f" - -# right side of status bar holds "[host name] (date time)" -set -g status-right-length 100 -set -g status-right-style fg=black -set -g status-right-style bold -set -g status-right '#[fg=#f99157,bg=#2d2d2d] %H:%M |#[fg=#6699cc] %y.%m.%d ' - -# make background window look like white tab -set-window-option -g window-status-style bg=default -set-window-option -g window-status-style fg=white -set-window-option -g window-status-style none -set-window-option -g window-status-format '#[fg=#6699cc,bg=colour235] #I #[fg=#999999,bg=#2d2d2d] #W #[default]' - -# make foreground window look like bold yellow foreground tab -set-window-option -g window-status-current-style none -set-window-option -g window-status-current-format '#[fg=#f99157,bg=#2d2d2d] #I #[fg=#cccccc,bg=#393939] #W #[default]' - -# active terminal yellow border, non-active white -set -g pane-border-style bg=default -set -g pane-border-style fg="#999999" -set -g pane-active-border-style fg="#f99157" diff --git a/site-modules/core/manifests/tmux.pp b/site-modules/core/manifests/tmux.pp index 7d6f239..d8f83e5 100644 --- a/site-modules/core/manifests/tmux.pp +++ b/site-modules/core/manifests/tmux.pp @@ -38,4 +38,11 @@ class core::tmux { provider => git, revision => 'master', } + + vcsrepo { "${user_home}/.tmux/plugins/base16-tmux": + ensure => latest, + source => 'https://github.com/tinted-theming/base16-tmux.git', + provider => git, + revision => 'main', + } } diff --git a/site-modules/core/templates/git/gitconfig.erb b/site-modules/core/templates/git/gitconfig.erb index 2e90b4e..409119d 100644 --- a/site-modules/core/templates/git/gitconfig.erb +++ b/site-modules/core/templates/git/gitconfig.erb @@ -29,7 +29,7 @@ diffFilter = delta --color-only [delta] - light = false + light = true line-numbers = true navigate = true hunk-header-style = raw