diff options
| -rw-r--r-- | bashrc | 2 | ||||
| -rw-r--r-- | bookmarks | 1 | ||||
| -rwxr-xr-x | install.sh | 4 | ||||
| -rw-r--r-- | mutt/muttrc | 2 | ||||
| -rw-r--r-- | nvim/.netrwhist | 3 | ||||
| -rw-r--r-- | nvim/mySnippets/python.snippets | 4 | ||||
| -rw-r--r-- | nvim/mySnippets/tex.snippets | 10 | ||||
| -rw-r--r-- | nvimrc | 9 | ||||
| -rw-r--r-- | zshrc | 16 |
9 files changed, 41 insertions, 10 deletions
@@ -112,6 +112,6 @@ if ! shopt -oq posix; then . /etc/bash_completion fi fi -[ -f ~/.fzf.bash ] && source ~/.fzf.bash source ~/github/fzf-marks/fzf-marks.bash +[ -f ~/.fzf.bash ] && source ~/.fzf.bash @@ -1,6 +1,5 @@ code : /home/urbain/Dropbox/phd/code/spectral dotfiles : /home/urbain/dotfiles -fuzzymarks : /home/urbain/github/fuzzy-zsh-marks paper : /home/urbain/Dropbox/phd/papers/spectral phd : /home/urbain/Dropbox/phd report : /home/urbain/Dropbox/phd/reports/esa @@ -11,6 +11,8 @@ repodirs[altercation/mutt-colors-solarized]=$home/.solarized/mutt-colors-solariz repodirs[gmarik/vundle]=$dir/vim/bundle/vundle repodirs[icholy/ttygif]=$home/ttygif repodirs[junegunn/fzf]=$home/.fzf +repodirs[rupa/z]=$home/github/z +repodirs[atweiden/fzf-extras]=$home/github/fzf-extras repodirs[junegunn/vim-plug]=$dir/nvim/vim-plug repodirs[seebi/dircolors-solarized]=$home/.solarized/dircolors-solarized repodirs[tmux-plugins/tpm]=$home/.tmux/plugins/tpm @@ -31,6 +33,8 @@ actions[altercation/mutt-colors-solarized]='' actions[gmarik/vundle]='' actions[icholy/ttygif]='make' actions[junegunn/fzf]='./install' +actions[rupa/z]='make' +actions[atweiden/fzf-extras]='' actions[junegunn/vim-plug]='after_vimplug' actions[seebi/dircolors-solarized]='' actions[tmux-plugins/tpm]='' diff --git a/mutt/muttrc b/mutt/muttrc index 711ae9e..d22cbc0 100644 --- a/mutt/muttrc +++ b/mutt/muttrc @@ -77,7 +77,7 @@ set sort_aux = reverse-last-date-received set sort_browser = reverse-date # Files to source -source `sh /home/urbain/.mutt/colormutt` +# source `sh /home/urbain/.mutt/colormutt` source ~/.mutt/alias # HTML messages diff --git a/nvim/.netrwhist b/nvim/.netrwhist index 8e202e0..1773c55 100644 --- a/nvim/.netrwhist +++ b/nvim/.netrwhist @@ -1,5 +1,6 @@ let g:netrw_dirhistmax =10 -let g:netrw_dirhist_cnt =3 +let g:netrw_dirhist_cnt =4 let g:netrw_dirhist_1='/home/urbain/Dropbox/phd/reports/mres' let g:netrw_dirhist_2='/home/urbain/dotfiles/git_template/hooks' let g:netrw_dirhist_3='/home/urbain/bin' +let g:netrw_dirhist_4='/home/urbain/dotfiles/nvim' diff --git a/nvim/mySnippets/python.snippets b/nvim/mySnippets/python.snippets index e69de29..4a7d74d 100644 --- a/nvim/mySnippets/python.snippets +++ b/nvim/mySnippets/python.snippets @@ -0,0 +1,4 @@ +snippet nicolas "Nicolas" i +Nicolas est le meilleur programmeur $1 +$0 +endsnippet diff --git a/nvim/mySnippets/tex.snippets b/nvim/mySnippets/tex.snippets index fb061f0..883a37d 100644 --- a/nvim/mySnippets/tex.snippets +++ b/nvim/mySnippets/tex.snippets @@ -46,16 +46,24 @@ snippet ip "Inner product" i \ip{$1}{$2}$0 endsnippet +snippet ipw "Inner product" i +\wip{$1}{$2}{$3}$0 +endsnippet + snippet norm "Norm" i \norm{$1}$0 endsnippet +snippet normw "Weighted norm" i +\wnorm{$1}{${2:\gamma}} +endsnippet + snippet test "Test functions" i \test{${1:\real^n}}$0 endsnippet snippet lp "Flat Lp space" i -\lp{${1:2}}{${2:\real^n}}$0 +\flp{${1:2}}{${2:\real^n}}$0 endsnippet snippet lpw "Weighted Lp space" i @@ -6,7 +6,7 @@ Plug 'AndrewRadev/splitjoin.vim' Plug 'benekastah/neomake' , { 'for' : 'cpp' } Plug 'bling/vim-airline' Plug 'christoomey/vim-tmux-navigator' -" Plug 'edkolev/tmuxline.vim' +Plug 'edkolev/tmuxline.vim' Plug 'freeo/vim-kalisi' Plug 'godlygeek/tabular' , { 'on' : 'Tab' } Plug 'gregsexton/gitv', { 'on' : 'Gitv' } @@ -69,7 +69,7 @@ let g:airline_right_sep='' let g:airline_section_c = '%f%m' let g:airline_section_y = '' let g:airline_section_z = '%3p%%|%3l|%3c' -let g:airline_theme='base16' +let g:airline_theme='dark' let g:airline#extensions#tabline#enabled = 0 let g:airline_exclude_preview = 0 @@ -154,7 +154,7 @@ set diffopt=filler,vertical set listchars=tab:▸\ ,eol:¬,trail:- set fillchars=fold:\ ,vert:\ , set breakindent -let &showbreak='--▸ ' +let &showbreak='--> ' set colorcolumn=0 set scrolloff=0 set t_Co=256 @@ -185,7 +185,7 @@ set lazyredraw set hidden " Colorscheme -silent! colo seoul256 +silent! colo molokai highlight Comment cterm=italic set t_ZH=[3m set t_ZR=[23m @@ -246,6 +246,7 @@ nnoremap >f :FZF ~ <cr> nnoremap <Leader>gs :Gstatus<cr> nnoremap <Leader>gr :Gread<cr> nnoremap <Leader>gd :Gdiff<cr> +nnoremap <Leader>gv :Gitv<cr> " Commands nnoremap ym :Neomake!<cr> @@ -93,7 +93,6 @@ bindkey -a 'j' history-beginning-search-forward crontab ~/.crontab TERM=xterm-256color -source ~/github/fzf-marks/fzf-marks.zsh fancy-ctrl-z () { @@ -107,4 +106,19 @@ fancy-ctrl-z () { } zle -N fancy-ctrl-z bindkey '^Z' fancy-ctrl-z + +fshow() { + git log --graph --color=always \ + --format="%C(auto)%h%d %s %C(black)%C(bold)%cr" "$@" | + fzf --ansi --no-sort --reverse --tiebreak=index --toggle-sort=\` \ + --bind 'ctrl-m:execute: + echo {} | grep -o "[a-f0-9]\{7\}" | + xargs -I % sh -c "git show --color=always % | less -R"' +} + [ -f ~/.fzf.zsh ] && source ~/.fzf.zsh +source ~/github/fzf-marks/fzf-marks.zsh +source ~/github/z/z.sh +source ~/github/fzf-extras/fzf-extras.sh +source ~/github/fzf-extras/fzf-extras.zsh +xrdb ~/.Xressources |