From f75cda02cb4340d64bc7450807dcbcd8a92bd8aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jesper=20Fussing=20M=C3=B8rk?= <jfm@moerks.dk>
Date: Fri, 23 Oct 2020 12:55:37 +0200
Subject: [PATCH] Minor updates

---
 neovim/.config/nvim/init.vim | 35 +++++++++++++++++++----------------
 zsh/.nvim-script.sh          |  5 +++++
 zsh/.tmux-script.sh          |  6 ++++++
 3 files changed, 30 insertions(+), 16 deletions(-)
 create mode 100755 zsh/.nvim-script.sh
 create mode 100755 zsh/.tmux-script.sh

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