summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlejandro Soto <alejandro@34project.org>2025-01-26 19:27:20 -0600
committerAlejandro Soto <alejandro@34project.org>2025-01-26 19:27:20 -0600
commitb93e52b72883317e0c206f4c2cfff8e2bcb04471 (patch)
tree363d0585f7cf7fc0ab96943d09cb00ef7dbcc052
parent71226ec478b71daf6a0e7d151514083feb1ca18f (diff)
flake: add default values for mkSystemFlake paths
-rw-r--r--flake.nix8
-rw-r--r--templates/system-flake/flake.nix6
2 files changed, 4 insertions, 10 deletions
diff --git a/flake.nix b/flake.nix
index 2318aa0..d8e51c6 100644
--- a/flake.nix
+++ b/flake.nix
@@ -41,14 +41,14 @@
flakes,
system,
formatter ? "alejandra",
- localOverlayPath ? null,
- nixpkgsConfigPath ? null,
- nixosSourcePath ? null,
+ localOverlayPath ? /. + "${flakes.self}" + /pkgs,
+ nixpkgsConfigPath ? localOverlayPath + /config,
+ nixosSourcePath ? /. + "${flakes.self}" + /sys,
nixosPlatformsPath ?
if nixosSourcePath != null
then nixosSourcePath + /platform
else null,
- hmSourcePath ? null,
+ hmSourcePath ? /. + "${flakes.self}" + /home,
hmPlatformsPath ?
if hmSourcePath != null
then hmSourcePath + /platform
diff --git a/templates/system-flake/flake.nix b/templates/system-flake/flake.nix
index 7b4ec56..6afe06f 100644
--- a/templates/system-flake/flake.nix
+++ b/templates/system-flake/flake.nix
@@ -24,11 +24,5 @@
trivium.lib.mkSystemFlake {
system = "x86_64-linux";
inherit flakes;
-
- localOverlayPath = ./pkgs;
- nixpkgsConfigPath = ./pkgs/config;
-
- hmSourcePath = ./home;
- nixosSourcePath = ./sys;
};
}