sync

flake.nix

@@ -28,7 +28,6 @@
     vscode-server.url = "github:msteen/nixos-vscode-server";
 
     # homeage = {url = "github:jordanisaacs/homeage"; inputs.nixpkgs.follows = "nixpkgs";};
-    # Nix Library Functions
     library = {
       type = "github";
       owner = "nix-community";
@@ -36,27 +35,29 @@
       ref = "master";
       rev = "af5239f892ae6e1c8bb560b11ed874cebbd10696";
     };
-    # Source Filter Functions
+
     filter.url = "github:numtide/nix-filter";
     ignore = {
       url = "github:hercules-ci/gitignore.nix";
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
-    # Flake Utility Functions
-    utils.url = "github:gytis-ivaskevicius/flake-utils-plus";
-
 
   };
 
-  outputs = { self, nixpkgs, home-manager,library, ignore, filter,... }@inputs:
+  outputs = { self, nixpkgs, home-manager, ignore, filter, library,... }@inputs:
     let
       inherit (self) outputs;
+      inherit (lib.my) mapModules mapModulesRec mapHosts;
+
       forEachSystem = nixpkgs.lib.genAttrs [ "x86_64-linux" "aarch64-linux" ];
         platforms = ["x86_64-linux"];
 
       forEachPkgs = f: forEachSystem (sys: f nixpkgs.legacyPackages.${sys});
 
+      lib = nixpkgs.lib.extend
+        (self: super: { my = import ./lib { inherit nixpkgs inputs; lib = self; }; });
+
     in
     rec {
       packages = forEachPkgs (pkgs: import ./pkgs { inherit pkgs; });
@@ -65,7 +66,7 @@
       nixosModules = import ./modules/nixos;
       homeManagerModules = import ./modules/home-manager;
 
-      util = import ./lib/map.nix;
+      lib = lib.my;
 
       # NixOS configuration entrypoint
       # Available through 'nixos-rebuild --flake .#your-hostname'
@@ -91,7 +92,7 @@
         # FIXME replace with your username@hostname
         "sstent@Go3" = home-manager.lib.homeManagerConfiguration {
           pkgs = nixpkgs.legacyPackages.x86_64-linux; # Home-manager requires 'pkgs' instance
-          extraSpecialArgs = { inherit inputs outputs; hostName = "Go3"; };
+          extraSpecialArgs = { inherit inputs outputs lib; hostName = "Go3"; };
           modules = [
             # > Our main home-manager configuration file <
             ./home-manager/users/sstent