WIP

configurations/darwin/khanelimac/default.nix

@@ -2,7 +2,6 @@
   config,
   inputs,
   lib,
-  root,
   khanelinix-lib,
   ...
 }:
@@ -24,7 +23,7 @@ in
       sops = {
         enable = true;
         sshKeyPaths = [ "/etc/ssh/ssh_host_ed25519_key" ];
-        defaultSopsFile = root + "/secrets/khanelimac/default.yaml";
+        defaultSopsFile = khanelinix-lib.getFile "secrets/khanelimac/default.yaml";
       };
     };
 

configurations/home/bruddy/default.nix

@@ -78,7 +78,7 @@ in
 
       # sops = {
       #   enable = true;
-      #   defaultSopsFile = root + "/secrets/khanelinix/khaneliman/default.yaml";
+      #   defaultSopsFile = khanelinix-lib.getFile "secrets/khanelinix/khaneliman/default.yaml";
       #   sshKeyPaths = [ "${config.home.homeDirectory}/.ssh/id_ed25519" ];
       # };
     };

configurations/home/khaneliman/default.nix

@@ -1,7 +1,6 @@
 {
   config,
   lib,
-  root,
   khanelinix-lib,
   ...
 }:
@@ -85,7 +84,7 @@ in
     services = {
       sops = {
         enable = true;
-        defaultSopsFile = root + "/secrets/khanelimac/khaneliman/default.yaml";
+        defaultSopsFile = khanelinix-lib.getFile "secrets/khanelimac/khaneliman/default.yaml";
         sshKeyPaths = [ "${config.home.homeDirectory}/.ssh/id_ed25519" ];
       };
     };

configurations/home/khaneliman@/default.nix

@@ -2,7 +2,6 @@
   config,
   lib,
   pkgs,
-  root,
   khanelinix-lib,
   self,
   system,
@@ -219,7 +218,7 @@ in
 
       sops = {
         enable = true;
-        defaultSopsFile = root + "/secrets/khanelinix/khaneliman/default.yaml";
+        defaultSopsFile = khanelinix-lib.getFile "secrets/khanelinix/khaneliman/default.yaml";
         sshKeyPaths = [ "${config.home.homeDirectory}/.ssh/id_ed25519" ];
       };
     };

configurations/home/nixos/default.nix

@@ -2,7 +2,6 @@
   config,
   lib,
   osConfig,
-  root,
   khanelinix-lib,
   ...
 }:
@@ -50,7 +49,7 @@ in
     services = {
       sops = {
         enable = true;
-        defaultSopsFile = root + "/secrets/CORE/nixos/default.yaml";
+        defaultSopsFile = khanelinix-lib.getFile "secrets/CORE/nixos/default.yaml";
         sshKeyPaths = [ "${config.home.homeDirectory}/.ssh/id_ed25519" ];
       };
     };

configurations/nixos/khanelilab/default.nix

@@ -1,6 +1,5 @@
 {
   config,
-  root,
   khanelinix-lib,
   ...
 }:
@@ -119,7 +118,7 @@ in
       sops = {
         enable = true;
         sshKeyPaths = [ "/etc/ssh/ssh_host_ed25519_key" ];
-        defaultSopsFile = root + "/secrets/khanelilab/default.yaml";
+        defaultSopsFile = khanelinix-lib.getFile "secrets/khanelilab/default.yaml";
       };
     };
 

flake/configs.nix

@@ -24,33 +24,33 @@
     darwin = {
       configurationsDirectory = ../configurations/darwin;
       modulesDirectory = ../modules/darwin;
-      hosts = {
-        khanelimac.userHomeModules = [
-          "khaneliman"
-        ];
-      };
+      # hosts = {
+      #   khanelimac.userHomeModules = [
+      #     "khaneliman"
+      #   ];
+      # };
     };
 
-    home = {
-      configurationsDirectory = ../configurations/home;
-      modulesDirectory = ../modules/home;
-    };
+    # home = {
+    #   configurationsDirectory = ../configurations/home;
+    #   modulesDirectory = ../modules/home;
+    # };
 
     nixos = {
       configurationsDirectory = ../configurations/nixos;
       modulesDirectory = ../modules/nixos;
-      hosts = {
-        CORE-PW00LM92.userHomeModules = [
-          "nixos"
-        ];
-        bruddynix.userHomeModules = [
-          "khaneliman"
-          "bruddy"
-        ];
-        khanelinix.userHomeModules = [
-          "khaneliman"
-        ];
-      };
+      # hosts = {
+      #   CORE-PW00LM92.userHomeModules = [
+      #     "nixos"
+      #   ];
+      #   bruddynix.userHomeModules = [
+      #     "khaneliman"
+      #     "bruddy"
+      #   ];
+      #   khanelinix.userHomeModules = [
+      #     "khaneliman"
+      #   ];
+      # };
     };
   };
 }

flake/lib.nix

@@ -9,6 +9,7 @@
   flake.lib = {
     khanelinix = lib.makeOverridable (import ../lib) {
       inherit lib self;
+      root = ../.;
     };
   };
 }

flake/overlays.nix

@@ -2,10 +2,9 @@
 let
   children =
     dir:
