From ae5315326a7d2c3239bbe478961724d171aea200 Mon Sep 17 00:00:00 2001
From: Alejandro Soto <alejandro@34project.org>
Date: Sun, 26 Jan 2025 19:27:20 -0600
Subject: [PATCH] flake: add default values for mkSystemFlake paths

---
 flake.nix                        | 8 ++++----
 templates/system-flake/flake.nix | 6 ------
 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;
     };
 }