sstent/vmimages
1
0
Fork 0
mirror of https://github.com/sstent/vmimages.git synced 2025-12-06 06:01:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed the the lib problem

Browse Source
This commit is contained in:
sstent
2023-03-01 23:52:27 +00:00
parent 41d73d457e
commit 4ecf7ad0d7
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
flake.nix
View File

@@ -65,7 +65,8 @@
pkgs' = mkPkgs nixpkgs-unstable []; pkgs' = mkPkgs nixpkgs-unstable [];
lib = nixpkgs.lib.extend 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 { in {
lib = lib.my; lib = lib.my;
packages."${system}" = packages."${system}" =
@@ -95,6 +96,7 @@
##import our HM modules ##import our HM modules
## -- imported in ./home-manger/general ## -- imported in ./home-manger/general
homeManagerModules = builtins.listToAttrs (map homeManagerModules = builtins.listToAttrs (map
(name: { (name: {
inherit name; inherit name;
@@ -129,8 +131,9 @@
homeConfigurations = { homeConfigurations = {
# FIXME replace with your username@hostname # FIXME replace with your username@hostname
"sstent@Go3" = home-manager.lib.homeManagerConfiguration { "sstent@Go3" = 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 = "Go3"; }; pkgs = pkgs;
extraSpecialArgs = { inherit inputs outputs lib; hostName = "Go3"; };
modules = [ modules = [
# > Our main home-manager configuration file < # > Our main home-manager configuration file <
./home-manager/users/sstent ./home-manager/users/sstent
@@ -138,7 +141,7 @@
]; ];
}; };
"sstent@StuPC" = home-manager.lib.homeManagerConfiguration { "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";}; extraSpecialArgs = { inherit inputs outputs; hostName = "StuPC";};
modules = [ modules = [
# > Our main home-manager configuration file < # > Our main home-manager configuration file <

3
home-manager/global/keybase.nix
View File

@@ -6,9 +6,10 @@ cfg = config.custom.keybase;
username = config.home.username; username = config.home.username;
secretstore = config._secretstore; secretstore = config._secretstore;
in { in {
# imports = [ # imports = [
# "${inputs.self}/libs/map.nix" # "${inputs.self}/lib/hm_secrets.nix"
# ]; # ];
options.custom.keybase = { options.custom.keybase = {