From 2b14724909681b6d43bd80b55fae28bf0b5b4d83 Mon Sep 17 00:00:00 2001
From: Joao P Dubas <joao.dubas+gitea@gmail.com>
Date: Sun, 29 Sep 2024 12:34:50 +0000
Subject: [PATCH] feat(tmux): add tmux-sessionizer to manage git sessions (#78)

Also made the following changes:

* update `docker`, `compose`, and `buildx`
* remove commented lines from `tmux` config
Co-authored-by: Joao P Dubas <joao.dubas+gitea@gmail.com>
Co-committed-by: Joao P Dubas <joao.dubas+gitea@gmail.com>
---
 Dockerfile            |  9 +++++----
 config/tmux/tmux.conf | 45 ++++---------------------------------------
 2 files changed, 9 insertions(+), 45 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 18da2f4..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 \
@@ -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 \
diff --git a/config/tmux/tmux.conf b/config/tmux/tmux.conf
index 7874329..41c1edd 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,37 +55,10 @@ 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
+# 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
@@ -99,12 +68,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'