From 6cb0744e92bdf9696781879e61d849b3a1f900f1 Mon Sep 17 00:00:00 2001
From: Michael Housh <mhoush@houshhomeenergy.com>
Date: Tue, 3 Oct 2023 08:34:06 -0400
Subject: [PATCH] Updated tmux config for prefix-S to switch sessions

---
 nvim/m-housh/lazy-lock.json      | 14 +++++++-------
 scripts/scripts/tmux-sessionator |  2 +-
 scripts/scripts/ts               | 13 ++++++++-----
 tmux/tmux.conf                   |  4 +---
 4 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/nvim/m-housh/lazy-lock.json b/nvim/m-housh/lazy-lock.json
index 7a4cafe..c9cef18 100644
--- a/nvim/m-housh/lazy-lock.json
+++ b/nvim/m-housh/lazy-lock.json
@@ -12,32 +12,32 @@
   "cmp_luasnip": { "branch": "master", "commit": "18095520391186d634a0045dacaa346291096566" },
   "formatter.nvim": { "branch": "master", "commit": "34dcdfa0c75df667743b2a50dd99c84a557376f0" },
   "friendly-snippets": { "branch": "main", "commit": "43727c2ff84240e55d4069ec3e6158d74cb534b6" },
-  "go.nvim": { "branch": "master", "commit": "54387e506e597ab65a89baa1681429728f66ed71" },
+  "go.nvim": { "branch": "master", "commit": "2f573a297bea3a483a3607ae7c607a8a08d27993" },
   "guihua.lua": { "branch": "master", "commit": "5ad8dba19ce9b9fd8965598984dfdc9c119f97e4" },
-  "lazy.nvim": { "branch": "main", "commit": "59335c5b9d116f5d3948f833288a89e2a829a005" },
+  "lazy.nvim": { "branch": "main", "commit": "6a2c47e6424a3f1e373bfeb714b716f6be13501c" },
   "lazygit.nvim": { "branch": "main", "commit": "de35012036d43bca03628d40d083f7c02a4cda3f" },
   "lsp_signature.nvim": { "branch": "master", "commit": "bdf3dc7bb03edd25c2173e0e31c2fb122052ed23" },
   "lspkind-nvim": { "branch": "master", "commit": "57610d5ab560c073c465d6faf0c19f200cb67e6e" },
   "lualine.nvim": { "branch": "master", "commit": "45e27ca739c7be6c49e5496d14fcf45a303c3a63" },
-  "mason-lspconfig.nvim": { "branch": "main", "commit": "e2705063f395b44f676cd26596a11007a2cbd3bd" },
+  "mason-lspconfig.nvim": { "branch": "main", "commit": "81e30dd629de24cbb26d08073ee938ab40006695" },
   "mason.nvim": { "branch": "main", "commit": "d66c60e17dd6fd8165194b1d14d21f7eb2c1697a" },
   "neo-tree.nvim": { "branch": "v3.x", "commit": "71f1841ba6c652908678cece623f52c1fea8a6cd" },
-  "neodev.nvim": { "branch": "main", "commit": "5147640bc8435ca3557a105ebd1143bc20420b60" },
+  "neodev.nvim": { "branch": "main", "commit": "58b1c0740e8ad79ce71e2649a449bb90536435cf" },
   "nightfox.nvim": { "branch": "main", "commit": "fe2fc7b93d66349eff2c5baa6cec922ee3958f56" },
   "noice.nvim": { "branch": "main", "commit": "396f9146529130904e07c45e90ecdbfa607534f3" },
   "nui.nvim": { "branch": "main", "commit": "c8de23342caf8d50b15d6b28368d36a56a69d76f" },
   "nvim-cmp": { "branch": "main", "commit": "5dce1b778b85c717f6614e3f4da45e9f19f54435" },
   "nvim-lsp-installer": { "branch": "main", "commit": "17e0bfa5f2c8854d1636fcd036dc8284db136baa" },
-  "nvim-lspconfig": { "branch": "master", "commit": "ac478757efcde1ac346f7044ab774e7cbb482533" },
+  "nvim-lspconfig": { "branch": "master", "commit": "61b40df9c17943e43e7e698873caab0e7dbcdadc" },
   "nvim-notify": { "branch": "master", "commit": "e4a2022f4fec2d5ebc79afa612f96d8b11c627b3" },
