From 03f1d74812cb76427ffbc55c43e8d07adde34da3 Mon Sep 17 00:00:00 2001
From: voidarc <admin@voidarc.co.uk>
Date: Thu, 27 Aug 2026 14:21:11 +0100
Subject: [PATCH] cleaned up core modules and added universal flakeLocation
 argument

---
 modules/system/core/default.nix      | 13 +++----------
 modules/system/core/nix-settings.nix | 10 +++++++---
 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/modules/system/core/default.nix b/modules/system/core/default.nix
index d2ec884..246a979 100644
--- a/modules/system/core/default.nix
+++ b/modules/system/core/default.nix
@@ -1,13 +1,5 @@
-{
-  self,
-  inputs,
-  ...
-}: {
-  flake.nixosModules.core = {
-    pkgs,
-    lib,
-    ...
-  }: let
+{self, ...}: {
+  flake.nixosModules.core = {pkgs, ...}: let
     modules = with self.nixosModules; [
       user
       bootloader
@@ -21,6 +13,7 @@
         /etc/nixos/hardware-configuration.nix
       ]
       ++ modules;
+
     services = {
       openssh.enable = true;
       avahi.enable = true;
diff --git a/modules/system/core/nix-settings.nix b/modules/system/core/nix-settings.nix
index ad2fb4c..540e2ed 100644
--- a/modules/system/core/nix-settings.nix
+++ b/modules/system/core/nix-settings.nix
@@ -1,8 +1,12 @@
 {inputs, ...}: {
   perSystem = {system, ...}: {
-    _module.args.unfreePkgs = import inputs.nixpkgs {
-      inherit system;
-      config.allowUnfree = true;
+    _module.args = {
+      unfreePkgs = import inputs.nixpkgs {
+        inherit system;
+        config.allowUnfree = true;
+      };
+      # Make flakeLocation universally addressable
+      flakeLocation = builtins.getEnv "PWD";
     };
   };
   flake.nixosModules.nix = {...}: {