feat(tmux): install tmux plugin manager

Also update tmux config to reflect this change, and mount a plugin dir.

Dockerfile

@@ -59,6 +59,8 @@ RUN apt-get update \
     python3-openssl \
     sudo \
     tk-dev \
+    tmux \
+    tmuxp \
     unixodbc-dev \
     unzip \
     uuid-dev \
@@ -130,14 +132,15 @@ ENV SHELL /usr/bin/bash
 
 # command line utilities
 RUN curl https://rtx.pub/install.sh | sh \
-  && curl -sS https://raw.githubusercontent.com/ajeetdsouza/zoxide/main/install.sh | bash
+  && curl -sS https://raw.githubusercontent.com/ajeetdsouza/zoxide/main/install.sh | bash \
+  && git clone https://github.com/tmux-plugins/tpm.git ${XDG_CONFIG_HOME}/tmux/plugins/tpm
 
 # git configuration
 COPY ./patch/kickstart.nvim/updates.patch /tmp
 COPY ./config/nvim/lua/custom/plugins/init.lua /tmp
 RUN git clone https://github.com/nvim-lua/kickstart.nvim.git "${XDG_CONFIG_HOME}"/nvim \
   && cd ${XDG_CONFIG_HOME}/nvim \
-  && git reset --hard 313bd75ca04cb2cef48a79ac3ad697a1b9a2daab \
+  && git reset --hard 9b256d93688b3d295dab89f06faeff741af58a68 \
   && git apply /tmp/updates.patch \
   && cp /tmp/init.lua ${XDG_CONFIG_HOME}/nvim/lua/custom/plugins \
   && nvim --headless "+Lazy! sync" +qa

config/tmux/tmux.conf

@@ -0,0 +1,99 @@
+# Based on:
+# https://github.com/henrik/dotfiles/blob/master/tmux.conf
+
+# Remap Prefix to C-a
+unbind C-b
+set -g prefix C-a
+
+# Improve pane split
+bind | split-window -h
+bind - split-window -v
+
+# Improve pane move
+bind h select-pane -L
+bind j select-pane -D
+bind k select-pane -U
+bind l select-pane -R
+
+# Improve window move
+bind -r C-h select-window -t :-
+bind -r C-l select-window -t :+
+
+# Improve resize pane
+bind -r H resize-pane -L 5
+bind -r J resize-pane -D 5
+bind -r K resize-pane -U 5
+bind -r L resize-pane -R 5
+
+# Enable vim keys
+set-window-option -g mode-keys vi
+
+# Make [shift]-arrows, [ctrl]-arrows, etc work in vim
+set -g xterm-keys on
+
+# Attempt to fixes slows [esc] issues
+set -s escape-time 0
+
+# Disable mouse
+# set -g mode-mouse off
+
+# Status bar styling and content
+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
+
+# Reload tmux conf
+unbind r
+bind r source-file ~/.tmux.conf\; display "Reloaded conf."
+
+# Full color for vim
+set -g default-terminal "screen-256color"
+
+#### 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
+
+# list plugins
+set -g @plugin 'tmux-plugins/tpm'
+set -g @plugin 'Morantron/tmux-fingers'
+set -g @plugin 'tmux-plugins/tmux-yank'
+run '~/.config/tmux/plugins/tpm/tpm'

config/tmuxp/dev.yml

@@ -0,0 +1,23 @@
+---
+session_name: dev
+start_directory: /opt/work
+windows:
+  - window_name: main
+    layout: even-vertical
+    focus: true
+    panes:
+      - focus: true
+      - pane
+  - window_name: support
+    layout: even-vertical
+    start_directory: support
+    panes:
+      - shell_command:
+        - docker compose exec pgcli bash
+      - pane
+  - window_name: local
+    layout: even-vertical
+    start_directory: local
+    panes:
+      - pane
+      - pane

config/tmuxp/work.yml

@@ -0,0 +1,15 @@
+session_name: personal
+start_directory: /opt/personal
+windows:
+  - window_name: labs
+    focus: true
+    layout: even-vertical
+    start_directory: labs/
+    panes:
+      - focus: true
+      - pane 
+  - window_name: ide
+    layout: even-vertical
+    panes:
+    - focus: true
+    - pane

docker-compose.yml

@@ -9,11 +9,15 @@ services:
     entrypoint: sleep
     command: infinity
     volumes:
+      - './config/rtx:/home/coder/.config/rtx'
+      - './config/tmux:/home/coder/.config/tmux'
+      - './config/tmuxp:/home/coder/.config/tmuxp'
+      - './config/nvim/lua/custom:/home/coder/.config/nvim/lua/custom'
       - 'home_cache:/home/coder/.cache'
       - 'home_local_share:/home/coder/.local/share'
