Wroclaw/nixos-configuration
1
0
Fork 0
Code Issues Pull requests Activity

nixos/{core; nix}: factor out nix overriding

Browse source
This commit is contained in:
Wroclaw 2025-02-09 09:17:51 +01:00
parent be62805cc6
commit 5c01a58f54
2 changed files with 35 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
nix-os/core.nix
View file

@ -4,28 +4,10 @@
{ inputs, lib, pkgs, ... }: { inputs, lib, pkgs, ... }:
let
inherit (pkgs) mkWrappedExecutable;
# bool -> nixpkgs[]
wrappedNixExecutables = inEnvironment: assert builtins.isBool inEnvironment; [
(mkWrappedExecutable {pkg = pkgs.nix; exe = "nix-build"; wrapperArgs = ["--add-flags" "\"--log-format\"" "--add-flags" "bar${lib.optionalString inEnvironment "-with-logs"}"];})
(mkWrappedExecutable {pkg = pkgs.nix; exe = "nix-shell"; wrapperArgs = ["--add-flags" "\"--log-format\"" "--add-flags" "bar"];})
];
wrappedNixosExecutables = [
(mkWrappedExecutable {pkg = pkgs.nixos-rebuild; wrapperArgs = ["--add-flags" "\"--log-format\"" "--add-flags" "bar"];})
];
wrappedNix = (pkgs.buildEnv {
name = "wrappedNix-${pkgs.nix.version}";
paths = [ pkgs.nix ] ++ wrappedNixExecutables false;
}).overrideAttrs {
version = pkgs.nix.version;
passthru.meta = pkgs.nix.meta;
};
in
{ {
imports = [ imports = [
./module-overrides.nix ./module-overrides.nix
./nix.nix
]; ];
# kernel # kernel
@ -37,7 +19,6 @@ in
# Allow unfree packages # Allow unfree packages
nixpkgs.config.allowUnfree = true; nixpkgs.config.allowUnfree = true;
nix = { nix = {
package = wrappedNix;
channel.enable = false; channel.enable = false;
settings.experimental-features = [ settings.experimental-features = [
"no-url-literals" "no-url-literals"
@ -62,9 +43,7 @@ in
fastfetch fastfetch
smartmontools smartmontools
ddrescue ddrescue
] ++ wrappedNixExecutables true ];
++ wrappedNixosExecutables;
programs.git.enable = true; programs.git.enable = true;
programs.git.config = { programs.git.config = {
commit.verbose = true; commit.verbose = true;

33
nix-os/nix.nix Normal file
View file

@ -0,0 +1,33 @@
{
lib,
pkgs,
...
}:
let
inherit (pkgs) mkWrappedExecutable;
# bool -> nixpkgs[]
wrappedNixExecutables = inEnvironment: assert builtins.isBool inEnvironment; [
(mkWrappedExecutable {pkg = pkgs.nix; exe = "nix-build"; wrapperArgs = ["--add-flags" "\"--log-format\"" "--add-flags" "bar${lib.optionalString inEnvironment "-with-logs"}"];})
(mkWrappedExecutable {pkg = pkgs.nix; exe = "nix-shell"; wrapperArgs = ["--add-flags" "\"--log-format\"" "--add-flags" "bar"];})
];
wrappedNixosExecutables = [
(mkWrappedExecutable {pkg = pkgs.nixos-rebuild; wrapperArgs = ["--add-flags" "\"--log-format\"" "--add-flags" "bar"];})
];
wrappedNix = (pkgs.buildEnv {
name = "wrappedNix-${pkgs.nix.version}";
paths = [ pkgs.nix ] ++ wrappedNixExecutables false;
}).overrideAttrs {
version = pkgs.nix.version;
passthru.meta = pkgs.nix.meta;
};
in {
config = {
nix.package = wrappedNix;
environment.systemPackages = lib.map (lib.hiPrio) [
(wrappedNixExecutables true)
wrappedNixosExecutables
];
};
}