From 66f85c7d7e199136359ef1794455ba62f7beed30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Mon, 19 May 2025 10:08:09 +0200 Subject: [PATCH] nix/xmonad: upstream is bumped to 0.18.1 --- nix/configurations/tungsten/nixos/gui.nix | 6 +----- nix/configurations/vanadium/nixos/gui.nix | 6 +----- nix/environments/haskell.nix | 5 +---- 3 files changed, 3 insertions(+), 14 deletions(-) diff --git a/nix/configurations/tungsten/nixos/gui.nix b/nix/configurations/tungsten/nixos/gui.nix index f2c413ae..4dca22d5 100644 --- a/nix/configurations/tungsten/nixos/gui.nix +++ b/nix/configurations/tungsten/nixos/gui.nix @@ -1,11 +1,7 @@ {pkgs, ...}: { services.xserver.windowManager.xmonad = { enable = true; - extraPackages = hs: [ - # https://github.com/ValveSoftware/steam-for-linux/issues/9376 - # opt into 0.18.1 specifically - hs.xmonad-contrib_0_18_1 - ]; + enableContribAndExtras = true; }; services.xserver = { diff --git a/nix/configurations/vanadium/nixos/gui.nix b/nix/configurations/vanadium/nixos/gui.nix index f2c413ae..4dca22d5 100644 --- a/nix/configurations/vanadium/nixos/gui.nix +++ b/nix/configurations/vanadium/nixos/gui.nix @@ -1,11 +1,7 @@ {pkgs, ...}: { services.xserver.windowManager.xmonad = { enable = true; - extraPackages = hs: [ - # https://github.com/ValveSoftware/steam-for-linux/issues/9376 - # opt into 0.18.1 specifically - hs.xmonad-contrib_0_18_1 - ]; + enableContribAndExtras = true; }; services.xserver = { diff --git a/nix/environments/haskell.nix b/nix/environments/haskell.nix index c92ca7e0..e068c355 100644 --- a/nix/environments/haskell.nix +++ b/nix/environments/haskell.nix @@ -10,10 +10,7 @@ buildEnv { # XMonad # (haskellPackages.ghcWithPackages (self: [ - # https://github.com/ValveSoftware/steam-for-linux/issues/9376 - # opt into 0.18.1 specifically - self.xmonad-contrib_0_18_1 - + self.xmonad-contrib self.xmonad-extras ])) haskell-language-server