update Neovim plugins

.bashrc

@@ -29,6 +29,9 @@ fi
 if ! [[ "$PATH" =~ $HOME/.local/bin:$HOME/bin: ]]; then
     PATH="$HOME/.local/bin:$HOME/bin:$PATH"
 fi
+if ! [[ "$PATH" =~ /usr/local/go/bin ]]; then
+    PATH="/usr/local/go/bin:$PATH"
+fi
 
 # User specific aliases and functions
 if [ -d ~/.bashrc.d ]; then
@@ -49,17 +52,10 @@ HISTFILESIZE=$HISTSIZE
 HISTCONTROL=ignorespace:ignoredups
 shopt -s histappend
 
-if command -v nvim > /dev/null; then
-    success "setting EDITOR to nvim"
-    export EDITOR=nvim
-
-    success "setting MANPAGER viewer to nvim"
-    export MANPAGER="nvim +Man!"
-else
-    warn "nvim not found"
-fi
-
 # OS specific environment
+#
+# This should be executed before the tools section, especially if we are using
+# tools from Homebrew
 case "$OSTYPE" in
     darwin*)
         # Homebrew
@@ -84,6 +80,16 @@ esac
 
 # Tools
 
+if command -v nvim > /dev/null; then
+    success "setting EDITOR to nvim"
+    export EDITOR=nvim
+
+    success "setting MANPAGER viewer to nvim"
+    export MANPAGER="nvim +Man!"
+else
+    warn "nvim not found"
+fi
+
 # fzf
 if command -v fzf > /dev/null; then
     eval "$(fzf "--$(basename "$SHELL")")"

.colordiffrc

@@ -1 +0,0 @@
-newtext = green 

.config/nvim/lazy-lock.json

@@ -1,47 +1,48 @@
 {
-  "LuaSnip": { "branch": "master", "commit": "c1851d5c519611dfc451b6582961b2602e0af89b" },
-  "catppuccin": { "branch": "main", "commit": "1bf070129c0b6f77cc23f6a2212dcdc868308c52" },
+  "LuaSnip": { "branch": "master", "commit": "73813308abc2eaeff2bc0d3f2f79270c491be9d7" },
+  "catppuccin": { "branch": "main", "commit": "c89184526212e04feffbddda9d06b041a8fca416" },
   "cmp-buffer": { "branch": "main", "commit": "b74fab3656eea9de20a9b8116afa3cfc4ec09657" },
-  "cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" },
-  "cmp-nvim-lsp": { "branch": "main", "commit": "a8912b88ce488f411177fc8aed358b04dc246d7b" },
-  "cmp-path": { "branch": "main", "commit": "c6635aae33a50d6010bf1aa756ac2398a2d54c32" },
+  "cmp-cmdline": { "branch": "main", "commit": "d126061b624e0af6c3a556428712dd4d4194ec6d" },
+  "cmp-nvim-lsp": { "branch": "main", "commit": "bd5a7d6db125d4654b50eeae9f5217f24bb22fd3" },
+  "cmp-path": { "branch": "main", "commit": "c642487086dbd9a93160e1679a1327be111cbc25" },
   "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" },
-  "conform.nvim": { "branch": "master", "commit": "2b2b30260203af3b93a7470ac6c8457ddd6e32d9" },
+  "conform.nvim": { "branch": "master", "commit": "9d859cbfbde7a1bd1770e7c97aef30ec5a237a71" },
   "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" },
-  "everforest-nvim": { "branch": "main", "commit": "2eb7c348f880ba93de4d98cae049c9441f5d4d49" },
+  "everforest-nvim": { "branch": "main", "commit": "d2936185a6d266def29fd7b523d296384580ef08" },
   "friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" },
