From b04fadd5abcbeedf96acd3140546df5e361ac25c Mon Sep 17 00:00:00 2001 From: Urbain Vaes Date: Fri, 24 Apr 2015 22:31:48 +0100 Subject: modified make for neovim --- make | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'make') diff --git a/make b/make index b706c27..4bc56f1 100755 --- a/make +++ b/make @@ -17,10 +17,9 @@ for file in $files; do ln -s $dir/$file ~/.$file done -# SSMTP config -echo ssmtp.conf -sudo mv /etc/ssmtp/ssmtp.conf $olddir -sudo ln -s $dir/ssmtp.conf /etc/ssmtp/ +# Symlink for neovim +ln -s $dir/vim ~/.nvim +ln -s $dir/vim/vimrc ~/.nvim/nvimrc # Solarized cd -- cgit v1.2.3 From 86e42e709711d4b45bb39bf8d81c1f484bc895c2 Mon Sep 17 00:00:00 2001 From: Urbain Vaes Date: Fri, 24 Apr 2015 22:59:49 +0100 Subject: Integration of neovim in workflow --- make | 4 +- vim/vimrc | 178 ------------------------------------------------------------ vimrc | 184 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ zshrc | 1 + 4 files changed, 187 insertions(+), 180 deletions(-) delete mode 100644 vim/vimrc create mode 100644 vimrc (limited to 'make') diff --git a/make b/make index 4bc56f1..4f88752 100755 --- a/make +++ b/make @@ -4,7 +4,7 @@ dir=~/dotfiles olddir=~/dotfiles_old # Files to sync -files="vim mutt passwords vifm msmtprc bashrc zshrc xmodmap mynotes tmux.conf zathurarc offlineimaprc offlineimap.py inputrc latexmkrc crontab gitconfig" +files="vim vimrc mutt passwords vifm msmtprc bashrc zshrc xmodmap mynotes tmux.conf zathurarc offlineimaprc offlineimap.py inputrc latexmkrc crontab gitconfig" rm -rf $olddir mkdir -p $olddir @@ -19,7 +19,7 @@ done # Symlink for neovim ln -s $dir/vim ~/.nvim -ln -s $dir/vim/vimrc ~/.nvim/nvimrc +ln -s $dir/vimrc ~/.nvimrc # Solarized cd diff --git a/vim/vimrc b/vim/vimrc deleted file mode 100644 index 941bc48..0000000 --- a/vim/vimrc +++ /dev/null @@ -1,178 +0,0 @@ -"" Required by Vundle - -set nocompatible -filetype off -set rtp+=~/.vim/bundle/vundle/ -call vundle#rc() - -"" Plugins -Plugin 'gmarik/vundle' -Plugin 'istib/vifm.vim' -Plugin 'LaTeX-Box-Team/latex-box' -Plugin 'SirVer/ultisnips' -Plugin 'altercation/vim-colors-solarized' -Plugin 'christoomey/vim-tmux-navigator' -Plugin 'godlygeek/tabular' -Plugin 'gregsexton/gitv' -Plugin 'honza/vim-snippets' -Plugin 'kien/ctrlp.vim' -Plugin 'scrooloose/nerdtree' -Plugin 'sjl/Gundo.vim' -Plugin 'tommcdo/vim-exchange' -Plugin 'tpope/vim-commentary' -Plugin 'tpope/vim-fugitive' -Plugin 'tpope/vim-obsession' -Plugin 'tpope/vim-repeat' -Plugin 'tpope/vim-scriptease' -Plugin 'tpope/vim-sensible' -Plugin 'tpope/vim-surround' -Plugin 'tpope/vim-unimpaired' - -filetype plugin indent on -syntax on - -" Leader maps -let mapleader = "\\" -let maplocalleader = "-" -nmap - -" Plugins options -let g:ctrlp_map = '' -let g:ctrlp_cmd = 'CtrlPBuffer' -let g:ctrlp_by_filename = 1 -let g:ctrlp_working_path_mode = 'r' -let g:ctrlp_show_hidden = 1 -let g:ctrlp_open_new_file = 't' -let g:ctrlp_user_command = ['.git/', 'git --git-dir=%s/.git ls-files -oc --exclude-standard'] - -let g:UltiSnipsExpandTrigger="" -let g:UltiSnipsJumpForwardTrigger="" -let g:UltiSnipsJumpBackwardTrigger="" -let g:UltiSnipsListSnippets="" -let g:UltiSnipsEditSplit="horizontal" -let g:UltiSnipsSnippetsDir="~/.vim/mySnippets" -let g:UltiSnipsSnippetDirectories=['UltiSnips', 'mySnippets'] - -let g:tex_flavor='latex' -let g:tex_conceal= 'adgm' -let g:LatexBox_Folding=0 -let g:LatexBox_viewer='zathura' -let g:LatexBox_latexmk_preview_continuously=1 -let g:LatexBox_quickfix=2 -function! SynctexShow() - let synctex = glob("*.synctex.gz") - if strlen(synctex) == 0 - echom "no synctex file found" - else - let pdffile = substitute(synctex,"synctex.gz","pdf","") - let execline = printf(":!zathura --synctex-forward %d:%d:%s %s", line('.'), col('.'), shellescape(bufname("%")), shellescape(pdffile)) - exec execline - end -endfunction - -" Gundo -nnoremap :GundoToggle - -" Nerdtree -nnoremap :NERDTreeToggle -let NERDTreeIgnore=['\.pdf$', '\~$','\.toc$', - \ '\.fls$','\.bbl$','\.blg$', - \ '\.out$', '\.log$','\.aux$','\.sty$', - \ '\.fdb_latexmk$', '\.synctex.gz$','\.latexmain$'] - -"" Options - -" Tabs and indent -set smartindent -set expandtab -set tabstop=4 -set softtabstop=4 -set shiftwidth=4 - -" Folds -set foldcolumn=0 -set foldenable -set foldmethod=expr -set foldlevel=0 - -" Search -set nohlsearch - -" Back up files -set noswapfile -set nowritebackup -set undofile -set undodir=/home/urbain/.vim/vimundo/ - -" Layout window -set nonumber -set listchars=tab:▸\ ,eol:¬,trail:- -set fillchars=fold:\ ,vert:\ , -set showbreak=... -set colorcolumn=0 -set scrolloff=0 -set t_Co=256 -set guitablabel=%N\ %t\ %M -set showcmd - -" Layout text -set nowrap -set linebreak -set textwidth=0 -set conceallevel=2 -set guifont=Monaco\ 11 -set lazyredraw -highlight diffAdded guifg=#00bf00 -highlight diffRemoved guifg=#bf0000 - -" Case and spell -set nospell -set smartcase -set ignorecase - -" General -set noautochdir -set cpoptions+=I -set encoding=utf-8 -set mouse=a - -"" Colorscheme -try | colorscheme solarized | catch | endtry - -" General -nnoremap te :tabedit -nnoremap tn :tabnew -nnoremap to :tabonly -nnoremap w :w -nnoremap q :q! -nnoremap h :set hlsearch! -nnoremap n :set relativenumber! -nnoremap sp :set paste! -nnoremap sv :source ~/.vim/vimrc -nnoremap sc :source % -nnoremap es :UltiSnipsEdit -nnoremap i mxgg=G'x -nnoremap - - -" Other maps -nnoremap o -nnoremap O -nnoremap J mzJ`z -nnoremap Y y$ - -nnoremap 3 -nnoremap 3 - -" Dvorak specific -nnoremap : , -nnoremap , : - -"" Latex -let g:tex_fast="" - -"" Autocommands -augroup autorelead_vimrc - au! - au BufWritePost ~/.vim/vimrc source ~/.vim/vimrc -augroup END diff --git a/vimrc b/vimrc new file mode 100644 index 0000000..0b3060d --- /dev/null +++ b/vimrc @@ -0,0 +1,184 @@ +"" Required by Vundle + +set nocompatible +filetype off +set rtp+=~/.vim/bundle/vundle/ +call vundle#rc() + +"" Plugins +Plugin 'gmarik/vundle' +Plugin 'istib/vifm.vim' +Plugin 'LaTeX-Box-Team/latex-box' +Plugin 'SirVer/ultisnips' +Plugin 'altercation/vim-colors-solarized' +Plugin 'christoomey/vim-tmux-navigator' +Plugin 'godlygeek/tabular' +Plugin 'gregsexton/gitv' +Plugin 'honza/vim-snippets' +Plugin 'kien/ctrlp.vim' +Plugin 'scrooloose/nerdtree' +Plugin 'sjl/Gundo.vim' +Plugin 'tommcdo/vim-exchange' +Plugin 'tpope/vim-commentary' +Plugin 'tpope/vim-fugitive' +Plugin 'tpope/vim-obsession' +Plugin 'tpope/vim-repeat' +Plugin 'tpope/vim-scriptease' +Plugin 'tpope/vim-sensible' +Plugin 'tpope/vim-surround' +Plugin 'tpope/vim-unimpaired' + +filetype plugin indent on +syntax on + +" Leader maps +let mapleader = "\\" +let maplocalleader = "-" +nmap + +" Plugins options +let g:ctrlp_map = '' +let g:ctrlp_cmd = 'CtrlPBuffer' +let g:ctrlp_by_filename = 1 +let g:ctrlp_working_path_mode = 'r' +let g:ctrlp_show_hidden = 1 +let g:ctrlp_open_new_file = 't' +let g:ctrlp_user_command = ['.git/', 'git --git-dir=%s/.git ls-files -oc --exclude-standard'] + +let g:UltiSnipsExpandTrigger="" +let g:UltiSnipsJumpForwardTrigger="" +let g:UltiSnipsJumpBackwardTrigger="" +let g:UltiSnipsListSnippets="" +let g:UltiSnipsEditSplit="horizontal" +let g:UltiSnipsSnippetsDir="~/.vim/mySnippets" +let g:UltiSnipsSnippetDirectories=['UltiSnips', 'mySnippets'] + +let g:tex_flavor='latex' +let g:tex_conceal= 'adgm' +let g:LatexBox_Folding=0 +let g:LatexBox_viewer='zathura' +let g:LatexBox_latexmk_preview_continuously=1 +let g:LatexBox_quickfix=2 +function! SynctexShow() + let synctex = glob("*.synctex.gz") + if strlen(synctex) == 0 + echom "no synctex file found" + else + let pdffile = substitute(synctex,"synctex.gz","pdf","") + let execline = printf(":!zathura --synctex-forward %d:%d:%s %s", line('.'), col('.'), shellescape(bufname("%")), shellescape(pdffile)) + exec execline + end +endfunction + +" Gundo +nnoremap :GundoToggle + +" Nerdtree +nnoremap :NERDTreeToggle +let NERDTreeIgnore=['\.pdf$', '\~$','\.toc$', + \ '\.fls$','\.bbl$','\.blg$', + \ '\.out$', '\.log$','\.aux$','\.sty$', + \ '\.fdb_latexmk$', '\.synctex.gz$','\.latexmain$'] + +"" Options + +" Tabs and indent +set smartindent +set expandtab +set tabstop=4 +set softtabstop=4 +set shiftwidth=4 + +" Folds +set foldcolumn=0 +set foldenable +set foldmethod=expr +set foldlevel=0 + +" Search +set nohlsearch + +" Back up files +set noswapfile +set nowritebackup +set undofile +set undodir=/home/urbain/.vim/vimundo/ + +" Layout window +set nonumber +set listchars=tab:▸\ ,eol:¬,trail:- +set fillchars=fold:\ ,vert:\ , +set showbreak=... +set colorcolumn=0 +set scrolloff=0 +set t_Co=256 +set guitablabel=%N\ %t\ %M +set showcmd + +" Layout text +set nowrap +set linebreak +set textwidth=0 +set conceallevel=2 +set guifont=Monaco\ 11 +set lazyredraw +highlight diffAdded guifg=#00bf00 +highlight diffRemoved guifg=#bf0000 + +" Case and spell +set nospell +set smartcase +set ignorecase + +" General +set noautochdir +set cpoptions+=I +set encoding=utf-8 +set mouse=a +set clipboard=unnamedplus + +"" Colorscheme +try | colorscheme solarized | catch | endtry + +" General +nnoremap te :tabedit +nnoremap tn :tabnew +nnoremap to :tabonly +nnoremap w :w +nnoremap q :q! +nnoremap h :set hlsearch! +nnoremap n :set relativenumber! +nnoremap sp :set paste! +nnoremap sv :source ~/.vim/vimrc +nnoremap sc :source % +nnoremap es :UltiSnipsEdit +nnoremap i mxgg=G'x +nnoremap + + +" Other maps +nnoremap o +nnoremap O +nnoremap J mzJ`z +nnoremap Y y$ + +nnoremap 3 +nnoremap 3 + +" Dvorak specific +nnoremap : , +nnoremap , : + +"" Latex +let g:tex_fast="" + +"" Autocommands +augroup autorelead_vimrc + au! + au BufWritePost ~/.vim/vimrc source ~/.vim/vimrc +augroup END + +"" Neovim specific +if has('nvim') + tmap jk +endif diff --git a/zshrc b/zshrc index 08eeafc..f929b6f 100644 --- a/zshrc +++ b/zshrc @@ -49,6 +49,7 @@ alias g='git' alias v=$EDITOR alias g='git' alias v='vim' +alias n='nvim' alias vs="vim --servername SYNC" alias va="vim --servername SYNC main.tex \ sections/introduction.tex \ -- cgit v1.2.3