gitconfig

@@ -113,7 +113,6 @@
 	helper = !gh auth git-credential
 [diff]
 	tool = vimdiff
-	ignoreSubmodules = dirty
 [merge]
 	tool = vimdiff
 [interactive]

nvimrc

@@ -295,24 +295,6 @@ packadd! vim-rhubarb       " https://github.com/tpope/vim-rhubarb.git
 packadd! editorconfig-vim  " https://github.com/editorconfig/editorconfig-vim.git
 packadd! vim-wordmotion    " https://github.com/chaoren/vim-wordmotion.git
 
-" projectionist
-packadd! vim-projectionist " https://github.com/tpope/vim-projectionist.git
-
-let g:projectionist_heuristics = {
-      \   "*.go": {
-      \     "*_test.go": {
-      \        "type": "source",
-      \        "alternate": "{}.go",
-      \     },
-      \     "*.go": {
-      \        "type": "source",
-      \        "alternate": "{}_test.go",
-      \     },
-      \     "etc/rbenv.d/*.bash": {"type": "hook"}
-      \   }
-      \ }
-nnoremap <leader>A :A<cr>
-
 " aerial
 packadd! aerial.nvim       " https://github.com/stevearc/aerial.nvim.git
 

vim/lua/lsp_config.lua

@@ -1,7 +1,5 @@
 local nvim_lsp = require("lspconfig")
 
-vim.lsp.set_log_level("debug")
-
 local on_attach = function(client, bufnr)
 	-- TODO: use vim.api.nvim_create_autocmd
 	vim.api.nvim_exec2([[autocmd User LspDiagnosticsChanged call lightline#update()]], { output = false })
@@ -68,23 +66,19 @@ nvim_lsp.gopls.setup({
 				unusedresult = true,
 				nilness = true,
 			},
-      buildFlags = { "-tags=acceptance,basketapitest,graphqlapitest" }
+			buildFlags = { "-tags=acceptance" },
 		},
 	},
 	init_options = {
 		usePlaceholders = true,
 	},
-  capabilities = vim.tbl_extend(
+	capabilities = vim.tbl_extend("error", capabilities, {
-    "error",
-    capabilities,
-    {
 		workspace = {
 			didChangeWatchedFiles = {
-          dynamicRegistration = true
+				dynamicRegistration = true,
-        }
+			},
-      }
+		},
-    }
+	}),
-  ),
 	on_attach = on_attach,
 })
 

zshrc

@@ -116,7 +116,7 @@ alias pg="pgrep -fa"
 alias pk="pkill -fc"
 alias rez="source $HOME/.zshenv && source $ZDOTDIR/.zshrc"
 alias rgo="rg -g '*.go' -g '!vendor/'"
-alias rgs="rg -g '*.go' -g '*.rb' -g '!vendor/' -g '!*_test.go' -g '!*_spec.rb'" -g '!*/mocks/*' -g '!*_mock.go'
+alias rgs="rg -g '*.go' -g '*.rb' -g '!vendor/' -g '!*_test.go' -g '!*_spec.rb'"
 alias rgt="rg -g '*_test.go' -g '*_spec.rb' -g '!vendor/'"
 alias sc="systemctl"
 alias shc="shellcheck"