-  "fzf-lua": { "branch": "main", "commit": "5af306b30f699513669efdf51cf50a6deab53968" },
-  "gitsigns.nvim": { "branch": "main", "commit": "43b0c856ae5f32a195d83f4a27fe21d63e6c966c" },
-  "gruvbox.nvim": { "branch": "main", "commit": "00e38a379bab3389e187b3953566d67d494dfddd" },
+  "fzf-lua": { "branch": "main", "commit": "478869cf8c4b4354771c27b6b8e9f985cb274de2" },
+  "gitsigns.nvim": { "branch": "main", "commit": "1ee5c1fd068c81f9dd06483e639c2aa4587dc197" },
+  "gruvbox.nvim": { "branch": "main", "commit": "5e0a460d8e0f7f669c158dedd5f9ae2bcac31437" },
   "harpoon": { "branch": "harpoon2", "commit": "ed1f853847ffd04b2b61c314865665e1dadf22c7" },
   "indent-blankline.nvim": { "branch": "master", "commit": "005b56001b2cb30bfa61b7986bc50657816ba4ba" },
-  "kanagawa.nvim": { "branch": "master", "commit": "4de88d695634a8776c687af8e7436cfa074aa0c0" },
-  "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" },
-  "lualine.nvim": { "branch": "master", "commit": "15884cee63a8c205334ab13ab1c891cd4d27101a" },
-  "lush.nvim": { "branch": "main", "commit": "45a79ec4acb5af783a6a29673a999ce37f00497e" },
-  "mason-lspconfig.nvim": { "branch": "main", "commit": "d39a75bbce4b8aad5d627191ea915179c77c100f" },
-  "mason.nvim": { "branch": "main", "commit": "7c7318e8bae7e3536ef6b9e86b9e38e74f2e125e" },
-  "mini.icons": { "branch": "main", "commit": "397ed3807e96b59709ef3292f0a3e253d5c1dc0a" },
-  "mini.pick": { "branch": "main", "commit": "fa1e449e1080bf7aa9b2890ee186d23b1b4e1287" },
-  "neo-tree.nvim": { "branch": "v3.x", "commit": "f481de16a0eb59c985abac8985e3f2e2f75b4875" },
-  "neogit": { "branch": "master", "commit": "00b102e0332f6b27f0aed17ab05732cc53089f08" },
+  "kanagawa.nvim": { "branch": "master", "commit": "27f1e119f3a7e6d11d435a59e3262e6affda1f83" },
+  "lazy.nvim": { "branch": "main", "commit": "59334064f8604ca073791c25dcc5c9698865406e" },
+  "lualine.nvim": { "branch": "master", "commit": "b8c23159c0161f4b89196f74ee3a6d02cdc3a955" },
+  "lush.nvim": { "branch": "main", "commit": "9c60ec2279d62487d942ce095e49006af28eed6e" },
+  "mason-lspconfig.nvim": { "branch": "main", "commit": "155eac5d8609a2f110041f8ac3491664cc126354" },
+  "mason.nvim": { "branch": "main", "commit": "ad7146aa61dcaeb54fa900144d768f040090bff0" },
+  "mini.icons": { "branch": "main", "commit": "284798619aed9f4c1ac1b9417b9a5e3b4b85ef3a" },
+  "mini.pick": { "branch": "main", "commit": "96ee37d07043aeed90ae6ae32733b2d0db8f1c13" },
+  "neo-tree.nvim": { "branch": "v3.x", "commit": "9130e58424ad95bf2dd8b40afbb8cf04d648638c" },
+  "neogit": { "branch": "master", "commit": "90dcfa7b2bd5f3f35d1a7afe24dde9e2bc482cd4" },
   "nightfox.nvim": { "branch": "main", "commit": "ba47d4b4c5ec308718641ba7402c143836f35aa9" },
   "nord.nvim": { "branch": "master", "commit": "80c1e5321505aeb22b7a9f23eb82f1e193c12470" },
-  "nui.nvim": { "branch": "main", "commit": "f535005e6ad1016383f24e39559833759453564e" },
+  "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" },
   "nvim-cmp": { "branch": "main", "commit": "b5311ab3ed9c846b585c0c15b7559be131ec4be9" },
