Minor updates

This commit is contained in:
Jesper Fussing Mørk 2020-10-23 12:55:37 +02:00
parent b4b71ddeb4
commit f75cda02cb
3 changed files with 30 additions and 16 deletions

View File

@ -18,7 +18,7 @@ set rtp^=/usr/share/vim/vimfiles/
set undodir=~/.local/share/nvim/undodir set undodir=~/.local/share/nvim/undodir
set undofile set undofile
set colorcolumn=80 set colorcolumn=80
" set foldmethod=syntax set foldmethod=indent
set foldlevelstart=20 set foldlevelstart=20
set number set number
set relativenumber set relativenumber
@ -35,27 +35,34 @@ Plug 'vim-airline/vim-airline-themes'
" Completion " Completion
Plug 'SirVer/ultisnips' Plug 'SirVer/ultisnips'
Plug 'mlaursen/vim-react-snippets'
Plug 'epilande/vim-es2015-snippets'
Plug 'honza/vim-snippets' Plug 'honza/vim-snippets'
Plug 'epilande/vim-react-snippets'
Plug 'neoclide/coc.nvim', {'branch': 'release'} Plug 'neoclide/coc.nvim', {'branch': 'release'}
let g:coc_global_extensioons = [
" Pretty parenthesis \ 'coc-tsserver',
Plug 'luochen1990/rainbow' \ 'coc-json',
\ 'coc-python',
\ 'coc-snippets',
\ 'coc-prettier',
\ 'coc-eslint'
\]
" File handling " File handling
Plug 'justinmk/vim-dirvish' Plug 'preservim/nerdtree'
Plug 'junegunn/fzf', { 'dir': '~/.fzf', 'do': './install --all' } Plug 'junegunn/fzf', { 'dir': '~/.fzf', 'do': './install --all' }
Plug 'junegunn/fzf.vim' Plug 'junegunn/fzf.vim'
" Python " Python
Plug 'w0rp/ale' Plug 'w0rp/ale'
Plug 'ambv/black' Plug 'numirias/semshi', {'do': ':UpdateRemotePlugins'}
" HTML " HTML
Plug 'jonsmithers/vim-html-template-literals' Plug 'jonsmithers/vim-html-template-literals'
Plug 'MaxMEllon/vim-jsx-pretty' Plug 'MaxMEllon/vim-jsx-pretty'
Plug 'pangloss/vim-javascript' Plug 'pangloss/vim-javascript'
Plug 'alvan/vim-closetag' Plug 'leafgarland/typescript-vim'
Plug 'peitalin/vim-jsx-typescript'
" Markdown " Markdown
Plug 'plasticboy/vim-markdown' Plug 'plasticboy/vim-markdown'
@ -66,6 +73,7 @@ Plug 'janko/vim-test'
" Editing " Editing
Plug 'tpope/vim-surround' Plug 'tpope/vim-surround'
Plug 'pseewald/vim-anyfold'
" Git " Git
Plug 'airblade/vim-gitgutter' Plug 'airblade/vim-gitgutter'
@ -93,21 +101,15 @@ inoremap <silent><expr> <c-space> coc#refresh()
nmap <silent> <C-F10> :TestNearest<CR> nmap <silent> <C-F10> :TestNearest<CR>
nmap <silent> <S-F10> :TestFile<CR> nmap <silent> <S-F10> :TestFile<CR>
"Rainbow Parentheses
let g:rainbow_active = 1
" HTML " HTML
let g:closetag_filenames = '*.html,*.js' let g:closetag_filenames = '*.html,*.js'
let g:html_indent_style1 = "inc" let g:html_indent_style1 = "inc"
" Black
autocmd BufWritePre *.py execute ':Black'
" FZF " FZF
let $FZF_DEFAULT_COMMAND = 'ag --ignore .git -g ""' let $FZF_DEFAULT_COMMAND = 'ag --ignore .git -g ""'
command! -bang -nargs=? -complete=dir HFiles command! -bang -nargs=? -complete=dir HFiles
\ call fzf#vim#files(<q-args>, {'source': 'ag --hidden --ignore .git -g ""'}, <bang>0) \ call fzf#vim#files(<q-args>, {'source': 'ag --hidden --ignore .git -g ""'}, <bang>0)
map <M-1> <Plug>(dirvish_up) map <M-1> :NERDTreeToggle<CR>
map <M-2> :HFiles<CR> map <M-2> :HFiles<CR>
map <M-3> :Buffers<CR> map <M-3> :Buffers<CR>
@ -128,9 +130,10 @@ nmap <Leader>gn <Plug>(GitGutterNextHunk) " git next
nmap <Leader>gp <Plug>(GitGutterPrevHunk) " git previous nmap <Leader>gp <Plug>(GitGutterPrevHunk) " git previous
nmap <Leader>ga <Plug>(GitGutterStageHunk) " git add (chunk) nmap <Leader>ga <Plug>(GitGutterStageHunk) " git add (chunk)
nmap <Leader>gu <Plug>(GitGutterUndoHunk) " git undo (chunk) nmap <Leader>gu <Plug>(GitGutterUndoHunk) " git undo (chunk)
nmap <M-p> <Plug>MarkdownPreview
"AutoCommands "AutoCommands
au FileType json setlocal equalprg=jq\ . au FileType json setlocal equalprg=jq\ .
au FileType xml setlocal equalprg=xmllint\ --format\ --recover\ -\ 2>/dev/null au FileType xml setlocal equalprg=xmllint\ --format\ --recover\ -\ 2>/dev/null
autocmd FileType python setlocal completeopt-=preview autocmd FileType python setlocal completeopt-=preview
autocmd BufEnter *.{js,jsx,ts,tsx} :syntax sync fromstart
autocmd BufLeave *.{js,jsx,ts,tsx} :syntax sync clear

5
zsh/.nvim-script.sh Executable file
View File

@ -0,0 +1,5 @@
#!/bin/bash
export NVIM_LISTEN_ADDRESS=/tmp/nvim$(uuidgen)
termite -e tmux

6
zsh/.tmux-script.sh Executable file
View File

@ -0,0 +1,6 @@
#!/bin/bash
export NVIM_LISTEN_ADDRESS=
tmux setenv NVIM_LISTEN_ADDRESS=/tmp/nvim$(uuidgen)