From cb5ace0a38e56ec9f6904b3f27416d743015fdb2 Mon Sep 17 00:00:00 2001
From: lilly <li@lly.sh>
Date: Fri, 7 Feb 2025 15:35:18 +0100
Subject: [PATCH] add some documentation
---
README.md | 33 +++++++++++++++++++++++++++++++++
modules/user_account.nix | 2 +-
systems/test.eh22.intern.nix | 3 ---
3 files changed, 34 insertions(+), 4 deletions(-)
diff --git a/README.md b/README.md
index a5b2682..0c8eb1a 100644
--- a/README.md
+++ b/README.md
@@ -7,3 +7,36 @@
- CCCHH Proxmox Address: https://10.31.210.248:8006/
+## VM Installation Instructions
+
+1. Create a new system configuration in the [systems/](./systems/) directory.
+ The default configuration (defined in [base_system.nix](./modules/base_system.nix) and [user_account.nix](./modules/user_account.nix)), which is automatically included, defines a `noc` user, filesystem configuration and some locale and nix settings.
+ For a basic installation, you should not need to actually add any relevant settings into your system config (see for reference [test.eh22.intern config](./systems/test.eh22.intern.nix).
+
+2. Add the new system configuration as flake output by including it at the bottom of [systems/default.nix](./systems/default.nix).
+
+3. Commit & Push your git changes.
+
+4. Create a new VM in Proxmox.
+ For our defaults to work, the system disk image should be added as scsi0 and BIOS-Boot should be used.
+
+ You should also add the `nixos-24.11-custom-installer.iso` in the VM's CD/DVD drive.
+
+5. Boot the installer and install the sytem.
+
+ Once the installer is booted and assuming that defaults are used, enter the following command to install a systems NixOS definition into the VM:
+
+ ```bash
+ sudo disko-install --disk system /dev/sda --flake "git+https://git.hamburg.ccc.de/EH22/nox.git#<your-system-name>"
+ ```
+
+6. Reboot into the installed system after installation has finished.
+
+ The VM can now further be configured using `./switch_remote.sh`.
+ See [VM Configuration](#vm-configuration) for details about this.
+
+
+## VM Configuration
+
+**TODO**
+
diff --git a/modules/user_account.nix b/modules/user_account.nix
index 50f7a41..cb659c5 100644
--- a/modules/user_account.nix
+++ b/modules/user_account.nix
@@ -18,7 +18,7 @@
openssh.authorizedKeys.keys = [
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPaVpSL8G9Gs16bSNn9tDl29PiN0SwYZuYCMkp9baSua lilly"
];
- hashedPassword = "$y$j9T$V7Fvq4uxK/NywaPgqsTgx1$K4/tlsLOHCONtuG5CrQpv5.4/UPsjrtdWeal/qp1UwD";
+ hashedPassword = "$y$j9T$1hxU2SmiDZSF57JiVq8Y70$9Fw63EAcU0E5Uw8XGVEc6TTio3y4E832mV7MS0QPm5D";
isNormalUser = true;
};
diff --git a/systems/test.eh22.intern.nix b/systems/test.eh22.intern.nix
index 91bb896..d111593 100644
--- a/systems/test.eh22.intern.nix
+++ b/systems/test.eh22.intern.nix
@@ -4,9 +4,6 @@
{
imports = [ ];
- # networking config
- networking.useDHCP = true;
-
# DO NOT CHANGE
# this defines the first version of NixOS that was installed on the machine so that programs with non-migratable data files are kept compatible
home-manager.users.noc.home.stateVersion = "24.11";