Synchronize with the look on photon

8 files changed, 32 insertions, 19 deletions

diff --git a/extras/HOME/.config/compton.conf b/extras/HOME/.config/compton.conf
index 2728ce1..828d949 100644
--- a/extras/HOME/.config/compton.conf
+++ b/extras/HOME/.config/compton.conf
@@ -5,9 +5,9 @@ shadow = true;
 no-dnd-shadow = true;
 # no-dock-shadow = true;
 # clear-shadow = true;
-shadow-radius = 7;
-shadow-offset-x = -10;
-shadow-offset-y = -5;
+shadow-radius = 10;
+shadow-offset-x = -3;
+shadow-offset-y = -3;
 shadow-opacity = 0.8;
 shadow-red = 0.0;
 shadow-green = 0.0;
@@ -33,14 +33,14 @@ shadow-exclude = [
 ];
 shadow-ignore-shaped = false;
 
-blur-background = false;
+blur-background = true;
 
 wintypes:
 {
   tooltip =
   {
     fade = true;
-    shadow = false;
+    shadow = true;
     opacity = 0.85;
     focus = true;
   }
diff --git a/extras/HOME/.xmobarrc b/extras/HOME/.xmobarrc
index ecf53ed..fc85d91 100644
--- a/extras/HOME/.xmobarrc
+++ b/extras/HOME/.xmobarrc
@@ -30,21 +30,29 @@ Config
       " %logo%  <fc=#a0a0a0><fn=3>%uname%</fn></fc><fc=#404040> │\
       \</fc><fc=#a0a0a0> %date%</fc><fc=#404040> │ \
       \</fc>%StdinReader%}<fn=1><fc=#8888ff>%time%</fc></fn>\
-      \{ %cpu% <fc=#404040>\
+      \{ %cpu% %memory% <fc=#404040>\
       \│</fc> %KLMO% <fc=#404040>│\
       \</fc> <fc=#a0a0a0>%mpris2%</fc> <fc=#404040>│ \
       \</fc>%bluetooth%%bat% "
    , commands = [
        Run StdinReader,
-       Run Memory ["-t", "<usedbar>"] 10,
        Run Date "%H:%M:%S" "time" 10,
        Run Date "<fn=3>%m/%d</fn>" "date" 10,
        Run Cpu [
-         "-t", "<fn=3><fc=#000000><bar></fc></fn>",
+           "-t", "<fn=3><fc=#000000><bar></fc></fn>",
+           "-L", "3",
+         "-H", "50",
+         "-b", "-",
+         "-f", "-",
+         "--normal", "green",
+         "--high", "red"
+       ] 10,
+       Run Memory [
+         "-t", "<fn=3><fc=#000000><usedbar></fc></fn>",
          "-L", "3",
          "-H", "50",
-         "-b", "─",
-         "-f", "─",
+         "-b", "-",
+         "-f", "-",
          "--normal", "green",
          "--high", "red"
        ] 10,
@@ -62,7 +70,9 @@ Config
              , ("considerable cloudiness", "<fc=#a0a0a0>ﭽ")]
              ["--template", "<skyConditionS></fc><fn=3><fc=#a0a0a0>   \
              \<tempF>°F</fc></fn>"] 360000,
-       Run Mpris2 "spotify" ["-t", "<fc=#1aa54b></fc>  <fn=3><title></fn>"] 20,
+       Run Mpris2 "spotify" [
+           "-t", "<fc=#1aa54b></fc>  <fn=3><title></fn>",
+           "--nastring", "<fc=#404040> </fc>"] 20,
        Run Com ".xmonad/xmobar-logo" [] "logo" 0,
        Run Com "uname" ["-r"] "uname" 0,
        Run Com ".xmonad/xmobar-bluetooth" [] "bluetooth" 50,
diff --git a/extras/HOME/.xmonad/startup b/extras/HOME/.xmonad/startup
index dc302b7..25df7d1 100755
--- a/extras/HOME/.xmonad/startup
+++ b/extras/HOME/.xmonad/startup
@@ -24,14 +24,15 @@ hostname_photon() {
   if [ -z "$(ps aux | grep compton | grep -v grep)" ] ; then
     __GL_SYNC_TO_VBLANK=1 nohup compton --backend=glx &>/dev/null &
   fi
-  xrandr --output DVI-I-1 --right-of DP-5 --mode 2560x1440
-  feh --bg-scale "/home/rahm/.xmonad/wallpaper.jpg"
+  # xrandr --output DVI-I-1 --right-of DP-5 --mode 2560x1440
+  feh --bg-scale "/usr/share/backgrounds/archlinux/mountain.jpg"
 }
 
 
 common
 
-hostname_fn="hostname_$(hostname)"
+xrdb "$HOME/.Xresources"
+hostname_fn="hostname_$(cat /etc/hostname)"
 
 if [[ "$(type -t "$hostname_fn")" == function ]] ; then
   "$hostname_fn" 
diff --git a/extras/HOME/.xmonad/xmobar-bluetooth b/extras/HOME/.xmonad/xmobar-bluetooth
index 93caa50..3024cfe 100755
--- a/extras/HOME/.xmonad/xmobar-bluetooth
+++ b/extras/HOME/.xmonad/xmobar-bluetooth
@@ -15,4 +15,4 @@ bluetoothctl -- info | while read line ; do
   fi
 done
 
-exec echo "<fc=#a0a0a0></fc> <fc=#404040>│</fc>"
+exec echo "<fc=#a0a0a0></fc> <fc=#404040>│</fc> "
diff --git a/extras/HOME/.xmonad/xmobar-logo b/extras/HOME/.xmonad/xmobar-logo
index 848ebd2..bf48047 100755
--- a/extras/HOME/.xmonad/xmobar-logo
+++ b/extras/HOME/.xmonad/xmobar-logo
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 case "$(uname -a)" in
-  *-arch-*) exec echo '<fn=5><fc=#1785bd></fc></fn>' ;;
+  *-arch*) exec echo '<fn=5><fc=#1785bd></fc></fn>' ;;
   *Debian*) exec echo '<fn=5><fc=#c00649></fc></fn>' ;;
   *Ubuntu*) exec echo '<fn=5><fc=#ff8888></fc></fn>' ;;
   *Linux*)  exec echo '<fn=5><fc=#ffffff></fc></fn>' ;;
