Fixed battery, temperature, clock, and workspace placement

.gitignore

@@ -0,0 +1,5 @@
+prompt-history
+xmonad-x86_64-linux
+xmonad.errors
+xmonad.hi
+xmonad.o

xmonad.hs

@@ -5,6 +5,7 @@ import XMonad.Config.Desktop
 -- Actions
 import XMonad.Actions.CycleWS
 import XMonad.Actions.DynamicWorkspaces as DW
+import XMonad.Actions.GridSelect
 import XMonad.Actions.OnScreen
 import XMonad.Actions.SpawnOn
 import XMonad.Actions.UpdatePointer
@@ -94,13 +95,13 @@ toggleHomeScreens = do
             spawn "while true; do \n\
                         \~/bin/battery; \n\ 
                         \echo -n ' '; \n\
-                        \echo -n $(cat /tmp/temp); \n\
+                        \~/bin/temp.sh; \n\
                         \echo -n ' '; \n\
                         \date \"+%a, %b %d %T\"; \n\
                         \/usr/bin/sed -E \"s/($(date +%_d)\b)/^fg(green)\1^fg()/\" ; \n\
                         \sleep 1; \n\
-                   \done | dzen2 -dock -p -x 1500 -w 425 -u -h 24 -ta l -sa c -fn 'xos4 Terminus:Regular:Pixelsize=12' &"
-            
+                        \done | dzen2 -dock -p -x 1600 -w 325 -u -h 24 -ta r -sa c -e 'sigusr1=togglehide'&"
+
         else if sc == 3
             then do
                 spawn "xrandr --output eDP-1-1 --primary --auto --output DVI-I-3-2 --auto --left-of eDP-1-1 --output DVI-I-2-1 --auto --right-of eDP-1-1"
@@ -108,27 +109,27 @@ toggleHomeScreens = do
                 spawn "while true; do \n\
                         \~/bin/battery; \n\
                             \echo -n ' '; \n\
-                            \echo -n $(cat /tmp/temp); \n\
+                            \~/bin/temp.sh; \n\
                             \echo -n ' '; \n\
                             \date '+%a, %b %d %T'; \n\
                             \sleep 1; \n\
-                       \done | dzen2 -dock -p -x 1680 -w 255 -h 24 -ta l -fg #aaaaaa -bg #000000 -fn 'xos4 Terminus:Regular:Pixelsize=12' &"
+                       \done | dzen2 -dock -p -x 1602 -w 325 -h 24 -ta l -fg #aaaaaa -bg #000000 -fn 'xos4 Terminus:style=Regular:Pixelsize=12' &"
                 spawn "while true; do \n\
                             \~/bin/battery; \n\
                             \echo -n ' '; \n\
-                            \echo -n $(cat /tmp/temp); \n\
+                            \~/bin/temp.sh; \n\
                             \echo -n ' '; \n\
                             \date '+%a, %b %d %T'; \n\
                             \sleep 1; \n\
-                        \done | dzen2 -dock -p -x 3600 -w 255 -h 24 -ta l -fg #aaaaaa -bg #000000 -fn 'xos4 Terminus:Regular:Pixelsize=12' &"
+                        \done | dzen2 -dock -p -x 3522 -w 325 -h 24 -ta l -fg #aaaaaa -bg #000000 -fn 'xos4 Terminus:style=Regular:Pixelsize=12' &"
                 spawn "while true; do \n\
                             \~/bin/battery; \n\
                             \echo -n ' '; \n\
-                            \echo -n $(cat /tmp/temp); \n\
+                            \~/bin/temp.sh; \n\
                             \echo -n ' '; \n\
                             \date '+%a, %b %d %T'; \n\
                             \sleep 1; \n\
-                        \done | dzen2 -dock -p -x 5520 -w 255 -h 24 -ta l -fg #aaaaaa -bg #000000 -fn 'xos4 Terminus:Regular:Pixelsize=12' &"
+                        \done | dzen2 -dock -p -x 5442 -w 325 -h 24 -ta l -fg #aaaaaa -bg #000000 -fn 'xos4 Terminus:style=Regular:Pixelsize=12' &"
 {-                spawn "while true; do echo -n $(cat /tmp/temp); echo -n ' '; date '+%a, %b %d %T'; sleep 1; done | dzen2 -dock -p -x 1710 -w 210 -e 'onstart:lower;button2=togglehide' -h 24 -ta l -fg #aaaaaa -bg #000000 -fn Terminus-10 -xs 1 &"
                 spawn "while true; do echo -n $(cat /tmp/temp); echo -n ' '; date '+%a, %b %d %T'; sleep 1; done | dzen2 -dock -p -x 3630 -w 210 -e 'onstart:lower;button2=togglehide' -h 24 -ta l -fg #aaaaaa -bg #000000 -fn Terminus-10 -xs 0 &"
                 spawn "while true; do echo -n $(cat /tmp/temp); echo -n ' '; date '+%a, %b %d %T'; sleep 1; done | dzen2 -dock -p -x 5550 -w 210 -e 'onstart:lower;button2=togglehide' -h 24 -ta r -fg #aaaaaa -bg #000000 -fn Terminus-10 -xs 2 &" -}
