From 2704384c10aa5897914beea55fd31a82d78dbd2b Mon Sep 17 00:00:00 2001 From: Urbain Vaes Date: Sat, 30 May 2015 18:20:37 +0100 Subject: minor changes --- nvim/mySnippets/cpp.snippets | 8 ++++++++ nvim/mySnippets/mail.snippets | 4 +++- 2 files changed, 11 insertions(+), 1 deletion(-) (limited to 'nvim') diff --git a/nvim/mySnippets/cpp.snippets b/nvim/mySnippets/cpp.snippets index 5ad9624..cb4c705 100644 --- a/nvim/mySnippets/cpp.snippets +++ b/nvim/mySnippets/cpp.snippets @@ -10,6 +10,14 @@ for (unsigned int iii = 0; iii < ${1:mat}.size(); ++iii) { $0 endsnippet +snippet forij "Matrix iteration" b +for (int ${2:i} = 0; $2 < ${1:count}; $2++) { + for (int ${4:j} = 0; $4 < $1; $4++) { + ${5} + } +} +endsnippet + snippet vec "vector" i vector<${1:double}> $0 endsnippet diff --git a/nvim/mySnippets/mail.snippets b/nvim/mySnippets/mail.snippets index c512f9b..9839916 100644 --- a/nvim/mySnippets/mail.snippets +++ b/nvim/mySnippets/mail.snippets @@ -15,7 +15,9 @@ ${3:Urbain} endsnippet snippet sign "Signature" b -Urbain Vaes, +Best wishes, + +Urbain Vaes Department of Mathematics Office 6M09 endsnippet -- cgit v1.2.3 From 1a10bbc712c64539ee9e0c73a4b360417449e208 Mon Sep 17 00:00:00 2001 From: Urbain Vaes Date: Sat, 30 May 2015 23:14:48 +0100 Subject: new cpp snippet --- nvim/mySnippets/cpp.snippets | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'nvim') diff --git a/nvim/mySnippets/cpp.snippets b/nvim/mySnippets/cpp.snippets index 5ad9624..4c9c567 100644 --- a/nvim/mySnippets/cpp.snippets +++ b/nvim/mySnippets/cpp.snippets @@ -10,6 +10,14 @@ for (unsigned int iii = 0; iii < ${1:mat}.size(); ++iii) { $0 endsnippet +snippet print_vec "Print vector" b +for (unsigned int iii = 0; iii < ${1:mat}.size(); ++iii) { + cout << setw(12) << $1[iii]; + cout << endl; +} +$0 +endsnippet + snippet vec "vector" i vector<${1:double}> $0 endsnippet -- cgit v1.2.3 From 95aa0e0bcfd7d392d8742f2f2a3a109790245afd Mon Sep 17 00:00:00 2001 From: Urbain Vaes Date: Tue, 2 Jun 2015 18:34:07 +0100 Subject: delete unused plugins --- ctags | 9 +++++++++ gitconfig | 2 ++ nvim/spell/en.utf-8.spl | Bin 0 -> 570549 bytes nvim/spell/en.utf-8.sug | Bin 0 -> 556477 bytes nvimrc | 21 +++++++++------------ tex/header.sty | 2 +- zshrc | 1 + 7 files changed, 22 insertions(+), 13 deletions(-) create mode 100644 ctags create mode 100644 nvim/spell/en.utf-8.spl create mode 100644 nvim/spell/en.utf-8.sug (limited to 'nvim') diff --git a/ctags b/ctags new file mode 100644 index 0000000..0c334fb --- /dev/null +++ b/ctags @@ -0,0 +1,9 @@ +--langdef=latex +--langmap=latex:.tex +--regex-latex=/\\label\{([^}]*)\}/\1/l,label/ +--regex-latex=/\\section\{([^}]*)\}/\1/s,section/ +--regex-latex=/\\subsection\{([^}]*)\}/\1/t,subsection/ +--regex-latex=/\\subsubsection\{([^}]*)\}/\1/u,subsubsection/ +--regex-latex=/\\section\*\{([^}]*)\}/\1/s,section/ +--regex-latex=/\\subsection\*\{([^}]*)\}/\1/t,subsection/ +--regex-latex=/\\subsubsection\*\{([^}]*)\}/\1/u,subsubsection/ diff --git a/gitconfig b/gitconfig index 4cf00e0..f1fffcd 100644 --- a/gitconfig +++ b/gitconfig @@ -5,3 +5,5 @@ templatedir = ~/.git_template [alias] ctags = !.git/hooks/ctags +[push] + default = simple diff --git a/nvim/spell/en.utf-8.spl b/nvim/spell/en.utf-8.spl new file mode 100644 index 0000000..a41bf79 Binary files /dev/null and b/nvim/spell/en.utf-8.spl differ diff --git a/nvim/spell/en.utf-8.sug b/nvim/spell/en.utf-8.sug new file mode 100644 index 0000000..b82667d Binary files /dev/null and b/nvim/spell/en.utf-8.sug differ diff --git a/nvimrc b/nvimrc index d128048..d815ca2 100644 --- a/nvimrc +++ b/nvimrc @@ -3,7 +3,7 @@ call plug#begin('~/.nvim/plugged') Plug 'airblade/vim-gitgutter', { 'on' : 'GitGutterToggle' } Plug 'altercation/vim-colors-solarized' Plug 'AndrewRadev/splitjoin.vim' -Plug 'benekastah/neomake' +Plug 'benekastah/neomake' , { 'for' : 'cpp' } Plug 'bling/vim-airline' Plug 'christoomey/vim-tmux-navigator' Plug 'edkolev/tmuxline.vim' @@ -13,20 +13,18 @@ Plug 'gregsexton/gitv', { 'on' : 'Gitv' } Plug 'honza/vim-snippets' Plug 'jamessan/vim-gnupg', { 'for' : 'asc' } Plug 'junegunn/fzf', { 'on' : 'FZF' } -Plug 'junegunn/goyo.vim', { 'on' : 'Goyo' } -Plug 'junegunn/limelight.vim', { 'on' : 'Limelight' } Plug 'junegunn/seoul256.vim' -Plug 'junegunn/vim-easy-align' +Plug 'junegunn/vim-pseudocl' Plug 'junegunn/vim-oblique' Plug 'junegunn/vim-peekaboo' -Plug 'junegunn/vim-pseudocl' Plug 'junegunn/rainbow_parentheses.vim' -Plug 'kien/ctrlp.vim' +Plug 'kassio/neoterm', { 'on' : 'T' } +Plug 'kien/ctrlp.vim', { 'on' : 'CtrlP' } Plug 'LaTeX-Box-Team/latex-box', { 'for' : 'tex' } -Plug 'lervag/vimtex' Plug 'majutsushi/tagbar' -Plug 'mileszs/ack.vim' +Plug 'mileszs/ack.vim', { 'on' : 'Ack' } Plug 'rdnetto/YCM-Generator', { 'branch' : 'stable' } +Plug 'ryanss/vim-hackernews' Plug 'scrooloose/nerdtree', { 'on': 'NERDTreeToggle' } Plug 'scrooloose/syntastic' Plug 'SirVer/ultisnips' @@ -41,7 +39,6 @@ Plug 'tpope/vim-commentary' Plug 'tpope/vim-fugitive' Plug 'tpope/vim-obsession' Plug 'tpope/vim-repeat' -Plug 'tpope/vim-scriptease' Plug 'tpope/vim-sensible' Plug 'tpope/vim-surround' Plug 'tpope/vim-unimpaired' @@ -52,7 +49,7 @@ Plug 'xolox/vim-notes', { 'on' : 'Note' } call plug#end() "" Plugins options -let g:LatexBox_Folding=0 +let g:LatexBox_fold_automatic=0 let g:LatexBox_latexmk_preview_continuously=1 let g:LatexBox_quickfix=2 let g:LatexBox_viewer='zathura' @@ -148,8 +145,8 @@ set nonumber set diffopt=filler,vertical set listchars=tab:▸\ ,eol:¬,trail:- set fillchars=fold:\ ,vert:\ , -set showbreak=--▸\ , set breakindent +let &showbreak='--▸ ' set colorcolumn=0 set scrolloff=0 set t_Co=256 @@ -157,7 +154,7 @@ set guitablabel=%N\ %t\ %M set showcmd " Layout text -set nowrap +set wrap set linebreak set textwidth=0 set conceallevel=2 diff --git a/tex/header.sty b/tex/header.sty index 9eeae8f..0d436a3 100644 --- a/tex/header.sty +++ b/tex/header.sty @@ -69,7 +69,7 @@ % Layout options \setlength{\parskip}{6pt} -\setstretch{1.3} +\setstretch{1.2} % Setting for the table of contents \setcounter{secnumdepth}{1} diff --git a/zshrc b/zshrc index 1692cfd..3974cc3 100644 --- a/zshrc +++ b/zshrc @@ -62,6 +62,7 @@ alias nsess="$EDITOR -S Session.vim" alias pull='git pull origin master' alias purge='sudo apt-get purge' alias push='git push origin master' +alias pushs='git push --recurse-submodules=check' alias remove='sudo apt-get autoremove' alias tmux="TERM=screen-256color-bce tmux" alias update='sudo apt-get update' -- cgit v1.2.3 From 7b82664776fd2b211da212c4eb64a9123aeea12f Mon Sep 17 00:00:00 2001 From: Urbain Vaes Date: Wed, 3 Jun 2015 16:26:08 +0100 Subject: shell-escape by default for latexmk + alias for tmuxline --- .gitignore | 1 + latexmkrc | 1 + nvim/.netrwhist | 3 +++ zshrc | 4 ++++ 4 files changed, 9 insertions(+) create mode 100644 nvim/.netrwhist (limited to 'nvim') diff --git a/.gitignore b/.gitignore index 567c7a1..67a599a 100644 --- a/.gitignore +++ b/.gitignore @@ -5,6 +5,7 @@ mutt/mailboxes/ mutt/mutt-colors-solarized/ mutt/temp/ newsbeuter +nvim/netrwhist nvim/autoload/ nvim/plugged/ nvim/vim-plug/ diff --git a/latexmkrc b/latexmkrc index a76cf2b..1de49b4 100644 --- a/latexmkrc +++ b/latexmkrc @@ -1,4 +1,5 @@ $pdf_mode = 1; +$pdflatex = 'pdflatex --shell-escape'; $pdf_previewer = 'zathura -s -x "vim --servername SYNC --remote +%{line} %{input}" %O %S'; $clean_ext = "synctex.gz bbl pdf dvi"; $new_viewer_always [0]; diff --git a/nvim/.netrwhist b/nvim/.netrwhist new file mode 100644 index 0000000..f3dd887 --- /dev/null +++ b/nvim/.netrwhist @@ -0,0 +1,3 @@ +let g:netrw_dirhistmax =10 +let g:netrw_dirhist_cnt =1 +let g:netrw_dirhist_1='/home/urbain/Dropbox/phd/reports/mres' diff --git a/zshrc b/zshrc index 190dcbf..d3a7b59 100644 --- a/zshrc +++ b/zshrc @@ -81,6 +81,10 @@ alias ex="$EDITOR ~/.xmodmap" alias ez="$EDITOR ~/.zshrc" alias eza="$EDITOR ~/.zathurarc" +# Tmux +alias son="tmux set -g status on" +alias soff="tmux set -g status off" + # Fix smart search history bindkey -a 'k' history-beginning-search-backward bindkey -a 'j' history-beginning-search-forward -- cgit v1.2.3