Compare commits
3 commits
a2eacddd44
...
d130ffb20d
| Author | SHA1 | Date | |
|---|---|---|---|
| d130ffb20d | |||
| 99056c9f32 | |||
| 5895f4beb1 |
5 changed files with 38 additions and 14 deletions
|
|
@ -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}"];
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -44,7 +44,9 @@
|
||||||
builtins.removeAttrs rawOptions missingOptions
|
builtins.removeAttrs rawOptions missingOptions
|
||||||
);
|
);
|
||||||
in {
|
in {
|
||||||
services.syncthing = removeMissingOptions systemConfig // {
|
services.syncthing =
|
||||||
|
removeMissingOptions systemConfig
|
||||||
|
// {
|
||||||
enable = true;
|
enable = true;
|
||||||
# Renamed options
|
# Renamed options
|
||||||
allProxy = systemConfig.all_proxy;
|
allProxy = systemConfig.all_proxy;
|
||||||
|
|
|
||||||
|
|
@ -50,7 +50,9 @@ in {
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
plasma-workspace = kPrev.plasma-workspace.overrideAttrs {
|
plasma-workspace = kPrev.plasma-workspace.overrideAttrs {
|
||||||
patches = kPrev.plasma-workspace.patches ++ [
|
patches =
|
||||||
|
kPrev.plasma-workspace.patches
|
||||||
|
++ [
|
||||||
./patches/plasma_workspace-pr4883.patch
|
./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 = [
|
||||||
{
|
{
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue