update Neovim plugins

https://blog.gitbutler.com/how-git-core-devs-configure-git/

.bash_profile

@@ -1,49 +0,0 @@
-# ~/.profile: executed by the command interpreter for login shells.
-# This file is not read by bash(1), if ~/.bash_profile or ~/.bash_login
-# exists.
-# see /usr/share/doc/bash/examples/startup-files for examples.
-# the files are located in the bash-doc package.
-
-# the default umask is set in /etc/profile; for setting the umask
-# for ssh logins, install and configure the libpam-umask package.
-#umask 022
-
-# if running bash
-if [ -n "$BASH_VERSION" ]; then
-    # include .bashrc if it exists
-    if [ -f "$HOME/.bashrc" ]; then
-	. "$HOME/.bashrc"
-    fi
-fi
-
-# set PATH so it includes user's private bin if it exists
-if [ -d "$HOME/bin" ] ; then
-    PATH="$HOME/bin:$PATH"
-fi
-
-PATH=/usr/local/bin:$PATH
-
-if [ -e `which keychain` ]; then
-# load SSH key
-    keychain --timeout 240 ~/.ssh/id_rsa
-    source ~/.keychain/$HOSTNAME-sh
-fi
-
-# some aliases
-alias vi='vim'
-alias ta='tmux attach'
-alias ta2='tmux -2 attach'
-alias ns='netstat -tulpn'
-alias llh='ls -lh'
-alias ll='ls -lp'
-alias ls='ls -p'
-
-# set 1337 h4x0r looking shell prompt
-#PS1="\w > "
-PS1='\[\e[1;32m\][\u@\h \w]\$\[\e[0m\] '
-
-[[ -s $HOME/.tmuxinator/scripts/tmuxinator ]] && source $HOME/.tmuxinator/scripts/tmuxinator
-
-export EDITOR=vim
-
-source /usr/local/share/chruby/chruby.sh

.bashrc

