1 files changed, 13 insertions, 9 deletions

diff --git a/flake.nix b/flake.nix
index fc28cd8..274a605 100644
--- a/flake.nix
+++ b/flake.nix
@@ -36,6 +36,8 @@
     # nix-gaming
     nix-gaming.url = "github:fufexan/nix-gaming";
     nix-gaming.inputs.nixpkgs.follows = "nixpkgs";
+    # nix-cachyos-kernel
+    nix-cachyos-kernel.url = "github:xddxdd/nix-cachyos-kernel/release";
   };
 
   outputs = {
@@ -55,26 +57,29 @@
           }
         )
         systems);
-    mkSystem = file: system:
-      nixpkgs.lib.nixosSystem {
+    mkSystem = hostDir: system: let
+      lib = nixpkgs.lib.extend (_: _: self.lib);
+    in
+      lib.nixosSystem {
         inherit system;
-        specialArgs = {inherit inputs system;};
+        specialArgs = {inherit inputs system hostDir lib;};
         modules = [
           ./system
           ./options.nix
-          file
+          hostDir
         ];
       };
-    mkHome = file: system: let
-      hostModule = mkSystem file system;
+    mkHome = hostDir: system: let
+      hostModule = mkSystem hostDir system;
+      lib = nixpkgs.lib.extend (_: _: self.lib // home-manager.lib);
     in
       home-manager.lib.homeManagerConfiguration {
         inherit (hostModule) pkgs;
-        extraSpecialArgs = {inherit inputs system;};
+        extraSpecialArgs = {inherit inputs system hostDir lib;};
         modules = [
           ./home
           ./options.nix
-          (self.lib.homeConfig hostModule.config)
+          (lib.home.mkConfig hostModule.config)
           {
             programs.home-manager.enable = nixpkgs.lib.mkForce false;
           }
@@ -97,7 +102,6 @@
     };
 
     lib = import ./lib {
-      inherit inputs;
       inherit (nixpkgs) lib;
     };