From 40e58f609f70611bde30f077d92e8101cd932679 Mon Sep 17 00:00:00 2001
From: Benedikt Peetz <benedikt.peetz@b-peetz.de>
Date: Fri, 24 May 2024 14:09:07 +0200
Subject: fix(flake/packages): Adapt the exposed `nvim` to the `pkgs` set
 changes

---
 flake/packages/default.nix | 23 +++++++++--------------
 1 file changed, 9 insertions(+), 14 deletions(-)

(limited to 'flake')

diff --git a/flake/packages/default.nix b/flake/packages/default.nix
index 7a8aacc2..b670793d 100644
--- a/flake/packages/default.nix
+++ b/flake/packages/default.nix
@@ -13,23 +13,20 @@
   inherit (import ./merge.nix {inherit lib;}) merge;
   output = import ../../bootstrap {inherit pkgs sysLib;};
 
-  args = {
-    inherit pkgs;
-    inherit (pkgs) lib;
-  };
-
   nvim =
     builtins.mapAttrs (
       name: value: let
         nvim_config =
           import ../../modules/home/conf/nvim/default.nix
-          args;
-        build_args =
-          args
-          // {
-            nixosConfig = value.config;
-            config = value.config.home-manager.users.soispha;
-          };
+          build_args;
+        build_args = let
+          inherit (value._module.args) pkgs;
+          inherit (pkgs) lib;
+        in {
+          inherit pkgs lib;
+          nixosConfig = value.config;
+          config = value.config.home-manager.users.soispha;
+        };
 
         resolve_imports = attrs:
           merge (builtins.map (v: import v build_args)
@@ -94,8 +91,6 @@ in
     #   format = "install-iso";
     # };
 
-    inherit myPkgs;
-
     update_shell_lib = shell_library.packages."${system}".update_shell_library;
 
     # gpg-iso = nixos-generators.nixosGenerate {
-- 
cgit 1.4.1