Minor changes

7 files changed, 22 insertions, 42 deletions

diff --git a/bin/.local/bin/mutt_attach b/bin/.local/bin/mutt_attach
index 4a14dbc..44a759f 100755
--- a/bin/.local/bin/mutt_attach
+++ b/bin/.local/bin/mutt_attach
@@ -3,7 +3,7 @@
 # File in which to store the list of filenames to attach
 tmp=$(mktemp)
 
-vifm "$HOME" --choose-files "$tmp"
+vifm "$HOME" -c "set nohlsearch" --choose-files "$tmp"
 # ranger "$HOME" --choosefiles="$tmp"
 
 while IFS="" read -r file; do
diff --git a/bin/.local/bin/references b/bin/.local/bin/references
index 46ff41e..4501904 100755
--- a/bin/.local/bin/references
+++ b/bin/.local/bin/references
@@ -1,5 +1,5 @@
 #!/bin/bash
-REF_DIR="$HOME/phd/references"
+REF_DIR="$HOME/postdoc/references"
 PDF=$(find $REF_DIR -regex ".*.\(pdf\|djvu\|PDF\|ps\)" -printf "%C@ %P\n" | sort | tac | cut -d' ' -f2-)
 TARGET=$(echo "${PDF//"$REF_DIR/"/}" | dmenu -i -p "Open File")
 [[ -n $TARGET ]] && exec zathura "$REF_DIR/$TARGET"
diff --git a/mutt/.mutt/crypto b/mutt/.mutt/crypto
index 393820b..b4ebc13 100644
--- a/mutt/.mutt/crypto
+++ b/mutt/.mutt/crypto
@@ -82,4 +82,3 @@ set pgp_list_secring_command="gpg --no-verbose --batch --quiet --with-colons --l
 
 # This version uses --status-fd messages
 set pgp_good_sign="^\\[GNUPG:\\] GOODSIG"
-
diff --git a/tmux/.tmux.conf b/tmux/.tmux.conf
index 040f93d..63a3799 100644
--- a/tmux/.tmux.conf
+++ b/tmux/.tmux.conf
@@ -27,6 +27,11 @@ set-hook -g session-created "if-shell '[ -n \""'$SSH_CONNECTION'"\" ]' 'set stat
 set-hook -g client-attached "if-shell '[ -n \""'$SSH_CONNECTION'"\" ]' 'set status-bg \"#aa4444\"' 'set status-bg \"green\"'"
 
 
+# PILOT_KEY_H=M-h
+# PILOT_KEY_J=M-j
+# PILOT_KEY_K=M-k
+# PILOT_KEY_L=M-l
+# PILOT_KEY_P=M-backslash
 PILOT_IGNORE=
 PILOT_BOUNDARY=ignore
 PILOT_MODE=wintab
diff --git a/vim/.vim/after/plugin/generalized_motion.vim b/vim/.vim/after/plugin/generalized_motion.vim
deleted file mode 100644
index a2b4284..0000000
--- a/vim/.vim/after/plugin/generalized_motion.vim
+++ /dev/null
@@ -1,31 +0,0 @@
-"" More general ; {{{1
-
-let g:generalized_motion = "f"
-function! Generalized_motion(...)
-    if a:0 > 0
-        let g:generalized_motion=a:1
-        echom "Generalized motion:" g:generalized_motion
-        if (g:generalized_motion == "f") | call feedkeys('f', 'n') | return | endif
-        if (g:generalized_motion == "t") | call feedkeys('t', 'n') | return | endif
-        if (g:generalized_motion == "s") | call feedkeys("\<Plug>Sneak_s") | return | endif
-    endif
-    if (g:generalized_motion == "f") | call feedkeys(';', 'n') | endif
-    if (g:generalized_motion == "t") | call feedkeys(';', 'n') | endif
-    if (g:generalized_motion == "s") | call feedkeys("\<Plug>Sneak_;") | return | endif
-    try
-        if (g:generalized_motion == "]q") | cnext | endif
-        if (g:generalized_motion == "[q") | cprevious | endif
-        if (g:generalized_motion == "]a") | next | endif
-        if (g:generalized_motion == "[a") | previous | endif
-        if (g:generalized_motion == "]b") | bnext | endif
-        if (g:generalized_motion == "[b") | bprevious | endif
-        if (g:generalized_motion == "]f") | call feedkeys("\<Plug>unimpairedDirectoryPrevious") | endif
-        if (g:generalized_motion == "[f") | call feedkeys("\<Plug>unimpairedDirectoryPrevious") | endif
-    catch
-        call feedkeys(';', 'n')
-    endtry
-endfunction
-for mapping in ['f', 't', 's', ']q', '[q', ']a', '[a', ']f', '[f', ']b', '[b']
-    exe "nmap <silent>" mapping ":<c-u>call Generalized_motion('".mapping."')<cr>"
-endfor
-nnoremap <silent> ; :<c-u>call Generalized_motion()<cr>
diff --git a/vim/.vimrc b/vim/.vimrc
index f715c13..abf20f6 100644
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -89,6 +89,7 @@ Plug 'KKPMW/moonshine-vim'
 Plug 'KKPMW/sacredforest-vim'
 Plug 'junegunn/seoul256.vim'
 Plug 'romainl/Apprentice'
+Plug 'joshdick/onedark.vim'
 " Plug 'josuegaleas/jay'
 call plug#end()
 
@@ -234,17 +235,22 @@ let g:vimtex_view_method='zathura'
 let g:vimtex_quickfix_mode=2
 let g:vimtex_compiler_progname='nvr'
 let g:vimtex_syntax_enabled=1
-let  g:vimtex_fold_types = {
-       \ 'preamble' : {'enabled' : 0},
-       \ 'envs' : {
-       \   'blacklist' : ['lemma', 'proposition', 'theorem', 'equation'],
-       \   'whitelist' : ['proof'],
-       \ },
-       \}
+" let  g:vimtex_fold_types = {
+"        \ 'preamble' : {'enabled' : 0},
+"        \ 'envs' : {
+"        \   'blacklist' : ['lemma', 'proposition', 'theorem', 'equation'],
+"        \   'whitelist' : ['proof'],
+"        \ },
+"        \}
 
 " Pilot
 let g:pilot_boundary='ignore'
 let g:pilot_mode='wintab'
+" let g:pilot_key_h='<a-h>'
+" let g:pilot_key_j='<a-j>'
+" let g:pilot_key_k='<a-k>'
+" let g:pilot_key_l='<a-l>'
+" let g:pilot_key_p='<a-\>'
 
 " YouCompleteMe
 let g:ycm_key_list_select_completion = ['<C-n>', '<Down>']
diff --git a/zsh/.zshenv b/zsh/.zshenv
index d29e014..eabf2f4 100644
--- a/zsh/.zshenv
+++ b/zsh/.zshenv
@@ -2,7 +2,8 @@ export EDITOR=nvim
 export VISUAL=nvim
 
 # Export PATH without repetitions
-export -U PATH="/home/urbain/.config/guix/current/bin${PATH:+:}$PATH"
+export -U PATH="$HOME/.local/bin${PATH:+:}$PATH"
+export -U PATH="$HOME/.config/guix/current/bin${PATH:+:}$PATH"
 export -U PATH=$(echo "$HOME/.gem/ruby/"*"/bin")"${PATH:+:}$PATH"
 export -U PATH="/usr/local/sbin${PATH:+:}$PATH"
 export -U PATH="/usr/bin${PATH:+:}$PATH"