Update config.

11 files changed, 96 insertions, 46 deletions

diff --git a/.gitignore b/.gitignore
index ea0d776..5015764 100755
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@
 /files/.vim/spell
 /files/.vim/bundle
 /files/.zsh/cache
+/files/.tmux/plugins/
diff --git a/.gitmodules b/.gitmodules
index b149a92..227f35f 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -11,3 +11,6 @@
 [submodule "vim/Vundle.vim"]
     path = files/.vim/bundle/Vundle.vim
     url = https://github.com/VundleVim/Vundle.vim
+[submodule "files/.tmux/plugins/tpm"]
+	path = files/.tmux/plugins/tpm
+	url = https://github.com/tmux-plugins/tpm
diff --git a/files/.aria2/aria2.conf b/files/.aria2/aria2.conf
index 6349128..2a6e5ad 100644
--- a/files/.aria2/aria2.conf
+++ b/files/.aria2/aria2.conf
@@ -1,9 +1,9 @@
 console-log-level=warn
 seed-time=0
 summary-interval=0
-load-cookies=/home/anton/.config/chromium/Default/Cookies
 max-connection-per-server=3
 auto-file-renaming=false
+file-allocation=falloc
 
 rpc-listen-all=true
 rpc-allow-origin-all=true
diff --git a/files/.gitconfig b/files/.gitconfig
index b88d000..b063960 100644
--- a/files/.gitconfig
+++ b/files/.gitconfig
@@ -60,4 +60,4 @@
 [filter "tabs"]
     ;clean = unexpand --tabs=4 --first-only
 [gui]
-    tabsize = 4
+    tabsize = 2
diff --git a/files/.gitignore b/files/.gitignore
index 7cf512d..574de7b 100644
--- a/files/.gitignore
+++ b/files/.gitignore
@@ -15,3 +15,6 @@
 # Infinitest
 infinitest.filters
 infinitest.args
+
+# NPM
+package-lock.json
diff --git a/files/.tmux.conf b/files/.tmux.conf
new file mode 100644
index 0000000..7a96f54
--- /dev/null
+++ b/files/.tmux.conf
@@ -0,0 +1,74 @@
+# bind prefix to ^a
+unbind C-b
+set -g prefix `
+bind-key ` send-prefix
+
+## make window/pane index start with 1
+set -g base-index 1
+setw -g pane-base-index 1
+
+set -g set-titles on
+set -g set-titles-string "#S / #W"
+
+
+# disable auto rename of windows
+set-option -g allow-rename off
+
+# enable mouse support
+setw -g mouse on
+
+## set vi mode for copy mode
+#setw -g mode-keys vi
+#unbind [
+#bind Escape copy-mode
+#unbind p
+#bind p paste-buffer
+#bind -t vi-copy 'v' begin-selection
+#bind -t vi-copy 't' copy-selection
+
+##
+## Key bindings
+##
+
+bind \ split-window -h -c '#{pane_current_path}'
+
+# toggle last 2 windows
+bind C-a last-window
+
+## pane movement
+#bind h select-pane -L
+#bind j select-pane -D
+#bind k select-pane -U
+#bind l select-pane -R
+
+## window movement
+#bind -r C-h select-window -t :-
+#bind -r C-l select-window -t :+
+
+## resize pane
+#bind -r H resize-pane -L 10
+#bind -r J resize-pane -D 10
+#bind -r K resize-pane -U 10
+#bind -r L resize-pane -R 10
+
+# stay in copy mode on drag end
+#unbind-key -t vi-copy MouseDragEnd1Pane
+#bind-key -t vi-copy MouseUp1Pane cancel
+
+# Status bar
+set -g status-right "$USER@#h %H:%M"
+
+set -g @colors-solarized 'light'
+
+# To Install Plugin: <Prefix> + I
+# To Uninstall Plugin: <Prefix> + <Alt> + U
+
+# Plugins
+set -g @plugin 'tmux-plugins/tpm'
+set -g @plugin 'tmux-plugins/tmux-sensible'
+set -g @plugin 'seebi/tmux-colors-solarized'
+set -g @plugin 'christoomey/vim-tmux-navigator'
+set -g @plugin 'tmux-plugins/tmux-pain-control'
+
+# Initialize TMUX plugin manager (keep this line at the very bottom of tmux.conf)
+run '~/.tmux/plugins/tpm/tpm'
diff --git a/files/.tmux/plugins/tpm b/files/.tmux/plugins/tpm
new file mode 160000
+Subproject 95f78336c3972f3e6648b7b3db754f2224320a5
diff --git a/files/.vimrc b/files/.vimrc
index da66aef..9913554 100644
--- a/files/.vimrc
+++ b/files/.vimrc
@@ -17,6 +17,7 @@ Plugin 'https://github.com/vim-scripts/L9.git'
 
 " Git inside vim
 Plugin 'https://github.com/tpope/vim-fugitive.git'