-  "nvim-lint": { "branch": "master", "commit": "fdb04e9285edefbe25a02a31a35e8fbb10fe054d" },
-  "nvim-lspconfig": { "branch": "master", "commit": "5a137448fd921a0c5d3939cb75e60d21f64e4606" },
-  "nvim-surround": { "branch": "main", "commit": "0e62500b98f4513feaaf7425c135472457ea5b7d" },
-  "nvim-tree.lua": { "branch": "master", "commit": "e7d1b7dadc62fe2eccc17d814354b0a5688621ce" },
-  "nvim-treesitter": { "branch": "master", "commit": "066fd6505377e3fd4aa219e61ce94c2b8bdb0b79" },
-  "nvim-web-devicons": { "branch": "master", "commit": "f1420728f59843eb2ef084406b3d0201a0a0932d" },
-  "oil.nvim": { "branch": "master", "commit": "685cdb4ffa74473d75a1b97451f8654ceeab0f4a" },
-  "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" },
-  "rose-pine": { "branch": "main", "commit": "491a0c77abc7ecb955c27a974091a5968232995f" },
+  "nvim-lint": { "branch": "master", "commit": "335a6044be16d7701001059cba9baa36fbeef422" },
+  "nvim-lspconfig": { "branch": "master", "commit": "e688b486fe9291f151eae7e5c0b5a5c4ef980847" },
+  "nvim-surround": { "branch": "main", "commit": "a868c256c861044beb9794b4dd126480dcdfbdad" },
+  "nvim-tree.lua": { "branch": "master", "commit": "87d096a39cb2d5d43e6771563575ff042a79f48b" },
+  "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" },
+  "nvim-web-devicons": { "branch": "master", "commit": "b8221e42cf7287c4dcde81f232f58d7b947c210d" },
+  "oil.nvim": { "branch": "master", "commit": "919e155fdf38e9148cdb5304faaaf53c20d703ea" },
+  "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" },
+  "rose-pine": { "branch": "main", "commit": "72a04c4065345b51b56aed4859ea1d884f734097" },
   "telescope.nvim": { "branch": "0.1.x", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" },
-  "tokyonight.nvim": { "branch": "main", "commit": "057ef5d260c1931f1dffd0f052c685dcd14100a3" },
-  "trouble.nvim": { "branch": "main", "commit": "85bedb7eb7fa331a2ccbecb9202d8abba64d37b3" },
-  "undotree": { "branch": "master", "commit": "b951b87b46c34356d44aa71886aecf9dd7f5788a" },
-  "vim-fugitive": { "branch": "master", "commit": "4a745ea72fa93bb15dd077109afbb3d1809383f2" },
-  "zenbones.nvim": { "branch": "main", "commit": "9deaa8a38e43e8c587b427095dd43c3511255b21" }
+  "tokyonight.nvim": { "branch": "main", "commit": "4d159616aee17796c2c94d2f5f87d2ee1a3f67c7" },
+  "trouble.nvim": { "branch": "main", "commit": "f176232e7759c4f8abd923c21e3e5a5c76cd6837" },
+  "twilight.nvim": { "branch": "main", "commit": "1584c0b0a979b71fd86b18d302ba84e9aba85b1b" },
+  "undotree": { "branch": "master", "commit": "0f1c9816975b5d7f87d5003a19c53c6fd2ff6f7f" },
+  "vim-fugitive": { "branch": "master", "commit": "61b51c09b7c9ce04e821f6cf76ea4f6f903e3cf4" },
+  "zenbones.nvim": { "branch": "main", "commit": "a934bc07d2ed4a98b74526c172d7f043736d8935" }
 }

.config/nvim/lua/plugins/harpoon.lua

