From 5895f4beb1418a73102900d98681a0c67d64378b Mon Sep 17 00:00:00 2001
From: Toast <toast003@tutamail.com>
Date: Sun, 15 Dec 2024 15:42:25 +0100
Subject: [PATCH 1/3] Kde/plasma: add mouse settings

---
 roles/kde/plasma.nix | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/roles/kde/plasma.nix b/roles/kde/plasma.nix
index dd6b234..7dadf13 100644
--- a/roles/kde/plasma.nix
+++ b/roles/kde/plasma.nix
@@ -98,6 +98,25 @@ in {
             layouts = [{layout = "es";}];
             numlockOnStartup = "off";
           };
+          mice = let
+            settings = {
+              enable = true;
+              accelerationProfile = "none";
+            };
+            mice = [
+              {
+                productId = "d030";
+                vendorId = "3434";
+                name = "Keychron  Keychron Link ";
+              }
+              {
+                productId = "d03f";
+                vendorId = "3434";
+                name = "Keychron Keychron M6 ";
+              }
+            ];
+          in
+            lib.lists.forEach mice (miceInfo: miceInfo // settings);
         };
         panels = [
           {

From 99056c9f32af428e02a65944fb2ea19b26c23657 Mon Sep 17 00:00:00 2001
From: Toast <toast003@tutamail.com>
Date: Sun, 15 Dec 2024 15:43:36 +0100
Subject: [PATCH 2/3] Run formatter

---
 roles/desktop/services/syncthing.nix | 14 ++++++++------
 roles/kde/plasma.nix                 |  8 +++++---
 roles/server/adguard.nix             |  2 +-
 roles/server/samba.nix               |  4 ++--
 4 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/roles/desktop/services/syncthing.nix b/roles/desktop/services/syncthing.nix
index f3b0713..dee6a2a 100644
--- a/roles/desktop/services/syncthing.nix
+++ b/roles/desktop/services/syncthing.nix
@@ -44,11 +44,13 @@
       builtins.removeAttrs rawOptions missingOptions
     );
   in {
-    services.syncthing = removeMissingOptions systemConfig // {
-      enable = true;
-      # Renamed options
-      allProxy = systemConfig.all_proxy;
-      extraOptions = systemConfig.extraFlags;
-    };
+    services.syncthing =
+      removeMissingOptions systemConfig
+      // {
+        enable = true;
+        # Renamed options
+        allProxy = systemConfig.all_proxy;
+        extraOptions = systemConfig.extraFlags;
+      };
   };
 }
diff --git a/roles/kde/plasma.nix b/roles/kde/plasma.nix
index 7dadf13..20d6267 100644
--- a/roles/kde/plasma.nix
+++ b/roles/kde/plasma.nix
@@ -50,9 +50,11 @@ in {
               ];
             };
             plasma-workspace = kPrev.plasma-workspace.overrideAttrs {
-              patches = kPrev.plasma-workspace.patches ++ [
-                ./patches/plasma_workspace-pr4883.patch
-              ];
+              patches =
+                kPrev.plasma-workspace.patches
+                ++ [
+                  ./patches/plasma_workspace-pr4883.patch
+                ];
             };
           }
         );
diff --git a/roles/server/adguard.nix b/roles/server/adguard.nix
index ab814f8..42da331 100644
--- a/roles/server/adguard.nix
+++ b/roles/server/adguard.nix
@@ -18,7 +18,7 @@ in {
       };
     };
 
-    headscale.settings.dns= {
+    headscale.settings.dns = {
       nameservers.global = lib.mkForce ["100.100.0.1"];
       extra_records = [
         {
diff --git a/roles/server/samba.nix b/roles/server/samba.nix
index 85f3c9f..ae6d9e6 100755
--- a/roles/server/samba.nix
+++ b/roles/server/samba.nix
@@ -5,8 +5,8 @@
       openFirewall = true;
       settings = {
         "global" = {
-        "map to guest" = "bad user";
-        "guest account" = "transmission";
+          "map to guest" = "bad user";
+          "guest account" = "transmission";
         };
         "Transmission downloads" = {
           path = "${config.services.transmission.settings.download-dir}";

From d130ffb20d6bea749d700bfcf09ed1fcdc2cff28 Mon Sep 17 00:00:00 2001
From: Toast <toast003@tutamail.com>
Date: Sun, 15 Dec 2024 16:25:48 +0100
Subject: [PATCH 3/3] Common/nix: remove unneeded nixpath workaround, update
 comment

---
 roles/common/programs/nix.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/roles/common/programs/nix.nix b/roles/common/programs/nix.nix
index de6a729..7a96dbf 100755
--- a/roles/common/programs/nix.nix
+++ b/roles/common/programs/nix.nix
@@ -58,9 +58,10 @@
       };
       # Write the system's nixpkgs into the registry to avoid mixing nixpkgs versions
       # https://dataswamp.org/~solene/2022-07-20-nixos-flakes-command-sync-with-system.html
+
+      # Since 24.05 this is already done for nixpkgs, but it doesn't keep the patches
+      # so I'm keeping this around just in case
       system.flake = systemPkgs;
     };
-    # I removed this in the past since I thought that I didn't need it, but turns out comma does :)
-    nixPath = ["nixpkgs=${systemPkgs}"];
   };
 }