@@ -0,0 +1,110 @@
+# Source global definitions
+if [ -f /etc/bashrc ]; then
+    . /etc/bashrc
+fi
+
+function log() {
+    if [[ -v "$VERBOSE" ]]; then
+        echo "$1"
+    fi
+}
+
+function success() {
+    log "✅ ${1}"
+}
+
+function warn() {
+    log "⚠️ ${1}"
+}
+
+# Run systemd generators
+if [[ -f /usr/lib/systemd/user-environment-generators/30-systemd-environment-d-generator ]]; then
+    set -o allexport
+    # shellcheck disable=1090
+    source <(/usr/lib/systemd/user-environment-generators/30-systemd-environment-d-generator)
+    set +o allexport
+fi
+
+# User specific environment
+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
+    for rc in ~/.bashrc.d/*; do
+        if [ -f "$rc" ]; then
+            # shellcheck disable=1090
+            . "$rc"
+        fi
+    done
+fi
+unset rc
+
+# Environment variables
+
+# history control
+HISTSIZE=10000
+HISTFILESIZE=$HISTSIZE
+HISTCONTROL=ignorespace:ignoredups
+shopt -s histappend
+
+# OS specific environment
+#
+# This should be executed before the tools section, especially if we are using
+# tools from Homebrew
+case "$OSTYPE" in
+    darwin*)
+        # Homebrew
+        if [[ -f /opt/homebrew/bin/brew ]]; then
+            eval "$(/opt/homebrew/bin/brew shellenv)"
+            success "set up homebrew"
+        else
+            warn "homebrew not found"
+        fi
+
+        # Ruby
+        if [[ -d /opt/homebrew/opt/ruby ]]; then
+            export PATH="/opt/homebrew/opt/ruby/bin:$PATH"
+            export LDFLAGS="-L/opt/homebrew/opt/ruby/lib"
+            export CPPFLAGS="-I/opt/homebrew/opt/ruby/include"
+            success "set up homebrew ruby"
+        else
+            warn "homebrew ruby not found"
+        fi
+        ;;
+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")")"
+    success "set up fzf"
+else
+    warn "fzf not found"
+fi
+
+# starship
+if command -v starship > /dev/null; then
+    eval "$(starship init "$(basename "$SHELL")")"
+    success "set up starship"
+else
+    warn "starship not found"
+fi
+
+# Aliases
+alias nview="nvim -R"

.colordiffrc

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

.config/nvim/lazy-lock.json

@@ -1,43 +1,48 @@
 {
-  "LuaSnip": { "branch": "master", "commit": "e808bee352d1a6fcf902ca1a71cee76e60e24071" },
+  "LuaSnip": { "branch": "master", "commit": "73813308abc2eaeff2bc0d3f2f79270c491be9d7" },
-  "catppuccin": { "branch": "main", "commit": "7be452ee067978cdc8b2c5f3411f0c71ffa612b9" },
+  "catppuccin": { "branch": "main", "commit": "c89184526212e04feffbddda9d06b041a8fca416" },
-  "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
+  "cmp-buffer": { "branch": "main", "commit": "b74fab3656eea9de20a9b8116afa3cfc4ec09657" },
-  "cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" },
+  "cmp-cmdline": { "branch": "main", "commit": "d126061b624e0af6c3a556428712dd4d4194ec6d" },
-  "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" },
+  "cmp-nvim-lsp": { "branch": "main", "commit": "bd5a7d6db125d4654b50eeae9f5217f24bb22fd3" },
-  "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
+  "cmp-path": { "branch": "main", "commit": "c642487086dbd9a93160e1679a1327be111cbc25" },
-  "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" },
+  "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" },
-  "conform.nvim": { "branch": "master", "commit": "40d4e98fcc3e6f485f0e8924c63734bc7e305967" },
+  "conform.nvim": { "branch": "master", "commit": "9d859cbfbde7a1bd1770e7c97aef30ec5a237a71" },
-  "everforest-nvim": { "branch": "main", "commit": "7c57941d5ef5a150f307b9295c00a59e95d78587" },
+  "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" },
-  "friendly-snippets": { "branch": "main", "commit": "de8fce94985873666bd9712ea3e49ee17aadb1ed" },
+  "everforest-nvim": { "branch": "main", "commit": "d2936185a6d266def29fd7b523d296384580ef08" },
-  "gitsigns.nvim": { "branch": "main", "commit": "863903631e676b33e8be2acb17512fdc1b80b4fb" },
+  "friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" },
-  "gruvbox.nvim": { "branch": "main", "commit": "49d9c0b150ba70efcd831ec7b3cb8ee740067045" },
+  "fzf-lua": { "branch": "main", "commit": "478869cf8c4b4354771c27b6b8e9f985cb274de2" },
-  "harpoon": { "branch": "harpoon2", "commit": "0378a6c428a0bed6a2781d459d7943843f374bce" },
+  "gitsigns.nvim": { "branch": "main", "commit": "1ee5c1fd068c81f9dd06483e639c2aa4587dc197" },
-  "indent-blankline.nvim": { "branch": "master", "commit": "e7a4442e055ec953311e77791546238d1eaae507" },
+  "gruvbox.nvim": { "branch": "main", "commit": "5e0a460d8e0f7f669c158dedd5f9ae2bcac31437" },
-  "kanagawa.nvim": { "branch": "master", "commit": "f491b0fe68fffbece7030181073dfe51f45cda81" },
+  "harpoon": { "branch": "harpoon2", "commit": "ed1f853847ffd04b2b61c314865665e1dadf22c7" },
-  "lazy.nvim": { "branch": "main", "commit": "1159bdccd8910a0fd0914b24d6c3d186689023d9" },
+  "indent-blankline.nvim": { "branch": "master", "commit": "005b56001b2cb30bfa61b7986bc50657816ba4ba" },
-  "lualine.nvim": { "branch": "master", "commit": "b431d228b7bbcdaea818bdc3e25b8cdbe861f056" },
+  "kanagawa.nvim": { "branch": "master", "commit": "27f1e119f3a7e6d11d435a59e3262e6affda1f83" },
-  "lush.nvim": { "branch": "main", "commit": "45a79ec4acb5af783a6a29673a999ce37f00497e" },
+  "lazy.nvim": { "branch": "main", "commit": "59334064f8604ca073791c25dcc5c9698865406e" },
-  "mason-lspconfig.nvim": { "branch": "main", "commit": "25c11854aa25558ee6c03432edfa0df0217324be" },
+  "lualine.nvim": { "branch": "master", "commit": "b8c23159c0161f4b89196f74ee3a6d02cdc3a955" },
-  "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" },
+  "lush.nvim": { "branch": "main", "commit": "9c60ec2279d62487d942ce095e49006af28eed6e" },
-  "mini.icons": { "branch": "main", "commit": "a2742459f0ee32806c2438ca06b4d8b331f3f4d4" },
+  "mason-lspconfig.nvim": { "branch": "main", "commit": "155eac5d8609a2f110041f8ac3491664cc126354" },
-  "neo-tree.nvim": { "branch": "v3.x", "commit": "a77af2e764c5ed4038d27d1c463fa49cd4794e07" },
+  "mason.nvim": { "branch": "main", "commit": "ad7146aa61dcaeb54fa900144d768f040090bff0" },
-  "nightfox.nvim": { "branch": "main", "commit": "7557f26defd093c4e9bc17f28b08403f706f5a44" },
+  "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": "b58e2bfda5cea347c9d58b7f11cf3012c7b3953f" },
+  "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" },
-  "nvim-cmp": { "branch": "main", "commit": "ae644feb7b67bf1ce4260c231d1d4300b19c6f30" },
+  "nvim-cmp": { "branch": "main", "commit": "b5311ab3ed9c846b585c0c15b7559be131ec4be9" },
-  "nvim-lint": { "branch": "master", "commit": "f707b3ae50417067fa63fdfe179b0bff6b380da1" },
+  "nvim-lint": { "branch": "master", "commit": "335a6044be16d7701001059cba9baa36fbeef422" },
-  "nvim-lspconfig": { "branch": "master", "commit": "d141895d1d9f41048fff201d62a2d6e96d299e32" },
+  "nvim-lspconfig": { "branch": "master", "commit": "e688b486fe9291f151eae7e5c0b5a5c4ef980847" },
-  "nvim-surround": { "branch": "main", "commit": "ec2dc7671067e0086cdf29c2f5df2dd909d5f71f" },
+  "nvim-surround": { "branch": "main", "commit": "a868c256c861044beb9794b4dd126480dcdfbdad" },
-  "nvim-tree.lua": { "branch": "master", "commit": "0fede9f813534a0bdbd8a654568367a351123959" },
+  "nvim-tree.lua": { "branch": "master", "commit": "87d096a39cb2d5d43e6771563575ff042a79f48b" },
-  "nvim-treesitter": { "branch": "master", "commit": "5a2ff8b7ca5470b1011ed82ef3fdd53139ffc467" },
+  "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" },
-  "nvim-web-devicons": { "branch": "master", "commit": "19d257cf889f79f4022163c3fbb5e08639077bd8" },
+  "nvim-web-devicons": { "branch": "master", "commit": "b8221e42cf7287c4dcde81f232f58d7b947c210d" },
-  "oil.nvim": { "branch": "master", "commit": "ccab9d5e09e2d0042fbbe5b6bd05e82426247067" },
+  "oil.nvim": { "branch": "master", "commit": "919e155fdf38e9148cdb5304faaaf53c20d703ea" },
-  "plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" },
+  "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" },
-  "rose-pine": { "branch": "main", "commit": "d396005db5bbd1d4ec7772a7c96c96f4c4802328" },
+  "rose-pine": { "branch": "main", "commit": "72a04c4065345b51b56aed4859ea1d884f734097" },
   "telescope.nvim": { "branch": "0.1.x", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" },
-  "tokyonight.nvim": { "branch": "main", "commit": "2c85fad417170d4572ead7bf9fdd706057bd73d7" },
+  "tokyonight.nvim": { "branch": "main", "commit": "4d159616aee17796c2c94d2f5f87d2ee1a3f67c7" },
-  "trouble.nvim": { "branch": "main", "commit": "254145ffd528b98eb20be894338e2d5c93fa02c2" },
+  "trouble.nvim": { "branch": "main", "commit": "f176232e7759c4f8abd923c21e3e5a5c76cd6837" },
-  "undotree": { "branch": "master", "commit": "78b5241191852ffa9bb5da5ff2ee033160798c3b" },
+  "twilight.nvim": { "branch": "main", "commit": "1584c0b0a979b71fd86b18d302ba84e9aba85b1b" },
-  "vim-fugitive": { "branch": "master", "commit": "d4877e54cef67f5af4f950935b1ade19ed6b7370" },
+  "undotree": { "branch": "master", "commit": "0f1c9816975b5d7f87d5003a19c53c6fd2ff6f7f" },
-  "zenbones.nvim": { "branch": "main", "commit": "88960c8aa3ad8aff0bcccdce7cd23629c7a3c510" }
+  "vim-fugitive": { "branch": "master", "commit": "61b51c09b7c9ce04e821f6cf76ea4f6f903e3cf4" },
+  "zenbones.nvim": { "branch": "main", "commit": "a934bc07d2ed4a98b74526c172d7f043736d8935" }
 }

.config/nvim/lua/config/lazy.lua

@@ -1,17 +1,17 @@
 -- Bootstrap lazy.nvim
 local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
 if not (vim.uv or vim.loop).fs_stat(lazypath) then
-  local lazyrepo = "https://github.com/folke/lazy.nvim.git"
+	local lazyrepo = "https://github.com/folke/lazy.nvim.git"
-  local out = vim.fn.system({ "git", "clone", "--filter=blob:none", "--branch=stable", lazyrepo, lazypath })
+	local out = vim.fn.system({ "git", "clone", "--filter=blob:none", "--branch=stable", lazyrepo, lazypath })
-  if vim.v.shell_error ~= 0 then
+	if vim.v.shell_error ~= 0 then
-    vim.api.nvim_echo({
+		vim.api.nvim_echo({
-      { "Failed to clone lazy.nvim:\n", "ErrorMsg" },
+			{ "Failed to clone lazy.nvim:\n", "ErrorMsg" },
-      { out, "WarningMsg" },
+			{ out, "WarningMsg" },
-      { "\nPress any key to exit..." },
+			{ "\nPress any key to exit..." },
-    }, true, {})
+		}, true, {})
-    vim.fn.getchar()
+		vim.fn.getchar()
-    os.exit(1)
+		os.exit(1)
-  end
+	end
 end
 vim.opt.rtp:prepend(lazypath)
 
@@ -23,13 +23,13 @@ vim.g.maplocalleader = "\\"
 
 -- Setup lazy.nvim
 require("lazy").setup({
-  spec = {
+	spec = {
-    -- import your plugins
+		-- import your plugins
-    { import = "plugins" },
+		{ import = "plugins" },
-  },
+	},
-  -- Configure any other settings here. See the documentation for more details.
+	-- Configure any other settings here. See the documentation for more details.
-  -- colorscheme that will be used when installing plugins.
+	-- colorscheme that will be used when installing plugins.
-  install = { colorscheme = { "habamax" } },
+	install = { colorscheme = { "habamax" } },
-  -- automatically check for plugin updates
+	-- automatically check for plugin updates
-  checker = { enabled = true },
+	checker = { enabled = true },
 })

.config/nvim/lua/plugins/cmp.lua

@@ -40,14 +40,14 @@ return {
 			}
 		end,
 		--[[
-        keys = {
+	keys = {
-            { "<C-b>", function() require('cmp').mapping.scroll_docs(-4) end },
+	    { "<C-b>", function() require('cmp').mapping.scroll_docs(-4) end },
-            { "<C-f>", function() require('cmp').mapping.scroll_docs(4) end },
+	    { "<C-f>", function() require('cmp').mapping.scroll_docs(4) end },
-            { "<C-Space>", function() require('cmp').mapping.complete() end },
+	    { "<C-Space>", function() require('cmp').mapping.complete() end },
-            { "<C-e>", function() require('cmp').mapping.abort() end },
+	    { "<C-e>", function() require('cmp').mapping.abort() end },
-            { "<CR>", function() require('cmp').mapping.confirm({ select = true }) end },
+	    { "<CR>", function() require('cmp').mapping.confirm({ select = true }) end },
-        },
+	},
-        ]]
+	]]
 		--
 	},
 }

.config/nvim/lua/plugins/conform.lua

@@ -17,6 +17,7 @@ return {
 		formatters_by_ft = {
 			lua = { "stylua" },
 			ruby = { "rufo" },
+			go = { "gofmt" },
 		},
 	},
 }

.config/nvim/lua/plugins/diffview.lua

@@ -0,0 +1 @@
+return { "sindrets/diffview.nvim" }

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

@@ -1,13 +1,13 @@
 return {
-    "ThePrimeagen/harpoon",
+	"ThePrimeagen/harpoon",
-    branch = "harpoon2",
+	branch = "harpoon2",
-    dependencies = { "nvim-lua/plenary.nvim" },
+	dependencies = { "nvim-lua/plenary.nvim" },
-    config = function()
+	config = function()
-        local harpoon = require("harpoon")
+		local harpoon = require("harpoon")
 
-        -- REQUIRED
+		-- REQUIRED
-        harpoon:setup()
+		harpoon:setup()
-        -- REQUIRED
+		-- REQUIRED
 
 		-- basic telescope configuration
 		local conf = require("telescope.config").values
@@ -17,27 +17,45 @@ return {
 				table.insert(file_paths, item.value)
 			end
 
-			require("telescope.pickers").new({}, {
+			require("telescope.pickers")
-				prompt_title = "Harpoon",
+				.new({}, {
-				finder = require("telescope.finders").new_table({
+					prompt_title = "Harpoon",
-					results = file_paths,
+					finder = require("telescope.finders").new_table({
-				}),
+						results = file_paths,
-				previewer = conf.file_previewer({}),
+					}),
-				sorter = conf.generic_sorter({}),
+					previewer = conf.file_previewer({}),
-			}):find()
+					sorter = conf.generic_sorter({}),
+				})
+				:find()
 		end
 
-        vim.keymap.set("n", "<leader>a", function() harpoon:list():add() end)
+		vim.keymap.set("n", "<leader>a", function()
-        -- vim.keymap.set("n", "<C-e>", function() harpoon.ui:toggle_quick_menu(harpoon:list()) end)
+			harpoon:list():add()
-        vim.keymap.set("n", "<C-e>", function() toggle_telescope(harpoon:list()) end, { desc = "Open harpoon window" })
+		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-h>", function() harpoon:list():select(1) end)
+		vim.keymap.set("n", "<C-h>", function()
-        vim.keymap.set("n", "<C-t>", function() harpoon:list():select(2) end)
+			harpoon:list():select(1)
-        vim.keymap.set("n", "<C-n>", function() harpoon:list():select(3) end)
+		end)
-        vim.keymap.set("n", "<C-s>", function() harpoon:list():select(4) 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
+		-- 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-P>", function()
-        vim.keymap.set("n", "<C-S-N>", function() harpoon:list():next() end)
+			harpoon:list():prev()
-    end,
+		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/lint.lua

@@ -1,13 +1,24 @@
 return {
 	"mfussenegger/nvim-lint",
+	opts = {
+		linters_by_ft = {
+			-- ruby = { "rubocop", "standardrb" },
+			ruby = { "standardrb" },
+			go = { "golangcilint" },
+		},
+	},
 	config = function()
-		require("lint").linters_by_ft = {
+		local lint = require("lint")
-			ruby = { "rubocop", "standardrb" },
+
+		lint.linters_by_ft = {
+			-- ruby = { "rubocop", "standardrb" },
+			ruby = { "standardrb" },
+			go = { "golangcilint" },
 		}
 
 		vim.api.nvim_create_autocmd({ "BufWritePost" }, {
 			callback = function()
-				require("lint").try_lint()
+				lint.try_lint()
 			end,
 		})
 	end,

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

@@ -1,38 +1,35 @@
 return {
 	{
-		"williamboman/mason.nvim",
+		"mason-org/mason.nvim",
-        config = function()
+		config = function()
 			require("mason").setup()
 		end,
-},
+	},
 	{
-		"williamboman/mason-lspconfig.nvim",
+		"mason-org/mason-lspconfig.nvim",
-		dependencies = { "williamboman/mason.nvim" },
+		dependencies = { "mason-org/mason.nvim" },
-        config = function()
+		config = function()
 			require("mason-lspconfig").setup({
 				ensure_installed = {
 					"lua_ls",
 					"ruby_lsp",
-					"standardrb",
+					-- "standardrb",
 					"terraformls",
 					"yamlls",
 					"pyright",
+					"zls",
+                    "gopls",
+					"golangci_lint_ls",
+					"bashls",
 				},
 			})
 		end,
 	},
 	{
 		"neovim/nvim-lspconfig",
-		dependencies = { "williamboman/mason-lspconfig.nvim" },
+		dependencies = { "mason-org/mason-lspconfig.nvim" },
 		config = function()
-			local lspconfig = require("lspconfig")
+			vim.lsp.config("lua_ls", {
-
-            lspconfig.ruby_lsp.setup({})
-			lspconfig.standardrb.setup({})
-			lspconfig.bashls.setup({})
-			lspconfig.yamlls.setup({})
-			lspconfig.terraformls.setup({})
-			lspconfig.lua_ls.setup({
 				settings = {
 					Lua = {
 						diagnostics = {
@@ -48,7 +45,24 @@ return {
 					},
 				},
 			})
-			lspconfig.pyright.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/neogit.lua

@@ -0,0 +1,13 @@
+return {
+	"NeogitOrg/neogit",
+	dependencies = {
+		"nvim-lua/plenary.nvim", -- required
+		"sindrets/diffview.nvim", -- optional - Diff integration
+
+		-- Only one of these is needed.
+		"nvim-telescope/telescope.nvim", -- optional
+		"ibhagwan/fzf-lua", -- optional
+		"echasnovski/mini.pick", -- optional
+	},
+	config = true,
+}

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

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

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

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

.config/nvim/lua/plugins/zenbones.lua

@@ -1,14 +1,14 @@
 return {
-    "zenbones-theme/zenbones.nvim",
+	"zenbones-theme/zenbones.nvim",
-    -- Optionally install Lush. Allows for more configuration or extending the colorscheme
+	-- Optionally install Lush. Allows for more configuration or extending the colorscheme
-    -- If you don't want to install lush, make sure to set g:zenbones_compat = 1
+	-- If you don't want to install lush, make sure to set g:zenbones_compat = 1
-    -- In Vim, compat mode is turned on as Lush only works in Neovim.
+	-- In Vim, compat mode is turned on as Lush only works in Neovim.
-    dependencies = "rktjmp/lush.nvim",
+	dependencies = "rktjmp/lush.nvim",
-    lazy = false,
+	lazy = false,
-    priority = 1000,
+	priority = 1000,
-    -- you can set set configuration options here
+	-- you can set set configuration options here
-    -- config = function()
+	-- config = function()
-    --     vim.g.zenbones_darken_comments = 45
+	--	   vim.g.zenbones_darken_comments = 45
-    --     vim.cmd.colorscheme('zenbones')
+	--	   vim.cmd.colorscheme('zenbones')
-    -- end
+	-- end
 }

.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,29 +1,26 @@
 [user]
 	name = Ryan Cavicchioni
 	email = ryan@cavi.cc
+	signingkey = ~/.ssh/id_ed25519.pub
 [color]
 	ui = true
 [push]
 	default = simple
 [commit]
     gpgsign = true
-[log]
+[pull]
-    showsignature = true
+	ff = only
-[core]
+[gpg]
-    pager = delta
+	format = ssh
-
-[interactive]
-    diffFilter = delta --color-only
-
-[delta]
-    navigate = true    # use n and N to move between diff sections
-
-    # delta detects terminal colors automatically; set one of these to disable auto-detection
-    # dark = true
-    # light = true
-
 [merge]
-    conflictstyle = diff3
+    conflictstyle = zdiff3
-
+[log]
+    showSignature = true
+[gpg "ssh"]
+	allowedSignersFile = ~/.ssh/allowed_signers
 [diff]
-    colorMoved = default
+    tool = meld
+[difftool]
+    prompt = false
+[difftool "meld"]
+    cmd = meld "$LOCAL" "$REMOTE"

.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

.profile

@@ -1,44 +1,8 @@
-# ~/.profile: executed by the command interpreter for login shells.
-# This file is not read by bash(1), if ~/.bash_profile or ~/.bash_login
-# exists.
-# see /usr/share/doc/bash/examples/startup-files for examples.
-# the files are located in the bash-doc package.
-
-# the default umask is set in /etc/profile; for setting the umask
-# for ssh logins, install and configure the libpam-umask package.
-#umask 022
-
 # if running bash
 if [ -n "$BASH_VERSION" ]; then
     # include .bashrc if it exists
     if [ -f "$HOME/.bashrc" ]; then
-	. "$HOME/.bashrc"
+        # shellcheck disable=SC1090
+        . "$HOME/.bashrc"
     fi
 fi
-
-# set PATH so it includes user's private bin directories
-PATH="$HOME/bin:$HOME/.local/bin:$PATH"
-
-export EDITOR=vim
-export GPG_TTY=$(tty)
-
-if [ ! -e /run/systemd/system ]; then
-    SSH_ENV="${HOME}/.ssh/env"
-
-    function start_ssh_agent {
-        ssh-agent | sed -e '/^echo/d' > "${SSH_ENV}"
-        chmod 0600 "${SSH_ENV}" 
-        . "${SSH_ENV}"
-    }
-
-    if [ -f "${SSH_ENV}" ]; then
-        . "${SSH_ENV}"
-        if ! kill -0 "${SSH_AGENT_PID}" > /dev/null 2>&1; then
-            start_ssh_agent
-        fi
-    else
-        start_ssh_agent
-    fi
-else
-    export SSH_AUTH_SOCK="$XDG_RUNTIME_DIR/ssh-agent.socket"
-fi

.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