Compare commits

..

4 Commits

Author SHA1 Message Date
Rob Watson
157a5172ac feat(zsh): update alias 2024-11-11 08:57:51 +01:00
Rob Watson
cffcfca318 style(nvim): lua formatting 2024-11-11 08:57:27 +01:00
Rob Watson
e41673a9ca feat(nvim): add projectionist 2024-11-11 08:44:16 +01:00
Rob Watson
7147da76cd chore(git): ignore dirty submodules 2024-11-11 08:43:47 +01:00
5 changed files with 228 additions and 203 deletions

View File

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

18
nvimrc
View File

@ -295,6 +295,24 @@ packadd! vim-rhubarb " https://github.com/tpope/vim-rhubarb.git
packadd! editorconfig-vim " https://github.com/editorconfig/editorconfig-vim.git packadd! editorconfig-vim " https://github.com/editorconfig/editorconfig-vim.git
packadd! vim-wordmotion " https://github.com/chaoren/vim-wordmotion.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 " aerial
packadd! aerial.nvim " https://github.com/stevearc/aerial.nvim.git packadd! aerial.nvim " https://github.com/stevearc/aerial.nvim.git

View File

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

2
zshrc
View File

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