Merge branch 'master' of ssh://bosco:/srv/git/.flake

1 files changed, 32 insertions, 8 deletions

diff --git a/flake.nix b/flake.nix
index 129d6ad..33cce64 100644
--- a/flake.nix
+++ b/flake.nix
@@ -27,6 +27,11 @@
     #   inputs.nixpkgs.follows = "nixpkgs";
     #   inputs.lix.follows = "lix";
     # };
+    
+    unf = {
+      url = "git+https://git.atagen.co/atagen/unf";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
 
     #for device formatting
     disko = {
@@ -192,18 +197,32 @@
     let
       inherit (self) outputs;
       lib = nixpkgs.lib // home-manager.lib;
-      systems = [ "x86_64-linux" "aarch64-linux" ];
-      # forAllSystems = f: lib.genAttrs systems (system: f pkgsFor.${system});
-      pkgsFor = lib.genAttrs systems (system: import nixpkgs {
-        inherit system;
-        config.allowUnfree = true;
-      });
+      # systems = [ "x86_64-linux" "aarch64-linux" ];
+      # # forAllSystems = f: lib.genAttrs systems (system: f pkgsFor.${system});
+      # pkgsFor = lib.genAttrs systems (system: import nixpkgs {
+      #   inherit system;
+      #   config.allowUnfree = true;
+      # });
+
+      # function to use unf to list options from arbitrary module for home-manager
+      mkOpts = system: module:
+        inputs.unf.lib.json {
+          inherit self;
+          pkgs = nixpkgs.legacyPackages.${system};
+
+          # not all modules can be evaluated easily. If your module
+          # does not evaluate, try checking this NüschtOS file:
+          #   https://github.com/NuschtOS/search.nuschtos.de/blob/main/flake.nix
+          modules = [module];
+        };        
 
       minimalHomeManagerSettings = [ # From github:MasterofNull/nixos config
         home-manager.nixosModules.home-manager {
           home-manager.useGlobalPkgs = true;
           home-manager.useUserPackages = true;
-          home-manager.extraSpecialArgs = { inherit inputs; };
+          home-manager.extraSpecialArgs = {
+            inherit inputs;
+          };
         }
       ];
       nixIndex = [
@@ -261,7 +280,12 @@
           modules = minimalModuleConfig ++ [ ./machines/zenbook
             # lix-module.nixosModules.default
             # hyprland.homeManagerModules.default {wayland.windowManager.hyprland.enable = true;}
-            home-manager.nixosModules.home-manager { home-manager.users.defin = import ./home-manager/tiling-wm.nix; }
+            home-manager.nixosModules.home-manager {
+              home-manager.users.defin = import ./home-manager/tiling-wm.nix;
+              home-manager.extraSpecialArgs = {
+                diskoOptions = inputs.disko.nixosModules.default;
+              };
+            }
           ];
         };