@@ -210,33 +211,38 @@ layoutH = layoutHints
     --        ||| tiled ||| Mirror tiled)
     $ Full
     ||| Mirror tiled
+    ||| tabbed shrinkText myTheme
     ||| tiled
     where
       tiled   = Tall 1 (3 % 100) (1/2)
     --tiled2  = Tall 1 (3 % 100) (5 % 9)
 
+myTheme :: Theme
+myTheme = defaultTheme { 
+    fontName = myFont
+}
+myFont = "xft:xos4 Terminus:style=Regular:Pixelsize=12"
+
 fadeHook = fadeInactiveLogHook fadeAmount
   where fadeAmount = 0.8
 
 makeLauncher yargs run exec close = concat
   ["exe=`yegonesh ", yargs, "` && ", run, " ", exec, "$exe", close]
 
-launcher = makeLauncher "-x -- -nf grey -nb black -fn 'xos4 Terminus:style=Regular:Pixelsize=16'" "eval" "\"exec " "\""
+--launcher = makeLauncher "-x -- -nf grey -nb black -fn 'xos4 Terminus:Pixelsize=8'" "eval" "\"exec " "\""
+launcher = makeLauncher "-x" "eval" "\"exec " "\""
 
-flags = "-e onstart lower -w 800 -h 24 -ta l -fg #aaaaaa -bg #000000 -fn 'xos4 Terminus:style=Regular:Pixelsize=12'"
 
 main = do
   dzenCenterBar <- spawnPipe centerBar
