From f9f81b279968c25898fa08727d2065a740225e1a Mon Sep 17 00:00:00 2001 From: Trey Blancher Date: Sat, 30 Dec 2023 14:38:39 -0500 Subject: [PATCH] Baseline for fluorine --- xmonad.hs | 161 ++++++++++++++++++++++++------------------------------ 1 file changed, 71 insertions(+), 90 deletions(-) diff --git a/xmonad.hs b/xmonad.hs index 62b353d..4a7e240 100755 --- a/xmonad.hs +++ b/xmonad.hs @@ -97,45 +97,45 @@ getTopBar sc = if sc == 1 then "dzen2 -dock -p -x 0 -ta l -w 1024 -e 'onstart:lower;button2=togglehide;sigusr1=togglehide'" else "dzen2 -dock -p -x 1920 -ta l -w 1024 -e 'onstart:lower;button2=togglehide;sigusr1=togglehide'" -getBarbicanBar :: Int -> String -getBarbicanBar sc = if sc == 1 - then "ssh barbican 'conky' | dzen2 -dock -p -x 0 -y -126 -ta l -w 1920 -e 'sigusr1=togglehide'" - else "ssh barbican 'conky' | dzen2 -dock -p -x 1920 -y -126 -ta l -w 1920 -e 'sigusr1=togglehide'" +--getBarbicanBar :: Int -> String +--getBarbicanBar sc = if sc == 1 +-- then "ssh barbican 'conky' | dzen2 -dock -p -x 0 -h 16 -y -112 -ta l -w 1920 -e 'sigusr1=togglehide'" +-- else "ssh barbican 'conky' | dzen2 -dock -p -x 1920 -h 16 -y -112 -ta l -w 1920 -e 'sigusr1=togglehide'" -getDeltachunkBar :: Int -> String -getDeltachunkBar sc = if sc == 1 - then "ssh deltachunk 'conky' | dzen2 -dock -p -x 0 -y -108 -ta l -w 1920 -e 'sigusr1=togglehide'" - else "ssh deltachunk 'conky' | dzen2 -dock -p -x 1920 -y -108 -ta l -w 1920 -e 'sigusr1=togglehide'" +--getDeltachunkBar :: Int -> String +--getDeltachunkBar sc = if sc == 1 +-- then "ssh deltachunk 'conky' | dzen2 -dock -p -x 0 -h 16 -y -96 -ta l -w 1920 -e 'sigusr1=togglehide'" +-- else "ssh deltachunk 'conky' | dzen2 -dock -p -x 1920 -h 16 -y -96 -ta l -w 1920 -e 'sigusr1=togglehide'" -getFerrumBar :: Int -> String -getFerrumBar sc = if sc == 1 - then "conky | dzen2 -dock -p -x 0 -y -90 -ta l -w 1920 -e 'sigusr1=togglehide'" - else "conky | dzen2 -dock -p -x 1920 -y -90 -ta l -w 1920 -e 'sigusr1=togglehide'" +--getFerrumBar :: Int -> String +--getFerrumBar sc = if sc == 1 +-- then "conky | dzen2 -dock -p -x 0 -h 16 -y -80 -ta l -w 1920 -e 'sigusr1=togglehide'" +-- else "conky | dzen2 -dock -p -x 1920 -h 16 -y -80 -ta l -w 1920 -e 'sigusr1=togglehide'" -- getGammachunkBar :: Int -> String -- getGammachunkBar sc = if sc == 1 -- then "ssh gammachunk 'conky' | dzen2 -dock -p -x 0 -y -72 -ta l -w 1920 -e 'sigusr1=togglehide'" -- else "ssh gammachunk 'conky' | dzen2 -dock -p -x 1920 -y -72 -ta l -w 1920 -e 'sigusr1=togglehide'" -getOsmiumBar :: Int -> String -getOsmiumBar sc = if sc == 1 - then "ssh osmium 'conky' | dzen2 -dock -p -x 0 -y -72 -ta l -w 1920 -e 'sigusr1=togglehide'" - else "ssh osmium 'conky' | dzen2 -dock -p -x 1920 -y -72 -ta l -w 1920 -e 'sigusr1=togglehide'" - -getSodiumBar :: Int -> String -getSodiumBar sc = if sc == 1 - then "ssh sodium 'conky' | dzen2 -dock -p -x 0 -y -54 -ta l -w 1920 -e 'sigusr1=togglehide'" - else "ssh sodium 'conky' | dzen2 -dock -p -x 1920 -y -54 -ta l -w 1920 -e 'sigusr1=togglehide'" - -getTennessineBar :: Int -> String -getTennessineBar sc = if sc == 1 - then "ssh tennessine 'conky' | dzen2 -dock -p -x 0 -y -36 -ta l -w 1920 -e 'sigusr1=togglehide'" - else "ssh tennessine 'conky' | dzen2 -dock -p -x 1920 -y -36 -ta l -w 1920 -e 'sigusr1=togglehide'" - -getBlancherBar :: Int -> String -getBlancherBar sc = if sc == 1 - then "ssh blancher 'conky' | dzen2 -dock -p -x 0 -y -1 -ta l -w 1920 -e 'sigusr1=togglehide'" - else "ssh blancher 'conky' | dzen2 -dock -p -x 1920 -y -1 -ta l -w 1920 -e 'sigusr1=togglehide'" +--getOsmiumBar :: Int -> String +--getOsmiumBar sc = if sc == 1 +-- then "ssh osmium 'conky' | dzen2 -dock -p -x 0 -h 16 -y -64 -ta l -w 1920 -e 'sigusr1=togglehide'" +-- else "ssh osmium 'conky' | dzen2 -dock -p -x 1920 -h 16 -y -64 -ta l -w 1920 -e 'sigusr1=togglehide'" +-- +--getSodiumBar :: Int -> String +--getSodiumBar sc = if sc == 1 +-- then "ssh sodium 'conky' | dzen2 -dock -p -x 0 -h 16 -y -48 -ta l -w 1920 -e 'sigusr1=togglehide'" +-- else "ssh sodium 'conky' | dzen2 -dock -p -x 1920 -h 16 -y -48 -ta l -w 1920 -e 'sigusr1=togglehide'" +-- +--getTennessineBar :: Int -> String +--getTennessineBar sc = if sc == 1 +-- then "ssh tennessine 'conky' | dzen2 -dock -p -x 0 -h 16 -y -32 -ta l -w 1920 -e 'sigusr1=togglehide'" +-- else "ssh tennessine 'conky' | dzen2 -dock -p -x 1920 -h 16 -y -32 -ta l -w 1920 -e 'sigusr1=togglehide'" +-- +--getBlancherBar :: Int -> String +--getBlancherBar sc = if sc == 1 +-- then "ssh blancher 'conky' | dzen2 -dock -p -x 0 -h 16 -y -16 -ta l -w 1920 -e 'sigusr1=togglehide'" +-- else "ssh blancher 'conky' | dzen2 -dock -p -x 1920 -h 16 -y -16 -ta l -w 1920 -e 'sigusr1=togglehide'" toggleHomeScreens :: X () toggleHomeScreens = do @@ -151,7 +151,7 @@ toggleHomeScreens = do \date \"+%a, %b %d %T\"; \n\ \/usr/bin/sed -E \"s/($(date +%_d)\b)/^fg(green)\1^fg()/\" ; \n\ \sleep 1; \n\ - \done | dzen2 -dock -p -x 1600 -w 325 -u -h 24 -ta r -sa c -e 'sigusr1=togglehide' &" + \done | dzen2 -dock -p -x 2400 -w 480 -u -h 24 -ta r -sa c -e 'sigusr1=togglehide' &" else if sc == 3 then do @@ -273,7 +273,7 @@ myTheme :: Theme myTheme = def { fontName = myFont } -myFont = "xft:Terminus:style=Regular:Pixelsize=12" +myFont = "monospace:style=Regular:Pixelsize=18" fadeHook = fadeInactiveLogHook fadeAmount where fadeAmount = 0.8 @@ -287,27 +287,27 @@ launcher = makeLauncher "-x" "eval" "\"exec " "\"" main = do sc <- IS.countScreens dzenTopBar <- spawnPipe (getTopBar sc) - dzenBarbicanBar <- spawnPipe (getBarbicanBar sc) - dzenDeltachunkBar <- spawnPipe (getDeltachunkBar sc) - dzenFerrumBar <- spawnPipe (getFerrumBar sc) - dzenOsmiumBar <- spawnPipe (getOsmiumBar sc) - dzenSodiumBar <- spawnPipe (getSodiumBar sc) - dzenTennessineBar <- spawnPipe (getTennessineBar sc) - dzenBlancherBar <- spawnPipe (getBlancherBar sc) + --dzenBarbicanBar <- spawnPipe (getBarbicanBar sc) + --dzenDeltachunkBar <- spawnPipe (getDeltachunkBar sc) + --dzenFerrumBar <- spawnPipe (getFerrumBar sc) + --dzenOsmiumBar <- spawnPipe (getOsmiumBar sc) + --dzenSodiumBar <- spawnPipe (getSodiumBar sc) + --dzenTennessineBar <- spawnPipe (getTennessineBar sc) + --dzenBlancherBar <- spawnPipe (getBlancherBar sc) xmonad $ desktopConfig { workspaces = genWorkspaces (S sc) , terminal = myTerminal , focusFollowsMouse = True , manageHook = manageDocks <+> myManageHook -- <+> manageHook desktopConfig , handleEventHook = handleEventHook desktopConfig - , layoutHook = avoidStruts $ gaps [(D,108)] $ layoutH - --, layoutHook = avoidStruts $ layoutH + --, layoutHook = avoidStruts $ gaps [(D,108)] $ layoutH + , layoutHook = avoidStruts $ layoutH , logHook = myLogHook dzenTopBar >> fadeHook >> updatePointer (0.5, 0.5) (0, 0) , borderWidth = 1 , normalBorderColor = "#282828" , focusedBorderColor = "#ebdbb2" , modMask = winKey - , startupHook = myStartup + , startupHook = myStartup } `additionalKeys` myKeys `removeKeys` remKeys @@ -316,22 +316,23 @@ main = do sc <- IS.countScreens myStartup :: X () myStartup = do --setWMName "LG3D" - sc <- IS.countScreens + --sc <- IS.countScreens toggleHomeScreens - spawn "xset dpms 600" + --spawn "xset dpms 600" spawn "xautolock -secure -time 10 -locker 'i3lock -c 000000'" - if sc == 1 - then do - spawn "trayer --edge top --align right --widthtype request --margin 318 --expand false --SetDockType true --SetPartialStrut false --tint 0x282828 --transparent true --alpha 0 --height 24 --monitor 'primary'" - --spawn "gnome-gmail-notifier" - --spawn "xautolock -secure -time 10 -locker 'i3lock -c 000000 -i /home/trey/images/black.png'" - - else if sc == 3 - then do - spawn "trayer --edge top --align right --widthtype request --margin 318 --expand false --SetDockType true --SetPartialStrut false --tint 0x282828 --transparent true --alpha 0 --height 24 --monitor 2" + --if sc == 1 + -- then do + -- --spawn "trayer --edge top --align right --widthtype request --margin 318 --expand false --SetDockType true --SetPartialStrut false --tint 0x282828 --transparent true --alpha 0 --height 24 --monitor 'primary'" + -- --spawn "stalonetray" + -- --spawn "gnome-gmail-notifier" + -- --spawn "xautolock -secure -time 10 -locker 'i3lock -c 000000 -i /home/trey/images/black.png'" + -- + --else if sc == 3 + -- then do + -- --spawn "trayer --edge top --align right --widthtype request --margin 318 --expand false --SetDockType true --SetPartialStrut false --tint 0x282828 --transparent true --alpha 0 --height 24 --monitor 2" - else - return () + --else + -- return () activateMyTerminal :: X () activateMyTerminal = do @@ -461,7 +462,7 @@ myKeys = [ --, ((winKey .|. shiftMask, xK_Return), spawnHere myTerminal) , ((winKey , xK_b), do spawnHere "pkill -USR1 dzen2" - spawnHere "pkill trayer" + spawnHere "pkill stalonetray" sendMessage $ ToggleStruts sendMessage $ ToggleGaps) --sendMessage $ ToggleStruts) @@ -469,7 +470,7 @@ myKeys = [ --, ((winKey , xK_g), ifWindows (className =? "Google-chrome") (mapM_ focus) (spawnHere "google-chrome")) , ((winKey , xK_g), do windows (viewOnScreen 0 "pindrop") - ifWindows (className =? "Google-chrome") (mapM_ focus) (spawnHere "google-chrome-stable")) + ifWindows (className =? "Google-chrome") (mapM_ focus) (spawnHere "vivaldi")) --, ((winKey , xK_r), do -- windows (viewOnScreen 1 "wb") -- ifWindows (className =? "Google-chrome-stable") (mapM_ focus) (spawnHere "google-chrome-stable")) @@ -553,43 +554,23 @@ myKeys = [ windows (viewOnScreen 0 "pindrop") --ifWindows (className =? "Pidgin") (mapM_ focus) (spawnHere "pidgin")) ifWindows (className =? "Slack") (mapM_ focus) (spawnHere "slack")) - {- - , ((winKey , xK_2), windows (viewOnScreen 0 "02:jobs")) - , ((winKey , xK_3), windows (viewOnScreen 0 "03:is660")) - , ((winKey , xK_4), windows (viewOnScreen 0 "04:office")) - , ((winKey , xK_5), windows (viewOnScreen 0 "05:sysadmin")) - , ((winKey , xK_6), windows (viewOnScreen 0 "06:irc")) - , ((winKey , xK_7), windows (viewOnScreen 0 "07:digium")) - , ((winKey , xK_8), windows (viewOnScreen 0 "08:vm")) - , ((winKey , xK_9), windows (viewOnScreen 0 "09:dump")) - , ((winKey , xK_0), windows (viewOnScreen 0 "10:music")) - , ((winKey , xK_F1), windows (viewOnScreen 1 "F1:man")) - , ((winKey , xK_F2), windows (viewOnScreen 1 "F2:jobs")) - , ((winKey , xK_F3), windows (viewOnScreen 1 "F3:isovr")) - , ((winKey , xK_F4), windows (viewOnScreen 1 "F4:offovr")) - , ((winKey , xK_F5), windows (viewOnScreen 1 "F5:sysovr")) - , ((winKey , xK_F6), windows (viewOnScreen 1 "F6:ircovr")) - , ((winKey , xK_F7), windows (viewOnScreen 1 "F7:dgmovr")) - , ((winKey , xK_F8), windows (viewOnScreen 1 "F8:vmovr")) - , ((winKey , xK_F9), windows (viewOnScreen 1 "F9:dmpovr")) - , ((winKey , xK_F10), windows (viewOnScreen 1 "F10:musovr"))-} - , ((winKey , xK_q), spawn "killall dzen2 trayer; xmonad --recompile; xmonad --restart") - , ((winKey .|. shiftMask , xK_q), io (exitWith ExitSuccess)) + , ((winKey , xK_q), spawn "killall dzen2 stalonetray; xmonad --recompile; xmonad --restart") + , ((winKey .|. shiftMask , xK_q), io (exitWith ExitSuccess)) -- win+h shows the selected workspace - , ((winKey , xK_h), DW.withWorkspace myXPConfigSelect $ \wk -> do - sc <- screenBy 0 - if sc == 0 + , ((winKey, xK_h), DW.withWorkspace myXPConfigSelect $ \wk -> do + --sc <- screenBy 0 + --if sc == 0 --then XS.modify $ LeftScreen . (wk :) . getLeftScreen -- prefix to list - then XS.modify $ LeftScreen . (++ [wk]) . getLeftScreen -- append to list + -- then XS.modify $ LeftScreen . (++ [wk]) . getLeftScreen -- append to list --else XS.modify $ RightScreen . (wk :) . getRightScreen -- prefix to list - else XS.modify $ RightScreen . (++ [wk]) . getRightScreen -- append to list + -- else XS.modify $ RightScreen . (++ [wk]) . getRightScreen -- append to list windows $ W.view wk) -- win+z moves the current window to the selected workspace - , ((winKey , xK_z), DW.withWorkspace myXPConfigSelect (\ws -> do - sc <- screenBy 0 - if sc == 0 - then XS.modify $ LeftScreen . nub . (ws :) . getLeftScreen -- prefix to list - else XS.modify $ RightScreen . nub . (ws :) . getRightScreen -- prefix to list + , ((winKey, xK_z), DW.withWorkspace myXPConfigSelect (\ws -> do + --sc <- screenBy 0 + --if sc == 0 + -- then XS.modify $ LeftScreen . nub . (ws :) . getLeftScreen -- prefix to list + -- else XS.modify $ RightScreen . nub . (ws :) . getRightScreen -- prefix to list --then XS.modify $ LeftScreen . nub . (++ [ws]) . getLeftScreen -- append to list --else XS.modify $ RightScreen . nub . (++ [ws]) . getRightScreen -- append to list