summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlassulus <lassulus@lassul.us>2021-12-08 08:15:51 +0100
committerlassulus <lassulus@lassul.us>2021-12-08 08:15:51 +0100
commit0f3c4547f9e0d3c4fc9bd32c056aa76e9e2277f1 (patch)
treedabde376b4add8e53d2a3e0cc12de14b9326731d
parentf221b9cc16e23a03b20f1727918f6122eb1e57f8 (diff)
parenta05213de2a259d2a1e328876827ef25f0fb7f7b3 (diff)
Merge remote-tracking branch 'ni/master' into 21.11
-rw-r--r--krebs/5pkgs/override/default.nix3
-rw-r--r--tv/2configs/default.nix13
-rw-r--r--tv/2configs/gitrepos.nix3
-rw-r--r--tv/2configs/hw/x220.nix18
4 files changed, 29 insertions, 8 deletions
diff --git a/krebs/5pkgs/override/default.nix b/krebs/5pkgs/override/default.nix
index c1d8fa3da..fe13b4309 100644
--- a/krebs/5pkgs/override/default.nix
+++ b/krebs/5pkgs/override/default.nix
@@ -20,6 +20,9 @@ self: super: {
"0.10.1" = [
./flameshot/flameshot_imgur_0.9.0.patch
];
+ "0.10.2" = [
+ ./flameshot/flameshot_imgur_0.9.0.patch
+ ];
}.${old.version} or [];
});
diff --git a/tv/2configs/default.nix b/tv/2configs/default.nix
index de298e162..8add07ff6 100644
--- a/tv/2configs/default.nix
+++ b/tv/2configs/default.nix
@@ -94,8 +94,17 @@ with import <stockholm/lib>;
{
boot.kernel.sysctl = {
# 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;
};
}
diff --git a/tv/2configs/gitrepos.nix b/tv/2configs/gitrepos.nix
index 6f4dedad6..fc76e5fd6 100644
--- a/tv/2configs/gitrepos.nix
+++ b/tv/2configs/gitrepos.nix
@@ -116,6 +116,9 @@ let {
TabFS = {
cgit.desc = "mount browser tabs & co. as a filesystem";
};
+ texnix = {
+ cgit.desc = "TeX live environment generator";
+ };
with-ssh = {};
} // mapAttrs (_: recursiveUpdate { cgit.section = "2. Host configurations"; }) {
ni = {
diff --git a/tv/2configs/hw/x220.nix b/tv/2configs/hw/x220.nix
index ecbb84a44..a4342fcce 100644
--- a/tv/2configs/hw/x220.nix
+++ b/tv/2configs/hw/x220.nix
@@ -26,6 +26,18 @@ in
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 = [
@@ -54,12 +66,6 @@ in
START_CHARGE_THRESH_BAT0 = 80;
};
- nix = {
- buildCores = 2;
- maxJobs = 2;
- daemonIONiceLevel = 1;
- daemonNiceLevel = 1;
- };
services.logind.extraConfig = ''
HandleHibernateKey=ignore