summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--coc-settings.json28
-rw-r--r--keys/mappings.vim20
-rw-r--r--vim-plug/plugins.vim6
3 files changed, 32 insertions, 22 deletions
diff --git a/coc-settings.json b/coc-settings.json
index 641e3730..623bb95e 100644
--- a/coc-settings.json
+++ b/coc-settings.json
@@ -1,7 +1,12 @@
{
-
// suggestions
// "suggest.echodocSupport": true,
+ // TODO add more labels and give them cool glyphs
+ "suggest.completionItemKindLabels": {
+ "text": "t",
+ "method": "m",
+ "function": "f"
+ },
// diagnostics
"diagnostic.errorSign": "✗",
@@ -18,7 +23,16 @@
"list.selectedSignText": " ",
// autoformat
- "coc.preferences.formatOnSaveFiletypes": ["css", "markdown", "javascript", "graphql", "html", "yaml", "json", "python"],
+ "coc.preferences.formatOnSaveFiletypes": [
+ "css",
+ "markdown",
+ "javascript",
+ "graphql",
+ "html",
+ "yaml",
+ "json",
+ "python"
+ ],
"coc.preferences.hoverTarget": "float",
// python config
@@ -26,23 +40,19 @@
"python.linting.pylintEnabled": true,
// snippets
- "snippets.ultisnips.directories":
- [
- "UltiSnips",
- "~/.config/nvim/utils/snips"
- ],
+ "snippets.ultisnips.directories": ["UltiSnips", "~/.config/nvim/utils/snips"],
// explorer
"explorer.width": 30,
"explorer.icon.enableNerdfont": true,
"explorer.previewAction.onHover": false,
- "explorer.icon.enableVimDevicons": true,
+ "explorer.icon.enableVimDevicons": false,
"explorer.keyMappings": {
"<cr>": ["expandable?", "expand", "open"],
"v": "open:vsplit"
},
- "languageserver":{
+ "languageserver": {
"bash": {
"command": "bash-language-server",
"args": ["start"],
diff --git a/keys/mappings.vim b/keys/mappings.vim
index 3e1d5741..33802954 100644
--- a/keys/mappings.vim
+++ b/keys/mappings.vim
@@ -27,18 +27,18 @@ else
" nnoremap <c-u> viwU<Esc>
" TAB in general mode will move to text buffer
- nnoremap <TAB> :bnext<CR>
+ nnoremap <silent> <TAB> :bnext<CR>
" SHIFT-TAB will go back
- nnoremap <S-TAB> :bprevious<CR>
+ nnoremap <silent> <S-TAB> :bprevious<CR>
" Alternate way to save
- nnoremap <C-s> :w<CR>
+ nnoremap <silent> <C-s> :w<CR>
" Alternate way to quit
- nnoremap <C-Q> :wq!<CR>
+ nnoremap <silent> <C-Q> :wq!<CR>
" Use control-c instead of escape
- nnoremap <C-c> <Esc>
+ nnoremap <silent> <C-c> <Esc>
" <TAB>: completion.
- inoremap <expr><TAB> pumvisible() ? "\<C-n>" : "\<TAB>"
+ inoremap <silent> <expr><TAB> pumvisible() ? "\<C-n>" : "\<TAB>"
" Better window navigation
@@ -48,9 +48,9 @@ else
nnoremap <C-l> <C-w>l
" Use alt + hjkl to resize windows
- nnoremap <M-j> :resize -2<CR>
- nnoremap <M-k> :resize +2<CR>
- nnoremap <M-h> :vertical resize -2<CR>
- nnoremap <M-l> :vertical resize +2<CR>
+ nnoremap <silent> <M-j> :resize -2<CR>
+ nnoremap <silent> <M-k> :resize +2<CR>
+ nnoremap <silent> <M-h> :vertical resize -2<CR>
+ nnoremap <silent> <M-l> :vertical resize +2<CR>
endif
diff --git a/vim-plug/plugins.vim b/vim-plug/plugins.vim
index 4031da3d..8f8eb989 100644
--- a/vim-plug/plugins.vim
+++ b/vim-plug/plugins.vim
@@ -47,13 +47,13 @@ call plug#begin('~/.config/nvim/autoload/plugged')
Plug 'alvan/vim-closetag'
" Themes
Plug 'christianchiarulli/onedark.vim'
- Plug 'kaicataldo/material.vim'
- Plug 'NLKNguyen/papercolor-theme'
+ " Plug 'kaicataldo/material.vim'
+ " Plug 'NLKNguyen/papercolor-theme'
" Intellisense
Plug 'neoclide/coc.nvim', {'branch': 'release'}
" Status Line
Plug 'vim-airline/vim-airline'
- Plug 'vim-airline/vim-airline-themes'
+ " Plug 'vim-airline/vim-airline-themes'
" Ranger
Plug 'francoiscabrol/ranger.vim'
Plug 'rbgrouleff/bclose.vim'