Compare commits

..

No commits in common. "e14263091475a92bc68f058ca83670700f582843" and "3f8f0fe495bccec3c1199cd2db9a3c4bc6e57c6a" have entirely different histories.

5 changed files with 28 additions and 21 deletions

5
nvimrc
View File

@ -276,6 +276,11 @@ let g:vimsyn_embed= 'lPr'
" vim-fugitive " vim-fugitive
packadd! vim-fugitive " https://github.com/tpope/vim-fugitive.git packadd! vim-fugitive " https://github.com/tpope/vim-fugitive.git
" vim-go
" Doesn't work in after/ftplugin/go.vim:
let g:go_def_mapping_enabled = 0
packadd! vim-go " https://github.com/fatih/vim-go.git
" load internal plugins: " load internal plugins:
runtime macros/matchit.vim runtime macros/matchit.vim

View File

@ -1,7 +1,7 @@
require("aerial").setup({ require("aerial").setup({
on_attach = function(bufnr) on_attach = function(bufnr)
vim.keymap.set("n", "[s", "<cmd>AerialPrev<CR>", { buffer = bufnr, noremap = true }) vim.keymap.set("n", "[", "<cmd>AerialPrev<CR>", { buffer = bufnr })
vim.keymap.set("n", "]s", "<cmd>AerialNext<CR>", { buffer = bufnr, noremap = true }) vim.keymap.set("n", "]", "<cmd>AerialNext<CR>", { buffer = bufnr })
end, end,
autojump = true, autojump = true,
nerd_font = "auto", nerd_font = "auto",

View File

@ -20,5 +20,5 @@ require("conform").setup({
lsp_fallback = true, lsp_fallback = true,
}, },
log_level = vim.log.levels.ERROR, log_level = vim.log.levels.ERROR,
notify_on_error = false, notify_on_error = true,
}) })

View File

@ -66,19 +66,23 @@ nvim_lsp.gopls.setup({
unusedresult = true, unusedresult = true,
nilness = true, nilness = true,
}, },
buildFlags = { "-tags=acceptance" }, buildFlags = { "-tags=acceptance" }
}, },
}, },
init_options = { init_options = {
usePlaceholders = true, usePlaceholders = true,
}, },
capabilities = vim.tbl_extend("error", capabilities, { capabilities = vim.tbl_extend(
workspace = { "error",
didChangeWatchedFiles = { capabilities,
dynamicRegistration = true, {
}, workspace = {
}, didChangeWatchedFiles = {
}), dynamicRegistration = true
}
}
}
),
on_attach = on_attach, on_attach = on_attach,
}) })
@ -99,12 +103,12 @@ nvim_lsp.rust_analyzer.setup({
enable = true, enable = true,
}, },
}, },
-- procMacro = { procMacro = {
-- enable = false, enable = false,
-- }, },
-- diagnostics = { diagnostics = {
-- disabled = { "unresolved-proc-macro" }, disabled = { "unresolved-proc-macro" },
-- }, },
}, },
}, },
}) })

6
zshrc
View File

@ -72,7 +72,6 @@ alias cdg=cdgit
alias cdgit='cd $(git rev-parse --show-toplevel)' alias cdgit='cd $(git rev-parse --show-toplevel)'
alias clp="tmux kill-pane" alias clp="tmux kill-pane"
alias clw="tmux kill-window" alias clw="tmux kill-window"
alias ct="cargo test"
alias d="docker" alias d="docker"
alias dc="docker-compose -f docker-compose.yml" alias dc="docker-compose -f docker-compose.yml"
alias dcd="docker-compose -f docker-compose.yml -f docker-compose.development.yml" alias dcd="docker-compose -f docker-compose.yml -f docker-compose.development.yml"
@ -103,7 +102,6 @@ alias kgp="kubectl get pod -o wide"
alias kgrpcurl="kubectl run grpcurl --image networld/grpcurl --image-pull-policy=Always -it --rm -- sh" alias kgrpcurl="kubectl run grpcurl --image networld/grpcurl --image-pull-policy=Always -it --rm -- sh"
alias kgs="kubectl get svc -o wide" alias kgs="kubectl get svc -o wide"
alias kmplayer="kubectl run mplayer --image olmesm/mplayer-docker:latest --image-pull-policy=Always -it --rm -- sh" alias kmplayer="kubectl run mplayer --image olmesm/mplayer-docker:latest --image-pull-policy=Always -it --rm -- sh"
alias kt="kubetail"
alias kw="kubectl get events -w" alias kw="kubectl get events -w"
alias ll="eza -l --group-directories-first --git" alias ll="eza -l --group-directories-first --git"
alias ls="eza --color=auto" alias ls="eza --color=auto"
@ -131,8 +129,8 @@ alias tp="telepresence"
alias tpl="telepresence list" alias tpl="telepresence list"
alias vim="nvim" alias vim="nvim"
alias wg="sudo wg" alias wg="sudo wg"
alias wgdown="sudo $HOME/script/wgdown" alias wgdown="sudo wgdown"
alias wgup="sudo $HOME/script/wgup" alias wgup="sudo wgup"
alias zzz="sudo systemctl hibernate" alias zzz="sudo systemctl hibernate"
ksecd() { kubectl get secret "$1" -o go-template='{{range $k,$v := .data}}{{printf "%s: " $k}}{{if not $v}}{{$v}}{{else}}{{$v | base64decode}}{{end}}{{"\n"}}{{end}}' } ksecd() { kubectl get secret "$1" -o go-template='{{range $k,$v := .data}}{{printf "%s: " $k}}{{if not $v}}{{$v}}{{else}}{{$v | base64decode}}{{end}}{{"\n"}}{{end}}' }
rgw() { SEARCH_TERM=$1; shift; rg -g '!vendor/' "\b$SEARCH_TERM\b" $* } rgw() { SEARCH_TERM=$1; shift; rg -g '!vendor/' "\b$SEARCH_TERM\b" $* }