From 66b4cbc2bc7b2d0bb7acc28bea50ac1ca4bc97dd Mon Sep 17 00:00:00 2001 From: Joao P Dubas Date: Sun, 29 Sep 2024 11:45:00 +0000 Subject: [PATCH 1/4] feat: add tmux sessionizer utility This is an experiment in use another type o session manager in the place of `tmuxp`. --- Dockerfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 18da2f4..bf519b6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -162,7 +162,8 @@ ENV MISE_ENV_FILE .env RUN curl https://mise.jdx.dev/install.sh | sh \ && curl -sS https://raw.githubusercontent.com/ajeetdsouza/zoxide/main/install.sh | bash \ && curl -sS https://raw.githubusercontent.com/atuinsh/atuin/main/install.sh | bash \ - && git clone https://github.com/tmux-plugins/tpm.git ${XDG_CONFIG_HOME}/tmux/plugins/tpm + && git clone https://github.com/tmux-plugins/tpm.git ${XDG_CONFIG_HOME}/tmux/plugins/tpm \ + && curl --proto '=https' --tlsv1.2 -LsSf https://github.com/jrmoulton/tmux-sessionizer/releases/download/v0.4.2/tmux-sessionizer-installer.sh | sh # configure fish and bash RUN fish -c true \ @@ -243,3 +244,4 @@ RUN git config --global user.email "${GIT_USER_EMAIL}" \ COPY ./scripts/docker-entrypoint.sh /usr/local/bin/docker-entrypoint COPY ./scripts/elixir-ls-setup.sh /usr/local/bin/elixir-ls-setup + -- 2.47.2 From ca63589a6e7b776a21dc3e3c9272b3f92af02e9a Mon Sep 17 00:00:00 2001 From: Joao P Dubas Date: Sun, 29 Sep 2024 11:46:39 +0000 Subject: [PATCH 2/4] chore: upgrade docker and siblings * `docker` from 27.1.1 to 27.3.1 * `compose` from 2.29.1 to 2.29.7 * `buildx` from 0.16.2 to 0.17.1 --- Dockerfile | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index bf519b6..2d1bf70 100644 --- a/Dockerfile +++ b/Dockerfile @@ -105,11 +105,11 @@ RUN apt-get update \ && echo 'permit persist :wheel as root' > /etc/doas.conf # command line utilities -ENV DO_VERSION 27.1.1 +ENV DO_VERSION 27.3.1 ENV DO_URL https://download.docker.com/linux/static/stable/x86_64/docker-${DO_VERSION}.tgz -ENV DC_VERSION v2.29.1 +ENV DC_VERSION v2.29.7 ENV DC_URL https://github.com/docker/compose/releases/download/${DC_VERSION}/docker-compose-linux-x86_64 -ENV BX_VERSION v0.16.2 +ENV BX_VERSION v0.17.1 ENV BX_URL https://github.com/docker/buildx/releases/download/${BX_VERSION}/buildx-${BX_VERSION}.linux-amd64 RUN curl -sS https://starship.rs/install.sh | sh -s -- --yes \ && mkdir /tmp/download \ @@ -244,4 +244,3 @@ RUN git config --global user.email "${GIT_USER_EMAIL}" \ COPY ./scripts/docker-entrypoint.sh /usr/local/bin/docker-entrypoint COPY ./scripts/elixir-ls-setup.sh /usr/local/bin/elixir-ls-setup - -- 2.47.2 From 33ca5dfe01c9265c45ac5b1c03f15acba31c0104 Mon Sep 17 00:00:00 2001 From: Joao P Dubas Date: Sun, 29 Sep 2024 12:23:56 +0000 Subject: [PATCH 3/4] chore(tmux): remove commented lines from config --- config/tmux/tmux.conf | 42 ------------------------------------------ 1 file changed, 42 deletions(-) diff --git a/config/tmux/tmux.conf b/config/tmux/tmux.conf index 7874329..d5745da 100644 --- a/config/tmux/tmux.conf +++ b/config/tmux/tmux.conf @@ -42,10 +42,6 @@ set -g status-bg black set -g status-fg white # set -g status-left "#$" -# Highlight the active window in the status bar -# set-window-option -g window-status-current-bg yellow -# set-window-option -g window-status-current-fg black - # Don't prompt to kill panes/windows bind-key x kill-pane bind-key & kill-window @@ -59,38 +55,6 @@ bind r source-file ~/.config/tmux/tmux.conf\; display "Reloaded conf." set -g default-terminal "tmux-256color" set -sg terminal-overrides ",*:RGB" -#### COLOUR (Solarized 256) - -# default statusbar colors -# set-option -g status-bg colour235 #base02 -# set-option -g status-fg colour136 #yellow -# set-option -g status-attr default - -# default window title colors -# set-window-option -g window-status-fg colour244 #base0 -# set-window-option -g window-status-bg default -# set-window-option -g window-status-attr dim - -# active window title colors -# set-window-option -g window-status-current-fg colour166 #orange -# set-window-option -g window-status-current-bg default -# set-window-option -g window-status-current-attr bright - -# pane border -# set-option -g pane-border-fg colour235 #base02 -# set-option -g pane-active-border-fg colour240 #base01 - -# message text -# set-option -g message-bg colour235 #base02 -# set-option -g message-fg colour166 #orange - -# pane number display -# set-option -g display-panes-active-colour colour33 #blue -# set-option -g display-panes-colour colour166 #orange - -# clock -# set-window-option -g clock-mode-colour colour64 #green - # buffer size set -g history-limit 50000 @@ -99,12 +63,6 @@ set -g @plugin 'tmux-plugins/tpm' set -g @plugin 'fabioluciano/tmux-tokyo-night' set -g @plugin 'Morantron/tmux-fingers' set -g @plugin 'tmux-plugins/tmux-yank' -# set -g @plugin 'tmux-plugins/tmux-resurrect' -# set -g @plugin 'tmux-plugins/tmux-continuum' - -# configure resurrect/continuum -# set -g @continuum-save-interval '15' -# set -g @continuum-restore 'on' # load/install plugins run '~/.config/tmux/plugins/tpm/tpm' -- 2.47.2 From 947bb98d3d27612ae1fe8540cc6becd1757feb18 Mon Sep 17 00:00:00 2001 From: Joao P Dubas Date: Sun, 29 Sep 2024 12:24:38 +0000 Subject: [PATCH 4/4] chore(tmux): configure tms bindings --- config/tmux/tmux.conf | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/config/tmux/tmux.conf b/config/tmux/tmux.conf index d5745da..41c1edd 100644 --- a/config/tmux/tmux.conf +++ b/config/tmux/tmux.conf @@ -55,6 +55,11 @@ bind r source-file ~/.config/tmux/tmux.conf\; display "Reloaded conf." set -g default-terminal "tmux-256color" set -sg terminal-overrides ",*:RGB" +# tms shortcuts +bind C-o display-popup -E "tms" +bind C-j display-popup -E "tms switch" +bind C-w display-popup -E "tms windows" + # buffer size set -g history-limit 50000 -- 2.47.2