Vim colourscheme/imports fix, base modifications
This commit is contained in:
@@ -23,9 +23,7 @@ Tools:
|
|||||||
* screenfetch
|
* screenfetch
|
||||||
|
|
||||||
Languages:
|
Languages:
|
||||||
* elm
|
|
||||||
* java
|
* java
|
||||||
* node (+ yarn, nvm)
|
* js (nvm, node yarn, nvm)
|
||||||
* python (+ poetry, pyenv)
|
* python (+ poetry, pyenv)
|
||||||
* ruby
|
* ruby
|
||||||
|
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ filetype on
|
|||||||
filetype plugin on
|
filetype plugin on
|
||||||
syntax on
|
syntax on
|
||||||
|
|
||||||
|
|
||||||
" ============================================================================ "
|
" ============================================================================ "
|
||||||
" === EDITING OPTIONS === "
|
" === EDITING OPTIONS === "
|
||||||
" ============================================================================ "
|
" ============================================================================ "
|
||||||
@@ -46,9 +47,6 @@ set cmdheight=2
|
|||||||
" Enable true color support
|
" Enable true color support
|
||||||
" set termguicolors
|
" set termguicolors
|
||||||
|
|
||||||
" Enable pseudo-transparency
|
|
||||||
set pumblend
|
|
||||||
|
|
||||||
" Change vertical split character to be a space (essentially hide it)
|
" Change vertical split character to be a space (essentially hide it)
|
||||||
set fillchars+=vert:.
|
set fillchars+=vert:.
|
||||||
|
|
||||||
@@ -61,11 +59,6 @@ set noshowmode
|
|||||||
" Set floating window to be slightly transparent
|
" Set floating window to be slightly transparent
|
||||||
set winbl=10
|
set winbl=10
|
||||||
|
|
||||||
" Editor theme
|
|
||||||
set background=dark
|
|
||||||
|
|
||||||
" Vim airline theme
|
|
||||||
|
|
||||||
" ============================================================================ "
|
" ============================================================================ "
|
||||||
" === MISC. === "
|
" === MISC. === "
|
||||||
" ============================================================================ "
|
" ============================================================================ "
|
||||||
@@ -98,5 +91,3 @@ endif
|
|||||||
set backupdir=$XDG_DATA_HOME/nvim/backup " Don't put backups in current dir
|
set backupdir=$XDG_DATA_HOME/nvim/backup " Don't put backups in current dir
|
||||||
set backup
|
set backup
|
||||||
set noswapfile
|
set noswapfile
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -1,3 +1,19 @@
|
|||||||
|
" No arrow keys
|
||||||
|
noremap <Up> <NOP>
|
||||||
|
noremap <Down> <NOP>
|
||||||
|
noremap <Left> <NOP>
|
||||||
|
noremap <Right> <NOP>
|
||||||
|
inoremap <Up> <NOP>
|
||||||
|
inoremap <Down> <NOP>
|
||||||
|
inoremap <Left> <NOP>
|
||||||
|
inoremap <Right> <NOP>
|
||||||
|
|
||||||
|
" Quick window switching
|
||||||
|
nmap <C-h> <C-w>h
|
||||||
|
nmap <C-j> <C-w>j
|
||||||
|
nmap <C-k> <C-w>k
|
||||||
|
nmap <C-l> <C-w>l
|
||||||
|
|
||||||
|
|
||||||
" ============================================================================ "
|
" ============================================================================ "
|
||||||
" === KEY MAPPINGS === "
|
" === KEY MAPPINGS === "
|
||||||
@@ -77,17 +93,6 @@ endfunction
|
|||||||
nmap <leader>n :NERDTreeToggle<CR>
|
nmap <leader>n :NERDTreeToggle<CR>
|
||||||
nmap <leader>f :NERDTreeFind<CR>
|
nmap <leader>f :NERDTreeFind<CR>
|
||||||
|
|
||||||
" <Space> - PageDown
|
|
||||||
" - - PageUp
|
|
||||||
noremap <Space> <PageDown>
|
|
||||||
noremap - <PageUp>
|
|
||||||
|
|
||||||
" Quick window switching
|
|
||||||
nmap <C-h> <C-w>h
|
|
||||||
nmap <C-j> <C-w>j
|
|
||||||
nmap <C-k> <C-w>k
|
|
||||||
nmap <C-l> <C-w>l
|
|
||||||
|
|
||||||
" === coc.nvim === "
|
" === coc.nvim === "
|
||||||
" <leader>dd - Jump to definition of current symbol
|
" <leader>dd - Jump to definition of current symbol
|
||||||
" <leader>dr - Jump to references of current symbol
|
" <leader>dr - Jump to references of current symbol
|
||||||
|
|||||||
@@ -7,13 +7,20 @@ call plug#begin('~/.config/nvim/plugged')
|
|||||||
Plug 'tpope/vim-sensible'
|
Plug 'tpope/vim-sensible'
|
||||||
|
|
||||||
" colorscheme
|
" colorscheme
|
||||||
Plug 'gilgigilgil/anderson.vim'
|
Plug 'flazz/vim-colorschemes'
|
||||||
silent! colorscheme anderson
|
|
||||||
|
|
||||||
|
|
||||||
" lint
|
" lint
|
||||||
Plug 'dense-analysis/ale'
|
Plug 'dense-analysis/ale'
|
||||||
let g:ale_fix_on_save = 1
|
let g:ale_fix_on_save = 1
|
||||||
|
let g:ale_lint_on_text_changed = 'always'
|
||||||
|
let g:ale_lint_delay = 1000
|
||||||
|
let g:ale_sign_error = '\ '
|
||||||
|
let g:ale_sign_warning = '\ '
|
||||||
|
|
||||||
|
" fixer configurations
|
||||||
|
let g:ale_fixers = {
|
||||||
|
\ '*': ['remove_trailing_lines', 'trim_whitespace'],
|
||||||
|
\}
|
||||||
|
|
||||||
" Intellisense Engine
|
" Intellisense Engine
|
||||||
Plug 'neoclide/coc.nvim', {'do': 'yarn install --frozen-lockfile'}
|
Plug 'neoclide/coc.nvim', {'do': 'yarn install --frozen-lockfile'}
|
||||||
@@ -76,7 +83,7 @@ Plug 'scrooloose/nerdtree'
|
|||||||
" Customized vim status line
|
" Customized vim status line
|
||||||
Plug 'vim-airline/vim-airline'
|
Plug 'vim-airline/vim-airline'
|
||||||
Plug 'vim-airline/vim-airline-themes'
|
Plug 'vim-airline/vim-airline-themes'
|
||||||
let g:airline_theme='onedark'
|
let g:airline_theme='badwolf'
|
||||||
|
|
||||||
" Icons
|
" Icons
|
||||||
Plug 'ryanoasis/vim-devicons'
|
Plug 'ryanoasis/vim-devicons'
|
||||||
@@ -86,6 +93,7 @@ Plug 'tiagofumo/vim-nerdtree-syntax-highlight'
|
|||||||
call plug#end()
|
call plug#end()
|
||||||
|
|
||||||
|
|
||||||
|
colorscheme badwolf
|
||||||
|
|
||||||
" ============================================================================ "
|
" ============================================================================ "
|
||||||
" === PLUGIN SETUP === "
|
" === PLUGIN SETUP === "
|
||||||
@@ -200,7 +208,7 @@ let g:NERDTreeDirArrowExpandable = ''
|
|||||||
let g:NERDTreeDirArrowCollapsible = ''
|
let g:NERDTreeDirArrowCollapsible = ''
|
||||||
|
|
||||||
" Hide certain files and directories from NERDTree
|
" Hide certain files and directories from NERDTree
|
||||||
let g:NERDTreeIgnore = ['^\.DS_Store$', '^tags$', '\.git$[[dir]]', '\.idea$[[dir]]', '\.sass-cache$']
|
let g:NERDTreeIgnore = ['\.git$[[dir]]']
|
||||||
|
|
||||||
" Wrap in try/catch to avoid errors on initial install before plugin is available
|
" Wrap in try/catch to avoid errors on initial install before plugin is available
|
||||||
try
|
try
|
||||||
@@ -266,53 +274,6 @@ let g:used_javascript_libs = 'underscore,requirejs,chai,jquery'
|
|||||||
let g:signify_sign_delete = '-'
|
let g:signify_sign_delete = '-'
|
||||||
|
|
||||||
|
|
||||||
" ============================================================================ "
|
|
||||||
" === CUSTOM COLORSCHEME CHANGES === "
|
|
||||||
" ============================================================================ "
|
|
||||||
"
|
|
||||||
" Add custom highlights in method that is executed every time a colorscheme is sourced
|
|
||||||
" See https://gist.github.com/romainl/379904f91fa40533175dfaec4c833f2f for details
|
|
||||||
function! TrailingSpaceHighlights() abort
|
|
||||||
" Hightlight trailing whitespace
|
|
||||||
highlight Trail ctermbg=red guibg=red
|
|
||||||
call matchadd('Trail', '\s\+$', 100)
|
|
||||||
endfunction
|
|
||||||
|
|
||||||
function! s:custom_jarvis_colors()
|
|
||||||
" coc.nvim color changes
|
|
||||||
hi link CocErrorSign WarningMsg
|
|
||||||
hi link CocWarningSign Number
|
|
||||||
hi link CocInfoSign Type
|
|
||||||
|
|
||||||
" Make background transparent for many things
|
|
||||||
hi Normal ctermbg=NONE guibg=NONE
|
|
||||||
hi NonText ctermbg=NONE guibg=NONE
|
|
||||||
hi LineNr ctermfg=NONE guibg=NONE
|
|
||||||
hi SignColumn ctermfg=NONE guibg=NONE
|
|
||||||
hi StatusLine guifg=#16252b guibg=#6699CC
|
|
||||||
hi StatusLineNC guifg=#16252b guibg=#16252b
|
|
||||||
|
|
||||||
" Try to hide vertical spit and end of buffer symbol
|
|
||||||
hi VertSplit gui=NONE guifg=#17252c guibg=#17252c
|
|
||||||
hi EndOfBuffer ctermbg=NONE ctermfg=NONE guibg=#17252c guifg=#17252c
|
|
||||||
|
|
||||||
" Customize NERDTree directory
|
|
||||||
hi NERDTreeCWD guifg=#99c794
|
|
||||||
|
|
||||||
" Make background color transparent for git changes
|
|
||||||
hi SignifySignAdd guibg=NONE
|
|
||||||
hi SignifySignDelete guibg=NONE
|
|
||||||
hi SignifySignChange guibg=NONE
|
|
||||||
|
|
||||||
" Highlight git change signs
|
|
||||||
hi SignifySignAdd guifg=#99c794
|
|
||||||
hi SignifySignDelete guifg=#ec5f67
|
|
||||||
hi SignifySignChange guifg=#c594c5
|
|
||||||
endfunction
|
|
||||||
|
|
||||||
autocmd! ColorScheme * call TrailingSpaceHighlights()
|
|
||||||
autocmd! ColorScheme codedark call s:custom_jarvis_colors()
|
|
||||||
|
|
||||||
" Call method on window enter
|
" Call method on window enter
|
||||||
augroup WindowManagement
|
augroup WindowManagement
|
||||||
autocmd!
|
autocmd!
|
||||||
@@ -334,4 +295,3 @@ endif
|
|||||||
|
|
||||||
" Disable deprecated python2 provider
|
" Disable deprecated python2 provider
|
||||||
let g:loaded_python_provider = 0
|
let g:loaded_python_provider = 0
|
||||||
|
|
||||||
|
|||||||
@@ -42,17 +42,16 @@ binaries: List[str] = [
|
|||||||
*shells,
|
*shells,
|
||||||
|
|
||||||
# tools
|
# tools
|
||||||
"git",
|
"git", "nvim",
|
||||||
"keybase", "firebase", "aws", "terraform",
|
"firebase", "aws", "terraform",
|
||||||
"docker", "docker-compose",
|
"docker", "docker-compose",
|
||||||
"screenfetch",
|
"screenfetch",
|
||||||
|
|
||||||
# language: python
|
# language: python
|
||||||
"pyenv", "python3", "pip3", "poetry",
|
"pyenv", "python3", "pip3", "poetry",
|
||||||
|
|
||||||
# langauge: node
|
# langauge: js
|
||||||
"nvm", "node", "npm", "yarn",
|
"nvm", "node", "npm", "yarn", "elm",
|
||||||
|
|
||||||
]
|
]
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user