diff --git a/desktop/sddm-unstable.nix b/desktop/sddm-unstable.nix deleted file mode 100644 index a1cbb65..0000000 --- a/desktop/sddm-unstable.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ config, nixpkgs-unstable, lib, pkgs, ... }: -with lib; -let - cfg = config.aviallon.desktop; -in { - 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/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.displayManager.sddm.wayland.compositor = "kwin"; - - nixpkgs.overlays = [ - (final: prev: { - sddm = final.libsForQt5.sddm; - libsForQt5 = prev.libsForQt5.overrideScope (f: p: { - sddm = f.callPackage (import (nixpkgs-unstable + /pkgs/applications/display-managers/sddm)) {}; - }); - kdePackages = final.libsForQt5; - }) - ]; - }; -} diff --git a/desktop/sddm.nix b/desktop/sddm.nix index 14ff319..8799f61 100644 --- a/desktop/sddm.nix +++ b/desktop/sddm.nix @@ -7,30 +7,17 @@ in { options.aviallon.desktop.sddm.unstable = mkEnableOption "bleeding-edge SDDM"; options.aviallon.desktop.sddm.enable = mkEnableOption "custom SDDM configuration"; - imports = [ ./sddm-unstable.nix ]; - config = mkIf cfg.sddm.enable { - # Delete SDDM QMLCache - systemd.tmpfiles.rules = mkAfter [ - "e ${config.users.users.sddm.home}/.cache/sddm-greeter/qmlcache/ - - - 0" - ]; - # Prevents blinking cursor - services.xserver.displayManager.sddm = { + services.displayManager.sddm = { enable = true; wayland.enable = mkDefault true; + wayland.compositor = "kwin"; settings = { - /*General.GreeterEnvironment = mkIf sddmCfg.wayland.enable (concatStringsSep "," [ - "QT_WAYLAND_SHELL_INTEGRATION=layer-shell" - "QT_QPA_PLATFORM=wayland" - ]);*/ Theme = { CursorTheme = "breeze_cursors"; }; - /*Wayland = mkIf sddmCfg.wayland.enable { - CompositorCommand = mkOverride 60 "${pkgs.libsForQt5.kwin}/bin/kwin_wayland --drm --no-lockscreen --no-global-shortcuts --locale1"; - };*/ }; };