Compare commits

...
2 Commits
Author SHA1 Message Date
Daniele Fucini 4d905774b8 Cap XMonad volume at 100% and clean up config
- Raise volume with wpctl, capped at 100%
- Define workspace names once instead of repeating the strings
- Remove unused imports and the never-matching transmission-gtk rule
- Add missing type signatures
- Document why the isFullscreen rule is needed alongside ewmhFullscreen
2026-10-08 16:11:27 +02:00
Daniele Fucini c7275031ba Make XMonad screen setup adapt to connected monitors
- Match scratchpads by WM_CLASS instead of title, so they no longer
  get shifted to workspace 1 or lose track of their window
- Spawn one xmobar per connected screen (dynamicEasySBs)
- Pick the xrandr layout and tray monitor based on whether HDMI is
  connected, and re-run it on monitor hotplug
- Don't let one failed startup step block the rest
- Make the startup command safe to re-run (no duplicate trayer/picom)
2026-10-08 15:52:58 +02:00
+86 -53
View File
@@ -1,20 +1,17 @@
-- Import -- Import
import Data.Default
import Data.Monoid import Data.Monoid
import Graphics.X11.ExtraTypes.XF86 import Graphics.X11.ExtraTypes.XF86
import Control.Monad (liftM2)
import XMonad import XMonad
import XMonad.Actions.PhysicalScreens import XMonad.Actions.PhysicalScreens
import XMonad.Hooks.DynamicLog
import XMonad.Hooks.EwmhDesktops import XMonad.Hooks.EwmhDesktops
import XMonad.Hooks.FloatConfigureReq
import XMonad.Hooks.InsertPosition
import XMonad.Hooks.ManageDocks import XMonad.Hooks.ManageDocks
import XMonad.Hooks.ManageHelpers import XMonad.Hooks.ManageHelpers
import XMonad.Hooks.Rescreen
import XMonad.Hooks.StatusBar import XMonad.Hooks.StatusBar
import XMonad.Hooks.StatusBar.PP import XMonad.Hooks.StatusBar.PP
import XMonad.Layout.Grid import XMonad.Layout.Grid
import XMonad.Layout.LayoutCombinators
import XMonad.Layout.Magnifier import XMonad.Layout.Magnifier
import XMonad.Layout.NoBorders import XMonad.Layout.NoBorders
import XMonad.Layout.PerWorkspace import XMonad.Layout.PerWorkspace
@@ -36,7 +33,8 @@ main =
xmonad xmonad
. ewmhFullscreen . ewmhFullscreen
. ewmh . ewmh
. withEasySB (xmobar1 <> xmobar2) defToggleStrutsKey . dynamicEasySBs myStatusBars
. addRandrChangeHook (spawn myScreenHotplug)
$ myConfig $ myConfig
-- Variables -- Variables
@@ -58,8 +56,10 @@ myFocusBorderColor = "#41a6b5"
myKeyboardLayoutIT :: String myKeyboardLayoutIT :: String
myKeyboardLayoutIT = " -layout it" myKeyboardLayoutIT = " -layout it"
myKeyboardLayoutUS :: String
myKeyboardLayoutUS = " -layout us" myKeyboardLayoutUS = " -layout us"
myKeyboardLayoutSK :: String
myKeyboardLayoutSK = " -layout sk -variant qwerty" myKeyboardLayoutSK = " -layout sk -variant qwerty"
myScreenshotDir :: String myScreenshotDir :: String
@@ -68,29 +68,46 @@ myScreenshotDir = "/home/fuxino/Pictures/Screenshots/"
myScreenshotName :: String myScreenshotName :: String
myScreenshotName = "Screenshot-%Y-%m-%d-%H%M%S.png" myScreenshotName = "Screenshot-%Y-%m-%d-%H%M%S.png"
-- Sets up the outputs and the wallpaper, and leaves the tray's monitor in $tray
myScreenLayout :: String
myScreenLayout =
"if xrandr --query | grep -q '^HDMI-1-0 connected'; then"
++ " xrandr --output HDMI-1-0 --preferred --primary --output eDP-1 --right-of HDMI-1-0 --preferred; tray=1;"
++ " else xrandr --output eDP-1 --preferred --primary --output HDMI-1-0 --off; tray=0; fi"
++ "; ~/.fehbg"
-- Replaces any running trayer, so there's never more than one
myTrayer :: String
myTrayer =
"pkill -x trayer; while pgrep -x trayer > /dev/null; do sleep 0.1; done; \
\trayer -l --edge top --align right --SetDockType true \
\--SetPartialStrut true --expand true --widthtype request \
\--tint 0x232634 --height 18 --monitor $tray"
-- Safe to re-run (e.g. spawnOnce after this string changes and xmonad restarts)
myScreenSetup :: String myScreenSetup :: String
myScreenSetup = myScreenSetup =
"sleep 1 && xrandr --output HDMI-1-0 --preferred --primary --output eDP-1 --right-of HDMI-1-0 --preferred && ~/.fehbg" "sleep 1; " ++ myScreenLayout ++ "; pgrep -x picom > /dev/null || picom -b -c; " ++ myTrayer
++ " && picom -b -c"
++ " && trayer -l --edge top --align right --SetDockType true \ -- Run when a monitor is (dis)connected; restarts trayer so it moves to the right screen
\--SetPartialStrut true --expand true --widthtype request \ myScreenHotplug :: String
\--tint 0x232634 --height 18 --monitor 1" myScreenHotplug = myScreenLayout ++ "; " ++ myTrayer
myScratchpads :: [NamedScratchpad] myScratchpads :: [NamedScratchpad]
myScratchpads = myScratchpads =
[ NS "Riseup-vpn" "riseup-vpn" (className =? "RiseupVPN") (customFloating $ W.RationalRect 0.15 0.4 0.15 0.4), [ NS "Riseup-vpn" "riseup-vpn" (className =? "RiseupVPN") (customFloating $ W.RationalRect 0.15 0.4 0.15 0.4),
NS "Terminal" spawnTerminal (title =? "kitty-float") (customFloating $ W.RationalRect 0.2 0.2 0.6 0.6), NS "Terminal" spawnTerminal (className =? "scratch-terminal") (customFloating $ W.RationalRect 0.2 0.2 0.6 0.6),
NS "Music" spawnMusic (title =? "ncmpcpp") (customFloating $ W.RationalRect 0.2 0.2 0.6 0.6), NS "Music" spawnMusic (className =? "scratch-music") (customFloating $ W.RationalRect 0.2 0.2 0.6 0.6),
NS "Mail" spawnMail (title =? "mutt") (customFloating $ W.RationalRect 0.2 0.2 0.6 0.6), NS "Mail" spawnMail (className =? "scratch-mail") (customFloating $ W.RationalRect 0.2 0.2 0.6 0.6),
NS "Cal" spawnCal (title =? "calcurse") (customFloating $ W.RationalRect 0.2 0.2 0.6 0.6), NS "Cal" spawnCal (className =? "scratch-cal") (customFloating $ W.RationalRect 0.2 0.2 0.6 0.6),
NS "Btop" spawnBtop (title =? "btop") (customFloating $ W.RationalRect 0.2 0.2 0.6 0.6) NS "Btop" spawnBtop (className =? "scratch-btop") (customFloating $ W.RationalRect 0.2 0.2 0.6 0.6)
] ]
where where
spawnTerminal = myTerminal ++ " -T kitty-float" spawnTerminal = myTerminal ++ " --class scratch-terminal -T kitty-float"
spawnMusic = myTerminal ++ " -T ncmpcpp ncmpcpp" spawnMusic = myTerminal ++ " --class scratch-music -T ncmpcpp ncmpcpp"
spawnMail = myTerminal ++ " -T mutt bash -c 'pushd ~/Downloads > /dev/null; mutt; popd > /dev/null'" spawnMail = myTerminal ++ " --class scratch-mail -T mutt bash -c 'pushd ~/Downloads > /dev/null; mutt; popd > /dev/null'"
spawnCal = myTerminal ++ " -T calcurse calcurse" spawnCal = myTerminal ++ " --class scratch-cal -T calcurse calcurse"
spawnBtop = myTerminal ++ " -T btop btop" spawnBtop = myTerminal ++ " --class scratch-btop -T btop btop"
-- Config -- Config
myConfig = myConfig =
@@ -105,7 +122,8 @@ myConfig =
manageHook = myManageHook, manageHook = myManageHook,
handleEventHook = myHandleEventHook handleEventHook = myHandleEventHook
} }
`additionalKeysP` [ ("M-S-l", spawn "slock"), `additionalKeysP` [ ("M-b", sendMessage ToggleStruts),
("M-S-l", spawn "slock"),
("<Print>", unGrab *> spawn ("scrot " ++ myScreenshotDir ++ myScreenshotName)), ("<Print>", unGrab *> spawn ("scrot " ++ myScreenshotDir ++ myScreenshotName)),
("S-<Print>", unGrab *> spawn ("scrot -s " ++ myScreenshotDir ++ myScreenshotName)), ("S-<Print>", unGrab *> spawn ("scrot -s " ++ myScreenshotDir ++ myScreenshotName)),
("M-S-<Print>", unGrab *> spawn ("scrot -u " ++ myScreenshotDir ++ myScreenshotName)), ("M-S-<Print>", unGrab *> spawn ("scrot -u " ++ myScreenshotDir ++ myScreenshotName)),
@@ -124,7 +142,7 @@ myConfig =
] ]
`additionalKeys` [ ((0, xF86XK_AudioMute), spawn "pactl set-sink-mute $(pactl get-default-sink) toggle"), `additionalKeys` [ ((0, xF86XK_AudioMute), spawn "pactl set-sink-mute $(pactl get-default-sink) toggle"),
((0, xF86XK_AudioLowerVolume), spawn "pactl set-sink-volume $(pactl get-default-sink) -10%"), ((0, xF86XK_AudioLowerVolume), spawn "pactl set-sink-volume $(pactl get-default-sink) -10%"),
((0, xF86XK_AudioRaiseVolume), spawn "pactl set-sink-volume $(pactl get-default-sink) +10%"), ((0, xF86XK_AudioRaiseVolume), spawn "wpctl set-volume -l 1.0 @DEFAULT_AUDIO_SINK@ 10%+"),
((0, xF86XK_Calculator), spawn "qalculate-gtk"), ((0, xF86XK_Calculator), spawn "qalculate-gtk"),
((0, xF86XK_HomePage), spawn myBrowser), ((0, xF86XK_HomePage), spawn myBrowser),
((0, xF86XK_Mail), namedScratchpadAction myScratchpads "Mail"), ((0, xF86XK_Mail), namedScratchpadAction myScratchpads "Mail"),
@@ -137,10 +155,19 @@ myConfig =
-- Workspaces -- Workspaces
myWorkspaces :: [String] myWorkspaces :: [String]
myWorkspaces = ["1:\xf489 ", "2:\xe743 ", "3:\xf1b6 ", "4:\xf10b ", "5:\xead9 ", "6:\xeb69 ", "7:\xea7a "] ++ map show [8, 9] myWorkspaces = [wsTerm, wsWeb, wsGames, wsChat, wsMedia, wsDocs, wsVM] ++ map show [8, 9]
wsTerm, wsWeb, wsGames, wsChat, wsMedia, wsDocs, wsVM :: String
wsTerm = "1:\xf489 "
wsWeb = "2:\xe743 "
wsGames = "3:\xf1b6 "
wsChat = "4:\xf10b "
wsMedia = "5:\xead9 "
wsDocs = "6:\xeb69 "
wsVM = "7:\xea7a "
-- Layout -- Layout
myLayoutHook = onWorkspace "2:\xe743 " myWebLayout $ onWorkspace "3:\xf1b6 " myGamesLayout $ onWorkspace "5:\xead9 " myVideoLayout myDefaultLayout myLayoutHook = onWorkspace wsWeb myWebLayout $ onWorkspace wsGames myGamesLayout $ onWorkspace wsMedia myVideoLayout myDefaultLayout
where where
myWebLayout = avoidStruts $ renamed [CutWordsLeft 1] $ spacingWithEdge 3 $ myTabbed ||| tiled ||| Mirror tiled ||| threeCol ||| Grid ||| spiral 0.856 myWebLayout = avoidStruts $ renamed [CutWordsLeft 1] $ spacingWithEdge 3 $ myTabbed ||| tiled ||| Mirror tiled ||| threeCol ||| Grid ||| spiral 0.856
myGamesLayout = avoidStruts $ smartBorders Full myGamesLayout = avoidStruts $ smartBorders Full
@@ -164,9 +191,13 @@ myLayoutHook = onWorkspace "2:\xe743 " myWebLayout $ onWorkspace "3:\xf1b6 " myG
delta = 3 / 100 delta = 3 / 100
-- Xmobar -- Xmobar
xmobar1 = statusBarProp "xmobar -x 0 ~/.config/xmobar/xmobarrc_hdmi" (pure myXmobarPP) -- One bar per connected screen. The laptop config leaves room for trayer, so it
-- goes on the laptop screen, which is screen 1 with HDMI and screen 0 without.
xmobar2 = statusBarProp "xmobar -x 1 ~/.config/xmobar/xmobarrc_laptop" (pure myXmobarPP) myStatusBars :: ScreenId -> X StatusBarConfig
myStatusBars (S i) = do
nScreens <- gets (length . W.screens . windowset)
let rc = if nScreens > 1 && i /= 1 then "xmobarrc_hdmi" else "xmobarrc_laptop"
pure $ statusBarProp ("xmobar -x " ++ show i ++ " ~/.config/xmobar/" ++ rc) (pure myXmobarPP)
myXmobarPP :: PP myXmobarPP :: PP
myXmobarPP = myXmobarPP =
@@ -211,49 +242,51 @@ myStartupHook = do
spawnOnce "blueman-applet" spawnOnce "blueman-applet"
spawnOnce "mousemove" spawnOnce "mousemove"
spawnOnce "adb start-server" spawnOnce "adb start-server"
spawnOnce "/home/fuxino/.local/bin/discover-overlay-wait"
-- Manage hook -- Manage hook
myManageHook :: ManageHook myManageHook :: ManageHook
myManageHook = myManageHook =
composeAll composeAll
[ className =? "Gpodder" --> doShift "5:\xead9 ", [ className =? "Gpodder" --> doShift wsMedia,
className =? "An Anime Game Launcher" --> doShift "3:\xf1b6 ", className =? "An Anime Game Launcher" --> doShift wsGames,
className =? "Qalculate-gtk" --> doFloat, className =? "Qalculate-gtk" --> doFloat,
title =? "Genshin Impact" --> doShift "3:\xf1b6 ", title =? "Genshin Impact" --> doShift wsGames,
className =? "Signal" --> doShift "4:\xf10b ", className =? "Signal" --> doShift wsChat,
className =? "Spotify" --> doShift "5:\xead9 ", className =? "Spotify" --> doShift wsMedia,
className =? "Transmission-gtk" --> doShift "2:\xe743 ", className =? "Transmission-gtk" --> doShift wsWeb,
className =? "Viewnior" --> doFloat, className =? "Viewnior" --> doFloat,
className =? "Vivaldi-stable" --> doShift "2:\xe743 ", className =? "Vivaldi-stable" --> doShift wsWeb,
className =? "Xmessage" --> doFloat, className =? "Xmessage" --> doFloat,
className =? "Xreader" --> doShift "6:\xeb69 ", className =? "Xreader" --> doShift wsDocs,
className =? "calibre" --> doShift "6:\xeb69 ", className =? "calibre" --> doShift wsDocs,
className =? "discord" --> doShift "4:\xf10b ", className =? "discord" --> doShift wsChat,
className =? "explorer.exe" --> doShift "3:\xf1b6 ", className =? "explorer.exe" --> doShift wsGames,
className =? "feh" --> doFloat, className =? "feh" --> doFloat,
title =? "glxgears" --> doFloat, title =? "glxgears" --> doFloat,
className =? "library_manager" --> doShift "6:\xeb69 ", className =? "library_manager" --> doShift wsDocs,
className =? "libreoffice-calc" --> doShift "6:\xeb69 ", className =? "libreoffice-calc" --> doShift wsDocs,
className =? "libreoffice-writer" --> doShift "6:\xeb69 ", className =? "libreoffice-writer" --> doShift wsDocs,
className =? "mpv" --> doFullFloat, className =? "mpv" --> doFullFloat,
className =? "mpv" --> doShift "5:\xead9 ", className =? "mpv" --> viewShift wsMedia,
className =? "FreeTube" --> doShift "5:\xead9 ", className =? "freetube" --> doShift wsMedia,
className =? myTerminal --> doShift "1:\xf489 ", className =? myTerminal --> doShift wsTerm,
className =? "scrcpy" --> doShift "5:\xead9 ", className =? "scrcpy" --> doShift wsMedia,
className =? "steam" --> doShift "3:\xf1b6 ", className =? "steam" --> doShift wsGames,
className =? "steam_app_109600" --> doFloat, className =? "steam_app_109600" --> doFloat,
className =? "steam_app_109600" --> doShift "3:\xf1b6 ", className =? "steam_app_109600" --> doShift wsGames,
className =? "steam_app_289070" --> doFloat, className =? "steam_app_289070" --> doFloat,
className =? "steam_app_289070" --> doShift "3:\xf1b6 ", className =? "steam_app_289070" --> doShift wsGames,
className =? "transmission-gtk" --> doShift "2:\xe743 ", className =? "VirtualBox Machine" --> doShift wsVM,
className =? "VirtualBox Machine" --> doShift "7:\xea7a ",
className =? "VirtualBox Machine" --> doFullFloat, className =? "VirtualBox Machine" --> doFullFloat,
className =? "VirtualBox Manager" --> doShift "7:\xea7a ", className =? "VirtualBox Manager" --> doShift wsVM,
className =? "zen" --> doShift "2:\xe743 ", className =? "zen" --> doShift wsWeb,
isDialog --> doFloat, isDialog --> doFloat,
-- Windows that open already fullscreen; ewmhFullscreen only handles later requests
isFullscreen --> doFullFloat isFullscreen --> doFullFloat
] ]
<+> namedScratchpadManageHook myScratchpads <+> namedScratchpadManageHook myScratchpads
where viewShift = doF . liftM2 (.) W.greedyView W.shift
-- Handle event hook -- Handle event hook
myHandleEventHook :: Event -> X All myHandleEventHook :: Event -> X All