-      - './config/rtx:/home/coder/.config/rtx'
+      - 'home_plugins_tmux:/home/coder/.config/tmux/plugins'
-      - './config/nvim/lua/custom:/home/coder/.config/nvim/lua/custom'
 
 volumes:
   home_cache: {}
   home_local_share: {}
+  home_plugins_tmux: {}

patch/kickstart.nvim/updates.patch

@@ -1,8 +1,8 @@
 diff --git a/init.lua b/init.lua
-index 5257113..85e97a5 100644
+index a7667dd..6bf8654 100644
 --- a/init.lua
 +++ b/init.lua
-@@ -219,7 +219,7 @@ require('lazy').setup({
+@@ -227,7 +227,7 @@ require('lazy').setup({
    --    Uncomment the following line and add your plugins to `lua/custom/plugins/*.lua` to get going.
    --
    --    For additional information see: https://github.com/folke/lazy.nvim#-structuring-your-plugins
@@ -11,7 +11,7 @@ index 5257113..85e97a5 100644
  }, {})
  
  -- [[ Setting options ]]
-@@ -229,11 +229,12 @@ require('lazy').setup({
+@@ -237,11 +237,12 @@ require('lazy').setup({
  -- Set highlight on search
  vim.o.hlsearch = false
  
@@ -27,7 +27,7 @@ index 5257113..85e97a5 100644
  
  -- Sync clipboard between OS and Neovim.
  --  Remove this option if you want your OS clipboard to remain independent.
-@@ -263,6 +264,14 @@ vim.o.completeopt = 'menuone,noselect'
+@@ -271,6 +272,14 @@ vim.o.completeopt = 'menuone,noselect'
  -- NOTE: You should make sure your terminal supports this
  vim.o.termguicolors = true
  
@@ -42,40 +42,40 @@ index 5257113..85e97a5 100644
  -- [[ Basic Keymaps ]]
  
  -- Keymaps for better default experience
-@@ -323,11 +332,29 @@ vim.keymap.set('n', '<leader>sr', require('telescope.builtin').resume, { desc =
+@@ -333,11 +342,29 @@ vim.keymap.set('n', '<leader>sr', require('telescope.builtin').resume, { desc =
- -- See `:help nvim-treesitter`
+ vim.defer_fn(function()
- require('nvim-treesitter.configs').setup {
+   require('nvim-treesitter.configs').setup {
-   -- Add languages to be installed here that you want installed for treesitter
+     -- Add languages to be installed here that you want installed for treesitter
--  ensure_installed = { 'c', 'cpp', 'go', 'lua', 'python', 'rust', 'tsx', 'javascript', 'typescript', 'vimdoc', 'vim' },
+-    ensure_installed = { 'c', 'cpp', 'go', 'lua', 'python', 'rust', 'tsx', 'javascript', 'typescript', 'vimdoc', 'vim', 'bash' },
 -
-+  ensure_installed = {
++    ensure_installed = {
-+    'css',
++      'css',
-+    'dockerfile',
++      'dockerfile',
-+    'eex',
++      'eex',
-+    'elixir',
++      'elixir',
-+    'erlang',
++      'erlang',
-+    'go',
++      'go',
-+    'heex',
++      'heex',
-+    'html',
++      'html',
-+    'http',
++      'http',
-+    'javascript',
++      'javascript',
-+    'json',
++      'json',
-+    'lua',
++      'lua',
-+    'markdown',
++      'markdown',
-+    'python',
++      'python',
-+    'sql',
++      'sql',
-+    'tsx',
++      'tsx',
-+    'typescript',
++      'typescript',
-+    'vim',
++      'vim',
-+    'vimdoc'
++      'vimdoc'
-+  },
++    },
-   -- Autoinstall languages that are not installed. Defaults to false (but you can change for yourself!)
+     -- Autoinstall languages that are not installed. Defaults to false (but you can change for yourself!)
-   auto_install = false,
+     auto_install = false,
 -
-   highlight = { enable = true },
+     highlight = { enable = true },
-   indent = { enable = true },
+     indent = { enable = true },
-   incremental_selection = {
+     incremental_selection = {
-@@ -456,19 +483,24 @@ require('which-key').register({
+@@ -472,19 +499,24 @@ require('mason-lspconfig').setup()
  --  If you want to override the default filetypes that your language server will attach to you can
  --  define the property 'filetypes' to the map in question.
  local servers = {