From 8e9986ab12f7438fa7db82c0b23ea8804ea33b3d Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie.litherland-smith@ukaea.uk>
Date: Tue, 6 Aug 2024 15:00:54 +0100
Subject: [PATCH] Use plasma-manager lib for configuring touchpads

Move bluedevilglobalrc config to be machine-specific (bluetooth off at
startup on laptops, on at startup on desktops, only specified if
machine has bluetooth capability)
---
 home/Northstar.nix              | 19 ++++++++++++++++---
 home/Ronin.nix                  | 19 ++++++++++++++++---
 home/Vanguard.nix               |  5 +++++
 home/desktop/plasma/default.nix |  1 -
 4 files changed, 37 insertions(+), 7 deletions(-)

diff --git a/home/Northstar.nix b/home/Northstar.nix
index dff76db4..46dc62c4 100644
--- a/home/Northstar.nix
+++ b/home/Northstar.nix
@@ -1,12 +1,25 @@
-{ config, lib, ... }:
+{ ... }:
 {
   imports = [
     ./personal.nix
     ./desktop/plasma/default.nix
   ];
-  programs.plasma = lib.mkIf config.programs.plasma.enable {
+  programs.plasma = {
+    input.touchpads = [
+      {
+        disableWhileTyping = true;
+        enable = true;
+        leftHanded = false;
+        middleMouseEmulation = true;
+        name = "SYNA32AA:00 06CB:CE17 Touchpad";
+        naturalScroll = true;
+        productId = "52759";
+        tapToClick = true;
+        vendorId = "1739";
+      }
+    ];
     configFile = {
-      kcminputrc."Libinput/1739/52759/SYNA32AA:00 06CB:CE17 Touchpad".NaturalScroll = true;
+      bluedevilglobalrc.Global.launchState.value = "disable";
     };
   };
 }
diff --git a/home/Ronin.nix b/home/Ronin.nix
index 8085b28f..bfe1e78e 100644
--- a/home/Ronin.nix
+++ b/home/Ronin.nix
@@ -1,12 +1,25 @@
-{ config, lib, ... }:
+{ ... }:
 {
   imports = [
     ./work.nix
     ./desktop/plasma/default.nix
   ];
-  programs.plasma = lib.mkIf config.programs.plasma.enable {
+  programs.plasma = {
+    input.touchpads = [
+      {
+        disableWhileTyping = true;
+        enable = true;
+        leftHanded = false;
+        middleMouseEmulation = true;
+        name = "DELL0A21:00 0488:1024 Touchpad";
+        naturalScroll = true;
+        productId = "4132";
+        tapToClick = true;
+        vendorId = "1160";
+      }
+    ];
     configFile = {
-      kcminputrc."Libinput/1160/4132/DELL0A21:00 0488:1024 Touchpad".NaturalScroll = true;
+      bluedevilglobalrc.Global.launchState.value = "disable";
     };
   };
 }
diff --git a/home/Vanguard.nix b/home/Vanguard.nix
index 9e76bb16..929ff612 100644
--- a/home/Vanguard.nix
+++ b/home/Vanguard.nix
@@ -6,6 +6,11 @@
     ./streaming/default.nix
     ./desktop/plasma/default.nix
   ];
+  programs.plasma = {
+    configFile = {
+      bluedevilglobalrc.Global.launchState.value = "enable";
+    };
+  };
   xdg.configFile = {
     "autostart/signal-desktop.desktop".source = "${pkgs.signal-desktop}/share/applications/signal-desktop.desktop";
     "autostart/com.github.eneshecan.WhatsAppForLinux.desktop".source = "${pkgs.whatsapp-for-linux}/share/applications/com.github.eneshecan.WhatsAppForLinux.desktop";
diff --git a/home/desktop/plasma/default.nix b/home/desktop/plasma/default.nix
index c7cef84f..dda75379 100644
--- a/home/desktop/plasma/default.nix
+++ b/home/desktop/plasma/default.nix
@@ -203,7 +203,6 @@
 
     configFile = {
       baloofilerc."Basic Settings"."Indexing-Enabled" = false;
-      bluedevilglobalrc.Global.launchState.value = "enable";
       kcminputrc.Keyboard.NumLock = 1;
       plasmanotifyrc = {
         Notifications = {