organzie .profile and .bashrc

.bashrc

@@ -3,20 +3,12 @@ if [ -f /etc/bashrc ]; then
     . /etc/bashrc
 fi
 
-function log() {
+function debug() {
-    if [[ -v "$VERBOSE" ]]; then
+    if [[ -v "$DEBUG" ]]; 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
@@ -49,58 +41,32 @@ 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"
+    debug "✅ setting EDITOR to nvim"
     export EDITOR=nvim
 
-    success "setting MANPAGER viewer to nvim"
+    debug "✅ setting MANPAGER viewer to nvim"
     export MANPAGER="nvim +Man!"
 else
-    warn "nvim not found"
+    debug "⚠️ nvim not found"
 fi
 
+# Tools
+
 # fzf
 if command -v fzf > /dev/null; then
     eval "$(fzf "--$(basename "$SHELL")")"
-    success "set up fzf"
+    debug "✅ set up fzf"
 else
-    warn "fzf not found"
+    debug "⚠️ fzf not found"
 fi
 
 # starship
 if command -v starship > /dev/null; then
     eval "$(starship init "$(basename "$SHELL")")"
-    success "set up starship"
+    debug "✅ set up starship"
 else
-    warn "starship not found"
+    debug "⚠️ starship not found"
 fi
 
 # Aliases

.colordiffrc

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

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

@@ -17,45 +17,27 @@ return {
 				table.insert(file_paths, item.value)
 			end
 
-			require("telescope.pickers")
+			require("telescope.pickers").new({}, {
-				.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()
+	vim.keymap.set("n", "<leader>a", function() harpoon:list():add() end)
-			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()
+	vim.keymap.set("n", "<C-e>", function() toggle_telescope(harpoon:list()) end, { desc = "Open harpoon window" })
-			toggle_telescope(harpoon:list())
-		end, { desc = "Open harpoon window" })
 
-		vim.keymap.set("n", "<C-h>", function()
+	vim.keymap.set("n", "<C-h>", function() harpoon:list():select(1) end)
-			harpoon:list():select(1)
+	vim.keymap.set("n", "<C-t>", function() harpoon:list():select(2) end)
-		end)
+	vim.keymap.set("n", "<C-n>", function() harpoon:list():select(3) end)
-		vim.keymap.set("n", "<C-t>", function()
+	vim.keymap.set("n", "<C-s>", function() harpoon:list():select(4) end)
-			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()
+	vim.keymap.set("n", "<C-S-P>", function() harpoon:list():prev() end)
-			harpoon:list():prev()
+	vim.keymap.set("n", "<C-S-N>", function() harpoon:list():next() end)
-		end)
-		vim.keymap.set("n", "<C-S-N>", function()
-			harpoon:list():next()
-		end)
     end,
 }

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

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

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

@@ -35,7 +35,7 @@ return {
 		init_options = {
 		    formatter = "standard",
 		    linters = { "standard" },
-				},
+		}
 	    })
 	    -- lspconfig.standardrb.setup({})
 	    lspconfig.bashls.setup({})

.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/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 = ~/.ssh/id_ed25519.pub
+	signingkey = /home/ryan/.ssh/id_ed25519.pub
 [color]
 	ui = true
 [push]
@@ -17,7 +17,7 @@
 [log]
     showSignature = true
 [gpg "ssh"]
-	allowedSignersFile = ~/.ssh/allowed_signers
+	allowedSignersFile = /home/ryan/.ssh/allowed_signers
 [diff]
     tool = meld
 [difftool]

.gitignore

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

.hgrc

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

.ssh/allowed_signers

@@ -1,4 +0,0 @@
-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

@@ -0,0 +1,28 @@
+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