🔫

git/gitconfig

@@ -12,6 +12,7 @@
         fa = fetch --all
         rebase-ours = rebase --interactive --autostash --merge --strategy recursive --strategy-option ours
         reup = rebase --interactive --autostash origin/master
+        master = "!f() { git checkout master && git fetch origin master && git reset --hard origin/master; }; f"
 [format]
         pretty = %Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset
 [color]

lang/python/python.sh

@@ -3,8 +3,8 @@
 export WORKON_HOME=$HOME/.virtualenvs            #
 export PIP_VIRTUALENV_BASE=$WORKON_HOME          #
 export PIP_RESPECT_VIRTUALENV=true               #
-                                                 #
 
+                                                 #
 # for pythonrc
 export PYTHONSTARTUP=~/.pystartup/.pythonrc
 alias plint="pylint --msg-template='{path}:{line}: [{msg_id}({symbol}), {obj}] {msg}' --output-format=colorized -r n"

osx/inputrc

@@ -20,4 +20,3 @@ set input-meta on
 set output-meta on
 set show-all-if-ambiguous on
 set visible-stats on
-set -o vi

vim/samstav-vimrc/plugin/samstav.vim

@@ -5,8 +5,8 @@ let g:jsx_ext_required = 0
 set synmaxcol=10000
 
 " map F9 to toggle line numbers
-nnoremap <F9> :<C-U>exe "set invnumber"<CR>
-vnoremap <F9> :<C-U>exe "set invnumber"<CR>
+nnoremap <L> :<C-U>exe "set invnumber"<CR>
+vnoremap <L> :<C-U>exe "set invnumber"<CR>
 
 "easier split navigations
 nnoremap <C-J> <C-W><C-J>
@@ -97,6 +97,9 @@ set ls=2
 set list
 set listchars=tab:>.,trail:⋮,extends:#,nbsp:.
 
+" show line/column
+set ruler
+
 " ************ Status Line *************
 
 "set statusline=%t       "tail of the filename