Merge branch 'master' of github.com:peplin/dotfiles

peplin · Jun 24, 2016 · 9d5edc8 · 9d5edc8
2 parents 9965a84 + e2c3d84
commit 9d5edc8
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 5 deletions.
diff --git a/c/gdbinit.symlink b/c/gdbinit.symlink
@@ -4,6 +4,7 @@ set $COLOUREDPROMPT = 1
 
 set confirm off
 set verbose off
+set breakpoint pending on
 
 set output-radix 0x10
 set input-radix 0x10

diff --git a/git/functions/glog b/git/functions/glog
@@ -16,15 +16,15 @@
 # Borrowed from Gary Bernhardt at https://github.com/garybernhardt/dotfiles
 
 HASH="%C(yellow)%h%Creset"
-RELATIVE_TIME="%Cgreen(%ar)%Creset"
+RELATIVE_TIME="%Cgreen(%cr)%Creset"
 AUTHOR="%C(bold blue)%an%Creset"
 REFS="%C(red)%d%Creset"
 SUBJECT="%s"
 
 FORMAT="$HASH $RELATIVE_TIME $AUTHOR $REFS $SUBJECT"
 
 glog() {
-    git log --graph --pretty="tformat:${FORMAT}" $* |
+    git log --graph --format=fuller --pretty="tformat:${FORMAT}" $* |
 	# Repalce (2 years ago) with (2 years)
 	sed -Ee 's/(^[^<]*) ago\)/\1\)/' |
 	# Replace (2 years, 5 months) with (2 years)

diff --git a/tmux/tmux.conf.symlink b/tmux/tmux.conf.symlink
@@ -22,3 +22,6 @@ set-window-option -g xterm-keys on
 
 set -g update-environment -r
 setenv -g SSH_AUTH_SOCK $HOME/.ssh/ssh_auth_sock
+
+# Increase scrollback buffer size
+set-option -g history-limit 3000
diff --git a/urxvt/Xresources.symlink b/urxvt/Xresources.symlink
@@ -25,7 +25,8 @@ URxvt*scrollWithBuffer: true
 URxvt*scrollTtyKeypress: true
 
 ! requires urxvt-perls from arch
-URxvt.perl-ext-common: default,matcher,vtwheel,font-size,selection-to-clipboard
+URxvt.perl-ext-common: default,matcher,vtwheel,font-size,selection-to-clipboard,clipboard
+URxvt.clipboard.autocopy: true
 
 URxvt.url-launcher: /usr/bin/xdg-open
 URxvt.url-select.underline: false

diff --git a/vim/vimrc.symlink b/vim/vimrc.symlink
@@ -26,6 +26,7 @@ autocmd!
         Plugin 'tpope/vim-endwise'
         Plugin 'tpope/vim-repeat'
         Plugin 'tpope/vim-unimpaired'
+        Plugin 'simnalamburt/vim-mundo'
 
         " Theme
         Plugin 'altercation/vim-colors-solarized'
@@ -371,6 +372,8 @@ autocmd!
         let g:ctrlp_map = '<leader>t'
         let g:ctrlp_cmd = 'CtrlP'
         let g:ctrlp_clear_cache_on_exit = 0
+        let g:ctrlp_max_files = 16000
+        let g:ctrlp_max_depth = 5
     " }
 
     " Gist {
@@ -472,6 +475,11 @@ autocmd!
                 \ "BreakConstructorInitializersBeforeComma" : "true"
                 \}
     " }
+
+    " vim-mundo {
+    nnoremap <F6> :MundoToggle<CR>
+
+    " }
 " }
 
 map <leader>q :call QFixToggle()<CR>

diff --git a/xmobar/xmobarrc.symlink b/xmobar/xmobarrc.symlink
@@ -4,7 +4,7 @@ Config { font = "xft:Ubuntu Mono-11"
        , position = Top
        , lowerOnStart = False
        , commands = [
-            Run Weather "KARB" ["-t","<tempF>F","-L",
+            Run Weather "KAGC" ["-t","<tempF>F","-L",
                 "20","-H","75","--normal","green","--high","red",
                 "--low","lightblue"] 36000
             , Run Com "/home/peplin/.dotfiles/bin/batterycheck.sh" [] "batcheck" 60
@@ -20,5 +20,5 @@ Config { font = "xft:Ubuntu Mono-11"
        ]
        , sepChar = "%"
        , alignSep = "}{"
-       , template = "         %multicpu% %memory% | %dynnetwork% %vol%}{%StdinReader% | %KARB% | <fc=#ee9a00>%date%</fc>"
+       , template = "         %multicpu% %memory% | %dynnetwork% %vol%}{%StdinReader% | %KAGC% | <fc=#ee9a00>%date%</fc>"
        }