qbit/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nixos/sysctl: remove with lib;

Browse Source
This commit is contained in:
Felix Buehler 2024-08-24 22:05:26 +02:00
parent 3ff6eebd21
commit 6db0587bdb
1 changed files with 18 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
nixos/modules/config/sysctl.nix
View File

@ -1,17 +1,14 @@
{ config, lib, ... }: { config, lib, ... }:
with lib;
let let
sysctlOption = mkOptionType { sysctlOption = lib.mkOptionType {
name = "sysctl option value"; name = "sysctl option value";
check = val: check = val:
let let
checkType = x: isBool x || isString x || isInt x || x == null; checkType = x: lib.isBool x || lib.isString x || lib.isInt x || x == null;
in in
checkType val || (val._type or "" == "override" && checkType val.content); checkType val || (val._type or "" == "override" && checkType val.content);
merge = loc: defs: mergeOneOption loc (filterOverrides defs); merge = loc: defs: lib.mergeOneOption loc (lib.filterOverrides defs);
}; };
in in
@ -20,33 +17,33 @@ in
options = { options = {
boot.kernel.sysctl = mkOption { boot.kernel.sysctl = lib.mkOption {
type = let type = let
highestValueType = types.ints.unsigned // { highestValueType = lib.types.ints.unsigned // {
merge = loc: defs: merge = loc: defs:
foldl lib.foldl
(a: b: if b.value == null then null else lib.max a b.value) (a: b: if b.value == null then null else lib.max a b.value)
0 0
(filterOverrides defs); (lib.filterOverrides defs);
}; };
in types.submodule { in lib.types.submodule {
freeformType = types.attrsOf sysctlOption; freeformType = lib.types.attrsOf sysctlOption;
options = { options = {
"net.core.rmem_max" = mkOption { "net.core.rmem_max" = lib.mkOption {
type = types.nullOr highestValueType; type = lib.types.nullOr highestValueType;
default = null; default = null;
description = "The maximum receive socket buffer size in bytes. In case of conflicting values, the highest will be used."; description = "The maximum receive socket buffer size in bytes. In case of conflicting values, the highest will be used.";
}; };
"net.core.wmem_max" = mkOption { "net.core.wmem_max" = lib.mkOption {
type = types.nullOr highestValueType; type = lib.types.nullOr highestValueType;
default = null; default = null;
description = "The maximum send socket buffer size in bytes. In case of conflicting values, the highest will be used."; description = "The maximum send socket buffer size in bytes. In case of conflicting values, the highest will be used.";
}; };
}; };
}; };
default = {}; default = {};
example = literalExpression '' example = lib.literalExpression ''
{ "net.ipv4.tcp_syncookies" = false; "vm.swappiness" = 60; } { "net.ipv4.tcp_syncookies" = false; "vm.swappiness" = 60; }
''; '';
description = '' description = ''
@ -66,8 +63,8 @@ in
config = { config = {
environment.etc."sysctl.d/60-nixos.conf".text = environment.etc."sysctl.d/60-nixos.conf".text =
concatStrings (mapAttrsToList (n: v: lib.concatStrings (lib.mapAttrsToList (n: v:
optionalString (v != null) "${n}=${if v == false then "0" else toString v}\n" lib.optionalString (v != null) "${n}=${if v == false then "0" else toString v}\n"
) config.boot.kernel.sysctl); ) config.boot.kernel.sysctl);
systemd.services.systemd-sysctl = systemd.services.systemd-sysctl =
@ -77,10 +74,10 @@ in
# Hide kernel pointers (e.g. in /proc/modules) for unprivileged # Hide kernel pointers (e.g. in /proc/modules) for unprivileged
# users as these make it easier to exploit kernel vulnerabilities. # users as these make it easier to exploit kernel vulnerabilities.
boot.kernel.sysctl."kernel.kptr_restrict" = mkDefault 1; boot.kernel.sysctl."kernel.kptr_restrict" = lib.mkDefault 1;
# Improve compatibility with applications that allocate # Improve compatibility with applications that allocate
# a lot of memory, like modern games # a lot of memory, like modern games
boot.kernel.sysctl."vm.max_map_count" = mkDefault 1048576; boot.kernel.sysctl."vm.max_map_count" = lib.mkDefault 1048576;
}; };
} }