Reorganize custom ISO files

.gitignore

@@ -1,3 +1,2 @@
 result
-*-iso
 *.iso

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

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
   ];
 }

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;