Merge branch 'master' of https://github.com/Dbroqua/home

# Conflicts:
#	zshrc

fluxbox/menu

@@ -4,7 +4,7 @@
     [exec] (Terminal) {urxvt} </usr/share/icons/nuoveXT2/24x24/apps/terminal.png>
     [exec] (Screencast) {vokoscreen} </usr/share/pixmaps/vokoscreen.png>
     [submenu] (Dev) <~/Icons/dev.xpm>
-        [exec] (Atom) {atom} </usr/share/atom/atom.png>
+        [exec] (Atom) {atom} </usr/share/icons/hicolor/32x32/apps/atom.png>
         [exec] (Robomongo) {~/Software/robomongo/bin/robomongo} <~/Icons/robomongo.png>
         [exec] (SmartGit) {/opt/smartgit/bin/smartgit.sh} </opt/smartgit/bin/smartgit-32.png>
     [end]
@@ -15,6 +15,7 @@
         [exec] (Freecad) {freecad} </usr/share/icons/hicolor/32x32/apps/freecad.png>
         [exec] (Slic3r) {slic3r --gui} <~/Software/Slic3r/var/Slic3r.png>
         [exec] (View 3D Scene) {view3dscene} </usr/share/icons/hicolor/48x48/apps/view3dscene.png>
+	[exec] (Wings3D) {wings3d} </usr/share/icons/wings3d.xpm>
     [end]
     [exec] (Minecraft) {java -jar ~/Software/Minecraft.jar} <~/Icons/minecraft.png>
     [submenu] (Fluxbox menu) </usr/share/icons/nuoveXT2/24x24/apps/gnome-settings-theme.png>

fluxbox/slitlist

@@ -0,0 +1,3 @@
+wmbattery
+wmnd
+conky

fluxbox/startup

@@ -13,7 +13,9 @@ xscreensaver -no-splash &
 # Background
 fbsetbg -a `tail -n 1 .fluxbox/lastwallpaper|cut -d'|' -f 2`
 
-# Network manager
+# Applets
+blueman-applet&
+pasystray &
 nm-applet &
 
 # Disable bell
@@ -22,6 +24,7 @@ xset -b
 # Defaults Apps
 spotify &
 brscan-skey &
+owncloud &
 
 # SSH
 ssh-add &

zshrc

@@ -80,6 +80,7 @@ zstyle ':completion:*:hosts' hosts $_ssh_config
 if [ -z "$SSH_AUTH_SOCK" ] ; then
     eval `ssh-agent -s`
     ssh-add ~/.ssh/id_rsa
+==== BASE ====
 fi
 
 # List of accounts to read the last tweet from, comma separated
@@ -111,3 +112,5 @@ export TTC_APIKEYS=true
 
 # Refresh the dashboard every 20 minutes.
 export TTC_UPDATE_INTERVAL=5
+
+rivalcfg --color=#509ADB -e steady