From 139dcc31d3c11ecd27dc9eaacb0c09906e4ae9df Mon Sep 17 00:00:00 2001 From: Jan Eitzinger Date: Tue, 14 Feb 2023 12:13:44 +0100 Subject: [PATCH] Integrate tmux config --- dot_tmux.conf.local | 3 --- dot_tmux.conf => dot_tmux.conf.tmpl | 13 +++++++------ 2 files changed, 7 insertions(+), 9 deletions(-) delete mode 100644 dot_tmux.conf.local rename dot_tmux.conf => dot_tmux.conf.tmpl (90%) diff --git a/dot_tmux.conf.local b/dot_tmux.conf.local deleted file mode 100644 index 64663e2..0000000 --- a/dot_tmux.conf.local +++ /dev/null @@ -1,3 +0,0 @@ -set -g default-command /bin/zsh -set -g default-shell /bin/zsh -set -g status-right '#[fg=colour8,bg=colour237] %H:%M %a %d #[fg=colour222,bg=colour238] #h #[fg=colour232,bg=colour154] #{battery_percentage}%% ' diff --git a/dot_tmux.conf b/dot_tmux.conf.tmpl similarity index 90% rename from dot_tmux.conf rename to dot_tmux.conf.tmpl index d1927ed..defb055 100644 --- a/dot_tmux.conf +++ b/dot_tmux.conf.tmpl @@ -3,7 +3,6 @@ set -g prefix C-a bind C-a send-prefix set -g base-index 1 -set -ga terminal-overrides ",xterm-256color:Tc" set -as terminal-overrides ',*:Smulx=\E[4::%p1%dm' set -as terminal-overrides ',*:Setulc=\E[58::2::%p1%{65536}%/%d::%p1%{256}%/%{255}%&%d::%p1%{255}%&%d%;m' @@ -48,7 +47,7 @@ set -g display-time 4000 set -g status-interval 5 # upgrade $TERM -set -g default-terminal "screen-256color" +set -g default-terminal "{{ .term }}" # emacs key bindings in tmux command prompt (prefix + :) are better than # vi keys, even for vim users @@ -60,8 +59,8 @@ set -g focus-events on # super useful when using "grouped sessions" and multi-monitor setup setw -g aggressive-resize on -set -g default-command /bin/zsh -set -g default-shell /bin/zsh +set -g default-command {{ .shell }} +set -g default-shell {{ .shell }} # status bar set-option -g status-position top @@ -71,9 +70,8 @@ set -g status-justify 'centre' set -g status-left-length '100' set -g status 'on' set -g status-right-length '100' -# set -g window-status-separator '|' set -g status-left '#[fg=colour232,bg=colour154] #S #[fg=colour222,bg=colour238] #W #[fg=colour8,bg=colour237] #(whoami) ' -set -g status-right '#[fg=colour8,bg=colour237] %H:%M %a %d #[fg=colour222,bg=colour238] #h #[fg=colour232,bg=colour154] #{pomodoro_status} ' +set -g status-right '#[fg=colour8,bg=colour237] %H:%M %a %d #[fg=colour222,bg=colour238] #h #[fg=colour232,bg=colour154] {{ .status }} ' setw -g window-status-format '#[default] #I #W ' setw -g window-status-current-format '#[fg=colour222,bg=colour238] #I #W #F ' @@ -82,6 +80,9 @@ set -g @plugin 'tmux-plugins/tmux-pain-control' set -g @plugin 'tmux-plugins/tmux-logging' set -g @plugin 'olimorris/tmux-pomodoro-plus' set -g @plugin "jlipps/tmux-safekill" +{{- if eq .chezmoi.os "openbsd" }} +set -g @plugin 'tmux-plugins/tmux-battery' +{{- end }} # Initialize TMUX plugin manager run -b '~/.tmux/plugins/tpm/tpm'