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}"]; }; } 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 dd6b234..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 + ]; }; } ); @@ -98,6 +100,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 = [ { 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}";