From 2d6153eab94c591fe1155a6a6241a633de3dfeb6 Mon Sep 17 00:00:00 2001
From: Tyler Hallada <tyler@hallada.net>
Date: Fri, 1 Dec 2023 15:26:02 -0500
Subject: [PATCH] Fix fugitive mappings, add tpope and just file plugins

---
 lazy-lock.json             |  7 +++++++
 lua/plugins/fugitive.lua   | 31 +++++++++++++++++--------------
 lua/plugins/just.lua       |  5 +++++
 lua/plugins/tpope.lua      |  6 ++++++
 lua/plugins/treesitter.lua |  6 ++++++
 5 files changed, 41 insertions(+), 14 deletions(-)
 create mode 100644 lua/plugins/just.lua
 create mode 100644 lua/plugins/tpope.lua
 create mode 100644 lua/plugins/treesitter.lua

diff --git a/lazy-lock.json b/lazy-lock.json
index 93029dc..47f5848 100644
--- a/lazy-lock.json
+++ b/lazy-lock.json
@@ -78,13 +78,20 @@
   "todo-comments.nvim": { "branch": "main", "commit": "4a6737a8d70fe1ac55c64dfa47fcb189ca431872" },
   "toggleterm.nvim": { "branch": "main", "commit": "faee9d60428afc7857e0927fdc18daa6c409fa64" },
   "tokyonight.nvim": { "branch": "main", "commit": "f247ee700b569ed43f39320413a13ba9b0aef0db" },
+  "tree-sitter-just": { "branch": "main", "commit": "4e5f5f3ff37b12a1bbf664eb3966b3019e924594" },
   "treesj": { "branch": "main", "commit": "1d6e89f4790aa04eaae38fa9460a3ee191961c96" },
   "trouble.nvim": { "branch": "main", "commit": "f1168feada93c0154ede4d1fe9183bf69bac54ea" },
   "true-zen.nvim": { "branch": "main", "commit": "2b9e210e0d1a735e1fa85ec22190115dffd963aa" },
   "venv-selector.nvim": { "branch": "main", "commit": "c259dacb20a00fb84ec6006e9a24b4085b27120a" },
+  "vim-eunuch": { "branch": "master", "commit": "67f3dd32b4dcd1c427085f42ff5f29c7adc645c6" },
   "vim-fugitive": { "branch": "master", "commit": "46eaf8918b347906789df296143117774e827616" },
   "vim-illuminate": { "branch": "master", "commit": "3bd2ab64b5d63b29e05691e624927e5ebbf0fb86" },
+  "vim-just": { "branch": "main", "commit": "fda7259fc3b16af1d16e467c1482aac3bcc4df9a" },
+  "vim-repeat": { "branch": "master", "commit": "24afe922e6a05891756ecf331f39a1f6743d3d5a" },
+  "vim-rhubarb": { "branch": "master", "commit": "ee69335de176d9325267b0fd2597a22901d927b1" },
+  "vim-sleuth": { "branch": "master", "commit": "1cc4557420f215d02c4d2645a748a816c220e99b" },
   "vim-startuptime": { "branch": "master", "commit": "454b3de856b7bd298700de33d79774ca9b9e3875" },
+  "vim-unimpaired": { "branch": "master", "commit": "6d44a6dc2ec34607c41ec78acf81657248580bf1" },
   "wezterm-types": { "branch": "main", "commit": "49f66ce40002f0ef881440c10f8854b02bb67c3f" },
   "which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" }
 }