diff --git a/src/Internal/Layout.hs b/src/Internal/Layout.hs
index c54ffa7..2339cca 100644
--- a/src/Internal/Layout.hs
+++ b/src/Internal/Layout.hs
@@ -10,6 +10,7 @@ import Data.List
 import XMonad.Layout.Spiral
 import XMonad.Layout.ThreeColumns
 import XMonad.Layout.Grid
+import XMonad.Layout.Dishes
 import XMonad.Layout
 import XMonad.Layout.LayoutModifier
 import XMonad
@@ -24,7 +25,8 @@ myLayout =
       Tall 1 (3/100) (1/2) |||
       ThreeCol 1 (3/100) (1/2) |||
       Full |||
-      Grid
+      Grid |||
+      Dishes 2 (1/6)
 
 data ResizeZoom = ShrinkZoom | ExpandZoom deriving (Typeable)
 
diff --git a/src/Main.hs b/src/Main.hs
index 85d18c7..28d50ad 100644
--- a/src/Main.hs
+++ b/src/Main.hs
@@ -81,7 +81,7 @@ main = do
     parseOut :: String -> String
     parseOut str =
       let colors = ["#ff878f", "#e187ff", "#8f87ff", "#87fff7", "#8bff87", "#ffe987", "#ff8787"]
-          components = zip (cycle colors) (splitOnAll [" - ", " · ", " "] str)
+          components = zip (cycle colors) (splitOnAll [" - ", " | ", " · ", " "] str)
           in  concatMap (\(color, str) ->
                   printf "<fc=%s>%s</fc> " color str) components
 
diff --git a/xmobar/extras/battery/battery.c b/xmobar/extras/battery/battery.c
index 791bc69..55deb17 100644
--- a/xmobar/extras/battery/battery.c
+++ b/xmobar/extras/battery/battery.c
@@ -251,6 +251,6 @@ int main(int argc, char** argv)
   return 0;
 
 fail:
-  printf("");
+  printf("<fc=#404040>%s</fc> ", icons[11]);
   return 0;
 }