-    with builtins;
     lib.pipe dir [
-      readDir
-      attrNames
+      builtins.readDir
+      builtins.attrNames
       (map (name: dir + "/${name}"))
     ];
 in

lib/default.nix

@@ -1,6 +1,7 @@
 {
   lib,
   self,
+  root,
   ...
 }:
 lib.makeExtensible (
@@ -16,7 +17,7 @@ lib.makeExtensible (
     deploy = call ./deploy/default.nix {
       inherit (self) inputs;
     };
-    file = call ./file/default.nix { };
+    file = call ./file/default.nix { inherit lib root; };
     module = call ./module/default.nix { };
     packages = call ./packages/default.nix { };
     network = call ./network/default.nix {
@@ -38,5 +39,11 @@ lib.makeExtensible (
       nested-default-attrs
       nested-force-attrs
       ;
+
+    inherit (self'.file)
+      getDefaultNixFiles
+      getDefaultNixFilesRecursive
+      getFile
+      ;
   }
 )

lib/file/default.nix

@@ -1,9 +1,115 @@
-_: {
+{
+  lib,
+  root,
+  ...
+}:
+let
+  inherit (builtins) readDir pathExists;
+  inherit (lib)
+    filterAttrs
+    mapAttrsToList
+    ;
+
+  fileNameRegex = "(.*)\\.(.*)$";
+in
+rec {
   fileWithText = file: text: ''
     ${builtins.readFile file}
     ${text}'';
 
   fileWithText' = file: text: ''
     ${text}
     ${builtins.readFile file}'';
+
+  hasAnyFileExtension =
+    file:
+    let
+      match = builtins.match fileNameRegex (toString file);
+    in
+    match != null;
+
+  getFileExtension =
+    file:
+    if hasAnyFileExtension file then
+      let
+        match = builtins.match fileNameRegex (toString file);
+      in
+      lib.last match
+    else
+      "";
+
+  hasFileExtension =
+    extension: file: if hasAnyFileExtension file then extension == getFileExtension file else false;
+
+  # Convert a store path back to a source path
+  sourcePathFromStorePath =
+    path:
+    let
+      pathStr = toString path;
+      # Match the nix store path pattern and extract the path after the hash
+      match = builtins.match "/nix/store/[a-z0-9]+-source(.*)" pathStr;
+    in
+    if match != null then builtins.head match else pathStr;
+
+  # Convert a store path to a relative path by removing the root prefix
+  makeRelative =
+    path:
+    let
+      pathStr = toString path;
+      rootStr = toString root;
+      sourcePath = sourcePathFromStorePath pathStr;
+    in
+    if lib.hasPrefix rootStr sourcePath then lib.removePrefix "${rootStr}/" sourcePath else sourcePath;
+
+  getFile = path: "${root}/${path}";
+
+  safeReadDirectory = path: if pathExists path then readDir path else { };
+
+  getDirectories =
+    path:
+    let
+      entries = safeReadDirectory path;
+      filteredEntries = filterAttrs (_name: kind: kind == "directory") entries;
+    in
+    mapAttrsToList (name: _kind: "${path}/${name}") filteredEntries;
+
+  getFiles =
+    path:
+    let
+      entries = safeReadDirectory path;
+      filteredEntries = filterAttrs (_name: kind: kind == "regular") entries;
+    in
+    mapAttrsToList (name: _kind: makeRelative "${path}/${name}") filteredEntries;
+  getFilesRecursive =
+    path:
+    let
+      actualPath = sourcePathFromStorePath path;
+      entries = safeReadDirectory actualPath;
+      filteredEntries = filterAttrs (_: kind: (kind == "regular") || (kind == "directory")) entries;
+      mapFile =
+        name: kind:
+        let
+          path' = "${actualPath}/${name}";
+        in
+        if kind == "directory" then getFilesRecursive path' else makeRelative path';
+    in
+    lib.flatten (mapAttrsToList mapFile filteredEntries);
+
+  getNixFiles = path: builtins.filter (hasFileExtension "nix") (getFiles path);
+
+  getNixFilesRecursive = path: builtins.filter (hasFileExtension "nix") (getFilesRecursive path);
+
+  getDefaultNixFiles =
+    path: builtins.filter (name: builtins.baseNameOf name == "default.nix") (getFiles path);
+
+  getDefaultNixFilesRecursive =
+    path:
+    let
+      allFiles = getFilesRecursive path;
+      # Ignore the top-level default.nix
+      topLevelDefaultNix = "${makeRelative path}/default.nix";
+    in
+    builtins.filter (
+      name: (builtins.baseNameOf name == "default.nix") && (name != topLevelDefaultNix)
+    ) allFiles;
 }

modules/darwin/default.nix

@@ -1,15 +1,9 @@
+{ khanelinix-lib, ... }:
 {
-  imports = [
-    ./archetypes
-    ./desktop
-    ./home
-    ./nix
-    ./programs
-    ./security
-    ./services
-    ./suites
-    ./system
-    ./tools
-    ./user
-  ];
+  imports = khanelinix-lib.getDefaultNixFilesRecursive ./.;
+
+  # FIXME: Should be inheriting pkgs with this already set
+  nixpkgs.config = {
+    allowUnfree = true;
+  };
 }