\ No newline at end of file
diff --git a/lua/plugins/fugitive.lua b/lua/plugins/fugitive.lua
index ae683c3..51ec7bb 100644
--- a/lua/plugins/fugitive.lua
+++ b/lua/plugins/fugitive.lua
@@ -1,33 +1,36 @@
 return {
   "tpope/vim-fugitive",
+  dependencies = {
+    "tpope/vim-rhubarb",
+  },
   keys = {
-    { "<leader>gx", [[<Cmd>G<CR>]], { noremap = false, silent = true, desc = "Toggle [G]it status window" } },
-    { "<leader>gs", [[<Cmd>Git<CR>]], { noremap = false, silent = true, desc = "Toggle [G]it [S]tatus window" } },
+    { "<leader>gx", [[<Cmd>G<CR>]], { desc = "Toggle [G]it status window" } },
+    { "<leader>gs", [[<Cmd>Git<CR>]], { desc = "Toggle [G]it [S]tatus window" } },
     {
       "<leader>gfd",
       [[<Cmd>Gdiffsplit<CR>]],
-      { noremap = false, silent = true, desc = "[G]it [D]iff current file against index with [F]ugitive" },
+      { desc = "[G]it [D]iff current file against index with [F]ugitive" },
     },
-    { "<leader>gc", [[<Cmd>Git commit<CR>]], { noremap = false, silent = true, desc = "[G]it [C]ommit" } },
-    { "<leader>gb", [[<Cmd>Git blame -C<CR>]], { noremap = false, silent = true, desc = "[G]it [B]lame" } },
-    { "<leader>gp", [[<Cmd>Git push<CR>]], { noremap = false, silent = true, desc = "[G]it [P]ush" } },
-    { "<leader>gf", [[<Cmd>Git push --force<CR>]], { noremap = false, silent = true, desc = "[G]it [F]orce push" } },
-    { "<leader>gu", [[<Cmd>Git pull<CR>]], { noremap = false, silent = true, desc = "[G]it p[U]ll" } },
+    { "<leader>gc", [[<Cmd>Git commit<CR>]], { desc = "[G]it [C]ommit" } },
+    { "<leader>gb", [[<Cmd>Git blame -C<CR>]], { desc = "[G]it [B]lame" } },
+    { "<leader>gp", [[<Cmd>Git push<CR>]], { desc = "[G]it [P]ush" } },
+    { "<leader>gf", [[<Cmd>Git push --force<CR>]], { desc = "[G]it [F]orce push" } },
+    { "<leader>gu", [[<Cmd>Git pull<CR>]], { desc = "[G]it p[U]ll" } },
     {
       "<leader>gh",
       [[<Cmd>Git diff --cached<CR>]],
-      { noremap = false, silent = true, desc = "[G]it diff current staged changes" },
+      { desc = "[G]it diff current staged changes" },
     },
     {
       "<leader>go",
-      [[<Cmd>GBrowse<CR>]],
-      { noremap = false, silent = true, desc = "[B]rowse [G]it URL for fugitive object under cursor" },
+      "<cmd>GBrowse<CR>",
+      { desc = "[B]rowse [G]it URL for fugitive object under cursor" },
     },
     {
-      "v",
       "<leader>go",
-      [[<Cmd>'<,'>GBrowse<CR>]],
-      { noremap = false, silent = true, desc = "[B]rowse [G]it URL for selected lines" },
+      ":'<,'>GBrowse<CR>",
+      mode = "v",
+      { desc = "[B]rowse [G]it URL for selected lines", silent = true },
     },
   },
 }
diff --git a/lua/plugins/just.lua b/lua/plugins/just.lua
new file mode 100644
index 0000000..33a71bb
--- /dev/null
+++ b/lua/plugins/just.lua
@@ -0,0 +1,5 @@
+return {
+  "NoahTheDuke/vim-just",
+  event = { "BufReadPre", "BufNewFile" },
+  ft = { "\\cjustfile", "*.just", ".justfile" },
+}
diff --git a/lua/plugins/tpope.lua b/lua/plugins/tpope.lua
new file mode 100644
index 0000000..3b22f01
--- /dev/null
+++ b/lua/plugins/tpope.lua
@@ -0,0 +1,6 @@
+return {
+  "tpope/vim-unimpaired",
+  "tpope/vim-repeat",
+  "tpope/vim-eunuch",
+  "tpope/vim-sleuth",
+}
diff --git a/lua/plugins/treesitter.lua b/lua/plugins/treesitter.lua
new file mode 100644
index 0000000..2b336a2
--- /dev/null
+++ b/lua/plugins/treesitter.lua
@@ -0,0 +1,6 @@
+return {
+  "IndianBoy42/tree-sitter-just",
+  config = function()
+    require("tree-sitter-just").setup({})
+  end,
+}