Merge branch 'master' of github.com:IvanMalison/dotfiles

dotfiles/config/taffybar/taffybar

@@ -1 +1 @@
-Subproject commit d1766409bc4c1e9faa1d869eb928144dad443250
+Subproject commit 6b1f3732ce5af9c8383585ad277c9866d459c9f4

dotfiles/config/taffybar/taffybar.css

@@ -16,7 +16,7 @@
 	border-color: rgba(1.0, 1.0, 1.0, 0.0);
 }
 
-.Active .WorkspaceContents, .Visible .WorkspaceContents {
+.Active .Contents, .Visible .Contents {
 	background-color: rgba(0.0, 0.0, 0.0, 0.5);
 }
 
@@ -96,7 +96,7 @@
 .IconContainer {
 	border-bottom: 0px;
 	transition: opacity .5s, box-shadow 1s;
-	padding-bottom: 2px;
+	padding-bottom: 4px;
 	opacity: 1;
 }
 
@@ -105,7 +105,7 @@
 	/* background-color: rgba(255, 255, 255, 0.3); */
 	border-radius: 0px;
 	opacity: 1;
-	box-shadow: inset 0 -3px #FFFFFF;
+	box-shadow: inset 0 -2px #FFFFFF;
 }
 
 .IconContainer.Urgent {

dotfiles/config/taffybar/taffybar.hs

@@ -211,8 +211,6 @@ main = do
       mpris = mpris2New
       cpu = pollingGraphNew cpuCfg 0.5 cpuCallback
       mem = pollingGraphNew memCfg 1 memCallback
-      battery = batteryBarNewWithFormat defaultBatteryConfig
-                "$percentage$% ($time$) - $status$" 1.0
       myWorkspacesConfig =
         defaultWorkspacesConfig
         { underlineHeight = 3
@@ -233,13 +231,12 @@ main = do
             , wnd >>= buildPadBox
             ]
         , endWidgets = map (>>= buildPadBoxNoShrink)
-          [ battery
-          , clock >>= setMinWidth 200
+          [ clock >>= setMinWidth 200
           , sniTrayNew
           , github
           , cpu
           , mem
-          , netMonitorGraphNew netCfg Nothing
+          , networkGraphNew netCfg Nothing
           -- , networkMonitorNew defaultNetFormat Nothing >>= setMinWidth 200
           , fsMonitorNew 60 ["/dev/sdd2"]
           , mpris

dotfiles/lib/bin/taffybar

@@ -2,12 +2,4 @@
 # -*- mode:sh
 
 cd "$HOME/.config/taffybar"
-stack install
-
-if command_exists "imalison-taffybar"; then
-	imalison-taffybar "$@"
-else
-	# Move .lib/bin to the end of PATH so that this script is not called again
-	add_to_path "$HOME/.lib/bin" --after
-	taffybar "$@"
-fi
+stack run