From a254150a884d869ddf4190868536d6db2a2a9461 Mon Sep 17 00:00:00 2001
From: Gerg-L <GregLeyda@proton.me>
Date: Sun, 30 Apr 2023 18:57:45 -0400
Subject: [PATCH] add diskoConfigurations

---
 flake.nix                      | 11 +++++++++++
 installer/default.nix          |  9 +++++++--
 systems/game-laptop/disko.nix  |  2 +-
 systems/gerg-desktop/disko.nix |  2 +-
 systems/moms-laptop/disko.nix  |  2 +-
 5 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/flake.nix b/flake.nix
index 9a7b916..a26c58b 100644
--- a/flake.nix
+++ b/flake.nix
@@ -67,6 +67,10 @@
               ++ importAll (self + "/systems/" + name);
           }
       );
+    mkDisko = names:
+      lib.genAttrs names (
+        name: (import (self + "/systems/" + name + "/disko.nix") inputs)
+      );
   in
     {
       nixosConfigurations =
@@ -77,6 +81,13 @@
           "game-laptop"
           "moms-laptop"
         ];
+      diskoConfigurations =
+        mkDisko
+        [
+          "gerg-desktop"
+          "game-laptop"
+          "moms-laptop"
+        ];
     }
     // flake-utils.lib.eachDefaultSystem (
       system: let
diff --git a/installer/default.nix b/installer/default.nix
index 4650fba..2f625e4 100644
--- a/installer/default.nix
+++ b/installer/default.nix
@@ -1,4 +1,4 @@
-_: {
+{disko, ...}: {
   lib,
   modulesPath,
   pkgs,
@@ -12,7 +12,11 @@ _: {
   environment = {
     noXlibs = lib.mkOverride 500 false;
     defaultPackages = [];
-    systemPackages = [pkgs.gitMinimal pkgs.neovim];
+    systemPackages = [
+      pkgs.gitMinimal
+      pkgs.neovim
+      disko.packages.${pkgs.system}.default
+    ];
     variables = {
       EDITOR = "nvim";
     };
@@ -34,4 +38,5 @@ _: {
       auto-optimise-store = true;
     };
   };
+  sound.enable = false;
 }
diff --git a/systems/game-laptop/disko.nix b/systems/game-laptop/disko.nix
index 0874fd8..8c537c4 100644
--- a/systems/game-laptop/disko.nix
+++ b/systems/game-laptop/disko.nix
@@ -1,4 +1,4 @@
-{disko, ...}: {
+{disko, ...}: {disks ? [], ...}: {
   imports = [disko.nixosModules.disko];
   disko.devices = {
     disk.nvme0n1 = {
diff --git a/systems/gerg-desktop/disko.nix b/systems/gerg-desktop/disko.nix
index cbd375a..8c245be 100644
--- a/systems/gerg-desktop/disko.nix
+++ b/systems/gerg-desktop/disko.nix
@@ -1,4 +1,4 @@
-{disko, ...}: {
+{disko, ...}: {disks ? [], ...}: {
   imports = [disko.nixosModules.disko];
   disko.devices = {
     disk = {
diff --git a/systems/moms-laptop/disko.nix b/systems/moms-laptop/disko.nix
index cded87c..4a4b3d1 100644
--- a/systems/moms-laptop/disko.nix
+++ b/systems/moms-laptop/disko.nix
@@ -1,4 +1,4 @@
-{disko, ...}: {
+{disko, ...}: {disks ? [], ...}: {
   imports = [disko.nixosModules.disko];
   disko.devices = {
     disk.sda = {