diff options
| author | Soispha <soispha@vhack.eu> | 2023-07-01 18:45:39 +0200 |
|---|---|---|
| committer | Soispha <soispha@vhack.eu> | 2023-07-10 16:44:12 +0200 |
| commit | c3d2c88eed96b82fa8e83e8b6ee53c414a0e4431 (patch) | |
| tree | a5a9553ba5cbf5b6095ae575ecca27356b73c96d /flake | |
| parent | Feat(system/disks): Add luks partition (diff) | |
| download | nixos-config-c3d2c88eed96b82fa8e83e8b6ee53c414a0e4431.tar.gz nixos-config-c3d2c88eed96b82fa8e83e8b6ee53c414a0e4431.zip | |
Refactor(bootstrap): Use disko
Diffstat (limited to 'flake')
| -rw-r--r-- | flake/default.nix | 1 | ||||
| -rw-r--r-- | flake/packages/default.nix | 49 |
2 files changed, 15 insertions, 35 deletions
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 |