+Plugin 'https://github.com/airblade/vim-gitgutter'
 Plugin 'https://github.com/tpope/vim-unimpaired'
 
 " Intelligent date inc/dec
@@ -30,7 +31,6 @@ Plugin 'https://github.com/ctrlpvim/ctrlp.vim'
 " Finder
 Plugin 'https://github.com/vim-scripts/FuzzyFinder.git'
 " Solarized colorscheme
-"Plugin 'https://github.com/altercation/vim-colors-solarized'
 Plugin 'https://github.com/lifepillar/vim-solarized8'
 " Zen codding
 Plugin 'https://github.com/mattn/emmet-vim.git'
@@ -55,16 +55,12 @@ Plugin 'https://github.com/godlygeek/tabular'
 Plugin 'https://github.com/ConradIrwin/vim-bracketed-paste'
 " File templates
 Plugin 'https://github.com/aperezdc/vim-template'
-" Code browser
-Plugin 'https://github.com/vim-scripts/taglist.vim'
 
 " File types
 
 " Ledger
-"Plugin 'https://github.com/ledger/vim-ledger'
 Plugin 'https://github.com/abobov/vim-ledger'
-" Nginx
-Plugin 'https://github.com/evanmiller/nginx-vim-syntax.git'
+
 " Jade templates
 Plugin 'https://github.com/digitaltoad/vim-jade.git'
 " Markdown
@@ -217,10 +213,13 @@ let maplocalleader="\\"
 if &t_Co < 16
     set t_Co=16
 endif
+let &t_8f = "\<Esc>[38;2;%lu;%lu;%lum"
+let &t_8b = "\<Esc>[48;2;%lu;%lu;%lum"
 let g:solarized_termcolors=256
 let g:solarized_termtrans=1
 set background=light
 colorscheme solarized8_light
+set termguicolors
 
 " }}}
 
@@ -560,6 +559,11 @@ let g:ctrlp_user_command = 'ag %s -l --nocolor -g ""'
 let g:ctrlp_user_caching = 0
 
 " }}}
+" Ledger {{{
+
+let g:ledger_commodity_spell = 0
+
+" }}}
 " }}}
 " Load custom local config {{{
 
diff --git a/files/.zsh/rc/S50_aliases b/files/.zsh/rc/S50_aliases
index 8f01397..60643b0 100644
--- a/files/.zsh/rc/S50_aliases
+++ b/files/.zsh/rc/S50_aliases
@@ -67,6 +67,9 @@ alias ipv6_disable='sudo sysctl net.ipv6.conf.all.disable_ipv6=1'
 alias ipv6_enable='sudo sysctl net.ipv6.conf.all.disable_ipv6=0'
 
 alias aria2c-rpc="aria2c --enable-rpc"
+if [ -f "$HOME/.config/chromium/Default/Cookies" ] ; then
+    alias aria2c-cookies="aria2c --load-cookies='$HOME/.config/chromium/Default/Cookies'"
+fi
 
 alias sc=systemctl
 alias jf="journalctl --unit"
@@ -100,10 +103,6 @@ alias -g LA='2>&1|less'
 alias -g X='|xclip'
 alias -g XC='|xclip -selection clipboard'
 
-# Projects
-
-alias sz='~/src/sovzond/proj.sh'
-
 # Run bush in last docker container
 alias dbash='docker exec -it `docker ps -ql` bash'
 alias dps='docker ps'
diff --git a/files/.zsh/rc/S50_functions b/files/.zsh/rc/S50_functions
index a8dfeef..28e585a 100644
--- a/files/.zsh/rc/S50_functions
+++ b/files/.zsh/rc/S50_functions
@@ -6,40 +6,6 @@ ppgrep() {
     pgrep "$@" | xargs --no-run-if-empty ps fp
 }
 
-stocks() {
-    if [ -z "$1" ] ; then
-        cat <<EOM
-stocks NAME
-
-Get current stock value for NAME.
-
-Example:
-
-    $ stocks GOOG
-    $ stocks EURUSD=x
-EOM
-        return
-    fi
-    curl -s 'http://download.finance.yahoo.com/d/quotes.csv?s='$1'&f=l1'
-}
-
-xe() {
-    if [ -z "$1" ] ; then
-        cat <<EOM
-xe NAME
-
-Get exchange rates.
-
-Example:
-
-    $ xe EURRUB
-    $ xe usdrub
-EOM
-        return
-    fi
-    stocks "$1=x"
-}
-
 setgov() {
     GOVS=($(cpufreq-info -g))
 
diff --git a/files/bin b/files/bin
-Subproject 95e920f6fe2de0b26cd8af072b29438c9a8e83c
+Subproject 941a793cbcf906725eec549a60eef3b3b3e8098