Merge branch 'master' of https://git.jonfu.com/jon/dots

bash/.bashrc

@@ -32,7 +32,7 @@ alias df='sudo df -hT -x tmpfs -x devtmpfs'
 alias rsync='rsync --progress'
 alias lg='ll | grep -i $0'
 
-bind 'set completion-ignore-case on'
+#bind 'set completion-ignore-case on'
 set bell-style none
 
 ## function and alias for short find
@@ -57,10 +57,12 @@ export PATH=$GOPATH:$GOPATH/bin:$PATH
 # use vimx if available (for clipboard support)
 if [ -f "/usr/bin/vimx" ]; then
     export EDITOR=/usr/bin/vimx
+    alias vim=/usr/bin/vimx
 else
     export EDITOR=/usr/bin/vim
 fi
 
+
 # so stupid, systemd ignores EDITOR and requires its own env variable
 # just set it to whatever editor is
 export SYSTEMD_EDITOR=$EDITOR
@@ -107,6 +109,21 @@ if [ -f /usr/share/fzf/shell/key-bindings.bash ]; then
     source /usr/share/fzf/shell/key-bindings.bash
 fi
 
+#this is a stopwatch function, call with: $ stopwatch
+stopwatch () {
+    date1=`date +%s`; while true; do echo -ne "$(date -u --date @$((`date +%s` - $date1)) +%H:%M:%S)\r"; done
+}
+
+timer() {
+    start="$(( $(date '+%s') + $1))"
+    while [ $start -ge $(date +%s) ]; do
+        time="$(( $start - $(date +%s) ))"
+        printf '%s\r' "$(date -u -d "@$time" +%H:%M:%S)"
+        sleep 0.1
+    done
+	notify-send "Timer Finished" "Timer Finished - $1 seconds elapsed"
+}
+
 n ()
 {
     # Block nesting of nnn in subshells
@@ -175,3 +192,4 @@ ex() {
 }
 
 # turn off incredibly annoying bell
+#xset b off

tmux/.tmux.conf

@@ -1,4 +1,5 @@
 set -g default-terminal screen-256color
+#set-option -sa terminal-overrides ",xterm-kitty:RGB"
 
 #remove escape delay
 set -s escape-time 0

vim/.vimrc

@@ -19,6 +19,8 @@ set smartcase
 " share system clipboard
 set clipboard^=unnamed,unnamedplus
 
+" mouse stuff
+set mouse=a
 
 " hide showmode because its in statusline
 set noshowmode
@@ -32,6 +34,16 @@ set textwidth=79
 set shiftwidth=4
 set fileformat=unix
 
+" move in insert mode
+inoremap <C-h> <Left>
+inoremap <C-j> <Down>
+inoremap <C-k> <Up>
+inoremap <C-l> <Right>
+cnoremap <C-h> <Left>
+cnoremap <C-j> <Down>
+cnoremap <C-k> <Up>
+cnoremap <C-l> <Right>
+
 "highlight cursorline cterm=none ctermbg=darkred ctermfg=white guibg=darkred guifg=white
 hi cursorline cterm=none term=none ctermbg=236
 set cursorline
@@ -121,6 +133,7 @@ Plug 'junegunn/goyo.vim'
 Plug 'junegunn/fzf.vim'
 Plug 'scrooloose/nerdtree'
 Plug 'chrisbra/Colorizer'
+Plug 'tpope/vim-rsi'
 " Colors
 Plug 'arzg/vim-substrata'
 

x/.Xresources

@@ -9,9 +9,8 @@ URxvt.cursorUnderline: 1
 
 !!! Real transparency (compositing)
 URxvt.depth: 32
-URxvt.background: rgba:0000/0000/0000/eeee
 !URxvt*background: rgba:0000/0000/0200/c800
-!URxvt.background: rgba:1111/1111/1111/dddd
+URxvt*background: rgba:0000/0000/0200/EA60
 
 URxvt*perl-ext-common:  default,matcher
 URxvt*matcher.button:   1
@@ -21,6 +20,9 @@ URxvt*internalBorder: 20
 ! URxvt.blurRadius: 25
 URxvt*.termName: rxvt-unicode-256color
 
+! set scrollback for rxvt
+URxvt.saveLines: 100000
+
 ! special
 *.foreground:   #c5c8c6
 *.background:   #222222