From 7973b53c4c552434d356ac056aeb25117e1334e0 Mon Sep 17 00:00:00 2001
From: Craige McWhirter <craige@mcwhirter.io>
Date: Thu, 15 Aug 2024 16:50:17 +1000
Subject: [PATCH] chore(xmonad): move xmonad.hs

---
 .gitignore.d/rcfiles                      |  2 +-
 .xmonad/{xmonad.hs => xmonad-sanganto.hs} | 20 ++++++++------------
 2 files changed, 9 insertions(+), 13 deletions(-)
 rename .xmonad/{xmonad.hs => xmonad-sanganto.hs} (95%)

diff --git a/.gitignore.d/rcfiles b/.gitignore.d/rcfiles
index c9fe1b4..8207021 100644
--- a/.gitignore.d/rcfiles
+++ b/.gitignore.d/rcfiles
@@ -38,7 +38,7 @@
 !/.xmobarrc
 !/.xmonad
 !/.xmonad/xmonad-session-rc
-!/.xmonad/xmonad.hs
+!/.xmonad/xmonad-sanganto.hs
 !/.xmonad/xmonad-sercanto.hs
 !/.xscreensaver
 !/.xsession
diff --git a/.xmonad/xmonad.hs b/.xmonad/xmonad-sanganto.hs
similarity index 95%
rename from .xmonad/xmonad.hs
rename to .xmonad/xmonad-sanganto.hs
index 32d9da0..2b4840c 100644
--- a/.xmonad/xmonad.hs
+++ b/.xmonad/xmonad-sanganto.hs
@@ -2,8 +2,8 @@ import XMonad
 import XMonad.Actions.CopyWindow
 import XMonad.Actions.DynamicProjects
 import XMonad.Actions.Navigation2D
-import XMonad.Actions.SinkAll
 import XMonad.Actions.SpawnOn
+import XMonad.Actions.WithAll
 import XMonad.Hooks.DynamicLog
 import XMonad.Hooks.EwmhDesktops
 import XMonad.Hooks.StatusBar
@@ -113,12 +113,11 @@ projects :: [Project]
 projects =
   [ Project
       { projectName = wsIOG,
-        projectDirectory = "~/source/IOG",
+        projectDirectory = "~/source/IOG/blockfrost-ops",
         projectStartHook = Just $ do
           spawnOn wsIOG iogBrowser
           spawnOn wsIOG slack
           spawnOn wsIOG iogTerminal
-          spawnOn wsIOG iogNeomuttTerminal
       },
     Project
       { projectName = wsSEC,
@@ -139,7 +138,6 @@ projects =
           spawnOn wsMIO element
           spawnOn wsMIO mastodon
           spawnOn wsMIO mioTerminal
-          spawnOn wsMIO myNeomuttTerminal
       },
     Project
       { projectName = wsLOG,
@@ -184,7 +182,7 @@ promptTheme =
 -- Applications --
 ------------------
 
-brightnessDown, brightnessUp, browser, discord, editor, element, hibernate, incognitoBrowser, iogBrowser, launcher, logseq, musicPlayer, notificationDaemon, obs, screenshot, signal, slack, iogNeomuttTerminal, iogTerminal, mioTerminal, myNeomuttTerminal, myTerminal, volumeDown, volumeMute, volumeUp :: String
+brightnessDown, brightnessUp, browser, discord, editor, element, hibernate, incognitoBrowser, iogBrowser, launcher, logseq, musicPlayer, notificationDaemon, obs, screenshot, signal, slack, iogTerminal, mioTerminal, myTerminal, volumeDown, volumeMute, volumeUp :: String
 brightnessDown = "light -U 10 ; notify-send -h int:value:$(light -G) \"Brightness\""
 brightnessUp = "light -A 10 ; notify-send -h int:value:$(light -G) \"Brightness\""
 browser = "firefox"
@@ -207,10 +205,8 @@ screenshot = "flameshot gui"
 signal = "signal-desktop"
 slack = "slack"
 mastodon = "whalebird"
-iogNeomuttTerminal = "terminology -e neomutt -F ~/.mutt/profile.IOHK"
-iogTerminal = "terminology -e 'tmux new-session -f /etc/tmux.conf -c ~/source/IOG -s IOG'"
+iogTerminal = "terminology -e 'tmux new-session -f /etc/tmux.conf -c ~/source/IOG/blockfrost/blockfrost-ops -s blockfrost'"
 mioTerminal = "terminology -e 'tmux new-session -f /etc/tmux.conf -c ~/forge/mio-ops -s mio'"
-myNeomuttTerminal = "terminology -e neomutt"
 myTerminal = "terminology"
 myScreenLockCmd = "xscreensaver --no-splash"
 myScreenLock = "xscreensaver-command -lock"
@@ -273,11 +269,11 @@ myKeybinds =
 ------------
 
 -- myLayout :: Choose (ModifiedLayout Spacing Tall) (Choose (Mirror (ModifiedLayout Spacing Tall)) Full) a
-myLayout = spacedThreeColMid
-    ||| spacedSpiral
-    ||| tiled
-    ||| Mirror tiled
+myLayout = Mirror tiled
     ||| Full
+    ||| spacedThreeColMid
+    ||| tiled
+    ||| spacedSpiral
   where
     tiled = spacing 3 $ Tall nmaster delta ratio
     spacedSpiral = spacing 3 $ spiral (6/7)