util via speciaArgs

mightyiam · Dec 25, 2024 · 3b48732 · 3b48732
1 parent 0c0e839
commit 3b48732
Show file tree

Hide file tree

Showing 6 changed files with 44 additions and 39 deletions.
diff --git a/flake.nix b/flake.nix
@@ -103,27 +103,31 @@
 
   outputs =
     inputs:
-    inputs.flake-parts.lib.mkFlake { inherit inputs; } {
-      imports = [
-        ./boot-message.nix
-        ./catppuccin.nix
-        ./codeberg.nix
-        ./drv-paths.nix
-        ./fmt.nix
-        ./git-hooks.nix
-        ./home-manager-modules
-        ./lib.nix
-        ./meta.nix
-        ./nix-on-droid-configurations
-        ./nixos-configurations.nix
-        ./nixos-modules
-        ./nixvim
-        inputs.devshell.flakeModule
-      ];
-
-      systems = [
-        "x86_64-linux"
-        "aarch64-linux"
-      ];
-    };
+    inputs.flake-parts.lib.mkFlake
+      {
+        inherit inputs;
+        specialArgs.util = import ./util.nix inputs;
+      }
+      {
+        imports = [
+          ./boot-message.nix
+          ./catppuccin.nix
+          ./codeberg.nix
+          ./drv-paths.nix
+          ./fmt.nix
+          ./git-hooks.nix
+          ./home-manager-modules
+          ./meta.nix
+          ./nix-on-droid-configurations
+          ./nixos-configurations.nix
+          ./nixos-modules
+          ./nixvim
+          inputs.devshell.flakeModule
+        ];
+
+        systems = [
+          "x86_64-linux"
+          "aarch64-linux"
+        ];
+      };
 }
diff --git a/home-manager-modules/default.nix b/home-manager-modules/default.nix
@@ -1,7 +1,7 @@
-{ lib, readModulesDir, ... }:
+{ lib, util, ... }:
 {
   options.flake.homeManagerModules = lib.mkOption {
     type = lib.types.attrsOf lib.types.anything;
   };
-  config.flake.homeManagerModules = readModulesDir ./.;
+  config.flake.homeManagerModules = util.readModulesDir ./.;
 }
diff --git a/lib.nix b/lib.nix
diff --git a/nixos-modules/default.nix b/nixos-modules/default.nix
@@ -1,4 +1,4 @@
-{ readModulesDir, ... }:
+{ util, ... }:
 {
-  flake.nixosModules = readModulesDir ./.;
+  flake.nixosModules = util.readModulesDir ./.;
 }
diff --git a/nixvim/default.nix b/nixvim/default.nix
@@ -1,7 +1,7 @@
 {
   lib,
   self,
-  readModulesDir,
+  util,
   ...
 }:
 {
@@ -10,7 +10,7 @@
   };
 
   config = {
-    flake.nixvimModules = readModulesDir ./.;
+    flake.nixvimModules = util.readModulesDir ./.;
     perSystem =
       {
         inputs',

diff --git a/util.nix b/util.nix
@@ -0,0 +1,11 @@
+{ nixpkgs, ... }:
+let
+  inherit (nixpkgs) lib;
+in
+{
+  readModulesDir =
+    path:
+    builtins.readDir path
+    |> lib.filterAttrs (name: _: name != "default.nix")
+    |> lib.mapAttrs' (name: type: lib.nameValuePair (lib.removeSuffix ".nix" name) (path + "/${name}"));
+}