diff --git a/bin/.local/bin/syncemail b/bin/.local/bin/syncemail index 0b940a4..adaf6d9 100755 --- a/bin/.local/bin/syncemail +++ b/bin/.local/bin/syncemail @@ -2,7 +2,7 @@ for a in waarp; do echo "Début de la synchronisation" - mbsync -a gmail-$a && echo "Synchronisation effectuée" || echo "Erreur de syncheronisation" >&2 + mbsync gmail-$a && echo "Synchronisation effectuée" || echo "Erreur de syncheronisation" >&2 echo mailboxes $(mbsync -l gmail-$a | sed -e 's|\(.*\)|"+\1"|') > ~/.config/mutt/$a.mailboxes done diff --git a/bin/.local/bin/wm-key b/bin/.local/bin/wm-key new file mode 100755 index 0000000..32db516 Binary files /dev/null and b/bin/.local/bin/wm-key differ diff --git a/fish/.config/fish/config.fish b/fish/.config/fish/config.fish index 0d64470..54d9254 100644 --- a/fish/.config/fish/config.fish +++ b/fish/.config/fish/config.fish @@ -1,6 +1,6 @@ ## PATH -set -x PATH $PATH ~/.local/bin ~/.go/bin +set -x PATH $PATH ~/.local/bin ~/.go/bin ~/.npm/bin set -x EDITOR vim set -x VIRTUAL_ENV_DISABLE_PROMPT true diff --git a/fish/.config/fish/fish_variables b/fish/.config/fish/fish_variables new file mode 100644 index 0000000..4f77ea0 --- /dev/null +++ b/fish/.config/fish/fish_variables @@ -0,0 +1,31 @@ +# This file contains fish universal variable definitions. +# VERSION: 3.0 +SETUVAR __fish_init_2_39_8:\x1d +SETUVAR __fish_init_2_3_0:\x1d +SETUVAR __fish_init_3_x:\x1d +SETUVAR fish_color_autosuggestion:555\x1ebrblack +SETUVAR fish_color_cancel:\x2dr +SETUVAR fish_color_command:\x2d\x2dbold +SETUVAR fish_color_comment:red +SETUVAR fish_color_cwd:green +SETUVAR fish_color_cwd_root:red +SETUVAR fish_color_end:brmagenta +SETUVAR fish_color_error:brred +SETUVAR fish_color_escape:bryellow\x1e\x2d\x2dbold +SETUVAR fish_color_history_current:\x2d\x2dbold +SETUVAR fish_color_host:normal +SETUVAR fish_color_match:\x2d\x2dbackground\x3dbrblue +SETUVAR fish_color_normal:normal +SETUVAR fish_color_operator:bryellow +SETUVAR fish_color_param:cyan +SETUVAR fish_color_quote:yellow +SETUVAR fish_color_redirection:brblue +SETUVAR fish_color_search_match:bryellow\x1e\x2d\x2dbackground\x3dbrblack +SETUVAR fish_color_selection:white\x1e\x2d\x2dbold\x1e\x2d\x2dbackground\x3dbrblack +SETUVAR fish_color_user:brgreen +SETUVAR fish_color_valid_path:\x2d\x2dunderline +SETUVAR fish_key_bindings:fish_default_key_bindings +SETUVAR fish_pager_color_completion:\x1d +SETUVAR fish_pager_color_description:B3A06D\x1eyellow +SETUVAR fish_pager_color_prefix:white\x1e\x2d\x2dbold\x1e\x2d\x2dunderline +SETUVAR fish_pager_color_progress:brwhite\x1e\x2d\x2dbackground\x3dcyan diff --git a/git/.gitconfig b/git/.gitconfig index d8ff99f..4d73318 100644 --- a/git/.gitconfig +++ b/git/.gitconfig @@ -1,5 +1,13 @@ [user] email = bruno.carlin@waarp.org name = Bruno Carlin + signkey = 08C44FD445331DEF6696FB5D229863E4199FC2F8 [gui] encoding = utf-8 +[protocol] + version = 2 +[filter "lfs"] + required = true + clean = git-lfs clean -- %f + smudge = git-lfs smudge -- %f + process = git-lfs filter-process diff --git a/i3wm/.config/i3/config b/i3wm/.config/i3/config index 5ec1dcb..11c82b6 100644 --- a/i3wm/.config/i3/config +++ b/i3wm/.config/i3/config @@ -174,8 +174,8 @@ bindsym Mod4+r mode "resize" # Screen display set $mode_display Display (b) Bureau, (s) single mode "$mode_display" { - bindsym b exec xrandr --output DP-2-1 --auto --right-of eDP-1 --output DP-1-2 --auto --right-of DP-2-1 - bindsym s exec xrandr --output DP-2-1 --off --output DP-1-2 --off + bindsym b exec xrandr --output DP2-1 --auto --right-of eDP1 --output DP1-2 --auto --right-of DP2-1 + bindsym s exec xrandr --output DP2-1 --off --output DP1-2 --off # back to normal: Enter or Escape bindsym Return mode "default" diff --git a/mutt/.config/mutt/muttrc b/mutt/.config/mutt/muttrc index 938b888..7af10c2 100644 --- a/mutt/.config/mutt/muttrc +++ b/mutt/.config/mutt/muttrc @@ -1,7 +1,7 @@ set editor=vim set send_charset="utf-8" -set index_format="%4C %Z %{%b %d} %-15.15L %y %s" +set index_format="%4C %Z %8{%b %d} %-15.15L %y [%E] %s" set sort=threads set sort_aux=last-date-received @@ -56,7 +56,6 @@ bind index,pager \CP sidebar-prev bind index previous-entry bind index next-entry bind index collapse-thread -bind index,pager R group-reply macro attach S "~/Téléchargements/" "Save to downloads" macro index,pager T "=[Gmail]/Corbeille" "Trash" diff --git a/mutt/.config/mutt/waarp.sig b/mutt/.config/mutt/waarp.sig index 80607bb..25002d1 100644 --- a/mutt/.config/mutt/waarp.sig +++ b/mutt/.config/mutt/waarp.sig @@ -3,4 +3,4 @@ Cordialement, Bruno Carlin Waarp SAS 01 56 38 51 08 -07 64 07 84 87 +06 67 21 99 14 diff --git a/vifm/.config/vifm/vifmrc b/vifm/.config/vifm/vifmrc index 349aa29..2ebd451 100644 --- a/vifm/.config/vifm/vifmrc +++ b/vifm/.config/vifm/vifmrc @@ -14,12 +14,13 @@ set vicmd=vim " set vicmd=elvis\ -G\ termcap " set vicmd=vile +set shell=/bin/sh " This makes vifm perform file operations on its own instead of relying on " standard utilities like `cp`. While using `cp` and alike is a more universal " solution, it's also much slower and doesn't support progress measuring. -" set syscalls +set syscalls " Trash Directory " The default is to move files that are deleted with dd or :d to @@ -237,7 +238,7 @@ fileviewer *.[1-8] man ./%c | col -b " Images filextype *.bmp,*.jpg,*.jpeg,*.png,*.gif,*.xpm \ {View in feh} - \ feh %f &, + \ feh --borderless --scale-down --draw-filename --draw-exif --draw-tinted --auto-rotate %"f &, \ {View in sxiv} \ sxiv %f, \ {View in gpicview} diff --git a/vim/.vimrc b/vim/.vimrc index 6597bd0..22fb325 100644 --- a/vim/.vimrc +++ b/vim/.vimrc @@ -24,7 +24,7 @@ set showmatch " Show matching brackets. set hlsearch "set ignorecase " Do case insensitive matching "set smartcase " Do smart case matching -"set incsearch " Incremental search +set incsearch " Incremental search "set autowrite " Automatically save before commands like :next and :make set hidden " Hide buffers when they are abandoned set mouse=a @@ -42,6 +42,7 @@ set backupdir=~/.vim/backup// set directory=~/.vim/swap// set undodir=~/.vim/undo// set splitright +set cursorline " flag lines wider than 80 char highlight ColorColumn ctermbg=magenta @@ -51,14 +52,16 @@ call matchadd('ColorColumn', '\%81v', 100) if has("autocmd") autocmd FileType yaml setlocal ts=2 sts=2 sw=2 expandtab autocmd FileType html setlocal ts=2 sts=2 sw=2 expandtab + autocmd FileType gohtmltmpl setlocal ts=2 sts=2 sw=2 expandtab autocmd FileType css setlocal ts=2 sts=2 sw=2 expandtab autocmd FileType javascript setlocal ts=2 sts=2 sw=2 expandtab - autocmd FileType handlebars setlocal ts=2 sts=2 sw=2 expandtab + autocmd FileType html.handlebars setlocal ts=2 sts=2 sw=2 expandtab autocmd FileType xml setlocal ts=2 sts=2 sw=2 expandtab autocmd FileType go setlocal ts=4 sts=4 sw=4 noexpandtab autocmd FileType rst setlocal tw=80 ts=3 sts=3 sw=3 expandtab autocmd FileType gitcommit setlocal tw=80 ts=2 sts=2 sw=2 expandtab autocmd FileType md setlocal tw=80 ts=2 sts=2 sw=2 expandtab + autocmd FileType vimwiki setlocal tw=80 ts=2 sts=2 sw=2 expandtab endif " Airline options @@ -85,9 +88,10 @@ let g:syntastic_javascript_checkers = ['eslint'] let g:syntastic_java_javac_config_file_enabled = 1 " Vim-go options -let g:go_fmt_command = "goimports" +let g:go_fmt_command = "goreturns" +let g:go_metalinter_enabled = ['vet', 'golint', 'errcheck', 'structcheck', 'deadcode', 'gocyclo', 'ineffassign', 'dupl', 'gotype', 'varcheck', 'interfacer', 'gosimple', 'staticcheck', 'misspell'] let g:go_metalinter_autosave = 1 -let g:go_metalinter_enabled = ['vet', 'golint', 'errcheck', 'structcheck', 'deadcode', 'gocyclo', 'ineffassign', 'dupl', 'gotype', 'varcheck', 'interfacer', 'gosimple', 'staticcheck', 'misspell', 'gas'] +let g:go_metalinter_autosave_enabled = ['vet', 'golint', 'errcheck', 'structcheck', 'deadcode', 'gocyclo', 'ineffassign', 'dupl', 'gotype', 'varcheck', 'interfacer', 'gosimple', 'staticcheck', 'misspell'] let g:go_get_update = 0 let g:go_list_type = "quickfix" let g:go_highlight_functions = 1 @@ -118,44 +122,55 @@ let g:vimwiki_list = [{'path': '~/Notebook/work', \ 'index': 'main', \ 'ext': '.md', \ 'syntax': 'markdown'}] +let g:vimwiki_ext2syntax = {'.md': 'markdown'} " Grammalecte options -let g:grammalecte_cli_py='/usr/share/grammalecte-fr/cli.py' +let g:grammalecte_cli_py='/usr/bin/grammalecte-cli.py' + +" IndentGuide options +let g:indent_guides_auto_colors = 0 +autocmd VimEnter,Colorscheme * :hi IndentGuidesOdd ctermbg=none +autocmd VimEnter,Colorscheme * :hi IndentGuidesEven ctermbg=black call plug#begin('~/.vim/plugged') Plug 'scrooloose/nerdtree' Plug 'xuyuanp/nerdtree-git-plugin' - Plug 'airblade/vim-gitgutter' - Plug 'bling/vim-airline' + Plug 'vim-airline/vim-airline' Plug 'vim-airline/vim-airline-themes' + + Plug 'airblade/vim-gitgutter' Plug 'tpope/vim-fugitive' Plug 'jreybert/vimagit' - Plug 'kien/ctrlp.vim' - Plug 'valloric/youcompleteme' - Plug 'altercation/vim-colors-solarized' Plug 'fatih/vim-go' Plug 'joukevandermaas/vim-ember-hbs' + Plug 'dag/vim-fish' Plug 'glench/vim-jinja2-syntax' + Plug 'mattn/emmet-vim' Plug 'scrooloose/syntastic' Plug 'mtscout6/syntastic-local-eslint.vim' + Plug 'kien/ctrlp.vim' + Plug 'valloric/youcompleteme' Plug 'aklt/plantuml-syntax' Plug 'scrooloose/vim-slumlord' Plug 'vimwiki/vimwiki' - Plug 'dpelle/vim-Grammalecte' + Plug 'nathanaelkane/vim-indent-guides' + Plug 'altercation/vim-colors-solarized' call plug#end() - " Other key mappings map :NERDTreeToggle map n :cnext map p :cprevious nmap N :NERDTreeFocus nnoremap h :cclose +" Removes trailing whitespaces +nnoremap s :keeppattern %s/\s\+$// +