diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-12-14 06:01:05 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-14 06:01:05 +0000 |
| commit | 747e072692819c3ea051f117c7405dd10092f69f (patch) | |
| tree | 60f1cef3365e4d4f0ed9910174f814c0bd18d121 /nixos | |
| parent | 07fa2153b89b5f8ee21f746931c8b66c64213067 (diff) | |
| parent | b1648e3b6a94264087b714b390eb40f9b6649c65 (diff) | |
| download | nixpkgs-747e072692819c3ea051f117c7405dd10092f69f.tar nixpkgs-747e072692819c3ea051f117c7405dd10092f69f.tar.gz nixpkgs-747e072692819c3ea051f117c7405dd10092f69f.tar.bz2 nixpkgs-747e072692819c3ea051f117c7405dd10092f69f.tar.lz nixpkgs-747e072692819c3ea051f117c7405dd10092f69f.tar.xz nixpkgs-747e072692819c3ea051f117c7405dd10092f69f.tar.zst nixpkgs-747e072692819c3ea051f117c7405dd10092f69f.zip | |
Merge master into staging-next
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/services/networking/unifi.nix | 4 | ||||
| -rw-r--r-- | nixos/modules/services/x11/desktop-managers/plasma5.nix | 8 |
2 files changed, 10 insertions, 2 deletions
diff --git a/nixos/modules/services/networking/unifi.nix b/nixos/modules/services/networking/unifi.nix index d30f7c89633..f04242d4ab5 100644 --- a/nixos/modules/services/networking/unifi.nix +++ b/nixos/modules/services/networking/unifi.nix @@ -24,8 +24,8 @@ in services.unifi.jrePackage = mkOption { type = types.package; - default = pkgs.jre8; - defaultText = literalExpression "pkgs.jre8"; + default = if (lib.versionAtLeast (lib.getVersion cfg.unifiPackage) "7.3") then pkgs.jdk11 else pkgs.jre8; + defaultText = literalExpression ''if (lib.versionAtLeast (lib.getVersion cfg.unifiPackage) "7.3" then pkgs.jdk11 else pkgs.jre8''; description = lib.mdDoc '' The JRE package to use. Check the release notes to ensure it is supported. ''; diff --git a/nixos/modules/services/x11/desktop-managers/plasma5.nix b/nixos/modules/services/x11/desktop-managers/plasma5.nix index a6ab3053087..2ab24951ec6 100644 --- a/nixos/modules/services/x11/desktop-managers/plasma5.nix +++ b/nixos/modules/services/x11/desktop-managers/plasma5.nix @@ -384,6 +384,11 @@ in ++ lib.optionals config.services.samba.enable [ kdenetwork-filesharing pkgs.samba ] ++ lib.optional config.services.xserver.wacom.enable pkgs.wacomtablet; + # Extra services for D-Bus activation + services.dbus.packages = [ + plasma5.kactivitymanagerd + ]; + environment.pathsToLink = [ # FIXME: modules should link subdirs of `/share` rather than relying on this "/share" @@ -446,6 +451,9 @@ in xdg.portal.enable = true; xdg.portal.extraPortals = [ plasma5.xdg-desktop-portal-kde ]; + # xdg-desktop-portal-kde expects PipeWire to be running. + # This does not, by default, replace PulseAudio. + services.pipewire.enable = mkDefault true; # Update the start menu for each user that is currently logged in system.userActivationScripts.plasmaSetup = activationScript; |