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

bash/.bashrc

@@ -18,16 +18,18 @@ fi
 ## 4 - right/left four chars
 export LESS='-C -M -j 3 -R -# 2'
 
-# User specific aliases and functions
+### User specific aliases and functions
+# before you remove, you can unalias with:  \<command>
 alias l.='ls -lh --time-style=long-iso --color' 2>/dev/null
 alias l='ls -lh --color --time-style=long'
 alias ll='ls -lAh --color --time-style=long'
 alias lsd='l -d */'
 alias p='ping'
-alias dmesg='dmesg -H'
+alias dmesg='dmesg -HT'
 alias ip='ip -c'
 #alias s='sudo $(history -p !!)'
 alias s='sudo'
+alias df='sudo df -hT -x tmpfs -x devtmpfs'
 
 set bell-style none
 
@@ -37,6 +39,9 @@ short_find() {
 }
 alias f=short_find
 
+# enable va-api in firefox
+export MOZ_X11_EGL=1
+
 #not sure why fedora doesnt set this or what it might break but here we go
 export XDG_CONFIG_HOME=$HOME/.config
 
@@ -73,8 +78,8 @@ export NNN_FALLBACK_OPENER=xdg-open
 # HISTORY
 #add date/time to history
 export HISTTIMEFORMAT="%F %T: "
-export HISTSIZE=2000
+export HISTSIZE=100000
-export HISTFILESIZE=5000
+export HISTFILESIZE=1000000
 
 #if tty -s; then
 if [ -t 1 ]; then

config/.config/git/config

@@ -0,0 +1,18 @@
+[user]
+    name = "jon"
+    email = "jon@f01"
+[credential]
+	helper = cache
+[alias]
+    co = checkout
+    br = branch
+    ci = commit
+    st = status
+    cm = commit -m
+    l  = log --oneline
+
+    unstage = reset HEAD --
+    undo    = reset --soft HEAD^
+    sl = stash list --pretty=format:\"%C(red)%h%C(reset) - %C(dim yellow)(%C(bold magenta)%gd%C(dim yellow))%C(reset) %<(70,trunc)%s %C(gree  n)(%cr) %C(bold blue)<%an>%C(reset)\"
+    discard = !git stash save --keep-index --include-untracked && git stash drop
+    ll = log --pretty=format:"%C(yellow)%h%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate --numstat

config/.config/procps/toprc

@@ -1,7 +1,7 @@
 top's Config File (Linux processes with windows)
 Id:i, Mode_altscr=0, Mode_irixps=1, Delay_time=1.0, Curwin=0
 Def	fieldscur=¥¨³´»½ÀÄ·¹Å&')*+,-./012568<>º?ABCFGHIJKLMÎOPQRSTUVWXYZ[\]^_`abcdefghij
-	winflags=950076, sortindx=21, maxtasks=0, graph_cpus=0, graph_mems=0
+	winflags=949564, sortindx=18, maxtasks=0, graph_cpus=0, graph_mems=0
 	summclr=1, msgsclr=1, headclr=3, taskclr=1
 Job	fieldscur=¥¦¹·º(³´Ä»½@<§Å)*+,-./012568>?ABCFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghij
 	winflags=193844, sortindx=0, maxtasks=0, graph_cpus=0, graph_mems=0

tmux/.tmux.conf

@@ -30,6 +30,12 @@ bind j select-pane -D
 bind k select-pane -U
 bind l select-pane -R
 
+# page up/down
+bind-key -n S-PageUp copy-mode -u
+bind-key -n S-PageDown copy-mode
+bind-key -T copy-mode S-PageUp send-keys -X page-up
+bind-key -T copy-mode S-PageDown send-keys -X page-down
+
 #join window
 bind-key @ command-prompt -p "create pane from:" "join-pane -s ':%%'"
 

vim/.vimrc

@@ -104,7 +104,8 @@ map <C-n> :NERDTreeToggle<CR>
 let g:jedi#popup_select_first = 0
 
 "colorizer plugin
-let g:colorizer_auto_color = 1
+"let g:colorizer_auto_color = 1
+let g:colorizer_auto_filetype='css,html,c'
 
 call plug#begin('~/.vim/plugged') " vim-plug 
 

x/.Xresources

@@ -2,12 +2,13 @@ URxvt*scrollBar:	false
 URxvt.font:     xft:Terminus:size=14:antialias=true
 URxvt.boldFont: xft:Terminus:bold:size=14:antialias=true
 
-URxvt*inheritPixmap: true
+!URxvt*inheritPixmap: true
-URxvt*transparent: true
+!URxvt*transparent: true
-URxvt*shading: 20
+!URxvt*shading: 6 
 
 !!! Real transparency (compositing)
-!urxvt.depth: 32
+URxvt.depth: 32
+URxvt.background: rgba:0000/0000/0000/eeee
 !urxvt*background: rgba:0000/0000/0200/c800
 !URxvt.background: rgba:1111/1111/1111/dddd
 
@@ -17,7 +18,7 @@ URxvt*url-launcher:     /usr/bin/xdg-open
 URxvt*internalBorder: 20
 
 ! URxvt.blurRadius: 25
-URxvt*.termName: rxvt-unicode-256color
+!URxvt*.termName: rxvt-unicode-256color
 
 ! special
 *.foreground:   #c5c8c6