From a977cdd5d1ae3753abb0d88b24b516e2c036d484 Mon Sep 17 00:00:00 2001
From: Dave Gallant <davegallant@gmail.com>
Date: Sun, 30 Aug 2020 17:33:56 -0400
Subject: [PATCH] xmobar: add stalonetray

---
 .config/nixpkgs/home.nix | 15 +++++++++------
 .config/xmobar/xmobar.hs | 13 ++-----------
 .stalonetrayrc           | 16 ++++++++++++++++
 .xmonad/xmonad.hs        |  3 ++-
 4 files changed, 29 insertions(+), 18 deletions(-)
 create mode 100644 .stalonetrayrc

diff --git a/.config/nixpkgs/home.nix b/.config/nixpkgs/home.nix
index c3c75e4..429eb95 100644
--- a/.config/nixpkgs/home.nix
+++ b/.config/nixpkgs/home.nix
@@ -43,6 +43,7 @@
       nodejs-14_x
       openvpn
       packer
+      pfetch
       pinentry-curses
       postman
       python38
@@ -53,8 +54,8 @@
       shfmt
       spotify
       starship
-      terraform_0_13
       terraform-ls
+      terraform_0_13
       tflint
       tmux
       tree
@@ -79,13 +80,14 @@
 
       # desktop environments
       bspwm
-      polybar
-      sxhkd
-      pavucontrol
-      xmonad-with-packages
       haskellPackages.xmobar
-      haskellPackages.xmonad-extras
       haskellPackages.xmonad-contrib
+      haskellPackages.xmonad-extras
+      pavucontrol
+      polybar
+      stalonetray
+      sxhkd
+      xmonad-with-packages
 
       ## aws
       awscli2
@@ -165,6 +167,7 @@
         eval "$(_RFD_COMPLETE=source_zsh rfd)"
         eval "$(starship init zsh)"
         setopt noincappendhistory
+        pfetch
       '';
 
       shellAliases = {
diff --git a/.config/xmobar/xmobar.hs b/.config/xmobar/xmobar.hs
index 0d86b53..01bd751 100644
--- a/.config/xmobar/xmobar.hs
+++ b/.config/xmobar/xmobar.hs
@@ -11,7 +11,7 @@ Config {
    -- layout
    , sepChar =  "%"   -- delineator between plugin names and straight text
    , alignSep = "}{"  -- separator between left-right alignment
-   , template = "%UnsafeStdinReader% | %battery% | %multicpu% | %coretemp% | %memory% | %dynnetwork% }{ %date% "
+   , template = "%UnsafeStdinReader% | %date% | %battery% | %multicpu% | %memory% | %dynnetwork%  "
 
    -- general behavior
    , lowerOnStart =     True    -- send to bottom of window stack on start
@@ -47,7 +47,7 @@ Config {
                              ] 10
 
         -- cpu activity monitor
-        , Run MultiCpu       [ "--template" , "Cpu: <total0>%|<total1>%"
+        , Run MultiCpu       [ "--template" , "Cpu: <total>%"
                              , "--Low"      , "50"         -- units: %
                              , "--High"     , "85"         -- units: %
                              , "--low"      , "darkgreen"
@@ -55,15 +55,6 @@ Config {
                              , "--high"     , "darkred"
                              ] 10
 
-        -- cpu core temperature monitor
-        , Run CoreTemp       [ "--template" , "Temp: <core0>°C|<core1>°C"
-                             , "--Low"      , "70"        -- units: °C
-                             , "--High"     , "80"        -- units: °C
-                             , "--low"      , "darkgreen"
-                             , "--normal"   , "darkorange"
-                             , "--high"     , "darkred"
-                             ] 50
-
         -- memory usage monitor
         , Run Memory         [ "--template" ,"Mem: <usedratio>%"
                              , "--Low"      , "20"        -- units: %
diff --git a/.stalonetrayrc b/.stalonetrayrc
new file mode 100644
index 0000000..4588946
--- /dev/null
+++ b/.stalonetrayrc
@@ -0,0 +1,16 @@
+decorations none
+transparent false
+dockapp_mode none
+geometry 5x1-0+0
+max_geometry 5x1-325-10
+background "#000000"
+kludges force_icons_size
+grow_gravity NE
+icon_gravity NE
+icon_size 12
+sticky true
+#window_strut none
+window_type dock
+window_layer bottom
+#no_shrink false
+skip_taskbar true
diff --git a/.xmonad/xmonad.hs b/.xmonad/xmonad.hs
index ae2726c..c4b13d7 100644
--- a/.xmonad/xmonad.hs
+++ b/.xmonad/xmonad.hs
@@ -310,8 +310,9 @@ myLogHook h = dynamicLogWithPP $ xmobarPP
 myStartupHook = do
   spawnOnce "dunst &"
   spawnOnce "feh --bg-fill ~/Pictures/Wallpapers/laughingman.jpg"
-  spawnOnce "picom --config ~/.config/compton.conf -b"
   spawnOnce "if xinput list | grep -qi 'mouse'; then xmodmap -e 'pointer = 3 2 1 ';fi" -- flip mouse buttons
+  spawnOnce "picom --config ~/.config/compton.conf -b"
+  spawnOnce "stalonetray &"
 
 ------------------------------------------------------------------------
 -- Now run xmonad with all the defaults we set up.