Bump xmonad-contrib, fix Steam

pdalpra · Oct 27, 2024 · 487cf79 · 487cf79
1 parent 5ceadb2
commit 487cf79
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 3 deletions.
diff --git a/home/modules/wm/xmonad-config/lib/WindowRules.hs b/home/modules/wm/xmonad-config/lib/WindowRules.hs
@@ -6,13 +6,16 @@ import Data.Ratio ((%))
 import Workspaces hiding (setup)
 import XMonad
 import XMonad.Hooks.ManageHelpers
+import XMonad.Prelude
 import XMonad.StackSet
+import XMonad.Util.Hacks
 
 
 setup :: XConfig l -> XConfig l
 setup c =
   c
     { manageHook = windowRules <+> c.manageHook
+    , handleEventHook = hacks <> c.handleEventHook
     }
 
 
@@ -28,3 +31,7 @@ windowRules =
     ]
   where
     smallCenteredFloat = doRectFloat (RationalRect (1 % 3) (1 % 3) (1 % 3) (1 % 3))
+
+
+hacks :: Event -> X All
+hacks = windowedFullscreenFixEventHook <> fixSteamFlicker
diff --git a/home/modules/wm/xmonad-config/lib/Workspaces.hs b/home/modules/wm/xmonad-config/lib/Workspaces.hs
@@ -148,7 +148,7 @@ workspacesLayout c =
     toggleFullScreen = mkToggle $ single NBFULL
     dropSpacingLabel = renamed [CutWordsLeft 1]
     layout = layoutHook def
-    codeLayout = Tall 1 (1 / 2) (2 / 3) ||| Full
+    codeLayout = Tall 1 (5 / 100) (2 / 3) ||| Full
     webLayout = forWorkspace web (tabs ||| Full)
     mailLayout = forWorkspace mail Full
     chatLayout = forWorkspace chat (tabs ||| Full)

diff --git a/home/modules/wm/xmonad-config/xmonad-config.cabal b/home/modules/wm/xmonad-config/xmonad-config.cabal
@@ -19,7 +19,7 @@ executable config
     WindowRules
     Workspaces
 
-  ghc-options:      -Wall -Whi-shadowing -Wname-shadowing
+  ghc-options:      -Wall -Wname-shadowing
   build-depends:
     , base            ^>=4.18.0
     , dbus            ^>=1.2.0

diff --git a/home/modules/wm/xmonad.nix b/home/modules/wm/xmonad.nix
@@ -57,11 +57,12 @@ in
 
     windowManager.xmonad = {
       inherit libFiles;
+      inherit (pkgs.unstable) haskellPackages;
 
       enable = true;
       config = ./xmonad-config/config.hs;
       extraPackages = hp: with hp; [
-        xmonad-contrib
+        xmonad-contrib_0_18_1
         dbus
       ];
     };