diff --git a/desktop/sddm-unstable.nix b/desktop/sddm-unstable.nix index 726be63..a1cbb65 100644 --- a/desktop/sddm-unstable.nix +++ b/desktop/sddm-unstable.nix @@ -3,14 +3,21 @@ with lib; let cfg = config.aviallon.desktop; in { - disabledModules = [ "services/x11/display-managers/sddm.nix" ]; + disabledModules = [ + "services/x11/display-managers/sddm.nix" + "services/x11/display-managers/default.nix" + "services/x11/window-managers/default.nix" + ]; imports = [ - (import (nixpkgs-unstable + /nixos/modules/services/x11/display-managers/sddm.nix)) + (import (nixpkgs-unstable + /nixos/modules/services/display-managers/sddm.nix)) + (import (nixpkgs-unstable + /nixos/modules/services/display-managers/default.nix)) + (import (nixpkgs-unstable + /nixos/modules/services/x11/window-managers/default.nix)) + (mkRenamedOptionModule [ "services" "xserver" "displayManager" "session" ] [ "services" "displayManager" "session" ]) ]; config = { - services.xserver.displayManager.sddm.wayland.compositor = "kwin"; + services.displayManager.sddm.wayland.compositor = "kwin"; nixpkgs.overlays = [ (final: prev: {