Merge remote-tracking branch 'origin/master' into staging-next

Conflicts: pkgs/tools/networking/xh/default.nix
2021-05-22 18:19:10 -07:00
parent 563389a7fd 6543c61311
commit 11a9ac00fc
157 changed files with 1479 additions and 591 deletions
@@ -128,6 +128,7 @@ in
        cinnamon-session
        cinnamon-desktop
        cinnamon-menus
+        cinnamon-translations

        # utils needed by some scripts
        killall
@@ -137,6 +138,9 @@ in
        # cinnamon-killer-daemon: provided by cinnamon-common
        gnome.networkmanagerapplet # session requirement - also nm-applet not needed

+        # For a polkit authentication agent
+        polkit_gnome
+
        # packages
        nemo
        cinnamon-control-center
@@ -316,6 +316,7 @@ in
        ++ lib.optionals config.hardware.bluetooth.enable [ bluedevil bluez-qt pkgs.openobex pkgs.obexftp ]
        ++ lib.optional config.networking.networkmanager.enable plasma-nm
        ++ lib.optional config.hardware.pulseaudio.enable plasma-pa
+        ++ lib.optional config.services.pipewire.pulse.enable plasma-pa
        ++ lib.optional config.powerManagement.enable powerdevil
        ++ lib.optional config.services.colord.enable pkgs.colord-kde
        ++ lib.optionals config.services.samba.enable [ kdenetwork-filesharing pkgs.samba ]