Merge branch 'master' of ssh://git.wormcar.gay:2200/devinf/nix-config

1 files changed, 17 insertions, 10 deletions

diff --git a/flake.nix b/flake.nix
index 7fc976c..71b9468 100644
--- a/flake.nix
+++ b/flake.nix
@@ -133,16 +133,16 @@
   };
 
   outputs = inputs@{ self, ...}: with inputs; {
-    # packages.x86_64-linux = {
-    #   linode = nixos-generators.nixosGenerate {
-    #     system = "x86_64-linux";
-    #     modules = [
-    #       ./modules/users/defin.nix
-    #       ./modules/nixos/system-packages.nix
-    #     ];
-    #     format = "linode";
-    #   };
-    # };
+    packages.x86_64-linux = {
+      ISO = nixos-generators.nixosGenerate {
+        system = "x86_64-linux";
+        modules = [
+          ./modules/users/defin.nix
+          ./modules/nixos/system-packages.nix
+        ];
+        format = "install-iso";
+      };
+    };
   #   let
   #     inherit (self) outputs;
   #     lib = nixpkgs.lib //home-manager.lib;
@@ -255,6 +255,13 @@
           ./modules/nixos/system-packages.nix
           ./modules/users/defin.nix
           ./modules/users/root.nix
+
+          home-manager.nixosModules.home-manager {
+            home-manager.useGlobalPkgs = true;
+            home-manager.useUserPackages = true;
+            home-manager.users.defin = import ./home-manager/default.nix;
+            home-manager.extraSpecialArgs = { inherit nushell-scripts nix-colors catppuccin-bat catppuccin-btop catppuccin-helix catppuccin-starship; };
+          }
         ];
       };
       bosco = nixpkgs.lib.nixosSystem { # this is my networking server