fix crap lua formatting

.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/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/catppuccin.lua

@@ -1,5 +1,5 @@
 return {
-    "catppuccin/nvim",
-    name = "catppuccin",
-    priority = 1000,
+	"catppuccin/nvim",
+	name = "catppuccin",
+	priority = 1000,
 }

.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/lint.lua

@@ -14,7 +14,7 @@ return {
 			-- ruby = { "rubocop", "standardrb" },
 			ruby = { "standardrb" },
 			go = { "golangcilint" },
-	}
+		}
 
 		vim.api.nvim_create_autocmd({ "BufWritePost" }, {
 			callback = function()

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

@@ -1,65 +1,65 @@
 return {
-    {
-	"williamboman/mason.nvim",
-	config = function()
-	    require("mason").setup()
-	end,
-    },
-    {
-	"williamboman/mason-lspconfig.nvim",
-	dependencies = { "williamboman/mason.nvim" },
-	config = function()
-	    require("mason-lspconfig").setup({
-		ensure_installed = {
-		    "lua_ls",
-		    "ruby_lsp",
-		    -- "standardrb",
-		    "terraformls",
-		    "yamlls",
-		    "pyright",
-		    "zls",
-		    "gopls",
-		    "bashls",
-		},
-	    })
-	end,
-    },
-    {
-	"neovim/nvim-lspconfig",
-	dependencies = { "williamboman/mason-lspconfig.nvim" },
-	config = function()
-	    local lspconfig = require("lspconfig")
+	{
+		"williamboman/mason.nvim",
+		config = function()
+			require("mason").setup()
+		end,
+	},
+	{
+		"williamboman/mason-lspconfig.nvim",
+		dependencies = { "williamboman/mason.nvim" },
+		config = function()
+			require("mason-lspconfig").setup({
+				ensure_installed = {
+					"lua_ls",
+					"ruby_lsp",
+					-- "standardrb",
+					"terraformls",
+					"yamlls",
+					"pyright",
+					"zls",
+					"gopls",
+					"bashls",
+				},
+			})
+		end,
+	},
+	{
+		"neovim/nvim-lspconfig",
+		dependencies = { "williamboman/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({
-		settings = {
-		    Lua = {
-			diagnostics = {
-			    globals = { "vim" },
-			},
-			format = {
-			    defaultConfig = {
-				indent_style = "tabs",
-				indent_size = "4",
-			    },
-			    enable = true,
-			},
-		    },
-		},
-	    })
-	    lspconfig.pyright.setup({})
-	    lspconfig.gopls.setup({})
-	    lspconfig.zls.setup({})
-	end,
-    },
+			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({
+				settings = {
+					Lua = {
+						diagnostics = {
+							globals = { "vim" },
+						},
+						format = {
+							defaultConfig = {
+								indent_style = "tabs",
+								indent_size = "4",
+							},
+							enable = true,
+						},
+					},
+				},
+			})
+			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,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

.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