From ba711a55786e9510dd9c93d7b1542bf1112a9f95 Mon Sep 17 00:00:00 2001 From: Michael Yockey Date: Mon, 25 Mar 2024 09:52:45 -0400 Subject: [PATCH] Fix tmux tpm and cleanup --- install.zsh | 2 +- nvim/.config/nvim/lazy-lock.json | 16 ++++++++-------- tmux/.config/tmux/plugins/.gitignore | 3 +++ tmux/.config/tmux/plugins/.keep | 0 tmux/.config/tmux/plugins/tmux | 1 - tmux/.config/tmux/plugins/tmux-dark-notify | 1 - tmux/.config/tmux/plugins/tmux-sensible | 1 - tmux/.config/tmux/plugins/tpm | 1 - tmux/.config/tmux/plugins/vim-tmux-navigator | 1 - tmux/.config/tmux/tmux.conf | 2 +- tpm | 1 - 11 files changed, 13 insertions(+), 16 deletions(-) create mode 100644 tmux/.config/tmux/plugins/.gitignore create mode 100644 tmux/.config/tmux/plugins/.keep delete mode 160000 tmux/.config/tmux/plugins/tmux delete mode 160000 tmux/.config/tmux/plugins/tmux-dark-notify delete mode 160000 tmux/.config/tmux/plugins/tmux-sensible delete mode 160000 tmux/.config/tmux/plugins/tpm delete mode 160000 tmux/.config/tmux/plugins/vim-tmux-navigator delete mode 160000 tpm diff --git a/install.zsh b/install.zsh index 40efe9d..3dd5cd6 100755 --- a/install.zsh +++ b/install.zsh @@ -20,7 +20,7 @@ git -C geometry pull || git clone git@github.com:geometry-zsh/geometry.git geome popd echo "Installing TMUX plugins" -pushd ~/.tmux/plugins +pushd tmux/.config/tmux/plugins git -C tpm pull || git clone git@github.com:tmux-plugins/tpm.git tpm popd diff --git a/nvim/.config/nvim/lazy-lock.json b/nvim/.config/nvim/lazy-lock.json index b661dad..f2a9eaa 100644 --- a/nvim/.config/nvim/lazy-lock.json +++ b/nvim/.config/nvim/lazy-lock.json @@ -1,27 +1,27 @@ { - "cloak.nvim": { "branch": "main", "commit": "6e5bcd50bebc5cdb7cd3a00eb3d97ab7c4cc3b94" }, + "cloak.nvim": { "branch": "main", "commit": "462e84e1659d984196d09f7d16690b19b9aee804" }, "copilot.vim": { "branch": "release", "commit": "9484e35cf222e9360e05450622a884f95c662c4c" }, "flexoki": { "branch": "main", "commit": "975654bce67514114db89373539621cff42befb5" }, "friendly-snippets": { "branch": "main", "commit": "dcd4a586439a1c81357d5b9d26319ae218cc9479" }, "git-blame.nvim": { "branch": "master", "commit": "a0282d05adbee80aaf4e2ff35b81b52940b67bed" }, - "lazy.nvim": { "branch": "main", "commit": "af6afefbb46ab29a8a1db69536b04290a9403876" }, + "lazy.nvim": { "branch": "main", "commit": "83493db50a434a4c5c648faf41e2ead80f96e478" }, "lualine.nvim": { "branch": "master", "commit": "b5e8bb642138f787a2c1c5aedc2a78cb2cebbd67" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "9dfcf2036c223920826140f0151d929a43f9eceb" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "2ba17cecfde8b8c7c7c287909a1e4de895223df6" }, "mason.nvim": { "branch": "main", "commit": "751b1fcbf3d3b783fcf8d48865264a9bcd8f9b10" }, "nvim": { "branch": "main", "commit": "56fb98218d22d5c326387bf9e4076227e7372e6b" }, "nvim-dap": { "branch": "master", "commit": "c1695e500c7d552a0a19953a9aefcc89178fb1af" }, "nvim-dap-ruby": { "branch": "main", "commit": "a2248b7b31f6f096b9e847e769afd00060e0aae4" }, "nvim-dap-ui": { "branch": "master", "commit": "edfa93f60b189e5952c016eee262d0685d838450" }, - "nvim-lspconfig": { "branch": "master", "commit": "24662f92c18edd397ef12d635b11dbdedef2d094" }, - "nvim-nio": { "branch": "master", "commit": "33c62b3eadd8154169e42144de16ba4db6784bec" }, + "nvim-lspconfig": { "branch": "master", "commit": "d67715d3b746a19e951b6b0a99663fa909bb9e64" }, + "nvim-nio": { "branch": "master", "commit": "7054695117581bdb0183b8d27d8d82b4a2ac8958" }, "nvim-surround": { "branch": "main", "commit": "84a26afce16cffa7e3322cfa80a42cddf60616eb" }, "nvim-tmux-navigation": { "branch": "main", "commit": "4898c98702954439233fdaf764c39636681e2861" }, - "nvim-treesitter": { "branch": "master", "commit": "8532b1d941b5859b4844310fa71d6db0f633be33" }, - "nvim-web-devicons": { "branch": "master", "commit": "585b2dc4bba2b5973f2b1d3e576709af5ac34fb6" }, + "nvim-treesitter": { "branch": "master", "commit": "722617e6726c1508adadf83d531f54987c703be0" }, + "nvim-web-devicons": { "branch": "master", "commit": "cb0c967c9723a76ccb1be0cc3a9a10e577d2f6ec" }, "plenary.nvim": { "branch": "master", "commit": "f7adfc4b3f4f91aab6caebf42b3682945fbc35be" }, "rspec.nvim": { "branch": "main", "commit": "304682100b152071c2186994690c9646a5d46e05" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "9ef21b2e6bb6ebeaf349a0781745549bbb870d27" }, - "telescope.nvim": { "branch": "master", "commit": "1e591885751d255b12c3649253cb6c2838e2c724" }, + "telescope.nvim": { "branch": "master", "commit": "221778e93bfaa58bce4be4e055ed2edecc26f799" }, "todo-comments.nvim": { "branch": "main", "commit": "833d8dd8b07eeda37a09e99460f72a02616935cb" }, "undotree": { "branch": "master", "commit": "aa93a7e5890dbbebbc064cd22260721a6db1a196" }, "which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" } diff --git a/tmux/.config/tmux/plugins/.gitignore b/tmux/.config/tmux/plugins/.gitignore new file mode 100644 index 0000000..1c0813e --- /dev/null +++ b/tmux/.config/tmux/plugins/.gitignore @@ -0,0 +1,3 @@ +* +!.gitignore +!.keep diff --git a/tmux/.config/tmux/plugins/.keep b/tmux/.config/tmux/plugins/.keep new file mode 100644 index 0000000..e69de29 diff --git a/tmux/.config/tmux/plugins/tmux b/tmux/.config/tmux/plugins/tmux deleted file mode 160000 index e80cb73..0000000 --- a/tmux/.config/tmux/plugins/tmux +++ /dev/null @@ -1 +0,0 @@ -Subproject commit e80cb735bbcd264ff971fdf7e58b219b60286c81 diff --git a/tmux/.config/tmux/plugins/tmux-dark-notify b/tmux/.config/tmux/plugins/tmux-dark-notify deleted file mode 160000 index 4a205f8..0000000 --- a/tmux/.config/tmux/plugins/tmux-dark-notify +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 4a205f86b64cfd45448be791ce133172c3f11c56 diff --git a/tmux/.config/tmux/plugins/tmux-sensible b/tmux/.config/tmux/plugins/tmux-sensible deleted file mode 160000 index 25cb91f..0000000 --- a/tmux/.config/tmux/plugins/tmux-sensible +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 25cb91f42d020f675bb0a2ce3fbd3a5d96119efa diff --git a/tmux/.config/tmux/plugins/tpm b/tmux/.config/tmux/plugins/tpm deleted file mode 160000 index 99469c4..0000000 --- a/tmux/.config/tmux/plugins/tpm +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 99469c4a9b1ccf77fade25842dc7bafbc8ce9946 diff --git a/tmux/.config/tmux/plugins/vim-tmux-navigator b/tmux/.config/tmux/plugins/vim-tmux-navigator deleted file mode 160000 index 38b1d04..0000000 --- a/tmux/.config/tmux/plugins/vim-tmux-navigator +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 38b1d0402c4600543281dc85b3f51884205674b6 diff --git a/tmux/.config/tmux/tmux.conf b/tmux/.config/tmux/tmux.conf index cebfb42..c08070a 100644 --- a/tmux/.config/tmux/tmux.conf +++ b/tmux/.config/tmux/tmux.conf @@ -15,7 +15,7 @@ set -g @plugin 'tmux-plugins/tmux-sensible' set -g @plugin 'catppuccin/tmux' set -g @plugin 'christoomey/vim-tmux-navigator' -run '~/.tmux/plugins/tpm/tpm' +run '~/.config/tmux/plugins/tpm/tpm' set-window-option -g mode-keys vi bind-key -T copy-mode-vi v send-keys -X begin-selection diff --git a/tpm b/tpm deleted file mode 160000 index 99469c4..0000000 --- a/tpm +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 99469c4a9b1ccf77fade25842dc7bafbc8ce9946