From b0bd0f05a0e2f6fc14175f950386b580a96b87be Mon Sep 17 00:00:00 2001
From: Peter Selby <peter.selby@bytedance.com>
Date: Mon, 6 Nov 2023 15:34:48 -0800
Subject: [PATCH] Switch how this works again

---
 flake.nix  | 4 ++--
 module.nix | 8 +++++---
 niten.nix  | 5 ++---
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/flake.nix b/flake.nix
index 0c00d3b..778296b 100644
--- a/flake.nix
+++ b/flake.nix
@@ -24,8 +24,8 @@
         (import ./module.nix { inherit doom-emacs niten-doom-config; })
       ];
     };
-    mkHomeManagerConfiguration = { username, user-email, home-dir, enable-gui, ... }: import ./niten.nix {
-      inherit username user-email home-dir enable-gui doom-emacs niten-doom-config;
+    mkHomeManagerConfiguration = { username, user-email, home-dir, enable-gui, pkgs, ... }: import ./niten.nix {
+      inherit username user-email home-dir enable-gui doom-emacs niten-doom-config pkgs;
     };
   };
 }
diff --git a/module.nix b/module.nix
index 52e780d..9c22996 100644
--- a/module.nix
+++ b/module.nix
@@ -38,15 +38,17 @@ in {
         user-email = if (user-cfg.email != null) then
           user-cfg.email else "${username}@${config.instance.local-domain}";
         home-dir = config.users.users.${username}.home;
-      in ((import user-configs.${username} {
+      in (import user-configs.${username} {
         inherit
           doom-emacs
           niten-doom-config
           username
           user-email
           home-dir
-          enable-gui;
-      }) { inherit config, lib, pgks, ...});
+          enable-gui
+	  lib,
+	  pkgs;
+      });
     in mapAttrs generate-config local-users;
   };
 }
diff --git a/niten.nix b/niten.nix
index dc83291..b41d7fa 100644
--- a/niten.nix
+++ b/niten.nix
@@ -5,12 +5,11 @@
   user-email,
   home-dir,
   enable-gui,
+  pkgs,
   ...
 }:
 
-{ config, lib, pkgs, }:
-
-with lib;
+with pkgs.lib;
 let
 
   doom-emacs-package = pkgs.callPackage doom-emacs {