-  "nvim-treesitter": { "branch": "master", "commit": "d96c216c54cc2d48d3c66ba7f0fc3c7c5b71b3b1" },
+  "nvim-treesitter": { "branch": "master", "commit": "16ea2969ea0a5ba902fceece9b2db10c7c9ba2d6" },
   "nvim-treesitter-textobjects": { "branch": "master", "commit": "bd103502252027434ec42f628d2dbf54821d4ce6" },
   "nvim-web-devicons": { "branch": "master", "commit": "45d0237c427baba8cd05e0ab26d30e2ee58c2c82" },
   "plenary.nvim": { "branch": "master", "commit": "9ce85b0f7dcfe5358c0be937ad23e456907d410b" },
   "swift.nvim": { "branch": "main", "commit": "a84cb608b0076aef39d3d4b1d20448a86a73b2eb" },
   "telescope-fzf-native.nvim": { "branch": "main", "commit": "6c921ca12321edaa773e324ef64ea301a1d0da62" },
   "telescope.nvim": { "branch": "0.1.x", "commit": "54930e1abfc94409e1bb9266e752ef8379008592" },
-  "toggleterm.nvim": { "branch": "main", "commit": "c80844fd52ba76f48fabf83e2b9f9b93273f418d" },
+  "toggleterm.nvim": { "branch": "main", "commit": "61e8ad370d4da5d84c77e31671027bc094ac06ca" },
   "which-key.nvim": { "branch": "main", "commit": "7ccf476ebe0445a741b64e36c78a682c1c6118b7" },
   "wrapping.nvim": { "branch": "master", "commit": "e1ce68aae5ea729fc20e5bc17fb569314f76b9bb" },
   "zen-mode.nvim": { "branch": "main", "commit": "68f554702de63f4b7b6b6d4bcb10178f41a0acc7" }
diff --git a/scripts/scripts/tmux-sessionator b/scripts/scripts/tmux-sessionator
index 8c74e73..817fdb6 100755
--- a/scripts/scripts/tmux-sessionator
+++ b/scripts/scripts/tmux-sessionator
@@ -5,7 +5,7 @@
 if [[ $# -eq 1 ]]; then
   selected=$1
 else
-  selected=$(find ~/LocalProjects ~/ -mindepth 1 -maxdepth 1 -type d | fzf)
+  selected=$(find ~/projects ~/ -mindepth 1 -maxdepth 1 -type d | fzf)
 fi
 
 if [[ -z $selected ]]; then
diff --git a/scripts/scripts/ts b/scripts/scripts/ts
index 7e7e968..95d7635 100755
--- a/scripts/scripts/ts
+++ b/scripts/scripts/ts
@@ -1,10 +1,13 @@
 #!/bin/sh
 
-session=${1}
+if [ $# -eq 1 ]; then
+  session=${1}
+else
+  session=$(tmux list-sessions -F \#S | gum filter --placeholder "Pick a session...")
+fi
 
 if [ -z "$session" ]; then
-  choice=$(tmux list-sessions -F \#S | gum filter --placeholder "Pick a session...")
-  tmux switch-client -t "$choice" || tmux attach -t "$choice"
-else
-  tmux switch-client -t "$session" || tmux attach -t "$session"
+  exit 0
 fi
+
+tmux switch-client -t "$session" || tmux attach -t "$session"
diff --git a/tmux/tmux.conf b/tmux/tmux.conf
index 7331a78..48bb462 100644
--- a/tmux/tmux.conf
+++ b/tmux/tmux.conf
@@ -64,8 +64,6 @@ bind -T prefix k select-pane -U
 bind -T prefix h select-pane -L
 bind -T prefix l select-pane -R
 bind-key -r K kill-pane
-bind-key -r ! break-pane -d -n _hidden_pane
-bind-key -r @ join-pane -s $.1
 
 # Use Shift-arrow keys to navigate windows.
 bind -n S-Left previous-window
@@ -73,7 +71,7 @@ bind -n S-Right next-window
 
 bind-key -r f run-shell "tmux neww ~/.local/scripts/tmux-sessionator"
 bind-key -r C run-shell "tmux neww ~/.local/scripts/tmux-sessionator ~/.dotfiles"
-bind-key -r S run-shell "tmux neww ~/.local/scripts/ts"
+bind-key -r S run-shell -b "~/.config/tmux/plugins/tmux-fzf/scripts/session.sh switch"
 
 # reload new changes
 bind-key r source-file ~/.config/tmux/tmux.conf\; \display-message "source-file done"