This commit is contained in:
Andrejus
2020-07-14 21:05:55 +01:00
parent e8de4289d8
commit 7078a8cf71
4 changed files with 34 additions and 117 deletions

View File

@@ -83,3 +83,5 @@ fi
export NVM_DIR="$HOME/.config/nvm" export NVM_DIR="$HOME/.config/nvm"
[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm
[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" # This loads nvm bash_completion [ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" # This loads nvm bash_completion
[ -f ~/.fzf.bash ] && source ~/.fzf.bash

View File

@@ -1,4 +1,5 @@
set fileencoding=utf-8 set fileencoding=utf-8
set fileformat=unix set fileformat=unix
filetype on filetype on
filetype plugin on filetype plugin on

View File

@@ -14,78 +14,9 @@ nmap <C-j> <C-w>j
nmap <C-k> <C-w>k nmap <C-k> <C-w>k
nmap <C-l> <C-w>l nmap <C-l> <C-w>l
"fzf
" ============================================================================ " nnoremap <silent> <leader>p :FZF<cr>
" === KEY MAPPINGS === " nnoremap <silent> <leader>P :FZF ~<cr>
" ============================================================================ "
" === Denite shorcuts === "
" ; - Browser currently open buffers
" <leader>t - Browse list of files in current directory
" <leader>g - Search current directory for occurences of given term and close window if no results
" <leader>j - Search current directory for occurences of word under cursor
nmap ; :Denite buffer<CR>
nmap <leader>t :DeniteProjectDir file/rec<CR>
nnoremap <leader>g :<C-u>Denite grep:. -no-empty<CR>
nnoremap <leader>j :<C-u>DeniteCursorWord grep:.<CR>
" Define mappings while in 'filter' mode
" <C-o> - Switch to normal mode inside of search results
" <Esc> - Exit denite window in any mode
" <CR> - Open currently selected file in any mode
" <C-t> - Open currently selected file in a new tab
" <C-v> - Open currently selected file a vertical split
" <C-h> - Open currently selected file in a horizontal split
autocmd FileType denite-filter call s:denite_filter_my_settings()
function! s:denite_filter_my_settings() abort
imap <silent><buffer> <C-o>
\ <Plug>(denite_filter_quit)
inoremap <silent><buffer><expr> <Esc>
\ denite#do_map('quit')
nnoremap <silent><buffer><expr> <Esc>
\ denite#do_map('quit')
inoremap <silent><buffer><expr> <CR>
\ denite#do_map('do_action')
inoremap <silent><buffer><expr> <C-t>
\ denite#do_map('do_action', 'tabopen')
inoremap <silent><buffer><expr> <C-v>
\ denite#do_map('do_action', 'vsplit')
inoremap <silent><buffer><expr> <C-h>
\ denite#do_map('do_action', 'split')
endfunction
" Define mappings while in denite window
" <CR> - Opens currently selected file
" q or <Esc> - Quit Denite window
" d - Delete currenly selected file
" p - Preview currently selected file
" <C-o> or i - Switch to insert mode inside of filter prompt
" <C-t> - Open currently selected file in a new tab
" <C-v> - Open currently selected file a vertical split
" <C-h> - Open currently selected file in a horizontal split
autocmd FileType denite call s:denite_my_settings()
function! s:denite_my_settings() abort
nnoremap <silent><buffer><expr> <CR>
\ denite#do_map('do_action')
nnoremap <silent><buffer><expr> q
\ denite#do_map('quit')
nnoremap <silent><buffer><expr> <Esc>
\ denite#do_map('quit')
nnoremap <silent><buffer><expr> d
\ denite#do_map('do_action', 'delete')
nnoremap <silent><buffer><expr> p
\ denite#do_map('do_action', 'preview')
nnoremap <silent><buffer><expr> i
\ denite#do_map('open_filter_buffer')
nnoremap <silent><buffer><expr> <C-o>
\ denite#do_map('open_filter_buffer')
nnoremap <silent><buffer><expr> <C-t>
\ denite#do_map('do_action', 'tabopen')
nnoremap <silent><buffer><expr> <C-v>
\ denite#do_map('do_action', 'vsplit')
nnoremap <silent><buffer><expr> <C-h>
\ denite#do_map('do_action', 'split')
endfunction
" === Nerdtree shorcuts === " " === Nerdtree shorcuts === "
" <leader>n - Toggle NERDTree on/off " <leader>n - Toggle NERDTree on/off
@@ -98,12 +29,10 @@ nmap <leader>f :NERDTreeFind<CR>
" <leader>dr - Jump to references of current symbol " <leader>dr - Jump to references of current symbol
" <leader>dj - Jump to implementation of current symbol " <leader>dj - Jump to implementation of current symbol
" <leader>ds - Fuzzy search current project symbols " <leader>ds - Fuzzy search current project symbols
" <leader>p - Run Prettier formatter on file
nmap <silent> <leader>dd <Plug>(coc-definition) nmap <silent> <leader>dd <Plug>(coc-definition)
nmap <silent> <leader>dr <Plug>(coc-references) nmap <silent> <leader>dr <Plug>(coc-references)
nmap <silent> <leader>dj <Plug>(coc-implementation) nmap <silent> <leader>dj <Plug>(coc-implementation)
nnoremap <silent> <leader>ds :<C-u>CocList -I -N --top symbols<CR> nnoremap <silent> <leader>ds :<C-u>CocList -I -N --top symbols<CR>
nmap <silent> <leader>p :Prettier<CR>
" === vim-better-whitespace === " " === vim-better-whitespace === "
" <leader>y - Automatically remove trailing whitespace " <leader>y - Automatically remove trailing whitespace
@@ -121,13 +50,3 @@ map <leader>w <Plug>(easymotion-bd-w)
" Allows you to save files you opened without write permissions via sudo " Allows you to save files you opened without write permissions via sudo
cmap w!! w !sudo tee % cmap w!! w !sudo tee %
" === vim-jsdoc shortcuts ==="
" Generate jsdoc for function under cursor
nmap <leader>z :JsDoc<CR>
" Delete current visual selection and dump in black hole buffer before pasting
" Used when you want to paste over something without it getting copied to
" Vim's default buffer
vnoremap <leader>p "_dP

View File

@@ -3,67 +3,35 @@
" ============================================================================ " " ============================================================================ "
call plug#begin('~/.config/nvim/plugged') call plug#begin('~/.config/nvim/plugged')
" Sensible (?) defaults " Sensible (?) defaults
Plug 'tpope/vim-sensible' Plug 'tpope/vim-sensible'
" colorscheme " colorscheme
Plug 'flazz/vim-colorschemes' Plug 'flazz/vim-colorschemes'
" Icons " Icons
Plug 'ryanoasis/vim-devicons' Plug 'ryanoasis/vim-devicons'
" File explorer " File explorer
Plug 'scrooloose/nerdtree' Plug 'scrooloose/nerdtree'
Plug 'tiagofumo/vim-nerdtree-syntax-highlight' Plug 'tiagofumo/vim-nerdtree-syntax-highlight'
" Show hidden files/directories
let g:NERDTreeShowHidden = 1
" Remove bookmarks and help text from NERDTree
let g:NERDTreeMinimalUI = 1
" Custom icons for expandable/expanded directories
let g:NERDTreeDirArrowExpandable = ''
let g:NERDTreeDirArrowCollapsible = ''
" Hide certain files and directories from NERDTree
let g:NERDTreeIgnore = ['\.git$[[dir]]']
" 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='badwolf'
" === Languages === " " === Languages === "
" lint " lint
Plug 'dense-analysis/ale' Plug 'dense-analysis/ale'
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 = '\ '
let g:ale_fixers = {
\ '*': ['remove_trailing_lines', 'trim_whitespace'],
\}
" Intellisense Engine " Intellisense Engine
Plug 'neoclide/coc.nvim', {'branch': 'release'} Plug 'neoclide/coc.nvim', {'branch': 'release'}
" fzf " fzf
Plug 'junegunn/fzf', { 'do': { -> fzf#install() } } Plug 'junegunn/fzf', { 'dir': '~/.fzf', 'do': './install --all' }
" elm " elm
Plug 'elmcast/elm-vim' Plug 'elmcast/elm-vim'
let g:elm_setup_keybindings = 0
" DOcumentation GEneraton " DOcumentation GEneraton
@@ -109,6 +77,33 @@ call plug#end()
colorscheme badwolf colorscheme badwolf
" Show hidden files/directories
let g:NERDTreeShowHidden = 1
" Remove bookmarks and help text from NERDTree
let g:NERDTreeMinimalUI = 1
" Custom icons for expandable/expanded directories
let g:NERDTreeDirArrowExpandable = ''
let g:NERDTreeDirArrowCollapsible = ''
" Hide certain files and directories from NERDTree
let g:NERDTreeIgnore = ['\.git$[[dir]]']
let g:elm_setup_keybindings = 0
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 = '\ '
let g:ale_fixers = {
\ '*': ['remove_trailing_lines', 'trim_whitespace'],
\}
let g:airline_theme='badwolf'
" 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