From 3c6f676b59300c4162e95a9729d8686f643e00a9 Mon Sep 17 00:00:00 2001
From: Alexander Kobjolke <me@failco.de>
Date: Mon, 5 Feb 2024 21:15:54 +0100
Subject: [PATCH 1/3] dregil: Disable gnome-keyring on xmonad

---
 modules/wm/xmonad.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/modules/wm/xmonad.nix b/modules/wm/xmonad.nix
index 392b324..dbb4945 100644
--- a/modules/wm/xmonad.nix
+++ b/modules/wm/xmonad.nix
@@ -2,7 +2,6 @@
 
 {
   services = {
-    gnome.gnome-keyring.enable = true;
     upower.enable = true;
 
     xserver = {

From 61d36c4c5cf6c4d1715e2df6eb8b1ce268622b90 Mon Sep 17 00:00:00 2001
From: Alexander Kobjolke <me@failco.de>
Date: Mon, 5 Feb 2024 21:16:34 +0100
Subject: [PATCH 2/3] xmonad: Run xmonad as xsession command

---
 home/alex/programs/xmonad/default.nix | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/home/alex/programs/xmonad/default.nix b/home/alex/programs/xmonad/default.nix
index 7fc15af..49af6ae 100644
--- a/home/alex/programs/xmonad/default.nix
+++ b/home/alex/programs/xmonad/default.nix
@@ -2,11 +2,10 @@
 
 {
   xsession = {
-    windowManager.xmonad = {
-      enable = true;
-      enableContribAndExtra = true;
-      extraPackages = hp: [ hp.dbus hp.monad-logger hp.xmonad-contrib ];
-      config = ./config.hs;
-    };
+    windowManager.command = let
+      xmonad = pkgs.xmonad-with-packages.override {
+        packages = self: [ self.xmonad-contrib ];
+      };
+    in "${xmonad}/bin/xmonad";
   };
 }

From 1f2545df5b8b3398af333109f7c816d18d042f91 Mon Sep 17 00:00:00 2001
From: Alexander Kobjolke <me@failco.de>
Date: Mon, 5 Feb 2024 21:17:07 +0100
Subject: [PATCH 3/3] alex: Prepare to load xmonad by default

---
 home/alex/home.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/home/alex/home.nix b/home/alex/home.nix
index 77e01e6..80ccc81 100644
--- a/home/alex/home.nix
+++ b/home/alex/home.nix
@@ -1,7 +1,10 @@
 { config, lib, pkgs, ... }:
 
 {
-  imports = [ ./cli.nix ];
+  imports = [
+    ./cli.nix
+    # ./programs/xmonad/default.nix
+  ];
 
   home = {
     homeDirectory = "/home/alex";