Update XMonad layouts

.bash_aliases

@@ -1,7 +1,9 @@
 # Aliases
+alias cat='bat'
 alias clean-aurutils-cache='find ~/.cache/aurutils/sync -type d -name .git -execdir git clean -xi \;'
 alias config='/usr/bin/git --git-dir=$HOME/.dotfiles/ --work-tree=$HOME'
-alias fastfetch='hyfetch'
+alias cookie='fortune /usr/share/fortune/asoiaf /usr/share/fortune/startrek | cowthink | lolcat -p 2.0 -F 0.3 -a -d 1'
+alias fastfetch='hyfetch --distro=arch'
 alias ghc='stack ghc'
 alias ghci='stack ghci'
 alias hoogle='stack hoogle'
@@ -13,7 +15,8 @@ alias sort='sort -n'
 alias ssh='kitten ssh'
 alias sudo='doas'
 alias sudoedit='doas rvim'
-alias trayer='trayer -l --edge top --align right --SetDockType true --SetPartialStrut true --expand true --widthtype request --transparent true --tint 0x232634 --height 18 --monitor 1'
+#alias trayer='trayer -l --edge top --align right --SetDockType true --SetPartialStrut true --expand true --widthtype request --transparent true --tint 0x232634 --height 18 --monitor 1'
+alias trayer='trayer -l --edge top --align right --SetDockType true --SetPartialStrut true --expand true --widthtype request --tint 0x232634 --height 18 --monitor 1'
 alias trc='trash-empty'
 alias trl='trash-list'
 alias trm='trash-rm'

.config/fish/config.fish

@@ -9,7 +9,7 @@ if status is-interactive
 
     fastfetch
 
-    fortune /usr/share/fortune/anarchism
+    cookie
 
     calcurse -d 7
 

.config/xmonad/xmonad.hs

@@ -47,7 +47,7 @@ myTerminal :: String
 myTerminal = "kitty"
 
 myBrowser :: String
-myBrowser = "vivaldi"
+myBrowser = "zen-browser"
 
 myNormBorderColor :: String
 myNormBorderColor = "#1f2335"
@@ -132,10 +132,11 @@ myWorkspaces :: [String]
 myWorkspaces = ["1:\xf489 ", "2:\xe743 ", "3:\xf1b6 ", "4:\xf10b ", "5:\xead9 ", "6:\xeb69 ", "7:\xea7a "] ++ map show [8, 9]
 
 -- Layout
-myLayoutHook = onWorkspace "2:\xe743 " myWebLayout $ onWorkspace "3:\xf1b6 " myGamesLayout myDefaultLayout
+myLayoutHook = onWorkspace "2:\xe743 " myWebLayout $ onWorkspace "3:\xf1b6 " myGamesLayout $ onWorkspace "5:\xead9 " myVideoLayout myDefaultLayout
   where
     myWebLayout = avoidStruts $ renamed [CutWordsLeft 1] $ spacingWithEdge 3 $ myTabbed ||| tiled ||| Mirror tiled ||| threeCol ||| Grid ||| spiral 0.856
     myGamesLayout = avoidStruts $ smartBorders Full
+    myVideoLayout = avoidStruts $ smartBorders Full
     myDefaultLayout = avoidStruts $ renamed [CutWordsLeft 1] $ spacingWithEdge 3 $ tiled ||| Mirror tiled ||| myTabbed ||| threeCol ||| Grid ||| spiral 0.856
     threeCol =
       renamed [Replace "ThreeCol"] $
@@ -156,6 +157,7 @@ myLayoutHook = onWorkspace "2:\xe743 " myWebLayout $ onWorkspace "3:\xf1b6 " myG
 
 -- Xmobar
 xmobar1 = statusBarProp "xmobar -x 0 ~/.config/xmobar/xmobarrc_hdmi" (pure myXmobarPP)
+
 xmobar2 = statusBarProp "xmobar -x 1 ~/.config/xmobar/xmobarrc_laptop" (pure myXmobarPP)
 
 myXmobarPP :: PP
@@ -191,13 +193,12 @@ myStartupHook = do
   --  spawnOnce "mons -e left && ~/.fehbg"
   spawnOnce $
     "xrandr --output HDMI-1-0 --preferred --primary --output eDP-1 --right-of HDMI-1-0 --preferred && ~/.fehbg"
-      ++ " && xcompmgr -c -C -t-5 -l-5 -r4.2 -o.55"
+      ++ " && picom -b -c"
   spawnOnce "xautolock -time 10 -locker slock -detectsleep"
   spawnOnce
     "trayer -l --edge top --align right --SetDockType true \
     \--SetPartialStrut true --expand true --widthtype request \
-    \--transparent true --tint 0x232634 --height 18 \
+    \--tint 0x232634 --height 18 --monitor 1"
-    \--monitor 1"
   spawnOnce "redshift-gtk"
   spawnOnce "udiskie"
   spawnOnce "nm-applet"
@@ -208,6 +209,7 @@ myStartupHook = do
   spawnOnce "numlockx"
   spawnOnce "blueman-applet"
   spawnOnce "mousemove"
+  spawnOnce "adb start-server"
 
 -- Manage hook
 myManageHook :: ManageHook
@@ -235,13 +237,15 @@ myManageHook =
       className =? "mpv" --> doFullFloat,
       className =? "mpv" --> doShift "5:\xead9 ",
       className =? myTerminal --> doShift "1:\xf489 ",
-      className =? "scrcpy" --> doShift "6:\xeb69 ",
+      className =? "scrcpy" --> doShift "5:\xead9 ",
       className =? "steam" --> doShift "3:\xf1b6 ",
       className =? "steam_app_109600" --> doFloat,
+      className =? "steam_app_109600" --> doShift "3:\xf1b6 ",
       className =? "transmission-gtk" --> doShift "2:\xe743 ",
       className =? "VirtualBox Machine" --> doShift "7:\xea7a ",
       className =? "VirtualBox Machine" --> doFullFloat,
       className =? "VirtualBox Manager" --> doShift "7:\xea7a ",
+      className =? "zen" --> doShift "2:\xe743 ",
       isDialog --> doFloat,
       isFullscreen --> doFullFloat
     ]