feat: change to a generic installer that is lightweight, downloads fl…

…ake from the internet so it doesn't require reflashing
mrnossiom · Jan 7, 2024 · 2849959 · 2849959
1 parent a43530f
commit 2849959
Show file tree

Hide file tree

Showing 4 changed files with 69 additions and 44 deletions.
diff --git a/apps/default.nix b/apps/default.nix
@@ -1,16 +1,8 @@
-{ self, lib, ... }@pkgs:
+{ lib, ... }@pkgs:
 
 with lib;
 
-let
+mapAttrs (_: program: { type = "app"; inherit program; }) {
+  flash-iso = import ./flash-installer.nix pkgs;
+}
 
-  inherit (self.outputs) nixosConfigurations;
-
-in
-mapAttrs (_: program: { type = "app"; inherit program; }) (
-  {
-    # Put apps here
-  }
-
-  // mapAttrs' (name: value: nameValuePair "flash-iso-${name}" (import ./flash-installer.nix value pkgs)) nixosConfigurations
-)
diff --git a/apps/flash-installer.nix b/apps/flash-installer.nix
@@ -1,13 +1,11 @@
-currentNixosSystem:
 { self, system, lib, writeShellApplication, ... }@pkgs:
 
 with lib;
 
 let
-  inherit (self) inputs outputs;
-  inherit (inputs) nixpkgs;
+  inherit (self.inputs) nixpkgs;
 
-  iso = nixpkgs.lib.nixosSystem { inherit system; specialArgs = { inherit inputs outputs; }; modules = [ (import ../nixos/profiles/installer.nix currentNixosSystem) ]; };
+  iso = nixpkgs.lib.nixosSystem { inherit system; specialArgs = { inherit self; }; modules = [ ../nixos/profiles/installer.nix ]; };
   # Build installer ISO
   isoPath = "${iso.config.system.build.isoImage}/iso/${iso.config.isoImage.isoName}";
 

diff --git a/nixos/modules/security.nix b/nixos/modules/security.nix
@@ -19,8 +19,6 @@ with lib;
     # Systemd Login
     services.logind = {
       lidSwitch = "lock";
-      lidSwitchDocked = "suspend";
-      lidSwitchExternalPower = "lock";
       extraConfig = lib.generators.toKeyValue { } {
         IdleAction = "lock";
         # Don’t shutdown when power button is short-pressed

diff --git a/nixos/profiles/installer.nix b/nixos/profiles/installer.nix
@@ -1,39 +1,55 @@
-system:
-{ lib, config, modulesPath, pkgs, ... }:
+{ self, lib, modulesPath, pkgs, ... }:
 
 with lib;
 
 let
   inherit (self.inputs) disko;
-  inherit (pkgs) writeShellScriptBin writeShellApplication;
+  inherit (pkgs) writeShellScriptBin writeShellApplication pastebinit;
 
-  # If the disk layout is managed, add disko bin and commands to install script
-  diskLayoutIsManaged = system.config.local.disk.id;
+  binName = drv: drv.meta.mainProgram;
 
-  diskoCli = writeShellScriptBin "disko" ''${system.config.system.build.diskoScript}'';
-  diskoFormat = writeShellScriptBin "disko-format" "${system.config.system.build.formatScript}";
-  diskoMount = writeShellScriptBin "disko-mount" "${system.config.system.build.mountScript}";
+  flakeUri = "github:mrnossiom/dotfiles/nixos";
 
-  installSystem = writeShellApplication {
-    name = "install-system";
-    runtimeInputs = [ diskoFormat diskoMount ];
+  ## Wireless related
 
-    text = ''
-      echo "Wiping initial disk table..."
-      parted /dev/${system.config.local.disk.id} -- mklabel gpt
+  # connect-wifi <interface> <BSSID>
+  connect-wifi = writeShellScriptBin "connect-wifi" ''
+    if [ -z "$1" ]; then echo "Interface unset"; exit; fi
+    if [ -z "$2" ]; then echo "SSID unset"; exit; fi
+    
+    CONFIG=$(mktemp)
+    wpa_passphrase $2 > $CONFIG 
+    sudo wpa_supplicant -B -i$1 -c$CONFIG
+  '';
 
-      echo "Formatting disks..."
-      disko-format
+  ## Formatting related
 
-      echo "Mounting disks..."
-      disko-mount
+  # Does the whole destroy, format, mount disko cycle
+  # disko-cycle <hostname>
+  disko-cycle = writeShellScriptBin "disko-cycle" ''
+    if [ -z "$1" ]; then echo "Hostname unset"; exit; fi
 
-      echo "Installing system..."
-      nixos-install --system ${system.config.system.build.toplevel}
+    echo "Running disko destroy, format and mount script for $1"
+    nix build ${flakeUri}#nixosConfigurations.$1.config.system.build.diskoScript
+    sudo bash result
+  '';
 
-      echo "Done!"
-    '';
-  };
+  ## NixOS install related
+
+  # Generates hardware related config and uploads it to pastebin
+  # link-hardware-config [root]
+  link-hardware-config = writeShellScriptBin "link-hardware-config" ''
+    nixos-generate-config --root ''${1:-/mnt} --show-hardware-config | ${getExe pastebinit}
+  '';
+
+  # Install specified flake system to /mnt
+  # install-system <hostname>
+  install-system = writeShellScriptBin "install-system" ''
+    if [ -z "$1" ]; then echo "Hostname unset"; exit; fi
+
+    echo "Installing $1"
+    nixos-install --system ${flakeUri}#$1
+  '';
 
 in
 {
@@ -46,11 +62,32 @@ in
     # Disable annoying warning
     boot.swraid.enable = mkForce false;
 
+    nix.settings = {
+      experimental-features = [ "nix-command" "flakes" ];
+      extra-substituters = [
+        "https://nix-community.cachix.org"
+        "https://mrnossiom.cachix.org"
+      ];
+      extra-trusted-public-keys = [
+        "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
+        "mrnossiom.cachix.org-1:WKo+xfDFaT6pRP4YiIFsEXvyBzI/Pm9uGhURgF1wlQg="
+      ];
+    };
+
+    # Start wpa_supplicant rigth away
+    systemd.services.wpa_supplicant.wantedBy = mkForce [ "multi-user.target" ];
+
     services.getty.helpLine = ''
-      You can use `${installSystem.meta.mainProgram}` to format and mount disks.
-      It then installs the selected system : ${"<system>"}.
+      Available custom tools:
+      - Networking: ${binName connect-wifi}
+      - File System: ${binName disko-cycle}
+      - Installation: ${binName link-hardware-config}, ${binName install-system}
+
+      Troubleshoot:
+      - If the disko installer fails to finish due to a dark error just wipe the disk table
+        $ parted /dev/<disk-id> -- mklabel gpt
     '';
 
-    environment.systemPackages = [ diskoCli diskoFormat diskoMount installSystem ];
+    environment.systemPackages = [ connect-wifi disko-cycle link-hardware-config install-system ];
   };
 }