andrejus/dotfiles
1
1
Fork 0
Code Issues Activity

coc auto formatting updates, airline theme, formatting

Browse Source
This commit is contained in:
Andrejus
2020-11-09 18:21:18 +00:00
parent 75b5a04b97
commit 5f6eec0996
9 changed files with 145 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
files/.config/nvim/base.vim
View File

@@ -49,7 +49,7 @@ set updatetime=100
set timeoutlen=300
" Don't pass messages to |ins-completion-menu|.
set shortmess+=c
set shortmess=atT
" Always show the signcolumn, otherwise it would shift the text each time
" diagnostics appear/become resolved.

174
files/.config/nvim/coc-settings.json
View File

@@ -1,99 +1,113 @@
{
"coc.preferences.formatOnSaveFiletypes": [""],
"coc.preferences.extensionUpdateCheck": "daily",
"coc.preferences.formatOnSaveFiletypes": [
"css",
"dockerfile",
"html",
"javascript",
"javascriptreact",
"json",
"make",
"markdown",
"perl",
"python",
"sh",
"svg",
"toml",
"typescript",
"typescriptreact",
"vim",
"xml",
"yaml"
],
"coc.preferences.extensionUpdateCheck": "daily",
"list.source.files.args": ["--hidden" , "--files"],
"list.source.files.args": ["--hidden", "--files"],
"suggest.echodocSupport": true,
"suggest.echodocSupport": true,
"python.pythonPath": "python3",
"python.jediEnabled": false,
"python.linting.flake8Enabled": true,
"python.linting.pylintEnabled": false,
"python.pythonPath": "python3",
"python.jediEnabled": false,
"python.linting.flake8Enabled": true,
"python.linting.pylintEnabled": false,
"languageserver": {
"terraform": {
"command": "terraform-ls",
"args": ["serve"],
"filetypes": ["tf", "terraform"],
"initializationOptions": {},
"settings": {}
}
},
"languageserver": {
"terraform": {
"command": "terraform-ls",
"args": ["serve"],
"filetypes": ["tf", "terraform"],
"initializationOptions": {},
"settings": {}
}
},
"explorer.width": 30,
"explorer.file.root.template": "[icon] [git] [hidden & 1][root]",
"explorer.icon.enableNerdfont": true,
"explorer.previewAction.onHover": false,
"explorer.icon.enableVimDevicons": false,
"explorer.file.showHiddenFiles": true,
"explorer.file.autoReveal": true,
"explorer.keyMappings.global": {
"i": false,
"explorer.width": 30,
"explorer.file.root.template": "[icon] [git] [hidden & 1][root]",
"explorer.icon.enableNerdfont": true,
"explorer.previewAction.onHover": false,
"explorer.icon.enableVimDevicons": false,
"explorer.file.showHiddenFiles": true,
"explorer.file.autoReveal": true,
"explorer.keyMappings.global": {
"i": false,
"gk": "expandablePrev",
"gj": "expandableNext",
"gk": "expandablePrev",
"gj": "expandableNext",
"*": "toggleSelection",
"<tab>": "actionMenu",
"*": "toggleSelection",
"<tab>": "actionMenu",
"h": "collapse",
"l": ["expandable?", "expand", "open"],
"J": ["toggleSelection", "nodeNext"],
"K": ["toggleSelection", "nodePrev"],
"gl": "expandRecursive",
"gh": "collapseRecursive",
"<2-LeftMouse>": [
"expandable?",
["expanded?", "collapse", "expand"],
"open"
],
"o": ["expanded?", "collapse", "expand"],
"<cr>": ["expandable?", "cd", "open"],
"e": "open",
"s": "open:split",
"S": "open:split:plain",
"E": "open:vsplit",
"t": "open:tab",
"<bs>": "gotoParent",
"gp": "preview:labeling",
"h": "collapse",
"l": ["expandable?", "expand", "open"],
"J": ["toggleSelection", "nodeNext"],
"K": ["toggleSelection", "nodePrev"],
"gl": "expandRecursive",
"gh": "collapseRecursive",
"y": "copyFilepath",
"Y": "copyFilename",
"c": "copyFile",
"x": "cutFile",
"p": "pasteFile",
"d": "delete",
"D": "deleteForever",
"o": ["expanded?", "collapse", "expand"],
"<cr>": ["expandable?", "cd", "open"],
"e": "open",
"s": "open:split",
"v": "open:vsplit",
"t": "open:tab",
"<bs>": "gotoParent",
"gp": "preview:labeling",
"a": "addFile",
"A": "addDirectory",
"r": "rename",
"y": "copyFilepath",
"Y": "copyFilename",
"c": "copyFile",
"x": "cutFile",
"p": "pasteFile",
"d": "delete",
"D": "deleteForever",
".": "toggleHidden",
"R": "refresh",
"a": "addFile",
"A": "addDirectory",
"r": "rename",
"?": "help",
"q": "quit",
"<esc>": "esc",
"X": "systemExecute",
"gd": "listDrive",
".": "toggleHidden",
"R": "refresh",
"f": "search",
"F": "searchRecursive",
"?": "help",
"q": "quit",
"<esc>": "esc",
"X": "systemExecute",
"gd": "listDrive",
"gf": "gotoSource:file",
"gb": "gotoSource:buffer",
"f": "search",
"F": "searchRecursive",
"[[": "sourcePrev",
"]]": "sourceNext",
"gf": "gotoSource:file",
"gb": "gotoSource:buffer",
"[d": "diagnosticPrev",
"]d": "diagnosticNext",
"[[": "sourcePrev",
"]]": "sourceNext",
"[c": "gitPrev",
"]c": "gitNext",
"<<": "gitStage",
">>": "gitUnstage"
}
"[d": "diagnosticPrev",
"]d": "diagnosticNext",
"[c": "gitPrev",
"]c": "gitNext",
"<<": "gitStage",
">>": "gitUnstage"
}
}

