summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorgithub-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>2023-06-15 06:01:39 +0000
committerGitHub <noreply@github.com>2023-06-15 06:01:39 +0000
commita5a4b79b0d3574765283328714bc304898bff0e9 (patch)
tree051df5d840ccdd98872493826af706edd041abe1 /nixos
parentc2fa1409374a4cc3c8ebcb2f1e81f53f4149daa1 (diff)
parent979b4232b33873e4e52692e7d1d0ebadc87d0633 (diff)
downloadnixpkgs-a5a4b79b0d3574765283328714bc304898bff0e9.tar
nixpkgs-a5a4b79b0d3574765283328714bc304898bff0e9.tar.gz
nixpkgs-a5a4b79b0d3574765283328714bc304898bff0e9.tar.bz2
nixpkgs-a5a4b79b0d3574765283328714bc304898bff0e9.tar.lz
nixpkgs-a5a4b79b0d3574765283328714bc304898bff0e9.tar.xz
nixpkgs-a5a4b79b0d3574765283328714bc304898bff0e9.tar.zst
nixpkgs-a5a4b79b0d3574765283328714bc304898bff0e9.zip
Merge master into staging-next
Diffstat (limited to 'nixos')
-rw-r--r--nixos/modules/services/x11/desktop-managers/cinnamon.nix6
1 files changed, 5 insertions, 1 deletions
diff --git a/nixos/modules/services/x11/desktop-managers/cinnamon.nix b/nixos/modules/services/x11/desktop-managers/cinnamon.nix
index 7ced5b63c83..c7755aca4bb 100644
--- a/nixos/modules/services/x11/desktop-managers/cinnamon.nix
+++ b/nixos/modules/services/x11/desktop-managers/cinnamon.nix
@@ -71,7 +71,7 @@ in
           package = mkDefault pkgs.cinnamon.mint-themes;
         };
         iconTheme = mkIf (notExcluded pkgs.cinnamon.mint-y-icons) {
-          name = mkDefault "Mint-Y-Aqua";
+          name = mkDefault "Mint-Y-Sand";
           package = mkDefault pkgs.cinnamon.mint-y-icons;
         };
         cursorTheme = mkIf (notExcluded pkgs.cinnamon.mint-cursor-themes) {
@@ -113,6 +113,8 @@ in
       services.gnome.glib-networking.enable = true;
       services.gnome.gnome-keyring.enable = true;
       services.gvfs.enable = true;
+      services.switcherooControl.enable = mkDefault true; # xapp-gpu-offload-helper
+      services.touchegg.enable = mkDefault true;
       services.udisks2.enable = true;
       services.upower.enable = mkDefault config.powerManagement.enable;
       services.xserver.libinput.enable = mkDefault true;
@@ -178,6 +180,8 @@ in
         nixos-artwork.wallpapers.simple-dark-gray
         mint-artwork
         mint-cursor-themes
+        mint-l-icons
+        mint-l-theme
         mint-themes
         mint-x-icons
         mint-y-icons