From c3d2c88eed96b82fa8e83e8b6ee53c414a0e4431 Mon Sep 17 00:00:00 2001
From: Soispha <soispha@vhack.eu>
Date: Sat, 1 Jul 2023 18:45:39 +0200
Subject: Refactor(bootstrap): Use disko

---
 flake/default.nix          |  1 +
 flake/packages/default.nix | 49 +++++++++++++---------------------------------
 2 files changed, 15 insertions(+), 35 deletions(-)

(limited to 'flake')

diff --git a/flake/default.nix b/flake/default.nix
index 6e70428b..02d6e5b4 100644
--- a/flake/default.nix
+++ b/flake/default.nix
@@ -138,6 +138,7 @@ in {
         nil
         ragenix.packages."${system}".default
         shellcheck
+        shfmt
         statix
         yamllint
       ];
diff --git a/flake/packages/default.nix b/flake/packages/default.nix
index 8ca00e98..0c3d6c1b 100644
--- a/flake/packages/default.nix
+++ b/flake/packages/default.nix
@@ -4,39 +4,18 @@
   defaultSpecialArgs,
   pkgs,
   sysLib,
-  lib,
   ...
-}: {
-  iso = nixos-generators.nixosGenerate {
-    system = "x86_64-linux";
-    specialArgs = defaultSpecialArgs;
-    modules = [
-      ../../hosts/marduk
-    ];
-    format = "install-iso";
-  };
-  install = import ../../bootstrap/install {
-    inherit
-      pkgs
-      sysLib
-      ;
-  };
-  activate = import ../../bootstrap/activate {
-    inherit
-      pkgs
-      sysLib
-      ;
-  };
-  setup = import ../../bootstrap/setup {
-    inherit
-      pkgs
-      sysLib
-      ;
-  };
-  config_setup = import ../../bootstrap/config_setup {
-    inherit
-      pkgs
-      sysLib
-      ;
-  };
-}
+}: let
+  output = import ../../bootstrap {inherit pkgs sysLib;};
+in
+  {
+    iso = nixos-generators.nixosGenerate {
+      system = "x86_64-linux";
+      specialArgs = defaultSpecialArgs;
+      modules = [
+        ../../hosts/marduk
+      ];
+      format = "install-iso";
+    };
+  }
+  // output
-- 
cgit 1.4.1