diff options
author | Toby Vincent <tobyv@tobyvin.dev> | 2023-08-28 10:37:59 -0500 |
---|---|---|
committer | Toby Vincent <tobyv@tobyvin.dev> | 2023-08-28 10:37:59 -0500 |
commit | 3ba6046d8414ee06e74d6e2b4ad4678f50414490 (patch) | |
tree | c6d65549490a772288c748e193ec138c63c7e0d6 | |
parent | b9615bf13e5b23c2ef433a4ef87caecb55f58916 (diff) |
revert(4ffdb5f): move back to dedicated gruvbox theme
This reverts commit 4ffdb5f (fix(tmux): simplify tmux theme config using
base16, 2023-08-27).
-rw-r--r-- | sh/.config/profile.d/30-fzf.sh | 4 | ||||
-rw-r--r-- | tmux/.config/tmux/tmux.conf | 49 |
2 files changed, 25 insertions, 28 deletions
diff --git a/sh/.config/profile.d/30-fzf.sh b/sh/.config/profile.d/30-fzf.sh index 9e01fb4..d9e89cb 100644 --- a/sh/.config/profile.d/30-fzf.sh +++ b/sh/.config/profile.d/30-fzf.sh @@ -12,4 +12,6 @@ export FZF_DEFAULT_OPTS='--bind ctrl-q:abort --bind ctrl-b:preview-page-up --bind ctrl-f:preview-page-down --bind alt-up:half-page-up ---bind alt-down:half-page-down' +--bind alt-down:half-page-down +--color fg:#ebdbb2,hl:#fabd2f,fg+:#ebdbb2,hl+:#fabd2f +--color info:#83a598,prompt:#bdae93,spinner:#fabd2f,pointer:#83a598,marker:#fe8019,header:#665c54' diff --git a/tmux/.config/tmux/tmux.conf b/tmux/.config/tmux/tmux.conf index 350dc95..f6444b7 100644 --- a/tmux/.config/tmux/tmux.conf +++ b/tmux/.config/tmux/tmux.conf @@ -1,22 +1,18 @@ -set-option -g default-terminal 'tmux-256color' +set -g default-terminal 'tmux-256color' -set-option -ga terminal-features ',*:hyperlinks' -set-option -ga terminal-features ',*:RGB' -set-option -ga terminal-features ',*:usstyle' -set-option -ga terminal-features ',*:strikethrough' +set -ga terminal-overrides ',*:Tc' +set -ga terminal-overrides ',*:RGB' +set -ga terminal-overrides ',*:Smulx=\E[4::%p1%dm' +set -ga terminal-overrides ',*:Setulc=\E[58::2::%p1%{65536}%/%d::%p1%{256}%/%{255}%&%d::%p1%{255}%&%d%;m' -set-option -g escape-time 50 -set-option -g mouse on -set-option -g prefix C-a +set -g escape-time 50 +set -g mouse on +set -g prefix C-a -set-option -g base-index 1 -set-option -g pane-base-index 1 -set-option -g detach-on-destroy off -set-option -g status-keys vi -set-option -g status-interval 1 - -set-option -g status-left "#[#{?client_prefix,#{window-status-bell-style},#{status-left-style}}][#S:#{host_short}]#[#{status-style}] " -set-option -g status-right "%Y-%m-%d %H:%M:%S" +set -g base-index 1 +set -g pane-base-index 1 +set -g detach-on-destroy off +set -g status-keys vi bind-key -N "Switch last session" A switch-client -l bind-key -N "Clock" T clock-mode @@ -49,21 +45,20 @@ bind-key '*' if-shell 'tmux swapw -d -t :=8' '' 'movew -t :=8' bind-key '(' if-shell 'tmux swapw -d -t :=9' '' 'movew -t :=9' bind-key ')' if-shell 'tmux swapw -d -t :=0' '' 'movew -t :=0' -set-option -g @colors-base16 'gruvbox-dark-hard' - -source-file -q $BASE16_CONFIG_PATH/tmux.base16.conf +set -g @plugin 'tmux-plugins/tpm' +set -g @plugin 'tmux-plugins/tmux-sensible' +set -g @plugin 'tmux-plugins/tmux-pain-control' +set -g @plugin 'lawabidingcactus/tmux-gruvbox-truecolor' -set-option -g @plugin 'tmux-plugins/tpm' -set-option -g @plugin 'tmux-plugins/tmux-sensible' -set-option -g @plugin 'tmux-plugins/tmux-pain-control' -set-option -g @plugin 'tinted-theming/base16-tmux' - -if-shell "test ! -d $XDG_CONFIG_HOME/tmux/plugins/tpm" \ +if "test ! -d $XDG_CONFIG_HOME/tmux/plugins/tpm" \ "run 'git clone https://github.com/tmux-plugins/tpm $XDG_CONFIG_HOME/tmux/plugins/tpm \ && $XDG_CONFIG_HOME/tmux/plugins/tpm/bin/install_plugins'" -run-shell '$XDG_CONFIG_HOME/tmux/plugins/tpm/tpm' +run '$XDG_CONFIG_HOME/tmux/plugins/tpm/tpm' + +set -g status-left-length 30 +set -g status-left "#[bg=#A89984, fg=#3C3836]#{?client_prefix,#[bg=#fe8019],#[bg=#A89984]} #{s|$HOME|~|:session_path} " %if #{m:*ssh,#{socket_path}} -source-file "$XDG_CONFIG_HOME/tmux/ssh.conf" +source "$XDG_CONFIG_HOME/tmux/ssh.conf" %endif |