diff --git a/xmonad.hs b/xmonad.hs index d8aeea4..41e476d 100755 --- a/xmonad.hs +++ b/xmonad.hs @@ -6,6 +6,7 @@ import XMonad.Config.Desktop -- Actions import XMonad.Actions.CycleWS import XMonad.Actions.DynamicWorkspaces as DW +import XMonad.Actions.DynamicWorkspaceGroups as DWG import XMonad.Actions.GridSelect import XMonad.Actions.OnScreen import XMonad.Actions.SpawnOn @@ -150,24 +151,24 @@ toggleHomeScreens = do else if sc == 3 then do - spawn "xrandr --output eDP-1-1 --primary --auto --output DVI-I-3-2 --auto --left-of eDP-1-1 --output DVI-I-2-1 --auto --right-of eDP-1-1" + spawn "xrandr --output eDP-1 --primary --auto --output DVI-I-3-2 --auto --left-of eDP-1 --output DVI-I-2-1 --auto --right-of eDP-1" -- spawn "xrandr --output eDP-1-1 --primary --auto --output DVI-I-2-1 --auto --left-of eDP-1-1 --output DVI-I-3-2 --auto --right-of eDP-1-1" - spawn "while true; do \n\ - \~/bin/battery; \n\ - \echo -n ' '; \n\ - \~/bin/temp.sh; \n\ - \echo -n ' '; \n\ - \date '+%a, %b %d %T'; \n\ - \sleep 1; \n\ - \done | dzen2 -dock -p -x 1602 -w 325 -h 24 -ta l -fn 'xos4 Terminus:style=Regular:Pixelsize=12' &" - spawn "while true; do \n\ - \~/bin/battery; \n\ - \echo -n ' '; \n\ - \~/bin/temp.sh; \n\ - \echo -n ' '; \n\ - \date '+%a, %b %d %T'; \n\ - \sleep 1; \n\ - \done | dzen2 -dock -p -x 3522 -w 325 -h 24 -ta l -fn 'xos4 Terminus:style=Regular:Pixelsize=12' &" + -- spawn "while true; do \n\ + -- \~/bin/battery; \n\ + -- \echo -n ' '; \n\ + -- \~/bin/temp.sh; \n\ + -- \echo -n ' '; \n\ + -- \date '+%a, %b %d %T'; \n\ + -- \sleep 1; \n\ + -- \done | dzen2 -dock -p -x 1602 -w 325 -h 24 -ta l -fn 'xos4 Terminus:style=Regular:Pixelsize=12' &" + -- spawn "while true; do \n\ + -- \~/bin/battery; \n\ + -- \echo -n ' '; \n\ + -- \~/bin/temp.sh; \n\ + -- \echo -n ' '; \n\ + -- \date '+%a, %b %d %T'; \n\ + -- \sleep 1; \n\ + -- \done | dzen2 -dock -p -x 3522 -w 325 -h 24 -ta l -fn 'xos4 Terminus:style=Regular:Pixelsize=12' &" spawn "while true; do \n\ \~/bin/battery; \n\ \echo -n ' '; \n\ @@ -308,14 +309,36 @@ main = do sc <- IS.countScreens myStartup :: X () -myStartup = do +myStartup = do --setWMName "LG3D" + sc <- IS.countScreens toggleHomeScreens - 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 "xset dpms 600" - --spawn "xautolock -secure -time 10 -locker 'i3lock -c 000000 -i /home/trey/images/black.png'" 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" + + else + return () + +activateMyTerminal :: X () +activateMyTerminal = do + sc <- IS.countScreens + if sc == 1 + then do + windows (viewOnScreen 0 "shell") + else if sc == 3 + then do + windows (viewOnScreen 2 "shell") + else + return () myBitmapsDir = "/home/trey/.xmonad/dzen2" --centerBar = fmap getCenterBar IS.countScreens @@ -404,9 +427,12 @@ myKeys = [ -- ((winKey , xK_l), spawnHere "xscreensaver-command --lock") -- ((winKey , xK_l), spawnHere "qdbus org.kde.krunner /ScreenSaver Lock") , ((winKey , xK_Return), do - windows (viewOnScreen 0 "shell") + ifWindows (resource =? "Alacritty") (mapM_ focus) (spawnHere myTerminal) + activateMyTerminal) + , ((winKey , xK_v), do + ifWindows (resource =? "Alacritty") (mapM_ focus) (spawnHere myTerminal) + activateMyTerminal) --ifWindows (resource =? "main") (mapM_ focus) (spawnHere myTerminal)) - ifWindows (resource =? "Alacritty") (mapM_ focus) (spawnHere myTerminal)) , ((controlMask .|. lAlt, xK_BackSpace), (spawnHere "xfdesktop --quit")) , ((controlMask .|. lAlt, xK_Delete), (spawnHere "pkill -9 chromium")) , ((controlMask .|. shiftMask, xK_Return), (spawnHere myTerminal))