diff --git a/nvim/coc-settings.json b/nvim/coc-settings.json index fabc7bf..a06293b 100644 --- a/nvim/coc-settings.json +++ b/nvim/coc-settings.json @@ -4,6 +4,7 @@ "git.removedSign.hlGroup": "GitGutterDelete", "git.topRemovedSign.hlGroup": "GitGutterDelete", "git.changeRemovedSign.hlGroup": "GitGutterChangeDelete", + "git.addGBlameToVirtualText": true, "languageserver": { "terraform": { "command": "terraform-ls", @@ -22,16 +23,14 @@ "json", "graphql", "prisma", - "terraform" + "terraform", + "jsonc" ], "tsserver.formatOnType": true, "coc.preferences.formatOnType": true, "yaml.schemaStore.enable": true, "yaml.schemas": { - "kubernetes": [ - "/**/kubernetes/**/*.yaml", - "/**/k8s/**/*.yaml" - ], + "kubernetes": ["/**/kubernetes/**/*.yaml", "/**/k8s/**/*.yaml"], "https://json.schemastore.org/github-workflow.json": "/.github/workflows/*.yaml" } } diff --git a/nvim/init.vim b/nvim/init.vim index e251f60..babaa1a 100644 --- a/nvim/init.vim +++ b/nvim/init.vim @@ -44,6 +44,11 @@ let g:coc_global_extensions = [ \ 'coc-prisma', \ 'coc-sh', \ 'coc-typos', + \ 'coc-docker', + \ 'coc-go', + \ 'coc-html', + \ 'coc-sql', + \ 'coc-toml', \ ] if isdirectory('./node_modules') && isdirectory('./node_modules/prettier') let g:coc_global_extensions += ['coc-prettier'] @@ -156,6 +161,12 @@ require'nvim-treesitter.configs'.setup { } EOF +""""" +"--- Custom Configurations +augroup JsonToJsonc + autocmd! FileType json set filetype=jsonc +augroup END + """"" "--- Telescope Configuration lua < key @@ -216,7 +231,7 @@ nnoremap let mapleader = " " " Telescope -nnoremap Telescope find_files +nnoremap Telescope git_files nnoremap ff Telescope find_files nnoremap fg Telescope live_grep " Telescope git diff --git a/zsh/zshrc b/zsh/zshrc index 5b10ae0..b198a9b 100644 --- a/zsh/zshrc +++ b/zsh/zshrc @@ -54,6 +54,9 @@ export PATH=$PATH:$HOME/.bin:$HOME/go/bin:/snap/bin # ENV export EDITOR=vim +# Nix fix +export LOCALE_ARCHIVE=/usr/lib/locale/locale-archive + # Starship export STARSHIP_CONFIG=~/.starship.toml eval "$(starship init zsh)"