merge up

.gitmodules

@@ -34,18 +34,9 @@
 [submodule "vim/bundle/vundle"]
 	path = vim/bundle/vundle
 	url = https://github.com/gmarik/vundle.git
-[submodule "zsh/oh-my-zsh"]
-	path = zsh/oh-my-zsh
-	url = git://github.com/linkinpark342/oh-my-zsh.git
-[submodule "zsh/custom/plugins/zsh-syntax-highlighting"]
-	path = zsh/custom/plugins/zsh-syntax-highlighting
-	url = git@github.com:zsh-users/zsh-syntax-highlighting.git
 [submodule "zsh/custom/plugins/autosuggestions"]
 	path = zsh/custom/plugins/autosuggestions
 	url = https://github.com/tarruda/zsh-autosuggestions.git
-[submodule "zsh/custom/plugins/fzf"]
-	path = zsh/custom/plugins/fzf
-	url = https://github.com/junegunn/fzf.git
-[submodule "zsh/custom/plugins/fzf-zsh"]
-	path = zsh/custom/plugins/fzf-zsh
-	url = https://github.com/Treri/fzf-zsh.git
+[submodule "vim/pack/minpac/opt/minpac"]
+	path = vim/pack/minpac/opt/minpac
+	url = https://github.com/k-takata/minpac.git

Makefile

@@ -17,14 +17,13 @@ all: $(HOME)/.vim \
 	$(HOME)/.pylintrc \
 	$(HOME)/.jshintrc \
 	$(HOME)/.tmux.conf \
-	vim/bundle/neobundle.vim/.git \
-	$(HOME)/.xonshrc \
 	vim/undo/ \
-	$(HOME)/bin/vv
+	$(HOME)/bin/vv \
+	$(HOME)/.config/nvim
 
-vim/bundle/neobundle.vim/.git:
-	git submodule init
-	git submodule update
+$(HOME)/.config/nvim:
+	mkdir -p $(HOME)/.config
+	ln -s "../.vim" $@
 
 $(HOME)/bin/%: bin/%
 	mkdir -p $(HOME)/bin
@@ -40,10 +39,6 @@ $(HOME)/.ssh/config: ssh_config
 	mkdir -p $(HOME)/.ssh
 	ln -fs $(abspath $<) $@
 
-python_vim/python.vim python_vim/vimrc:
-	svn checkout http://svn.python.org/projects/python/trunk/Misc/Vim python_vim
-
-vim/syntax/python.vim: python_vim/python.vim
-	cd python_vim && svn up
-	ln -s $(abspath $<) $@
-
+vim/pack/tomorrow/start/theme/colors/Tomorrow-Night-Eighties.vim:
+	mkdir -p $(dir $@)
+	curl -L https://raw.githubusercontent.com/chriskempson/tomorrow-theme/master/vim/colors/Tomorrow-Night-Eighties.vim -o $@

gitconfig

@@ -1,10 +1,7 @@
 [user]
 	name = Abhishek Mukherjee
 	email = abhishek.mukher.g@gmail.com
-[core]
-	pager = less -X -F
 [color]
-	pager = true
 	ui = auto
 	diff = auto
 	status = auto
@@ -23,6 +20,7 @@
 	fast = merge --ff-only
 	ffast = pull --ff-only
 	ignore = "!gi() { curl -L -s https://www.gitignore.io/api/$@ ;}; gi"
+	versions = tag --sort=v:refname
 [log]
 	decorate = true
 [giggle]
@@ -44,3 +42,6 @@
 	required = true
 	clean = git media clean %f
 	smudge = git media smudge %f
+[core]
+	pager = less -F -X
+	autocrlf = input

tmux.conf

@@ -17,8 +17,8 @@ bind-key y run-shell "tmux show-buffer | xsel -i -b"
 set -g base-index 1
 
 set-option -g default-terminal "screen-256color"
-set-option -g mouse-select-pane off
-set-option -g mouse-resize-pane off
+# set-option -g mouse-select-pane off
+# set-option -g mouse-resize-pane off
 set-option -g status-keys vi
 set-option -g bell-action any
 set-option -g set-titles off
@@ -29,13 +29,13 @@ set-option -g allow-rename off
 bind -n C-k send-keys C-l \; run-shell "sleep .3s" \; clear-history
 
 setw -g mode-keys vi
-setw -g mode-mouse off
+# setw -g mode-mouse off
 setw -g monitor-activity off
 
-set-option -g mouse-select-pane off
-set-option -g mouse-resize-pane off
-setw -g mode-mouse off
-set -g mouse-select-window off
+# set-option -g mouse-select-pane off
+# get-option -g mouse-resize-pane off
+# setw -g mode-mouse off
+#set -g mouse-select-window off
 
 bind e previous-window
 bind f next-window
@@ -44,9 +44,16 @@ bind k select-pane -U
 bind h select-pane -L
 bind l select-pane -R
 
+is_vim="ps -o state= -o comm= -t '#{pane_tty}' \
+    | grep -iqE '^[^TXZ ]+ +(\\S+\\/)?g?(view|n?vim?x?)(diff)?$'"
+bind-key -n C-h if-shell "$is_vim" "send-keys C-h"  "select-pane -L"
+bind-key -n C-j if-shell "$is_vim" "send-keys C-j"  "select-pane -D"
+bind-key -n C-k if-shell "$is_vim" "send-keys C-k"  "select-pane -U"
+bind-key -n C-l if-shell "$is_vim" "send-keys C-l"  "select-pane -R"
+bind-key -n C-\ if-shell "$is_vim" "send-keys C-\\" "select-pane -l"
+
 bind s set-window-option synchronize-panes
 
-set-option -g status-utf8 on
 # set-option -g status-justify centre
 set-option -g status-justify left
 set-option -g status-bg black
@@ -83,3 +90,5 @@ unbind-key Right
 
 
 bind r source-file ~/.tmux.conf
+
+set -sg escape-time 0