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"; 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"; }; } 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 = {