diff --git a/home/alex/home.nix b/home/alex/home.nix
index 80ccc81..77e01e6 100644
--- a/home/alex/home.nix
+++ b/home/alex/home.nix
@@ -1,10 +1,7 @@
 { config, lib, pkgs, ... }:
 
 {
-  imports = [
-    ./cli.nix
-    # ./programs/xmonad/default.nix
-  ];
+  imports = [ ./cli.nix ];
 
   home = {
     homeDirectory = "/home/alex";
diff --git a/home/alex/programs/xmonad/default.nix b/home/alex/programs/xmonad/default.nix
index 49af6ae..7fc15af 100644
--- a/home/alex/programs/xmonad/default.nix
+++ b/home/alex/programs/xmonad/default.nix
@@ -2,10 +2,11 @@
 
 {
   xsession = {
-    windowManager.command = let
-      xmonad = pkgs.xmonad-with-packages.override {
-        packages = self: [ self.xmonad-contrib ];
-      };
-    in "${xmonad}/bin/xmonad";
+    windowManager.xmonad = {
+      enable = true;
+      enableContribAndExtra = true;
+      extraPackages = hp: [ hp.dbus hp.monad-logger hp.xmonad-contrib ];
+      config = ./config.hs;
+    };
   };
 }
diff --git a/modules/wm/xmonad.nix b/modules/wm/xmonad.nix
index dbb4945..392b324 100644
--- a/modules/wm/xmonad.nix
+++ b/modules/wm/xmonad.nix
@@ -2,6 +2,7 @@
 
 {
   services = {
+    gnome.gnome-keyring.enable = true;
     upower.enable = true;
 
     xserver = {