---  dzenLeftBar <- spawnPipe leftBar
---  dzenRightBar <- spawnPipe rightBar
+  dzenBottomBar <- spawnPipe bottomBar
   xmonad $ docks $ ewmh $ desktopConfig {
-    workspaces = ["shell","spideroak","vivaldi","pindrop","kofc","bitcoin"]
+    workspaces = ["shell","vivaldi","pindrop","kofc","VM"]
   , terminal = myTerminal
   , focusFollowsMouse    = True
   , manageHook = manageDocks <+> myManageHook <+> manageHook desktopConfig
   , handleEventHook = docksEventHook <+> handleEventHook desktopConfig
   , layoutHook = avoidStruts $ layoutH 
-  --, logHook = myLogHook dzenCenterBar >> myLogHook dzenLeftBar >>  myLogHook dzenRightBar >>  fadeHook >> updatePointer (0.5, 0.5) (0, 0)
   , logHook = myLogHook dzenCenterBar >> fadeHook >> updatePointer (0.5, 0.5) (0, 0)
   , borderWidth = 1
   , normalBorderColor = "#333333"
@@ -248,16 +254,19 @@ main = do
 
 myStartup :: X ()
 myStartup = do
-    setWMName "LG3D"
+    --setWMName "LG3D"
     toggleHomeScreens
-    spawn "trayer --edge top --align right --widthtype request --margin 425 --expand false --align right --SetDockType true --SetPartialStrut false --tint 0x000000 --transparent true --alpha 0 --height 32 --monitor 'primary'"
+    spawn "trayer --edge top --align right --widthtype request --margin 318 --expand false --SetDockType true --SetPartialStrut false --tint 0x000000 --transparent true --alpha 0 --height 24 --monitor 'primary'"
     --spawn "gnome-gmail-notifier"
     spawn "xset dpms 600"
-    spawn "xautolock -secure -time 10 -locker 'i3lock -c 000000 -i /home/trey/images/black.png'"
+    --spawn "xautolock -secure -time 10 -locker 'i3lock -c 000000 -i /home/trey/images/black.png'"
+    spawn "xautolock -secure -time 10 -locker 'i3lock -c 000000'"
 
 myBitmapsDir = "/home/trey/.xmonad/dzen2"
 --leftBar = "dzen2 -w 0 -h 24 -ta l -fg #555753 -bg #000000 -fn Terminus-10 -xs 1"
-centerBar = "dzen2 -dock -p -x 2060 -ta l -w 1024 -e 'onstart:lower;button2=togglehide' -fg #555753 -bg #000000 -fn 'xos4 Terminus:style=Regular:size=12'"
+centerBar = "dzen2 -dock -p -x 1920 -ta l -w 1024 -e 'onstart:lower;button2=togglehide;sigusr1=togglehide'"
+bottomBar = "conky | dzen2 -dock -p -x 1920 -y 1080 -ta l -w 1920 -e 'sigusr1=togglehide'"
+
 -- rightBar = "dzen2 -w 3840 -h 24 -ta r -fg #555753 -bg #000000 -fn Terminus-10 -xs 2"
 
 myLogHook :: Handle -> X ()
@@ -348,19 +357,23 @@ myKeys =    [
   , ((controlMask .|. shiftMask,    xK_4),         unGrab >> spawn "scrot --exec 'mkdir -p ~/Desktop && mv $f ~/Desktop' --select && paplay ~/wav/camera.wav")                                                      
                                                                   --    windows (viewOnScreen 1 "ws")
                                                                   --    ifWindows (resource =? "altUrxvt") (mapM_ focus) (spawnHere altTerminal))
-  , ((winKey .|. shiftMask,         xK_v),         do
-                                                   windows (viewOnScreen 1 "virtualbox")
-                                                   ifWindows (className =? "Gvim") (mapM_ focus) (spawnHere "gvim"))
-  , ((winKey ,                      xK_v),         do
-                                                   windows (viewOnScreen 1 "timetracker")
-                                                   ifWindows (title =? "osmium:timetracker") (mapM_ focus) (spawnHere "urxvtc -cd ~/timetracker -e 'tmux attach -t timetracker || tmux -2 new-session -s timetracker'"))
+  , ((lAlt,                        xK_v),         spawn "clipmenu && xdotool key Ctrl+v")
+  --, ((winKey .|. shiftMask,         xK_v),         do
+     --                                              windows (viewOnScreen 1 "virtualbox")
+    --                                               ifWindows (className =? "Gvim") (mapM_ focus) (spawnHere "gvim"))
+  --, ((winKey ,                      xK_v),         do
+  --                                                   windows (viewOnScreen 1 "timetracker")
+   --                                                ifWindows (title =? "osmium:timetracker") (mapM_ focus) (spawnHere "urxvtc -cd ~/timetracker -e 'tmux attach -t timetracker || tmux -2 new-session -s timetracker'"))
   --, ((lAlt ,                        xK_v),         spawnHere "xfce4-popup-clipman")
   --, ((winKey ,                                            xK_x),                                              windowPromptGoto dXPConfig)
   , ((winKey .|. shiftMask,            xK_x),         windowPromptBring dXPConfig)
   --, ((winKey .|. shiftMask,        xK_Return),                                      windows W.swapMaster)
   --, ((winKey .|. shiftMask,        xK_Return),                                      spawnHere myTerminal)
-  , ((winKey ,                        xK_b),        sendMessage $ ToggleStrut U)
-  --, ((winKey ,                                            xK_g),                                              spawnHere "chromium --allow-outdated-plugins --purge-memory-button ")
+  , ((winKey ,                        xK_b),        do
+                                                        spawnHere "pkill -USR1 dzen2"
+                                                        spawnHere "pkill trayer"
+                                                        sendMessage $ ToggleStrut U)
+  , ((lAlt ,        xK_g),                          spawnHere "~/bin/google_selection.sh")
   --, ((winKey ,                                            xK_g),                                              ifWindows (className =? "Google-chrome") (mapM_ focus) (spawnHere "google-chrome"))
   , ((winKey ,                                            xK_g), ifWindows (className =? "Google-chrome") (mapM_ focus) (spawnHere "google-chrome-stable"))
   --, ((winKey ,                                            xK_r),                                                do
@@ -398,6 +411,7 @@ myKeys =    [
   , ((winKey ,                                            xK_k),                                              windows W.focusUp) -- explicitly setting the default
   , ((winKey .|. controlMask,                    xK_k),                                              windows W.swapUp) -- explicitly setting the default
   , ((lAlt ,                                                xK_Tab),                                          windows W.focusDown) -- replicating MS Windows task switcher behavior
+  , ((winKey ,                                                xK_Tab),                                          goToSelected defaultGSConfig)
   , ((lAlt .|. shiftMask,                        xK_Tab),                                          windows W.focusUp)  -- replicating MS Windows task switcher behavior
   , ((winKey .|. controlMask,                xK_Return),                                      windows W.swapMaster)
   , ((winKey,                       xK_space ),                   sendMessage NextLayout)   
@@ -531,7 +545,7 @@ myKeys =    [
    [((m .|. winKey, key), screenWorkspace sc >>= flip whenJust (windows . f))                                                                                                                 
 --    | (key, sc) <- zip [xK_w, xK_r] [0..]                                                                                                                                                   
     -- | (key, sc) <- zip [xK_Left, xK_Right] [0..] -- For arrow keys                                                                                                                         
-    | (key, sc) <- zip [xK_e, xK_r, xK_w] [0..] -- For w,r keys                                                                                                                                     
+    | (key, sc) <- zip [xK_e, xK_w, xK_r] [0..] -- For w,r keys                                                                                                                                     
     -- | (key, sc) <- zip [xK_w, xK_r] [1,0] -- For w,r keys in backwards order  
     -- | (key, sc) <- zip [xK_w, xK_r] [1,0] -- For w,r keys in backwards order
      , (f, m) <- [(W.view, 0), (W.shift, shiftMask)]]
@@ -539,7 +553,9 @@ myKeys =    [
 
 dXPConfig = defaultXPConfig {
    bgColor = "yellow"
-, fgColor = "blue"
+   , fgColor = "blue"
+   , font = myFont
+
 }
 
 myXPConfigSelect = defaultXPConfig {
@@ -547,6 +563,7 @@ myXPConfigSelect = defaultXPConfig {
   , fgColor        = "blue"
   , autoComplete    = Just 0
   , showCompletionOnTab = True
+  , font = myFont
 }
 
 myXPConfigNew = defaultXPConfig {
@@ -554,5 +571,6 @@ myXPConfigNew = defaultXPConfig {
   , fgColor        = "blue"
   , autoComplete    = Nothing
   , showCompletionOnTab    = True
+  , font = myFont
 }