From 4ecf7ad0d789ff04f45ed75e4cbe3ee193bc97b5 Mon Sep 17 00:00:00 2001
From: sstent <stuart.stent@gmail.com>
Date: Wed, 1 Mar 2023 23:52:27 +0000
Subject: [PATCH] fixed the the lib problem

---
 flake.nix                       | 11 +++++++----
 home-manager/global/keybase.nix |  3 ++-
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/flake.nix b/flake.nix
index dfa4642..9045579 100644
--- a/flake.nix
+++ b/flake.nix
@@ -65,7 +65,8 @@
       pkgs' = mkPkgs nixpkgs-unstable [];
 
       lib = nixpkgs.lib.extend
-        (self: super: { my = import ./lib { inherit pkgs inputs outputs; lib = self; }; });
+        (self: super: { my = import ./lib { inherit pkgs inputs outputs; lib = self; }; }// home-manager.lib);
+
     in {
       lib = lib.my;
       packages."${system}" =
@@ -95,6 +96,7 @@
 
       ##import our HM modules
       ## -- imported in ./home-manger/general  
+      
       homeManagerModules = builtins.listToAttrs (map
         (name: {
           inherit name;
@@ -129,8 +131,9 @@
       homeConfigurations = {
         # 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"; };
+          # pkgs = nixpkgs.legacyPackages.x86_64-linux; # Home-manager requires 'pkgs' instance
+          pkgs = pkgs;
+          extraSpecialArgs = { inherit inputs outputs lib; hostName = "Go3"; };
           modules = [
             # > Our main home-manager configuration file <
             ./home-manager/users/sstent
@@ -138,7 +141,7 @@
           ];
         };
         "sstent@StuPC" = home-manager.lib.homeManagerConfiguration {
-          pkgs = nixpkgs.legacyPackages.x86_64-linux; # Home-manager requires 'pkgs' instance
+          # pkgs = nixpkgs.legacyPackages.x86_64-linux; # Home-manager requires 'pkgs' instance
           extraSpecialArgs = { inherit inputs outputs; hostName = "StuPC";};
           modules = [
             # > Our main home-manager configuration file <
diff --git a/home-manager/global/keybase.nix b/home-manager/global/keybase.nix
index 2c3ea7c..db35a88 100644
--- a/home-manager/global/keybase.nix
+++ b/home-manager/global/keybase.nix
@@ -6,9 +6,10 @@ cfg = config.custom.keybase;
 username = config.home.username;
 secretstore = config._secretstore;
 
+
 in {
   # imports =  [
-  #   "${inputs.self}/libs/map.nix" 
+  #   "${inputs.self}/lib/hm_secrets.nix" 
   #   ];
 
   options.custom.keybase = {