From 737eaf14b076a4976ccb84d48c74c9a477bb72f1 Mon Sep 17 00:00:00 2001
From: NullBite <me@nullbite.com>
Date: Mon, 22 Apr 2024 22:15:33 -0400
Subject: [PATCH] Use attrset for nixfiles lib init

---
 home/default.nix           | 2 +-
 lib/nixfiles/default.nix   | 6 +++---
 lib/nixfiles/minecraft.nix | 2 +-
 lib/nixfiles/types.nix     | 2 +-
 system/default.nix         | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/home/default.nix b/home/default.nix
index 333f850..ff0eaaa 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -24,7 +24,7 @@ in
 
     lib = lib.mkOption {
       description = "nixfiles library";
-      default = (import ../lib/nixfiles) pkgs;
+      default = (import ../lib/nixfiles) { inherit pkgs; };
       readOnly = true;
     };
 
diff --git a/lib/nixfiles/default.nix b/lib/nixfiles/default.nix
index f0e74a5..6468712 100644
--- a/lib/nixfiles/default.nix
+++ b/lib/nixfiles/default.nix
@@ -1,8 +1,8 @@
-pkgs:
+{ pkgs, ... }:
 let
   inherit (pkgs) lib;
 in
 {
-  types = (import ./types.nix) pkgs;
-  minecraft = (import ./minecraft.nix) pkgs;
+  types = (import ./types.nix) { inherit pkgs; };
+  minecraft = (import ./minecraft.nix) { inherit pkgs; };
 }
diff --git a/lib/nixfiles/minecraft.nix b/lib/nixfiles/minecraft.nix
index b970887..99aedc9 100644
--- a/lib/nixfiles/minecraft.nix
+++ b/lib/nixfiles/minecraft.nix
@@ -1,4 +1,4 @@
-pkgs:
+{ pkgs, ... }:
 let
   inherit (pkgs) lib;
 in
diff --git a/lib/nixfiles/types.nix b/lib/nixfiles/types.nix
index 263d457..b81e3bd 100644
--- a/lib/nixfiles/types.nix
+++ b/lib/nixfiles/types.nix
@@ -1,4 +1,4 @@
-pkgs:
+{ pkgs, ... }:
 let
   inherit (pkgs) lib;
   inherit (lib.types) mkOptionType;
diff --git a/system/default.nix b/system/default.nix
index 9a193f1..15d8998 100644
--- a/system/default.nix
+++ b/system/default.nix
@@ -30,7 +30,7 @@ in
 
     lib = lib.mkOption {
       description = "nixfiles library";
-      default = (import ../lib/nixfiles) pkgs;
+      default = (import ../lib/nixfiles) { inherit pkgs; };
       readOnly = true;
       type = lib.types.attrs;
     };