diff --git a/xmonad.hs b/xmonad.hs index 281c62a..dce5297 100755 --- a/xmonad.hs +++ b/xmonad.hs @@ -99,7 +99,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 1615 -w 325 -u -h 24 -ta l -sa c &" + \done | dzen2 -dock -p -x 1615 -w 325 -u -h 24 -ta l -sa c -fn 'xos4 Terminus:Regular:Pixelsize=12' &" else if sc == 3 then do @@ -112,7 +112,7 @@ toggleHomeScreens = do \echo -n ' '; \n\ \date '+%a, %b %d %T'; \n\ \sleep 1; \n\ - \done | dzen2 -dock -p -x 1680 -w 255 -h 24 -ta l -fg #aaaaaa -bg #000000 -fn Terminus-10 &" + \done | dzen2 -dock -p -x 1680 -w 255 -h 24 -ta l -fg #aaaaaa -bg #000000 -fn 'xos4 Terminus:Regular:Pixelsize=12' &" spawn "while true; do \n\ \~/bin/battery; \n\ \echo -n ' '; \n\ @@ -120,7 +120,7 @@ toggleHomeScreens = do \echo -n ' '; \n\ \date '+%a, %b %d %T'; \n\ \sleep 1; \n\ - \done | dzen2 -dock -p -x 3600 -w 255 -h 24 -ta l -fg #aaaaaa -bg #000000 -fn Terminus-10 &" + \done | dzen2 -dock -p -x 3600 -w 255 -h 24 -ta l -fg #aaaaaa -bg #000000 -fn 'xos4 Terminus:Regular:Pixelsize=12' &" spawn "while true; do \n\ \~/bin/battery; \n\ \echo -n ' '; \n\ @@ -128,7 +128,7 @@ toggleHomeScreens = do \echo -n ' '; \n\ \date '+%a, %b %d %T'; \n\ \sleep 1; \n\ - \done | dzen2 -dock -p -x 5520 -w 255 -h 24 -ta l -fg #aaaaaa -bg #000000 -fn Terminus-10 &" + \done | dzen2 -dock -p -x 5520 -w 255 -h 24 -ta l -fg #aaaaaa -bg #000000 -fn 'xos4 Terminus:Regular:Pixelsize=12' &" {- spawn "while true; do echo -n $(cat /tmp/temp); echo -n ' '; date '+%a, %b %d %T'; sleep 1; done | dzen2 -dock -p -x 1710 -w 210 -e 'onstart:lower;button2=togglehide' -h 24 -ta l -fg #aaaaaa -bg #000000 -fn Terminus-10 -xs 1 &" spawn "while true; do echo -n $(cat /tmp/temp); echo -n ' '; date '+%a, %b %d %T'; sleep 1; done | dzen2 -dock -p -x 3630 -w 210 -e 'onstart:lower;button2=togglehide' -h 24 -ta l -fg #aaaaaa -bg #000000 -fn Terminus-10 -xs 0 &" spawn "while true; do echo -n $(cat /tmp/temp); echo -n ' '; date '+%a, %b %d %T'; sleep 1; done | dzen2 -dock -p -x 5550 -w 210 -e 'onstart:lower;button2=togglehide' -h 24 -ta r -fg #aaaaaa -bg #000000 -fn Terminus-10 -xs 2 &" -} @@ -228,7 +228,7 @@ main = do -- dzenLeftBar <- spawnPipe leftBar -- dzenRightBar <- spawnPipe rightBar xmonad $ docks $ ewmh $ desktopConfig { - workspaces = ["shell","spideroak","chromium","pindrop","kofc","bitcoin"] + workspaces = ["shell","spideroak","vivaldi","pindrop","kofc","bitcoin"] , terminal = myTerminal , focusFollowsMouse = True , manageHook = manageDocks <+> myManageHook <+> manageHook desktopConfig @@ -250,11 +250,11 @@ myStartup = do spawn "trayer --edge top --align right --widthtype request --margin 325 --expand false --align right --SetDockType true --SetPartialStrut false --tint 0x000000 --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'" + spawn "xautolock -secure -time 10 -locker 'i3lock -c 000000 -i /home/trey/images/black.png'" myBitmapsDir = "/home/trey/.xmonad/dzen2" --leftBar = "dzen2 -w 0 -h 24 -ta l -fg #555753 -bg #000000 -fn Terminus-10 -xs 1" -centerBar = "dzen2 -dock -p -x 1921 -ta l -w 960 -e 'onstart:lower;button2=togglehide' -fg #555753 -bg #000000 -fn 'xos4 Terminus:style=Regular:size=16'" +centerBar = "dzen2 -dock -p -x 1921 -ta l -w 960 -e 'onstart:lower;button2=togglehide' -fg #555753 -bg #000000 -fn 'xos4 Terminus:style=Regular:size=12,xftSymbola'" -- rightBar = "dzen2 -w 3840 -h 24 -ta r -fg #555753 -bg #000000 -fn Terminus-10 -xs 2" myLogHook :: Handle -> X () @@ -292,10 +292,10 @@ winKey :: KeyMask-} --myTerminal :: String --myTerminal = "konsole" -myTerminal = "ssh-agent urxvtc -cd ~" ---myTerminal = "terminology" +--myTerminal = "ssh-agent urxvtc -cd ~" +myTerminal = "alacritty" --myTerminal = "terminator" -altTerminal = "urxvtc -cd ~ -name altUrxvt" +--altTerminal = "urxvtc -cd ~ -name altUrxvt4 --myTerminal = "gnome-terminal" --myTerminal = "terminator" @@ -329,7 +329,7 @@ myKeys = [ --, ((winKey , xK_l), spawnHere "xscreensaver-command --lock && sleep 3 && xset dpms force off") --, ((winKey , xK_l), spawnHere "gnome-screensaver-command --lock && sleep 10 && xset dpms force off") --, ((winKey , xK_l), spawnHere "dm-tool lock") - , ((winKey , xK_l), spawnHere "i3lock --color 000000 && sleep 3 && xset dpms force off") + , ((winKey , xK_l), spawnHere "i3lock --color 000000 -i /home/trey/images/black.png && sleep 3 && xset dpms force off") -- , ((winKey , xK_l), spawnHere "light-locker-command --lock && sleep 10 && xset dpms force off") -- , ((winKey , xK_l), spawnHere "dm-tool lock && sleep 3 && xset dpms force off") -- ((winKey , xK_l), spawnHere "xscreensaver-command --lock") @@ -337,7 +337,7 @@ myKeys = [ , ((winKey , xK_Return), do windows (viewOnScreen 0 "shell") --ifWindows (resource =? "main") (mapM_ focus) (spawnHere myTerminal)) - ifWindows (resource =? "urxvt") (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)) @@ -369,8 +369,8 @@ myKeys = [ --, ((winKey , xK_i), spawnHere "clementine") , ((winKey , xK_i), ifWindows (className =? "Clementine") (mapM_ killWindow) (spawnHere "clementine")) -- , ((winKey , xK_d ), ifWindows (className =? "Goldendict") (mapM_ killWindow) (spawnHere "goldendict")) - , ((winKey , xK_d), ifWindows (className =? "Xfce4-dict") (mapM_ killWindow) (spawnHere "xfce4-dict")) --- , ((winKey , xK_d), ifWindows (className =? "Gnome-dictionary") (mapM_ killWindow) (spawnHere "gnome-dictionary")) +-- , ((winKey , xK_d), ifWindows (className =? "Xfce4-dict") (mapM_ killWindow) (spawnHere "xfce4-dict")) + , ((winKey , xK_d), ifWindows (className =? "Gnome-dictionary") (mapM_ killWindow) (spawnHere "gnome-dictionary")) , ((winKey , xK_f), spawnHere (myTerminal ++ " -e vifm . ~")) --, ((winKey , xK_f), spawnHere ("export SHELL=/bin/bash && " ++ myTerminal ++ " -e mc")) --, ((winKey , xK_e), spawnHere ("export SHELL=/bin/bash && " ++ myTerminal ++ " -e mc")) -- key stroke matches Win+E (from Win7) @@ -415,20 +415,24 @@ myKeys = [ , ((0, xF86XK_Calculator), ifWindows (className =? "Gnome-calculator") (mapM_ killWindow) (spawnHere "gnome-calculator")) , ((0, xF86XK_AudioPlay), spawn "clementine --play-pause") --, ((0, xF86XK_AudioMute), spawn "amixer -c 0 set Master toggle") - , ((0, xF86XK_AudioMute), spawn "/home/trey/bin/mute") - , ((0, xF86XK_AudioRaiseVolume), spawn "amixer -c 0 set Master 5dB+") - , ((0, xF86XK_AudioLowerVolume), spawn "amixer -c 0 set Master 5dB-") + , ((0, xF86XK_AudioMute), spawn "pamixer --toggle-mute") + , ((0, xF86XK_AudioRaiseVolume), spawn "pamixer --increase 5") + , ((0, xF86XK_AudioLowerVolume), spawn "pamixer --decrease 5") + , ((0, xF86XK_MonBrightnessUp), spawn "sudo xbacklight -inc 5") + , ((0, xF86XK_MonBrightnessDown), spawn "sudo xbacklight -dec 5") -- , ((winKey .|. controlMask, xK_Left), shiftToPrev >> prevWS) -- , ((winKey .|. controlMask, xK_Right), shiftToNext >> nextWS) , ((winKey .|. controlMask, xK_h), sendMessage Shrink) , ((winKey .|. lAlt, xK_h), do --windows (viewOnScreen 1 "hng") - windows (viewOnScreen 1 "chromium") - ifWindows (className =? "Chromium") (mapM_ focus) (spawnHere "chromium")) + --windows (viewOnScreen 1 "chromium") + --ifWindows (className =? "Chromium") (mapM_ focus) (spawnHere "chromium")) + windows (viewOnScreen 1 "vivaldi") + ifWindows (className =? "Vivaldi-stable") (mapM_ focus) (spawnHere "vivaldi-stable")) --ifWindows (className =? "Iceweasel") (mapM_ focus) (spawnHere "iceweasel")) , ((winKey .|. controlMask, xK_l), sendMessage Expand) --, ((winKey , xK_1), windows (viewOnScreen 0 "shell")) - , ((winKey , xK_1), ifWindows (resource =? "urxvt") (mapM_ focus) (spawnHere myTerminal)) + , ((winKey , xK_1), ifWindows (className =? "Alacritty") (mapM_ focus) (spawnHere myTerminal)) , ((winKey , xK_2), windows (viewOnScreen 0 "chromium")) , ((winKey , xK_a), do windows (viewOnScreen 1 "pindrop")