@@ -1,4 +1,4 @@
-complete -c j -f -r
+complete -c n -f -r
 
 set -l paths ""
 
@@ -6,4 +6,4 @@ for f in $MARKPATH/*
     set -a paths (basename $f)
 end
 
-complete -c j -a "$paths"
+complete -c n -a "$paths"

@@ -15,6 +15,6 @@ printf '%s -> %s\n' (basename $f) (readlink $f)
     end
 end
 
-function j -d 'The based jumper.'
+function n -d 'The based jumper.'  # n because workman
     cd (realpath $MARKPATH/$argv) 2>/dev/null || printf '%s\n' "error: no such mark $argv"
 end

@@ -1,5 +1,6 @@
-# Defined in /tmp/fish.tReLyy/workman.fish @ line 2
+# Defined in /tmp/fish.KwcRqe/workman.fish @ line 2
 function workman --wraps='setxkbmap us; xmodmap xmodmap/xmodmap.workman && xset r 66' --description 'alias workman=setxkbmap us; xmodmap xmodmap/xmodmap.workman && xset r 66'
-  setxkbmap us; xmodmap ~/leet/xmodmap/xmodmap.workman && xset r 66 $argv;
+  setxkbmap -option 'grp:alt_shift_toggle' -layout us,ru -variant ',phonetic' -option 'compose:caps'
+  xmodmap ~/leet/xmodmap/xmodmap.workman && xset r 66 $argv;
   export KEYBOARD_LAYOUT="workman"
 end

@@ -21,7 +21,7 @@ Plug 'Clavelito/indent-awk.vim'
 Plug 'wellle/targets.vim'
 Plug 'tpope/vim-rsi'
 Plug 'zah/nim.vim'
-Plug 'easymotion/vim-easymotion'
+Plug 'nicwest/vim-workman'
 call plug#end()
 
 " indentation
@@ -212,155 +212,6 @@ let &t_EI .= "\e[2 q"
     let &t_SR .= "\e[4 q"
 endif
 
-" for the Workman layout
-
-" --- Keyboard  ----------------------------------------------------------------------
-function Keyboard(type)
-  if a:type == "workman"
-
-  " --- Movement ---
-    noremap o l|          " move right
-    noremap e k|          " move up
-    noremap n j|          " move downn
-    noremap y h|          " move left
-
-    noremap <C-f> <C-u>|  " move half page up
-    noremap <C-h> <C-d>|  " move half page down
-    noremap <C-v> <C-b>|  " move one page up
-    noremap <C-t> <C-f>|  " move one page down
-    noremap <C-r> <C-e>|  " scroll text up
-    noremap <C-j> <C-y>|  " scroll text down
+" for workman in normal mode
+let g:workman_normal_qwerty = 1
 
-    noremap Y H|          " move to top of screen
-    noremap L M|          " move to middle of screen
-    noremap O L|          " move to bottom of screen
-
-    noremap d w|          " move to beginning of next word
-    noremap D W|          " move to beginning of next word after a whitespace
-    noremap v b|          " move to previous beginning of word
-    noremap V B|          " move to beginning of previous word before a whitespace
-    noremap r e|          " move to end of word
-    noremap R E|          " move to end of word before a whitespace
-    noremap gr ge|        " move to previous end of word
-    noremap gR gE|        " move to previous end of word before a whitespace
-
-            "  zz           scroll the line with the cursor to the center of the screen
-    noremap zb zt|        " scroll the line with the cursor to the top
-    noremap zv zb|        " scroll the line with the cursor to the bottom
-
-  " --- Insert ---
-            " a             append text after the cursor
-            " A             append text at the end of the line
-    noremap u i|          " insert text before the cursor
-    noremap U I|          " insert text before the first non-blank in the line
-    noremap p o|          " begin a new line below the cursor and insert text
-    noremap P O|          " begin a new line above the cursor and insert text
-
-  " --- Del, Change, Yank, Past, Undo, Redo ---
-    noremap h d|          " del text under {motion}
-    noremap H D|          " del to end of line
-            " x             del character below cursor
-            " s             substitute char under cursor
-            " s             substitute entire line
-    noremap m c|          " change {motion} text (into register) and begin insert
-    noremap M C|          " change to end of line
-    noremap w r|          " replace current character
-    noremap W R|          " replace character until esc
-
-    noremap j y|          " yank
-    noremap J Y|          " yank line
-    noremap ; p|          " put below current line
-    noremap : P|          " put abowe current line
-
-    noremap f u|          " undo
-            " ctrl+r        redo
-
-  " --- Search ---
-            " *             next whole word under cursor
-            " #             previous whole word under cursor
-            " g*            next matching search (not whole word) pattern under cursor
-            " g#            previous matching search (not whole word) pattern under cursor
-    noremap k n|          " next matching search pattern
-    noremap K N|          " previous matching search pattern
-
-    noremap t f|          " to next 'X' after cursor, in the same line (X is any character)
-    noremap T F|          " to previous 'X' before cursor
-    noremap b t|          " til next 'X' (similar to above, but cursor is before X)
-    noremap B T|          " till previous 'X'
-    noremap i ;|          " repeat above, in same direction
-    noremap I :|          " repeat above, in reverse direction
-
-    noremap c v|          " enter visual mode
-    noremap <C-c> <C-v>|  " enter visual block mode
-
-    silent! unmap jj
-    imap nn <Esc>|        " use 'nn' to exit insert mode
-
-  else " qwerty
-    call UnmapWorkman()
-  endif
-endfunction
-
-function UnmapWorkman()
-
-  " --- Unmap Workman keys ---
-  silent! unmap o
-  silent! unmap e
-  silent! unmap n
-  silent! unmap y
-  silent! unmap <C-f>
-  silent! unmap <C-h>
-  silent! unmap <C-v>
-  silent! unmap <C-t>
-  silent! unmap <C-r>
-  silent! unmap <C-j>
-  silent! unmap Y
-  silent! unmap L
-  silent! unmap O
-  silent! unmap d
-  silent! unmap D
-  silent! unmap v
-  silent! unmap V
-  silent! unmap r
-  silent! unmap R
-  silent! unmap gr
-  silent! unmap gR
-  silent! unmap zb
-  silent! unmap zv
-  silent! unmap u
-  silent! unmap U
-  silent! unmap p
-  silent! unmap P
-  silent! unmap h
-  silent! unmap H
-  silent! unmap m
-  silent! unmap M
-  silent! unmap w
-  silent! unmap W
-  silent! unmap j
-  silent! unmap J
-  silent! unmap ;
-  silent! unmap :
-  silent! unmap f
-  silent! unmap k
-  silent! unmap K
-  silent! unmap t
-  silent! unmap T
-  silent! unmap b
-  silent! unmap B
-  silent! unmap i
-  silent! unmap I
-  silent! unmap c
-  silent! unmap <C-c>
-
-  silent! unmap nn
-  imap jj <Esc>|          " use 'jj' to exit insert mode
-
-endfunction
-
-
-autocmd VimEnter * call Keyboard("workman")| " load workman layout at startup
-
-" quickly change layouts - default <Leader> = \
-:noremap <Leader>q :call Keyboard("qwerty")<CR>:echom "qwerty keyboard layout"<CR>
-:noremap <Leader>w :call Keyboard("workman")<CR>:echom "workman keyboard layout"<CR>

@@ -395,7 +395,42 @@ default.buffer = "irc;rizon.#buddy;3"
 default.buffer = "irc;rizon.#crimson;4"
 default.buffer = "irc;rizon.#homescreen;5"
 default.buffer = "irc;rizon.#rice;6"
-default.buffer = "irc;rizon.*status;7"
+default.buffer = "python;makera-org.slack.com;7"
+default.buffer = "python;makera-org.slack.com.#bugs;8"
+default.buffer = "python;makera-org.slack.com.#celebrations;9"
+default.buffer = "python;makera-org.slack.com.#design;10"
+default.buffer = "python;makera-org.slack.com.#dev;11"
+default.buffer = "python;makera-org.slack.com.#general;12"
+default.buffer = "python;makera-org.slack.com.#innerjourney;13"
+default.buffer = "python;makera-org.slack.com.#legal;14"
+default.buffer = "python;makera-org.slack.com.#makera;15"
+default.buffer = "python;makera-org.slack.com.#random;16"
+default.buffer = "python;makera-org.slack.com.#ycombinator;17"
+default.buffer = "python;makera-org.slack.com.Abhishek;18"
+default.buffer = "python;makera-org.slack.com.Anirudh;19"
+default.buffer = "python;makera-org.slack.com.Dish;20"
+default.buffer = "python;makera-org.slack.com.GitHub;21"
+default.buffer = "python;makera-org.slack.com.Kavya;22"
+default.buffer = "python;makera-org.slack.com.Vishesh;23"
+default.buffer = "python;teamcometchat.slack.com;24"
+default.buffer = "python;teamcometchat.slack.com.&breakouts-pro;25"
+default.buffer = "python;teamcometchat.slack.com.&hipaa;26"
+default.buffer = "python;teamcometchat.slack.com.&interns-pro;27"
+default.buffer = "python;teamcometchat.slack.com.&xmpp-pro;28"
+default.buffer = "python;teamcometchat.slack.com.AjayGajra,Bosky,KetanYekale,RaviRanjan;29"
+default.buffer = "python;teamcometchat.slack.com.#general;30"
+default.buffer = "python;teamcometchat.slack.com.PrathameshMajgaonkar,RaviRanjan;31"
+default.buffer = "python;teamcometchat.slack.com.#product-releases;32"
+default.buffer = "python;teamcometchat.slack.com.#random;33"
+default.buffer = "python;teamcometchat.slack.com.#spotlight;34"
+default.buffer = "python;teamcometchat.slack.com.AjayGajra;35"
+default.buffer = "python;teamcometchat.slack.com.AjayPrabhakar;36"
+default.buffer = "python;teamcometchat.slack.com.Bosky;37"
+default.buffer = "python;teamcometchat.slack.com.donut;38"
+default.buffer = "python;teamcometchat.slack.com.KetanYekale;39"
+default.buffer = "python;teamcometchat.slack.com.PrathameshMajgaonkar;40"
+default.buffer = "python;teamcometchat.slack.com.RaviRanjan;41"
+default.buffer = "python;teamcometchat.slack.com.standuply;42"
 default.window = "1;0;0;0;irc;rizon.Carp"
 default.current = on
 _zoom.window = "1;0;0;0;irc;freenode.##crustaceans"
@@ -469,6 +504,7 @@ python.teamcometchat.slack.com.PrathameshMajgaonkar = all
 python.teamcometchat.slack.com.PrathameshMajgaonkar,RaviRanjan = all
 python.teamcometchat.slack.com.RaviRanjan = all
 python.teamcometchat.slack.com.Slackbot = all
+python.teamcometchat.slack.com.standuply = all
 python.teamcometchat.slack.com.Taru = all
 
 [filter]