From 29a8d8da231e3ffdfff90dbc12a772b4dbedac7b Mon Sep 17 00:00:00 2001 From: Urbain Vaes Date: Tue, 26 May 2015 14:05:58 +0100 Subject: added good junegunn plugins --- nvimrc | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'nvimrc') diff --git a/nvimrc b/nvimrc index 44a70c0..f4f8a5a 100644 --- a/nvimrc +++ b/nvimrc @@ -12,8 +12,13 @@ Plug 'godlygeek/tabular' Plug 'gregsexton/gitv', { 'on' : 'Gitv' } Plug 'honza/vim-snippets' Plug 'jamessan/vim-gnupg', { 'for' : 'asc' } +Plug 'junegunn/fzf', { 'on' : 'FZF' } Plug 'junegunn/seoul256.vim' -Plug 'junegunn/fzf' , { 'on' : 'FZF' } +Plug 'junegunn/goyo.vim', { 'on' : 'Goyo' } +Plug 'junegunn/limelight.vim', { 'on' : 'Limelight' } +Plug 'junegunn/vim-pseudocl' +Plug 'junegunn/vim-oblique' +Plug 'junegunn/vim-peekaboo' Plug 'kien/ctrlp.vim' Plug 'LaTeX-Box-Team/latex-box', { 'for' : 'tex' } Plug 'majutsushi/tagbar' @@ -84,6 +89,9 @@ let g:ctrlp_prompt_mappings = { \ 'PrtHistory(-1)': [''], \ 'PrtHistory(1)': [''],} +let g:limelight_conceal_ctermfg = 'gray' +let g:limelight_conceal_ctermfg = 240 + let g:syntastic_cpp_compiler = "g++" let g:syntastic_cpp_compiler_options = "-std=c++11 -Wall -Wextra -Wpedantic" -- cgit v1.2.3 From 2704384c10aa5897914beea55fd31a82d78dbd2b Mon Sep 17 00:00:00 2001 From: Urbain Vaes Date: Sat, 30 May 2015 18:20:37 +0100 Subject: minor changes --- mutt/muttrc | 2 +- nvim/mySnippets/cpp.snippets | 8 ++++++++ nvim/mySnippets/mail.snippets | 4 +++- nvimrc | 19 ++++++++++++------ vimrc | 1 + zshrc | 45 +++++++++++++++++++------------------------ 6 files changed, 46 insertions(+), 33 deletions(-) (limited to 'nvimrc') diff --git a/mutt/muttrc b/mutt/muttrc index 2184667..711ae9e 100644 --- a/mutt/muttrc +++ b/mutt/muttrc @@ -62,7 +62,7 @@ set quote_regexp = "^( {0,4}[>|:#%]| {0,4}[a-z0-9]+[>|]+)+" alternative_order text/plain text/enriched text/html # Email editing -set editor="vim" +set editor="nvim" set edit_headers set include=yes 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 diff --git a/nvimrc b/nvimrc index f4f8a5a..81447ee 100644 --- a/nvimrc +++ b/nvimrc @@ -1,4 +1,4 @@ -"" Plugins +" Plugins call plug#begin('~/.nvim/plugged') Plug 'airblade/vim-gitgutter', { 'on' : 'GitGutterToggle' } Plug 'altercation/vim-colors-solarized' @@ -13,18 +13,19 @@ Plug 'gregsexton/gitv', { 'on' : 'Gitv' } Plug 'honza/vim-snippets' Plug 'jamessan/vim-gnupg', { 'for' : 'asc' } Plug 'junegunn/fzf', { 'on' : 'FZF' } -Plug 'junegunn/seoul256.vim' Plug 'junegunn/goyo.vim', { 'on' : 'Goyo' } Plug 'junegunn/limelight.vim', { 'on' : 'Limelight' } -Plug 'junegunn/vim-pseudocl' +Plug 'junegunn/seoul256.vim' +Plug 'junegunn/vim-easy-align' Plug 'junegunn/vim-oblique' Plug 'junegunn/vim-peekaboo' +Plug 'junegunn/vim-pseudocl' Plug 'kien/ctrlp.vim' Plug 'LaTeX-Box-Team/latex-box', { 'for' : 'tex' } Plug 'majutsushi/tagbar' Plug 'mileszs/ack.vim' Plug 'rdnetto/YCM-Generator', { 'branch' : 'stable' } -Plug 'scrooloose/nerdtree', { 'on': 'NERDTreeToggle' } +Plug 'scrooloose/nerdtree', { 'on': 'NERDTreeToggle' } Plug 'scrooloose/syntastic' Plug 'SirVer/ultisnips' Plug 'sjl/Gundo.vim', { 'on' : 'GundoToggle' } @@ -113,8 +114,9 @@ let NERDTreeIgnore=['\.pdf$', '\~$','\.toc$', let g:ycm_key_list_select_completion = ['', ''] let g:ycm_key_list_previous_completion = ['', ''] -let g:ycm_auto_trigger = 1 +let g:ycm_add_preview_to_completeopt = 0 let g:ycm_confirm_extra_conf = 1 +let g:ycm_auto_trigger = 1 "" Vim options @@ -139,6 +141,7 @@ set undodir=/home/urbain/.nvim/vimundo/ " Layout window set nonumber +set diffopt=filler,vertical set listchars=tab:▸\ ,eol:¬,trail:- set fillchars=fold:\ ,vert:\ , set showbreak=--▸\ , @@ -200,6 +203,7 @@ nnoremap ps :PlugStatus " Toggles nnoremap cop :set paste! nnoremap tg :GitGutterToggle +nnoremap tl :Limelight!! nnoremap tn :NERDTreeToggle nnoremap tt :TagbarToggle nnoremap tu :GundoToggle @@ -227,6 +231,7 @@ nnoremap 3 nnoremap 3 nnoremap o nnoremap O +nnoremap >f :FZF ~ " Git nnoremap gs :Gstatus @@ -254,12 +259,14 @@ vnoremap , : " Neovim specific tnoremap :ZoomWinTabOut +tnoremap :CtrlPMRUFiles nnoremap :ZoomWinTabIn:b termi inoremap :b termi "" Restore cursor position -augroup autocommands +augroup nvimrc au! + autocmd BufWritePost *vimrc source % autocmd BufWritePost *.cpp Neomake! autocmd BufReadPost * \ if line("'\"") > 1 && line("'\"") <= line("$") | diff --git a/vimrc b/vimrc index f6b1027..fecfa44 100644 --- a/vimrc +++ b/vimrc @@ -19,6 +19,7 @@ Plugin 'honza/vim-snippets' Plugin 'jamessan/vim-gnupg' Plugin 'terryma/vim-multiple-cursors' Plugin 'jeetsukumaran/vim-buffergator' +Plugin 'junegunn/goyo.vim' Plugin 'AndrewRadev/splitjoin.vim' Plugin 'kien/ctrlp.vim' Plugin 'majutsushi/tagbar' diff --git a/zshrc b/zshrc index 436e036..aacf09b 100644 --- a/zshrc +++ b/zshrc @@ -43,41 +43,36 @@ alias books='cd ~/Dropbox/phd/books' alias cdd='cd ~/dotfiles' # Commands -alias tmux="TERM=screen-256color-bce tmux" -alias g='git' -alias v='vim' -alias n='nvim' -alias e=$EDITOR -alias vs="$EDITOR --servername SYNC" -alias vsess="$EDITOR -S Session.vim" -alias va="$EDITOR --servername SYNC main.tex \ - sections/introduction.tex \ - sections/sec1.tex \ - sections/sec2.tex \ - sections/sec3.tex \ - sections/conclusion.tex" -alias c='clear' -alias mc='make clean' -alias m='mutt' alias a='vifm' -alias mn="$EDITOR ~/.mynotes" -alias x='sh ~/.xmodmap' -alias mail='offlineimap -u quiet &' +alias c='clear' alias ca='printf "\ec"' -alias update='sudo apt-get update' -alias upgrade='sudo apt-get upgrade' +alias commit='git commit -a -m' +alias e=$EDITOR +alias g='git' +alias gco='git checkout' alias install='sudo apt-get install' -alias remove='sudo apt-get autoremove' +alias m='mutt' +alias mail='offlineimap -u quiet &' +alias mc='make clean' +alias mn="$EDITOR ~/.mynotes" +alias n='nvim' +alias ns="$EDITOR --servername SYNC" +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 pull='git pull origin master' -alias commit='git commit -a -m' -alias gco='git checkout' +alias remove='sudo apt-get autoremove' +alias tmux="TERM=screen-256color-bce tmux" +alias update='sudo apt-get update' +alias upgrade='sudo apt-get upgrade' +alias v='vim' +alias x='sh ~/.xmodmap' # Configuration alias ez="$EDITOR ~/.zshrc" alias em="$EDITOR ~/.mutt/muttrc" alias ev="$EDITOR ~/.vimrc" +alias en="$EDITOR ~/.nvimrc" alias eza="$EDITOR ~/.zathurarc" alias et="$EDITOR ~/.tmux.conf" alias evi="$EDITOR ~/.vifm/vifmrc" -- cgit v1.2.3 From 74a10839a8f4b09bcd8dbc49ae783e357cca46b6 Mon Sep 17 00:00:00 2001 From: Urbain Vaes Date: Sun, 31 May 2015 13:59:34 +0100 Subject: new plugins --- nvimrc | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'nvimrc') diff --git a/nvimrc b/nvimrc index 81447ee..d5c11ce 100644 --- a/nvimrc +++ b/nvimrc @@ -20,8 +20,10 @@ Plug 'junegunn/vim-easy-align' Plug 'junegunn/vim-oblique' Plug 'junegunn/vim-peekaboo' Plug 'junegunn/vim-pseudocl' +Plug 'junegunn/rainbow_parentheses.vim' Plug 'kien/ctrlp.vim' Plug 'LaTeX-Box-Team/latex-box', { 'for' : 'tex' } +Plug 'lervag/vimtex' Plug 'majutsushi/tagbar' Plug 'mileszs/ack.vim' Plug 'rdnetto/YCM-Generator', { 'branch' : 'stable' } @@ -45,6 +47,8 @@ Plug 'tpope/vim-surround' Plug 'tpope/vim-unimpaired' Plug 'troydm/zoomwintab.vim' Plug 'Valloric/YouCompleteMe', { 'do' : './install.sh --clang-completer' } +Plug 'xolox/vim-misc', { 'on' : 'Note' } +Plug 'xolox/vim-notes', { 'on' : 'Note' } call plug#end() "" Plugins options -- cgit v1.2.3 From c7365f1bc50845037387ecff266408a99cf26879 Mon Sep 17 00:00:00 2001 From: Urbain Vaes Date: Mon, 1 Jun 2015 11:50:02 +0100 Subject: added header.sty in tex --- notes/Personal notes | 26 +++++++++++ nvimrc | 11 +++-- tex/header.sty | 90 ++++++++++++++++++++++++++++++++++++ tex/report_default.tex | 121 ------------------------------------------------- zshrc | 17 +++---- 5 files changed, 132 insertions(+), 133 deletions(-) create mode 100644 notes/Personal notes create mode 100644 tex/header.sty delete mode 100644 tex/report_default.tex (limited to 'nvimrc') diff --git a/notes/Personal notes b/notes/Personal notes new file mode 100644 index 0000000..f129738 --- /dev/null +++ b/notes/Personal notes @@ -0,0 +1,26 @@ +Personal notes + +# Personal TODO list + • Message_Victor + • Prepare speech wedding + • Repay Arnaud + + * * * + +# PhD TODO list + • 9 months report + • Article by Virginie + + * * * + +# Admin + • Expense claims + ◦ Distribution textbook + ◦ Flight to Spain + ◦ Flight to Switzerland + • Invigilation + + * * * + +# Useful info + • Bank number: 930630876 diff --git a/nvimrc b/nvimrc index d5c11ce..d128048 100644 --- a/nvimrc +++ b/nvimrc @@ -1,4 +1,4 @@ -" Plugins +"" Plugins call plug#begin('~/.nvim/plugged') Plug 'airblade/vim-gitgutter', { 'on' : 'GitGutterToggle' } Plug 'altercation/vim-colors-solarized' @@ -8,7 +8,7 @@ Plug 'bling/vim-airline' Plug 'christoomey/vim-tmux-navigator' Plug 'edkolev/tmuxline.vim' Plug 'freeo/vim-kalisi' -Plug 'godlygeek/tabular' +Plug 'godlygeek/tabular' , { 'on' : 'Tab' } Plug 'gregsexton/gitv', { 'on' : 'Gitv' } Plug 'honza/vim-snippets' Plug 'jamessan/vim-gnupg', { 'for' : 'asc' } @@ -180,10 +180,10 @@ set lazyredraw set hidden " Colorscheme -try | colorscheme solarized | catch | endtry +silent! colo solarized highlight Comment cterm=italic set t_ZH= -set t_ZR= +set t_ZR=[23m "" Maps @@ -277,3 +277,6 @@ augroup nvimrc \ exe "normal! g`\"" | \ endif augroup END + +"" Experimental +let g:notes_directories = ['~/dotfiles/notes'] diff --git a/tex/header.sty b/tex/header.sty new file mode 100644 index 0000000..9eeae8f --- /dev/null +++ b/tex/header.sty @@ -0,0 +1,90 @@ +% Compilation options +\synctex=1 + +% Packages +\usepackage[T1]{fontenc} +\usepackage[utf8]{inputenx} +\usepackage[english]{babel} +\usepackage{microtype} +\usepackage{fancyhdr} +\usepackage{listings} +\usepackage{appendix} +\usepackage{vmargin} +\usepackage{setspace} +\usepackage{mathrsfs} +\usepackage{mathenv} +\usepackage{amsmath} +\usepackage{amsfonts} +\usepackage{amssymb} +\usepackage{amscd} +\usepackage{amsthm} +\usepackage{mathrsfs} +\usepackage{graphicx} +\usepackage{epstopdf} +\usepackage{subfigure} +\usepackage{color} +\usepackage{todonotes} +\usepackage{caption} +\usepackage[numbers]{natbib} +\usepackage{hyperref} +\usepackage{cleveref} + +% Packages options +\hypersetup{citecolor=blue, colorlinks=true, linkcolor=[rgb]{0.,0.,0.7}} +\graphicspath{{figures/}} + +% Macros +\definecolor{darkred}{rgb}{.7,0,0} +\newcommand{\real}[0]{\mathbf{R}} +\newcommand{\nat}[0]{\mathbf{N}} +\newcommand{\op}[0]{\mathcal} +\newcommand{\grad}[0]{\nabla} +\newcommand{\dive}[0] {\,\nabla\,\cdot\,} +\newcommand{\ip}[2]{\left\langle{#1,#2}\right\rangle} +\newcommand{\norm}[1]{\left\| #1 \right\|} +\newcommand{\pard}[2]{\partial_{#2} #1} +\newcommand{\pardl}[2]{\frac{\partial{#1}}{\partial{#2}}} +\newcommand{\pardd}[2]{\partial_{#2}^2 #1} +\newcommand{\parddl}[2]{\frac{\partial^2{#1}}{\partial{#2}^2}} +\newcommand{\hermite}[0]{\mathcal} +\newcommand{\gaussian}[1]{g_{#1}} +\newcommand{\stdgaussian}[0]{g} +\newcommand{\test}[1]{C^\infty_c (#1)} +\newcommand{\flp}[2]{L^{#1} (#2)} +\newcommand{\wlp}[3]{L^{#1} (#2,#3)} +\newcommand{\sobolev}[2]{H^{#1} (#2)} +\newcommand{\wsobolev}[3]{H^{#1} (#2, #3)} +\newcommand{\red}[1]{\textcolor{darkred}{#1}} +\newcommand{\HRule}{\rule{\linewidth}{0.5mm}} +\newcommand{\smooth}[1]{C^\infty(#1)} +\newcommand{\cont}[2]{C^{#1} (#2)} +\newcommand{\contb}[2]{C_b^{#1} (#2)} +\newcommand{\Space}[0]{\mathscr} +\newcommand{\expect}[0]{\mathbb{E}} +\newcommand{\dotx}[0]{\,\cdot\,} +\newcommand{\abs}[1]{\left| #1 \right|} + +% Redefinitions +\renewcommand{\d}[0]{\,\mathrm{d}} + +% Layout options +\setlength{\parskip}{6pt} +\setstretch{1.3} + +% Setting for the table of contents +\setcounter{secnumdepth}{1} +\setcounter{tocdepth}{1} + +% Theorems +\theoremstyle{plain} +\newtheorem{assumption}{Assumption}[section] +\newtheorem{example}{Example}[section] +\newtheorem{theorem}{Theorem}[section] +\newtheorem{corollary}[theorem]{Corollary} +\newtheorem{lemma}[theorem]{Lemma} +\newtheorem{proposition}[theorem]{Proposition} +\newtheorem{axiom}[theorem]{Axiom} +\theoremstyle{definition} +\newtheorem{definition}[theorem]{Definition} +\theoremstyle{remark} +\newtheorem{remark}[theorem]{Remark} diff --git a/tex/report_default.tex b/tex/report_default.tex deleted file mode 100644 index e9eb94f..0000000 --- a/tex/report_default.tex +++ /dev/null @@ -1,121 +0,0 @@ -\documentclass[10pt,twoside]{report} - -% Files to include -\includeonly{ - preamble/title, - preamble/authorship, - preamble/abstract, - preamble/acknowledgements, - chapters/introduction, - chapters/chap1, - chapters/chap2, - chapters/chap3, - chapters/conclusion, -} - -% Boolean variables -\newif \ifcontents \contentsfalse -\newif \ifbib \bibtrue -\newif \iflong \longtrue - -% Packages -\usepackage[utf8]{inputenx} -\usepackage[english]{babel} -\usepackage{microtype} -\usepackage{fancyhdr} -\usepackage{listings} -\usepackage{appendix} -\usepackage{vmargin} -\usepackage{setspace} -\usepackage{mathenv} -\usepackage{amsmath} -\usepackage{amsfonts} -\usepackage{amssymb} -\usepackage{amscd} -\usepackage{amsthm} -\usepackage{hyperref} -\usepackage{cleveref} -\usepackage{graphicx} -\usepackage{epstopdf} -\usepackage{subfigure} -\usepackage{color} - -% Packages with options -\usepackage[labelfont=sc]{caption} -\usepackage[square, numbers, comma, sort&compress]{natbib} - -% Layout options -\setlength{\parskip}{6pt} - -% Compilation options -\synctex=1 - -% Setting for the table of contents -\setcounter{secnumdepth}{3} -\setcounter{tocdepth}{3} - -% Macros -\definecolor{darkred}{rgb}{.7,0,0} -\newcommand{\real}[0]{\mathbf R} -\newcommand{\nat}[0]{\mathbf N} -\newcommand{\op}[0]{\mathcal} -\newcommand{\grad}[0]{\,\nabla\,} -\newcommand{\dive}[0] {\,\nabla\,\cdot\,} -\newcommand{\ip}[2]{\left \langle #1,#2 \right\rangle} -\newcommand{\norm}[1]{\,\| #1 \|\,} -\newcommand{\pard}[2]{\partial_{#2} #1} -\newcommand{\pardl}[2]{\frac{\partial #1}{\partial #2}} -\newcommand{\pardd}[2]{\partial_{#2}^2 #1} -\newcommand{\parddl}[2]{\frac{\partial^2 #1}{\partial #2^2}} -\newcommand{\dx}[0]{\mathrm d} -\newcommand{\hermite}[0]{\mathcal} -\newcommand{\gaussian}[1]{g_{#1}} -\newcommand{\stdgaussian}[0]{g} -\newcommand{\test}[1]{C^\infty_c(#1)} -\newcommand{\flp}[2]{L^{#1}(#2)} -\newcommand{\wlp}[3]{L^{#1}(#2, #3)} -\newcommand{\sobolev}[2]{H^{#1}(#2)} -\newcommand{\wsobolev}[3]{H^{#1}(#2, #3)} -\newcommand{\red}[1]{\textcolor{darkred}{#1}} -\newcommand{\HRule}{\rule{\linewidth}{0.5mm}} - -% Theorems -\theoremstyle{plain} -\newtheorem{assumption}{Assumption}[section] -\newtheorem{example}{Example}[section] -\newtheorem{theorem}{Theorem}[section] -\newtheorem{corollary}[theorem]{Corollary} -\newtheorem{lemma}[theorem]{Lemma} -\newtheorem{proposition}[theorem]{Proposition} -\newtheorem{axiom}[theorem]{Axiom} -\theoremstyle{definition} -\newtheorem{definition}[theorem]{Definition} -\theoremstyle{remark} -\newtheorem{remark}[theorem]{Remark} - -\begin{document} - -\pagestyle{empty} - -\setstretch{1.3} -\include{preamble/title} \cleardoublepage -\include{preamble/authorship} \cleardoublepage -\include{preamble/abstract} \cleardoublepage -\include{preamble/acknowledgements} \cleardoublepage -\ifcontents \tableofcontents \fi - -\pagestyle{plain} - - -\include{chapters/introduction} \cleardoublepage -\include{chapters/chap1} \cleardoublepage -\include{chapters/chap2} \cleardoublepage -\include{chapters/chap3} \cleardoublepage -\include{chapters/conclusion} \cleardoublepage - -\nocite* -\bibliographystyle{unsrtnat} -\bibliography{Bibliography} - -\end{document} - diff --git a/zshrc b/zshrc index aacf09b..1692cfd 100644 --- a/zshrc +++ b/zshrc @@ -33,14 +33,15 @@ alias -s tex=$EDITOR alias -s pdf=zathura # Directories +alias books='cd ~/Dropbox/phd/books' +alias cdd='cd ~/dotfiles' +alias papers='cd ~/Dropbox/phd/papers' +alias report='cd ~/Dropbox/phd/reports/9\ months' alias u='cd ~/Dropbox/phd/papers/spectral/code/finite' alias uc='cd ~/Dropbox/phd/programs' alias ul='cd ~/Dropbox/phd/literature' -alias ur='cd ~/Dropbox/phd/reports' alias up='cd ~/Dropbox/phd/presentations' -alias papers='cd ~/Dropbox/phd/papers' -alias books='cd ~/Dropbox/phd/books' -alias cdd='cd ~/dotfiles' +alias ur='cd ~/Dropbox/phd/reports' # Commands alias a='vifm' @@ -69,15 +70,15 @@ alias v='vim' alias x='sh ~/.xmodmap' # Configuration -alias ez="$EDITOR ~/.zshrc" alias em="$EDITOR ~/.mutt/muttrc" -alias ev="$EDITOR ~/.vimrc" alias en="$EDITOR ~/.nvimrc" -alias eza="$EDITOR ~/.zathurarc" +alias eo="$EDITOR ~/.offlineimaprc" alias et="$EDITOR ~/.tmux.conf" +alias ev="$EDITOR ~/.vimrc" alias evi="$EDITOR ~/.vifm/vifmrc" -alias eo="$EDITOR ~/.offlineimaprc" alias ex="$EDITOR ~/.xmodmap" +alias ez="$EDITOR ~/.zshrc" +alias eza="$EDITOR ~/.zathurarc" # Fix smart search history bindkey -a 'k' history-beginning-search-backward -- 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 'nvimrc') 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 a11c6b48ee8e4e6c6f3711d387a8a8f25424551a Mon Sep 17 00:00:00 2001 From: Urbain Vaes Date: Tue, 2 Jun 2015 20:28:19 +0100 Subject: handy function in zshrc --- nvimrc | 5 +++-- zshrc | 15 ++++++++++++++- 2 files changed, 17 insertions(+), 3 deletions(-) (limited to 'nvimrc') diff --git a/nvimrc b/nvimrc index d815ca2..3f7744f 100644 --- a/nvimrc +++ b/nvimrc @@ -23,8 +23,8 @@ Plug 'kien/ctrlp.vim', { 'on' : 'CtrlP' } Plug 'LaTeX-Box-Team/latex-box', { 'for' : 'tex' } Plug 'majutsushi/tagbar' Plug 'mileszs/ack.vim', { 'on' : 'Ack' } -Plug 'rdnetto/YCM-Generator', { 'branch' : 'stable' } -Plug 'ryanss/vim-hackernews' +Plug 'rdnetto/YCM-Generator', { 'branch' : 'stable' , 'on' : 'YcmGenerateConfig' } +Plug 'ryanss/vim-hackernews', { 'on' : 'HackerNews' } Plug 'scrooloose/nerdtree', { 'on': 'NERDTreeToggle' } Plug 'scrooloose/syntastic' Plug 'SirVer/ultisnips' @@ -277,3 +277,4 @@ augroup END "" Experimental let g:notes_directories = ['~/dotfiles/notes'] +" Idea: instant download colorscheme diff --git a/zshrc b/zshrc index 3974cc3..190dcbf 100644 --- a/zshrc +++ b/zshrc @@ -37,7 +37,7 @@ alias books='cd ~/Dropbox/phd/books' alias cdd='cd ~/dotfiles' alias papers='cd ~/Dropbox/phd/papers' alias report='cd ~/Dropbox/phd/reports/9\ months' -alias u='cd ~/Dropbox/phd/papers/spectral/code/finite' +alias u='cd ~/Dropbox/phd' alias uc='cd ~/Dropbox/phd/programs' alias ul='cd ~/Dropbox/phd/literature' alias up='cd ~/Dropbox/phd/presentations' @@ -90,3 +90,16 @@ crontab ~/.crontab TERM=xterm-256color [ -f ~/.fzf.zsh ] && source ~/.fzf.zsh + + +fancy-ctrl-z () { + if [[ $#BUFFER -eq 0 ]]; then + BUFFER="fg" + zle accept-line + else + zle push-input + zle clear-screen + fi +} +zle -N fancy-ctrl-z +bindkey '^Z' fancy-ctrl-z -- cgit v1.2.3