aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--flake/default.nix5
-rw-r--r--flake/packages/default.nix1
-rw-r--r--hosts/marduk/default.nix4
3 files changed, 8 insertions, 2 deletions
diff --git a/flake/default.nix b/flake/default.nix
index 834d0b0c..b3e18ca7 100644
--- a/flake/default.nix
+++ b/flake/default.nix
@@ -112,7 +112,10 @@ in {
agenix
;
};
- packages."${system}" = import ./packages {inherit nixos-generators defaultSpecialArgs pkgs sysLib;};
+ packages."${system}" = import ./packages {
+ inherit nixos-generators defaultSpecialArgs pkgs sysLib;
+ inherit (pkgs) lib;
+ };
apps."${system}" = import ./apps {inherit self system;};
diff --git a/flake/packages/default.nix b/flake/packages/default.nix
index 666fa20a..8ca00e98 100644
--- a/flake/packages/default.nix
+++ b/flake/packages/default.nix
@@ -4,6 +4,7 @@
defaultSpecialArgs,
pkgs,
sysLib,
+ lib,
...
}: {
iso = nixos-generators.nixosGenerate {
diff --git a/hosts/marduk/default.nix b/hosts/marduk/default.nix
index aae467a5..a45d9efd 100644
--- a/hosts/marduk/default.nix
+++ b/hosts/marduk/default.nix
@@ -1,5 +1,5 @@
# vim: ts=2
-{...}: {
+{lib, ...}: {
imports = [
./hardware
./networking.nix
@@ -8,6 +8,8 @@
console = {
keyMap = "dvorak";
};
+ # needed to override defaults
+ isoImage.isoName = lib.mkForce "nixos-iso";
system.stateVersion = "23.05";
}