re-brand to LixOS
This commit is contained in:
parent
462a2c6463
commit
88e485934f
2 changed files with 14 additions and 4 deletions
|
@ -20,7 +20,7 @@ in
|
||||||
niv
|
niv
|
||||||
];
|
];
|
||||||
|
|
||||||
environment.sessionVariables = lib.mkIf config.nixpkgs.pkgs.config.allowUnfree {
|
environment.sessionVariables = lib.mkIf pkgs.config.allowUnfree {
|
||||||
NIXPKGS_ALLOW_UNFREE = "1";
|
NIXPKGS_ALLOW_UNFREE = "1";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -20,10 +20,21 @@ in
|
||||||
|
|
||||||
nixpkgs.hostPlatform = "x86_64-linux";
|
nixpkgs.hostPlatform = "x86_64-linux";
|
||||||
|
|
||||||
|
system.nixos = {
|
||||||
|
distroId = "lixos";
|
||||||
|
distroName = "LixOS";
|
||||||
|
};
|
||||||
|
|
||||||
|
environment.sessionVariables = with config.system.nixos; {
|
||||||
|
distro = "${distroName} ${version} (${codeName}) ${builtins.currentSystem}";
|
||||||
|
# NIXPKGS_ALLOW_UNFREE = "1";
|
||||||
|
};
|
||||||
|
|
||||||
nixpkgs.pkgs =
|
nixpkgs.pkgs =
|
||||||
let
|
let
|
||||||
src = nivSources.nixpkgs;
|
src = nivSources.nixpkgs;
|
||||||
unpatched = import src { allowUnfree = true; };
|
config = { allowUnfree = true; };
|
||||||
|
unpatched = import src { inherit config; };
|
||||||
inherit (unpatched) applyPatches fetchpatch;
|
inherit (unpatched) applyPatches fetchpatch;
|
||||||
in
|
in
|
||||||
import
|
import
|
||||||
|
@ -31,8 +42,7 @@ in
|
||||||
name = "nixpkgs-patched";
|
name = "nixpkgs-patched";
|
||||||
inherit src;
|
inherit src;
|
||||||
patches = map fetchpatch nixpkgs_patches;
|
patches = map fetchpatch nixpkgs_patches;
|
||||||
})
|
}) { inherit config; };
|
||||||
{ };
|
|
||||||
|
|
||||||
nixpkgs.overlays = lib.singleton (
|
nixpkgs.overlays = lib.singleton (
|
||||||
final: prev: { agenix = final.callPackage "${nivSources.agenix}/pkgs/agenix.nix" { }; }
|
final: prev: { agenix = final.callPackage "${nivSources.agenix}/pkgs/agenix.nix" { }; }
|
||||||
|
|
Loading…
Reference in a new issue