fix crap lua formatting

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,107 @@
+# 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
+
+# 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,47 +1,47 @@
 {
-  "LuaSnip": { "branch": "master", "commit": "2c08f32a570c07b8130144813266e21393da80d3" },
-  "catppuccin": { "branch": "main", "commit": "65bf0b16f57a3db70d6a93ac68882dd9a31d0565" },
-  "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
+  "LuaSnip": { "branch": "master", "commit": "c1851d5c519611dfc451b6582961b2602e0af89b" },
+  "catppuccin": { "branch": "main", "commit": "1bf070129c0b6f77cc23f6a2212dcdc868308c52" },
+  "cmp-buffer": { "branch": "main", "commit": "b74fab3656eea9de20a9b8116afa3cfc4ec09657" },
   "cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" },
-  "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" },
-  "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
-  "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" },
-  "conform.nvim": { "branch": "master", "commit": "6a28c90082a67f62a323ab90d988e000a718a8c7" },
+  "cmp-nvim-lsp": { "branch": "main", "commit": "a8912b88ce488f411177fc8aed358b04dc246d7b" },
+  "cmp-path": { "branch": "main", "commit": "c6635aae33a50d6010bf1aa756ac2398a2d54c32" },
+  "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" },
+  "conform.nvim": { "branch": "master", "commit": "2b2b30260203af3b93a7470ac6c8457ddd6e32d9" },
   "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" },
-  "everforest-nvim": { "branch": "main", "commit": "7c57941d5ef5a150f307b9295c00a59e95d78587" },
-  "friendly-snippets": { "branch": "main", "commit": "de8fce94985873666bd9712ea3e49ee17aadb1ed" },
-  "fzf-lua": { "branch": "main", "commit": "ce1e24f2a48089b65deefcb0a71a9856839002b5" },
-  "gitsigns.nvim": { "branch": "main", "commit": "2d725fdd7fe4a612fa3171ca0a965f455d8dc325" },
-  "gruvbox.nvim": { "branch": "main", "commit": "49d9c0b150ba70efcd831ec7b3cb8ee740067045" },
-  "harpoon": { "branch": "harpoon2", "commit": "0378a6c428a0bed6a2781d459d7943843f374bce" },
-  "indent-blankline.nvim": { "branch": "master", "commit": "04e44b09ee3ff189c69ab082edac1ef7ae2e256c" },
-  "kanagawa.nvim": { "branch": "master", "commit": "f491b0fe68fffbece7030181073dfe51f45cda81" },
-  "lazy.nvim": { "branch": "main", "commit": "cf8ecc2c5e4332760431a33534240b0cbc6680ab" },
-  "lualine.nvim": { "branch": "master", "commit": "b431d228b7bbcdaea818bdc3e25b8cdbe861f056" },
+  "everforest-nvim": { "branch": "main", "commit": "2eb7c348f880ba93de4d98cae049c9441f5d4d49" },
+  "friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" },
+  "fzf-lua": { "branch": "main", "commit": "5af306b30f699513669efdf51cf50a6deab53968" },
+  "gitsigns.nvim": { "branch": "main", "commit": "43b0c856ae5f32a195d83f4a27fe21d63e6c966c" },
+  "gruvbox.nvim": { "branch": "main", "commit": "00e38a379bab3389e187b3953566d67d494dfddd" },
+  "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": "4d0e5b49363cac187326998b96aa6a2884e0e89b" },
-  "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" },
-  "mini.icons": { "branch": "main", "commit": "a2742459f0ee32806c2438ca06b4d8b331f3f4d4" },
-  "mini.pick": { "branch": "main", "commit": "b7ee06ca0b692023d87a17ba855012047c6bec6f" },
-  "neo-tree.nvim": { "branch": "v3.x", "commit": "a77af2e764c5ed4038d27d1c463fa49cd4794e07" },
-  "neogit": { "branch": "master", "commit": "001f43f50d9589d837cec59004fd92486ab06870" },
-  "nightfox.nvim": { "branch": "main", "commit": "7557f26defd093c4e9bc17f28b08403f706f5a44" },
+  "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" },
+  "nightfox.nvim": { "branch": "main", "commit": "ba47d4b4c5ec308718641ba7402c143836f35aa9" },
   "nord.nvim": { "branch": "master", "commit": "80c1e5321505aeb22b7a9f23eb82f1e193c12470" },
