From 9d887fc79c612673294c62d9c835fc2b41cae2e6 Mon Sep 17 00:00:00 2001
From: Gerg-L <GregLeyda@proton.me>
Date: Mon, 20 Feb 2023 21:38:52 -0500
Subject: [PATCH] finished iso generator fixed stupid type causing vfat
 partition to not mount

---
 flake.lock          | 37 +++++++++++++++++++++++++++++++++++++
 iso/default.nix     | 28 +++++++++++++++++++---------
 systems/desktop.nix |  2 +-
 3 files changed, 57 insertions(+), 10 deletions(-)

diff --git a/flake.lock b/flake.lock
index aad0609..3d67630 100644
--- a/flake.lock
+++ b/flake.lock
@@ -193,6 +193,42 @@
         "type": "github"
       }
     },
+    "nixlib": {
+      "locked": {
+        "lastModified": 1636849918,
+        "narHash": "sha256-nzUK6dPcTmNVrgTAC1EOybSMsrcx+QrVPyqRdyKLkjA=",
+        "owner": "nix-community",
+        "repo": "nixpkgs.lib",
+        "rev": "28a5b0557f14124608db68d3ee1f77e9329e9dd5",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "nixpkgs.lib",
+        "type": "github"
+      }
+    },
+    "nixos-generators": {
+      "inputs": {
+        "nixlib": "nixlib",
+        "nixpkgs": [
+          "unstable"
+        ]
+      },
+      "locked": {
+        "lastModified": 1676297861,
+        "narHash": "sha256-YECUmK34xzg0IERpnbCnaO6z6YgfecJlstMWX7dqOZ8=",
+        "owner": "nix-community",
+        "repo": "nixos-generators",
+        "rev": "1e0a05219f2a557d4622bc38f542abb360518795",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "nixos-generators",
+        "type": "github"
+      }
+    },
     "nixpkgs": {
       "locked": {
         "lastModified": 1670461440,
@@ -269,6 +305,7 @@
         "flake-utils": "flake-utils_2",
         "master": "master",
         "nix": "nix",
+        "nixos-generators": "nixos-generators",
         "nvim-flake": "nvim-flake",
         "spicetify-nix": "spicetify-nix",
         "stable": "stable",
diff --git a/iso/default.nix b/iso/default.nix
index ce5cbb9..fe6d00c 100644
--- a/iso/default.nix
+++ b/iso/default.nix
@@ -1,6 +1,7 @@
 _: {
   lib,
   modulesPath,
+  pkgs,
   ...
 }: {
   imports = [
@@ -8,14 +9,18 @@ _: {
     "${toString modulesPath}/installer/cd-dvd/installation-cd-base.nix"
   ];
 
-  # Causes a lot of uncached builds for a negligible decrease in size.
-  environment.noXlibs = lib.mkOverride 500 false;
-
-  documentation.man.enable = lib.mkOverride 500 true;
-
-  # Although we don't really need HTML documentation in the minimal installer,
-  # not including it may cause annoying cache misses in the case of the NixOS manual.
-  documentation.doc.enable = lib.mkOverride 500 true;
+  environment = {
+    noXlibs = lib.mkOverride 500 false;
+    defaultPackages = [];
+    systemPackages = with pkgs; [gitMinimal neovim];
+    variables = {
+      EDITOR = "nvim";
+    };
+  };
+  documentation = {
+    man.enable = lib.mkOverride 500 false;
+    doc.enable = lib.mkOverride 500 false;
+  };
 
   fonts.fontconfig.enable = lib.mkForce false;
 
@@ -24,5 +29,10 @@ _: {
 
     isoName = lib.mkForce "NixOS.iso";
   };
-
+  nix = {
+    settings = {
+      experimental-features = ["nix-command" "flakes" "repl-flake"];
+      auto-optimise-store = true;
+    };
+  };
 }
diff --git a/systems/desktop.nix b/systems/desktop.nix
index 426269b..83ef516 100644
--- a/systems/desktop.nix
+++ b/systems/desktop.nix
@@ -118,7 +118,7 @@ inputs: {
     options = ["X-mount.mkdir"];
   };
 
-  fileSystems."/boot/efis/nvme-SHPP41-500GM_SSSB4N6719101A4N0E" = {
+  fileSystems."/boot/efis/nvme-SHPP41-500GM_SSB4N6719101A4N0E" = {
     device = "/dev/disk/by-id/nvme-SHPP41-500GM_SSB4N6719101A4N0E-part2";
     fsType = "vfat";
     options = [