dotfiles

commit 4d8264101e86e075e733fbc5bdbcb44527b24dfb
parent 287fd3ac9ca548be483420ebbc04c5440ba51f8d
Author: Ed van Bruggen <edvb54@gmail.com>
Date:   Thu,  9 Apr 2015 17:50:28 -0700

Merge branch 'master' of https://github.com/edvb54/dotfiles

Diffstat:
bashrc
 | 
3
++-
config/openbox/rc.xml
 | 
15
++++-----------

2 files changed, 6 insertions(+), 12 deletions(-)
diff --git a/bashrc b/bashrc
@@ -56,7 +56,8 @@ git_color() {
 
 PS1='\[${Blue}\]\u \
 \[$(checkium_color)\]$(checkium_random_face) \
-\[$(git_color)\]$(__git_ps1 "%s ")\[${White}\]\
+\[$(git_color)\]$(__git_ps1 "%s ")\[${Yellow}\]\
+$([ \j -gt 0 ] && echo "\j ")\[${White}\]\
 \$\[${Color_Off}\] '
 
 # PS1="${Blue}\u@\h${Color_Off}:${Cyan}\w${White}❯❯${Color_Off} "
diff --git a/config/openbox/rc.xml b/config/openbox/rc.xml
@@ -40,7 +40,7 @@
                     'Active' - where the active window is -->
   </placement>
   <theme>
-    <name>Turquoise Nights Ob</name>
+    <name>Numix Solarized</name>
     <titleLayout>DSLMC</titleLayout>
     <!--
       avaible characters are NDSLIMC, each can occur at most once.
@@ -722,16 +722,6 @@
       </mousebind>
     </context>
     <context name="Desktop">
-      <mousebind button="Up" action="Click">
-        <action name="GoToDesktop">
-          <to>previous</to>
-        </action>
-      </mousebind>
-      <mousebind button="Down" action="Click">
-        <action name="GoToDesktop">
-          <to>next</to>
-        </action>
-      </mousebind>
       <mousebind button="A-Up" action="Click">
         <action name="GoToDesktop">
           <to>previous</to>
@@ -935,5 +925,8 @@
         <y>center</y>
       </position>
     </application>
+    <application class="*">
+      <decor>no</decor>
+    </application>
   </applications>
 </openbox_config>