From a5d0731b6e520714aea771a1441ad4210479b23f Mon Sep 17 00:00:00 2001 From: Craige McWhirter Date: Sun, 18 Dec 2022 22:33:45 +1000 Subject: [PATCH] xmonad: updated workspaces --- .xmonad/xmonad.hs | 44 +++++++++++++++++++++++++++----------------- 1 file changed, 27 insertions(+), 17 deletions(-) diff --git a/.xmonad/xmonad.hs b/.xmonad/xmonad.hs index d667deb..0e84fd6 100644 --- a/.xmonad/xmonad.hs +++ b/.xmonad/xmonad.hs @@ -90,17 +90,18 @@ myXmobarPP = ---------------- myWorkspaces :: [String] -myWorkspaces = [wsGEN, wsCOM, wsINT] +myWorkspaces = [wsSIG, wsIOG, wsMIO, wsDOT, wsLOG, wsMUS, wsREC, wsVID, wsADA] -wsCOM, wsDOT, wsGEN, wsINT, wsLOG, wsMUS, wsREC, wsVID :: String -wsCOM = "com" +wsIOG, wsDOT, wsSIG, wsMIO, wsLOG, wsMUS, wsREC, wsVID, wsADA :: String +wsIOG = "iog" wsDOT = "dot" -wsGEN = "gen" -wsINT = "int" +wsSIG = "sig" +wsMIO = "mio" wsLOG = "log" wsMUS = "mus" wsREC = "rec" wsVID = "vid" +wsADA = "ada" -------------- -- Projects -- @@ -109,30 +110,31 @@ wsVID = "vid" projects :: [Project] projects = [ Project - { projectName = wsCOM, + { projectName = wsIOG, projectDirectory = "~/", projectStartHook = Just $ do - spawnOn wsCOM element + spawnOn wsIOG iogBrowser + spawnOn wsIOG slack }, Project { projectName = wsDOT, projectDirectory = "~/.dotfiles", - projectStartHook = Just $ do spawnOn wsDOT $ editor ++ " ." + projectStartHook = Just $ do spawnOn wsDOT myTerminal }, Project - { projectName = wsGEN, + { projectName = wsSIG, projectDirectory = "~/", projectStartHook = Nothing }, Project - { projectName = wsINT, + { projectName = wsMIO, projectDirectory = "~/", - projectStartHook = Just $ do spawnOn wsINT browser + projectStartHook = Just $ do spawnOn wsMIO browser }, Project { projectName = wsLOG, projectDirectory = "~/", - projectStartHook = Just $ do spawnOn wsLOG logseq + projectStartHook = Just $ do spawnOn wsIOG myTerminal }, Project { projectName = wsMUS, @@ -148,7 +150,12 @@ projects = { projectName = wsVID, projectDirectory = "~/", projectStartHook = Nothing - } + }, + Project + { projectName = wsADA, + projectDirectory = "~/", + projectStartHook = Just $ do spawnOn wsADA daedalus + }, ] promptTheme :: XPConfig @@ -167,20 +174,23 @@ promptTheme = -- Applications -- ------------------ -browser, discord, editor, element, incognitoBrowser, launcher, logseq, musicPlayer, obs, screenshot, terminal :: String +browser, discord, editor, element, incognitoBrowser, iogBrowser, launcher, logseq, musicPlayer, obs, screenshot, slack, myTerminal :: String browser = "brave" +daedalus = "daedalus" discord = "discord" editor = "codium" element = "element-desktop" enableEDP1 = "xrandr --output eDP-1 --primary --auto --output HDMI-1 --off" enableHDMI1 = "xrandr --output eDP-1 --off --output HDMI-1 --primary --mode 3840x2160" incognitoBrowser = "brave -incognito" +iogBrowser = "google-chrome-stable" launcher = "rofi -show drun" logseq = "logseq" musicPlayer = "spotify" obs = "obs" screenshot = "flameshot gui" -terminal = "termonad" +slack = "slack" +myTerminal = "termonad" myScreenLockCmd = "xscreensaver --no-splash" myScreenLock = "xscreensaver-command -lock" @@ -197,7 +207,7 @@ myKeybinds = ("M-p", spawn launcher), ("M-S-e", spawn enableEDP1), ("M-S-h", spawn enableHDMI1), - ("M-S-", spawn Main.terminal), + ("M-S-", spawn myTerminal), ("M-", kill1), -- Layout control ("M-z", sendMessage Expand), @@ -245,7 +255,7 @@ myLayout = spacedThreeColMid delta = 3 / 100 ---------------- --- Navigation --L +-- Navigation -- ---------------- myNav2DConf :: Navigation2DConfig