@@ -17,27 +17,45 @@ return {
 				table.insert(file_paths, item.value)
 			end
 
-			require("telescope.pickers").new({}, {
+			require("telescope.pickers")
+				.new({}, {
 					prompt_title = "Harpoon",
 					finder = require("telescope.finders").new_table({
 						results = file_paths,
 					}),
 					previewer = conf.file_previewer({}),
 					sorter = conf.generic_sorter({}),
-			}):find()
+				})
+				:find()
 		end
 
-	vim.keymap.set("n", "<leader>a", function() harpoon:list():add() end)
+		vim.keymap.set("n", "<leader>a", function()
+			harpoon:list():add()
+		end)
 		-- vim.keymap.set("n", "<C-e>", function() harpoon.ui:toggle_quick_menu(harpoon:list()) end)
-	vim.keymap.set("n", "<C-e>", function() toggle_telescope(harpoon:list()) end, { desc = "Open harpoon window" })
+		vim.keymap.set("n", "<C-e>", function()
+			toggle_telescope(harpoon:list())
+		end, { desc = "Open harpoon window" })
 
-	vim.keymap.set("n", "<C-h>", function() harpoon:list():select(1) end)
-	vim.keymap.set("n", "<C-t>", function() harpoon:list():select(2) end)
-	vim.keymap.set("n", "<C-n>", function() harpoon:list():select(3) end)
-	vim.keymap.set("n", "<C-s>", function() harpoon:list():select(4) end)
+		vim.keymap.set("n", "<C-h>", function()
+			harpoon:list():select(1)
+		end)
+		vim.keymap.set("n", "<C-t>", function()
+			harpoon:list():select(2)
+		end)
+		vim.keymap.set("n", "<C-n>", function()
+			harpoon:list():select(3)
+		end)
+		vim.keymap.set("n", "<C-s>", function()
+			harpoon:list():select(4)
+		end)
 
 		-- Toggle previous & next buffers stored within Harpoon list
-	vim.keymap.set("n", "<C-S-P>", function() harpoon:list():prev() end)
-	vim.keymap.set("n", "<C-S-N>", function() harpoon:list():next() end)
+		vim.keymap.set("n", "<C-S-P>", function()
+			harpoon:list():prev()
+		end)
+		vim.keymap.set("n", "<C-S-N>", function()
+			harpoon:list():next()
+		end)
 	end,
 }

.config/nvim/lua/plugins/indent-blankline.lua

@@ -1,6 +1,5 @@
 return {
 	"lukas-reineke/indent-blankline.nvim",
 	main = "ibl",
-	opts = {
-    },
+	opts = {},
 }

.config/nvim/lua/plugins/lspconfig.lua

