alex: Prepare to load xmonad by default

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";

home/alex/programs/xmonad/default.nix

@@ -2,11 +2,10 @@
 
 {
   xsession = {
-    windowManager.xmonad = {
+    windowManager.command = let
-      enable = true;
+      xmonad = pkgs.xmonad-with-packages.override {
-      enableContribAndExtra = true;
+        packages = self: [ self.xmonad-contrib ];
-      extraPackages = hp: [ hp.dbus hp.monad-logger hp.xmonad-contrib ];
+      };
-      config = ./config.hs;
+    in "${xmonad}/bin/xmonad";
-    };
   };
 }

modules/wm/xmonad.nix

@@ -2,7 +2,6 @@
 
 {
   services = {
-    gnome.gnome-keyring.enable = true;
     upower.enable = true;
 
     xserver = {