Compare commits

...

3 commits

Author SHA1 Message Date
d130ffb20d Common/nix: remove unneeded nixpath workaround, update comment 2024-12-15 16:25:48 +01:00
99056c9f32 Run formatter 2024-12-15 15:43:36 +01:00
5895f4beb1 Kde/plasma: add mouse settings 2024-12-15 15:42:25 +01:00
5 changed files with 38 additions and 14 deletions

View file

@ -58,9 +58,10 @@
}; };
# Write the system's nixpkgs into the registry to avoid mixing nixpkgs versions # 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 # 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; 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}"];
}; };
} }

View file

@ -44,11 +44,13 @@
builtins.removeAttrs rawOptions missingOptions builtins.removeAttrs rawOptions missingOptions
); );
in { in {
services.syncthing = removeMissingOptions systemConfig // { services.syncthing =
enable = true; removeMissingOptions systemConfig
# Renamed options // {
allProxy = systemConfig.all_proxy; enable = true;
extraOptions = systemConfig.extraFlags; # Renamed options
}; allProxy = systemConfig.all_proxy;
extraOptions = systemConfig.extraFlags;
};
}; };
} }

View file

@ -50,9 +50,11 @@ in {
]; ];
}; };
plasma-workspace = kPrev.plasma-workspace.overrideAttrs { plasma-workspace = kPrev.plasma-workspace.overrideAttrs {
patches = kPrev.plasma-workspace.patches ++ [ patches =
./patches/plasma_workspace-pr4883.patch kPrev.plasma-workspace.patches
]; ++ [
./patches/plasma_workspace-pr4883.patch
];
}; };
} }
); );
@ -98,6 +100,25 @@ in {
layouts = [{layout = "es";}]; layouts = [{layout = "es";}];
numlockOnStartup = "off"; 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 = [ panels = [
{ {

View file

@ -18,7 +18,7 @@ in {
}; };
}; };
headscale.settings.dns= { headscale.settings.dns = {
nameservers.global = lib.mkForce ["100.100.0.1"]; nameservers.global = lib.mkForce ["100.100.0.1"];
extra_records = [ extra_records = [
{ {

View file

@ -5,8 +5,8 @@
openFirewall = true; openFirewall = true;
settings = { settings = {
"global" = { "global" = {
"map to guest" = "bad user"; "map to guest" = "bad user";
"guest account" = "transmission"; "guest account" = "transmission";
}; };
"Transmission downloads" = { "Transmission downloads" = {
path = "${config.services.transmission.settings.download-dir}"; path = "${config.services.transmission.settings.download-dir}";