[vim] Update generalized_motion

4 files changed, 14 insertions, 7 deletions

diff --git a/tmux/.tmux.conf b/tmux/.tmux.conf
index c268025..7df3a18 100644
--- a/tmux/.tmux.conf
+++ b/tmux/.tmux.conf
@@ -26,3 +26,6 @@ PILOT_BOUNDARY=ignore
 PILOT_MODE=wintab
 PILOT_ROOT=$HOME/Dropbox/projects/vim-wintab
 source-file $PILOT_ROOT/pilot.tmux
+
+# Bind for clear-screen
+bind C-l send-keys C-l
diff --git a/vifm/.config/vifm/vifmrc b/vifm/.config/vifm/vifmrc
index 0ef0c26..1bd27d8 100644
--- a/vifm/.config/vifm/vifmrc
+++ b/vifm/.config/vifm/vifmrc
@@ -1,12 +1,12 @@
 " Command to open files
-filetype * xdg-open &
-filetype *.exe wine
+filetype *.JPG feh %f &
+filetype *.exe wine %f & 
+filetype * xdg-open %f &
 
 " Options
 set fastrun
 set history=100
 set incsearch
-set runexec
 set sortnumbers
 set scrolloff=2
 set smartcase
@@ -15,6 +15,9 @@ set relativenumber
 set vimhelp
 set wildmenu
 
+" Run executables on <cr>
+" set runexec
+
 " Commands
 command! backup !cp -r %f %f.bak
 
diff --git a/vim/.vim/after/plugin/generalized_motion.vim b/vim/.vim/after/plugin/generalized_motion.vim
index 112016c..a2b4284 100644
--- a/vim/.vim/after/plugin/generalized_motion.vim
+++ b/vim/.vim/after/plugin/generalized_motion.vim
@@ -1,7 +1,4 @@
 "" More general ; {{{1
-" if exists('g:loaded_sneak_plugin')
-
-" endif
 
 let g:generalized_motion = "f"
 function! Generalized_motion(...)
@@ -10,9 +7,11 @@ function! Generalized_motion(...)
         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
@@ -20,6 +19,8 @@ function! Generalized_motion(...)
         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
diff --git a/vim/.vimrc b/vim/.vimrc
index e2f6104..20fe884 100644
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -136,8 +136,8 @@ nnoremap <silent> gh :set opfunc=Call_heytmux<cr>g@
 xnoremap <silent> gh :Heytmux!<cr>
 
 " Iron
+" let g:iron_repl_open_cmd = 'vsplit'
 let g:iron_map_defaults=0
-let g:iron_repl_open_cmd='edit'
 nmap yr <Plug>(iron-send-motion)
 xmap R <Plug>(iron-send-motion)
 nmap yrr VR