From 49524fef661af218646c17a30a0988d10f360095 Mon Sep 17 00:00:00 2001
From: Michael Housh <mhoush@houshhomeenergy.com>
Date: Thu, 14 Nov 2024 16:26:35 -0500
Subject: [PATCH] feat: Updates to nvim config and git config

---
 git/git/config                             |  3 ++-
 nvim/m-housh/lua/user/plugin/harpoon.lua   |  8 ++++----
 nvim/m-housh/lua/user/plugin/swift.lua     |  4 ++--
 nvim/m-housh/lua/user/plugin/telescope.lua |  3 +++
 nvim/m-housh/lua/user/plugins.lua          | 22 ++++++++++++----------
 5 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/git/git/config b/git/git/config
index 36b3dc2..2ef093e 100644
--- a/git/git/config
+++ b/git/git/config
@@ -24,4 +24,5 @@
 
 [credential "https://git.housh.dev"]
 	username = michael
-
+[push]
+	autoSetupRemote = true
diff --git a/nvim/m-housh/lua/user/plugin/harpoon.lua b/nvim/m-housh/lua/user/plugin/harpoon.lua
index 0bc0834..824f1d9 100644
--- a/nvim/m-housh/lua/user/plugin/harpoon.lua
+++ b/nvim/m-housh/lua/user/plugin/harpoon.lua
@@ -53,19 +53,19 @@ return {
     -- with the <Control> key.
 
     -- Select buffer numbers.
-    vim.keymap.set("n", "<C-y>",
+    vim.keymap.set("n", "<C-S-Y>",
       function() harpoon:list():select(1) end,
       { desc = "Select first harpoon buffer." }
     )
-    vim.keymap.set("n", "<C-u>",
+    vim.keymap.set("n", "<C-S-U>",
       function() harpoon:list():select(2) end,
       { desc = "Select second harpoon buffer." }
     )
-    vim.keymap.set("n", "<C-i>",
+    vim.keymap.set("n", "<C-S-I>",
       function() harpoon:list():select(3) end,
       { desc = "Select third harpoon buffer." }
     )
-    vim.keymap.set("n", "<C-o>",
+    vim.keymap.set("n", "<C-S-O>",
       function() harpoon:list():select(3) end,
       { desc = "Select third harpoon buffer." }
     )
diff --git a/nvim/m-housh/lua/user/plugin/swift.lua b/nvim/m-housh/lua/user/plugin/swift.lua
index 129d4db..14e140a 100755
--- a/nvim/m-housh/lua/user/plugin/swift.lua
+++ b/nvim/m-housh/lua/user/plugin/swift.lua
@@ -9,7 +9,7 @@ return {
       local default_options = { noremap = true, silent = true }
       local actions = require('swift.actions')
 
-      vim.keymap.set('n', '<c-b>', actions.build, default_options)
-      vim.keymap.set('n', '<c-u>', actions.test, default_options)
+      vim.keymap.set('n', '<C-b>', actions.build, default_options)
+      vim.keymap.set('n', '<C-S-U>', actions.test, default_options)
     end
   }
diff --git a/nvim/m-housh/lua/user/plugin/telescope.lua b/nvim/m-housh/lua/user/plugin/telescope.lua
index 54515c0..ce6e126 100755
--- a/nvim/m-housh/lua/user/plugin/telescope.lua
+++ b/nvim/m-housh/lua/user/plugin/telescope.lua
@@ -7,6 +7,7 @@ return {
   lazy = true,
   config = function()
     local actions = require('telescope.actions')
+    local builtin = require('telescope.builtin')
 
     require('telescope').setup({
       defaults = {
@@ -68,5 +69,7 @@ return {
         buffer_previewer_maker = require'telescope.previewers'.buffer_previewer_maker
       }
     })
+
+    vim.keymap.set("n", "<C-A-j>", builtin.jumplist, { silent = true, noremap = true, desc = "Open [J]ump List."})
   end
 }
diff --git a/nvim/m-housh/lua/user/plugins.lua b/nvim/m-housh/lua/user/plugins.lua
index 2bcb823..c6c1b3b 100755
--- a/nvim/m-housh/lua/user/plugins.lua
+++ b/nvim/m-housh/lua/user/plugins.lua
@@ -27,16 +27,6 @@ require("lazy").setup({
   -- Git --
   { import = 'user.plugin.lazygit' },
 
-  -- LSP, formatting, etc. --
-  { 'folke/neodev.nvim', opts = {} },
-  { import = 'user.plugin.lsp' },
-  { import = 'user.plugin.lualine' },
-  { import = 'user.plugin.treesitter' },
-  { import = 'user.plugin.formatter' },
-  { import = 'user.plugin.go' },
-  { import = 'user.plugin.nvim-lint' },
-  --{'fladson/vim-kitty', lazy=true, },
-
   -- Navigation --
   { import = 'user.plugin.neo-tree' },
   { import = 'user.plugin.telescope' },
@@ -71,4 +61,16 @@ require("lazy").setup({
     end
   },
 
+  -- LSP, formatting, etc. --
+  { 'folke/neodev.nvim', opts = {} },
+  { import = 'user.plugin.lsp' },
+  { import = 'user.plugin.lualine' },
+  { import = 'user.plugin.treesitter' },
+  { import = 'user.plugin.formatter' },
+  { import = 'user.plugin.go' },
+  { import = 'user.plugin.nvim-lint' },
+  --{'fladson/vim-kitty', lazy=true, },
+
+
+
 })