From 683e8aa4d7c73d57bd036625bb0af856ccf0b5e9 Mon Sep 17 00:00:00 2001
From: albert <albert@sysctl.io>
Date: Fri, 21 Jun 2024 10:50:33 +0900
Subject: [PATCH] Update Plasma

---
 .../desktops/plasma6/plasma-manager.nix       | 56 ++++++++++---------
 .../desktops/plasma6/default.nix              | 11 +++-
 nixos/common/desktops/plasma6/default.nix     |  3 +-
 nixos/containers/rdesktop/default.nix         |  8 ++-
 4 files changed, 45 insertions(+), 33 deletions(-)

diff --git a/home-manager/common/desktops/plasma6/plasma-manager.nix b/home-manager/common/desktops/plasma6/plasma-manager.nix
index 77ed87b7..776dec75 100644
--- a/home-manager/common/desktops/plasma6/plasma-manager.nix
+++ b/home-manager/common/desktops/plasma6/plasma-manager.nix
@@ -15,9 +15,6 @@
     overrideConfig = true;
     configFile = {
       kscreenlockerrc = {
-        # Laptop - natural scrolling
-        "kcminputrc"."Libinput/2362/628/PIXA3854:00 093A:0274 Touchpad"."NaturalScroll" = true;
-        
         # Set Lock Screen Wallpaper
         "Greeter/Wallpaper/org.kde.image/General" =  {
           Image = "/etc/nixos/git/wallpapers/${theme}/wallpaper1.png";
@@ -25,31 +22,36 @@
         };
       };
 
-      kwinrc = {
-        # Tiling - Laptop
-        "Tiling/d67b1509-69a3-585f-adcc-1048a4265c4f"."tiles" = "{
-          \"layoutDirection\":\"horizontal\",
-          \"tiles\":[
-            {
-              \"layoutDirection\":\"vertical\",
-              \"tiles\":[
-                {
-                  \"height\":0.5
-                },
-                {
-                  \"height\":0.5
-                }
-              ],
-              \"width\":0.4
-            },
-            {
-              \"width\":0.6
-            }
-          ]
-        }";
+      # Set the activity manager default activity to match the one for Tiling
+      kactivitymanagerdrc = {
+        activites.d67b1509-69a3-585f-adcc-1048a4265c4f = "Default";
+        main.currentActivity = "d67b1509-69a3-585f-adcc-1048a4265c4f";
+      };
 
-        Tiling = {
-          padding = 10;
+      kwinrc = {
+        # Tiling - Single Screen
+        Tiling.Padding = 10;
+        "Tiling/d67b1509-69a3-585f-adcc-1048a4265c4f" = {
+          tiles = "{
+            \"layoutDirection\":\"horizontal\",
+            \"tiles\":[
+              {
+                \"layoutDirection\":\"vertical\",
+                \"tiles\":[
+                  {
+                    \"height\":0.5
+                  },
+                  {
+                    \"height\":0.5
+                  }
+                ],
+                \"width\":0.4
+              },
+              {
+                \"width\":0.6
+              }
+            ]
+          }";
         };
 
         # Set window border size 
diff --git a/home-manager/hosts/nixos-framework/desktops/plasma6/default.nix b/home-manager/hosts/nixos-framework/desktops/plasma6/default.nix
index 0db3279e..13bf9a54 100644
--- a/home-manager/hosts/nixos-framework/desktops/plasma6/default.nix
+++ b/home-manager/hosts/nixos-framework/desktops/plasma6/default.nix
@@ -1,3 +1,10 @@
-{
-
+{ ... }: {
+  programs.plasma = {
+    configFile = {
+      kscreenlockerdrc = {
+        # Laptop - natural scrolling
+        "kcminputrc"."Libinput/2362/628/PIXA3854:00 093A:0274 Touchpad"."NaturalScroll" = true;
+      };
+    };
+  };
 }
diff --git a/nixos/common/desktops/plasma6/default.nix b/nixos/common/desktops/plasma6/default.nix
index 2de68e6e..010f1af4 100644
--- a/nixos/common/desktops/plasma6/default.nix
+++ b/nixos/common/desktops/plasma6/default.nix
@@ -1,7 +1,7 @@
 { pkgs, ... }: {
   # Enable sound with pipewire.
   sound.enable = true;
-  hardware.pulseaudio.enable = false;
+  hardware.pulseaudio.enable = true;
   security.rtkit.enable = true;
   services.pipewire = {
     enable = true;
@@ -25,6 +25,7 @@
     papirus-icon-theme
     plasma-theme-switcher
     tailscale-systray
+    la-capitaine-icon-theme
   ];
 
   services.xrdp.defaultWindowManager = "startplasma-x11";
diff --git a/nixos/containers/rdesktop/default.nix b/nixos/containers/rdesktop/default.nix
index c5623a09..7e4d87ce 100644
--- a/nixos/containers/rdesktop/default.nix
+++ b/nixos/containers/rdesktop/default.nix
@@ -6,7 +6,9 @@
     ../../common/modules/fonts.nix
   ];
 
-  services.xrdp.openFirewall = true; 
-  services.xrdp.enable = true;
-  services.xrdp.audio.enable = true;
+  services.xrdp = {
+    openFirewall = true;
+    enable = true;
+    audio.enable = true;
+  };
 }