Misc. changes from new laptop

13 files changed, 59 insertions, 57 deletions

diff --git a/base/bashrc b/base/bashrc
index 18ba4b2..d07906e 100644
--- a/base/bashrc
+++ b/base/bashrc
@@ -49,9 +49,6 @@ if [ -n "$force_color_prompt" ]; then
     fi
 fi
 
-if [ -f $(brew --prefix)/etc/bash_completion ]; then
-    . $(brew --prefix)/etc/bash_completion
-fi
 GIT_PS1_SHOWDIRTYSTATE=1
 
 if [ "$color_prompt" = yes ]; then
@@ -111,15 +108,10 @@ fi
 export EDITOR=vim
 export MAILDIR=$HOME/.maildir/INBOX
 
-export SSH_AUTH_SOCK=$HOME/.gnupg/S.gpg-agent.ssh
-#if [ -f "${HOME}/.gpg-agent-info" ]; then
-#    . "${HOME}/.gpg-agent-info"
-#    export GPG_AGENT_INFO
-#    export SSH_AUTH_SOCK
-#    export SSH_AGENT_PID
-#fi
+#export SSH_AUTH_SOCK=$HOME/.gnupg/S.gpg-agent.ssh
+export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket)
 
-source /usr/local/etc/bash_completion.d/*
+#source /usr/local/etc/bash_completion.d/*
 
 if [ -f ~/.shell_pathes ]; then
     source ~/.shell_pathes
diff --git a/base/config/i3/autostart.d/10_xautolock b/base/config/i3/autostart.d/10_xautolock
index 29e7f8e..92cc30b 100644
--- a/base/config/i3/autostart.d/10_xautolock
+++ b/base/config/i3/autostart.d/10_xautolock
@@ -1,2 +1,3 @@
-exec --no-startup-id xautolock -time 5 -locker lock -corners 0-00
+#exec --no-startup-id xautolock -time 5 -locker lock -corners 0-00
+exec --no-startup-id gnome-screensaver
 
diff --git a/base/config/i3/autostart.d/50_pidgin b/base/config/i3/autostart.d/50_pidgin
deleted file mode 100644
index 3edf586..0000000
--- a/base/config/i3/autostart.d/50_pidgin
+++ /dev/null
@@ -1,2 +0,0 @@
-exec pidgin
-
diff --git a/base/config/i3/config.d/00_base_config b/base/config/i3/config.d/00_base_config
index 93a8651..67f3943 100644
--- a/base/config/i3/config.d/00_base_config
+++ b/base/config/i3/config.d/00_base_config
@@ -6,8 +6,8 @@ set $mod Mod4
 floating_modifier $mod
 
 ## Visual Settings
-font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
-#hide_edge_borders both
+font xft:Inconsolata 10
+hide_edge_borders both
 
 ## Bindings to start programs
 bindsym $mod+space exec dmenu_run -l 20
@@ -93,7 +93,7 @@ bindsym $mod+minus        scratchpad show
 ## Bindings to contorl the session
 bindsym $mod+Shift+C     exec "make_i3_config > $HOME/.config/i3/config"; reload
 bindsym $mod+Shift+R     restart
-bindsym $mod+Shift+E     exit 
+bindsym $mod+Shift+E     exit
 bindsym Control+mod1+l   exec $HOME/bin/lock
 
 
@@ -105,12 +105,12 @@ mode "resize" {
     bindsym h          resize shrink left  10 px or 10 ppt
     bindsym Shift+H    resize grow   left  10 px or 10 ppt
     bindsym j          resize shrink down  10 px or 10 ppt
-    bindsym Shift+j    resize grow   down  10 px or 10 ppt 
+    bindsym Shift+j    resize grow   down  10 px or 10 ppt
     bindsym k          resize shrink up    10 px or 10 ppt
     bindsym Shift+K    resize grow   up    10 px or 10 ppt
     bindsym l          resize shrink right 10 px or 10 ppt
     bindsym Shift+L    resize grow   right 10 px or 10 ppt
-    
+
     bindsym Return mode "default"
     bindsym Escape mode "default"
 }
@@ -133,13 +133,18 @@ bindsym $mod+g     exec sshclip
 bindsym $mod+c     exec clipmv
 
 ### Music
-bindsym $mod+End   exec xmms2 toggle
-bindsym $mod+Home  exec xmms2 next
+bindsym XF86AudioPlay exec xmms2 toggle
+bindsym XF86AudioNext exec xmms2 next
+bindsym XF86AudioPrev exec xmms2 prev
 
 ### Volume
-bindsym $mod+Prior exec pactl set-sink-volume -- 1 "+2%"
-bindsym $mod+Next  exec pactl set-sink-volume -- 1 "-2%"
+bindsym XF86AudioRaiseVolume exec "amixer -q set Master 5%+ unmute; amixer -q set Speaker unmute"
+bindsym XF86AudioLowerVolume exec "amixer -q set Master 5%- unmute; amixer -q set Speaker unmute"
+bindsym XF86AudioMute exec amixer -q set Master mute
 
+### Brightness
+bindsym XF86MonBrightnessUp exec "brightnessctl set +5%"
+bindsym XF86MonBrightnessDown exec "brightnessctl set 5%-"
 
 ## Specific Window Settings
 for_window [class="Gcalctool"]        floating enable
diff --git a/base/conkyrc b/base/conkyrc
index 1bac737..17ec7e6 100644
--- a/base/conkyrc
+++ b/base/conkyrc
@@ -10,12 +10,11 @@ cpu_avg_samples 2
 net_avg_samples 2
 
 TEXT
-${if_xmms2_connected}${xmms2_title} - ${xmms2_artist} | ${endif}\
 ✉ ${new_mails $HOME/.maildir/INBOX/}/${mails $HOME/.maildir/INBOX} | \
 /home ${fs_free /home} | \
 RAM ${memperc}% | \
 BATT ${battery BAT0} | \
 ${execi 300 weatherbar.sh} | \
 ${loadavg 1} | \
-♪ ${exec pactl list sinks | awk '/Volume: 0:/ {print substr($3, 1, index($3, "%") - 1)}'|head -n 1} | \
+♪ ${exec pactl list sinks | awk '/Volume: 0:/ {print substr($3, 1, index($3, "%") - 2)}'|head -n 1} | \
 ${time %a %d %b %Y} ${time %H:%M:%S} 
diff --git a/base/mailcap b/base/mailcap
index 720c93b..bb8ca1b 100644
--- a/base/mailcap
+++ b/base/mailcap
@@ -2,3 +2,9 @@ text/calendar; mutt-ical.py -i -e "jesse@jesterpm.net" %s
 application/ics; mutt-ical.py -i -e "jesse@jesterpm.net" %s
 
 text/html; pandoc -f html -t markdown --reference-links; copiousoutput; compose=vim %s
+
+application/pdf; evince %s; test=test -n "$DISPLAY"
+application/x-bzpdf; evince %s; test=test -n "$DISPLAY"
+application/x-ext-pdf; evince %s; test=test -n "$DISPLAY"
+application/x-gzpdf; evince %s; test=test -n "$DISPLAY"
+application/x-xzpdf; evince %s; test=test -n "$DISPLAY"
diff --git a/base/muttrc b/base/muttrc
index bad1a74..292d2fc 100644
--- a/base/muttrc
+++ b/base/muttrc
@@ -29,26 +29,30 @@ set forward_format="Fwd: %s"
 macro pager <Up> "<previous-line>" "Previous line"
 macro pager <Down> "<next-line>" "Next line"
 
-bind index g        noop
-bind index gg       first-entry
-bind index G        last-entry
-bind index R        group-reply
-macro index c "<change-folder>?<toggle-mailboxes>" "open a different folder"
-macro pager c "<change-folder>?<toggle-mailboxes>" "open a different folder"
-macro index C "<copy-message>?<toggle-mailboxes>" "copy a message to a mailbox"
-macro index M "<save-message>?<toggle-mailboxes>" "move a message to a mailbox"
+bind  index,pager g  noop
+bind  index       gg first-entry
+bind  pager       gg top
+bind  index       G  last-entry
+bind  pager       G  bottom
+bind  index,pager R  group-reply
+macro index,pager c  "<change-folder>?<toggle-mailboxes>" "open a different folder"
+macro index       C  "<copy-message>?<toggle-mailboxes>" "copy a message to a mailbox"
+macro index       M  "<save-message>?<toggle-mailboxes>" "move a message to a mailbox"
 # For gmail, don't move the message to archive, just remove it from the inbox.
 #macro index e "<save-message>+archive<enter>" "Archive a message."
 #macro pager e "<save-message>+archive<enter>" "Archive a message."
-macro index e "<delete-message>" "Archive a message."
-macro pager e "<delete-message>" "Archive a message."
-macro index S "<save-message>+spam<enter>" "Report message as spam."
-macro index d "<save-message>+trash<enter>" "Move to trash"
-macro pager d "<save-message>+trash<enter>" "Move to trash"
+macro index,pager e "<delete-message>" "Archive a message."
+macro index,pager S "<save-message>+spam<enter>" "Report message as spam."
+macro index,pager d "<save-message>+trash<enter>" "Move to trash"
 macro pager \Cu "|urlview<enter>" "view links in urlview"
 
 macro index \es "<enter-command>unset wait_key<enter><shell-escape>notmuch-mutt --prompt search<enter><change-folder-readonly>~/.cache/notmuch/mutt/results/<enter>" "Search All Mail"
-
+ macro index <F9> \
+           "<enter-command>set my_old_pipe_decode=\$pipe_decode my_old_wait_key=\$wait_key nopipe_decode nowait_key<enter>\
+           <pipe-message>notmuch-mutt -r thread<enter>\
+           <change-folder-readonly>`echo ${XDG_CACHE_HOME:-$HOME/.cache}/notmuch/mutt/results`<enter>\
+           <enter-command>set pipe_decode=\$my_old_pipe_decode wait_key=\$my_old_wait_key<enter>" \
+                 "notmuch: reconstruct thread"
 # Colors
 #color index brightwhite default ~N 
 #color index brightwhite default ~O
diff --git a/base/vim/bundle/fetch_bundles.sh b/base/vim/bundle/fetch_bundles.sh
index 315100f..fabe0a9 100755
--- a/base/vim/bundle/fetch_bundles.sh
+++ b/base/vim/bundle/fetch_bundles.sh
@@ -8,3 +8,4 @@
 git clone git://github.com/tpope/vim-abolish.git
 git clone https://github.com/ctrlpvim/ctrlp.vim.git
 git clone https://github.com/tomtom/tcomment_vim.git
+git clone https://github.com/leafgarland/typescript-vim.git
diff --git a/base/vim/syntax/php.vim b/base/vim/syntax/php.vim
new file mode 100644
index 0000000..981ba43
--- /dev/null
+++ b/base/vim/syntax/php.vim
@@ -0,0 +1 @@
+setl ts=4 sw=4 sts=4
diff --git a/base/vimrc b/base/vimrc
index d8b2003..bad175b 100644
--- a/base/vimrc
+++ b/base/vimrc
@@ -142,6 +142,7 @@ highlight SpellLocal term=underline cterm=underline
 let g:ctrlp_extensions = ['tag', 'buffertag']
 map <C-r> :CtrlPTag<Enter>
 map <C-y> :redo<Enter>
+set scroll=2
 
 " Load host-specific settings
 set runtimepath^=~/.host-specific/vim,
diff --git a/base/xsession b/base/xsession
index fdcb3fb..88f81e9 100644
--- a/base/xsession
+++ b/base/xsession
@@ -14,27 +14,24 @@ if [ -f ~/.host-specific/shell_pathes ]; then
 fi
 
 # Some X Stuff
-xsetroot -solid "#333333"
+xsetroot -solid "#111"
 ulimit -c unlimited
 
 # Startup applications
-/usr/lib/deja-dup/deja-dup/deja-dup-monitor &
-/usr/lib/gnome-settings-daemon/gnome-settings-daemon &
+#/usr/lib/deja-dup/deja-dup/deja-dup-monitor &
+#/usr/lib/gnome-settings-daemon/gnome-settings-daemon &
 /usr/lib/notification-daemon/notification-daemon &
 (sleep 8; start-pulseaudio-x11) &
 (sleep 60; update-notifier) &
-(sleep 5; gnome-sound-applet) &
+#(sleep 5; gnome-sound-applet) &
 (sleep 5; nm-applet) &
 (sleep 5; system-config-printer-applet) &
-(sleep 5; nitrogen --restore) &
-gtk-theme-switch2 -i Ambiance
-xrdb $HOME/.Xresources
-
-source $HOME/.gpg-agent-info
-export GPG_AGENT_INFO
-export SSH_AUTH_SOCK
-export SSH_AGENT_PID
+#(sleep 5; nitrogen --restore) &
+#gtk-theme-switch2 -i Ambiance
+xrdb -merge $HOME/.Xresources
 
+# Disable bell
+xset -b
 
 # Host Specific Settings
 if [ -f $HOME/.host-specific/xsession ]; then
@@ -48,8 +45,4 @@ urxvtd -f -o
 
 make_i3_config > $HOME/.config/i3/config
 
-if [ -x ~/dev/i3/i3 ]; then
-    exec ~/dev/i3/i3
-else
-    exec i3
-fi
+exec i3
diff --git a/host-overrides/cadmium.jesterpm.net/config/i3/autostart.d/keybase.conf b/host-overrides/cadmium.jesterpm.net/config/i3/autostart.d/keybase.conf
index 299b915..1791865 100644
--- a/host-overrides/cadmium.jesterpm.net/config/i3/autostart.d/keybase.conf
+++ b/host-overrides/cadmium.jesterpm.net/config/i3/autostart.d/keybase.conf
@@ -1 +1 @@
-exec "env KEYBASE_START_UI=hideWindow run_keybase"
+exec --no-startup-id "env KEYBASE_START_UI=hideWindow run_keybase"
diff --git a/host-overrides/jesterpm.net/host-specific/bash_aliases b/host-overrides/jesterpm.net/host-specific/bash_aliases
new file mode 100644
index 0000000..0afc370
--- /dev/null
+++ b/host-overrides/jesterpm.net/host-specific/bash_aliases
@@ -0,0 +1 @@
+alias open=xdg-open