@@ -1,13 +1,13 @@
 return {
 	{
-	"williamboman/mason.nvim",
+		"mason-org/mason.nvim",
 		config = function()
 			require("mason").setup()
 		end,
 	},
 	{
-	"williamboman/mason-lspconfig.nvim",
-	dependencies = { "williamboman/mason.nvim" },
+		"mason-org/mason-lspconfig.nvim",
+		dependencies = { "mason-org/mason.nvim" },
 		config = function()
 			require("mason-lspconfig").setup({
 				ensure_installed = {
@@ -19,6 +19,7 @@ return {
 					"pyright",
 					"zls",
                     "gopls",
+					"golangci_lint_ls",
 					"bashls",
 				},
 			})
@@ -26,22 +27,9 @@ return {
 	},
 	{
 		"neovim/nvim-lspconfig",
-	dependencies = { "williamboman/mason-lspconfig.nvim" },
+		dependencies = { "mason-org/mason-lspconfig.nvim" },
 		config = function()
-	    local lspconfig = require("lspconfig")
-
-	    lspconfig.zls.setup({})
-	    lspconfig.ruby_lsp.setup({
-		init_options = {
-		    formatter = "standard",
-		    linters = { "standard" },
-		}
-	    })
-	    -- lspconfig.standardrb.setup({})
-	    lspconfig.bashls.setup({})
-	    lspconfig.yamlls.setup({})
-	    lspconfig.terraformls.setup({})
-	    lspconfig.lua_ls.setup({
+			vim.lsp.config("lua_ls", {
 				settings = {
 					Lua = {
 						diagnostics = {
@@ -57,9 +45,24 @@ return {
 					},
 				},
 			})
-	    lspconfig.pyright.setup({})
-	    lspconfig.gopls.setup({})
-	    lspconfig.zls.setup({})
+
+			vim.lsp.config("ruby_lsp", {
+				init_options = {
+					formatter = "standard",
+					linters = { "standard" },
+				},
+			})
+
+			vim.lsp.enable("bashls")
+			vim.lsp.enable("golangci_lint_ls")
+			vim.lsp.enable("lua_ls")
+			vim.lsp.enable("pyright")
+			vim.lsp.enable("ruby_lsp")
+			vim.lsp.enable("terraformls")
+			vim.lsp.enable("yamlls")
+			vim.lsp.enable("zls")
+
+			-- vim.lsp.enable("standardrb")
 		end,
 	},
 }

.config/nvim/lua/plugins/nvim-tree.lua

@@ -2,5 +2,5 @@ return {
 	"nvim-tree/nvim-tree.lua",
 	config = function()
 		require("nvim-tree").setup()
-    end
+	end,
 }

.config/nvim/lua/plugins/twilight.lua

@@ -0,0 +1,3 @@
+return {
+  "folke/twilight.nvim",
+} 

.config/nvim/lua/vim-options.lua

@@ -5,6 +5,6 @@ vim.cmd("set shiftwidth=4")
 vim.cmd("set smartindent")
 
 vim.wo.number = true
-vim.cmd.colorscheme "tokyonight"
+vim.cmd.colorscheme("tokyonight")
 
 vim.opt.termguicolors = true

.gitconfig

@@ -1,7 +1,7 @@
 [user]
 	name = Ryan Cavicchioni
 	email = ryan@cavi.cc
-	signingkey = /home/ryan/.ssh/id_ed25519.pub
+	signingkey = ~/.ssh/id_ed25519.pub
 [color]
 	ui = true
 [push]
@@ -17,7 +17,7 @@
 [log]
     showSignature = true
 [gpg "ssh"]
-	allowedSignersFile = /home/ryan/.ssh/allowed_signers
+	allowedSignersFile = ~/.ssh/allowed_signers
 [diff]
     tool = meld
 [difftool]

.gitignore

@@ -1,3 +0,0 @@
-!.vim/bundle/Vundle.vim
-.vim/bundle/*
-.vim/swp/*

.hgrc

@@ -1,3 +0,0 @@
-[ui]
-username = Ryan Cavicchioni <ryan@confabulator.net>
-editor = vim

.ssh/allowed_signers

@@ -0,0 +1,4 @@
+ryan@cavi.cc namespaces="git" ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGznaofIstAxYsX1MH8xQiZU4aOO4SUw9OlRbyFMfQTx compy386
+ryan@cavi.cc namespaces="git" ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICndorpp/6aKlLq2K1YP81r8zA80VGp1qAUeCZtdVhAw lappy486
+rcavicchioni@gmail.com namespaces="git" ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGznaofIstAxYsX1MH8xQiZU4aOO4SUw9OlRbyFMfQTx compy386
+rcavicchioni@gmail.com namespaces="git" ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICndorpp/6aKlLq2K1YP81r8zA80VGp1qAUeCZtdVhAw lappy486

Makefile

@@ -1,28 +0,0 @@
-install: install-vim install-git install-bash install-colordiff install-hg \
-		 install-mutt
-
-install-vim:
-	rm -rf ~/.vim ~/.vimrc
-	ln -s `pwd`/.vim ~/.vim
-	ln -s ~/.vim/vimrc ~/.vimrc
-
-install-git:
-	rm -f ~/.gitconfig
-	ln -s `pwd`/.gitconfig ~/.gitconfig
-
-install-bash:
-	rm -f ~/.bash_profile ~/.inputrc
-	ln -s `pwd`/.bash_profile ~/.bash_profile
-	ln -s `pwd`/.inputrc ~/.inputrc
-
-install-colordiff:
-	rm -f ~/.colordiffrc
-	ln -s `pwd`/.colordiffrc ~/.colordiffrc
-
-install-hg:
-	rm -f ~/.hgrc
-	ln -s `pwd`/.hgrc ~/.hgrc
-
-install-mutt:
-	rm -f ~/.muttrc
-	ln -s `pwd`/.muttrc ~/.muttrc