From 9226005534570388f5ea4e470b085d574bb4d8b3 Mon Sep 17 00:00:00 2001 From: Luis Freixial <48995671+lfreixial@users.noreply.github.com> Date: Thu, 10 Jul 2025 22:06:39 +0100 Subject: [PATCH 1/2] backup tmux --- tmux/.tmux.conf | 76 +++++++++++++++++++++++++-- tmux/.tmux/plugins/catppuccin-tmux | 1 + tmux/.tmux/plugins/tmux | 1 + tmux/.tmux/plugins/tmux-continuum | 1 + tmux/.tmux/plugins/tmux-powerline | 1 + tmux/.tmux/plugins/tmux-resurrect | 1 + tmux/.tmux/plugins/tmux-sensible | 1 + tmux/.tmux/plugins/tmux-weather | 1 + tmux/.tmux/plugins/tmux-wttr | 1 + tmux/.tmux/plugins/tmux-yank | 1 + tmux/.tmux/plugins/vim-tmux-navigator | 1 + 11 files changed, 82 insertions(+), 4 deletions(-) create mode 160000 tmux/.tmux/plugins/catppuccin-tmux create mode 160000 tmux/.tmux/plugins/tmux create mode 160000 tmux/.tmux/plugins/tmux-continuum create mode 160000 tmux/.tmux/plugins/tmux-powerline create mode 160000 tmux/.tmux/plugins/tmux-resurrect create mode 160000 tmux/.tmux/plugins/tmux-sensible create mode 160000 tmux/.tmux/plugins/tmux-weather create mode 160000 tmux/.tmux/plugins/tmux-wttr create mode 160000 tmux/.tmux/plugins/tmux-yank create mode 160000 tmux/.tmux/plugins/vim-tmux-navigator diff --git a/tmux/.tmux.conf b/tmux/.tmux.conf index 8be72f0..6d201bb 100644 --- a/tmux/.tmux.conf +++ b/tmux/.tmux.conf @@ -1,9 +1,77 @@ -set -g @plugin 'tmux-plugins/tpm' -set -g @plugin 'tmux-plugins/tmux-sensible' +set-option -sa terminal-overrides ",xterm*:Tc" +set -g mouse on +unbind C-b +set -g prefix C-Space +bind C-Space send-prefix + +# Vim style pane selection +bind h select-pane -L +bind j select-pane -D +bind k select-pane -U +bind l select-pane -R + +# Start windows and panes at 1, not 0 +set -g base-index 1 +set -g pane-base-index 1 +set-window-option -g pane-base-index 1 +set-option -g renumber-windows on + +# Use Alt-arrow keys without prefix key to switch panes +bind -n M-Left select-pane -L +bind -n M-Right select-pane -R +bind -n M-Up select-pane -U +bind -n M-Down select-pane -D + +# Shift arrow to switch windows +bind -n S-Left previous-window +bind -n S-Right next-window + +# Shift Alt vim keys to switch windows +bind -n M-H previous-window +bind -n M-L next-window + +# --- Plugins --- +set -g @plugin 'tmux-plugins/tpm': +set -g @plugin 'tmux-plugins/tmux-sensible' +set -g @plugin 'christoomey/vim-tmux-navigator' +set -g @plugin 'tmux-plugins/tmux-yank' +set -g @plugin 'tmux-plugins/tmux-resurrect' +set -g @plugin 'tmux-plugins/tmux-continuum' +set -s default-terminal 'tmux-256color' run ~/git-repos/dracula-tmux/dracula.tmux -set -g @dracula-plugins "git" +set -g @dracula-time "Europe/Belfast,America/New_York" +set -g @dracula-time-military false +set -g @dracula-show-empty-plugins false +set -g @dracula-show-powerline true +set -g @dracula-fixed-location "Antrim" +set -g @dracula-show-flags true +set -g @dracula-show-left-icon session +set -g @dracula-show-fahrenheit false +set -g @dracula-show-edge-icons false +set -g @dracula-refresh-rate 5 +set -g @dracula-show-left-icon "#H | #S " +set -g @dracula-git-disable-status true +set -g @dracula-git-show-repo-name true +set -g @dracula-show-ssh-only-when-connected true +set -g @dracula-plugins "git weather battery time ssh-session" + +set -g status-position top + +# set vi-mode +set-window-option -g mode-keys vi +# keybindings +bind-key -T copy-mode-vi v send-keys -X begin-selection +bind-key -T copy-mode-vi C-v send-keys -X rectangle-toggle +bind-key -T copy-mode-vi y send-keys -X copy-selection-and-cancel + +bind n display-popup -E 'bash -i -c "read -p \"Session name: \" name; tmux new-session -d -s \$name && tmux switch-client -t \$name"' +bind j display-popup -E "tmux list-sessions | sed -E 's/:.*$//' | grep -v \"^$(tmux display-message -p '#S')\$\" | fzf --reverse | xargs tmux switch-client -t" + +bind '"' split-window -v -c "#{pane_current_path}" +bind % split-window -h -c "#{pane_current_path}" + +# Initialize TMUX plugin manager (keep this line at the very bottom of tmux.conf) run '~/.tmux/plugins/tpm/tpm' - diff --git a/tmux/.tmux/plugins/catppuccin-tmux b/tmux/.tmux/plugins/catppuccin-tmux new file mode 160000 index 0000000..b4e0715 --- /dev/null +++ b/tmux/.tmux/plugins/catppuccin-tmux @@ -0,0 +1 @@ +Subproject commit b4e0715356f820fc72ea8e8baf34f0f60e891718 diff --git a/tmux/.tmux/plugins/tmux b/tmux/.tmux/plugins/tmux new file mode 160000 index 0000000..0e568d1 --- /dev/null +++ b/tmux/.tmux/plugins/tmux @@ -0,0 +1 @@ +Subproject commit 0e568d1d7bf6b9e9f842ddd62d89f00b6467f1d5 diff --git a/tmux/.tmux/plugins/tmux-continuum b/tmux/.tmux/plugins/tmux-continuum new file mode 160000 index 0000000..0698e8f --- /dev/null +++ b/tmux/.tmux/plugins/tmux-continuum @@ -0,0 +1 @@ +Subproject commit 0698e8f4b17d6454c71bf5212895ec055c578da0 diff --git a/tmux/.tmux/plugins/tmux-powerline b/tmux/.tmux/plugins/tmux-powerline new file mode 160000 index 0000000..a14267b --- /dev/null +++ b/tmux/.tmux/plugins/tmux-powerline @@ -0,0 +1 @@ +Subproject commit a14267b48f26e6b44b1c378374b8b82e522209c3 diff --git a/tmux/.tmux/plugins/tmux-resurrect b/tmux/.tmux/plugins/tmux-resurrect new file mode 160000 index 0000000..cff343c --- /dev/null +++ b/tmux/.tmux/plugins/tmux-resurrect @@ -0,0 +1 @@ +Subproject commit cff343cf9e81983d3da0c8562b01616f12e8d548 diff --git a/tmux/.tmux/plugins/tmux-sensible b/tmux/.tmux/plugins/tmux-sensible new file mode 160000 index 0000000..25cb91f --- /dev/null +++ b/tmux/.tmux/plugins/tmux-sensible @@ -0,0 +1 @@ +Subproject commit 25cb91f42d020f675bb0a2ce3fbd3a5d96119efa diff --git a/tmux/.tmux/plugins/tmux-weather b/tmux/.tmux/plugins/tmux-weather new file mode 160000 index 0000000..829b703 --- /dev/null +++ b/tmux/.tmux/plugins/tmux-weather @@ -0,0 +1 @@ +Subproject commit 829b7031952f1c27eaf08e06001861b66b4de81e diff --git a/tmux/.tmux/plugins/tmux-wttr b/tmux/.tmux/plugins/tmux-wttr new file mode 160000 index 0000000..f77ec66 --- /dev/null +++ b/tmux/.tmux/plugins/tmux-wttr @@ -0,0 +1 @@ +Subproject commit f77ec668349275c8fb3484c6edc65e809998f2cd diff --git a/tmux/.tmux/plugins/tmux-yank b/tmux/.tmux/plugins/tmux-yank new file mode 160000 index 0000000..acfd36e --- /dev/null +++ b/tmux/.tmux/plugins/tmux-yank @@ -0,0 +1 @@ +Subproject commit acfd36e4fcba99f8310a7dfb432111c242fe7392 diff --git a/tmux/.tmux/plugins/vim-tmux-navigator b/tmux/.tmux/plugins/vim-tmux-navigator new file mode 160000 index 0000000..412c474 --- /dev/null +++ b/tmux/.tmux/plugins/vim-tmux-navigator @@ -0,0 +1 @@ +Subproject commit 412c474e97468e7934b9c217064025ea7a69e05e From fb0d692489e518f2687de6baabe552b96aa7eec2 Mon Sep 17 00:00:00 2001 From: lfreixial Date: Thu, 10 Jul 2025 22:14:19 +0100 Subject: [PATCH 2/2] update make file --- Makefile | 13 ++++++++----- tmux/.tmux/plugins/catppuccin-tmux | 1 - tmux/.tmux/plugins/tmux | 1 - tmux/.tmux/plugins/tmux-continuum | 1 - tmux/.tmux/plugins/tmux-powerline | 1 - tmux/.tmux/plugins/tmux-resurrect | 1 - tmux/.tmux/plugins/tmux-sensible | 1 - tmux/.tmux/plugins/tmux-weather | 1 - tmux/.tmux/plugins/tmux-wttr | 1 - tmux/.tmux/plugins/tmux-yank | 1 - tmux/.tmux/plugins/tpm | 1 - tmux/.tmux/plugins/vim-tmux-navigator | 1 - tmux/.tmux/tpm | 1 - 13 files changed, 8 insertions(+), 17 deletions(-) delete mode 160000 tmux/.tmux/plugins/catppuccin-tmux delete mode 160000 tmux/.tmux/plugins/tmux delete mode 160000 tmux/.tmux/plugins/tmux-continuum delete mode 160000 tmux/.tmux/plugins/tmux-powerline delete mode 160000 tmux/.tmux/plugins/tmux-resurrect delete mode 160000 tmux/.tmux/plugins/tmux-sensible delete mode 160000 tmux/.tmux/plugins/tmux-weather delete mode 160000 tmux/.tmux/plugins/tmux-wttr delete mode 160000 tmux/.tmux/plugins/tmux-yank delete mode 160000 tmux/.tmux/plugins/tpm delete mode 160000 tmux/.tmux/plugins/vim-tmux-navigator delete mode 160000 tmux/.tmux/tpm diff --git a/Makefile b/Makefile index 675a1c6..c1b367e 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -.PHONY: zsh +.PHONY: zsh update-zsh tmux update-tmux zsh: @for file in zsh/.[!.]*; do \ @@ -15,10 +15,13 @@ update-zsh: done && echo "zsh files updated from home directory" || echo "zsh files not updated from home directory" tmux: - @for file in tmux/.[!.]*; do \ - file=$${file#tmux/}; \ - [ -f "$$HOME/$$file" ] && mv "$$HOME/$$file" "$$HOME/$$file.bak"; \ - done && cp -r tmux/.[!.]* ~/ && echo "tmux files copied to home directory" || echo "tmux files not copied to home directory" + @if [ -f "$$HOME/.tmux.conf" ]; then \ + mv "$$HOME/.tmux.conf" "$$HOME/.tmux.conf.bak"; \ + cp tmux/.tmux.conf "$$HOME/.tmux.conf"; \ + echo ".tmux.conf copied to home directory"; \ + else \ + echo ".tmux.conf not found in home directory"; \ + fi update-tmux: @if [ -f "$$HOME/.tmux.conf" ]; then \ diff --git a/tmux/.tmux/plugins/catppuccin-tmux b/tmux/.tmux/plugins/catppuccin-tmux deleted file mode 160000 index b4e0715..0000000 --- a/tmux/.tmux/plugins/catppuccin-tmux +++ /dev/null @@ -1 +0,0 @@ -Subproject commit b4e0715356f820fc72ea8e8baf34f0f60e891718 diff --git a/tmux/.tmux/plugins/tmux b/tmux/.tmux/plugins/tmux deleted file mode 160000 index 0e568d1..0000000 --- a/tmux/.tmux/plugins/tmux +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 0e568d1d7bf6b9e9f842ddd62d89f00b6467f1d5 diff --git a/tmux/.tmux/plugins/tmux-continuum b/tmux/.tmux/plugins/tmux-continuum deleted file mode 160000 index 0698e8f..0000000 --- a/tmux/.tmux/plugins/tmux-continuum +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 0698e8f4b17d6454c71bf5212895ec055c578da0 diff --git a/tmux/.tmux/plugins/tmux-powerline b/tmux/.tmux/plugins/tmux-powerline deleted file mode 160000 index a14267b..0000000 --- a/tmux/.tmux/plugins/tmux-powerline +++ /dev/null @@ -1 +0,0 @@ -Subproject commit a14267b48f26e6b44b1c378374b8b82e522209c3 diff --git a/tmux/.tmux/plugins/tmux-resurrect b/tmux/.tmux/plugins/tmux-resurrect deleted file mode 160000 index cff343c..0000000 --- a/tmux/.tmux/plugins/tmux-resurrect +++ /dev/null @@ -1 +0,0 @@ -Subproject commit cff343cf9e81983d3da0c8562b01616f12e8d548 diff --git a/tmux/.tmux/plugins/tmux-sensible b/tmux/.tmux/plugins/tmux-sensible deleted file mode 160000 index 25cb91f..0000000 --- a/tmux/.tmux/plugins/tmux-sensible +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 25cb91f42d020f675bb0a2ce3fbd3a5d96119efa diff --git a/tmux/.tmux/plugins/tmux-weather b/tmux/.tmux/plugins/tmux-weather deleted file mode 160000 index 829b703..0000000 --- a/tmux/.tmux/plugins/tmux-weather +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 829b7031952f1c27eaf08e06001861b66b4de81e diff --git a/tmux/.tmux/plugins/tmux-wttr b/tmux/.tmux/plugins/tmux-wttr deleted file mode 160000 index f77ec66..0000000 --- a/tmux/.tmux/plugins/tmux-wttr +++ /dev/null @@ -1 +0,0 @@ -Subproject commit f77ec668349275c8fb3484c6edc65e809998f2cd diff --git a/tmux/.tmux/plugins/tmux-yank b/tmux/.tmux/plugins/tmux-yank deleted file mode 160000 index acfd36e..0000000 --- a/tmux/.tmux/plugins/tmux-yank +++ /dev/null @@ -1 +0,0 @@ -Subproject commit acfd36e4fcba99f8310a7dfb432111c242fe7392 diff --git a/tmux/.tmux/plugins/tpm b/tmux/.tmux/plugins/tpm deleted file mode 160000 index 99469c4..0000000 --- a/tmux/.tmux/plugins/tpm +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 99469c4a9b1ccf77fade25842dc7bafbc8ce9946 diff --git a/tmux/.tmux/plugins/vim-tmux-navigator b/tmux/.tmux/plugins/vim-tmux-navigator deleted file mode 160000 index 412c474..0000000 --- a/tmux/.tmux/plugins/vim-tmux-navigator +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 412c474e97468e7934b9c217064025ea7a69e05e diff --git a/tmux/.tmux/tpm b/tmux/.tmux/tpm deleted file mode 160000 index 99469c4..0000000 --- a/tmux/.tmux/tpm +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 99469c4a9b1ccf77fade25842dc7bafbc8ce9946