Various config changes.

4 files changed, 31 insertions, 8 deletions

diff --git a/base/Xresources b/base/Xresources
index cb61578..fa0ebad 100644
--- a/base/Xresources
+++ b/base/Xresources
@@ -26,4 +26,6 @@ XTerm*scrollBar: false
 XTerm*faceName: xft:Inconsolata:size=12:autohint=true
 XTerm*bellIsUrgent: true
 XTerm*eightBitInput: false
-
+XTerm*metaSendsEscape: true
+xterm*termName: xterm-256color
+XTerm*locale: true
diff --git a/base/config/i3/config.d/00_base_config b/base/config/i3/config.d/00_base_config
index 505ffec..93a8651 100644
--- a/base/config/i3/config.d/00_base_config
+++ b/base/config/i3/config.d/00_base_config
@@ -7,7 +7,7 @@ floating_modifier $mod
 
 ## Visual Settings
 font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
-hide_edge_borders both
+#hide_edge_borders both
 
 ## Bindings to start programs
 bindsym $mod+space exec dmenu_run -l 20
@@ -94,7 +94,7 @@ bindsym $mod+minus        scratchpad show
 bindsym $mod+Shift+C     exec "make_i3_config > $HOME/.config/i3/config"; reload
 bindsym $mod+Shift+R     restart
 bindsym $mod+Shift+E     exit 
-bindsym Control+mod1+l   exec xautolock -locknow
+bindsym Control+mod1+l   exec $HOME/bin/lock
 
 
 ## Alternative modes
@@ -137,12 +137,12 @@ bindsym $mod+End   exec xmms2 toggle
 bindsym $mod+Home  exec xmms2 next
 
 ### Volume
-bindsym $mod+Prior exec pactl set-sink-volume -- 0 "+2%"
-bindsym $mod+Next  exec pactl set-sink-volume -- 0 "-2%"
+bindsym $mod+Prior exec pactl set-sink-volume -- 1 "+2%"
+bindsym $mod+Next  exec pactl set-sink-volume -- 1 "-2%"
 
 
 ## Specific Window Settings
 for_window [class="Gcalctool"]        floating enable
 for_window [class="Gnome-calculator"] floating enable
-
+for_window [class="file_progress"] floating enable
 
diff --git a/base/vimrc b/base/vimrc
index cf124b2..d9c0419 100644
--- a/base/vimrc
+++ b/base/vimrc
@@ -147,6 +147,16 @@ map <C-x> :silent make<Enter>:copen<Enter><C-w><C-w>:redraw<Enter>
 
 execute pathogen#infect()
 
+" Spell Check colors
+highlight clear SpellBad
+highlight SpellBad term=standout ctermfg=1 term=underline cterm=underline
+highlight clear SpellCap
+highlight SpellCap term=underline cterm=underline
+highlight clear SpellRare
+highlight SpellRare term=underline cterm=underline
+highlight clear SpellLocal
+highlight SpellLocal term=underline cterm=underline
+
 " Load host-specific settings
 set runtimepath^=~/.host-specific/vim,
 set runtimepath+=~/.host-specific/vim/after
diff --git a/base/xsession b/base/xsession
index 84e8af6..fdcb3fb 100644
--- a/base/xsession
+++ b/base/xsession
@@ -1,6 +1,8 @@
 # Set my editor and terminal
-export TERMINAL=urxvt
+export TERMINAL=urxvtc
 export EDITOR=vim
+export LANG=en_US.utf8
+export LC_ALL=en_US.utf8
 
 if [ -f ~/.shell_pathes ]; then
     source ~/.shell_pathes
@@ -16,6 +18,7 @@ xsetroot -solid "#333333"
 ulimit -c unlimited
 
 # Startup applications
+/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) &
@@ -23,16 +26,24 @@ ulimit -c unlimited
 (sleep 5; gnome-sound-applet) &
 (sleep 5; nm-applet) &
 (sleep 5; system-config-printer-applet) &
-#eval $(gnome-keyring-daemon -s --components=pkcs11,secrets,ssh,gpg) &
 (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
+
+
 # Host Specific Settings
 if [ -f $HOME/.host-specific/xsession ]; then
     source $HOME/.host-specific/xsession
 fi
 
+# Start terminal daemon
+urxvtd -f -o
+
 # Make the i3 config
 
 make_i3_config > $HOME/.config/i3/config