-  "nui.nvim": { "branch": "main", "commit": "b58e2bfda5cea347c9d58b7f11cf3012c7b3953f" },
-  "nvim-cmp": { "branch": "main", "commit": "29fb4854573355792df9e156cb779f0d31308796" },
-  "nvim-lint": { "branch": "master", "commit": "16b21a7d04d06661f92f273a0744fd81fb19e09e" },
-  "nvim-lspconfig": { "branch": "master", "commit": "59a6766cbf32c7e4cf3ed685ccad7ffe1dde8c40" },
-  "nvim-surround": { "branch": "main", "commit": "ec2dc7671067e0086cdf29c2f5df2dd909d5f71f" },
-  "nvim-tree.lua": { "branch": "master", "commit": "120ba58254835d412bbc91cffe847e9be835fadd" },
-  "nvim-treesitter": { "branch": "master", "commit": "39016abc99853c3e9d70f1bec7e2fa661b9a81bf" },
-  "nvim-web-devicons": { "branch": "master", "commit": "19d257cf889f79f4022163c3fbb5e08639077bd8" },
-  "oil.nvim": { "branch": "master", "commit": "42333bb46e34dd47e13927010b1dcd30e6e4ca96" },
-  "plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" },
-  "rose-pine": { "branch": "main", "commit": "07a887a7bef4aacea8c7caebaf8cbf808cdc7a8e" },
+  "nui.nvim": { "branch": "main", "commit": "f535005e6ad1016383f24e39559833759453564e" },
+  "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" },
   "telescope.nvim": { "branch": "0.1.x", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" },
-  "tokyonight.nvim": { "branch": "main", "commit": "2e1daa1d164ad8cc3e99b44ca68e990888a66038" },
-  "trouble.nvim": { "branch": "main", "commit": "2f3b537f2207ce32f4459f9d56746ee013b5e01b" },
-  "undotree": { "branch": "master", "commit": "78b5241191852ffa9bb5da5ff2ee033160798c3b" },
-  "vim-fugitive": { "branch": "master", "commit": "d4877e54cef67f5af4f950935b1ade19ed6b7370" },
-  "zenbones.nvim": { "branch": "main", "commit": "88960c8aa3ad8aff0bcccdce7cd23629c7a3c510" }
+  "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" }
 }

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

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

@@ -40,14 +40,14 @@ return {
 			}
 		end,
 		--[[
-        keys = {
-            { "<C-b>", 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-e>", function() require('cmp').mapping.abort() end },
-            { "<CR>", function() require('cmp').mapping.confirm({ select = true }) end },
-        },
-        ]]
+	keys = {
+	    { "<C-b>", 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-e>", function() require('cmp').mapping.abort() end },
+	    { "<CR>", function() require('cmp').mapping.confirm({ select = true }) end },
+	},
+	]]
 		--
 	},
 }

.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",
-    branch = "harpoon2",
-    dependencies = { "nvim-lua/plenary.nvim" },
-    config = function()
-        local harpoon = require("harpoon")
+	"ThePrimeagen/harpoon",
+	branch = "harpoon2",
+	dependencies = { "nvim-lua/plenary.nvim" },
+	config = function()
+		local harpoon = require("harpoon")
 
-        -- REQUIRED
-        harpoon:setup()
-        -- REQUIRED
+		-- REQUIRED
+		harpoon:setup()
+		-- 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({}, {
-				prompt_title = "Harpoon",
-				finder = require("telescope.finders").new_table({
-					results = file_paths,
-				}),
-				previewer = conf.file_previewer({}),
-				sorter = conf.generic_sorter({}),
-			}):find()
+			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()
 		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", "<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-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)
-    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)
+	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

@@ -13,10 +13,13 @@ return {
 				ensure_installed = {
 					"lua_ls",
 					"ruby_lsp",
-					"standardrb",
+					-- "standardrb",
 					"terraformls",
 					"yamlls",
 					"pyright",
+					"zls",
+					"gopls",
+					"bashls",
 				},
 			})
 		end,
@@ -27,8 +30,14 @@ return {
 		config = function()
 			local lspconfig = require("lspconfig")
 
-            lspconfig.ruby_lsp.setup({})
-			lspconfig.standardrb.setup({})
+			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({})
@@ -50,6 +59,7 @@ return {
 			})
 			lspconfig.pyright.setup({})
 			lspconfig.gopls.setup({})
+			lspconfig.zls.setup({})
 		end,
 	},
 }

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

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

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

@@ -1,14 +1,14 @@
 return {
-    "zenbones-theme/zenbones.nvim",
-    -- 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
-    -- In Vim, compat mode is turned on as Lush only works in Neovim.
-    dependencies = "rktjmp/lush.nvim",
-    lazy = false,
-    priority = 1000,
-    -- you can set set configuration options here
-    -- config = function()
-    --     vim.g.zenbones_darken_comments = 45
-    --     vim.cmd.colorscheme('zenbones')
-    -- end
+	"zenbones-theme/zenbones.nvim",
+	-- 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
+	-- In Vim, compat mode is turned on as Lush only works in Neovim.
+	dependencies = "rktjmp/lush.nvim",
+	lazy = false,
+	priority = 1000,
+	-- you can set set configuration options here
+	-- config = function()
+	--	   vim.g.zenbones_darken_comments = 45
+	--	   vim.cmd.colorscheme('zenbones')
+	-- 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]
-    showsignature = true
-[core]
-    pager = delta
-
-[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
-
+[pull]
+	ff = only
+[gpg]
+	format = ssh
 [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