From 9cf2d2aaf5dfc32a044da544c5043ad06564ce22 Mon Sep 17 00:00:00 2001
From: Solomon Laing <solomonlaing@protonmail.com>
Date: Tue, 16 Mar 2021 14:32:51 +1030
Subject: [PATCH] updated some things for new laptop, big change is updating
 amixer commands to pactl

---
 .xmonad/xmonad.hs | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/.xmonad/xmonad.hs b/.xmonad/xmonad.hs
index c9c8d23..77b050b 100644
--- a/.xmonad/xmonad.hs
+++ b/.xmonad/xmonad.hs
@@ -234,10 +234,11 @@ myKeys conf@(XConfig {XMonad.modMask = modm}) = M.fromList $
     --
     [
         -- decrease volume with mod+f11
-        ((modm, xK_F11), spawn "amixer -c 2 set Master 5%-")
+        ((modm, xK_F11), spawn "pactl set-sink-volume 0 -5%")
     
         -- increase volume with mod+f12
-        ,((modm, xK_F12), spawn "amixer -c 2 set Master 5%+")
+        ,((modm, xK_F12), spawn "pactl set-sink-volume 0 +5%")
+	,((modm, xK_F10), spawn "pactl set-sink-mute 0 toggle")
     ]
     ++
 
@@ -383,8 +384,8 @@ myManageHook = composeAll
     , resource  =? "desktop_window" --> doIgnore
     , (className =? "firefox" <&&> resource =? "Dialog") --> doFloat  -- Float Firefox Dialog
     , resource  =? "kdesktop"       --> doIgnore 
-    , className =? "MusicBrainz Picard" --> doIgnore ]
-
+    , className =? "MusicBrainz Picard" --> doIgnore
+    , className =? "Steam" --> doFloat ]
 ------------------------------------------------------------------------
 -- Event handling
 
@@ -411,23 +412,29 @@ myLogHook = fadeInactiveLogHook fadeAmount
 --
 -- By default, do nothing.
 myStartupHook = do
+    -- .xprofile contains numlock, compositor, nitrogen, cursor set, and kbd set.
+    -- Move to .xprofile on desktop
     spawnOnce "/usr/lib/x86_64-linux-gnu/libexec/org_kde_powerdevil &"
-    spawnOnce "/home/solomon/.screenlayout/normal.sh"
     spawnOnce "compton &"
     spawnOnce "nitrogen --restore &"
-    spawnOnce "dunst &"
     spawnOnce "xsetroot -cursor_name left_ptr"
     spawnOnce "numlockx"
+
+    -- Startup apps (tray) and settings
+    spawnOnce "/home/solomon/.screenlayout/normal.sh" -- really only matters for desktop
     spawnOnce "trayer --edge top --align right --widthtype request --padding 6 --SetDockType true --SetPartialStrut true --expand true --monitor 1 --transparent true --alpha 0 --tint 0x14071F  --height 20 &"
     spawnOnce "volumeicon &"
     spawnOnce "nm-applet &"
     spawnOnce "blueman-applet &"
     spawnOnce "kdeconnect-indicator &"
-    spawnOnce "ibus-daemon &"
+    spawnOnce "dunst &" -- notification daemon
+    
+    -- Startup Applications
     spawnOnce "guake &"
     spawnOnce "barrier &"
     spawnOnce "nextcloud &"
     spawnOnce "slack &"
+    spawnOnce "todoist &"
 
 ------------------------------------------------------------------------