From c3f87354a9fbe52447bd32ff2b7ac476f9a4fc93 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vili=20Sinerv=C3=A4?= <vili.m.sinerva@gmail.com>
Date: Thu, 29 May 2025 02:06:42 +0300
Subject: [PATCH] Reorganize custom ISO files

---
 .gitignore                                    |  1 -
 .../base.nix                                  | 20 +------------------
 .../graphical.nix                             |  4 ++--
 .../minimal.nix                               |  2 +-
 .../template-configuration.nix                |  0
 5 files changed, 4 insertions(+), 23 deletions(-)
 rename misc/custom-iso-base.nix => custom-installer/base.nix (76%)
 rename misc/custom-gnome-iso.nix => custom-installer/graphical.nix (64%)
 rename misc/custom-minimal-iso.nix => custom-installer/minimal.nix (86%)
 rename {misc => custom-installer}/template-configuration.nix (100%)

diff --git a/.gitignore b/.gitignore
index 6324adf..bdb48ac 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,2 @@
 result
-*-iso
 *.iso
diff --git a/misc/custom-iso-base.nix b/custom-installer/base.nix
similarity index 76%
rename from misc/custom-iso-base.nix
rename to custom-installer/base.nix
index 37d10ab..d790af3 100644
--- a/misc/custom-iso-base.nix
+++ b/custom-installer/base.nix
@@ -46,7 +46,7 @@ let
 
     nixos-generate-config --root /mnt
     mv /mnt/etc/nixos/configuration.nix configuration.nix.old
-    curl https://forgejo.sinerva.eu/VSinerva/nixos-conf/raw/branch/main/misc/template-configuration.nix -o /mnt/etc/nixos/configuration.nix
+    curl https://forgejo.sinerva.eu/VSinerva/nixos-conf/raw/branch/main/custom-installer/template-configuration.nix -o /mnt/etc/nixos/configuration.nix
   '';
 in
 {
@@ -57,18 +57,7 @@ in
 
   environment.systemPackages =
     (with pkgs; [
-      (onlykey.override (prev: {
-        node_webkit = prev.node_webkit.overrideAttrs {
-          src = fetchurl {
-            url = "https://dl.nwjs.io/v0.71.1/nwjs-v0.71.1-linux-x64.tar.gz";
-            hash = "sha256-bnObpwfJ6SNJdOvzWTnh515JMcadH1+fxx5W9e4gl/4=";
-          };
-        };
-      }))
-
       cryptsetup
-      onlykey-cli
-      onlykey-agent
     ])
     ++ [
       create-partitions
@@ -76,13 +65,6 @@ in
       prep-install
     ];
 
-  programs.gnupg.agent = {
-    enable = true;
-    enableSSHSupport = true;
-    pinentryPackage = pkgs.pinentry-curses;
-  };
-  hardware.onlykey.enable = true;
-
   isoImage.squashfsCompression = "gzip -Xcompression-level 1";
 
   #Many installs will need this, and it won't hurt either way
diff --git a/misc/custom-gnome-iso.nix b/custom-installer/graphical.nix
similarity index 64%
rename from misc/custom-gnome-iso.nix
rename to custom-installer/graphical.nix
index d76c90b..dfd8bec 100644
--- a/misc/custom-gnome-iso.nix
+++ b/custom-installer/graphical.nix
@@ -1,7 +1,7 @@
 { ... }:
 {
   imports = [
-    <nixpkgs/nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares-gnome.nix>
-    ./custom-iso-base.nix
+    <nixpkgs/nixos/modules/installer/cd-dvd/installation-cd-graphical-combined.nix>
+    ./base.nix
   ];
 }
diff --git a/misc/custom-minimal-iso.nix b/custom-installer/minimal.nix
similarity index 86%
rename from misc/custom-minimal-iso.nix
rename to custom-installer/minimal.nix
index 14508c5..dd984e1 100644
--- a/misc/custom-minimal-iso.nix
+++ b/custom-installer/minimal.nix
@@ -2,7 +2,7 @@
 {
   imports = [
     <nixpkgs/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix>
-    ./custom-iso-base.nix
+    ./base.nix
   ];
 
   networking.networkmanager.enable = pkgs.lib.mkForce false;
diff --git a/misc/template-configuration.nix b/custom-installer/template-configuration.nix
similarity index 100%
rename from misc/template-configuration.nix
rename to custom-installer/template-configuration.nix