feat: organise better

flake.nix

@@ -18,7 +18,7 @@
     };
   };
 
-  outputs = { self, flake-utils,nixpkgs, nixos-generators, disko, agenix, ... }: {
+  outputs = { flake-utils,nixpkgs, nixos-generators, agenix, ... }: {
     packages.x86_64-linux = {
       create-vm = let
         pkgs = import nixpkgs { system = "x86_64-linux"; };
@@ -28,12 +28,12 @@
           buildCommand = "${old.buildCommand}\n patchShebangs $out";
         });
         buildInputs = with pkgs; [ gum jq ];
-        in pkgs.symlinkJoin {
+      in pkgs.symlinkJoin {
           name = script-name;
           paths = [ script ] ++ buildInputs;
           nativeBuildInputs = with pkgs; [makeWrapper];
           postBuild = "wrapProgram $out/bin/${script-name} --prefix PATH : $out/bin";
-      };
+        };
       generate-iso = nixos-generators.nixosGenerate {
         format = "iso";
         system = "x86_64-linux";
@@ -49,61 +49,38 @@
         script-name = "setup-vm";
         src = builtins.readFile ./nixos/proxmox/setup-vm.sh;
         script = (pkgs.writeScriptBin script-name src).overrideAttrs(old: {
-            buildCommand = "${old.buildCommand}\n patchShebangs $out";
-            });
-      buildInputs = with pkgs; [ 
-        gum 
-        agenix.packages.aarch64-darwin.default
+          buildCommand = "${old.buildCommand}\n patchShebangs $out";
+        });
+        buildInputs = with pkgs; [ 
+          gum 
+          agenix.packages.aarch64-darwin.default
         ];
       in pkgs.symlinkJoin {
-        name = script-name;
-        paths = [ script ] ++ buildInputs;
-        nativeBuildInputs = with pkgs; [makeWrapper];
-        postBuild = "wrapProgram $out/bin/${script-name} --prefix PATH : $out/bin";
-      };
-    };
-
-    nixosConfigurations = let
-      nodes = import ./nixos/server/nodes.nix;
-    in builtins.mapAttrs (name: data: nixpkgs.lib.nixosSystem {
-        specialArgs = { meta = { hostname = name; ip = data.ip; }; };
-        modules = [
-        disko.nixosModules.disko
-        agenix.nixosModules.default
-        ./nixos/server/disko-config.nix
-        ./nixos/server/configuration.nix
-        ./nixos/server/hardware-configuration.nix
-        ];
-      }) nodes;
-    colmena = let
-      configs = self.nixosConfigurations;
-    in {
-       meta = {
-          description = "My personal machines";
-          nixpkgs = import nixpkgs { system = "x86_64-linux"; };
-          nodeNixpkgs = builtins.mapAttrs (name: value: value.pkgs) configs;
-          nodeSpecialArgs = builtins.mapAttrs (name: value: value._module.specialArgs) configs;
+          name = script-name;
+          paths = [ script ] ++ buildInputs;
+          nativeBuildInputs = with pkgs; [makeWrapper];
+          postBuild = "wrapProgram $out/bin/${script-name} --prefix PATH : $out/bin";
         };
-    } // builtins.mapAttrs (name: value: { imports = value._module.args.modules; }) configs;
-  } // flake-utils.lib.eachDefaultSystem (system:
-    let pkgs = import nixpkgs {
-      inherit system;
-    }; in
-    {
-      devShells = {
-        default = pkgs.mkShell {
-        buildInputs = [
-          pkgs.nix
-          pkgs.colmena
-          pkgs.shellcheck
-          agenix.packages.${system}.default
-          pkgs.ansible
-          pkgs.kubernetes-helm
-          pkgs.helmfile
-          pkgs.fluxcd
-          pkgs.kustomize
-        ];
-      };
     };
-  });
+  } // flake-utils.lib.eachDefaultSystem (system:
+      let pkgs = import nixpkgs {
+        inherit system;
+      }; in
+        {
+        devShells = {
+          default = pkgs.mkShell {
+            buildInputs = [
+              pkgs.nix
+              pkgs.colmena
+              pkgs.shellcheck
+              agenix.packages.${system}.default
+              pkgs.ansible
+              pkgs.kubernetes-helm
+              pkgs.helmfile
+              pkgs.fluxcd
+              pkgs.kustomize
+            ];
+          };
+        };
+      });
 }