Compare commits

..

No commits in common. "157a5172acb20c264f2c8bd92fe53eaeab8203ee" and "e14263091475a92bc68f058ca83670700f582843" have entirely different histories.

5 changed files with 203 additions and 228 deletions

View File

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

18
nvimrc
View File

@ -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

View File

@ -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(
"error",
capabilities,
{
capabilities = vim.tbl_extend("error", capabilities, {
workspace = {
didChangeWatchedFiles = {
dynamicRegistration = true
}
}
}
),
dynamicRegistration = true,
},
},
}),
on_attach = on_attach,
})

2
zshrc
View File

@ -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"