mirror of
https://github.com/aviallon/nixos-lib.git
synced 2026-04-06 01:38:06 +00:00
Compare commits
No commits in common. "5be1c37d3cede53a5f196b726a97b3a81bbe84a8" and "9737dfe1c0c49b470c9e61731cdb7d985a312be9" have entirely different histories.
5be1c37d3c
...
9737dfe1c0
71 changed files with 1845 additions and 2774 deletions
|
|
@ -1 +0,0 @@
|
|||
bf219a30c29cf3ce35a2d4f1a34ddf17aec32be1
|
||||
216
boot.nix
216
boot.nix
|
|
@ -1,11 +1,4 @@
|
|||
{
|
||||
config,
|
||||
pkgs,
|
||||
lib,
|
||||
myLib,
|
||||
options,
|
||||
...
|
||||
}:
|
||||
{ config, pkgs, lib, myLib, options, ... }:
|
||||
with lib;
|
||||
let
|
||||
customKernelPatches = {
|
||||
|
|
@ -48,81 +41,43 @@ let
|
|||
patch = ./remove-kernel-drm.patch;
|
||||
};
|
||||
|
||||
|
||||
backports = {
|
||||
};
|
||||
|
||||
optimizeForCPUArch =
|
||||
arch:
|
||||
let
|
||||
optimizeForCPUArch = arch: let
|
||||
archConfigMap = {
|
||||
"k8" = "K8";
|
||||
"opteron" = "K8";
|
||||
"athlon64" = "K8";
|
||||
"athlon-fx" = "K8";
|
||||
"k8-sse3" = "K8SSE3";
|
||||
"opteron-sse3" = "K8SSE3";
|
||||
"athlon64-sse3" = "K8SSE3";
|
||||
"znver1" = "ZEN";
|
||||
"znver2" = "ZEN2";
|
||||
"znver3" = "ZEN3";
|
||||
"znver4" = "ZEN3";
|
||||
"bdver1" = "BULLDOZER";
|
||||
"bdver2" = "PILEDRIVER";
|
||||
"bdver3" = "STEAMROLLER";
|
||||
"bdver4" = "EXCAVATOR";
|
||||
"barcelona" = "BARCELONA";
|
||||
"amdfam10" = "BARCELONA";
|
||||
"btver1" = "BOBCAT";
|
||||
"btver2" = "JAGUAR";
|
||||
"k8" = "K8"; "opteron" = "K8"; "athlon64" = "K8"; "athlon-fx" = "K8";
|
||||
"k8-sse3" = "K8SSE3"; "opteron-sse3" = "K8SSE3"; "athlon64-sse3" = "K8SSE3";
|
||||
"znver1" = "ZEN"; "znver2" = "ZEN2"; "znver3" = "ZEN3"; "znver4" = "ZEN3";
|
||||
"bdver1" = "BULLDOZER"; "bdver2" = "PILEDRIVER"; "bdver3" = "STEAMROLLER"; "bdver4" = "EXCAVATOR";
|
||||
"barcelona" = "BARCELONA"; "amdfam10" = "BARCELONA";
|
||||
"btver1" = "BOBCAT"; "btver2" = "JAGUAR";
|
||||
|
||||
"rocketlake" = "ROCKETLAKE";
|
||||
"alderlake" = "ALDERLAKE";
|
||||
"sapphirerapids" = "SAPPHIRERAPIDS";
|
||||
"tigerlake" = "TIGERLAKE";
|
||||
"cooperlake" = "COOPERLAKE";
|
||||
"cascadelake" = "CASCADELAKE";
|
||||
"icelake-server" = "ICELAKE";
|
||||
"icelake-client" = "ICELAKE";
|
||||
"cannonlake" = "CANNONLAKE";
|
||||
"skylake-avx512" = "SKYLAKEX";
|
||||
"tremont" = "GOLDMONTPLUS";
|
||||
"goldmont-plus" = "GOLDMONTPLUS";
|
||||
"goldmont" = "GOLDMONT";
|
||||
"silvermont" = "SILVERMONT";
|
||||
"bonnel" = "GENERIC_CPU";
|
||||
"skylake" = "SKYLAKE";
|
||||
"broadwell" = "BROADWELL";
|
||||
"haswell" = "HASWELL";
|
||||
"ivybridge" = "IVYBRIDGE";
|
||||
"sandybridge" = "SANDYBRIDGE";
|
||||
"westmere" = "WESTMERE";
|
||||
"nehalem" = "NEHALEM";
|
||||
"rocketlake" = "ROCKETLAKE"; "alderlake" = "ALDERLAKE";
|
||||
"sapphirerapids" = "SAPPHIRERAPIDS"; "tigerlake" = "TIGERLAKE"; "cooperlake" = "COOPERLAKE";
|
||||
"cascadelake" = "CASCADELAKE"; "icelake-server" = "ICELAKE"; "icelake-client" = "ICELAKE";
|
||||
"cannonlake" = "CANNONLAKE"; "skylake-avx512" = "SKYLAKEX";
|
||||
"tremont" = "GOLDMONTPLUS"; "goldmont-plus" = "GOLDMONTPLUS"; "goldmont" = "GOLDMONT";
|
||||
"silvermont" = "SILVERMONT"; "bonnel" = "GENERIC_CPU"; "skylake" = "SKYLAKE";
|
||||
"broadwell" = "BROADWELL"; "haswell" = "HASWELL";
|
||||
"ivybridge" = "IVYBRIDGE"; "sandybridge" = "SANDYBRIDGE";
|
||||
"westmere" = "WESTMERE"; "nehalem" = "NEHALEM";
|
||||
"core2" = "CORE2";
|
||||
"nocona" = "PSC";
|
||||
"prescott" = "PSC";
|
||||
"pentium4m" = "PSC";
|
||||
"pentium4" = "PSC";
|
||||
"nocona" = "PSC"; "prescott" = "PSC"; "pentium4m" = "PSC"; "pentium4" = "PSC";
|
||||
|
||||
"nano-3000" = "GENERIC_CPU2";
|
||||
"nano-x2" = "GENERIC_CPU2";
|
||||
"nano-x4" = "GENERIC_CPU2";
|
||||
"nano-3000" = "GENERIC_CPU2"; "nano-x2" = "GENERIC_CPU2"; "nano-x4" = "GENERIC_CPU2";
|
||||
|
||||
"lujiazui" = "GENERIC_CPU2";
|
||||
|
||||
"native" = "NATIVE_INTEL";
|
||||
"x86-64-v2" = "GENERIC_CPU2";
|
||||
"x86-64-v3" = "GENERIC_CPU3";
|
||||
"x86-64-v4" = "GENERIC_CPU4";
|
||||
"native" = "NATIVE_INTEL"; "x86-64-v2" = "GENERIC_CPU2"; "x86-64-v3" = "GENERIC_CPU3"; "x86-64-v4" = "GENERIC_CPU4";
|
||||
};
|
||||
|
||||
archToConfig =
|
||||
arch:
|
||||
if (hasAttr arch archConfigMap) then
|
||||
archConfigMap."${arch}"
|
||||
else
|
||||
trace "Warning: '${arch}' not recognized, building for generic CPU" "GENERIC_CPU";
|
||||
in
|
||||
{
|
||||
archToConfig = arch:
|
||||
if (hasAttr arch archConfigMap) then archConfigMap."${arch}"
|
||||
else trace "Warning: '${arch}' not recognized, building for generic CPU" "GENERIC_CPU"
|
||||
;
|
||||
in {
|
||||
name = "optimize-for-${arch}";
|
||||
patch = null;
|
||||
extraConfig = ''
|
||||
|
|
@ -131,21 +86,13 @@ let
|
|||
};
|
||||
};
|
||||
|
||||
toCmdlineValue =
|
||||
v:
|
||||
if (isBool v) then
|
||||
(if v then "y" else "n")
|
||||
else if (isInt v || isString v) then
|
||||
(toString v)
|
||||
else if (isList v) then
|
||||
(concatStringsSep "," v)
|
||||
else
|
||||
throw "Invalid value for kernel cmdline parameter";
|
||||
toCmdlineValue = v: if (isBool v) then (if v then "y" else "n")
|
||||
else if (isInt v || isString v) then (toString v)
|
||||
else if (isList v) then (concatStringsSep "," v)
|
||||
else throw "Invalid value for kernel cmdline parameter";
|
||||
|
||||
toCmdlineList =
|
||||
set:
|
||||
mapAttrsToList (
|
||||
key: value:
|
||||
toCmdlineList = set: mapAttrsToList
|
||||
(key: value:
|
||||
if (isNull value) then
|
||||
null
|
||||
else if (value == "") then
|
||||
|
|
@ -160,14 +107,12 @@ let
|
|||
|
||||
cfg = config.aviallon.boot;
|
||||
generalCfg = config.aviallon.general;
|
||||
allowUnfree =
|
||||
(types.isType types.attrs config.nixpkgs.config)
|
||||
allowUnfree = (types.isType types.attrs config.nixpkgs.config)
|
||||
&& (hasAttr "allowUnfree" config.nixpkgs.config)
|
||||
&& (getAttr "allowUnfree" config.nixpkgs.config);
|
||||
|
||||
cpuConfig = config.aviallon.general.cpu;
|
||||
in
|
||||
{
|
||||
in {
|
||||
|
||||
options.aviallon.boot = {
|
||||
enable = mkOption {
|
||||
|
|
@ -183,6 +128,7 @@ in
|
|||
type = types.bool;
|
||||
};
|
||||
|
||||
|
||||
x32abi.enable = mkEnableOption "X32 kernel ABI";
|
||||
kvdo.enable = mkEnableOption "dm-kvdo kernel module";
|
||||
rtGroupSched.enable = mkEnableOption "RT cgroups"; # Breaks standard way of setting RT sched policy to processes
|
||||
|
|
@ -215,18 +161,11 @@ in
|
|||
cmdline = mkOption {
|
||||
description = "Kernel params as attributes (instead of list). Set a parameter to `null` to remove it.";
|
||||
default = { };
|
||||
example = {
|
||||
"i915.fastboot" = true;
|
||||
};
|
||||
type =
|
||||
with types;
|
||||
lazyAttrsOf (
|
||||
nullOr (oneOf [
|
||||
bool
|
||||
int
|
||||
str
|
||||
(listOf str)
|
||||
])
|
||||
example = { "i915.fastboot" = true; };
|
||||
type = with types; lazyAttrsOf (
|
||||
nullOr (
|
||||
oneOf [ bool int str (listOf str) ]
|
||||
)
|
||||
);
|
||||
};
|
||||
|
||||
|
|
@ -242,18 +181,14 @@ in
|
|||
description = "Merge specified attributes to kernel derivation (via special overideAttrs)";
|
||||
default = {};
|
||||
type = with types; attrs;
|
||||
example = {
|
||||
KCFLAGS = "-Wall";
|
||||
};
|
||||
example = { KCFLAGS = "-Wall"; };
|
||||
};
|
||||
|
||||
addOptimizationAttributes = mkOption {
|
||||
description = "Merge specified attributes to kernel derivation IF aviallon.optimizations.enabled is true";
|
||||
default = {};
|
||||
type = with types; attrs;
|
||||
example = {
|
||||
KCFLAGS = "-O3 -fipa-pta";
|
||||
};
|
||||
example = { KCFLAGS = "-O3 -fipa-pta"; };
|
||||
};
|
||||
};
|
||||
|
||||
|
|
@ -261,23 +196,17 @@ in
|
|||
};
|
||||
|
||||
imports = [
|
||||
(mkRemovedOptionModule [
|
||||
"aviallon"
|
||||
"boot"
|
||||
"extraKCflags"
|
||||
] "Replaced by aviallon.boot.kernel.addOptimizationAttributes attrset")
|
||||
( mkRemovedOptionModule [ "aviallon" "boot" "extraKCflags" ] "Replaced by aviallon.boot.kernel.addOptimizationAttributes attrset" )
|
||||
( mkRemovedOptionModule [ "aviallon" "boot" "loops_per_jiffies" ] "Actually unused by the kernel" )
|
||||
];
|
||||
|
||||
config = mkMerge [
|
||||
{
|
||||
assertions = [
|
||||
{
|
||||
assertion = cfg.efi -> !cfg.legacy;
|
||||
{ assertion = cfg.efi -> !cfg.legacy;
|
||||
message = "exactly one of aviallon.boot.efi and aviallon.boot.legacy must be set";
|
||||
}
|
||||
{
|
||||
assertion = cfg.legacy -> cfg.useGrub;
|
||||
{ assertion = cfg.legacy -> cfg.useGrub;
|
||||
message = "Using GRUB is mandatory for legacy BIOS";
|
||||
}
|
||||
];
|
||||
|
|
@ -307,18 +236,17 @@ in
|
|||
else if config.boot.consoleLogLevel == 4 then
|
||||
"auto"
|
||||
else
|
||||
"yes";
|
||||
"yes"
|
||||
;
|
||||
|
||||
# 'quiet' is required to silence systemd-efi-stub messages
|
||||
"quiet" = mkIf (config.boot.consoleLogLevel <= 4) true;
|
||||
};
|
||||
|
||||
nixpkgs.overlays = [
|
||||
(final: prev: {
|
||||
nixpkgs.overlays = [(final: prev: {
|
||||
# Use bleeding-edge linux firmware
|
||||
linux-firmware = prev.unstable.linux-firmware;
|
||||
})
|
||||
];
|
||||
})];
|
||||
|
||||
boot = {
|
||||
bootspec.enableValidation = true;
|
||||
|
|
@ -330,14 +258,9 @@ in
|
|||
initrd.systemd.enable = true;
|
||||
|
||||
initrd.compressor = "zstd";
|
||||
initrd.compressorArgs = [
|
||||
"-T0"
|
||||
"-9"
|
||||
];
|
||||
initrd.compressorArgs = [ "-T0" "-9" ];
|
||||
|
||||
kernelPackages =
|
||||
with myLib.debug;
|
||||
let
|
||||
kernelPackages = with myLib.debug; let
|
||||
baseKernel = traceValWithPrefix "aviallon.boot.kernel.package" cfg.kernel.package;
|
||||
|
||||
# Possible CFLAGS source : (myLib.optimizations.makeOptimizationFlags {}).CFLAGS
|
||||
|
|
@ -346,15 +269,15 @@ in
|
|||
"-march=${cpuConfig.arch}"
|
||||
"-mtune=${cpuConfig.tune or cpuConfig.arch}"
|
||||
]
|
||||
++ optional (
|
||||
!isNull cpuConfig.caches.lastLevel
|
||||
) "--param l2-cache-size=${toString cpuConfig.caches.lastLevel}"
|
||||
++ optional (! isNull cpuConfig.caches.lastLevel ) "--param l2-cache-size=${toString cpuConfig.caches.lastLevel}"
|
||||
++ optional (! isNull cpuConfig.caches.l1d ) "--param l1-cache-size=${toString cpuConfig.caches.l1d}"
|
||||
);
|
||||
kRustflags = traceValWithPrefix "kRustflags" ([
|
||||
kRustflags = traceValWithPrefix "kRustflags" (
|
||||
[
|
||||
"-Ctarget-cpu=${cpuConfig.arch}"
|
||||
"-Ctune-cpu=${cpuConfig.tune or cpuConfig.arch}"
|
||||
]);
|
||||
]
|
||||
);
|
||||
|
||||
optimizedKernelAttrs = traceValWithPrefix "optimizedKernelAttrs" (
|
||||
optionalAttrs config.aviallon.optimizations.enable (
|
||||
|
|
@ -365,9 +288,7 @@ in
|
|||
KRUSTFLAGS = kRustflags;
|
||||
};
|
||||
}
|
||||
(
|
||||
traceValWithPrefix "aviallon.boot.kernel.addOptimizationAttributes" cfg.kernel.addOptimizationAttributes
|
||||
)
|
||||
(traceValWithPrefix "aviallon.boot.kernel.addOptimizationAttributes" cfg.kernel.addOptimizationAttributes)
|
||||
)
|
||||
);
|
||||
moddedKernelAttrs = traceValWithPrefix "moddedKernelAttrs" (
|
||||
|
|
@ -384,7 +305,9 @@ in
|
|||
'';
|
||||
})
|
||||
else
|
||||
baseKernel;
|
||||
baseKernel
|
||||
;
|
||||
|
||||
|
||||
moddedKernel = myLib.optimizations.addAttrs noDRMKernel moddedKernelAttrs;
|
||||
|
||||
|
|
@ -397,18 +320,15 @@ in
|
|||
# moddedKernel
|
||||
# ;
|
||||
|
||||
in
|
||||
mkOverride 2 (pkgs.linuxPackagesFor noDRMKernel);
|
||||
in mkOverride 2 (pkgs.linuxPackagesFor noDRMKernel);
|
||||
|
||||
kernelPatches =
|
||||
[ ]
|
||||
kernelPatches = []
|
||||
++ optional cfg.x32abi.enable customKernelPatches.enableX32ABI
|
||||
++ optional cfg.rtGroupSched.enable customKernelPatches.enableRTGroupSched
|
||||
++ optional cfg.energyModel.enable customKernelPatches.enableEnergyModel
|
||||
++ optional (isXanmod cfg.kernel.package && config.aviallon.optimizations.enable) (
|
||||
customKernelPatches.optimizeForCPUArch config.aviallon.general.cpu.arch
|
||||
)
|
||||
++ optional config.aviallon.optimizations.enable customKernelPatches.zstd;
|
||||
++ optional (isXanmod cfg.kernel.package && config.aviallon.optimizations.enable) (customKernelPatches.optimizeForCPUArch config.aviallon.general.cpu.arch)
|
||||
++ optional config.aviallon.optimizations.enable customKernelPatches.zstd
|
||||
;
|
||||
|
||||
# Hide boot menu for systemd-boot by default
|
||||
loader.timeout = mkIf (!cfg.useGrub) 0;
|
||||
|
|
@ -425,11 +345,9 @@ in
|
|||
enable = cfg.efi && (!cfg.useGrub);
|
||||
configurationLimit = cfg.configurationLimit;
|
||||
consoleMode = mkDefault "max";
|
||||
extraInstallCommands =
|
||||
let
|
||||
extraInstallCommands = let
|
||||
efiDir = config.boot.loader.efi.efiSysMountPoint;
|
||||
in
|
||||
''
|
||||
in ''
|
||||
export PATH="$PATH:${getBin pkgs.coreutils-full}/bin:${getBin pkgs.gnused}/bin"
|
||||
rpath=
|
||||
generation=
|
||||
|
|
|
|||
|
|
@ -1,26 +1,16 @@
|
|||
{
|
||||
config,
|
||||
pkgs,
|
||||
lib,
|
||||
myLib,
|
||||
options,
|
||||
...
|
||||
}:
|
||||
{ config, pkgs, lib, myLib, options, ... }:
|
||||
with lib;
|
||||
let
|
||||
cfg = config.aviallon.desktop;
|
||||
generalCfg = config.aviallon.general;
|
||||
in
|
||||
{
|
||||
in {
|
||||
options.aviallon.desktop.browser = {
|
||||
firefox.overrides = mkOption {
|
||||
internal = true;
|
||||
description = "Override firefox package settings";
|
||||
type = types.attrs;
|
||||
default = {};
|
||||
example = {
|
||||
enablePlasmaIntegration = true;
|
||||
};
|
||||
example = { enablePlasmaIntegration = true; };
|
||||
};
|
||||
chromium = {
|
||||
package = mkOption {
|
||||
|
|
@ -34,21 +24,13 @@ in
|
|||
description = "Override chromium package settings";
|
||||
type = types.attrs;
|
||||
default = {};
|
||||
example = {
|
||||
commandLineArgs = [
|
||||
"--enable-features=UseOzonePlatform"
|
||||
"--ozone-platform=wayland"
|
||||
];
|
||||
};
|
||||
example = { commandLineArgs = [ "--enable-features=UseOzonePlatform" "--ozone-platform=wayland" ]; };
|
||||
};
|
||||
commandLineArgs = mkOption {
|
||||
description = "Override chromium flags";
|
||||
type = with types; listOf str;
|
||||
default = [ "--ozone-platform-hint=auto" ];
|
||||
example = [
|
||||
"--ozone-platform-hint=auto"
|
||||
"--ignore-gpu-blacklist"
|
||||
];
|
||||
example = [ "--ozone-platform-hint=auto" "--ignore-gpu-blacklist" ];
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
@ -59,19 +41,16 @@ in
|
|||
# firefox is added by plasma or gnome
|
||||
];
|
||||
|
||||
nixpkgs.overlays = [
|
||||
(final: prev: {
|
||||
|
||||
nixpkgs.overlays = [(final: prev: {
|
||||
myFirefox = (final.callPackage ../packages/firefox.nix cfg.browser.firefox.overrides);
|
||||
})
|
||||
];
|
||||
})];
|
||||
|
||||
aviallon.desktop.browser.chromium.overrides.enableWideVine = true;
|
||||
|
||||
aviallon.programs.allowUnfreeList = [
|
||||
"chromium-unwrapped"
|
||||
"chrome-widevine-cdm"
|
||||
"ungoogled-chromium"
|
||||
"chromium" # because of widevine
|
||||
"chromium-unwrapped" "chrome-widevine-cdm"
|
||||
"ungoogled-chromium" "chromium" # because of widevine
|
||||
];
|
||||
|
||||
environment.variables = {
|
||||
|
|
@ -79,9 +58,7 @@ in
|
|||
};
|
||||
|
||||
aviallon.desktop.browser.chromium.overrides.commandLineArgs = cfg.browser.chromium.commandLineArgs;
|
||||
aviallon.desktop.browser.chromium.commandLineArgs = mkIf generalCfg.unsafeOptimizations (
|
||||
options.aviallon.desktop.browser.chromium.commandLineArgs.default
|
||||
++ [
|
||||
aviallon.desktop.browser.chromium.commandLineArgs = mkIf generalCfg.unsafeOptimizations (options.aviallon.desktop.browser.chromium.commandLineArgs.default ++ [
|
||||
"--flag-switches-begin"
|
||||
"--ignore-gpu-blacklist"
|
||||
"--enable-gpu-rasterization"
|
||||
|
|
@ -92,8 +69,7 @@ in
|
|||
"--enable-features=VaapiVideoDecoder,VaapiVideoEncoder,WebRTCPipeWireCapturer"
|
||||
"--disable-features=UseChromeOSDirectVideoDecoder"
|
||||
"--flag-switches-end"
|
||||
]
|
||||
);
|
||||
]);
|
||||
|
||||
programs.chromium = {
|
||||
enable = true;
|
||||
|
|
|
|||
|
|
@ -1,25 +1,23 @@
|
|||
{
|
||||
config,
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
{ config, pkgs, lib, ... }:
|
||||
with lib;
|
||||
let
|
||||
xcfg = config.services.xserver;
|
||||
generalCfg = config.aviallon.general;
|
||||
in
|
||||
{
|
||||
in {
|
||||
config = {
|
||||
services.kmscon = {
|
||||
hwRender = mkDefault xcfg.enable;
|
||||
extraConfig =
|
||||
""
|
||||
+ optionalString (!isNull xcfg.layout) "xkb-layout=${xcfg.layout}"
|
||||
+ optionalString (!isNull xcfg.xkbVariant) "xkb-variant=${xcfg.xkbVariant}"
|
||||
+ optionalString (!isNull xcfg.xkbOptions) "xkb-options=${xcfg.xkbOptions}"
|
||||
+ "font-dpi=${toString (xcfg.dpi or 96)}";
|
||||
extraConfig = ""
|
||||
+ optionalString ( ! isNull xcfg.layout )
|
||||
"xkb-layout=${xcfg.layout}"
|
||||
+ optionalString ( ! isNull xcfg.xkbVariant )
|
||||
"xkb-variant=${xcfg.xkbVariant}"
|
||||
+ optionalString ( ! isNull xcfg.xkbOptions )
|
||||
"xkb-options=${xcfg.xkbOptions}"
|
||||
+ "font-dpi=${toString (xcfg.dpi or 96)}"
|
||||
;
|
||||
enable = mkDefault (! generalCfg.minimal );
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,9 +1,4 @@
|
|||
{
|
||||
config,
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
{ config, pkgs, lib, ... }:
|
||||
with lib;
|
||||
{
|
||||
imports = [
|
||||
|
|
|
|||
|
|
@ -1,20 +1,12 @@
|
|||
{
|
||||
config,
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
{ config, pkgs, lib, ... }:
|
||||
with lib;
|
||||
let
|
||||
cfg = config.aviallon.developer;
|
||||
generalCfg = config.aviallon.general;
|
||||
in
|
||||
{
|
||||
in {
|
||||
options.aviallon.developer = {
|
||||
enable = mkEnableOption "enable developer mode on this machine";
|
||||
virtualization.host.enable = (mkEnableOption "hypervisor virtualization services") // {
|
||||
default = true;
|
||||
};
|
||||
virtualization.host.enable = (mkEnableOption "hypervisor virtualization services") // { default = true; };
|
||||
virtualbox.unstable = mkEnableOption "use unstable virtualbox";
|
||||
};
|
||||
config = mkIf cfg.enable {
|
||||
|
|
@ -74,9 +66,7 @@ in
|
|||
gnumake
|
||||
cmake
|
||||
|
||||
linux-manual
|
||||
man-pages
|
||||
man-pages-posix
|
||||
linux-manual man-pages man-pages-posix
|
||||
|
||||
linuxHeaders
|
||||
|
||||
|
|
@ -109,6 +99,7 @@ in
|
|||
};
|
||||
};
|
||||
|
||||
|
||||
virtualisation.spiceUSBRedirection.enable = true; # Quality of life
|
||||
security.virtualisation.flushL1DataCache = "never"; # We do not care, we are on a dev platform
|
||||
|
||||
|
|
@ -118,25 +109,19 @@ in
|
|||
host.enableHardening = false; # Causes kernel build failures
|
||||
};
|
||||
|
||||
nixpkgs.overlays =
|
||||
[ ]
|
||||
++ optional cfg.virtualbox.unstable (
|
||||
final: prev: {
|
||||
nixpkgs.overlays = []
|
||||
++ optional cfg.virtualbox.unstable (final: prev: {
|
||||
virtualbox = final.unstable.virtualbox;
|
||||
virtualboxExtpack = final.unstable.virtualboxExtpack;
|
||||
}
|
||||
);
|
||||
})
|
||||
;
|
||||
|
||||
console.enable = true;
|
||||
|
||||
boot.initrd.systemd.emergencyAccess = mkIf (
|
||||
config.users.users.root.hashedPassword != null
|
||||
) config.users.users.root.hashedPassword;
|
||||
boot.initrd.systemd.emergencyAccess = mkIf (config.users.users.root.hashedPassword != null) config.users.users.root.hashedPassword;
|
||||
|
||||
environment.extraOutputsToInstall = [
|
||||
"doc"
|
||||
"info"
|
||||
"dev"
|
||||
"doc" "info" "dev"
|
||||
];
|
||||
|
||||
services.ollama = {
|
||||
|
|
@ -145,14 +130,12 @@ in
|
|||
group = "ollama";
|
||||
user = "ollama";
|
||||
package =
|
||||
if config.aviallon.hardware.amd.enable then
|
||||
pkgs.unstable.ollama-rocm
|
||||
else if
|
||||
(config.aviallon.hardware.nvidia.enable && config.aviallon.hardware.nvidia.variant != "nouveau")
|
||||
then
|
||||
pkgs.unstable.ollama-cuda
|
||||
else
|
||||
pkgs.unstable.ollama;
|
||||
if config.aviallon.hardware.amd.enable
|
||||
then pkgs.unstable.ollama-rocm
|
||||
else if (config.aviallon.hardware.nvidia.enable && config.aviallon.hardware.nvidia.variant != "nouveau")
|
||||
then pkgs.unstable.ollama-cuda
|
||||
else pkgs.unstable.ollama
|
||||
;
|
||||
};
|
||||
|
||||
aviallon.services.journald.extraConfig = {
|
||||
|
|
@ -162,10 +145,8 @@ in
|
|||
aviallon.boot.configurationLimit = mkDefault 10;
|
||||
|
||||
aviallon.programs.allowUnfreeList = [
|
||||
"tabnine"
|
||||
"clion"
|
||||
"Oracle_VM_VirtualBox_Extension_Pack"
|
||||
"virtualbox"
|
||||
"tabnine" "clion"
|
||||
"Oracle_VM_VirtualBox_Extension_Pack" "virtualbox"
|
||||
"intelephense"
|
||||
];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,14 +1,8 @@
|
|||
{
|
||||
config,
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
{ config, pkgs, lib, ...}:
|
||||
with lib;
|
||||
let
|
||||
cfg = config.aviallon.desktop;
|
||||
in
|
||||
{
|
||||
in {
|
||||
config = mkIf cfg.enable {
|
||||
services.flatpak.enable = mkDefault true;
|
||||
systemd.services.flatpak-add-flathub = {
|
||||
|
|
@ -38,19 +32,14 @@ in
|
|||
};
|
||||
|
||||
fileSystems =
|
||||
let
|
||||
mkRoSymBind = path: {
|
||||
let mkRoSymBind = path: {
|
||||
device = path;
|
||||
fsType = "none";
|
||||
options = [
|
||||
"rbind"
|
||||
"ro"
|
||||
"x-gvfs-hide"
|
||||
];
|
||||
options = [ "rbind" "ro" "x-gvfs-hide" ];
|
||||
};
|
||||
in
|
||||
{
|
||||
in {
|
||||
"/usr/share/icons" = mkRoSymBind "/run/current-system/sw/share/icons";
|
||||
};
|
||||
};
|
||||
}
|
||||
;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,19 +1,11 @@
|
|||
{
|
||||
config,
|
||||
pkgs,
|
||||
lib,
|
||||
myLib,
|
||||
suyu,
|
||||
...
|
||||
}:
|
||||
{ config, pkgs, lib, myLib, suyu, ... }:
|
||||
with lib;
|
||||
let
|
||||
cfg = config.aviallon.desktop;
|
||||
generalCfg = config.aviallon.general;
|
||||
optimizePkg = config.aviallon.optimizations.optimizePkg;
|
||||
mkTmpDir = dirpath: cleanup: "D ${dirpath} 777 root root ${cleanup}";
|
||||
in
|
||||
{
|
||||
in {
|
||||
|
||||
options = {
|
||||
aviallon.desktop.gaming = {
|
||||
|
|
@ -35,37 +27,24 @@ in
|
|||
|
||||
config = mkIf cfg.gaming.enable {
|
||||
assertions = [
|
||||
{
|
||||
assertion = cfg.gaming.enable -> cfg.enable;
|
||||
message = "Gaming features requires desktop to be enabled";
|
||||
}
|
||||
{
|
||||
assertion = cfg.gaming.enable -> !generalCfg.minimal;
|
||||
message = "Gaming features are incompatible with minimal mode";
|
||||
}
|
||||
{ assertion = cfg.gaming.enable -> cfg.enable; message = "Gaming features requires desktop to be enabled"; }
|
||||
{ assertion = cfg.gaming.enable -> !generalCfg.minimal; message = "Gaming features are incompatible with minimal mode"; }
|
||||
];
|
||||
|
||||
environment.systemPackages =
|
||||
let
|
||||
environment.systemPackages = let
|
||||
my_yuzu = cfg.gaming.yuzu.package.overrideAttrs (old: {
|
||||
cmakeFlags = old.cmakeFlags ++ [
|
||||
#"-DYUZU_USE_PRECOMPILED_HEADERS=OFF"
|
||||
#"-DDYNARMIC_USE_PRECOMPILED_HEADERS=OFF"
|
||||
];
|
||||
});
|
||||
in
|
||||
with pkgs;
|
||||
[
|
||||
in with pkgs; [
|
||||
gamescope
|
||||
mangohud
|
||||
lutris
|
||||
bottles
|
||||
]
|
||||
++ optionals cfg.gaming.emulation [
|
||||
(optimizePkg {
|
||||
recursive = 0;
|
||||
lto = false;
|
||||
} my_yuzu)
|
||||
] ++ optionals cfg.gaming.emulation [
|
||||
(optimizePkg { recursive = 0; lto = false; } my_yuzu)
|
||||
(optimizePkg { } cfg.gaming.ryujinx.package)
|
||||
];
|
||||
|
||||
|
|
@ -125,10 +104,7 @@ in
|
|||
};
|
||||
|
||||
aviallon.programs.allowUnfreeList = [
|
||||
"steam"
|
||||
"steam-original"
|
||||
"steam-runtime"
|
||||
"steam-run"
|
||||
"steam" "steam-original" "steam-runtime" "steam-run"
|
||||
];
|
||||
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,16 +1,9 @@
|
|||
{
|
||||
config,
|
||||
pkgs,
|
||||
lib,
|
||||
myLib,
|
||||
...
|
||||
}:
|
||||
{ config, pkgs, lib, myLib, ... }:
|
||||
with lib;
|
||||
let
|
||||
cfg = config.aviallon.desktop;
|
||||
generalCfg = config.aviallon.general;
|
||||
in
|
||||
{
|
||||
in {
|
||||
options.aviallon.desktop = {
|
||||
enable = mkOption {
|
||||
default = true;
|
||||
|
|
@ -21,13 +14,7 @@ in
|
|||
environment = mkOption {
|
||||
default = "plasma";
|
||||
example = "gnome";
|
||||
type =
|
||||
with types;
|
||||
enum [
|
||||
"plasma"
|
||||
"plasma6"
|
||||
"gnome"
|
||||
];
|
||||
type = with types; enum [ "plasma" "plasma6" "gnome" ];
|
||||
description = "What Desktop Environment to use";
|
||||
};
|
||||
layout = mkOption {
|
||||
|
|
@ -64,13 +51,7 @@ in
|
|||
};
|
||||
|
||||
imports = [
|
||||
(mkRemovedOptionModule [
|
||||
"aviallon"
|
||||
"desktop"
|
||||
"graphics"
|
||||
"shaderCache"
|
||||
"path"
|
||||
] "Now always relative to $XDG_CACHE_HOME")
|
||||
(mkRemovedOptionModule [ "aviallon" "desktop" "graphics" "shaderCache" "path" ] "Now always relative to $XDG_CACHE_HOME" )
|
||||
];
|
||||
|
||||
config = mkIf cfg.enable (mkMerge [
|
||||
|
|
@ -90,6 +71,7 @@ in
|
|||
services.xserver.xkb.layout = cfg.layout;
|
||||
services.xserver.xkb.options = "eurosign:e";
|
||||
|
||||
|
||||
aviallon.boot.cmdline = {
|
||||
splash = mkIf (!generalCfg.debug) "";
|
||||
"udev.log_level" = mkIf (!generalCfg.debug) 3;
|
||||
|
|
@ -122,7 +104,9 @@ in
|
|||
p7zip
|
||||
];
|
||||
|
||||
security.sudo.extraConfig = ''
|
||||
|
||||
security.sudo.extraConfig =
|
||||
''
|
||||
# Keep X and Wayland related variables for better GUI integration
|
||||
Defaults:root,%wheel env_keep+=DISPLAY
|
||||
Defaults:root,%wheel env_keep+=XAUTHORITY
|
||||
|
|
@ -130,7 +114,8 @@ in
|
|||
Defaults:root,%wheel env_keep+=WAYLAND_DISPLAY
|
||||
Defaults:root,%wheel env_keep+=WAYLAND_SOCKET
|
||||
Defaults:root,%wheel env_keep+=XDG_RUNTIME_DIR
|
||||
'';
|
||||
''
|
||||
;
|
||||
|
||||
}
|
||||
(mkIf (!generalCfg.minimal) {
|
||||
|
|
@ -189,12 +174,12 @@ in
|
|||
};
|
||||
|
||||
aviallon.programs.allowUnfreeList = [
|
||||
"spotify"
|
||||
"spotify-unwrapped"
|
||||
"spotify" "spotify-unwrapped"
|
||||
|
||||
"veracrypt"
|
||||
];
|
||||
|
||||
|
||||
aviallon.programs.libreoffice.enable = true;
|
||||
|
||||
services.packagekit.enable = mkDefault true;
|
||||
|
|
|
|||
|
|
@ -1,14 +1,8 @@
|
|||
{
|
||||
config,
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
{config, pkgs, lib, ...}:
|
||||
with lib;
|
||||
let
|
||||
cfg = config.aviallon.desktop;
|
||||
in
|
||||
{
|
||||
in {
|
||||
config = mkIf (cfg.enable && (cfg.environment == "gnome")) {
|
||||
services.xserver.desktopManager.gnome = {
|
||||
enable = true;
|
||||
|
|
@ -49,9 +43,7 @@ in
|
|||
|
||||
aviallon.programs.libreoffice.enable = true;
|
||||
|
||||
environment.systemPackages =
|
||||
with pkgs;
|
||||
[ guake ]
|
||||
environment.systemPackages = with pkgs; [ guake ]
|
||||
++ (with gnome; [
|
||||
gnome-software
|
||||
])
|
||||
|
|
@ -61,7 +53,8 @@ in
|
|||
dash-to-dock-toggle
|
||||
dash-to-dock-animator
|
||||
tray-icons-reloaded
|
||||
]);
|
||||
])
|
||||
;
|
||||
systemd.packages = with pkgs; [
|
||||
gnomeExtensions.gamemode
|
||||
gnomeExtensions.dash-to-dock
|
||||
|
|
|
|||
|
|
@ -1,9 +1,4 @@
|
|||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
{ config, lib, pkgs, ... }:
|
||||
with lib;
|
||||
let
|
||||
cfg = config.aviallon.desktop;
|
||||
|
|
@ -17,26 +12,21 @@ let
|
|||
|
||||
# Multimedia Packages
|
||||
|
||||
ffmpeg-full-unfree =
|
||||
let
|
||||
ffmpeg-full-unfree = let
|
||||
withUnfree = pkgs.unstable.ffmpeg-full.override {
|
||||
withUnfree = true;
|
||||
withTensorflow = false;
|
||||
};
|
||||
in
|
||||
withUnfree;
|
||||
in withUnfree;
|
||||
|
||||
in
|
||||
{
|
||||
in {
|
||||
config = mkIf (cfg.enable && !generalCfg.minimal) {
|
||||
environment.systemPackages = with pkgs; [
|
||||
ffmpeg-full-unfree
|
||||
krita
|
||||
(pkgs.wrapOBS {
|
||||
plugins = with obs-studio-plugins; [
|
||||
(pkgs.wrapOBS { plugins = with obs-studio-plugins; [
|
||||
obs-pipewire-audio-capture
|
||||
];
|
||||
})
|
||||
]; })
|
||||
|
||||
#scribus
|
||||
yt-dlp
|
||||
|
|
@ -46,11 +36,10 @@ in
|
|||
#jamesdsp # Audio post-processing
|
||||
];
|
||||
|
||||
nixpkgs.overlays = [
|
||||
(final: prev: {
|
||||
nixpkgs.overlays = [(final: prev: {
|
||||
inherit ffmpeg-full-unfree;
|
||||
})
|
||||
];
|
||||
})];
|
||||
|
||||
|
||||
# Enable sound.
|
||||
services.pulseaudio.enable = false;
|
||||
|
|
@ -87,10 +76,7 @@ in
|
|||
"node.description" = "Sortie combinée";
|
||||
"combine.latency-compensate" = true;
|
||||
"combine.props" = {
|
||||
"audio.position" = [
|
||||
"FL"
|
||||
"FR"
|
||||
];
|
||||
"audio.position" = [ "FL" "FR" ];
|
||||
};
|
||||
"stream.props" = {};
|
||||
"stream.rules" = [
|
||||
|
|
@ -119,27 +105,21 @@ in
|
|||
"bluez5.enable-sbc-xq" = true; # Should be default now
|
||||
"bluez5.enable-msbc" = true; # Default
|
||||
"bluez5.enable-hw-volume" = true; # Default
|
||||
"bluez5.headset-roles" = [
|
||||
"hsp_hs"
|
||||
"hsp_ag"
|
||||
"hfp_hf"
|
||||
"hfp_ag"
|
||||
];
|
||||
"bluez5.headset-roles" = [ "hsp_hs" "hsp_ag" "hfp_hf" "hfp_ag" ];
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
security.rtkit.enable = true; # Real-time support for pipewire
|
||||
|
||||
aviallon.programs.allowUnfreeList = [
|
||||
"ffmpeg-full" # Because of unfree codecs
|
||||
];
|
||||
|
||||
|
||||
# Hardware-agnostic audio denoising
|
||||
systemd.user.services =
|
||||
let
|
||||
mkPipewireModule =
|
||||
{ conf, description }:
|
||||
{
|
||||
systemd.user.services = let
|
||||
mkPipewireModule = {conf, description}: {
|
||||
unitConfig = {
|
||||
Slice = "session.slice";
|
||||
};
|
||||
|
|
@ -158,21 +138,16 @@ in
|
|||
wantedBy = [ "pipewire.service" ];
|
||||
inherit description;
|
||||
};
|
||||
in
|
||||
{
|
||||
in {
|
||||
pipewire-noise-filter = mkIf cfg.audio.noise-filter.enable (
|
||||
(mkPipewireModule {
|
||||
conf = filterConfig;
|
||||
description = "Pipewire Noise Filter";
|
||||
})
|
||||
// {
|
||||
(mkPipewireModule { conf = filterConfig; description = "Pipewire Noise Filter"; }) //
|
||||
{
|
||||
enable = cfg.audio.noise-filter.strength > 0.0;
|
||||
}
|
||||
);
|
||||
pipewire-airplay-sink = mkIf cfg.audio.airplay.enable (mkPipewireModule {
|
||||
conf = airplayConfig;
|
||||
description = "Pipewire Airplay Sink";
|
||||
});
|
||||
pipewire-airplay-sink = mkIf cfg.audio.airplay.enable (
|
||||
mkPipewireModule { conf = airplayConfig; description = "Pipewire Airplay Sink"; }
|
||||
);
|
||||
};
|
||||
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,6 +1,5 @@
|
|||
{
|
||||
lib,
|
||||
writeText,
|
||||
{ lib
|
||||
, writeText
|
||||
}:
|
||||
|
||||
writeText "pipewire-airplay.conf" ''
|
||||
|
|
|
|||
|
|
@ -1,8 +1,7 @@
|
|||
{
|
||||
lib,
|
||||
writeText,
|
||||
rnnoise-plugin,
|
||||
noiseFilterStrength,
|
||||
{ lib
|
||||
, writeText
|
||||
, rnnoise-plugin
|
||||
, noiseFilterStrength
|
||||
}:
|
||||
|
||||
writeText "pipewire-noise-filter.conf" ''
|
||||
|
|
|
|||
|
|
@ -1,16 +1,9 @@
|
|||
{
|
||||
config,
|
||||
pkgs,
|
||||
nixpkgs-unstable,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
{config, pkgs, nixpkgs-unstable, lib, ...}:
|
||||
with lib;
|
||||
let
|
||||
cfg = config.aviallon.desktop;
|
||||
optimizeCfg = config.aviallon.optimizations;
|
||||
in
|
||||
{
|
||||
in {
|
||||
|
||||
imports = [
|
||||
./plasma6.nix
|
||||
|
|
|
|||
|
|
@ -1,17 +1,11 @@
|
|||
{
|
||||
config,
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
{ config, pkgs, lib, ... }:
|
||||
with lib;
|
||||
let
|
||||
cfg = config.aviallon.desktop;
|
||||
generic = import ./generic.nix {
|
||||
kdePackages = pkgs.kdePackages;
|
||||
};
|
||||
in
|
||||
{
|
||||
in {
|
||||
config = mkIf (cfg.enable && (cfg.environment == "plasma6")) {
|
||||
# Enable the Plasma 6 Desktop Environment.
|
||||
services.desktopManager.plasma6 = {
|
||||
|
|
|
|||
|
|
@ -1,24 +1,16 @@
|
|||
{
|
||||
config,
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
{ config, pkgs, lib, ... }:
|
||||
with lib;
|
||||
let
|
||||
cfg = config.aviallon.desktop;
|
||||
generalCfg = config.aviallon.general;
|
||||
in
|
||||
{
|
||||
in {
|
||||
config = mkIf (cfg.enable && !generalCfg.minimal) {
|
||||
services.printing = {
|
||||
enable = true;
|
||||
defaultShared = mkDefault true;
|
||||
browsing = mkDefault true;
|
||||
listenAddresses = [ "0.0.0.0:631" ];
|
||||
drivers =
|
||||
with pkgs;
|
||||
[ ]
|
||||
drivers = with pkgs; []
|
||||
++ (optionals (!generalCfg.minimal) [
|
||||
hplipWithPlugin
|
||||
gutenprint
|
||||
|
|
@ -54,13 +46,10 @@ in
|
|||
brscan4.enable = true;
|
||||
};
|
||||
|
||||
networking.firewall.allowedTCPPorts = optionals config.services.printing.enable [
|
||||
631
|
||||
139
|
||||
445
|
||||
];
|
||||
networking.firewall.allowedTCPPorts = optionals config.services.printing.enable [ 631 139 445 ];
|
||||
networking.firewall.allowedUDPPorts = optionals config.services.printing.enable [ 137 ];
|
||||
|
||||
|
||||
aviallon.programs.allowUnfreeList = [
|
||||
"hplip"
|
||||
"hplipWithPlugin"
|
||||
|
|
|
|||
|
|
@ -1,15 +1,9 @@
|
|||
{
|
||||
config,
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
{ config, pkgs, lib, ... }:
|
||||
with lib;
|
||||
let
|
||||
cfg = config.aviallon.desktop;
|
||||
sddmCfg = config.services.displayManager.sddm;
|
||||
in
|
||||
{
|
||||
in {
|
||||
options.aviallon.desktop.sddm.unstable = mkEnableOption "bleeding-edge SDDM";
|
||||
options.aviallon.desktop.sddm.enable = mkEnableOption "custom SDDM configuration";
|
||||
|
||||
|
|
|
|||
|
|
@ -1,20 +1,9 @@
|
|||
{
|
||||
config,
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
{ config, pkgs, lib, ... }:
|
||||
with lib;
|
||||
let
|
||||
cfg = config.aviallon.filesystems;
|
||||
|
||||
ioSchedType = types.enum [
|
||||
"bfq"
|
||||
"kyber"
|
||||
"mq-deadline"
|
||||
"none"
|
||||
null
|
||||
];
|
||||
ioSchedType = types.enum [ "bfq" "kyber" "mq-deadline" "none" null ];
|
||||
in
|
||||
{
|
||||
imports = [
|
||||
|
|
@ -70,39 +59,22 @@ in
|
|||
boot.vdo.enable = config.aviallon.boot.kvdo.enable;
|
||||
};
|
||||
boot.initrd.kernelModules = ifEnable cfg.lvm [
|
||||
"dm-cache"
|
||||
"dm-cache-smq"
|
||||
"dm-cache-mq"
|
||||
"dm-cache-cleaner"
|
||||
"dm-cache" "dm-cache-smq" "dm-cache-mq" "dm-cache-cleaner"
|
||||
];
|
||||
boot.kernelModules =
|
||||
[ ]
|
||||
++ optionals cfg.lvm [
|
||||
"dm-cache"
|
||||
"dm-cache-smq"
|
||||
"dm-persistent-data"
|
||||
"dm-bio-prison"
|
||||
"dm-clone"
|
||||
"dm-crypt"
|
||||
"dm-writecache"
|
||||
"dm-mirror"
|
||||
"dm-snapshot"
|
||||
]
|
||||
++ optionals config.aviallon.boot.kvdo.enable [ "kvdo" ];
|
||||
boot.kernelModules = []
|
||||
++ optionals cfg.lvm [ "dm-cache" "dm-cache-smq" "dm-persistent-data" "dm-bio-prison" "dm-clone" "dm-crypt" "dm-writecache" "dm-mirror" "dm-snapshot" ]
|
||||
++ optionals config.aviallon.boot.kvdo.enable [ "kvdo" ]
|
||||
;
|
||||
|
||||
boot.supportedFilesystems = [
|
||||
"ntfs"
|
||||
"ext4"
|
||||
"vfat"
|
||||
"exfat"
|
||||
];
|
||||
boot.supportedFilesystems = [ "ntfs" "ext4" "vfat" "exfat" ];
|
||||
|
||||
hardware.block.defaultSchedulerRotational = mkDefault cfg.hddScheduler;
|
||||
aviallon.filesystems.udevRules = mkBefore (concatLists [
|
||||
(optional (!(builtins.isNull cfg.hddScheduler))
|
||||
''ACTION!="remove", SUBSYSTEM=="block", KERNEL=="sd[a-z]", ATTR{queue/rotational}=="1", ATTR{queue/scheduler}="${cfg.hddScheduler}"''
|
||||
)
|
||||
(optional (!(builtins.isNull cfg.slowFlashScheduler)) ''
|
||||
(optional (!(builtins.isNull cfg.slowFlashScheduler))
|
||||
''
|
||||
SUBSYSTEM!="block", GOTO="aviallon_slowflash_end"
|
||||
KERNEL!="sd[a-z]|nvme[0-9]*n[0-9]|mmcblk[0-9]", GOTO="aviallon_slowflash_end"
|
||||
ATTR{queue/rotational}=="1", GOTO="aviallon_slowflash_end"
|
||||
|
|
@ -125,11 +97,14 @@ in
|
|||
# END: NCQ disabled
|
||||
|
||||
LABEL="aviallon_slowflash_end"
|
||||
'')
|
||||
''
|
||||
)
|
||||
(optional (!(builtins.isNull cfg.nvmeScheduler))
|
||||
''ACTION!="remove", SUBSYSTEM=="block", KERNEL=="nvme[0-9]*n[0-9]", ATTR{queue/scheduler}="${cfg.nvmeScheduler}"''
|
||||
)
|
||||
(optional cfg.queuePriority ''ACTION!="remove", SUBSYSTEM=="block", KERNEL=="sd[a-z]", ATTR{device/ncq_prio_supported}=="1", ATTR{device/ncq_prio_enable}="1"'')
|
||||
(optional cfg.queuePriority
|
||||
''ACTION!="remove", SUBSYSTEM=="block", KERNEL=="sd[a-z]", ATTR{device/ncq_prio_supported}=="1", ATTR{device/ncq_prio_enable}="1"''
|
||||
)
|
||||
]);
|
||||
|
||||
boot.initrd.services.udev.rules = concatStringsSep "\n" cfg.udevRules;
|
||||
|
|
@ -143,7 +118,8 @@ in
|
|||
let
|
||||
hasSwap = length config.swapDevices > 0;
|
||||
in
|
||||
if hasSwap then "150%" else "75%";
|
||||
if hasSwap then "150%" else "75%"
|
||||
;
|
||||
|
||||
services.smartd = {
|
||||
enable = mkDefault true;
|
||||
|
|
|
|||
|
|
@ -1,10 +1,4 @@
|
|||
{
|
||||
config,
|
||||
pkgs,
|
||||
lib,
|
||||
myLib,
|
||||
...
|
||||
}:
|
||||
{ config, pkgs, lib, myLib, ... }:
|
||||
with lib;
|
||||
let
|
||||
cfg = config.aviallon.filesystems.btrfs;
|
||||
|
|
@ -12,8 +6,7 @@ let
|
|||
btrfsPaths = [ "/" ];
|
||||
# btrfsPaths = filterAttrs (n: v: v.fsType == "btrfs") fsCfg;
|
||||
generalCfg = config.aviallon.general;
|
||||
in
|
||||
{
|
||||
in {
|
||||
options.aviallon.filesystems.btrfs = {
|
||||
enable = mkEnableOption "BTRFS support";
|
||||
autoScrub = {
|
||||
|
|
|
|||
|
|
@ -1,14 +1,8 @@
|
|||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
{config, lib, pkgs, ...}:
|
||||
with lib;
|
||||
let
|
||||
cfg = config.aviallon.filesystems.zfs;
|
||||
in
|
||||
{
|
||||
in {
|
||||
options.aviallon.filesystems.zfs = {
|
||||
enable = mkEnableOption "ZFS support";
|
||||
};
|
||||
|
|
|
|||
45
flake.nix
45
flake.nix
|
|
@ -19,34 +19,31 @@
|
|||
};
|
||||
|
||||
outputs =
|
||||
inputs@{
|
||||
self,
|
||||
nixpkgs,
|
||||
nur,
|
||||
nixpkgs-unstable,
|
||||
fps,
|
||||
suyu,
|
||||
...
|
||||
}:
|
||||
let
|
||||
inputs@{ self
|
||||
, nixpkgs
|
||||
, nur
|
||||
, nixpkgs-unstable
|
||||
, fps
|
||||
, suyu
|
||||
, ...
|
||||
}: let
|
||||
lib = nixpkgs.lib;
|
||||
myLib = import ./lib {
|
||||
inherit lib;
|
||||
};
|
||||
mkPkgs =
|
||||
pkgs:
|
||||
{
|
||||
system ? system,
|
||||
config,
|
||||
overlays ? [ ],
|
||||
...
|
||||
}:
|
||||
import pkgs { inherit system config overlays; };
|
||||
in
|
||||
{
|
||||
mkPkgs = pkgs: { system ? system
|
||||
, config
|
||||
, overlays ? [ ]
|
||||
, ...
|
||||
}: import pkgs { inherit system config overlays; };
|
||||
in {
|
||||
inherit self inputs myLib;
|
||||
|
||||
overlays.default = final: prev: self.overlay final (nur.overlay final prev);
|
||||
overlays.default = final: prev:
|
||||
self.overlay
|
||||
final
|
||||
(nur.overlay final prev)
|
||||
;
|
||||
|
||||
overlay = (final: prev: {});
|
||||
|
||||
|
|
@ -57,8 +54,6 @@
|
|||
|
||||
nixpkgsConfig = self.nixosModules.aviallon.aviallon.programs.config;
|
||||
|
||||
specialArgs = inputs // {
|
||||
inherit myLib;
|
||||
};
|
||||
specialArgs = inputs // { inherit myLib; };
|
||||
};
|
||||
}
|
||||
|
|
|
|||
26
general.nix
26
general.nix
|
|
@ -1,10 +1,4 @@
|
|||
{
|
||||
config,
|
||||
pkgs,
|
||||
lib,
|
||||
myLib,
|
||||
...
|
||||
}:
|
||||
{ config, pkgs, lib, myLib, ... }:
|
||||
with lib;
|
||||
let
|
||||
cfg = config.aviallon.general;
|
||||
|
|
@ -14,12 +8,7 @@ let
|
|||
in
|
||||
{
|
||||
imports = [
|
||||
(mkRemovedOptionModule [
|
||||
"aviallon"
|
||||
"general"
|
||||
"flakes"
|
||||
"enable"
|
||||
] "Flakes are now enabled by default")
|
||||
(mkRemovedOptionModule [ "aviallon" "general" "flakes" "enable" ] "Flakes are now enabled by default")
|
||||
(mkRenamedOptionModule [ "aviallon" "general" "cpuVendor" ] [ "aviallon" "general" "cpu" "vendor" ])
|
||||
(mkRenamedOptionModule [ "aviallon" "general" "cpuArch" ] [ "aviallon" "general" "cpu" "arch" ])
|
||||
(mkRenamedOptionModule [ "aviallon" "general" "cpuTune" ] [ "aviallon" "general" "cpu" "tune" ])
|
||||
|
|
@ -52,7 +41,12 @@ in
|
|||
};
|
||||
|
||||
arch = mkOption {
|
||||
default = if cfg.cpu.x86.level >= 2 then "x86-64-v${toString cfg.cpu.x86.level}" else "x86-64";
|
||||
default =
|
||||
if cfg.cpu.x86.level >= 2 then
|
||||
"x86-64-v${toString cfg.cpu.x86.level}"
|
||||
else
|
||||
"x86-64"
|
||||
;
|
||||
example = "x86-64-v2";
|
||||
description = "Set CPU arch used in overlays, ...";
|
||||
type = types.str;
|
||||
|
|
@ -119,9 +113,7 @@ in
|
|||
font = "Lat2-Terminus16";
|
||||
};
|
||||
|
||||
boot.initrd.systemd.contents =
|
||||
mkIf (config.boot.initrd.systemd.enable && !config.console.earlySetup)
|
||||
{
|
||||
boot.initrd.systemd.contents = mkIf (config.boot.initrd.systemd.enable && !config.console.earlySetup) {
|
||||
"/etc/kbd/consolefonts".source = "${pkgs.kbd}/share/consolefonts";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -1,16 +1,10 @@
|
|||
{
|
||||
config,
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
{ config, pkgs, lib, ... }:
|
||||
with lib;
|
||||
let
|
||||
cfg = config.aviallon.hardware.amd;
|
||||
devCfg = config.aviallon.developer;
|
||||
generalCfg = config.aviallon.general;
|
||||
in
|
||||
{
|
||||
in {
|
||||
config = mkIf (cfg.enable && cfg.kernelDriver == "amdgpu") {
|
||||
boot.initrd.kernelModules = [ "amdgpu" ];
|
||||
|
||||
|
|
@ -28,7 +22,9 @@ in
|
|||
SUBSYSTEM=="pci", DRIVER=="amdgpu", ATTR{power_dpm_force_performance_level}="auto"
|
||||
'';
|
||||
|
||||
services.xserver.videoDrivers = optional cfg.useProprietary "amdgpu-pro" ++ [ "modesetting" ];
|
||||
services.xserver.videoDrivers =
|
||||
optional cfg.useProprietary "amdgpu-pro"
|
||||
++ [ "modesetting" ];
|
||||
|
||||
hardware.amdgpu.opencl.enable = true;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,25 +1,16 @@
|
|||
{
|
||||
config,
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
{config, pkgs, lib, ...}:
|
||||
with lib;
|
||||
let
|
||||
generalCfg = config.aviallon.general;
|
||||
enableZenpower =
|
||||
(!isNull (builtins.match "znver[1-3]" generalCfg.cpu.arch)) && (versionOlder kernelVersion "6.13");
|
||||
enableZenpower = (! isNull (builtins.match "znver[1-3]" generalCfg.cpu.arch)) && (versionOlder kernelVersion "6.13");
|
||||
kernelVersion = getVersion config.boot.kernelPackages.kernel;
|
||||
in
|
||||
{
|
||||
in {
|
||||
config = mkIf (generalCfg.cpu.vendor == "amd") {
|
||||
boot.kernel.sysctl = {
|
||||
|
||||
# Why: https://www.phoronix.com/news/Ryzen-Segv-Response
|
||||
# Workaround: https://forums.gentoo.org/viewtopic-p-2605135.html#2605135
|
||||
"kernel.randomize_va_space" = mkIf (generalCfg.cpu.arch == "znver1") (
|
||||
warn "Disable Adress Space Layout Randomization on Ryzen 1 CPU" 0
|
||||
);
|
||||
"kernel.randomize_va_space" = mkIf (generalCfg.cpu.arch == "znver1" ) (warn "Disable Adress Space Layout Randomization on Ryzen 1 CPU" 0);
|
||||
};
|
||||
|
||||
aviallon.boot.cmdline = {
|
||||
|
|
@ -29,23 +20,26 @@ in
|
|||
else if versionAtLeast kernelVersion "6.3" then
|
||||
"active"
|
||||
else
|
||||
"passive";
|
||||
}
|
||||
// optionalAttrs (generalCfg.cpu.arch == "znver2") {
|
||||
"passive"
|
||||
;
|
||||
} // optionalAttrs (generalCfg.cpu.arch == "znver2") {
|
||||
# Required for Zen 2
|
||||
"amd_pstate.shared_memory" = 1;
|
||||
};
|
||||
|
||||
aviallon.boot.patches = mkIf config.aviallon.optimizations.enable {};
|
||||
|
||||
boot.extraModulePackages =
|
||||
with config.boot.kernelPackages;
|
||||
[ ] ++ optional enableZenpower (info "enable zenpower for Ryzen [1-3] CPU" zenpower);
|
||||
boot.extraModulePackages = with config.boot.kernelPackages; []
|
||||
++ optional enableZenpower (info "enable zenpower for Ryzen [1-3] CPU" zenpower)
|
||||
;
|
||||
|
||||
boot.kernelModules = [ ] ++ optional enableZenpower "zenpower";
|
||||
boot.kernelModules = []
|
||||
++ optional enableZenpower "zenpower"
|
||||
;
|
||||
|
||||
boot.blacklistedKernelModules =
|
||||
[ ] ++ optional enableZenpower "k10-temp" # Superseded by zenpower
|
||||
boot.blacklistedKernelModules = []
|
||||
++ optional enableZenpower "k10-temp" # Superseded by zenpower
|
||||
;
|
||||
};
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,15 +1,9 @@
|
|||
{
|
||||
config,
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
{ config, pkgs, lib, ... }:
|
||||
with lib;
|
||||
let
|
||||
cfg = config.aviallon.hardware.amd;
|
||||
generalCfg = config.aviallon.general;
|
||||
in
|
||||
{
|
||||
in {
|
||||
options.aviallon.hardware.amd = {
|
||||
enable = mkEnableOption "AMD gpus";
|
||||
useProprietary = mkEnableOption "Use proprietary AMDGPU Pro";
|
||||
|
|
@ -20,12 +14,7 @@ in
|
|||
};
|
||||
kernelDriver = mkOption {
|
||||
description = "wether to use radeon or amdgpu kernel driver";
|
||||
type =
|
||||
with types;
|
||||
enum [
|
||||
"radeon"
|
||||
"amdgpu"
|
||||
];
|
||||
type = with types; enum [ "radeon" "amdgpu" ];
|
||||
default = "amdgpu";
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,16 +1,10 @@
|
|||
{
|
||||
config,
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
{ config, pkgs, lib, ... }:
|
||||
with lib;
|
||||
let
|
||||
cfg = config.aviallon.hardware.amd;
|
||||
devCfg = config.aviallon.developer;
|
||||
generalCfg = config.aviallon.general;
|
||||
in
|
||||
{
|
||||
in {
|
||||
config = mkIf (cfg.enable && cfg.kernelDriver == "radeon") {
|
||||
boot.initrd.kernelModules = [ "radeon" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -1,9 +1,4 @@
|
|||
{
|
||||
config,
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
{ config, pkgs, lib, ... }:
|
||||
with lib;
|
||||
let
|
||||
cfg = config.aviallon.hardware.amd;
|
||||
|
|
@ -27,8 +22,7 @@ let
|
|||
gxf1036 = "10.3.0";
|
||||
};
|
||||
|
||||
/*
|
||||
autoDetectGPU = pkgs: pkgs.callPackage (
|
||||
/*autoDetectGPU = pkgs: pkgs.callPackage (
|
||||
{ runCommandLocal,
|
||||
gnugrep,
|
||||
rocmPackages,
|
||||
|
|
@ -40,18 +34,13 @@ let
|
|||
rocminfo &>/dev/stderr
|
||||
rocminfo | grep --only-matching --perl-regexp '^\s*Name:\s+\Kgfx[0-9a-f]+' | tee $out/output
|
||||
''
|
||||
) { };
|
||||
*/
|
||||
) { };*/
|
||||
|
||||
gfxToCompatible =
|
||||
gfxISA: if (hasAttr gfxISA gfxToCompatibleMap) then (getAttr gfxISA gfxToCompatibleMap) else "";
|
||||
in
|
||||
{
|
||||
gfxToCompatible = gfxISA: if (hasAttr gfxISA gfxToCompatibleMap) then (getAttr gfxISA gfxToCompatibleMap) else "";
|
||||
in {
|
||||
|
||||
options.aviallon.hardware.amd.rocm = {
|
||||
enable = (mkEnableOption "ROCm configuration") // {
|
||||
default = true;
|
||||
};
|
||||
enable = (mkEnableOption "ROCm configuration") // { default = true; };
|
||||
gfxISA = mkOption {
|
||||
description = "What is the GFX ISA of your system. Leave blank if you have several GPUs of incompatible ISAs";
|
||||
default = "";
|
||||
|
|
@ -60,13 +49,11 @@ in
|
|||
};
|
||||
gpuTargets = mkOption {
|
||||
description = "Override supported GPU ISAs in some ROCm packages.";
|
||||
default = [
|
||||
"803"
|
||||
default = [ "803"
|
||||
"900"
|
||||
"906:xnack-"
|
||||
"908:xnack-"
|
||||
"90a:xnack+"
|
||||
"90a:xnack-"
|
||||
"90a:xnack+" "90a:xnack-"
|
||||
"940"
|
||||
"941"
|
||||
"942"
|
||||
|
|
@ -76,29 +63,24 @@ in
|
|||
"1031"
|
||||
"1100"
|
||||
"1101"
|
||||
"1102"
|
||||
];
|
||||
example = [
|
||||
"900"
|
||||
"1031"
|
||||
];
|
||||
"1102" ];
|
||||
example = [ "900" "1031" ];
|
||||
type = with types; nullOr (listOf str);
|
||||
};
|
||||
};
|
||||
|
||||
config = mkIf (cfg.enable && localCfg.enable) {
|
||||
environment.systemPackages =
|
||||
with pkgs;
|
||||
environment.systemPackages = with pkgs;
|
||||
[
|
||||
rocmPackages.rocm-smi
|
||||
#rocmPackages.meta.rocm-ml-libraries
|
||||
#rocmPackages.meta.rocm-hip-runtime
|
||||
|
||||
#pkgs.autoDetectGPU
|
||||
]
|
||||
++ optionals devCfg.enable [
|
||||
] ++ optionals devCfg.enable [
|
||||
rocmPackages.rocminfo
|
||||
];
|
||||
]
|
||||
;
|
||||
|
||||
#systemd.tmpfiles.rules = [
|
||||
# "L+ /opt/rocm/hip - - - - ${pkgs.rocmPackages.meta.rocm-hip-runtime}"
|
||||
|
|
@ -107,8 +89,7 @@ in
|
|||
|
||||
environment.variables = {
|
||||
ROC_ENABLE_PRE_VEGA = "1"; # Enable OpenCL with Polaris GPUs
|
||||
}
|
||||
// (mkIf (gfxToCompatible cfg.rocm.gfxISA != "") {
|
||||
} // (mkIf (gfxToCompatible cfg.rocm.gfxISA != "") {
|
||||
HSA_OVERRIDE_GFX_VERSION = gfxToCompatible cfg.rocm.gfxISA;
|
||||
});
|
||||
|
||||
|
|
@ -120,19 +101,14 @@ in
|
|||
];
|
||||
|
||||
nix.settings.substituters = [ "https://nixos-rocm.cachix.org" ];
|
||||
nix.settings.trusted-public-keys = [
|
||||
"nixos-rocm.cachix.org-1:VEpsf7pRIijjd8csKjFNBGzkBqOmw8H9PRmgAq14LnE="
|
||||
];
|
||||
nix.settings.trusted-public-keys = [ "nixos-rocm.cachix.org-1:VEpsf7pRIijjd8csKjFNBGzkBqOmw8H9PRmgAq14LnE=" ];
|
||||
|
||||
nixpkgs.config.rocmSupport = true;
|
||||
|
||||
nixpkgs.overlays = mkIf (!isNull localCfg.gpuTargets) (mkBefore [
|
||||
(final: prev: {
|
||||
nixpkgs.overlays = mkIf (! isNull localCfg.gpuTargets) (mkBefore [(final: prev: {
|
||||
#rocmPackages_5 = final.rocmPackages;
|
||||
rocmPackages = prev.rocmPackages // {
|
||||
clr = prev.rocmPackages.clr.override {
|
||||
localGpuTargets = lib.forEach localCfg.gpuTargets (target: "gfx${target}");
|
||||
};
|
||||
clr = prev.rocmPackages.clr.override { localGpuTargets = lib.forEach localCfg.gpuTargets (target: "gfx${target}"); };
|
||||
rocdbgapi = prev.rocmPackages.rocdbgapi.override { buildDocs = false; };
|
||||
# (oldAttrs: {
|
||||
# passthru = oldAttrs.passthru // {
|
||||
|
|
@ -146,7 +122,6 @@ in
|
|||
# gpuTargets = lib.forEach localCfg.gpuTargets (target: "gfx${target}");
|
||||
#};
|
||||
};
|
||||
})
|
||||
]);
|
||||
})]);
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,9 +1,4 @@
|
|||
{
|
||||
config,
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
{ config, pkgs, lib, ... }:
|
||||
with lib;
|
||||
let
|
||||
cfg = config.aviallon.hardware;
|
||||
|
|
|
|||
|
|
@ -1,15 +1,9 @@
|
|||
{
|
||||
config,
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
{config, pkgs, lib, ...}:
|
||||
with lib;
|
||||
let
|
||||
generalCfg = config.aviallon.general;
|
||||
throttledService = "throttled";
|
||||
in
|
||||
{
|
||||
in {
|
||||
config = mkIf (generalCfg.cpu.vendor == "intel") {
|
||||
aviallon.boot.cmdline = {
|
||||
"intel_pstate" = "passive";
|
||||
|
|
|
|||
|
|
@ -1,9 +1,4 @@
|
|||
{
|
||||
config,
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
{ config, pkgs, lib, ... }:
|
||||
with lib;
|
||||
let
|
||||
cfg = config.aviallon.hardware.intel;
|
||||
|
|
@ -30,9 +25,7 @@ in
|
|||
boot.initrd.kernelModules = [ "i915" ];
|
||||
hardware.graphics = {
|
||||
enable = true;
|
||||
extraPackages =
|
||||
with pkgs;
|
||||
[ ]
|
||||
extraPackages = with pkgs; []
|
||||
++ [
|
||||
vaapiVdpau
|
||||
libvdpau-va-gl
|
||||
|
|
@ -45,8 +38,7 @@ in
|
|||
;
|
||||
};
|
||||
|
||||
aviallon.boot.cmdline =
|
||||
{ }
|
||||
aviallon.boot.cmdline = {}
|
||||
// optionalAttrs generalCfg.unsafeOptimizations {
|
||||
"i915.mitigations" = "off";
|
||||
"i915.enable_fbc" = 1;
|
||||
|
|
|
|||
|
|
@ -1,10 +1,4 @@
|
|||
{
|
||||
config,
|
||||
pkgs,
|
||||
lib,
|
||||
options,
|
||||
...
|
||||
}:
|
||||
{ config, pkgs, lib, options, ... }:
|
||||
with lib;
|
||||
let
|
||||
cfg = config.aviallon.hardware.mesa;
|
||||
|
|
@ -13,18 +7,13 @@ let
|
|||
optimizationsCfg = config.aviallon.optimizations;
|
||||
optimizePkg = optimizationsCfg.optimizePkg;
|
||||
packageWithDefaults = types.package // {
|
||||
merge =
|
||||
loc: defs:
|
||||
let
|
||||
res = mergeDefaultOption loc defs;
|
||||
in
|
||||
if builtins.isPath res || (builtins.isString res && !builtins.hasContext res) then
|
||||
toDerivation res
|
||||
else
|
||||
res;
|
||||
merge = loc: defs:
|
||||
let res = mergeDefaultOption loc defs;
|
||||
in if builtins.isPath res || (builtins.isString res && ! builtins.hasContext res)
|
||||
then toDerivation res
|
||||
else res;
|
||||
};
|
||||
in
|
||||
{
|
||||
in {
|
||||
options.aviallon.hardware.mesa = {
|
||||
enable = mkOption {
|
||||
default = false;
|
||||
|
|
@ -76,8 +65,10 @@ in
|
|||
aviallon.hardware.mesa.package32 = mkIf cfg.unstable pkgs.unstable.driversi686Linux.mesa;
|
||||
|
||||
aviallon.hardware.mesa.internal = mkIf cfg.optimized {
|
||||
package = mkDefault (optimizePkg { lto = false; } cfg.package);
|
||||
package32 = mkDefault (optimizePkg { lto = false; } cfg.package32);
|
||||
package = mkDefault (
|
||||
optimizePkg { lto = false; } cfg.package);
|
||||
package32 = mkDefault (
|
||||
optimizePkg { lto = false; } cfg.package32);
|
||||
};
|
||||
|
||||
hardware.graphics = {
|
||||
|
|
|
|||
|
|
@ -1,22 +1,13 @@
|
|||
{
|
||||
config,
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
{config, pkgs, lib, ...}:
|
||||
with lib;
|
||||
let
|
||||
cfg = config.aviallon.hardware.nvidia;
|
||||
in
|
||||
{
|
||||
in {
|
||||
|
||||
imports = [
|
||||
./proprietary.nix
|
||||
./opensource.nix
|
||||
(mkRenamedOptionModule
|
||||
[ "aviallon" "hardware" "nvidia" "saveAllVram" ]
|
||||
[ "aviallon" "hardware" "nvidia" "proprietary" "saveAllVram" ]
|
||||
)
|
||||
( mkRenamedOptionModule [ "aviallon" "hardware" "nvidia" "saveAllVram" ] [ "aviallon" "hardware" "nvidia" "proprietary" "saveAllVram" ] )
|
||||
];
|
||||
|
||||
options.aviallon.hardware.nvidia = {
|
||||
|
|
@ -25,13 +16,7 @@ in
|
|||
default = (cfg.variant == "proprietary");
|
||||
};
|
||||
variant = mkOption {
|
||||
type =
|
||||
with types;
|
||||
enum [
|
||||
"proprietary"
|
||||
"open"
|
||||
"nouveau"
|
||||
];
|
||||
type = with types; enum [ "proprietary" "open" "nouveau" ];
|
||||
description = "What driver variant to use";
|
||||
default = "proprietary";
|
||||
example = "nouveau";
|
||||
|
|
|
|||
|
|
@ -1,29 +1,13 @@
|
|||
{
|
||||
config,
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
{ config, pkgs, lib, ... }:
|
||||
with lib;
|
||||
let
|
||||
cfg = config.aviallon.hardware.nvidia;
|
||||
in
|
||||
{
|
||||
in {
|
||||
options.aviallon.hardware.nvidia.nouveau = {
|
||||
config = mkOption {
|
||||
description = "nouveau boot config";
|
||||
type =
|
||||
with types;
|
||||
attrsOf (
|
||||
nullOr (oneOf [
|
||||
int
|
||||
str
|
||||
bool
|
||||
])
|
||||
);
|
||||
example = {
|
||||
NvBoost = 1;
|
||||
};
|
||||
type = with types; attrsOf (nullOr (oneOf [ int str bool ]));
|
||||
example = { NvBoost = 1; };
|
||||
default = {};
|
||||
};
|
||||
};
|
||||
|
|
@ -35,14 +19,15 @@ in
|
|||
"nouveau.pstate" = 1;
|
||||
"nouveau.runpm" = 1;
|
||||
"nouveau.modeset" = 1;
|
||||
"nouveau.config" =
|
||||
let
|
||||
toValue = v: if isBool v then toString (if v then 1 else 0) else toString v;
|
||||
"nouveau.config" = let
|
||||
toValue = v:
|
||||
if isBool v
|
||||
then toString (if v then 1 else 0)
|
||||
else toString v;
|
||||
filteredConfig = filterAttrs (n: v: ! isNull v) cfg.nouveau.config;
|
||||
configList = mapAttrsToList (n: v: "${n}=${toValue v}") filteredConfig;
|
||||
configString = concatStringsSep "," configList;
|
||||
in
|
||||
trace "Nouveau config: ${configString}" configString;
|
||||
in trace "Nouveau config: ${configString}" configString;
|
||||
};
|
||||
|
||||
aviallon.hardware.mesa.enable = mkDefault true;
|
||||
|
|
|
|||
|
|
@ -1,11 +1,4 @@
|
|||
{
|
||||
config,
|
||||
pkgs,
|
||||
lib,
|
||||
options,
|
||||
nixpkgs-unstable,
|
||||
...
|
||||
}:
|
||||
{ config, pkgs, lib, options, nixpkgs-unstable, ... }:
|
||||
with lib;
|
||||
let
|
||||
cfg = config.aviallon.hardware.nvidia;
|
||||
|
|
@ -16,14 +9,9 @@ let
|
|||
exec ${options.programs.xwayland.package.default}/bin/xwayland -eglstream "$@"
|
||||
'';
|
||||
|
||||
nvidiaUnstable = config.boot.kernelPackages.callPackage (
|
||||
nixpkgs-unstable + /pkgs/os-specific/linux/nvidia-x11/default.nix
|
||||
) { };
|
||||
cudaUnstable =
|
||||
pkgs: cudaVersion:
|
||||
pkgs.callPackages (nixpkgs-unstable + /pkgs/top-level/cuda-packages.nix) { inherit cudaVersion; };
|
||||
in
|
||||
{
|
||||
nvidiaUnstable = config.boot.kernelPackages.callPackage (nixpkgs-unstable + /pkgs/os-specific/linux/nvidia-x11/default.nix) {};
|
||||
cudaUnstable = pkgs: cudaVersion: pkgs.callPackages (nixpkgs-unstable + /pkgs/top-level/cuda-packages.nix) { inherit cudaVersion; };
|
||||
in {
|
||||
options = {
|
||||
aviallon.hardware.nvidia.proprietary = {
|
||||
gsync = mkEnableOption "Screen is GSYNC monitor";
|
||||
|
|
@ -51,12 +39,7 @@ in
|
|||
saveAllVram = mkEnableOption "back up all VRAM in /var/tmp before going to sleep. May reduce artifacts after resuming";
|
||||
version = mkOption {
|
||||
description = "What Nvidia version variant to use";
|
||||
type = types.enum [
|
||||
"production"
|
||||
"stable"
|
||||
"beta"
|
||||
"unstable_beta"
|
||||
];
|
||||
type = types.enum [ "production" "stable" "beta" "unstable_beta" ];
|
||||
default = if generalCfg.unsafeOptimizations then "beta" else "stable";
|
||||
example = "unstable_beta";
|
||||
};
|
||||
|
|
@ -66,12 +49,7 @@ in
|
|||
# Very useful resource.
|
||||
# https://forums.developer.nvidia.com/t/power-mizer-difference-between-powermizerdefault-and-powermizerlevel/46884/3
|
||||
example = [ "PerfLevelSrc=0x2222" ];
|
||||
default = [
|
||||
"PowerMizerEnable=0x1"
|
||||
"OverrideMaxPerf=0x1"
|
||||
"PowerMizerDefault=0x3"
|
||||
"PowerMizerDefaultAC=0x3"
|
||||
];
|
||||
default = [ "PowerMizerEnable=0x1" "OverrideMaxPerf=0x1" "PowerMizerDefault=0x3" "PowerMizerDefaultAC=0x3" ];
|
||||
type = with types; listOf str;
|
||||
};
|
||||
};
|
||||
|
|
@ -99,9 +77,7 @@ in
|
|||
|
||||
services.xserver.exportConfiguration = true;
|
||||
|
||||
services.xserver.displayManager.sddm.wayland.enable = mkIf (
|
||||
!config.aviallon.hardware.intel.enable
|
||||
) (mkDefault false); # Frequent issues with Nvidia GPUs
|
||||
services.xserver.displayManager.sddm.wayland.enable = mkIf (!config.aviallon.hardware.intel.enable) (mkDefault false); # Frequent issues with Nvidia GPUs
|
||||
|
||||
# Fix hybrid sleep with Nvidia GPU
|
||||
systemd.services.nvidia-suspend = {
|
||||
|
|
@ -109,9 +85,7 @@ in
|
|||
before = [ "systemd-hybrid-sleep.service" ];
|
||||
};
|
||||
hardware.nvidia = {
|
||||
powerManagement =
|
||||
mkIf (config.hardware.nvidia.prime.offload.enable || cfg.proprietary.saveAllVram)
|
||||
{
|
||||
powerManagement = mkIf (config.hardware.nvidia.prime.offload.enable || cfg.proprietary.saveAllVram) {
|
||||
enable = true;
|
||||
finegrained = mkIf config.hardware.nvidia.prime.offload.enable true;
|
||||
};
|
||||
|
|
@ -121,7 +95,8 @@ in
|
|||
if cfg.proprietary.version == "unstable_beta" then
|
||||
nvidiaUnstable.beta # Use bleeding edge version
|
||||
else
|
||||
config.boot.kernelPackages.nvidiaPackages.${cfg.proprietary.version};
|
||||
config.boot.kernelPackages.nvidiaPackages.${cfg.proprietary.version}
|
||||
;
|
||||
};
|
||||
|
||||
aviallon.hardware.nvidia.proprietary.EGLStream = mkDefault (
|
||||
|
|
@ -133,8 +108,7 @@ in
|
|||
boot.extraModprobeConfig = ''
|
||||
options nvidia NVreg_RegistryDwords="${concatStringsSep ";" cfg.proprietary.registryDwords}"
|
||||
'';
|
||||
aviallon.boot.cmdline =
|
||||
{ }
|
||||
aviallon.boot.cmdline = {}
|
||||
// {
|
||||
"nvidia-drm.modeset" = 1;
|
||||
"nvidia-drm.fbdev" = 1;
|
||||
|
|
@ -146,7 +120,8 @@ in
|
|||
"nvidia.NVreg_DynamicPowerManagement" = "0x02";
|
||||
"nvidia.NVreg_EnableS0ixPowerManagement" = 1;
|
||||
"nvidia.NVreg_TemporaryFilePath" = "/var/tmp";
|
||||
};
|
||||
}
|
||||
;
|
||||
|
||||
programs.xwayland.package = mkIf cfg.proprietary.EGLStream xwaylandEGLStream;
|
||||
aviallon.programs.allowUnfreeList = [
|
||||
|
|
@ -189,6 +164,7 @@ in
|
|||
# "__GL_THREADED_OPTIMIZATIONS" = toValue generalCfg.unsafeOptimizations;
|
||||
"KWIN_DRM_USE_EGL_STREAMS" = toValue cfg.proprietary.EGLStream; # Make KWin use EGL Streams if needed, because otherwise performance will be horrible.
|
||||
|
||||
|
||||
# Undocumented, fix for EGL not being found by Nvidia driver: https://github.com/NVIDIA/egl-wayland/issues/39#issuecomment-927288015
|
||||
__EGL_EXTERNAL_PLATFORM_CONFIG_DIRS = "/run/opengl-driver/share/egl/egl_external_platform.d";
|
||||
|
||||
|
|
@ -200,19 +176,15 @@ in
|
|||
};
|
||||
|
||||
nix.settings.substituters = [ "https://cuda-maintainers.cachix.org" ];
|
||||
nix.settings.trusted-public-keys = [
|
||||
"cuda-maintainers.cachix.org-1:0dq3bujKpuEPMCX6U4WylrUDZ9JyUG0VpVZa7CNfq5E="
|
||||
];
|
||||
nix.settings.trusted-public-keys = [ "cuda-maintainers.cachix.org-1:0dq3bujKpuEPMCX6U4WylrUDZ9JyUG0VpVZa7CNfq5E=" ];
|
||||
|
||||
nixpkgs.overlays =
|
||||
[ ]
|
||||
++ optional (cfg.proprietary.version == "unstable_beta") (
|
||||
final: prev: {
|
||||
nixpkgs.overlays = []
|
||||
++ optional (cfg.proprietary.version == "unstable_beta") (final: prev: {
|
||||
cudaPackages_11 = final.unstable.cudaPackages_11;
|
||||
cudaPackages_12 = final.unstable.cudaPackages_12;
|
||||
cudaPackages = final.unstable.cudaPackages;
|
||||
|
||||
}
|
||||
);
|
||||
})
|
||||
;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
29
laptop.nix
29
laptop.nix
|
|
@ -1,14 +1,8 @@
|
|||
{
|
||||
config,
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
{ config, pkgs, lib, ... }:
|
||||
with lib;
|
||||
let
|
||||
cfg = config.aviallon.laptop;
|
||||
in
|
||||
{
|
||||
in {
|
||||
options.aviallon.laptop = {
|
||||
enable = mkOption {
|
||||
default = false;
|
||||
|
|
@ -20,11 +14,7 @@ in
|
|||
default = "tlp";
|
||||
example = "power-profiles-daemon";
|
||||
description = "Change service used to manage power consumption on laptop";
|
||||
type = types.enum [
|
||||
"tlp"
|
||||
"power-profiles-daemon"
|
||||
false
|
||||
];
|
||||
type = types.enum [ "tlp" "power-profiles-daemon" false ];
|
||||
};
|
||||
tweaks = {
|
||||
pcieAspmForce = mkEnableOption "hardcore tweaks to power consumption. Warning: Might be dangerous to use.";
|
||||
|
|
@ -65,11 +55,10 @@ in
|
|||
};
|
||||
};
|
||||
|
||||
systemd.services.aspm-force-enable =
|
||||
let
|
||||
|
||||
systemd.services.aspm-force-enable = let
|
||||
aspm_enable = pkgs.callPackage ./packages/aspm_enable { };
|
||||
in
|
||||
{
|
||||
in {
|
||||
serviceConfig = {
|
||||
ExecStart = [
|
||||
"${aspm_enable}/bin/aspm_enable"
|
||||
|
|
@ -85,8 +74,7 @@ in
|
|||
services.power-profiles-daemon.enable = (cfg.power-manager == "power-profiles-daemon");
|
||||
powerManagement.powertop.enable = mkDefault true;
|
||||
systemd.services.powertop = mkIf config.powerManagement.powertop.enable {
|
||||
serviceConfig.ExecStart =
|
||||
let
|
||||
serviceConfig.ExecStart = let
|
||||
script = pkgs.writeShellScriptBin "powertop-auto-tune" ''
|
||||
${pkgs.powertop}/bin/powertop --auto-tune
|
||||
|
||||
|
|
@ -97,8 +85,7 @@ in
|
|||
echo 'on' > /sys/bus/usb/devices/$i/power/control
|
||||
done
|
||||
'';
|
||||
in
|
||||
mkOverride 10 "${script}/bin/powertop-auto-tune";
|
||||
in mkOverride 10 "${script}/bin/powertop-auto-tune";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,25 +1,17 @@
|
|||
{lib, myLib, ...}:
|
||||
with lib;
|
||||
rec {
|
||||
mergeAttrsRecursive =
|
||||
a: b:
|
||||
foldAttrs
|
||||
(
|
||||
item: acc:
|
||||
mergeAttrsRecursive = a: b: foldAttrs (item: acc:
|
||||
if (isNull acc) then
|
||||
item
|
||||
else if (isList item) then
|
||||
if isList acc then acc ++ item else [ acc ] ++ item
|
||||
if isList acc then
|
||||
acc ++ item
|
||||
else [ acc ] ++ item
|
||||
else if (isString item) then
|
||||
acc + item
|
||||
else if (isAttrs item) then
|
||||
mergeAttrsRecursive acc item
|
||||
else
|
||||
item
|
||||
)
|
||||
null
|
||||
[
|
||||
b
|
||||
a
|
||||
];
|
||||
else item
|
||||
) null [ b a ];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,24 +1,18 @@
|
|||
{lib, myLib}:
|
||||
with lib;
|
||||
let
|
||||
mkListToString =
|
||||
{
|
||||
sep ? " ",
|
||||
}:
|
||||
list: concatStringsSep sep (forEach list (v: toString v));
|
||||
in
|
||||
rec {
|
||||
mkListToString = { sep ? " " }: list: concatStringsSep sep (
|
||||
forEach list (v: toString v)
|
||||
);
|
||||
in rec {
|
||||
mkValueString =
|
||||
let
|
||||
gen = generators.mkValueStringDefault {};
|
||||
listToString = mkListToString {};
|
||||
in
|
||||
v: if isList v then listToString v else gen v;
|
||||
in v: if isList v then listToString v
|
||||
else gen v;
|
||||
|
||||
mkKeyValue =
|
||||
{ sep }:
|
||||
with generators;
|
||||
toKeyValue {
|
||||
mkKeyValue = { sep }: with generators; toKeyValue {
|
||||
mkKeyValue = mkKeyValueDefault {
|
||||
mkValueString = mkValueString;
|
||||
} sep;
|
||||
|
|
|
|||
|
|
@ -1,37 +1,22 @@
|
|||
{ lib, myLib }:
|
||||
with lib;
|
||||
rec {
|
||||
toPretty =
|
||||
depth: x:
|
||||
toPretty = depth: x:
|
||||
# Stolen from: https://github.com/teto/nixpkgs/blob/6f098631f6f06b93c17f49abdf677790e017778d/lib/debug.nix#L109C5-L117C30
|
||||
let
|
||||
snip =
|
||||
v:
|
||||
if isList v then
|
||||
noQuotes "[…]" v
|
||||
else if isAttrs v then
|
||||
noQuotes "{…}" v
|
||||
else
|
||||
v;
|
||||
noQuotes = str: v: {
|
||||
__pretty = const str;
|
||||
val = v;
|
||||
};
|
||||
modify =
|
||||
n: fn: v:
|
||||
if (n == 0) then
|
||||
fn v
|
||||
else if isList v then
|
||||
map (modify (n - 1) fn) v
|
||||
else if isAttrs v then
|
||||
mapAttrs (const (modify (n - 1) fn)) v
|
||||
else
|
||||
v;
|
||||
in
|
||||
lib.generators.toPretty { allowPrettyValues = true; } (modify depth snip x);
|
||||
snip = v: if isList v then noQuotes "[…]" v
|
||||
else if isAttrs v then noQuotes "{…}" v
|
||||
else v;
|
||||
noQuotes = str: v: { __pretty = const str; val = v; };
|
||||
modify = n: fn: v: if (n == 0) then fn v
|
||||
else if isList v then map (modify (n - 1) fn) v
|
||||
else if isAttrs v then mapAttrs
|
||||
(const (modify (n - 1) fn)) v
|
||||
else v;
|
||||
in lib.generators.toPretty { allowPrettyValues = true; } (modify depth snip x);
|
||||
|
||||
traceValWithPrefix =
|
||||
prefix: value:
|
||||
traceValWithPrefix = prefix: value:
|
||||
#trace "traceValWithPrefix 'prefix': ${prefix}" value
|
||||
trace "${prefix}: ${toPretty 2 value}" value;
|
||||
trace "${prefix}: ${toPretty 2 value}" value
|
||||
;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,19 +1,11 @@
|
|||
{
|
||||
lib ? import < nixpkgs/lib,
|
||||
...
|
||||
}:
|
||||
{ lib ? import <nixpkgs/lib, ... }:
|
||||
let
|
||||
myLib = lib.makeExtensible (
|
||||
self:
|
||||
let
|
||||
callLibs =
|
||||
file:
|
||||
import file {
|
||||
myLib = lib.makeExtensible (self: let
|
||||
callLibs = file: import file {
|
||||
inherit lib;
|
||||
myLib = self;
|
||||
};
|
||||
in
|
||||
{
|
||||
in {
|
||||
math = callLibs ./math.nix;
|
||||
config = callLibs ./config.nix;
|
||||
optimizations = callLibs ./optimizations.nix;
|
||||
|
|
@ -21,7 +13,5 @@ let
|
|||
types = callLibs ./types.nix;
|
||||
debug = callLibs ./debug.nix;
|
||||
derivations = callLibs ./derivations.nix;
|
||||
}
|
||||
);
|
||||
in
|
||||
myLib
|
||||
});
|
||||
in myLib
|
||||
|
|
|
|||
|
|
@ -1,13 +1,15 @@
|
|||
{lib, myLib, ...}:
|
||||
with lib;
|
||||
rec {
|
||||
isBroken =
|
||||
x:
|
||||
isBroken = x:
|
||||
let
|
||||
tryX = builtins.tryEval x;
|
||||
in
|
||||
if tryX.success && (isDerivation tryX.value) then
|
||||
if
|
||||
tryX.success && (isDerivation tryX.value)
|
||||
then
|
||||
tryX.value.meta.insecure || tryX.value.meta.broken
|
||||
else
|
||||
true;
|
||||
true
|
||||
;
|
||||
}
|
||||
|
|
|
|||
16
lib/math.nix
16
lib/math.nix
|
|
@ -1,16 +1,12 @@
|
|||
{
|
||||
lib,
|
||||
myLib,
|
||||
{lib
|
||||
, myLib
|
||||
}:
|
||||
|
||||
rec {
|
||||
log2 =
|
||||
let
|
||||
log2 = let
|
||||
mylog = x: y: if (x >= 2) then mylog (x / 2) (y + 1) else y;
|
||||
in
|
||||
x: mylog x 0;
|
||||
in x: mylog x 0;
|
||||
|
||||
clamp =
|
||||
min_x: max_x: x:
|
||||
lib.min (lib.max x min_x) max_x;
|
||||
clamp = min_x: max_x: x: lib.min ( lib.max x min_x ) max_x;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -33,12 +33,7 @@ let
|
|||
"-Wl,-sort-common"
|
||||
"-Wl,--gc-sections"
|
||||
];
|
||||
ltoFlags =
|
||||
{
|
||||
threads ? 1,
|
||||
thin ? false,
|
||||
}:
|
||||
[
|
||||
ltoFlags = { threads ? 1, thin ? false }: [
|
||||
# Fat LTO objects are object files that contain both the intermediate language and the object code. This makes them usable for both LTO linking and normal linking.
|
||||
"-flto=${toString threads}" # Use -flto=auto to use GNU make’s job server, if available, or otherwise fall back to autodetection of the number of CPU threads present in your system.
|
||||
(optionalString (!thin) "-ffat-lto-objects")
|
||||
|
|
@ -109,11 +104,9 @@ let
|
|||
"-floop-nest-optimize" # "Calculates a loop structure optimized for data-locality and parallelism."
|
||||
];
|
||||
|
||||
archToX86Level =
|
||||
arch:
|
||||
archToX86Level = arch:
|
||||
let
|
||||
_map =
|
||||
{ }
|
||||
_map = { }
|
||||
// genAttrs [
|
||||
"nehalem"
|
||||
"westmere"
|
||||
|
|
@ -129,7 +122,8 @@ let
|
|||
"bdver2" # Piledriver
|
||||
"bdver3" # Steamroller
|
||||
"x86-64-v2"
|
||||
] (name: 2)
|
||||
]
|
||||
(name: 2)
|
||||
// genAttrs [
|
||||
"haswell"
|
||||
"broadwell"
|
||||
|
|
@ -140,7 +134,8 @@ let
|
|||
"znver2"
|
||||
"znver3"
|
||||
"x86-64-v3"
|
||||
] (name: 3)
|
||||
]
|
||||
(name: 3)
|
||||
// genAttrs [
|
||||
"knl"
|
||||
"knm"
|
||||
|
|
@ -155,16 +150,20 @@ let
|
|||
"rocketlake"
|
||||
"znver4"
|
||||
"x86-64-v4"
|
||||
] (name: 4);
|
||||
]
|
||||
(name: 4)
|
||||
;
|
||||
in
|
||||
if (hasAttr arch _map) then _map.${arch} else 1;
|
||||
if (hasAttr arch _map) then _map.${arch} else 1
|
||||
;
|
||||
|
||||
getARMLevel =
|
||||
arch: if (!isNull arch) then toInt (elemAt (builtins.match "armv([0-9]).+") 0) else null;
|
||||
getARMLevel = arch:
|
||||
if (! isNull arch) then
|
||||
toInt (elemAt (builtins.match "armv([0-9]).+") 0)
|
||||
else null;
|
||||
|
||||
# https://go.dev/doc/install/source#environment
|
||||
getGOARM =
|
||||
armLevel: if (isNull armLevel) || (armLevel < 5) || (armLevel > 7) then null else armLevel;
|
||||
getGOARM = armLevel: if (isNull armLevel) || (armLevel < 5) || (armLevel > 7) then null else armLevel;
|
||||
|
||||
workarounds = {
|
||||
# https://www.intel.com/content/dam/support/us/en/documents/processors/mitigations-jump-conditional-code-erratum.pdf
|
||||
|
|
@ -178,8 +177,7 @@ let
|
|||
};
|
||||
};
|
||||
|
||||
addMarchSpecific =
|
||||
march:
|
||||
addMarchSpecific = march:
|
||||
let
|
||||
_map = {
|
||||
skylake = workarounds.intel-jump-conditional-code;
|
||||
|
|
@ -190,22 +188,16 @@ let
|
|||
in
|
||||
attrByPath [ march ] { } _map;
|
||||
|
||||
cacheTuning =
|
||||
{
|
||||
compiler,
|
||||
l1d ? null,
|
||||
l1i ? null,
|
||||
l1Line ? null,
|
||||
lastLevel ? null,
|
||||
}:
|
||||
if compiler == "gcc" then
|
||||
[ ]
|
||||
|
||||
cacheTuning = { compiler, l1d ? null, l1i ? null, l1Line ? null, lastLevel ? null }:
|
||||
if compiler == "gcc" then [ ]
|
||||
++ optional (! isNull l1d) "--param l1-cache-size=${toString l1d}"
|
||||
++ optional (! isNull l1Line) "--param l1-cache-line-size=${toString l1Line}"
|
||||
++ optional (! isNull lastLevel) "--param l2-cache-size=${toString lastLevel}"
|
||||
else
|
||||
[ ];
|
||||
|
||||
|
||||
in
|
||||
rec {
|
||||
|
||||
|
|
@ -217,30 +209,23 @@ rec {
|
|||
"very-unsafe" = 5;
|
||||
};
|
||||
|
||||
addAttrs =
|
||||
pkg: attrs:
|
||||
pkg.overrideAttrs (
|
||||
old:
|
||||
(myLib.attrsets.mergeAttrsRecursive old attrs)
|
||||
// {
|
||||
addAttrs = pkg: attrs: pkg.overrideAttrs (old:
|
||||
(myLib.attrsets.mergeAttrsRecursive old attrs) // {
|
||||
passthru = (pkg.passthru or {}) // (attrs.passtru or {});
|
||||
}
|
||||
);
|
||||
|
||||
optimizePkg =
|
||||
pkg:
|
||||
{
|
||||
level ? "normal",
|
||||
recursive ? 0,
|
||||
optimizeFlags ? (guessOptimizationFlags pkg),
|
||||
blacklist ? [ ],
|
||||
ltoBlacklist ? [ ],
|
||||
overrideMap ? { },
|
||||
stdenv ? null,
|
||||
lto ? false,
|
||||
attributes ? null,
|
||||
_depth ? 0,
|
||||
...
|
||||
optimizePkg = pkg: { level ? "normal"
|
||||
, recursive ? 0
|
||||
, optimizeFlags ? (guessOptimizationFlags pkg)
|
||||
, blacklist ? [ ]
|
||||
, ltoBlacklist ? [ ]
|
||||
, overrideMap ? { }
|
||||
, stdenv ? null
|
||||
, lto ? false
|
||||
, attributes ? null
|
||||
, _depth ? 0
|
||||
, ...
|
||||
}@attrs:
|
||||
if _depth > recursive then
|
||||
pkg # Max depth reached, return un-modified pkg
|
||||
|
|
@ -252,28 +237,23 @@ rec {
|
|||
let
|
||||
_pkgStdenvCC = attrByPath [ "stdenv" "cc" ] null pkg;
|
||||
_ltoBlacklisted = any (p: p == getName pkg) ltoBlacklist;
|
||||
_lto = if (lto && _ltoBlacklisted) then warn "LTO-blacklisted '${getName pkg}'" false else lto;
|
||||
_lto =
|
||||
if (lto && _ltoBlacklisted) then warn "LTO-blacklisted '${getName pkg}'" false
|
||||
else lto;
|
||||
_stdenvCC = if isNull stdenv then _pkgStdenvCC else stdenv.cc;
|
||||
optimizedAttrs = optimizeFlags (
|
||||
attrs
|
||||
// {
|
||||
optimizedAttrs = optimizeFlags (attrs // {
|
||||
inherit level;
|
||||
compiler =
|
||||
if isNull _pkgStdenvCC then
|
||||
null
|
||||
else if pkg.stdenv.cc.isGNU then
|
||||
"gcc"
|
||||
else if pkg.stdenv.cc.isClang then
|
||||
"clang"
|
||||
else
|
||||
throw "Unknown compiler '${getName pkg.stdenv.cc}'" null;
|
||||
if isNull _pkgStdenvCC then null
|
||||
else if pkg.stdenv.cc.isGNU then "gcc"
|
||||
else if pkg.stdenv.cc.isClang then "clang"
|
||||
else throw "Unknown compiler '${getName pkg.stdenv.cc}'" null
|
||||
;
|
||||
lto = _lto;
|
||||
stdenvCC = _stdenvCC;
|
||||
}
|
||||
);
|
||||
});
|
||||
_nativeBuildInputs = filter (p: ! isNull p) (pkg.nativeBuildInputs or [ ]);
|
||||
_nativeBuildInputsOverriden = forEach _nativeBuildInputs (
|
||||
_pkg:
|
||||
_nativeBuildInputsOverriden = forEach _nativeBuildInputs (_pkg:
|
||||
let
|
||||
_pkgName = myGetName _pkg;
|
||||
hasOverride = any (n: n == _pkgName) (attrNames overrideMap);
|
||||
|
|
@ -286,35 +266,23 @@ rec {
|
|||
);
|
||||
|
||||
_buildInputs = filter (p: (! isNull p) && (isDerivation p)) (pkg.buildInputs or [ ]);
|
||||
_buildInputsOverriden = forEach _buildInputs (
|
||||
_pkg:
|
||||
_buildInputsOverriden = forEach _buildInputs (_pkg:
|
||||
if (any (n: n == myGetName _pkg) blacklist) then
|
||||
warn "Skipping blacklisted '${myGetName _pkg}'" _pkg
|
||||
else
|
||||
optimizePkg _pkg (
|
||||
attrs
|
||||
// {
|
||||
inherit
|
||||
level
|
||||
recursive
|
||||
blacklist
|
||||
optimizeFlags
|
||||
stdenv
|
||||
;
|
||||
optimizePkg _pkg (attrs // {
|
||||
inherit level recursive blacklist optimizeFlags stdenv;
|
||||
parallelize = null;
|
||||
_depth = _depth + 1;
|
||||
}
|
||||
)
|
||||
})
|
||||
);
|
||||
_pkgStdenvOverridable = attrByPath [ "override" "__functionArgs" "stdenv" ] null pkg;
|
||||
_pkgWithStdenv =
|
||||
if (isNull _pkgStdenvOverridable) || (isNull stdenv) then
|
||||
pkg
|
||||
else
|
||||
warn "Replacing stdenv for '${myGetName pkg}'" (pkg.override { inherit stdenv; });
|
||||
if (isNull _pkgStdenvOverridable) || (isNull stdenv)
|
||||
then pkg
|
||||
else warn "Replacing stdenv for '${myGetName pkg}'" (pkg.override { inherit stdenv; });
|
||||
|
||||
_pkg = _pkgWithStdenv.overrideAttrs (
|
||||
old:
|
||||
_pkg = _pkgWithStdenv.overrideAttrs (old:
|
||||
{
|
||||
buildInputs = _buildInputsOverriden;
|
||||
nativeBuildInputs = _nativeBuildInputsOverriden;
|
||||
|
|
@ -332,79 +300,72 @@ rec {
|
|||
);
|
||||
_pkgOptimized = addAttrs _pkg optimizedAttrs;
|
||||
_pkgFinal =
|
||||
if isAttrs attributes then addAttrs _pkgOptimized (traceVal attributes) else _pkgOptimized;
|
||||
if isAttrs attributes then
|
||||
addAttrs _pkgOptimized (traceVal attributes)
|
||||
else
|
||||
_pkgOptimized
|
||||
;
|
||||
in
|
||||
trace "Optimized ${myGetName pkg} with overrideAttrs at level '${level}' (depth: ${toString _depth}, lto: ${if lto then "true" else "false"})" _pkgFinal
|
||||
else if (hasAttr "name" pkg) then
|
||||
warn "Can't optimize ${myGetName pkg} (depth: ${toString _depth})" pkg
|
||||
else
|
||||
throw "Not a pkg: ${builtins.toJSON pkg} (depth: ${toString _depth})" pkg;
|
||||
throw "Not a pkg: ${builtins.toJSON pkg} (depth: ${toString _depth})" pkg
|
||||
;
|
||||
|
||||
myGetName = pkg: if isDerivation pkg then getName pkg else null;
|
||||
myGetName = pkg:
|
||||
if isDerivation pkg
|
||||
then getName pkg
|
||||
else null;
|
||||
#else warn "getName input is not a derivation: '${toString pkg}'" null;
|
||||
|
||||
guessOptimizationFlags =
|
||||
pkg:
|
||||
{ ... }@attrs:
|
||||
makeOptimizationFlags (
|
||||
{
|
||||
guessOptimizationFlags = pkg: { ... }@attrs: makeOptimizationFlags ({
|
||||
rust = any (p: (myGetName p) == "rustc") pkg.nativeBuildInputs;
|
||||
cmake = any (p: (myGetName p) == "cmake") pkg.nativeBuildInputs;
|
||||
go = any (p: (myGetName p) == "go") pkg.nativeBuildInputs;
|
||||
ninja = any (p: (myGetName p) == "ninja") pkg.nativeBuildInputs;
|
||||
autotools = any (p: (myGetName p) == "autoreconf-hook") pkg.nativeBuildInputs;
|
||||
}
|
||||
// attrs
|
||||
);
|
||||
} // attrs);
|
||||
|
||||
makeOptimizationFlags =
|
||||
{
|
||||
level ? "normal",
|
||||
extraCFlags ? null,
|
||||
lto ? false,
|
||||
parallelize ? null,
|
||||
cpuArch ? null,
|
||||
cpuTune ? null,
|
||||
ISA ? "amd64",
|
||||
armLevel ? (getARMLevel cpuArch),
|
||||
x86Level ? (archToX86Level cpuArch),
|
||||
check ? false,
|
||||
compiler ? "gcc",
|
||||
stdenvCC ? null,
|
||||
cpuCores ? 4,
|
||||
go ? false,
|
||||
rust ? false,
|
||||
cmake ? false,
|
||||
ninja ? false,
|
||||
autotools ? false,
|
||||
l1LineCache ? null,
|
||||
l1iCache ? null,
|
||||
l1dCache ? null,
|
||||
lastLevelCache ? null,
|
||||
...
|
||||
{ level ? "normal"
|
||||
, extraCFlags ? null
|
||||
, lto ? false
|
||||
, parallelize ? null
|
||||
, cpuArch ? null
|
||||
, cpuTune ? null
|
||||
, ISA ? "amd64"
|
||||
, armLevel ? (getARMLevel cpuArch)
|
||||
, x86Level ? (archToX86Level cpuArch)
|
||||
, check ? false
|
||||
, compiler ? "gcc"
|
||||
, stdenvCC ? null
|
||||
, cpuCores ? 4
|
||||
, go ? false
|
||||
, rust ? false
|
||||
, cmake ? false
|
||||
, ninja ? false
|
||||
, autotools ? false
|
||||
, l1LineCache ? null
|
||||
, l1iCache ? null
|
||||
, l1dCache ? null
|
||||
, lastLevelCache ? null
|
||||
, ...
|
||||
}:
|
||||
let
|
||||
levelN = levelNames.${level};
|
||||
march =
|
||||
if (!isNull cpuArch) then
|
||||
cpuArch
|
||||
else if (!isNull cpuTune) then
|
||||
cpuTune
|
||||
else
|
||||
"generic";
|
||||
if (! isNull cpuArch) then cpuArch
|
||||
else if (! isNull cpuTune) then cpuTune
|
||||
else "generic";
|
||||
uarchTune =
|
||||
if (!isNull cpuTune) then
|
||||
cpuTune
|
||||
else if (!isNull cpuArch) then
|
||||
cpuArch
|
||||
else
|
||||
"generic";
|
||||
in
|
||||
myLib.debug.traceValWithPrefix "optimizations" (
|
||||
foldl' myLib.attrsets.mergeAttrsRecursive { } [
|
||||
if (! isNull cpuTune) then cpuTune
|
||||
else if (! isNull cpuArch) then cpuArch
|
||||
else "generic";
|
||||
in myLib.debug.traceValWithPrefix "optimizations" (foldl' myLib.attrsets.mergeAttrsRecursive {} [
|
||||
(rec {
|
||||
CFLAGS = unique (
|
||||
[ ]
|
||||
CFLAGS = unique
|
||||
([ ]
|
||||
++ requiredFlags
|
||||
++ optionals (compiler == "clang") clangSpecificFlags
|
||||
++ optionals (levelN >= 1) genericCompileFlags
|
||||
|
|
@ -412,9 +373,7 @@ rec {
|
|||
++ optionals (levelN >= 3) moderatelyUnsafeOptimizationFlags
|
||||
++ optionals (levelN >= 4) unsafeOptimizationFlags
|
||||
++ optionals (levelN >= 5) veryUnsafeOptimizationFlags
|
||||
++ optionals lto (ltoFlags {
|
||||
threads = myLib.math.log2 cpuCores;
|
||||
})
|
||||
++ optionals lto (ltoFlags { threads = myLib.math.log2 cpuCores; })
|
||||
++ optionals (! isNull parallelize) (automaticallyParallelizeFlags parallelize)
|
||||
++ optionals (! isNull extraCFlags) extraCFlags
|
||||
++ optionals (! isNull cpuArch) [ "-march=${cpuArch}" ]
|
||||
|
|
@ -425,11 +384,12 @@ rec {
|
|||
l1i = l1iCache;
|
||||
l1d = l1dCache;
|
||||
lastLevel = lastLevelCache;
|
||||
}
|
||||
);
|
||||
});
|
||||
CXXFLAGS = CFLAGS;
|
||||
CPPFLAGS = [ ] ++ optionals (levelN >= 1) genericPreprocessorFlags;
|
||||
LDFLAGS = [ ] ++ optionals (levelN >= 3) genericLinkerFlags;
|
||||
CPPFLAGS = []
|
||||
++ optionals (levelN >= 1) genericPreprocessorFlags;
|
||||
LDFLAGS = []
|
||||
++ optionals (levelN >= 3) genericLinkerFlags;
|
||||
|
||||
preConfigure = ''
|
||||
|
||||
|
|
@ -459,7 +419,8 @@ rec {
|
|||
''}
|
||||
)
|
||||
|
||||
'';
|
||||
''
|
||||
;
|
||||
})
|
||||
(optionalAttrs ninja {
|
||||
preConfigure = ''
|
||||
|
|
@ -470,13 +431,9 @@ rec {
|
|||
'';
|
||||
})
|
||||
(optionalAttrs rust {
|
||||
RUSTFLAGS =
|
||||
[ ]
|
||||
RUSTFLAGS = [ ]
|
||||
++ optionals (levelN >= 2) [ "-C opt-level=3" ]
|
||||
++ optionals lto [
|
||||
"-C lto=fat"
|
||||
"-C embed-bitcode=on"
|
||||
]
|
||||
++ optionals lto [ "-C lto=fat" "-C embed-bitcode=on" ]
|
||||
++ optionals (! isNull cpuArch) [ "-C target-cpu=${cpuArch}" ]
|
||||
#++ [ "-C embed-bitcode=off" "-C lto=off" ] # Not needed since rust 1.45
|
||||
#++ optionals lto [ "-Clinker-plugin-lto" "-Clto" ]
|
||||
|
|
@ -503,6 +460,6 @@ rec {
|
|||
CGO_LDFLAGS_ALLOW = "-Wl.*";
|
||||
})
|
||||
(addMarchSpecific march)
|
||||
]
|
||||
);
|
||||
])
|
||||
;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,14 +2,10 @@
|
|||
with lib;
|
||||
{
|
||||
package' = types.package // {
|
||||
merge =
|
||||
loc: defs:
|
||||
let
|
||||
res = mergeDefaultOption loc defs;
|
||||
in
|
||||
if builtins.isPath res || (builtins.isString res && !builtins.hasContext res) then
|
||||
toDerivation res
|
||||
else
|
||||
res;
|
||||
merge = loc: defs:
|
||||
let res = mergeDefaultOption loc defs;
|
||||
in if builtins.isPath res || (builtins.isString res && ! builtins.hasContext res)
|
||||
then toDerivation res
|
||||
else res;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
40
network.nix
40
network.nix
|
|
@ -1,10 +1,4 @@
|
|||
{
|
||||
config,
|
||||
pkgs,
|
||||
lib,
|
||||
myLib,
|
||||
...
|
||||
}:
|
||||
{ config, pkgs, lib, myLib, ... }:
|
||||
with lib;
|
||||
let
|
||||
cfg = config.aviallon.network;
|
||||
|
|
@ -22,27 +16,15 @@ in
|
|||
default = "systemd-networkd";
|
||||
example = "NetworkManager";
|
||||
description = "Set network backend";
|
||||
type = types.enum [
|
||||
"systemd-networkd"
|
||||
"NetworkManager"
|
||||
"dhcpcd"
|
||||
];
|
||||
type = types.enum [ "systemd-networkd" "NetworkManager" "dhcpcd" ];
|
||||
};
|
||||
dns = mkOption {
|
||||
default = "systemd-resolved";
|
||||
example = "dnsmasq";
|
||||
description = "Set network DNS";
|
||||
type = types.enum [
|
||||
"systemd-resolved"
|
||||
"dnsmasq"
|
||||
"unbound"
|
||||
"none"
|
||||
"default"
|
||||
];
|
||||
};
|
||||
vpnSupport = mkEnableOption "VPN support of many kinds in NetworkManager" // {
|
||||
default = desktopCfg.enable;
|
||||
type = types.enum [ "systemd-resolved" "dnsmasq" "unbound" "none" "default" ];
|
||||
};
|
||||
vpnSupport = mkEnableOption "VPN support of many kinds in NetworkManager" // { default = desktopCfg.enable; };
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
|
|
@ -50,10 +32,11 @@ in
|
|||
networking.networkmanager.enable = (cfg.backend == "NetworkManager");
|
||||
networking.dhcpcd.enable = (cfg.backend == "dhcpcd");
|
||||
|
||||
|
||||
services.resolved = {
|
||||
enable = (cfg.dns == "systemd-resolved");
|
||||
settings.Resolve = {
|
||||
LLMNR = mkForce false; # https://www.blackhillsinfosec.com/how-to-disable-llmnr-why-you-want-to/
|
||||
LLMNR = mkForce false; # https://www.blackhillsinfosec.com/how-to-disable-llmnr-why-you-want-to/
|
||||
DNSSEC = false;
|
||||
DNS = [
|
||||
# cloudflare-dns.com
|
||||
|
|
@ -76,9 +59,7 @@ in
|
|||
networking.networkmanager = {
|
||||
wifi.backend = mkDefault "iwd";
|
||||
dns = mkDefault cfg.dns;
|
||||
plugins =
|
||||
with pkgs;
|
||||
[ ]
|
||||
plugins = with pkgs; []
|
||||
++ optional (cfg.dns == "dnsmasq") dnsmasq
|
||||
++ optionals cfg.vpnSupport [
|
||||
networkmanager_strongswan
|
||||
|
|
@ -86,7 +67,8 @@ in
|
|||
networkmanager-openconnect
|
||||
networkmanager-sstp
|
||||
networkmanager-l2tp
|
||||
];
|
||||
]
|
||||
;
|
||||
};
|
||||
networking.wireless.enable = (cfg.backend != "NetworkManager");
|
||||
networking.wireless.iwd.enable = true;
|
||||
|
|
@ -96,9 +78,7 @@ in
|
|||
# Must always be false
|
||||
networking.useDHCP = false;
|
||||
|
||||
networking.hostId = mkDefault (
|
||||
substring 0 8 (builtins.hashString "sha256" config.networking.hostName)
|
||||
);
|
||||
networking.hostId = mkDefault (substring 0 8 (builtins.hashString "sha256" config.networking.hostName));
|
||||
networking.hostName = mkDefault (builtins.abort "Default hostname not changed" null);
|
||||
|
||||
# Needed for proper WiFi support in some countries (like France, for instance)
|
||||
|
|
|
|||
|
|
@ -1,10 +1,4 @@
|
|||
{
|
||||
config,
|
||||
pkgs,
|
||||
lib,
|
||||
myLib,
|
||||
...
|
||||
}:
|
||||
{ config, pkgs, lib, myLib, ... }:
|
||||
with lib;
|
||||
let
|
||||
cfg = config.aviallon.nix;
|
||||
|
|
@ -16,8 +10,7 @@ let
|
|||
|
||||
getSpeed = cores: threads: cores + (threads - cores) / 2;
|
||||
|
||||
mkBuildMachine =
|
||||
{
|
||||
mkBuildMachine = {
|
||||
hostName,
|
||||
cores,
|
||||
systems ? [ "x86_64-linux" ] ,
|
||||
|
|
@ -25,31 +18,27 @@ let
|
|||
features ? [ ],
|
||||
x86ver ? 1 ,
|
||||
...
|
||||
}@attrs:
|
||||
let
|
||||
}@attrs: let
|
||||
speedFactor = getSpeed cores threads;
|
||||
in
|
||||
{
|
||||
in {
|
||||
inherit hostName speedFactor;
|
||||
systems = systems ++ optional (any (s: s == "x86_64-linux") systems) "i686-linux";
|
||||
systems = systems
|
||||
++ optional (any (s: s == "x86_64-linux") systems) "i686-linux"
|
||||
;
|
||||
sshUser = "builder";
|
||||
sshKey = buildUserKeyFilePath;
|
||||
maxJobs = myLib.math.log2 cores;
|
||||
supportedFeatures = [
|
||||
"kvm"
|
||||
"benchmark"
|
||||
]
|
||||
supportedFeatures = [ "kvm" "benchmark" ]
|
||||
++ optional (speedFactor > 8) "big-parallel"
|
||||
++ optional (x86ver >= 2) "gccarch-x86-64-v2"
|
||||
++ optional (x86ver >= 3) "gccarch-x86-64-v3"
|
||||
++ optional (x86ver >= 4) "gccarch-x86-64-v4"
|
||||
++ features;
|
||||
++ features
|
||||
;
|
||||
|
||||
};
|
||||
|
||||
machineList = filterAttrs (
|
||||
name: value: config.networking.hostName != name && value.enable
|
||||
) cfg.builder.buildMachines;
|
||||
machineList = filterAttrs (name: value: config.networking.hostName != name && value.enable) cfg.builder.buildMachines;
|
||||
in
|
||||
{
|
||||
imports = [
|
||||
|
|
@ -70,16 +59,9 @@ in
|
|||
};
|
||||
|
||||
buildMachines = mkOption {
|
||||
type = types.attrsOf (
|
||||
types.submoduleWith {
|
||||
type = types.attrsOf (types.submoduleWith {
|
||||
modules = [
|
||||
(
|
||||
{
|
||||
config,
|
||||
options,
|
||||
name,
|
||||
...
|
||||
}:
|
||||
({ config, options, name, ...}:
|
||||
{
|
||||
options = {
|
||||
enable = mkOption {
|
||||
|
|
@ -122,13 +104,10 @@ in
|
|||
};
|
||||
};
|
||||
|
||||
}
|
||||
)
|
||||
];
|
||||
}
|
||||
);
|
||||
})]; });
|
||||
default = {};
|
||||
example = literalExpression ''
|
||||
example = literalExpression
|
||||
''
|
||||
{
|
||||
luke-skywalker-nixos = {
|
||||
hostName = "2aXX:e0a:18e:8670::";
|
||||
|
|
@ -143,29 +122,20 @@ in
|
|||
};
|
||||
|
||||
config = {
|
||||
nix.buildMachines = traceValSeqN 3 (
|
||||
mapAttrsToList (
|
||||
name: value:
|
||||
nix.buildMachines = traceValSeqN 3 (mapAttrsToList (name: value:
|
||||
mkBuildMachine {
|
||||
inherit (value)
|
||||
hostName
|
||||
cores
|
||||
threads
|
||||
x86ver
|
||||
;
|
||||
inherit (value) hostName cores threads x86ver;
|
||||
}
|
||||
) machineList
|
||||
);
|
||||
) machineList);
|
||||
|
||||
programs.ssh.extraConfig = concatStringsSep "\n" (
|
||||
mapAttrsToList (
|
||||
name: value:
|
||||
(optionalString (value.sshConfig != "") ''
|
||||
programs.ssh.extraConfig = concatStringsSep "\n" (mapAttrsToList (name: value:
|
||||
(optionalString (value.sshConfig != "")
|
||||
''
|
||||
Host ${value.hostName}
|
||||
${value.sshConfig}
|
||||
'')
|
||||
) machineList
|
||||
);
|
||||
''
|
||||
)
|
||||
) machineList);
|
||||
|
||||
users.users.builder = {
|
||||
isSystemUser = true;
|
||||
|
|
|
|||
57
nix/nix.nix
57
nix/nix.nix
|
|
@ -1,12 +1,4 @@
|
|||
{
|
||||
config,
|
||||
pkgs,
|
||||
lib,
|
||||
myLib,
|
||||
nixpkgs,
|
||||
nixpkgs-unstable,
|
||||
...
|
||||
}:
|
||||
{config, pkgs, lib, myLib, nixpkgs, nixpkgs-unstable, ...}:
|
||||
with lib;
|
||||
with myLib;
|
||||
let
|
||||
|
|
@ -34,8 +26,7 @@ in
|
|||
upper = "05:00";
|
||||
};
|
||||
|
||||
system.build.nixos-rebuild =
|
||||
let
|
||||
system.build.nixos-rebuild = let
|
||||
nixos-rebuild = pkgs.nixos-rebuild.override { nix = config.nix.package.out; };
|
||||
nixos-rebuild-inhibit = pkgs.writeShellScriptBin "nixos-rebuild" ''
|
||||
exec ${config.systemd.package}/bin/systemd-inhibit --what=idle:shutdown --mode=block \
|
||||
|
|
@ -44,8 +35,7 @@ in
|
|||
-- \
|
||||
${pkgs.coreutils}/bin/nice -n 19 -- ${nixos-rebuild}/bin/nixos-rebuild "$@"
|
||||
'';
|
||||
in
|
||||
mkOverride 20 nixos-rebuild-inhibit;
|
||||
in mkOverride 20 nixos-rebuild-inhibit;
|
||||
|
||||
environment.systemPackages = [
|
||||
(hiPrio config.system.build.nixos-rebuild)
|
||||
|
|
@ -73,6 +63,8 @@ in
|
|||
};
|
||||
};
|
||||
|
||||
|
||||
|
||||
nix.gc.automatic = mkDefault true;
|
||||
nix.gc.dates = mkDefault "Monday,Wednesday,Friday,Sunday 03:00:00";
|
||||
nix.gc.randomizedDelaySec = "3h";
|
||||
|
|
@ -92,40 +84,31 @@ in
|
|||
};
|
||||
};
|
||||
|
||||
nix.package = optimizePkg {
|
||||
stdenv = pkgs.fastStdenv;
|
||||
level = "slower";
|
||||
} pkgs.nixVersions.latest;
|
||||
|
||||
nix.settings.system-features = [
|
||||
"big-parallel"
|
||||
"kvm"
|
||||
"benchmark"
|
||||
]
|
||||
nix.package = optimizePkg { stdenv = pkgs.fastStdenv; level = "slower"; } pkgs.nixVersions.latest;
|
||||
|
||||
nix.settings.system-features = [ "big-parallel" "kvm" "benchmark" ]
|
||||
++ optional ( ! isNull generalCfg.cpu.arch ) "gccarch-${generalCfg.cpu.arch}"
|
||||
++ optional ( generalCfg.cpu.x86.level >= 2 ) "gccarch-x86-64-v2"
|
||||
++ optional ( generalCfg.cpu.x86.level >= 3 ) "gccarch-x86-64-v3"
|
||||
++ optional (generalCfg.cpu.x86.level >= 4) "gccarch-x86-64-v4";
|
||||
++ optional ( generalCfg.cpu.x86.level >= 4 ) "gccarch-x86-64-v4"
|
||||
;
|
||||
|
||||
nix.settings.builders-use-substitutes = true;
|
||||
nix.settings.substitute = true;
|
||||
nix.settings.experimental-features = [
|
||||
"nix-command"
|
||||
"flakes"
|
||||
]
|
||||
nix.settings.experimental-features = [ "nix-command" "flakes" ]
|
||||
++ optional (versionOlder config.nix.package.version "2.19") "repl-flake"
|
||||
++ optional cfg.contentAddressed "ca-derivations";
|
||||
++ optional cfg.contentAddressed "ca-derivations"
|
||||
;
|
||||
|
||||
nix.settings.download-attempts = 5;
|
||||
nix.settings.stalled-download-timeout = 20;
|
||||
|
||||
nix.settings.substituters = mkBefore (
|
||||
[ ]
|
||||
nix.settings.substituters = mkBefore ([]
|
||||
++ optional cfg.enableCustomSubstituter "https://nix-cache.lesviallon.fr"
|
||||
++ optional cfg.contentAddressed "https://cache.ngi0.nixos.org/"
|
||||
);
|
||||
nix.settings.trusted-public-keys = mkBefore (
|
||||
[ ]
|
||||
nix.settings.trusted-public-keys = mkBefore ([]
|
||||
++ optional cfg.enableCustomSubstituter "nix-cache.lesviallon.fr-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
|
||||
++ optional cfg.contentAddressed "cache.ngi0.nixos.org-1:KqH5CBLNSyX184S9BKZJo1LxrxJ9ltnY2uAs5c/f1MA="
|
||||
);
|
||||
|
|
@ -135,15 +118,9 @@ in
|
|||
nix.settings.cores = mkIf (generalCfg.cpu.threads != null) generalCfg.cpu.threads;
|
||||
nix.settings.max-jobs = mkIf (generalCfg.cpu.threads != null) (math.log2 generalCfg.cpu.threads);
|
||||
|
||||
nix.settings.trusted-users = [
|
||||
"root"
|
||||
"@wheel"
|
||||
];
|
||||
nix.settings.trusted-users = [ "root" "@wheel" ];
|
||||
|
||||
nix.settings.hashed-mirrors = [
|
||||
"https://tarballs.nixos.org"
|
||||
"https://nixpkgs-unfree.cachix.org"
|
||||
];
|
||||
nix.settings.hashed-mirrors = [ "https://tarballs.nixos.org" "https://nixpkgs-unfree.cachix.org" ];
|
||||
|
||||
nix.registry = {
|
||||
nixpkgs.flake = nixpkgs;
|
||||
|
|
|
|||
|
|
@ -1,11 +1,4 @@
|
|||
{
|
||||
config,
|
||||
pkgs,
|
||||
options,
|
||||
lib,
|
||||
myLib,
|
||||
...
|
||||
}:
|
||||
{ config, pkgs, options, lib, myLib, ... }:
|
||||
with lib;
|
||||
let
|
||||
cfg = config.aviallon.optimizations;
|
||||
|
|
@ -31,18 +24,18 @@ let
|
|||
lto = cfg.lto.enable;
|
||||
};
|
||||
|
||||
optimizePkg =
|
||||
{
|
||||
optimizePkg = {
|
||||
attributes ? {},
|
||||
stdenv ? null,
|
||||
...
|
||||
}@attrs:
|
||||
pkg:
|
||||
}@attrs: pkg:
|
||||
myLib.optimizations.optimizePkg pkg (
|
||||
defaultOptimizeAttrs // cfg.defaultSettings // { inherit stdenv attributes; } // attrs
|
||||
defaultOptimizeAttrs
|
||||
// cfg.defaultSettings
|
||||
// { inherit stdenv attributes; }
|
||||
// attrs
|
||||
);
|
||||
in
|
||||
{
|
||||
in {
|
||||
options.aviallon.optimizations = {
|
||||
enable = mkOption {
|
||||
default = true;
|
||||
|
|
@ -59,22 +52,12 @@ in
|
|||
blacklist = mkOption {
|
||||
description = "Packages to blacklist from LTO";
|
||||
type = types.listOf types.str;
|
||||
default = [
|
||||
"x265"
|
||||
"cpio"
|
||||
"cups"
|
||||
"gtk+3"
|
||||
"which"
|
||||
"openssh"
|
||||
];
|
||||
default = [ "x265" "cpio" "cups" "gtk+3" "which" "openssh" ];
|
||||
};
|
||||
};
|
||||
extraCompileFlags = mkOption {
|
||||
default = [ ];
|
||||
example = [
|
||||
"-O2"
|
||||
"-mavx"
|
||||
];
|
||||
example = [ "-O2" "-mavx" ];
|
||||
description = "Add specific compile flags";
|
||||
type = types.listOf types.str;
|
||||
};
|
||||
|
|
@ -83,10 +66,7 @@ in
|
|||
recursive = 0;
|
||||
level = "slower";
|
||||
};
|
||||
example = {
|
||||
level = "unsafe";
|
||||
recursive = 0;
|
||||
};
|
||||
example = { level = "unsafe"; recursive = 0; };
|
||||
description = "Specify default options passed to optimizePkg";
|
||||
};
|
||||
optimizePkg = mkOption {
|
||||
|
|
@ -98,22 +78,11 @@ in
|
|||
trace = mkEnableOption "trace attributes in overriden derivations";
|
||||
runtimeOverrides.enable = mkEnableOption "runtime overrides for performance sensitive libraries (glibc, ...)";
|
||||
blacklist = mkOption {
|
||||
default = [
|
||||
# Broken
|
||||
"alsa-lib"
|
||||
"glib"
|
||||
"lcms2"
|
||||
"gconf"
|
||||
"gnome-vfs"
|
||||
default = [ # Broken
|
||||
"alsa-lib" "glib" "lcms2" "gconf" "gnome-vfs"
|
||||
|
||||
# Very slow
|
||||
"llvm"
|
||||
"clang"
|
||||
"clang-wrapper"
|
||||
"valgrind"
|
||||
"rustc"
|
||||
"tensorflow"
|
||||
"qtwebengine"
|
||||
"llvm" "clang" "clang-wrapper" "valgrind" "rustc" "tensorflow" "qtwebengine"
|
||||
|
||||
# Fixable with work, but slow for now
|
||||
"rapidjson"
|
||||
|
|
@ -126,7 +95,8 @@ in
|
|||
type = with types; attrsOf package;
|
||||
default = {
|
||||
};
|
||||
example = literalExpression ''
|
||||
example = literalExpression
|
||||
''
|
||||
{
|
||||
ninja = pkgs.ninja-samurai;
|
||||
cmake = pkgs.my-cmake-override;
|
||||
|
|
@ -142,12 +112,9 @@ in
|
|||
options.aviallon.optimizations.blacklist.default
|
||||
++ (traceValSeq (forEach config.system.replaceRuntimeDependencies (x: lib.getName x.oldDependency )))
|
||||
);
|
||||
system.replaceDependencies.replacements =
|
||||
mkIf (!lib.inPureEvalMode && cfg.runtimeOverrides.enable)
|
||||
[
|
||||
system.replaceDependencies.replacements = mkIf (!lib.inPureEvalMode && cfg.runtimeOverrides.enable) [
|
||||
# glibc usually represents 20% of the userland CPU time. It is therefore very much worth optimizing.
|
||||
/*
|
||||
{
|
||||
/*{
|
||||
original = pkgs.glibc;
|
||||
replacement = let
|
||||
optimizedFlags = [ "-fipa-pta" ];
|
||||
|
|
@ -158,8 +125,7 @@ in
|
|||
NIX_CFLAGS_COMPILE = (attrs.env.NIX_CFLAGS_COMPILE or "") + (toString optimizedFlags.CFLAGS);
|
||||
};
|
||||
});
|
||||
}
|
||||
*/
|
||||
}*/
|
||||
# zlib is in second place, given how often it is used
|
||||
#{
|
||||
# original = pkgs.zlib;
|
||||
|
|
@ -169,27 +135,22 @@ in
|
|||
|
||||
nixpkgs.overlays = mkAfter [
|
||||
(self: super: {
|
||||
veryFastStdenv = super.overrideCC super.gccStdenv (
|
||||
super.buildPackages.gcc_latest.overrideAttrs (
|
||||
old:
|
||||
veryFastStdenv = super.overrideCC super.gccStdenv (super.buildPackages.gcc_latest.overrideAttrs (old:
|
||||
let
|
||||
optimizedAttrs = { } // {
|
||||
optimizedAttrs = {}
|
||||
// {
|
||||
configureFlags = [
|
||||
"--with-cpu-64=${generalCfg.cpu.arch}"
|
||||
"--with-arch-64=${generalCfg.cpu.arch}"
|
||||
"--with-cpu-64=${generalCfg.cpu.arch}" "--with-arch-64=${generalCfg.cpu.arch}"
|
||||
"--with-tune-64=${generalCfg.cpu.tune}"
|
||||
"--with-build-config=bootstrap-lto-lean"
|
||||
];
|
||||
};
|
||||
ccWithProfiling = old.cc.overrideAttrs (_: {
|
||||
buildFlags = [ "profiledbootstrap" ];
|
||||
});
|
||||
in
|
||||
{
|
||||
}
|
||||
;
|
||||
ccWithProfiling = old.cc.overrideAttrs (_: { buildFlags = [ "profiledbootstrap" ]; } );
|
||||
in {
|
||||
cc = addAttrs ccWithProfiling optimizedAttrs;
|
||||
}
|
||||
)
|
||||
);
|
||||
));
|
||||
})
|
||||
|
||||
(self: super: {
|
||||
|
|
|
|||
|
|
@ -1,10 +1,4 @@
|
|||
{
|
||||
config,
|
||||
options,
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
{ config, options, pkgs, lib, ... }:
|
||||
with lib;
|
||||
let
|
||||
cfg = config.aviallon.optimizations;
|
||||
|
|
@ -14,8 +8,7 @@ let
|
|||
};
|
||||
man-db = optimizePkg { level = "moderately-unsafe"; } pkgs.man-db;
|
||||
mandoc = optimizePkg { level = "moderately-unsafe"; } pkgs.mandoc;
|
||||
in
|
||||
{
|
||||
in {
|
||||
config = mkIf cfg.enable {
|
||||
documentation.man.man-db.package = man-db;
|
||||
documentation.man.mandoc.package = mandoc;
|
||||
|
|
|
|||
127
overlays.nix
127
overlays.nix
|
|
@ -1,11 +1,4 @@
|
|||
{
|
||||
config,
|
||||
pkgs,
|
||||
options,
|
||||
lib,
|
||||
myLib,
|
||||
...
|
||||
}:
|
||||
{config, pkgs, options, lib, myLib, ...}:
|
||||
with builtins;
|
||||
with lib;
|
||||
let
|
||||
|
|
@ -15,10 +8,7 @@ in
|
|||
{
|
||||
|
||||
imports = [
|
||||
(mkRenamedOptionModule
|
||||
[ "aviallon" "overlays" "optimizations" ]
|
||||
[ "aviallon" "optimizations" "enable" ]
|
||||
)
|
||||
(mkRenamedOptionModule [ "aviallon" "overlays" "optimizations" ] [ "aviallon" "optimizations" "enable" ])
|
||||
];
|
||||
|
||||
options.aviallon.overlays = {
|
||||
|
|
@ -33,23 +23,20 @@ in
|
|||
config = mkIf cfg.enable {
|
||||
nix.nixPath =
|
||||
# Append our nixpkgs-overlays.
|
||||
[ "nixpkgs-overlays=/etc/nixos/overlays-compat/" ];
|
||||
[ "nixpkgs-overlays=/etc/nixos/overlays-compat/" ]
|
||||
;
|
||||
|
||||
nixpkgs.overlays =
|
||||
[ ]
|
||||
++ optional cfg.traceCallPackage (
|
||||
self: super: {
|
||||
callPackage =
|
||||
path: overrides:
|
||||
|
||||
nixpkgs.overlays = []
|
||||
++ optional cfg.traceCallPackage (self: super: {
|
||||
callPackage = path: overrides:
|
||||
let
|
||||
_pkg = super.callPackage path overrides;
|
||||
_name = _pkg.name or _pkg.pname or "<unknown>";
|
||||
in
|
||||
trace "callPackage ${_name}" _pkg;
|
||||
}
|
||||
)
|
||||
++ [
|
||||
(self: super: {
|
||||
in trace "callPackage ${_name}" _pkg
|
||||
;
|
||||
})
|
||||
++ [(self: super: {
|
||||
htop = super.htop.overrideAttrs (old: {
|
||||
configureFlags = old.configureFlags ++ [
|
||||
"--enable-affinity"
|
||||
|
|
@ -57,14 +44,10 @@ in
|
|||
"--enable-capabilities"
|
||||
];
|
||||
|
||||
nativeBuildInputs =
|
||||
old.nativeBuildInputs
|
||||
++ (with super; [
|
||||
nativeBuildInputs = old.nativeBuildInputs ++ (with super; [
|
||||
pkg-config
|
||||
]);
|
||||
buildInputs =
|
||||
old.buildInputs
|
||||
++ (with super; [
|
||||
buildInputs = old.buildInputs ++ (with super; [
|
||||
libcap
|
||||
libunwind
|
||||
libnl
|
||||
|
|
@ -75,24 +58,17 @@ in
|
|||
};
|
||||
|
||||
})
|
||||
# (final: prev: {
|
||||
# # linux-manual requires scripts/split-man.pl from the kernel source, but
|
||||
# # neither xanmod 6.19.7 nor vanilla 6.18.x ship it yet. Mark broken so
|
||||
# # the build doesn't fail; man-pages and man-pages-posix still build fine.
|
||||
# linux-manual = prev.linux-manual.overrideAttrs (_: {
|
||||
# meta = (prev.linux-manual.meta or { }) // {
|
||||
# broken = true;
|
||||
# };
|
||||
# });
|
||||
# })
|
||||
(final: prev: {
|
||||
# Use our kernel for generating linux man pages
|
||||
linux-manual = prev.linux-manual.override { linuxPackages_latest = config.boot.kernelPackages; };
|
||||
})
|
||||
|
||||
(final: prev: {
|
||||
lutris-fhs = (
|
||||
prev.buildFHSUserEnv {
|
||||
lutris-fhs =
|
||||
(prev.buildFHSUserEnv {
|
||||
name = "lutris";
|
||||
targetPkgs =
|
||||
pkgs:
|
||||
(with pkgs; [
|
||||
targetPkgs = pkgs: (with pkgs;
|
||||
[
|
||||
glibc
|
||||
bashInteractive
|
||||
|
||||
|
|
@ -100,9 +76,10 @@ in
|
|||
|
||||
lutris
|
||||
gamescope
|
||||
wineWow64Packages.waylandFull
|
||||
wineWowPackages.waylandFull
|
||||
flatpak
|
||||
]);
|
||||
]
|
||||
);
|
||||
|
||||
# symlink shared assets, including icons and desktop entries
|
||||
extraInstallCommands = ''
|
||||
|
|
@ -110,25 +87,17 @@ in
|
|||
'';
|
||||
|
||||
runScript = "/usr/bin/lutris";
|
||||
}
|
||||
);
|
||||
});
|
||||
})
|
||||
|
||||
(
|
||||
final: prev:
|
||||
let
|
||||
pycharm-common =
|
||||
pkg:
|
||||
(final: prev: let
|
||||
pycharm-common = pkg:
|
||||
let
|
||||
myIsDerivation = x: !(myLib.derivations.isBroken x);
|
||||
interpreters = pkgs: filter (x: myIsDerivation x) (attrValues pkgs.pythonInterpreters);
|
||||
in
|
||||
prev.buildFHSUserEnv rec {
|
||||
in prev.buildFHSUserEnv rec {
|
||||
name = pkg.pname;
|
||||
targetPkgs =
|
||||
pkgs:
|
||||
(
|
||||
with pkgs;
|
||||
targetPkgs = pkgs: (with pkgs;
|
||||
[
|
||||
glibc
|
||||
bashInteractive
|
||||
|
|
@ -138,9 +107,7 @@ in
|
|||
|
||||
pkg
|
||||
]
|
||||
++ trace "Using the following interpreters: ${toString (pkgNames (interpreters pkgs))}" (
|
||||
interpreters pkgs
|
||||
)
|
||||
++ trace "Using the following interpreters: ${toString (pkgNames (interpreters pkgs))}" (interpreters pkgs)
|
||||
);
|
||||
|
||||
# symlink shared assets, including icons and desktop entries
|
||||
|
|
@ -150,31 +117,21 @@ in
|
|||
|
||||
runScript = "/usr/bin/${pkg.pname}";
|
||||
};
|
||||
in
|
||||
{
|
||||
in {
|
||||
jetbrains = prev.jetbrains // {
|
||||
pycharm-community-fhs = pycharm-common prev.jetbrains.pycharm-community;
|
||||
pycharm-professional-fhs = pycharm-common prev.jetbrains.pycharm-professional;
|
||||
|
||||
clion-fhs =
|
||||
let
|
||||
compilers =
|
||||
pkgs:
|
||||
with pkgs;
|
||||
with llvmPackages_17;
|
||||
[
|
||||
clion-fhs = let
|
||||
compilers = pkgs: with pkgs; with llvmPackages_17; [
|
||||
(setPrio (-9) gcc13)
|
||||
(hiPrio clang)
|
||||
clang-unwrapped
|
||||
libcxx
|
||||
];
|
||||
in
|
||||
prev.buildFHSUserEnv rec {
|
||||
in prev.buildFHSUserEnv rec {
|
||||
name = "clion";
|
||||
targetPkgs =
|
||||
pkgs:
|
||||
(
|
||||
with pkgs;
|
||||
targetPkgs = pkgs: (with pkgs;
|
||||
[
|
||||
jetbrains.clion
|
||||
(hiPrio cmake)
|
||||
|
|
@ -188,22 +145,16 @@ in
|
|||
extraInstallCommands = ''
|
||||
ln -s "${prev.jetbrains.clion}/share" "$out/"
|
||||
'';
|
||||
extraOutputsToInstall = [
|
||||
"include"
|
||||
"dev"
|
||||
"doc"
|
||||
];
|
||||
extraOutputsToInstall = [ "include" "dev" "doc" ];
|
||||
|
||||
runScript = "/usr/bin/clion";
|
||||
};
|
||||
};
|
||||
}
|
||||
)
|
||||
})
|
||||
|
||||
];
|
||||
aviallon.programs.allowUnfreeList = [
|
||||
"unrar"
|
||||
"ark"
|
||||
"unrar" "ark"
|
||||
];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
29
packages.nix
29
packages.nix
|
|
@ -1,10 +1,4 @@
|
|||
{
|
||||
config,
|
||||
pkgs,
|
||||
lib,
|
||||
myLib,
|
||||
...
|
||||
}:
|
||||
{ config, pkgs, lib, myLib, ... }:
|
||||
with lib;
|
||||
let
|
||||
cfg = config.aviallon.programs;
|
||||
|
|
@ -17,10 +11,7 @@ in
|
|||
{
|
||||
imports = [
|
||||
./programs
|
||||
(mkRenamedOptionModule
|
||||
[ "aviallon" "programs" "compileFlags" ]
|
||||
[ "aviallon" "optimizations" "extraCompileFlags" ]
|
||||
)
|
||||
(mkRenamedOptionModule [ "aviallon" "programs" "compileFlags" ] [ "aviallon" "optimizations" "extraCompileFlags" ])
|
||||
];
|
||||
|
||||
options.aviallon.programs = {
|
||||
|
|
@ -32,19 +23,14 @@ in
|
|||
};
|
||||
allowUnfreeList = mkOption {
|
||||
default = [ ];
|
||||
example = [
|
||||
"nvidia-x11"
|
||||
"steam"
|
||||
];
|
||||
example = [ "nvidia-x11" "steam" ];
|
||||
description = "Allow specific unfree software to be installed";
|
||||
type = types.listOf types.str;
|
||||
};
|
||||
config = mkOption {
|
||||
default = {};
|
||||
type = types.attrs;
|
||||
example = {
|
||||
cudaSupport = true;
|
||||
};
|
||||
example = { cudaSupport = true; };
|
||||
description = "nixpkgs config settings to be applied to all nixpkgs instances";
|
||||
};
|
||||
};
|
||||
|
|
@ -53,12 +39,9 @@ in
|
|||
|
||||
programs.java.enable = mkDefault (!generalCfg.minimal);
|
||||
|
||||
aviallon.programs.config.allowUnfreePredicate =
|
||||
pkg: builtins.elem (lib.getName pkg) cfg.allowUnfreeList;
|
||||
aviallon.programs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) cfg.allowUnfreeList;
|
||||
|
||||
environment.systemPackages =
|
||||
with pkgs;
|
||||
[ ]
|
||||
environment.systemPackages = with pkgs; []
|
||||
++ [
|
||||
vim
|
||||
wget
|
||||
|
|
|
|||
|
|
@ -1,13 +1,12 @@
|
|||
{
|
||||
lib,
|
||||
bc,
|
||||
pciutils,
|
||||
gnugrep,
|
||||
coreutils,
|
||||
bash,
|
||||
writeText,
|
||||
stdenv,
|
||||
substituteAll,
|
||||
{lib
|
||||
,bc
|
||||
,pciutils
|
||||
,gnugrep
|
||||
,coreutils
|
||||
,bash
|
||||
,writeText
|
||||
,stdenv
|
||||
,substituteAll
|
||||
}:
|
||||
with lib;
|
||||
stdenv.mkDerivation rec {
|
||||
|
|
@ -27,23 +26,13 @@ stdenv.mkDerivation rec {
|
|||
substituteAllInPlace $out/bin/aspm_enable;
|
||||
'';
|
||||
|
||||
buildInputs = [
|
||||
pciutils
|
||||
bc
|
||||
coreutils
|
||||
gnugrep
|
||||
];
|
||||
buildInputs = [ pciutils bc coreutils gnugrep ];
|
||||
|
||||
meta = {
|
||||
description = "A program to forcibly enable PCIe ASPM for compatible devices";
|
||||
homepage = "https://wireless.wiki.kernel.org/en/users/Documentation/ASPM";
|
||||
license = licenses.gpl3Plus;
|
||||
patforms = [
|
||||
"x86_64-linux"
|
||||
"i686-linux"
|
||||
"aarch64-linux"
|
||||
"mipsel-linux"
|
||||
];
|
||||
patforms = [ "x86_64-linux" "i686-linux" "aarch64-linux" "mipsel-linux" ];
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -33,3 +33,4 @@ writeShellScriptBin "pinentry" ''
|
|||
|
||||
exec ''${pinentryFlavors[$flavor]}/bin/pinentry
|
||||
''
|
||||
|
||||
|
|
|
|||
62
power.nix
62
power.nix
|
|
@ -1,17 +1,10 @@
|
|||
{
|
||||
config,
|
||||
pkgs,
|
||||
lib,
|
||||
myLib,
|
||||
...
|
||||
}:
|
||||
{ config, pkgs, lib, myLib, ... }:
|
||||
with lib;
|
||||
let
|
||||
generalCfg = config.aviallon.general;
|
||||
cfg = config.aviallon.power;
|
||||
undervoltType = with types; nullOr (addCheck int (x: (x < 0 && x > -200)));
|
||||
in
|
||||
{
|
||||
in {
|
||||
options.aviallon.power = {
|
||||
enable = mkOption {
|
||||
default = true;
|
||||
|
|
@ -23,10 +16,7 @@ in
|
|||
default = "performance";
|
||||
example = "efficiency";
|
||||
description = "What to optimize towards";
|
||||
type = types.enum [
|
||||
"performance"
|
||||
"efficiency"
|
||||
];
|
||||
type = types.enum [ "performance" "efficiency" ];
|
||||
};
|
||||
powerLimit = {
|
||||
enable = mkEnableOption "power limiting";
|
||||
|
|
@ -133,18 +123,12 @@ in
|
|||
users.groups.power = {};
|
||||
|
||||
systemd.services.undervolt-intel = {
|
||||
script =
|
||||
""
|
||||
script = ""
|
||||
+ "${pkgs.undervolt}/bin/undervolt"
|
||||
+ (optionalString (
|
||||
!isNull cfg.undervolt.cpu.coreOffset
|
||||
) " --core ${toString cfg.undervolt.cpu.coreOffset}")
|
||||
+ (optionalString (
|
||||
!isNull cfg.undervolt.cpu.cacheOffset
|
||||
) " --cache ${toString cfg.undervolt.cpu.cacheOffset}")
|
||||
+ (optionalString (
|
||||
!isNull cfg.undervolt.cpu.iGPUOffset
|
||||
) " --gpu ${toString cfg.undervolt.cpu.iGPUOffset}");
|
||||
+ (optionalString (! isNull cfg.undervolt.cpu.coreOffset ) " --core ${toString cfg.undervolt.cpu.coreOffset}")
|
||||
+ (optionalString (! isNull cfg.undervolt.cpu.cacheOffset ) " --cache ${toString cfg.undervolt.cpu.cacheOffset}")
|
||||
+ (optionalString (! isNull cfg.undervolt.cpu.iGPUOffset ) " --gpu ${toString cfg.undervolt.cpu.iGPUOffset}")
|
||||
;
|
||||
serviceConfig = {
|
||||
RemainAfterExit = true;
|
||||
};
|
||||
|
|
@ -154,15 +138,11 @@ in
|
|||
};
|
||||
|
||||
systemd.services.intel-powerlimit-ac = {
|
||||
script =
|
||||
"${pkgs.undervolt}/bin/undervolt"
|
||||
+ optionalString (
|
||||
!isNull cfg.powerLimit.ac.cpu
|
||||
) " --power-limit-long ${toString cfg.powerLimit.ac.cpu} 28"
|
||||
+ optionalString (
|
||||
!isNull cfg.powerLimit.ac.cpuBoost
|
||||
) " --power-limit-short ${toString cfg.powerLimit.ac.cpuBoost} 0.1"
|
||||
+ optionalString (!isNull cfg.temperature.ac.cpu) " --temp ${toString cfg.temperature.ac.cpu}";
|
||||
script = "${pkgs.undervolt}/bin/undervolt"
|
||||
+ optionalString (! isNull cfg.powerLimit.ac.cpu ) " --power-limit-long ${toString cfg.powerLimit.ac.cpu} 28"
|
||||
+ optionalString (! isNull cfg.powerLimit.ac.cpuBoost ) " --power-limit-short ${toString cfg.powerLimit.ac.cpuBoost} 0.1"
|
||||
+ optionalString (! isNull cfg.temperature.ac.cpu ) " --temp ${toString cfg.temperature.ac.cpu}"
|
||||
;
|
||||
unitConfig = {
|
||||
ConditionACPower = true;
|
||||
};
|
||||
|
|
@ -176,17 +156,11 @@ in
|
|||
};
|
||||
|
||||
systemd.services.intel-powerlimit-battery = {
|
||||
script =
|
||||
"${pkgs.undervolt}/bin/undervolt"
|
||||
+ optionalString (
|
||||
!isNull cfg.powerLimit.battery.cpu
|
||||
) " --power-limit-long ${toString cfg.powerLimit.battery.cpu} 28"
|
||||
+ optionalString (
|
||||
!isNull cfg.powerLimit.battery.cpuBoost
|
||||
) " --power-limit-short ${toString cfg.powerLimit.battery.cpuBoost} 0.1"
|
||||
+ optionalString (
|
||||
!isNull cfg.temperature.battery.cpu
|
||||
) " --temp ${toString cfg.temperature.battery.cpu}";
|
||||
script = "${pkgs.undervolt}/bin/undervolt"
|
||||
+ optionalString (! isNull cfg.powerLimit.battery.cpu ) " --power-limit-long ${toString cfg.powerLimit.battery.cpu} 28"
|
||||
+ optionalString (! isNull cfg.powerLimit.battery.cpuBoost ) " --power-limit-short ${toString cfg.powerLimit.battery.cpuBoost} 0.1"
|
||||
+ optionalString (! isNull cfg.temperature.battery.cpu ) " --temp ${toString cfg.temperature.battery.cpu}"
|
||||
;
|
||||
unitConfig = {
|
||||
ConditionACPower = false;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,9 +1,4 @@
|
|||
{
|
||||
config,
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
{ config, pkgs, lib, ... }:
|
||||
with lib;
|
||||
{
|
||||
options.aviallon.programs.bash = {
|
||||
|
|
|
|||
|
|
@ -1,27 +1,17 @@
|
|||
{
|
||||
config,
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
{config, pkgs, lib, ...}:
|
||||
with lib;
|
||||
let
|
||||
genPrefList =
|
||||
{
|
||||
locked ? false,
|
||||
}:
|
||||
prefs:
|
||||
genPrefList = {locked ? false}: prefs:
|
||||
let
|
||||
prefFuncName = if locked then "lockPref" else "defaultPref";
|
||||
in
|
||||
concatStringsSep "\n" (
|
||||
mapAttrsToList (
|
||||
key: value: ''${prefFuncName}(${builtins.toJSON key}, ${builtins.toJSON value});''
|
||||
) prefs
|
||||
mapAttrsToList
|
||||
(key: value: ''${prefFuncName}(${builtins.toJSON key}, ${builtins.toJSON value});'' )
|
||||
prefs
|
||||
);
|
||||
cfg = config.programs.firefox;
|
||||
in
|
||||
{
|
||||
in {
|
||||
config = mkIf cfg.enable {
|
||||
programs.firefox.wrapperConfig = {
|
||||
smartcardSupport = true;
|
||||
|
|
@ -136,8 +126,7 @@ in
|
|||
|
||||
#"privacy.trackingprotection.origin_telemetry.enabled" = false;
|
||||
|
||||
}
|
||||
// {
|
||||
} // {
|
||||
"intl.accept_languages" = "fr-fr,en-us,en";
|
||||
"intl.locale.requested" = "fr,en-US";
|
||||
"media.eme.enabled" = true; # DRM
|
||||
|
|
|
|||
|
|
@ -1,10 +1,4 @@
|
|||
{
|
||||
config,
|
||||
pkgs,
|
||||
lib,
|
||||
myLib,
|
||||
...
|
||||
}:
|
||||
{config, pkgs, lib, myLib, ...}:
|
||||
with lib;
|
||||
{
|
||||
programs.git = {
|
||||
|
|
|
|||
|
|
@ -1,9 +1,4 @@
|
|||
{
|
||||
config,
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
{config, pkgs, lib, ...}:
|
||||
{
|
||||
programs.htop.enable = true;
|
||||
programs.htop.settings = {
|
||||
|
|
@ -43,29 +38,9 @@
|
|||
delay = 10;
|
||||
hide_function_bar = 0;
|
||||
header_layout = "two_50_50";
|
||||
column_meters_0 = [
|
||||
"AllCPUs"
|
||||
"Memory"
|
||||
"Swap"
|
||||
];
|
||||
column_meter_modes_0 = [
|
||||
1
|
||||
1
|
||||
1
|
||||
];
|
||||
column_meters_1 = [
|
||||
"Tasks"
|
||||
"LoadAverage"
|
||||
"Uptime"
|
||||
"DiskIO"
|
||||
"NetworkIO"
|
||||
];
|
||||
column_meter_modes_1 = [
|
||||
2
|
||||
2
|
||||
2
|
||||
2
|
||||
2
|
||||
];
|
||||
column_meters_0 = [ "AllCPUs" "Memory" "Swap" ];
|
||||
column_meter_modes_0 = [ 1 1 1 ];
|
||||
column_meters_1 = [ "Tasks" "LoadAverage" "Uptime" "DiskIO" "NetworkIO" ];
|
||||
column_meter_modes_1 = [ 2 2 2 2 2 ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,26 +1,14 @@
|
|||
{
|
||||
config,
|
||||
pkgs,
|
||||
lib,
|
||||
myLib,
|
||||
...
|
||||
}:
|
||||
{ config, pkgs, lib, myLib, ... }:
|
||||
with lib;
|
||||
let
|
||||
cfg = config.aviallon.programs.libreoffice;
|
||||
|
||||
applyOverrides = overrides: pkg: pipe pkg overrides;
|
||||
in
|
||||
{
|
||||
in {
|
||||
options.aviallon.programs.libreoffice = {
|
||||
enable = mkEnableOption "LibreOffice";
|
||||
variant = mkOption {
|
||||
type =
|
||||
with types;
|
||||
types.enum [
|
||||
"still"
|
||||
"fresh"
|
||||
];
|
||||
type = with types; types.enum [ "still" "fresh" ];
|
||||
default = "fresh";
|
||||
description = "Which LibreOffice variant to use";
|
||||
};
|
||||
|
|
@ -47,27 +35,19 @@ in
|
|||
config = mkIf cfg.enable {
|
||||
aviallon.programs.libreoffice.package =
|
||||
let
|
||||
overridesList =
|
||||
[ ]
|
||||
++ [
|
||||
(
|
||||
pkg:
|
||||
pkg.override {
|
||||
overridesList = []
|
||||
++ [(pkg: pkg.override {
|
||||
variant = cfg.variant;
|
||||
}
|
||||
)
|
||||
]
|
||||
++ optional cfg.opencl (
|
||||
pkg:
|
||||
pkg.overrideAttrs (old: {
|
||||
})]
|
||||
++ optional cfg.opencl (pkg: pkg.overrideAttrs (old: {
|
||||
buildInputs = old.buildInputs ++ [ pkgs.ocl-icd ];
|
||||
})
|
||||
);
|
||||
in
|
||||
pkgs.libreoffice.override {
|
||||
}))
|
||||
;
|
||||
in pkgs.libreoffice.override {
|
||||
unwrapped = applyOverrides overridesList cfg.package';
|
||||
};
|
||||
|
||||
|
||||
environment.systemPackages = [
|
||||
cfg.package
|
||||
];
|
||||
|
|
|
|||
|
|
@ -1,29 +1,13 @@
|
|||
{
|
||||
config,
|
||||
pkgs,
|
||||
lib,
|
||||
myLib,
|
||||
...
|
||||
}:
|
||||
{ config, pkgs, lib, myLib, ... }:
|
||||
with lib;
|
||||
let
|
||||
cfg = config.aviallon.programs.nvtop;
|
||||
in
|
||||
{
|
||||
in {
|
||||
options.aviallon.programs.nvtop = {
|
||||
enable = mkEnableOption "nvtop";
|
||||
backend = mkOption {
|
||||
description = "Which backend to enable";
|
||||
type =
|
||||
with types;
|
||||
listOf (enum [
|
||||
"nvidia"
|
||||
"amd"
|
||||
"intel"
|
||||
"panthor"
|
||||
"panfrost"
|
||||
"msm"
|
||||
]);
|
||||
type = with types; listOf (enum [ "nvidia" "amd" "intel" "panthor" "panfrost" "msm" ]);
|
||||
default = [ "amd" ];
|
||||
};
|
||||
|
||||
|
|
@ -41,8 +25,7 @@ in
|
|||
aviallon.programs.nvtop.package = mkDefault (
|
||||
if (length cfg.backend > 1) then
|
||||
pkgs.nvtopPackages.full
|
||||
else
|
||||
pkgs.nvtopPackages.${elemAt cfg.backend 0}
|
||||
else pkgs.nvtopPackages.${elemAt cfg.backend 0}
|
||||
);
|
||||
|
||||
environment.systemPackages = [
|
||||
|
|
|
|||
|
|
@ -1,14 +1,8 @@
|
|||
{
|
||||
config,
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
{ config, pkgs, lib, ... }:
|
||||
with lib;
|
||||
let
|
||||
cfg = config.aviallon.security.encryption;
|
||||
in
|
||||
{
|
||||
in {
|
||||
options.aviallon.security.encryption = {
|
||||
enable = mkEnableOption "encryption-related tools and programs";
|
||||
cryptsetup.package = mkOption {
|
||||
|
|
|
|||
|
|
@ -1,9 +1,4 @@
|
|||
{
|
||||
config,
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
{ config, pkgs, lib, ... }:
|
||||
with lib;
|
||||
let
|
||||
cfg = config.aviallon.hardening;
|
||||
|
|
@ -37,18 +32,11 @@ in
|
|||
};
|
||||
|
||||
imports = [
|
||||
(mkRemovedOptionModule [
|
||||
"aviallon"
|
||||
"hardening"
|
||||
"services"
|
||||
"dbus"
|
||||
] "dbus should use AppArmor hardening instead")
|
||||
(mkRemovedOptionModule [ "aviallon" "hardening" "services" "dbus" ] "dbus should use AppArmor hardening instead")
|
||||
];
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
aviallon.boot.kernel.package = mkIf cfg.hardcore (
|
||||
mkDefault pkgs.linuxKernel.kernels.linux_hardened
|
||||
);
|
||||
aviallon.boot.kernel.package = mkIf cfg.hardcore (mkDefault pkgs.linuxKernel.kernels.linux_hardened);
|
||||
security.lockKernelModules = mkIf cfg.hardcore (mkQuasiForce true);
|
||||
# security.protectKernelImage = mkIf cfg.hardcore (mkOverride 500 false); # needed for kexec
|
||||
|
||||
|
|
@ -56,26 +44,27 @@ in
|
|||
|
||||
security.sudo.execWheelOnly = true;
|
||||
|
||||
services.openssh.settings.PermitRootLogin = if cfg.hardcore then "no" else "prohibit-password";
|
||||
services.openssh.settings.PermitRootLogin =
|
||||
if cfg.hardcore then
|
||||
"no"
|
||||
else "prohibit-password";
|
||||
|
||||
security.apparmor.enable = true;
|
||||
services.dbus.apparmor = "enabled";
|
||||
|
||||
aviallon.boot.cmdline = {
|
||||
"lsm" = [
|
||||
"landlock"
|
||||
]
|
||||
"lsm" = [ "landlock" ]
|
||||
++ optional cfg.hardcore "lockdown"
|
||||
++ [ "yama" ]
|
||||
# Apparmor https://wiki.archlinux.org/title/AppArmor#Installation
|
||||
++ optionals config.security.apparmor.enable [ "apparmor" ]
|
||||
++ [ "bpf" ];
|
||||
++ [ "bpf" ]
|
||||
;
|
||||
"lockdown" = if cfg.hardcore then "confidentiality" else "integrity";
|
||||
|
||||
# Vsyscall page not readable (default is "emulate". "none" might break statically-linked binaries.)
|
||||
vsyscall = mkIf cfg.hardcore "xonly";
|
||||
}
|
||||
// (ifEnable cfg.expensive {
|
||||
} // (ifEnable cfg.expensive {
|
||||
# Slab/slub sanity checks, redzoning, and poisoning
|
||||
"init_on_alloc" = 1;
|
||||
"init_on_free" = 1;
|
||||
|
|
@ -113,11 +102,9 @@ in
|
|||
security.audit.enable = mkDefault true;
|
||||
security.auditd.enable = mkQuasiForce false;
|
||||
|
||||
systemd.services.systemd-journald =
|
||||
let
|
||||
systemd.services.systemd-journald = let
|
||||
rules = pkgs.writeText "audit.rules" (concatStringsSep "\n" config.security.audit.rules);
|
||||
in
|
||||
mkIf config.security.audit.enable {
|
||||
in mkIf config.security.audit.enable {
|
||||
serviceConfig = {
|
||||
#ExecStartPre = "-${pkgs.audit}/bin/augenrules --load";
|
||||
ExecStartPre = ''-${pkgs.audit}/bin/auditctl -R ${rules} -e 1 -f 1 -r 1000 -b 64'';
|
||||
|
|
@ -127,8 +114,7 @@ in
|
|||
path = [ pkgs.audit ];
|
||||
};
|
||||
|
||||
security.audit.rules =
|
||||
[ ]
|
||||
security.audit.rules = []
|
||||
++ [
|
||||
"-A exclude,always -F msgtype=SERVICE_START"
|
||||
"-A exclude,always -F msgtype=SERVICE_STOP"
|
||||
|
|
@ -141,7 +127,8 @@ in
|
|||
"-a exit,always -F arch=b64 -C auid!=euid -F auid!=unset -F euid=0 -S execve -k privesc_execve"
|
||||
"-a exit,always -F arch=b32 -C auid!=euid -F auid!=unset -F euid=0 -S execve -k privesc_execve"
|
||||
]
|
||||
++ optional cfg.expensive "-a exit,always -F arch=b64 -S execve -k execve_calls";
|
||||
++ optional cfg.expensive "-a exit,always -F arch=b64 -S execve -k execve_calls"
|
||||
;
|
||||
|
||||
environment.systemPackages = with pkgs; [
|
||||
sbctl # Secure Boot keys generation
|
||||
|
|
|
|||
|
|
@ -1,18 +1,10 @@
|
|||
{
|
||||
config,
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
{config, pkgs, lib, ...}:
|
||||
with lib;
|
||||
let
|
||||
cfg = config.aviallon.security.tpm;
|
||||
in
|
||||
{
|
||||
in {
|
||||
options.aviallon.security.tpm = {
|
||||
enable = (mkEnableOption "TPM") // {
|
||||
default = true;
|
||||
};
|
||||
enable = (mkEnableOption "TPM") // { default = true; };
|
||||
tpm1_2.enable = mkEnableOption "TPM 1.2 support";
|
||||
};
|
||||
config = mkIf cfg.enable {
|
||||
|
|
@ -24,16 +16,14 @@ in
|
|||
|
||||
environment.systemPackages = [
|
||||
pkgs.tpm2-tools
|
||||
]
|
||||
++ optional cfg.tpm1_2.enable pkgs.tpm-tools;
|
||||
] ++ optional cfg.tpm1_2.enable pkgs.tpm-tools;
|
||||
|
||||
services.tcsd = mkIf cfg.tpm1_2.enable {
|
||||
enable = true;
|
||||
};
|
||||
|
||||
boot.initrd.availableKernelModules = [
|
||||
"tpm_tis"
|
||||
"tpm_crb"
|
||||
"tpm_tis" "tpm_crb"
|
||||
];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,9 +1,4 @@
|
|||
{
|
||||
config,
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
{ config, pkgs, lib, ... }:
|
||||
with lib;
|
||||
let
|
||||
cfg = config.aviallon.services;
|
||||
|
|
@ -11,28 +6,23 @@ let
|
|||
laptopCfg = config.aviallon.laptop;
|
||||
generalCfg = config.aviallon.general;
|
||||
|
||||
journaldConfigValue =
|
||||
value:
|
||||
if value == true then
|
||||
"true"
|
||||
else if value == false then
|
||||
"false"
|
||||
else if isList value then
|
||||
toString value
|
||||
else
|
||||
generators.mkValueStringDefault { } value;
|
||||
journaldConfigValue = value:
|
||||
if value == true then "true"
|
||||
else if value == false then "false"
|
||||
else if isList value then toString value
|
||||
else generators.mkValueStringDefault { } value;
|
||||
|
||||
isNullOrEmpty = v: (v == null) || (isList v && (length v == 0));
|
||||
isNullOrEmpty = v: (v == null) ||
|
||||
(isList v && (length v == 0));
|
||||
|
||||
journaldConfig =
|
||||
settings:
|
||||
(generators.toKeyValue {
|
||||
journaldConfig = settings: (generators.toKeyValue {
|
||||
mkKeyValue = generators.mkKeyValueDefault {
|
||||
mkValueString = journaldConfigValue;
|
||||
} "=";
|
||||
} (filterAttrs (n: v: !(isNullOrEmpty v)) settings));
|
||||
in
|
||||
{
|
||||
} (filterAttrs (n: v: !(isNullOrEmpty v))
|
||||
settings)
|
||||
);
|
||||
in {
|
||||
|
||||
options.aviallon.services = {
|
||||
enable = mkOption {
|
||||
|
|
@ -45,13 +35,7 @@ in
|
|||
journald.extraConfig = mkOption {
|
||||
default = {};
|
||||
example = {};
|
||||
type =
|
||||
with types;
|
||||
attrsOf (oneOf [
|
||||
bool
|
||||
int
|
||||
str
|
||||
]);
|
||||
type = with types; attrsOf (oneOf [ bool int str ]);
|
||||
description = "Add extra config to journald with Nix language";
|
||||
};
|
||||
};
|
||||
|
|
@ -87,22 +71,21 @@ in
|
|||
|
||||
environment.systemPackages = with pkgs; [ waypipe ];
|
||||
|
||||
|
||||
# Better reliability and performance
|
||||
services.dbus.implementation = "broker";
|
||||
|
||||
|
||||
|
||||
|
||||
networking.firewall.allowedTCPPorts = [ 22 ];
|
||||
networking.firewall.allowedUDPPorts = [
|
||||
22
|
||||
5353
|
||||
];
|
||||
networking.firewall.allowedUDPPorts = [ 22 5353 ];
|
||||
|
||||
services.rsyncd.enable = !desktopCfg.enable;
|
||||
|
||||
services.fstrim.enable = true;
|
||||
|
||||
services.haveged.enable = (
|
||||
builtins.compareVersions config.boot.kernelPackages.kernel.version "5.6" < 0
|
||||
);
|
||||
services.haveged.enable = (builtins.compareVersions config.boot.kernelPackages.kernel.version "5.6" < 0);
|
||||
|
||||
services.irqbalance.enable = true;
|
||||
|
||||
|
|
@ -120,38 +103,23 @@ in
|
|||
loglevel = "info";
|
||||
cgroup_realtime_workaround = false;
|
||||
};
|
||||
services.ananicy.extraRules = concatStringsSep "\n" (
|
||||
forEach [
|
||||
{
|
||||
name = "cp";
|
||||
type = "BG_CPUIO";
|
||||
}
|
||||
{
|
||||
name = "nix-build";
|
||||
type = "BG_CPUIO";
|
||||
}
|
||||
{
|
||||
name = "nix-store";
|
||||
type = "BG_CPUIO";
|
||||
}
|
||||
{
|
||||
name = "nix-collect-garbage";
|
||||
type = "BG_CPUIO";
|
||||
}
|
||||
{
|
||||
name = "nix";
|
||||
type = "BG_CPUIO";
|
||||
}
|
||||
{
|
||||
name = "X";
|
||||
type = "LowLatency_RT";
|
||||
}
|
||||
{
|
||||
name = "htop";
|
||||
type = "LowLatency_RT";
|
||||
}
|
||||
] (x: builtins.toJSON x)
|
||||
);
|
||||
services.ananicy.extraRules = concatStringsSep "\n" ( forEach [
|
||||
{ name = "cp";
|
||||
type = "BG_CPUIO"; }
|
||||
{ name = "nix-build";
|
||||
type = "BG_CPUIO"; }
|
||||
{ name = "nix-store";
|
||||
type = "BG_CPUIO"; }
|
||||
{ name = "nix-collect-garbage";
|
||||
type = "BG_CPUIO"; }
|
||||
{ name = "nix";
|
||||
type = "BG_CPUIO"; }
|
||||
{ name = "X";
|
||||
type = "LowLatency_RT"; }
|
||||
{ name = "htop";
|
||||
type = "LowLatency_RT"; }
|
||||
] (x: builtins.toJSON x));
|
||||
|
||||
|
||||
# Enusre low-latency response for this time-critical service
|
||||
systemd.services."hdapsd@" = {
|
||||
|
|
@ -190,6 +158,7 @@ in
|
|||
MulticastDNS = false;
|
||||
};
|
||||
|
||||
|
||||
services.nginx = {
|
||||
recommendedProxySettings = true;
|
||||
recommendedGzipSettings = true;
|
||||
|
|
|
|||
|
|
@ -1,17 +1,11 @@
|
|||
{
|
||||
config,
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
{ config, pkgs, lib, ... }:
|
||||
with lib;
|
||||
let
|
||||
gpgNoTTY = pkgs.writeShellScriptBin "gpg-no-tty" ''
|
||||
exec ${pkgs.gnupg}/bin/gpg --batch --no-tty "$@"
|
||||
'';
|
||||
pinentrySwitcher = pkgs.callPackage ../packages/pinentry.nix {};
|
||||
in
|
||||
{
|
||||
in {
|
||||
config = {
|
||||
|
||||
programs.gnupg = {
|
||||
|
|
|
|||
|
|
@ -1,9 +1,4 @@
|
|||
{
|
||||
config,
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
{config, pkgs, lib, ...}:
|
||||
with lib;
|
||||
let
|
||||
cfg = config.aviallon.services.jupyterhub;
|
||||
|
|
@ -16,11 +11,8 @@ in
|
|||
config = mkIf cfg.enable {
|
||||
services.jupyterhub = {
|
||||
enable = true;
|
||||
kernels.python3 =
|
||||
let
|
||||
env = (
|
||||
pkgs.python3.withPackages (
|
||||
pythonPackages: with pythonPackages; [
|
||||
kernels.python3 = let
|
||||
env = (pkgs.python3.withPackages (pythonPackages: with pythonPackages; [
|
||||
ipykernel
|
||||
pandas
|
||||
scikit-learn
|
||||
|
|
@ -28,11 +20,8 @@ in
|
|||
matplotlib
|
||||
numpy
|
||||
pip
|
||||
]
|
||||
)
|
||||
);
|
||||
in
|
||||
{
|
||||
]));
|
||||
in {
|
||||
displayName = "Python 3 for machine learning";
|
||||
argv = [
|
||||
"${env.interpreter}"
|
||||
|
|
@ -52,12 +41,7 @@ in
|
|||
};
|
||||
services.nginx.virtualHosts = {
|
||||
"jupyterhub.localhost" = {
|
||||
listen = [
|
||||
{
|
||||
addr = "0.0.0.0";
|
||||
port = 80;
|
||||
}
|
||||
];
|
||||
listen = [ { addr = "0.0.0.0"; port = 80; } ];
|
||||
locations."/" = {
|
||||
proxyPass = "http://localhost:${toString config.services.jupyterhub.port}";
|
||||
proxyWebsockets = true;
|
||||
|
|
|
|||
|
|
@ -1,20 +1,14 @@
|
|||
{
|
||||
config,
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
{ config, pkgs, lib, ... }:
|
||||
with lib;
|
||||
let
|
||||
cfg = config.aviallon.windows.wine;
|
||||
in
|
||||
{
|
||||
in {
|
||||
options.aviallon.windows.wine = {
|
||||
enable = mkEnableOption "windows executable support on Linux";
|
||||
package = mkOption {
|
||||
description = "Wine package to use";
|
||||
type = types.package;
|
||||
default = pkgs.wineWow64Packages.waylandFull;
|
||||
default = pkgs.wineWowPackages.waylandFull;
|
||||
example = pkgs.winePackages.stable;
|
||||
};
|
||||
};
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue