From 35271fd1227c0263fa69c691ba432dc0e0a3a66c Mon Sep 17 00:00:00 2001
From: Mikhail Klementev <blame@dumpstack.io>
Date: Sat, 17 Dec 2022 17:49:44 +0000
Subject: [PATCH] Build xmonad with home-manager

---
 desktop.nix      | 4 ----
 home-manager.nix | 9 +++++++--
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/desktop.nix b/desktop.nix
index fe5385f..d2401a7 100644
--- a/desktop.nix
+++ b/desktop.nix
@@ -13,10 +13,6 @@ in {
     enable = true;
     layout = "us,ru"; # see also home-manager.nix
     xkbOptions = "ctrl:nocaps,grp:rctrl_toggle"; # see also home-manager.nix
-    windowManager.xmonad = {
-      enable = true;
-      enableContribAndExtras = true;
-    };
     dpi = 282;   # 15.6 inch, 3840x2160, comment out in case of nvidia
   };
 
diff --git a/home-manager.nix b/home-manager.nix
index 79fc34d..c60a043 100644
--- a/home-manager.nix
+++ b/home-manager.nix
@@ -128,7 +128,6 @@ in {
 
     home.file = {
       ".emacs.d/init.el".source = ./etc/emacs.el;
-      ".xmonad/xmonad.hs".source = ./etc/xmonad.hs;
 
       ".mutt/mailcap".source = ./etc/mutt/mailcap;
       ".mutt/muttrc".source = ./etc/mutt/muttrc;
@@ -149,7 +148,13 @@ in {
 
     xsession = {
       enable = true;
-      windowManager.command = "exec xmonad";
+      windowManager.xmonad = {
+        enable = true;
+        config = pkgs.writeText "xmonad.hs" (builtins.readFile ./etc/xmonad.hs);
+        extraPackages = haskellPackages: [
+          haskellPackages.xmonad-contrib
+        ];
+      };
       initExtra = ''
         touchpad=$(xinput | grep -o 'Synaptics.*id=[0-9]*' | cut -d '=' -f 2)
         trackpoint=$(xinput | grep -o 'TrackPoint.*id=[0-9]*' | cut -d '=' -f 2)