diff options
author | Pasquale <p3dimaria@hotmail.it> | 2020-10-09 00:18:26 +0200 |
---|---|---|
committer | Peter Hoeg <peter@hoeg.com> | 2021-10-15 09:20:13 +0800 |
commit | 4832352d023fdd9546748f33c499034d722382ba (patch) | |
tree | 22f52861cd55265ab2fffa5b0e99fd3b9e2966cc | |
parent | 001f61426cefbc0304f78b47ae99f8455b8e00ac (diff) | |
download | nixpkgs-4832352d023fdd9546748f33c499034d722382ba.tar nixpkgs-4832352d023fdd9546748f33c499034d722382ba.tar.gz nixpkgs-4832352d023fdd9546748f33c499034d722382ba.tar.bz2 nixpkgs-4832352d023fdd9546748f33c499034d722382ba.tar.lz nixpkgs-4832352d023fdd9546748f33c499034d722382ba.tar.xz nixpkgs-4832352d023fdd9546748f33c499034d722382ba.tar.zst nixpkgs-4832352d023fdd9546748f33c499034d722382ba.zip |
nixos/plasma: use upstream xsession/wayland files
-rw-r--r-- | nixos/modules/services/x11/desktop-managers/plasma5.nix | 11 | ||||
-rw-r--r-- | nixos/tests/plasma5.nix | 2 | ||||
-rw-r--r-- | pkgs/desktops/plasma-5/plasma-workspace/default.nix | 1 |
3 files changed, 5 insertions, 9 deletions
diff --git a/nixos/modules/services/x11/desktop-managers/plasma5.nix b/nixos/modules/services/x11/desktop-managers/plasma5.nix index e418195e1a7..e1a3cdbea04 100644 --- a/nixos/modules/services/x11/desktop-managers/plasma5.nix +++ b/nixos/modules/services/x11/desktop-managers/plasma5.nix @@ -136,9 +136,6 @@ let fi fi - '' - + '' - exec "${startplasma-x11}" ''; in @@ -183,6 +180,7 @@ in config = mkMerge [ (mkIf cfg.enable { + # Seed our configuration into nixos-generate-config system.nixos-generate-config.desktopConfiguration = ['' # Enable the Plasma 5 Desktop Environment. @@ -190,11 +188,7 @@ in services.xserver.desktopManager.plasma5.enable = true; '']; - services.xserver.desktopManager.session = singleton { - name = "plasma5"; - bgSupport = true; - start = startplasma; - }; + services.xserver.displayManager.sessionPackages = [ pkgs.libsForQt5.plasma5.plasma-workspace ]; security.wrappers = { kcheckpass = @@ -389,6 +383,7 @@ in # Update the start menu for each user that is currently logged in system.userActivationScripts.plasmaSetup = activationScript; + services.xserver.displayManager.setupCommands = startplasma; nixpkgs.config.firefox.enablePlasmaBrowserIntegration = true; }) diff --git a/nixos/tests/plasma5.nix b/nixos/tests/plasma5.nix index f09859a055d..7a5b7db9462 100644 --- a/nixos/tests/plasma5.nix +++ b/nixos/tests/plasma5.nix @@ -12,7 +12,7 @@ import ./make-test-python.nix ({ pkgs, ...} : imports = [ ./common/user-account.nix ]; services.xserver.enable = true; services.xserver.displayManager.sddm.enable = true; - services.xserver.displayManager.defaultSession = "plasma5"; + services.xserver.displayManager.defaultSession = "plasma"; services.xserver.desktopManager.plasma5.enable = true; services.xserver.displayManager.autoLogin = { enable = true; diff --git a/pkgs/desktops/plasma-5/plasma-workspace/default.nix b/pkgs/desktops/plasma-5/plasma-workspace/default.nix index b65bc7df8ed..fac10cf31d4 100644 --- a/pkgs/desktops/plasma-5/plasma-workspace/default.nix +++ b/pkgs/desktops/plasma-5/plasma-workspace/default.nix @@ -24,6 +24,7 @@ let inherit (lib) getBin getLib; in mkDerivation { name = "plasma-workspace"; + passthru.providedSessions = [ "plasma" "plasmawayland" ]; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ |