diff --git a/roles/common/programs/nix.nix b/roles/common/programs/nix.nix index 7a96dbf..de6a729 100755 --- a/roles/common/programs/nix.nix +++ b/roles/common/programs/nix.nix @@ -58,10 +58,9 @@ }; # 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 dee6a2a..f3b0713 100644 --- a/roles/desktop/services/syncthing.nix +++ b/roles/desktop/services/syncthing.nix @@ -44,13 +44,11 @@ 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 20d6267..dd6b234 100644 --- a/roles/kde/plasma.nix +++ b/roles/kde/plasma.nix @@ -50,11 +50,9 @@ 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 + ]; }; } ); @@ -100,25 +98,6 @@ 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 42da331..ab814f8 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 ae6d9e6..85f3c9f 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}";