Merge remote-tracking branch 'ni/master' into 21.11
This commit is contained in:
commit
0f3c4547f9
|
@ -20,6 +20,9 @@ self: super: {
|
||||||
"0.10.1" = [
|
"0.10.1" = [
|
||||||
./flameshot/flameshot_imgur_0.9.0.patch
|
./flameshot/flameshot_imgur_0.9.0.patch
|
||||||
];
|
];
|
||||||
|
"0.10.2" = [
|
||||||
|
./flameshot/flameshot_imgur_0.9.0.patch
|
||||||
|
];
|
||||||
}.${old.version} or [];
|
}.${old.version} or [];
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
|
@ -94,8 +94,17 @@ with import <stockholm/lib>;
|
||||||
{
|
{
|
||||||
boot.kernel.sysctl = {
|
boot.kernel.sysctl = {
|
||||||
# Enable IPv6 Privacy Extensions
|
# Enable IPv6 Privacy Extensions
|
||||||
"net.ipv6.conf.all.use_tempaddr" = 2;
|
#
|
||||||
"net.ipv6.conf.default.use_tempaddr" = 2;
|
# XXX use mkForce here because since NixOS 21.11 there's a collision in
|
||||||
|
# net.ipv6.conf.default.use_tempaddr, and boot.kernel.sysctl incapable
|
||||||
|
# of merging.
|
||||||
|
#
|
||||||
|
# XXX net.ipv6.conf.all.use_tempaddr is set because it was mentioned in
|
||||||
|
# https://tldp.org/HOWTO/Linux+IPv6-HOWTO/ch06s05.html
|
||||||
|
# TODO check if that is really necessary, otherwise we can rely solely
|
||||||
|
# on networking.tempAddresses in the future (when nothing is <21.11)
|
||||||
|
"net.ipv6.conf.all.use_tempaddr" = mkForce 2;
|
||||||
|
"net.ipv6.conf.default.use_tempaddr" = mkForce 2;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -116,6 +116,9 @@ let {
|
||||||
TabFS = {
|
TabFS = {
|
||||||
cgit.desc = "mount browser tabs & co. as a filesystem";
|
cgit.desc = "mount browser tabs & co. as a filesystem";
|
||||||
};
|
};
|
||||||
|
texnix = {
|
||||||
|
cgit.desc = "TeX live environment generator";
|
||||||
|
};
|
||||||
with-ssh = {};
|
with-ssh = {};
|
||||||
} // mapAttrs (_: recursiveUpdate { cgit.section = "2. Host configurations"; }) {
|
} // mapAttrs (_: recursiveUpdate { cgit.section = "2. Host configurations"; }) {
|
||||||
ni = {
|
ni = {
|
||||||
|
|
|
@ -26,6 +26,18 @@ in
|
||||||
LIBINPUT_MODEL_LENOVO_X220_TOUCHPAD_FW81=1
|
LIBINPUT_MODEL_LENOVO_X220_TOUCHPAD_FW81=1
|
||||||
'';
|
'';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
{
|
||||||
|
nix.buildCores = 2;
|
||||||
|
nix.maxJobs = 2;
|
||||||
|
}
|
||||||
|
(if lib.versionAtLeast lib.version "21.11" then {
|
||||||
|
nix.daemonCPUSchedPolicy = "batch";
|
||||||
|
nix.daemonIOSchedPriority = 1;
|
||||||
|
} else {
|
||||||
|
nix.daemonIONiceLevel = 1;
|
||||||
|
nix.daemonNiceLevel = 1;
|
||||||
|
})
|
||||||
];
|
];
|
||||||
|
|
||||||
boot.extraModulePackages = [
|
boot.extraModulePackages = [
|
||||||
|
@ -54,12 +66,6 @@ in
|
||||||
START_CHARGE_THRESH_BAT0 = 80;
|
START_CHARGE_THRESH_BAT0 = 80;
|
||||||
};
|
};
|
||||||
|
|
||||||
nix = {
|
|
||||||
buildCores = 2;
|
|
||||||
maxJobs = 2;
|
|
||||||
daemonIONiceLevel = 1;
|
|
||||||
daemonNiceLevel = 1;
|
|
||||||
};
|
|
||||||
|
|
||||||
services.logind.extraConfig = ''
|
services.logind.extraConfig = ''
|
||||||
HandleHibernateKey=ignore
|
HandleHibernateKey=ignore
|
||||||
|
|
Loading…
Reference in New Issue
Block a user