From 88e485934fe2fe98f42bcf22146d96b36c3c1406 Mon Sep 17 00:00:00 2001 From: Grimmauld Date: Tue, 7 May 2024 15:14:12 +0200 Subject: [PATCH] re-brand to LixOS --- common/tooling/nix.nix | 2 +- fake_flake.nix | 16 +++++++++++++--- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/common/tooling/nix.nix b/common/tooling/nix.nix index 87e46d3..e9ac6f8 100644 --- a/common/tooling/nix.nix +++ b/common/tooling/nix.nix @@ -20,7 +20,7 @@ in niv ]; - environment.sessionVariables = lib.mkIf config.nixpkgs.pkgs.config.allowUnfree { + environment.sessionVariables = lib.mkIf pkgs.config.allowUnfree { NIXPKGS_ALLOW_UNFREE = "1"; }; diff --git a/fake_flake.nix b/fake_flake.nix index 31f5ca2..ac4f5c4 100644 --- a/fake_flake.nix +++ b/fake_flake.nix @@ -20,10 +20,21 @@ in 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 = let src = nivSources.nixpkgs; - unpatched = import src { allowUnfree = true; }; + config = { allowUnfree = true; }; + unpatched = import src { inherit config; }; inherit (unpatched) applyPatches fetchpatch; in import @@ -31,8 +42,7 @@ in name = "nixpkgs-patched"; inherit src; patches = map fetchpatch nixpkgs_patches; - }) - { }; + }) { inherit config; }; nixpkgs.overlays = lib.singleton ( final: prev: { agenix = final.callPackage "${nivSources.agenix}/pkgs/agenix.nix" { }; }