24
files/.config/nvim/mappings.vim
View File

@@ -87,10 +87,13 @@ nmap <silent> <leader>E :CocCommand explorer --reveal expand('<sfile>')<cr>
" <l>j - Jump to implementation of current symbol
" <l>s - Fuzzy search current project symbols
" <l>n - Symbol renaming
" <l>k - Symbol renaming
nmap <silent> <C-n> <Plug>(coc-diagnostic-prev)
nmap <silent> <C-p> <Plug>(coc-diagnostic-next)
" broken d
nmap <silent> <leader>d <Plug>(coc-definition)
nmap <silent> <leader>r <Plug>(coc-references)
" broken j
nmap <silent> <leader>j <Plug>(coc-implementation)
nmap <silent> <leader>s :<C-u>CocList -I -N --top symbols<cr>
nmap <silent> <leader>n <Plug>(coc-rename)
@@ -103,25 +106,6 @@ nnoremap <leader>h :%s///<left><left>
nnoremap <silent> <leader>/ :nohlsearch<cr>
" use <tab> for trigger completion and navigate to next complete item
inoremap <silent><expr> <TAB>
\ pumvisible() ? "\<C-n>" :
\ <SID>check_back_space() ? "\<TAB>" :
\ coc#refresh()
inoremap <expr><S-TAB> pumvisible() ? "\<C-p>" : "\<C-h>"
function! s:check_back_space() abort
let col = col('.') - 1
return !col || getline('.')[col - 1] =~ '\s'
endfunction
" Use <c-space> to trigger completion.
if has('nvim')
inoremap <silent><expr> <c-space> coc#refresh()
else
inoremap <silent><expr> <c-@> coc#refresh()
endif
" Use K to show documentation in preview window.
nnoremap <silent> K :call <SID>show_documentation()<cr>
@@ -145,5 +129,3 @@ augroup mygroup
" Update signature help on jump placeholder.
autocmd User CocJumpPlaceholder call CocActionAsync('showSignatureHelp')
augroup end

12
files/.config/nvim/plugins.vim
View File

@@ -17,7 +17,11 @@ Plug 'ryanoasis/vim-devicons'
" status line
Plug 'vim-airline/vim-airline'
Plug 'vim-airline/vim-airline-themes'
" {{{
" Theme
let g:airline_theme = 'base16_seti'
" Enable extensions
let g:airline_extensions = ['branch', 'coc', 'hunks']
@@ -124,24 +128,32 @@ Plug 'neoclide/coc.nvim', {'do': 'yarn install --frozen-lockfile'}
" {{{
let g:coc_global_extensions = [
\ 'coc-actions',
\ 'coc-clangd',
\ 'coc-css',
\ 'coc-docker',
\ 'coc-emmet',
\ 'coc-emoji',
\ 'coc-eslint',
\ 'coc-explorer',
\ 'coc-fish',
\ 'coc-fzf-preview',
\ 'coc-git',
\ 'coc-go',
\ 'coc-groovy',
\ 'coc-highlight',
\ 'coc-html',
\ 'coc-json',
\ 'coc-lists',
\ 'coc-marketplace',
\ 'coc-perl',
\ 'coc-prettier',
\ 'coc-python',
\ 'coc-rust-analyzer',
\ 'coc-sh',
\ 'coc-snippets',
\ 'coc-svg',
\ 'coc-tabnine',
\ 'coc-toml',
\ 'coc-tsserver',
\ 'coc-vimlsp',
\ 'coc-xml',

7
files/.profile
View File

@@ -61,10 +61,11 @@ export VISUAL="nvim"
# fzf
export FZF_DEFAULT_OPTS="--reverse --margin=1,5%"
export FZF_DEFAULT_COMMAND='rg --files --smart-case --hidden --follow --no-ignore-vcs'
export FZF_DEFAULT_COMMAND='fdfind --type f --hidden --follow --exclude .git'
export FZF_CTRL_T_COMMAND="$FZF_DEFAULT_COMMAND"
export FZF_COMPLETION_TRIGGER='**'
# do not use fishlogin
# do not use fishlogin for subshells
export SHELL=/bin/sh
# _ _ _ ____
@@ -80,3 +81,5 @@ alias vi='vim'
alias bat='batcat'
alias cat='bat'
alias j="z"