From 99c39769ce6f105b03cde7c2e1def31b8e4e4b7d Mon Sep 17 00:00:00 2001
From: Rouven Seifert <rouven@rfive.de>
Date: Fri, 17 Feb 2023 15:08:24 +0100
Subject: [PATCH] Update README.md

---
 README.md | 32 +++++++++++++++++++++++++++-----
 1 file changed, 27 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 77ffebe..41f2f4d 100755
--- a/README.md
+++ b/README.md
@@ -6,15 +6,37 @@ This repository contains the NixOS configuration files for FSR machines.
 ## Machines configures by this repository:
 - `birne` (the printer notebook)
 - `tomate` (backup endpoint and office computer)
+- `quitte` (new server predestined to run all important services)
 
 ## Setup
 
-Clone this repository on the target machine to `/var/src` and link the folder for the respective machine to the nixos configuration path, e.g.
+Clone this repository on the target machine to `/etc/nixos` and build the desired host configuration e.g.
 
 ```bash
-# you may need to delete the newly generated config, but make sure to update
-# the `hardware-configuration.nix` file if necessary
-# rm -rf /etc/nixos
-ln -s /var/src/fruitbasket/birne /etc/nixos
+# you may need to copy the generated hardware-configuration.nix to hosts/<hostname>/hardware-configuraion.nix
+nixos-rebuild switch --flake .#<hostname>
 ```
 
+## Tips and Tricks
+<details>
+  <summary>Resolving merge conflicts in sops files</summary>
+  
+  ### Required steps
+  1. Manually resolve the conflicts in the encrypted file
+  2. Open the file using `sops --ignore-mac secrets/<hostname>.yml`
+  3. Change one letter in one of the yml entries to let sops know it has to regenerate the MAC
+  4. Close the file. Open it again and revert the change you just did in step 3.
+</details>
+
+<details>
+  <summary>DKIM Key generation</summary>
+  
+  Commands to create the dkim key:
+  ```bash
+  cd /var/lib/rspamd/dkim
+  ```
+  ```bash
+  DOMAIN=ifsr.de;rspamadm dkim_keygen -d "$DOMAIN" -s quitte -k "$DOMAIN".quitte.key >> "$DOMAIN".quitte.pub
+  ```
+
+</details>