Merge pull request #35 from naturallaw777/copilot/improve-port-forwarding-ui

Improve port forwarding panel readability: remove scroll cap, increase table font size
Merge pull request #34 from naturallaw777/copilot/make-sovran-hub-accessible
2026-04-03 16:12:09 -05:00 · 2026-04-03 16:11:34 -05:00 · 2026-04-03 21:08:58 +00:00 · 2026-04-03 21:08:21 +00:00 · 2026-04-03 21:06:42 +00:00 · 2026-04-03 21:06:27 +00:00
79 changed files with 11074 additions and 2626 deletions
@@ -0,0 +1,4 @@
+__pycache__/
+*.pyc
+*.pyo
+
@@ -0,0 +1,8 @@
+custom.nix
+role-state.nix
+*.iso
+*.zip
+*.pma
+__pycache__/
+*.pyc
+*.pyo
@@ -1,251 +0,0 @@
-# Sovran Systems offers limited support of a DIY install of Sovran_SystemsOS. You can reach out to others in the matrix room https://matrix.to/#/#DIY_Sovran_SystemsOS:anarchyislove.xyz.
-
-# These instructions will change over time due to new software development and Sovran Systems creator finding more efficient ways to install Sovran_SystemsOS. 9-12-2024
-
-# Also, to fully complete the install, the Bitcoin blockchain will have to download. This could take up to 3 weeks.
-
-# Lastly, if you gift to the computer movement <https://zaps.sovransystems.com> to receive a Sovran Pro, you do not have to do any of this. It is all done for you. On top of that, the Bitcoin blockchain is already installed. 😉
-
-### Requirements
-
-1. First computer with Linux OS already installed (like NixOS, Ubuntu, Arch, etc.) to download and burn the NixOS image to a USB thumb drive.
-2. USB thumb drive 16GB or larger
-3. Second computer that is ready to have Sovran_SystemsOS installed (Safe Boot turned off in the UEFI[BIOS] and be prepared for the entire storage drive to be ERASED!).
-4. Second computer needs the following hardware specs:
-
- Intel or AMD processor (NO ARM processors)
- 32GB of RAM or Larger
- First main NVME internal drive to install Sovran_SystemsOS (500GB or larger)
- Second NVME internal drive to store the Bitcoin blockchain and the automatic backups (NVME 4TB or larger)
- Also, the second NVME internal drive needs to be installed FIRST into a USB enclosure. You will need a NVME USB enclosure. The USB enclosure will be plugged into the first Linux machine.
-
-5. Working Internet connection for both computers
-6. Personalized Domain names already purchased from Njal.la. See the explanation here: https://sovransystems.com/how-to-setup/
-7. Your Router with ports open (Port Forwarding) to your second machine's internal IP address. This will usually be `192.168.1.(some number)` You will complete this at the end.
-
- Port 80
- Port 443
- Port 22
- Port 5349
- Port 8448
-
-## Preparing the Second Internal Drive
-
-1. Install the second NVME internal drive into the USB enclosure, NOT into the Second computer yet.
-2. Plug in the USB enclosure into the first computer with Linux OS already installed into one of its available USB ports.
-3. **Please Make Sure You Know The Existing Storage Names On This First Linux Computer. If You Run The Script Below And You Do Not Know What You Are Doing, You Could Potentially Erase Your First Linux Computer's Data. I Am Not Responsibly For Your Errors**
-4. Open a terminal in the first Linux computer and log in as root.
-5. Type in or copy and paste:
-
-```bash
-wget https://git.sovransystems.com/Sovran_Systems/Sovran_SystemsOS/raw/branch/main/for_new_sovran_pros/sdpsp.sh
-```
-
-then press enter.
-
-6. Now, type `bash sdpsp.sh` then press enter.
-7. Then the screen will ask for "what block..." which will be the drive in the list that is not mounted, which will be the drive you just plugged in. It might be labeled `sda`, or `sdb` etc. Type in the drive name and press `enter`.
-8. Then the screen will ask for "what partition...,"which will be whatever you typed into the first prompt, but with a "1" on it. For example, `sda1` or `sdb1`. Type it into the terminal and press `enter`.
-9. Since the script is made to copy the blockchain from another Sovran Pro that already has the full blockchain installed it will throw an error. However, it should complete the setup just fine.
-10. Once complete, remove the second drive from the USB enclosure and install it into your second computer in which you are installing Sovran_SystemsOS.
-
-## Preparing the First Main Internal Drive
-
-### Procedure One - Installing base NixOS
-
- 1. Still on the first computer with Linux OS already installed, download the latest NixOS <u>minimal</u> (64-bit Intel/AMD) image from here: https://nixos.org/download
- 2. Burn that ISO image onto the USB thumb drive.
- 3. Insert the newly created USB thumb drive with the ISO image into the second computer (the one you are installing Sovran_SystemsOS).
- 4. Reboot the second computer while the USB thumb drive is inserted and boot into the USB thumb drive. This may require you to press the F7 or F12 key at boot. (Also, make sure the second computer has "safe boot" turned off in the UEFI[BIOS]).
- 5. Proceed with the NixOS boot menu
- 6. Once at the command prompt type in `sudo su` to move to the root user
- 7. Once logged into the root user type in `passwd` then set the root user password to `a`
- 8. Type in `ip a` to get your internal IP address. It will usually be `192.1681.1.(somenumber)` make a note of this IP as you will need it later.
- 9. Now, that you are logged in as the root user type in or copy and paste:
-
-    ```bash
-    curl https://git.sovransystems.com/Sovran_Systems/Sovran_SystemsOS/raw/branch/main/for_new_sovran_pros/psp_physical_ram.sh -o psp_physical_ram.sh
-    ```
-
-    the command to install the base NixOS and press enter.
-10. Now, type `bash psp_physical_ram.sh` then press enter.
-11. The script will ask for name of first main internal drive. It usually will be `nvme0n1`. Basically, it will be the drive without any data and it will not be mounted per the list on the screen. Type in the name and press enter on the keyboard.
-12. Then the script will ask for the 'Boot' partition. It will be the SMALLER partition and usually named `nvme0n1p1`. Type in the name and press enter on the keyboard.
-13. Then it will ask for the 'Primary' partition. It will be the LARGER partition usually named `nvme0n1p2`. Type in the name and press enter on the keyboard.
-14. The script will finish installing the base NixOS. At the end it will ask for a root password. Type `a` and press enter and type `a` again to confirm and press enter.
-15. The machine will reboot into a very basic install of NixOS command prompt.
-16. Remove the USB thumb drive from the second computer.
-
-
-### Procedure Two  - Opening The Ports on Your Router - Internal IP
-
-1. Go to port forwarding on your router and open the above mentioned ports to the internal IP (the one you found above) of your new Sovran_SystemsOS machine
-
-
-### Procedure Three - Installing Sovran_SystemsOS
-
-
-1. Now at the basic install of NixOS from Procedure One, type `root` to log into root and type the password `a` when asked then press enter.
-2. Now you are logged in as `root`.
-3. Now type in or copy and paste:
-
-   ```bash
-   wget https://git.sovransystems.com/Sovran_Systems/Sovran_SystemsOS/raw/branch/main/for_new_sovran_pros/sp.sh
-   ```
-
-   then press enter.
-4. Type in `bash sp.sh` then press enter.
-5. Next the script will ask for your domain names from Njal.la. Type them in the corresponding prompts and then press enter for each prompt.
-6. Then it will ask for an email for the SSL certificates. Type it in and press enter.
-7. The script is long so it will take some time.
-8. It will finish by stating `All Finished! Please Reboot then Enjoy your New Sovran Pro!`
-9. Press the power button on the machine for it to turn off THEN press it again to power the machine
-
-## Finishing the Install
-
-
-### Putting the External IP of your New DIY Sovran Pro into your new domain names you just bought at [njal.la](https://njal.la)
-
-1. On your New DIY Sovran Pro, log into your [njal.la](https://njal.la) account
-2. Make a "dynamic" record for each subdomain 
-3. Njal.la will now display a `curl` command for each sub-domain.
-4. Open the `Terminal` on your New DIY Sovran Pro and type in or copy and paste:
-
-    ```bash
-    ssh root@localhost
-    ```
-    It will as you for a password which is `gosovransystems` as this is the default temporary password from Sovran Systems. 
-    
-    Now you will be logged in as root.
-
-5. Now type:
-
-    `nano /var/lib/njalla/njalla.sh`
-
-    and press enter.
-
-
-3. Paste the `curl` commands from njal.la's website for each sub-domain. Each `curl` command gets a new line. For example:
-
-   ```bash
-   ...
-   curl "https://njal.la/update/?h=test.testsovransystems.com&k=8n7vk3afj-jkyg37&a=${IP}"
-   curl "https://njal.la/update/?h=zap.testsovransystems.com&k=8no*73afj-jkygi2ea=${IP}"
-   ...
-   
-   ```
-   ##### Make sure the default `&auto` from njal.la is replaced by `&a=${IP}` at the end of each `curl` command in the `/var/lib/njalla/njalla.sh` as in the example above.
-
-7. After you have added all the sub-domins into `/var/lib/njalla/njalla.sh`, press `ctrl + s` then press `ctrl + x` to save and exit `nano`.
-
-8. Close the `Terminal`.
-
-### Setting the Desktop
-
-1. Open the `Terminal` again and type in: `dconf load / < /home/free/Downloads/Sovran_SystemsOS-Desktop`. Do NOT log in as root.
-
-2. Close the `Terminal`.
-
-### Setting Up Nextcloud and Wordpress
-
-#### Nextcloud
-
-1. Open a web browser and navigate to your domain name you bought from [njal.la](https://njal.la) for example "cloud.myfreedomsite.com" you attributed to your Nextcloud instance.
-2. Nextcloud will as you to set up a new account to be used as a log in. Do so.
-3. Nextcloud will also ask you where you want the data directory. Type in `/var/lib/nextcloud/data`
-4. Nextcloud will ask you to connect the database:
-   1. Choose `Postgresql` from the optoins.
-   2. Database username is `ncusr`
-   3. Database name is `nextclouddb`
-   4. Database password is found by doing this:
-      1. Open the `Terminal` again, then type in or copy and paste:
-
-         ```bash
-         ssh root@localhost
-         ```
-         Now you will be logged in as root.
-
-      2. Now type:
-
-         `cat /var/lib/secrets/nextclouddb`
-
-         and press enter.
-
-      3. Your database password will be displayed in the `Terminal` window.
-      4. Type that into the password field
-
-5. Now, press `Install` on the Nextcloud website and Nextcloud will be installed. It will take a few minutes. Follow the on screen prompts.
-
-#### Wordpress
-
-1. Open a web browser and navigate to your domain name you bought from [njal.la](https://njal.la) for example "myfreedomsite.com" you attributed to your Wordpress instance.
-2. Wordpress will ask you to connect the database:
-   1. Database username is `wpusr`
-   2. Database name is `wordpressdb`
-   4. Database password is found by doing this:
-      1. Open the `Terminal` again, then type in or copy and paste:
-
-         ```bash
-         ssh root@localhost
-         ```
-         Now you will be logged in as root.
-
-      2. Now type:
-
-         `cat /var/lib/secrets/wordpressdb`
-
-         and press enter.
-
-      3. Your database password will be displayed in the `Terminal` window.
-      4. Type that into the password field
-
-5. Now, press `Install` on the Wordpress website and Wordpress will be installed. It will take a few minutes. Follow the on screen prompts.
-
-### Final Install for Coturn, Flatpak, and Nextcloud
-
-1. Staying in the `Terminal` type in or copy and paste:
-
-    ```bash
-    sed -i '$e cat /var/lib/nextcloudaddition/nextcloudaddition' /var/lib/www/nextcloud/config/config.php
-
-    chown caddy:php /var/lib/www -R
-
-    chmod 700 /var/lib/www R
-    ```
-    and press enter.
-
-2. Now type or copy and paste:
-
-    ```bash
-    set DOMAIN $(cat /var/lib/domains/matrix) && cp -n /var/lib/caddy/.local/share/caddy/certificates/acme-v02.api.letsencrypt.org-directory/{$DOMAIN}/{$DOMAIN}.crt /var/lib/coturn/{$DOMAIN}.crt.pem && cp -n /var/lib/caddy/.local/share/caddy/certificates/acme-v02.api.letsencrypt.org-directory/{$DOMAIN}/{$DOMAIN}.key /var/lib/coturn/{$DOMAIN}.key.pem && chown turnserver:turnserver /var/lib/coturn -R && chmod 770 /var/lib/coturn -R  && systemctl restart coturn
-    ```
-    and press enter.
-
-3. Now type or copy and paste:
-
-    ```bash
-    sudo -u free flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
-    ```
-    and press enter.
-
-    It will ask for your `Administrator` password and to get the password open a new `Terminal` window and type:
-    
-    ```bash
-    ssh root@localhost
-    ```
-    press enter.
-
-    Now you will be logged in as root.
-
-    Now type:
-
-    ```bash
-    cat /var/lib/secrets/main
-    ```
-    Then the `Administrator`'s password will be displayed. Copy and paste the password into the other `Terminal` window that is open. Then press enter.
-
-    Now you can close the `Terminal`.
-
-### Everything now will be installed regarding Sovran_SystemsOS. The remaining setup will be only for the front-end user account creations for BTCpayserver, Vaultwarden, connecting the node to Sparrow wallet and Bisq.
-
-### Congratulations! 🎉
@@ -659,4 +659,3 @@ specific requirements.
 if any, to sign a "copyright disclaimer" for the program, if necessary.
 For more information on this, and how to apply and follow the GNU AGPL, see
 <https://www.gnu.org/licenses/>.
-
@@ -1,180 +0,0 @@
-# Sovran_SystemsOS
-
-### The Officaly Repository of Sovran_SystemsOS and the Sovran Pro
-
-**A declarative, self-hosted server and desktop operating system built on NixOS by [Sovran Systems](https://sovransystems.com)**
-
---
-
-## Overview
-
-Sovran_SystemsOS is a fully integrated NixOS configuration that transforms a single machine into a personal cloud, communications hub, Bitcoin node, web server, and **daily-use desktop** — all managed declaratively.
-
-**It comes preinstalled on The Sovran Pro**
-
-Every service is pre-wired: reverse proxy routing, database initialization, firewall rules, automated backups, and inter-service communication are handled out of the box. Moreover, you can activate the other custom packages; the system does the rest.
-
---
-
-## Architecture
-
-Sovran_SystemsOS is structured as a set of NixOS modules exposed via a flake. A remote machine consumes the flake and selectively enables features through a simple configuration interface.
-
-```
-Repository Main Flake (flake.nix)
-  └── Sovran_SystemsOS flake (nixosModules.Sovran_SystemsOS)
-        ├── configuration.nix/       # Base system
-        │   ├── gnome Desktop        # Gnome Desktop Interface
-        │   ├── caddy                # Reverse proxy + HTTPS
-        │   ├── nextcloud            # Cloud storage
-        │   ├── wordpress            # CMS / publishing
-        │   ├── element              # Matrix Synapse via Element Messaging App
-        ├── modules/
-        │   ├── bitcoinecosystem.nix # Bitcoin Core / Knots / BTCPay Server / Bitcoin Lightning
-        │   ├── bip110.nix           # Bip110 Node Consensus Policy
-        │   ├── element-calling.nix  # Matrix Synapse via Element + Element Voice and Video Calling
-        │   ├── haven.nix            # Nostr relay
-        │   ├── mempool.nix          # Mempool explorer
-        │   ├── rdp.nix              # Remote desktop (RDP)
-        │   ├── vaultwarden.nix      # Password management
-        ├── nix-bitcoin integration
-        ├── bitcoin clients integration
-        │   ├── sparrow wallet       # Trusted and Standard Open Source Bitcoin Wallet
-        │   ├── bisq/bisq2           # Non KYC Bitcoin Buying and Selling   
-        ├── agenix (secrets management)
-        └── nixvim
-```
-
-## Features
-
-### Feature Toggles
-
-[Custom Add-On Guide](custom-add-ons.md)
-
-Every major service is gated behind a feature flag. Enable only what you need:
-
-```nix
-# custom.nix
-{ config, pkgs, lib, ... }:
-
-{
-  
-  sovran_systemsOS = {
-    features = {
-        bip110          = lib.mkForce true;
-        element-calling = lib.mkForce true;
-        haven           = lib.mkForce true;
-        mempool         = lib.mkForce true;
-        rdp             = lib.mkForce true;
-    };
-    nostr_npub = "pasteyournpubhere";
-  };
-
-}
-```
-
-No unnecessary services run. No wasted resources.
-
---
-
-### Service Stack
-
-| Category | Service | Description |
-|---|---|---|
-| **Web** | Caddy | Automatic HTTPS, reverse proxy for all services |
-| **Cloud** | Nextcloud | File storage, sync, and collaboration |
-| **CMS** | WordPress | Self-hosted publishing and content management |
-| **Passwords** | Vaultwarden | Bitwarden-compatible password vault |
-| **Messaging** | Element/Matrix Synapse | Federated, decentralized messaging backend |
-| **Video/Voice Calling** | Element Video and Voice Calling | Decentralized Voice Over IP for Matrix with optional TURN/STUN |
-| **Bitcoin** | Bitcoin Core / Knots | **Full node with optional BIP-110 consensus policy** |
-| **Bitcoin Lightning** | LND | Full LND Node Connected over Tor intergrated into BTCPay Server |
-| **Payments** | BTCPay Server | Self-hosted Bitcoin payment processor |
-| **Explorer** | Mempool | Bitcoin mempool visualizer and block explorer |
-| **Nostr** | Haven | Nostr relay server |
-| **Remote Access** | GNOME Remote Desktop | RDP access with auto-generated TLS and credentials |
-
---
-
-### Security
-
- **SSH hardened** — password authentication disabled by default
- **Fail2ban** — active on https
- **Agenix** — encrypted secrets management integrated into the flake
- **Tor** — integration into the bitcoin ecosystem
- **Firewall** — ports managed per-module; only enabled services are exposed
-
-### Reliability
-
- **Automated backups** via rsnapshot
- **Scheduled maintenance** via systemd timers
- **Database initialization** handled declaratively
- **Reproducible builds** — the main system is defined in code and can be rebuilt to match most systems
-
---
-
-### Network Configuration
-
-Sovran_SystemsOS hosts public-facing services (Wordpress, Element/Element Calling, Nextcloud, BTCPayserver, Haven Relay, and Vaultwarden) that require inbound connections from the internet. To make these services accessible outside your local network, you must configure **port forwarding** on your home router.
-
-**Before deploying, ensure you have:**
-
- Access to your router's administration interface (typically at `192.168.1.1` or `192.168.0.1`)
- The ability to create port forwarding rules
- The local/private IP address of the machine running Sovran_SystemsOS
- The external public IP address of the machine running Sovran_SystemsOS
-
-**Required port forwards (depending on enabled features):**
-
-Forward each port to the **private IP address** of your Sovran_SystemsOS machine. Only forward ports for services you have enabled.
-
-> **Tip:** Assign a static IP or DHCP reservation to your Sovran_SystemsOS machine so the forwarding rules remain valid after reboots.
-
-> **Note:** If your ISP uses CGNAT (Carrier-Grade NAT), standard port forwarding will not work. Contact your ISP to request a public IP address. 
-
---
-
-## Installation
-
-### Full Guide (Outdated as of now... will be working on a full .iso soon)
-
-👉 [DIY Install Sovran_SystemsOS](https://git.sovransystems.com/Sovran_Systems/Sovran_SystemsOS/src/branch/main/DIY%20Install%20Sovran_SystemsOS.md)
-
---
-
-## Requirements
-
-| Resource | Minimum | Recommended |
-|---|---|---|
-| CPU | 4 cores | 8+ cores |
-| RAM | 16 GB | 32+ GB |
-| Storage | 512 GB SSD + 4 TB SSD | 2GB SSD + 4+ TB SSD (Bitcoin node requires significant disk) |
-| Network | 100 Mbs Down/20 Mbs Up + No need for DDNS if domains are brought through https://njal.la | 1 Gbs Down/1 Gbs Up + No need for DDNS if domains are brought through https://njal.la  |
-
---
-
-## Community
-
-| Channel | Link |
-|---|---|
-| General Chat | [#sovran-systems:anarchyislove.xyz](https://matrix.to/#/#sovran-systems:anarchyislove.xyz) |
-| DIY Support | [#DIY_Sovran_SystemsOS:anarchyislove.xyz](https://matrix.to/#/#DIY_Sovran_SystemsOS:anarchyislove.xyz) |
-
---
-
-## License
-
-[GNU Affero General Public License v3.0](LICENSE)
-
---
-
-## Project Philosophy
-
-Sovran_SystemsOS exists to provide a complete, self-hosted infrastructure stack that eliminates dependency on third-party platforms. It is opinionated by design — services are pre-integrated so you spend time using your system, not assembling it.
-
-You retain full visibility into every module, every service definition, and every configuration choice. Nothing is hidden. Everything is reproducible.
-
---
-
-**Be Digitally Sovereign**
-
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64"><circle cx="32" cy="32" r="30" fill="#1E3A5F"/><text x="32" y="28" font-family="sans-serif" font-size="12" font-weight="bold" fill="#F7931A" text-anchor="middle">BIP</text><text x="32" y="46" font-family="sans-serif" font-size="18" font-weight="bold" fill="white" text-anchor="middle">110</text></svg>
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64"><circle cx="32" cy="32" r="30" fill="#F7931A"/><circle cx="32" cy="32" r="22" fill="none" stroke="white" stroke-width="2"/><text x="32" y="44" font-family="sans-serif" font-size="30" font-weight="bold" fill="white" text-anchor="middle">₿</text></svg>
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64"><circle cx="32" cy="32" r="30" fill="#F7931A"/><text x="32" y="44" font-family="sans-serif" font-size="36" font-weight="bold" fill="white" text-anchor="middle">₿</text></svg>
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64"><circle cx="32" cy="32" r="30" fill="#51B13E"/><text x="32" y="44" font-family="sans-serif" font-size="28" font-weight="bold" fill="white" text-anchor="middle">PAY</text></svg>
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64"><circle cx="32" cy="32" r="30" fill="#1F2937"/><path d="M20 18h24v6H20z M20 28h24v6H20z M20 38h24v6H20z" fill="#22D3EE"/><circle cx="42" cy="21" r="2" fill="#4ADE80"/><circle cx="42" cy="31" r="2" fill="#4ADE80"/><circle cx="42" cy="41" r="2" fill="#FBBF24"/></svg>
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64"><circle cx="32" cy="32" r="30" fill="#3B82F6"/><text x="32" y="44" font-family="sans-serif" font-size="36" fill="white" text-anchor="middle">⚡</text></svg>
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64"><circle cx="32" cy="32" r="30" fill="#8B5CF6"/><text x="32" y="44" font-family="sans-serif" font-size="28" font-weight="bold" fill="white" text-anchor="middle">N</text></svg>
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64"><circle cx="32" cy="32" r="30" fill="#0DBD8B"/><text x="32" y="44" font-family="sans-serif" font-size="28" fill="white" text-anchor="middle">EC</text></svg>
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64"><circle cx="32" cy="32" r="30" fill="#7B3FE4"/><polygon points="36,8 20,36 30,36 28,56 44,28 34,28" fill="white"/></svg>
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64"><circle cx="32" cy="32" r="30" fill="#2D3348"/><rect x="14" y="38" width="8" height="12" rx="1" fill="#5E35B1"/><rect x="24" y="30" width="8" height="20" rx="1" fill="#7C4DFF"/><rect x="34" y="22" width="8" height="28" rx="1" fill="#B388FF"/><rect x="44" y="14" width="8" height="36" rx="1" fill="#E1BEE7"/></svg>
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64"><circle cx="32" cy="32" r="30" fill="#0082C9"/><ellipse cx="32" cy="34" rx="18" ry="12" fill="white" opacity="0.9"/><ellipse cx="22" cy="36" rx="10" ry="8" fill="white"/><ellipse cx="42" cy="36" rx="10" ry="8" fill="white"/></svg>
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64"><rect x="6" y="12" width="52" height="34" rx="4" fill="#3584E4" stroke="#fff" stroke-width="2"/><rect x="12" y="18" width="40" height="22" rx="2" fill="#1A1A2E"/><rect x="26" y="46" width="12" height="4" rx="1" fill="#aaa"/><rect x="20" y="50" width="24" height="3" rx="1.5" fill="#888"/></svg>
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64"><circle cx="32" cy="32" r="30" fill="#16A34A"/><text x="32" y="43" font-family="sans-serif" font-size="32" font-weight="bold" fill="white" text-anchor="middle">RTL</text></svg>
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64"><circle cx="32" cy="32" r="30" fill="#374151"/><path d="M32 14C22.06 14 14 22.06 14 32c0 5.25 2.27 9.97 5.88 13.24V50a2 2 0 0 0 2 2h20a2 2 0 0 0 2-2v-4.76A17.94 17.94 0 0 0 50 32c0-9.94-8.06-18-18-18zm-7 22a4 4 0 0 1 0-8v8zm14 0v-8a4 4 0 0 1 0 8z" fill="#cdd6f4"/></svg>
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64"><circle cx="32" cy="32" r="30" fill="#0DBD8B"/><text x="32" y="44" font-family="sans-serif" font-size="30" font-weight="bold" fill="white" text-anchor="middle">[M]</text></svg>
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64"><circle cx="32" cy="32" r="30" fill="#374151"/><path d="M32 20a12 12 0 1 0 0 24 12 12 0 0 0 0-24zm0 18a6 6 0 1 1 0-12 6 6 0 0 1 0 12z" fill="#cdd6f4"/><path d="M30 12h4v6h-4zm0 34h4v6h-4zm-18-16v-4h6v4zm34 0v-4h6v4zm-28.97-13.97 2.83-2.83 4.24 4.24-2.83 2.83zm18.38 18.38 2.83-2.83 4.24 4.24-2.83 2.83zm-24.08 1.41 2.83 2.83 4.24-4.24-2.83-2.83zm18.38-18.38 2.83 2.83 4.24-4.24-2.83-2.83z" fill="#cdd6f4"/></svg>
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64"><circle cx="32" cy="32" r="30" fill="#7D4698"/><text x="32" y="44" font-family="sans-serif" font-size="30" font-weight="bold" fill="white" text-anchor="middle">TOR</text></svg>
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64"><circle cx="32" cy="32" r="30" fill="#175DDC"/><path d="M32 10 L48 20 L48 36 C48 48 32 54 32 54 C32 54 16 48 16 36 L16 20 Z" fill="white" opacity="0.9"/><text x="32" y="40" font-family="sans-serif" font-size="18" font-weight="bold" fill="#175DDC" text-anchor="middle">VW</text></svg>
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64"><circle cx="32" cy="32" r="30" fill="#21759B"/><text x="32" y="44" font-family="serif" font-size="38" font-weight="bold" fill="white" text-anchor="middle">W</text></svg>
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64"><circle cx="32" cy="32" r="30" fill="#374151"/><polygon points="36,10 22,34 30,34 28,54 42,30 34,30" fill="#cdd6f4"/></svg>
@@ -0,0 +1,20 @@
+"""Load the Nix-generated config for Sovran_SystemsOS_Hub."""
+
+import json
+import os
+
+
+def load_config() -> dict:
+    """Read config from the path injected by the Nix derivation."""
+    path = os.environ.get(
+        "SOVRAN_HUB_CONFIG",
+        os.path.join(
+            os.path.dirname(os.path.dirname(os.path.abspath(__file__))),
+            "config.json",
+        ),
+    )
+    try:
+        with open(path, "r") as fh:
+            return json.load(fh)
+    except (FileNotFoundError, json.JSONDecodeError):
+        return {"refresh_interval": 5, "command_method": "systemctl", "services": []}
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.1"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 218.44057 109.75845"
+   xml:space="preserve"
+   sodipodi:docname="sovran_systems_2.svg"
+   width="218.44057"
+   height="109.75845"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"><defs
+   id="defs47" /><sodipodi:namedview
+   id="namedview45"
+   pagecolor="#505050"
+   bordercolor="#ffffff"
+   borderopacity="1"
+   inkscape:showpageshadow="0"
+   inkscape:pageopacity="0"
+   inkscape:pagecheckerboard="1"
+   inkscape:deskcolor="#505050"
+   showgrid="false" />
+<style
+   type="text/css"
+   id="style2">
+	.st0{fill:#1C9954;}
+	.st1{fill:#077233;}
+</style>
+<g
+   id="g30"
+   transform="matrix(0.32162395,0,0,0.33123626,-75.234275,-114.64087)"
+   style="fill:#ffffff;fill-opacity:1">
+	<path
+   d="m 354.93,540.02 h -18.69 c -0.75,0 -1.29,-0.17 -1.63,-0.5 -0.34,-0.33 -0.5,-0.88 -0.5,-1.63 v -6.92 c 0,-0.75 0.17,-1.29 0.5,-1.63 0.33,-0.33 0.88,-0.5 1.63,-0.5 h 15.91 c 0.51,0 0.9,-0.17 1.15,-0.5 0.26,-0.33 0.38,-0.74 0.38,-1.21 0,-0.67 -0.13,-1.16 -0.38,-1.48 -0.26,-0.31 -0.64,-0.49 -1.15,-0.53 l -8.87,-1.24 c -2.76,-0.39 -4.98,-1.3 -6.65,-2.72 -1.68,-1.42 -2.51,-3.78 -2.51,-7.1 v -6.21 c 0,-3.35 1.08,-5.92 3.25,-7.72 2.17,-1.79 5.16,-2.69 8.99,-2.69 h 16.56 c 0.75,0 1.29,0.17 1.63,0.5 0.33,0.34 0.5,0.88 0.5,1.63 v 7.04 c 0,0.75 -0.17,1.29 -0.5,1.63 -0.34,0.34 -0.88,0.5 -1.63,0.5 h -13.78 c -0.51,0 -0.91,0.17 -1.18,0.5 -0.28,0.34 -0.41,0.76 -0.41,1.27 0,0.51 0.14,0.95 0.41,1.3 0.28,0.35 0.67,0.55 1.18,0.59 l 8.81,1.18 c 2.76,0.39 4.99,1.3 6.68,2.72 1.69,1.42 2.54,3.78 2.54,7.1 v 6.21 c 0,3.35 -1.09,5.92 -3.28,7.72 -2.19,1.8 -5.18,2.69 -8.96,2.69 z"
+   id="path4"
+   style="fill:#ffffff;fill-opacity:1" />
+	<path
+   d="m 412.05,528.85 c 0,1.81 -0.27,3.46 -0.8,4.94 -0.53,1.48 -1.48,2.74 -2.84,3.78 -1.36,1.04 -3.23,1.86 -5.62,2.45 -2.39,0.59 -5.41,0.89 -9.08,0.89 -3.67,0 -6.7,-0.29 -9.11,-0.89 -2.4,-0.59 -4.29,-1.41 -5.65,-2.45 -1.36,-1.04 -2.31,-2.31 -2.84,-3.78 -0.53,-1.48 -0.8,-3.12 -0.8,-4.94 v -20.17 c 0,-1.81 0.27,-3.46 0.8,-4.94 0.53,-1.48 1.48,-2.75 2.84,-3.81 1.36,-1.06 3.24,-1.89 5.65,-2.48 2.4,-0.59 5.44,-0.89 9.11,-0.89 3.67,0 6.69,0.3 9.08,0.89 2.39,0.59 4.26,1.42 5.62,2.48 1.36,1.06 2.31,2.34 2.84,3.81 0.53,1.48 0.8,3.13 0.8,4.94 z m -23.3,-2.13 c 0,0.79 0.3,1.45 0.89,1.98 0.59,0.53 1.95,0.8 4.08,0.8 2.13,0 3.49,-0.27 4.08,-0.8 0.59,-0.53 0.89,-1.19 0.89,-1.98 v -15.91 c 0,-0.75 -0.3,-1.39 -0.89,-1.92 -0.59,-0.53 -1.95,-0.8 -4.08,-0.8 -2.13,0 -3.49,0.27 -4.08,0.8 -0.59,0.53 -0.89,1.17 -0.89,1.92 z"
+   id="path6"
+   style="fill:#ffffff;fill-opacity:1" />
+	<path
+   d="m 447.12,540.02 h -15.38 c -0.75,0 -1.37,-0.14 -1.86,-0.41 -0.49,-0.28 -0.88,-0.79 -1.15,-1.54 l -5.8,-14.49 c -0.35,-0.87 -0.65,-1.63 -0.89,-2.28 -0.24,-0.65 -0.43,-1.27 -0.59,-1.86 -0.16,-0.59 -0.27,-1.21 -0.33,-1.86 -0.06,-0.65 -0.09,-1.45 -0.09,-2.4 v -15.61 c 0,-0.75 0.17,-1.29 0.5,-1.63 0.33,-0.33 0.88,-0.5 1.63,-0.5 h 9.4 c 0.75,0 1.32,0.17 1.71,0.5 0.39,0.34 0.59,0.88 0.59,1.63 v 16.32 c 0,0.39 0.04,0.79 0.12,1.18 0.08,0.39 0.2,0.81 0.35,1.24 l 2.78,8.28 c 0.12,0.39 0.26,0.66 0.41,0.8 0.16,0.14 0.39,0.21 0.71,0.21 h 0.65 c 0.31,0 0.55,-0.07 0.71,-0.21 0.16,-0.14 0.3,-0.4 0.41,-0.8 l 2.78,-8.34 c 0.16,-0.43 0.28,-0.85 0.35,-1.24 0.08,-0.39 0.12,-0.79 0.12,-1.18 v -16.26 c 0,-0.75 0.17,-1.29 0.5,-1.63 0.33,-0.33 0.88,-0.5 1.63,-0.5 h 9.28 c 0.75,0 1.29,0.17 1.63,0.5 0.33,0.34 0.5,0.88 0.5,1.63 v 15.61 c 0,0.95 -0.03,1.74 -0.09,2.4 -0.06,0.65 -0.17,1.27 -0.33,1.86 -0.16,0.59 -0.35,1.21 -0.59,1.86 -0.24,0.65 -0.53,1.41 -0.89,2.28 l -5.8,14.49 c -0.28,0.75 -0.66,1.26 -1.15,1.54 -0.45,0.28 -1.07,0.41 -1.82,0.41 z"
+   id="path8"
+   style="fill:#ffffff;fill-opacity:1" />
+	<path
+   d="m 478.69,540.02 h -9.11 c -0.75,0 -1.29,-0.17 -1.63,-0.5 -0.34,-0.33 -0.5,-0.88 -0.5,-1.63 v -38.32 c 0,-0.75 0.17,-1.29 0.5,-1.63 0.33,-0.33 0.88,-0.5 1.63,-0.5 h 19.69 c 4.41,0 7.46,0.92 9.14,2.75 1.68,1.83 2.51,4.21 2.51,7.13 v 2.72 c 0,1.66 -0.25,3.07 -0.74,4.23 -0.49,1.16 -1.35,2 -2.57,2.51 2.13,0.24 3.85,1.1 5.17,2.6 1.32,1.5 1.98,3.49 1.98,5.97 v 12.54 c 0,0.75 -0.17,1.29 -0.5,1.63 -0.34,0.34 -0.88,0.5 -1.63,0.5 h -9.17 c -0.75,0 -1.29,-0.17 -1.63,-0.5 -0.34,-0.33 -0.5,-0.88 -0.5,-1.63 v -9.05 c 0,-0.87 -0.17,-1.51 -0.5,-1.92 -0.34,-0.41 -0.92,-0.62 -1.74,-0.62 h -8.28 v 11.59 c 0,0.75 -0.17,1.29 -0.5,1.63 -0.32,0.34 -0.87,0.5 -1.62,0.5 z m 2.13,-31.93 v 7.57 h 4.44 c 1.02,0 1.71,-0.27 2.07,-0.8 0.36,-0.53 0.53,-1.19 0.53,-1.98 v -2.01 c 0,-0.79 -0.18,-1.45 -0.53,-1.98 -0.35,-0.53 -1.04,-0.8 -2.07,-0.8 z"
+   id="path10"
+   style="fill:#ffffff;fill-opacity:1" />
+	<path
+   d="m 525.83,537.89 c 0,0.75 -0.17,1.29 -0.5,1.63 -0.34,0.34 -0.88,0.5 -1.63,0.5 H 515 c -0.75,0 -1.29,-0.17 -1.63,-0.5 -0.34,-0.33 -0.5,-0.88 -0.5,-1.63 v -15.61 c 0,-1.18 0.19,-2.54 0.56,-4.08 0.38,-1.54 0.96,-3.33 1.75,-5.38 l 5.15,-13.42 c 0.24,-0.67 0.6,-1.16 1.09,-1.48 0.49,-0.31 1.13,-0.47 1.92,-0.47 h 15.91 c 0.75,0 1.37,0.16 1.86,0.47 0.49,0.32 0.86,0.81 1.09,1.48 l 5.14,13.42 c 0.79,2.05 1.37,3.84 1.75,5.38 0.37,1.54 0.56,2.9 0.56,4.08 v 15.61 c 0,0.75 -0.17,1.29 -0.5,1.63 -0.34,0.34 -0.88,0.5 -1.63,0.5 h -8.93 c -0.79,0 -1.37,-0.17 -1.74,-0.5 -0.38,-0.33 -0.56,-0.88 -0.56,-1.63 v -8.28 h -10.47 v 8.28 z m 3.37,-28.03 -2.78,8.99 h 9.29 l -2.78,-8.99 c -0.16,-0.35 -0.33,-0.61 -0.5,-0.77 -0.18,-0.16 -0.38,-0.24 -0.62,-0.24 h -1.48 c -0.24,0 -0.44,0.08 -0.62,0.24 -0.19,0.16 -0.36,0.42 -0.51,0.77 z"
+   id="path12"
+   style="fill:#ffffff;fill-opacity:1" />
+	<path
+   d="m 570.29,540.02 h -8.87 c -0.75,0 -1.29,-0.17 -1.63,-0.5 -0.33,-0.33 -0.5,-0.88 -0.5,-1.63 v -38.32 c 0,-0.75 0.17,-1.29 0.5,-1.63 0.33,-0.33 0.88,-0.5 1.63,-0.5 h 6.15 c 0.75,0 1.39,0.12 1.92,0.35 0.53,0.24 1.05,0.65 1.57,1.24 l 11.47,13.13 v -12.6 c 0,-0.75 0.17,-1.29 0.5,-1.63 0.33,-0.33 0.88,-0.5 1.63,-0.5 h 8.87 c 0.75,0 1.29,0.17 1.63,0.5 0.33,0.34 0.5,0.88 0.5,1.63 v 38.32 c 0,0.75 -0.17,1.29 -0.5,1.63 -0.34,0.34 -0.88,0.5 -1.63,0.5 h -8.87 c -0.75,0 -1.29,-0.17 -1.63,-0.5 -0.34,-0.33 -0.5,-0.88 -0.5,-1.63 v -7.27 l -10.11,-12.24 v 19.51 c 0,0.75 -0.17,1.29 -0.5,1.63 -0.34,0.35 -0.88,0.51 -1.63,0.51 z"
+   id="path14"
+   style="fill:#ffffff;fill-opacity:1" />
+	<path
+   d="m 641.61,540.02 h -18.69 c -0.75,0 -1.29,-0.17 -1.63,-0.5 -0.33,-0.33 -0.5,-0.88 -0.5,-1.63 v -6.92 c 0,-0.75 0.17,-1.29 0.5,-1.63 0.33,-0.34 0.88,-0.5 1.63,-0.5 h 15.91 c 0.51,0 0.9,-0.17 1.15,-0.5 0.26,-0.33 0.38,-0.74 0.38,-1.21 0,-0.67 -0.13,-1.16 -0.38,-1.48 -0.26,-0.31 -0.64,-0.49 -1.15,-0.53 l -8.87,-1.24 c -2.76,-0.39 -4.98,-1.3 -6.65,-2.72 -1.68,-1.42 -2.51,-3.78 -2.51,-7.1 v -6.21 c 0,-3.35 1.08,-5.92 3.25,-7.72 2.17,-1.79 5.16,-2.69 8.99,-2.69 h 16.56 c 0.75,0 1.29,0.17 1.63,0.5 0.33,0.34 0.5,0.88 0.5,1.63 v 7.04 c 0,0.75 -0.17,1.29 -0.5,1.63 -0.34,0.34 -0.88,0.5 -1.63,0.5 h -13.78 c -0.51,0 -0.91,0.17 -1.18,0.5 -0.28,0.34 -0.41,0.76 -0.41,1.27 0,0.51 0.14,0.95 0.41,1.3 0.28,0.35 0.67,0.55 1.18,0.59 l 8.81,1.18 c 2.76,0.39 4.99,1.3 6.68,2.72 1.7,1.42 2.54,3.78 2.54,7.1 v 6.21 c 0,3.35 -1.09,5.92 -3.28,7.72 -2.19,1.8 -5.17,2.69 -8.96,2.69 z"
+   id="path16"
+   style="fill:#ffffff;fill-opacity:1" />
+	<path
+   d="m 683.66,540.02 h -9.58 c -0.75,0 -1.29,-0.17 -1.63,-0.5 -0.34,-0.33 -0.5,-0.88 -0.5,-1.63 v -7.57 L 662.9,518.2 c -0.91,-1.22 -1.51,-2.29 -1.8,-3.19 -0.3,-0.91 -0.44,-2.27 -0.44,-4.08 v -11.35 c 0,-0.75 0.17,-1.29 0.5,-1.63 0.33,-0.33 0.88,-0.5 1.63,-0.5 h 9.11 c 0.75,0 1.29,0.17 1.63,0.5 0.33,0.34 0.5,0.88 0.5,1.63 v 9.7 c 0,0.39 0.02,0.81 0.06,1.24 0.04,0.43 0.2,0.85 0.47,1.24 l 2.72,4.26 c 0.2,0.35 0.4,0.61 0.62,0.77 0.22,0.16 0.48,0.24 0.8,0.24 h 0.59 c 0.31,0 0.58,-0.08 0.8,-0.24 0.22,-0.16 0.42,-0.41 0.62,-0.77 l 2.72,-4.26 c 0.28,-0.39 0.43,-0.81 0.47,-1.24 0.04,-0.43 0.06,-0.85 0.06,-1.24 v -9.7 c 0,-0.75 0.17,-1.29 0.5,-1.63 0.33,-0.33 0.88,-0.5 1.63,-0.5 h 8.81 c 0.75,0 1.29,0.17 1.63,0.5 0.33,0.34 0.5,0.88 0.5,1.63 v 11.35 c 0,1.81 -0.16,3.17 -0.47,4.08 -0.32,0.91 -0.91,1.97 -1.77,3.19 l -8.99,12.18 v 7.51 c 0,0.75 -0.17,1.29 -0.5,1.63 -0.35,0.34 -0.9,0.5 -1.64,0.5 z"
+   id="path18"
+   style="fill:#ffffff;fill-opacity:1" />
+	<path
+   d="m 725.88,540.02 h -18.69 c -0.75,0 -1.29,-0.17 -1.63,-0.5 -0.33,-0.33 -0.5,-0.88 -0.5,-1.63 v -6.92 c 0,-0.75 0.17,-1.29 0.5,-1.63 0.33,-0.34 0.88,-0.5 1.63,-0.5 h 15.91 c 0.51,0 0.9,-0.17 1.15,-0.5 0.26,-0.33 0.38,-0.74 0.38,-1.21 0,-0.67 -0.13,-1.16 -0.38,-1.48 -0.26,-0.31 -0.64,-0.49 -1.15,-0.53 l -8.87,-1.24 c -2.76,-0.39 -4.98,-1.3 -6.65,-2.72 -1.68,-1.42 -2.51,-3.78 -2.51,-7.1 v -6.21 c 0,-3.35 1.08,-5.92 3.25,-7.72 2.17,-1.79 5.16,-2.69 8.99,-2.69 h 16.56 c 0.75,0 1.29,0.17 1.63,0.5 0.33,0.34 0.5,0.88 0.5,1.63 v 7.04 c 0,0.75 -0.17,1.29 -0.5,1.63 -0.34,0.34 -0.88,0.5 -1.63,0.5 h -13.78 c -0.51,0 -0.91,0.17 -1.18,0.5 -0.28,0.34 -0.41,0.76 -0.41,1.27 0,0.51 0.14,0.95 0.41,1.3 0.28,0.35 0.67,0.55 1.18,0.59 l 8.81,1.18 c 2.76,0.39 4.99,1.3 6.68,2.72 1.7,1.42 2.54,3.78 2.54,7.1 v 6.21 c 0,3.35 -1.09,5.92 -3.28,7.72 -2.19,1.8 -5.18,2.69 -8.96,2.69 z"
+   id="path20"
+   style="fill:#ffffff;fill-opacity:1" />
+	<path
+   d="m 766.44,540.02 h -9.58 c -0.75,0 -1.29,-0.17 -1.63,-0.5 -0.34,-0.33 -0.5,-0.88 -0.5,-1.63 v -29.04 h -8.69 c -0.75,0 -1.29,-0.17 -1.63,-0.5 -0.33,-0.33 -0.5,-0.88 -0.5,-1.63 v -7.16 c 0,-0.75 0.17,-1.29 0.5,-1.63 0.33,-0.33 0.88,-0.5 1.63,-0.5 h 31.22 c 0.75,0 1.29,0.17 1.63,0.5 0.33,0.34 0.5,0.88 0.5,1.63 v 7.16 c 0,0.75 -0.17,1.29 -0.5,1.63 -0.33,0.34 -0.88,0.5 -1.63,0.5 h -8.69 v 29.04 c 0,0.75 -0.17,1.29 -0.5,1.63 -0.33,0.34 -0.88,0.5 -1.63,0.5 z"
+   id="path22"
+   style="fill:#ffffff;fill-opacity:1" />
+	<path
+   d="m 817.06,540.02 h -27.44 c -0.75,0 -1.29,-0.17 -1.63,-0.5 -0.33,-0.33 -0.5,-0.88 -0.5,-1.63 v -38.32 c 0,-0.75 0.17,-1.29 0.5,-1.63 0.33,-0.33 0.88,-0.5 1.63,-0.5 h 27.44 c 0.75,0 1.29,0.17 1.63,0.5 0.33,0.34 0.5,0.88 0.5,1.63 v 6.92 c 0,0.75 -0.17,1.29 -0.5,1.63 -0.34,0.34 -0.88,0.5 -1.63,0.5 h -16.32 v 4.55 h 11.53 c 0.75,0 1.29,0.17 1.63,0.5 0.33,0.33 0.5,0.88 0.5,1.63 v 6.33 c 0,0.75 -0.17,1.29 -0.5,1.63 -0.34,0.33 -0.88,0.5 -1.63,0.5 h -11.53 v 5.08 h 16.32 c 0.75,0 1.29,0.17 1.63,0.5 0.33,0.33 0.5,0.88 0.5,1.63 v 6.92 c 0,0.75 -0.17,1.29 -0.5,1.63 -0.34,0.34 -0.88,0.5 -1.63,0.5 z"
+   id="path24"
+   style="fill:#ffffff;fill-opacity:1" />
+	<path
+   d="m 839.48,540.02 h -8.81 c -0.75,0 -1.29,-0.17 -1.63,-0.5 -0.33,-0.33 -0.5,-0.88 -0.5,-1.63 v -38.32 c 0,-0.75 0.17,-1.29 0.5,-1.63 0.33,-0.33 0.88,-0.5 1.63,-0.5 h 9.52 c 0.63,0 1.15,0.14 1.57,0.41 0.41,0.28 0.8,0.73 1.15,1.36 l 5.32,9.64 c 0.2,0.35 0.36,0.61 0.5,0.77 0.14,0.16 0.33,0.24 0.56,0.24 h 0.53 c 0.24,0 0.42,-0.08 0.56,-0.24 0.14,-0.16 0.3,-0.41 0.5,-0.77 l 5.26,-9.64 c 0.36,-0.63 0.74,-1.08 1.15,-1.36 0.41,-0.28 0.94,-0.41 1.57,-0.41 h 9.58 c 0.75,0 1.29,0.17 1.63,0.5 0.33,0.34 0.5,0.88 0.5,1.63 v 38.32 c 0,0.75 -0.17,1.29 -0.5,1.63 -0.34,0.34 -0.88,0.5 -1.63,0.5 h -9.11 c -0.75,0 -1.29,-0.17 -1.63,-0.5 -0.34,-0.33 -0.5,-0.88 -0.5,-1.63 v -20.82 l -3.49,6.45 c -0.35,0.67 -0.78,1.15 -1.27,1.45 -0.49,0.3 -1.12,0.44 -1.86,0.44 h -2.37 c -0.75,0 -1.37,-0.15 -1.86,-0.44 -0.49,-0.29 -0.92,-0.78 -1.27,-1.45 l -3.49,-6.45 v 20.82 c 0,0.75 -0.17,1.29 -0.5,1.63 -0.32,0.34 -0.87,0.5 -1.61,0.5 z"
+   id="path26"
+   style="fill:#ffffff;fill-opacity:1" />
+	<path
+   d="m 900.86,540.02 h -18.69 c -0.75,0 -1.29,-0.17 -1.63,-0.5 -0.33,-0.33 -0.5,-0.88 -0.5,-1.63 v -6.92 c 0,-0.75 0.17,-1.29 0.5,-1.63 0.33,-0.34 0.88,-0.5 1.63,-0.5 h 15.91 c 0.51,0 0.9,-0.17 1.15,-0.5 0.26,-0.33 0.38,-0.74 0.38,-1.21 0,-0.67 -0.13,-1.16 -0.38,-1.48 -0.26,-0.31 -0.64,-0.49 -1.15,-0.53 l -8.87,-1.24 c -2.76,-0.39 -4.98,-1.3 -6.65,-2.72 -1.68,-1.42 -2.51,-3.78 -2.51,-7.1 v -6.21 c 0,-3.35 1.08,-5.92 3.25,-7.72 2.17,-1.79 5.16,-2.69 8.99,-2.69 h 16.56 c 0.75,0 1.29,0.17 1.63,0.5 0.33,0.34 0.5,0.88 0.5,1.63 v 7.04 c 0,0.75 -0.17,1.29 -0.5,1.63 -0.34,0.34 -0.88,0.5 -1.63,0.5 h -13.78 c -0.51,0 -0.91,0.17 -1.18,0.5 -0.28,0.34 -0.41,0.76 -0.41,1.27 0,0.51 0.14,0.95 0.41,1.3 0.28,0.35 0.67,0.55 1.18,0.59 l 8.81,1.18 c 2.76,0.39 4.99,1.3 6.68,2.72 1.7,1.42 2.54,3.78 2.54,7.1 v 6.21 c 0,3.35 -1.09,5.92 -3.28,7.72 -2.19,1.8 -5.18,2.69 -8.96,2.69 z"
+   id="path28"
+   style="fill:#ffffff;fill-opacity:1" />
+</g>
+<g
+   id="g34"
+   transform="matrix(0.32162395,0,0,0.33123626,-75.234275,-114.64087)">
+	<path
+   class="st0"
+   d="m 399.59,375.57 c -75.1,0 -136.2,61.1 -136.2,136.2 0,75.1 61.1,136.2 136.2,136.2 27.74,0 53.37,-8.55 74.84,-22.9 -1.35,-1.17 -2.61,-2.4 -3.8,-3.72 -20.44,13.4 -44.79,21.29 -71.04,21.29 -72.16,0 -130.87,-58.71 -130.87,-130.87 0,-72.16 58.71,-130.87 130.87,-130.87 47.14,0 88.35,25.15 111.36,62.66 h 6.25 C 493.61,402.98 449.81,375.57 399.59,375.57 Z"
+   id="path32" />
+</g>
+<g
+   id="g38"
+   transform="matrix(0.32162395,0,0,0.33123626,-75.234275,-114.64087)">
+	<path
+   class="st1"
+   d="m 535.7,566.96 c -21.87,53.75 -74.6,91.78 -136.11,91.78 -81.04,0 -146.98,-65.94 -146.98,-146.98 0,-81.04 65.94,-146.98 146.98,-146.98 29.26,0 56.5,8.66 79.43,23.45 l 3.7,-3.7 c -23.92,-15.69 -52.44,-24.91 -83.13,-24.91 -83.89,0 -152.14,68.24 -152.14,152.14 0,83.9 68.24,152.14 152.14,152.14 64.42,0 119.58,-40.26 141.72,-96.94 z"
+   id="path36" />
+</g>
+<g
+   id="g42"
+   transform="matrix(0.32162395,0,0,0.33123626,-75.234275,-114.64087)">
+	<path
+   class="st0"
+   d="m 399.59,672.5 c -88.63,0 -160.73,-72.11 -160.73,-160.73 0,-88.62 72.11,-160.73 160.73,-160.73 75.66,0 139.05,52.63 156.04,123.16 h 5.06 C 543.61,400.93 478,346.1 399.6,346.1 c -91.36,0 -165.68,74.32 -165.68,165.68 0,91.36 74.32,165.68 165.68,165.68 56.18,0 105.83,-28.17 135.77,-71.07 -1.21,-1.21 -2.42,-2.42 -3.64,-3.63 -29,42.03 -77.32,69.74 -132.14,69.74 z"
+   id="path40" />
+</g>
+</svg>
@@ -0,0 +1,730 @@
+/* Sovran_SystemsOS Hub — First-Boot Onboarding Wizard
+   Drives the 6-step post-install setup flow. */
+"use strict";
+
+// ── Constants ─────────────────────────────────────────────────────
+
+const TOTAL_STEPS = 6;
+
+// Domains that may need configuration, with service unit mapping for enabled check
+const DOMAIN_DEFS = [
+  { name: "matrix",          label: "Matrix (Synapse)",             unit: "matrix-synapse.service",   needsDdns: true },
+  { name: "haven",           label: "Haven Nostr Relay",            unit: "haven-relay.service",      needsDdns: true },
+  { name: "element-calling", label: "Element Video/Audio Calling",  unit: "livekit.service",          needsDdns: true },
+  { name: "vaultwarden",     label: "Vaultwarden (Password Vault)", unit: "vaultwarden.service",      needsDdns: true },
+  { name: "btcpayserver",    label: "BTCPay Server",                unit: "btcpayserver.service",     needsDdns: true },
+  { name: "nextcloud",       label: "Nextcloud",                    unit: "phpfpm-nextcloud.service", needsDdns: true },
+  { name: "wordpress",       label: "WordPress",                    unit: "phpfpm-wordpress.service", needsDdns: true },
+];
+
+const REBUILD_POLL_INTERVAL = 2000;
+
+// ── State ─────────────────────────────────────────────────────────
+
+var _currentStep  = 1;
+var _servicesData = null;
+var _domainsData  = null;
+var _featuresData = null;
+
+var _rebuildPollTimer  = null;
+var _rebuildLogOffset  = 0;
+var _rebuildFinished   = false;
+
+// ── Helpers ───────────────────────────────────────────────────────
+
+function escHtml(str) {
+  return String(str)
+    .replace(/&/g, "&amp;")
+    .replace(/</g, "&lt;")
+    .replace(/>/g, "&gt;")
+    .replace(/"/g, "&quot;")
+    .replace(/'/g, "&#39;");
+}
+
+async function apiFetch(path, options) {
+  var res = await fetch(path, options || {});
+  if (!res.ok) {
+    var detail = res.status + " " + res.statusText;
+    try {
+      var body = await res.json();
+      if (body && body.detail) detail = body.detail;
+    } catch (e) {}
+    throw new Error(detail);
+  }
+  return res.json();
+}
+
+function setStatus(elId, msg, type) {
+  var el = document.getElementById(elId);
+  if (!el) return;
+  el.textContent = msg;
+  el.className = "onboarding-save-status" + (type ? " onboarding-save-status--" + type : "");
+}
+
+// ── Progress / step navigation ────────────────────────────────────
+
+function updateProgress(step) {
+  var fill = document.getElementById("onboarding-progress-fill");
+  if (fill) {
+    fill.style.width = Math.round(((step - 1) / (TOTAL_STEPS - 1)) * 100) + "%";
+  }
+  var dots = document.querySelectorAll(".onboarding-step-dot");
+  dots.forEach(function(dot) {
+    var ds = parseInt(dot.dataset.step, 10);
+    dot.classList.remove("active", "completed");
+    if (ds < step) dot.classList.add("completed");
+    if (ds === step) dot.classList.add("active");
+  });
+}
+
+function showStep(step) {
+  for (var i = 1; i <= TOTAL_STEPS; i++) {
+    var panel = document.getElementById("step-" + i);
+    if (panel) panel.style.display = (i === step) ? "" : "none";
+  }
+  _currentStep = step;
+  updateProgress(step);
+
+  // Lazy-load step content
+  if (step === 2) loadStep2();
+  if (step === 3) loadStep3();
+  if (step === 4) loadStep4();
+  if (step === 5) loadStep5();
+}
+
+// ── Step 1: Welcome ───────────────────────────────────────────────
+
+async function loadStep1() {
+  try {
+    var cfg = await apiFetch("/api/config");
+    var badge = document.getElementById("onboarding-role-badge");
+    if (badge && cfg.role_label) badge.textContent = cfg.role_label;
+  } catch (_) {}
+}
+
+// ── Step 2: Domain Configuration ─────────────────────────────────
+
+async function loadStep2() {
+  var body = document.getElementById("step-2-body");
+  if (!body) return;
+
+  try {
+    // Fetch services, domains, and network info in parallel
+    var results = await Promise.all([
+      apiFetch("/api/services"),
+      apiFetch("/api/domains/status"),
+      apiFetch("/api/network"),
+    ]);
+    _servicesData = results[0];
+    _domainsData  = results[1];
+    var networkData = results[2];
+  } catch (err) {
+    body.innerHTML = '<p class="onboarding-error">⚠ Could not load service data: ' + escHtml(err.message) + '</p>';
+    return;
+  }
+
+  var externalIp = (networkData && networkData.external_ip) || "Unknown (could not retrieve)";
+
+  // Build set of enabled service units
+  var enabledUnits = new Set();
+  (_servicesData || []).forEach(function(svc) {
+    if (svc.enabled) enabledUnits.add(svc.unit);
+  });
+
+  // Filter domain defs to only those whose service is enabled
+  var relevantDomains = DOMAIN_DEFS.filter(function(d) {
+    return enabledUnits.has(d.unit);
+  });
+
+  var html = "";
+
+  if (relevantDomains.length === 0) {
+    html += '<p class="onboarding-body-text">No domain-based services are enabled for your role. You can skip this step.</p>';
+  } else {
+    html += '<div class="onboarding-port-warn" style="margin-bottom:16px;">'
+      + '<strong>Before you continue:</strong>'
+      + '<ol style="margin:8px 0 0 16px; padding:0; line-height:1.7;">'
+      + '<li>Create an account at <a href="https://njal.la" target="_blank" style="color:var(--accent-color);">https://njal.la</a></li>'
+      + '<li>Purchase your domain on Njal.la</li>'
+      + '<li>In the Njal.la web interface, create a <strong>Dynamic</strong> record pointing to this machine\'s external IP address:<br>'
+      + '<span style="display:inline-block;margin-top:4px;padding:4px 12px;background:var(--card-color);border:1px solid var(--border-color);border-radius:6px;font-family:monospace;font-size:1.1em;font-weight:700;letter-spacing:0.03em;">' + escHtml(externalIp) + '</span></li>'
+      + '<li>Njal.la will give you a curl command like:<br>'
+      + '<code style="font-size:0.8em;">curl "https://njal.la/update/?h=sub.domain.com&amp;k=abc123&amp;auto"</code></li>'
+      + '<li>Enter the subdomain and paste that curl command below for each service</li>'
+      + '</ol>'
+      + '</div>';
+    html += '<p class="onboarding-hint">Enter each fully-qualified subdomain (e.g. <code>matrix.yourdomain.com</code>) and its Njal.la DDNS curl command.</p>';
+    relevantDomains.forEach(function(d) {
+      var currentVal = (_domainsData && _domainsData[d.name]) || "";
+      html += '<div class="onboarding-domain-group">';
+      html += '<label class="onboarding-domain-label">' + escHtml(d.label) + '</label>';
+      html += '<input class="onboarding-domain-input domain-field-input" type="text" id="domain-input-' + escHtml(d.name) + '" data-domain="' + escHtml(d.name) + '" placeholder="e.g. ' + escHtml(d.name) + '.yourdomain.com" value="' + escHtml(currentVal) + '" />';
+      html += '<label class="onboarding-domain-label onboarding-domain-label--sub">Njal.la DDNS Curl Command</label>';
+      html += '<input class="onboarding-domain-input domain-field-input" type="text" id="ddns-input-' + escHtml(d.name) + '" data-ddns="' + escHtml(d.name) + '" placeholder="curl &quot;https://njal.la/update/?h=' + escHtml(d.name) + '.yourdomain.com&amp;k=abc123&amp;auto&quot;" />';
+      html += '<p class="onboarding-hint" style="margin-top:4px;">ℹ Paste the curl URL from your Njal.la dashboard\'s Dynamic record</p>';
+      html += '</div>';
+    });
+  }
+
+  // SSL email section
+  var emailVal = (_domainsData && _domainsData["sslemail"]) || "";
+  html += '<div class="onboarding-domain-group onboarding-domain-group--email">';
+  html += '<label class="onboarding-domain-label">📧 SSL Certificate Email</label>';
+  html += '<p class="onboarding-hint onboarding-hint--inline">Let\'s Encrypt uses this for certificate expiry notifications.</p>';
+  html += '<input class="onboarding-domain-input domain-field-input" type="email" id="ssl-email-input" placeholder="you@example.com" value="' + escHtml(emailVal) + '" />';
+  html += '</div>';
+
+  body.innerHTML = html;
+}
+
+async function saveStep2() {
+  setStatus("step-2-status", "Saving domains…", "info");
+  var errors = [];
+
+  // Save each domain input
+  var domainInputs = document.querySelectorAll("[data-domain]");
+  for (var i = 0; i < domainInputs.length; i++) {
+    var inp = domainInputs[i];
+    var domainName = inp.dataset.domain;
+    var domainVal = inp.value.trim();
+    if (!domainVal) continue; // skip empty — not required
+
+    var ddnsInput = document.getElementById("ddns-input-" + domainName);
+    var ddnsVal = ddnsInput ? ddnsInput.value.trim() : "";
+
+    try {
+      await apiFetch("/api/domains/set", {
+        method: "POST",
+        headers: { "Content-Type": "application/json" },
+        body: JSON.stringify({ domain_name: domainName, domain: domainVal, ddns_url: ddnsVal }),
+      });
+    } catch (err) {
+      errors.push(domainName + ": " + err.message);
+    }
+  }
+
+  // Save SSL email
+  var emailInput = document.getElementById("ssl-email-input");
+  if (emailInput && emailInput.value.trim()) {
+    try {
+      await apiFetch("/api/domains/set-email", {
+        method: "POST",
+        headers: { "Content-Type": "application/json" },
+        body: JSON.stringify({ email: emailInput.value.trim() }),
+      });
+    } catch (err) {
+      errors.push("SSL email: " + err.message);
+    }
+  }
+
+  if (errors.length > 0) {
+    setStatus("step-2-status", "⚠ Some errors: " + errors.join("; "), "error");
+    return false;
+  }
+
+  setStatus("step-2-status", "✓ Saved", "ok");
+  return true;
+}
+
+// ── Step 3: Port Forwarding ───────────────────────────────────────
+
+async function loadStep3() {
+  var body = document.getElementById("step-3-body");
+  if (!body) return;
+  body.innerHTML = '<p class="onboarding-loading">Checking ports…</p>';
+
+  var networkData = null;
+
+  try {
+    networkData = await apiFetch("/api/network");
+  } catch (err) {
+    body.innerHTML = '<p class="onboarding-error">⚠ Could not load network data: ' + escHtml(err.message) + '</p>';
+    return;
+  }
+
+  var internalIp = (networkData && networkData.internal_ip) || "unknown";
+
+  var ip = escHtml(internalIp);
+
+  var html = '<p class="onboarding-port-note" style="margin-bottom:14px;">'
+    + '⚠ <strong>Each port only needs to be forwarded once — all services share the same ports.</strong>'
+    + '</p>';
+
+  html += '<div class="onboarding-port-ip">';
+  html += '  <span class="onboarding-port-ip-label">Forward ports to this machine\'s internal IP:</span>';
+  html += '  <span class="port-req-internal-ip">' + ip + '</span>';
+  html += '</div>';
+
+  // Required ports table
+  html += '<div class="onboarding-port-section" style="margin-bottom:20px;">';
+  html += '<div class="onboarding-port-section-title" style="font-weight:700;margin-bottom:8px;">Required Ports — open these on your router:</div>';
+  html += '<table class="onboarding-port-table">';
+  html += '<thead><tr><th>Port</th><th>Protocol</th><th>Forward&nbsp;to</th><th>Purpose</th></tr></thead>';
+  html += '<tbody>';
+  html += '<tr><td class="port-req-port">80</td><td class="port-req-proto">TCP</td><td class="port-req-internal-ip">' + ip + '</td><td class="port-req-desc">HTTP</td></tr>';
+  html += '<tr><td class="port-req-port">443</td><td class="port-req-proto">TCP</td><td class="port-req-internal-ip">' + ip + '</td><td class="port-req-desc">HTTPS</td></tr>';
+  html += '<tr><td class="port-req-port">22</td><td class="port-req-proto">TCP</td><td class="port-req-internal-ip">' + ip + '</td><td class="port-req-desc">SSH Remote Access</td></tr>';
+  html += '<tr><td class="port-req-port">8448</td><td class="port-req-proto">TCP</td><td class="port-req-internal-ip">' + ip + '</td><td class="port-req-desc">Matrix Federation</td></tr>';
+  html += '</tbody></table>';
+  html += '</div>';
+
+  // Optional ports table
+  html += '<div class="onboarding-port-section" style="margin-bottom:20px;">';
+  html += '<div class="onboarding-port-section-title" style="font-weight:700;margin-bottom:4px;">Optional — Only needed if you enable Element Calling:</div>';
+  html += '<div style="font-size:0.88em;margin-bottom:8px;color:var(--color-text-muted,#888);">These 5 additional port openings are required on top of the 4 required ports above.</div>';
+  html += '<table class="onboarding-port-table">';
+  html += '<thead><tr><th>Port</th><th>Protocol</th><th>Forward&nbsp;to</th><th>Purpose</th></tr></thead>';
+  html += '<tbody>';
+  html += '<tr><td class="port-req-port">7881</td><td class="port-req-proto">TCP</td><td class="port-req-internal-ip">' + ip + '</td><td class="port-req-desc">LiveKit WebRTC signalling</td></tr>';
+  html += '<tr><td class="port-req-port">7882–7894</td><td class="port-req-proto">UDP</td><td class="port-req-internal-ip">' + ip + '</td><td class="port-req-desc">LiveKit media streams</td></tr>';
+  html += '<tr><td class="port-req-port">5349</td><td class="port-req-proto">TCP</td><td class="port-req-internal-ip">' + ip + '</td><td class="port-req-desc">TURN over TLS</td></tr>';
+  html += '<tr><td class="port-req-port">3478</td><td class="port-req-proto">UDP</td><td class="port-req-internal-ip">' + ip + '</td><td class="port-req-desc">TURN (STUN/relay)</td></tr>';
+  html += '<tr><td class="port-req-port">30000–40000</td><td class="port-req-proto">TCP/UDP</td><td class="port-req-internal-ip">' + ip + '</td><td class="port-req-desc">TURN relay (WebRTC)</td></tr>';
+  html += '</tbody></table>';
+  html += '</div>';
+
+  // Totals
+  html += '<div class="onboarding-port-totals" style="margin-bottom:18px;padding:10px 14px;background:var(--color-bg-subtle,#f6f8fa);border-radius:6px;font-size:0.93em;">';
+  html += '<strong>Total port openings: 4</strong> (without Element Calling)<br>';
+  html += '<strong>Total port openings: 9</strong> (with Element Calling — 4 required + 5 optional)';
+  html += '</div>';
+
+  html += '<div class="onboarding-port-warn" style="margin-bottom:16px;">'
+    + '⚠ <strong>Ports 80 and 443 must be forwarded first.</strong> '
+    + 'Caddy uses these to obtain SSL certificates from Let\'s Encrypt. '
+    + 'If they are closed, HTTPS will not work and your services will be unreachable from outside your network.'
+    + '</div>';
+
+  html += '<details class="onboarding-port-details" style="margin-bottom:16px;">'
+    + '<summary class="onboarding-port-details-summary">How to set up port forwarding</summary>'
+    + '<ol style="margin:12px 0 0 16px; padding:0; line-height:1.8;">'
+    + '<li>Open your router\'s admin panel — usually <code>http://192.168.1.1</code> or <code>http://192.168.0.1</code></li>'
+    + '<li>Look for <strong>"Port Forwarding"</strong>, <strong>"NAT"</strong>, or <strong>"Virtual Server"</strong> in the settings</li>'
+    + '<li>Create a new rule for each port listed above</li>'
+    + '<li>Set the destination/internal IP to <strong>' + ip + '</strong></li>'
+    + '<li>Set both internal and external port to the same number</li>'
+    + '<li>Save and apply changes</li>'
+    + '</ol>'
+    + '</details>';
+
+  body.innerHTML = html;
+}
+
+// ── Step 4: Credentials ───────────────────────────────────────────
+
+async function loadStep4() {
+  var body = document.getElementById("step-4-body");
+  if (!body) return;
+  body.innerHTML = '<p class="onboarding-loading">Loading credentials…</p>';
+
+  if (!_servicesData) {
+    try {
+      _servicesData = await apiFetch("/api/services");
+    } catch (err) {
+      body.innerHTML = '<p class="onboarding-error">⚠ Could not load services: ' + escHtml(err.message) + '</p>';
+      return;
+    }
+  }
+
+  // Find services with credentials that are enabled
+  var credsServices = (_servicesData || []).filter(function(svc) {
+    return svc.has_credentials && svc.enabled;
+  });
+
+  if (credsServices.length === 0) {
+    body.innerHTML = '<p class="onboarding-body-text">No credentials found for your current configuration.</p>';
+    return;
+  }
+
+  body.innerHTML = '<p class="onboarding-loading">Loading credentials…</p>';
+
+  // Fetch all credentials in parallel
+  var fetches = credsServices.map(function(svc) {
+    return apiFetch("/api/credentials/" + encodeURIComponent(svc.unit))
+      .then(function(data) { return { svc: svc, data: data, error: null }; })
+      .catch(function(err) { return { svc: svc, data: null, error: err.message }; });
+  });
+  var allCreds = await Promise.all(fetches);
+
+  // Group by category
+  var CATEGORY_ORDER_LOCAL = [
+    ["infrastructure", "🔧 Infrastructure"],
+    ["bitcoin-base",   "₿ Bitcoin Base"],
+    ["bitcoin-apps",   "₿ Bitcoin Apps"],
+    ["communication",  "💬 Communication"],
+    ["apps",           "📦 Self-Hosted Apps"],
+    ["nostr",          "📡 Nostr"],
+  ];
+
+  var grouped = {};
+  allCreds.forEach(function(item) {
+    var cat = item.svc.category || "other";
+    if (!grouped[cat]) grouped[cat] = [];
+    grouped[cat].push(item);
+  });
+
+  var html = '<div class="onboarding-creds-notice">💡 Save these credentials somewhere safe. You can always view them again from the Hub dashboard.</div>';
+
+  CATEGORY_ORDER_LOCAL.forEach(function(pair) {
+    var catKey = pair[0];
+    var catLabel = pair[1];
+    if (!grouped[catKey] || grouped[catKey].length === 0) return;
+
+    html += '<div class="onboarding-creds-category">';
+    html += '<div class="onboarding-creds-category-title">' + escHtml(catLabel) + '</div>';
+
+    grouped[catKey].forEach(function(item) {
+      html += '<div class="onboarding-creds-service">';
+      html += '<div class="onboarding-creds-service-name">' + escHtml(item.svc.name) + '</div>';
+
+      if (item.error) {
+        html += '<p class="onboarding-error">⚠ ' + escHtml(item.error) + '</p>';
+      } else if (item.data && item.data.credentials) {
+        item.data.credentials.forEach(function(cred) {
+          html += '<div class="onboarding-cred-row">';
+          html += '<span class="onboarding-cred-label">' + escHtml(cred.label || "") + '</span>';
+          if (cred.value) {
+            var isSecret = /password|secret|key|token/i.test(cred.label || "");
+            if (isSecret) {
+              html += '<span class="onboarding-cred-value onboarding-cred-secret" title="Click to reveal">'
+                + '<span class="onboarding-cred-hidden">••••••••</span>'
+                + '<span class="onboarding-cred-real" style="display:none">' + escHtml(cred.value) + '</span>'
+                + '<button class="onboarding-cred-reveal-btn">Show</button>'
+                + '</span>';
+            } else {
+              html += '<span class="onboarding-cred-value">' + escHtml(cred.value) + '</span>';
+            }
+          }
+          html += '</div>';
+        });
+      }
+
+      html += '</div>';
+    });
+
+    html += '</div>';
+  });
+
+  // Remaining categories not in the order
+  Object.keys(grouped).forEach(function(catKey) {
+    var inOrder = CATEGORY_ORDER_LOCAL.some(function(p) { return p[0] === catKey; });
+    if (inOrder || !grouped[catKey] || grouped[catKey].length === 0) return;
+
+    html += '<div class="onboarding-creds-category">';
+    html += '<div class="onboarding-creds-category-title">' + escHtml(catKey) + '</div>';
+    grouped[catKey].forEach(function(item) {
+      html += '<div class="onboarding-creds-service">';
+      html += '<div class="onboarding-creds-service-name">' + escHtml(item.svc.name) + '</div>';
+      if (item.error) {
+        html += '<p class="onboarding-error">⚠ ' + escHtml(item.error) + '</p>';
+      } else if (item.data && item.data.credentials) {
+        item.data.credentials.forEach(function(cred) {
+          if (cred.value) {
+            html += '<div class="onboarding-cred-row">';
+            html += '<span class="onboarding-cred-label">' + escHtml(cred.label || "") + '</span>';
+            html += '<span class="onboarding-cred-value">' + escHtml(cred.value) + '</span>';
+            html += '</div>';
+          }
+        });
+      }
+      html += '</div>';
+    });
+    html += '</div>';
+  });
+
+  body.innerHTML = html;
+
+  // Wire up reveal buttons
+  body.querySelectorAll(".onboarding-cred-secret").forEach(function(el) {
+    var btn     = el.querySelector(".onboarding-cred-reveal-btn");
+    var hidden  = el.querySelector(".onboarding-cred-hidden");
+    var real    = el.querySelector(".onboarding-cred-real");
+    if (!btn || !hidden || !real) return;
+    btn.addEventListener("click", function() {
+      if (real.style.display === "none") {
+        real.style.display = "";
+        hidden.style.display = "none";
+        btn.textContent = "Hide";
+      } else {
+        real.style.display = "none";
+        hidden.style.display = "";
+        btn.textContent = "Show";
+      }
+    });
+  });
+}
+
+// ── Step 5: Feature Manager ───────────────────────────────────────
+
+async function loadStep5() {
+  var body = document.getElementById("step-5-body");
+  if (!body) return;
+  body.innerHTML = '<p class="onboarding-loading">Loading features…</p>';
+
+  try {
+    _featuresData = await apiFetch("/api/features");
+  } catch (err) {
+    body.innerHTML = '<p class="onboarding-error">⚠ Could not load features: ' + escHtml(err.message) + '</p>';
+    return;
+  }
+
+  renderFeaturesStep(_featuresData);
+}
+
+function renderFeaturesStep(data) {
+  var body = document.getElementById("step-5-body");
+  if (!body) return;
+
+  var SUBCATEGORY_LABELS = {
+    "infrastructure": "🔧 Infrastructure",
+    "bitcoin":        "₿ Bitcoin",
+    "communication":  "💬 Communication",
+    "nostr":          "📡 Nostr",
+  };
+
+  var SUBCATEGORY_ORDER = ["infrastructure", "bitcoin", "communication", "nostr"];
+
+  var grouped = {};
+  (data.features || []).forEach(function(f) {
+    var cat = f.category || "other";
+    if (!grouped[cat]) grouped[cat] = [];
+    grouped[cat].push(f);
+  });
+
+  var html = "";
+  var orderedCats = SUBCATEGORY_ORDER.filter(function(k) { return grouped[k]; });
+  Object.keys(grouped).forEach(function(k) {
+    if (orderedCats.indexOf(k) === -1) orderedCats.push(k);
+  });
+
+  orderedCats.forEach(function(catKey) {
+    var feats = grouped[catKey];
+    if (!feats || feats.length === 0) return;
+
+    var catLabel = SUBCATEGORY_LABELS[catKey] || catKey;
+    html += '<div class="onboarding-feat-group">';
+    html += '<div class="onboarding-feat-group-title">' + escHtml(catLabel) + '</div>';
+
+    feats.forEach(function(feat) {
+      var domainHtml = "";
+      if (feat.needs_domain) {
+        if (feat.domain_configured) {
+          domainHtml = '<span class="onboarding-feat-domain onboarding-feat-domain--ok">🌐 Domain configured</span>';
+        } else {
+          domainHtml = '<span class="onboarding-feat-domain onboarding-feat-domain--missing">🌐 Domain not set</span>';
+        }
+      }
+
+      html += '<div class="onboarding-feat-card" id="feat-card-' + escHtml(feat.id) + '">';
+      html += '<div class="onboarding-feat-info">';
+      html += '<div class="onboarding-feat-name">' + escHtml(feat.name) + '</div>';
+      html += '<div class="onboarding-feat-desc">' + escHtml(feat.description) + '</div>';
+      html += domainHtml;
+      html += '</div>';
+      html += '<label class="feature-toggle' + (feat.enabled ? " active" : "") + '" title="Toggle ' + escHtml(feat.name) + '">';
+      html += '<input type="checkbox" class="feature-toggle-input" data-feat-id="' + escHtml(feat.id) + '"' + (feat.enabled ? " checked" : "") + ' />';
+      html += '<span class="feature-toggle-slider"></span>';
+      html += '</label>';
+      html += '</div>';
+    });
+
+    html += '</div>';
+  });
+
+  body.innerHTML = html;
+
+  // Wire up toggles
+  body.querySelectorAll(".feature-toggle-input").forEach(function(input) {
+    var featId = input.dataset.featId;
+    var label  = input.closest(".feature-toggle");
+    var feat   = (data.features || []).find(function(f) { return f.id === featId; });
+    if (!feat) return;
+
+    input.addEventListener("change", function() {
+      var newEnabled = input.checked;
+      // Revert UI until confirmed/done
+      input.checked = feat.enabled;
+      if (newEnabled) { if (label) label.classList.remove("active"); }
+      else            { if (label) label.classList.add("active"); }
+
+      handleFeatureToggleStep5(feat, newEnabled, input, label);
+    });
+  });
+}
+
+async function handleFeatureToggleStep5(feat, newEnabled, inputEl, labelEl) {
+  setStatus("step-5-rebuild-status", "Saving…", "info");
+
+  // Collect nostr_npub if needed
+  var extra = {};
+  if (newEnabled && feat.id === "haven") {
+    var npub = prompt("Enter your Nostr public key (npub1…):");
+    if (!npub || !npub.trim()) {
+      setStatus("step-5-rebuild-status", "⚠ npub required for Haven", "error");
+      return;
+    }
+    extra.nostr_npub = npub.trim();
+  }
+
+  try {
+    await apiFetch("/api/features/toggle", {
+      method: "POST",
+      headers: { "Content-Type": "application/json" },
+      body: JSON.stringify({ feature: feat.id, enabled: newEnabled, extra: extra }),
+    });
+  } catch (err) {
+    setStatus("step-5-rebuild-status", "⚠ " + err.message, "error");
+    return;
+  }
+
+  // Update local state
+  feat.enabled = newEnabled;
+  if (inputEl) inputEl.checked = newEnabled;
+  if (labelEl) {
+    if (newEnabled) labelEl.classList.add("active");
+    else            labelEl.classList.remove("active");
+  }
+
+  setStatus("step-5-rebuild-status", "✓ Feature updated — system rebuild started", "ok");
+  startRebuildPoll();
+}
+
+// ── Rebuild progress polling ──────────────────────────────────────
+
+function startRebuildPoll() {
+  _rebuildLogOffset = 0;
+  _rebuildFinished  = false;
+
+  var modal    = document.getElementById("ob-rebuild-modal");
+  var statusEl = document.getElementById("ob-rebuild-status");
+  var logEl    = document.getElementById("ob-rebuild-log");
+  var closeBtn = document.getElementById("ob-rebuild-close");
+  var spinner  = document.getElementById("ob-rebuild-spinner");
+
+  if (modal) modal.style.display = "flex";
+  if (statusEl) statusEl.textContent = "Rebuilding…";
+  if (logEl) logEl.textContent = "";
+  if (closeBtn) closeBtn.disabled = true;
+  if (spinner) spinner.style.display = "";
+
+  if (_rebuildPollTimer) clearInterval(_rebuildPollTimer);
+  _rebuildPollTimer = setInterval(pollRebuild, REBUILD_POLL_INTERVAL);
+}
+
+async function pollRebuild() {
+  if (_rebuildFinished) {
+    clearInterval(_rebuildPollTimer);
+    return;
+  }
+
+  try {
+    var data = await apiFetch("/api/rebuild/status?offset=" + _rebuildLogOffset);
+    var logEl    = document.getElementById("ob-rebuild-log");
+    var statusEl = document.getElementById("ob-rebuild-status");
+    var closeBtn = document.getElementById("ob-rebuild-close");
+    var spinner  = document.getElementById("ob-rebuild-spinner");
+
+    if (data.log && logEl) {
+      logEl.textContent += data.log;
+      logEl.scrollTop = logEl.scrollHeight;
+      _rebuildLogOffset = data.offset || _rebuildLogOffset;
+    }
+
+    if (!data.running) {
+      _rebuildFinished = true;
+      clearInterval(_rebuildPollTimer);
+      if (data.result === "success" || data.result === "ok") {
+        if (statusEl) statusEl.textContent = "✓ Rebuild complete";
+        if (spinner)  spinner.style.display = "none";
+        setStatus("step-5-rebuild-status", "✓ Rebuild complete", "ok");
+      } else {
+        if (statusEl) statusEl.textContent = "⚠ Rebuild finished with issues";
+        if (spinner)  spinner.style.display = "none";
+        setStatus("step-5-rebuild-status", "⚠ Rebuild finished with issues — see log", "error");
+      }
+      if (closeBtn) closeBtn.disabled = false;
+    }
+  } catch (_) {}
+}
+
+// ── Step 6: Complete ──────────────────────────────────────────────
+
+async function completeOnboarding() {
+  var btn = document.getElementById("step-6-finish");
+  if (btn) { btn.disabled = true; btn.textContent = "Finishing…"; }
+
+  try {
+    await apiFetch("/api/onboarding/complete", { method: "POST" });
+  } catch (_) {
+    // Even if this fails, navigate to dashboard
+  }
+
+  window.location.href = "/";
+}
+
+// ── Event wiring ──────────────────────────────────────────────────
+
+function wireNavButtons() {
+  // Step 1 → 2
+  var s1next = document.getElementById("step-1-next");
+  if (s1next) s1next.addEventListener("click", function() { showStep(2); });
+
+  // Step 2 → 3 (save first)
+  var s2next = document.getElementById("step-2-next");
+  if (s2next) s2next.addEventListener("click", async function() {
+    s2next.disabled = true;
+    s2next.textContent = "Saving…";
+    await saveStep2();
+    s2next.disabled = false;
+    s2next.textContent = "Save & Continue →";
+    showStep(3);
+  });
+
+  // Step 3 → 4
+  var s3next = document.getElementById("step-3-next");
+  if (s3next) s3next.addEventListener("click", function() { showStep(4); });
+
+  // Step 4 → 5
+  var s4next = document.getElementById("step-4-next");
+  if (s4next) s4next.addEventListener("click", function() { showStep(5); });
+
+  // Step 5 → 6
+  var s5next = document.getElementById("step-5-next");
+  if (s5next) s5next.addEventListener("click", function() { showStep(6); });
+
+  // Step 6: finish
+  var s6finish = document.getElementById("step-6-finish");
+  if (s6finish) s6finish.addEventListener("click", completeOnboarding);
+
+  // Back buttons
+  document.querySelectorAll(".onboarding-btn-back").forEach(function(btn) {
+    var prev = parseInt(btn.dataset.prev, 10);
+    btn.addEventListener("click", function() { showStep(prev); });
+  });
+
+  // Rebuild modal close
+  var rebuildClose = document.getElementById("ob-rebuild-close");
+  if (rebuildClose) {
+    rebuildClose.addEventListener("click", function() {
+      var modal = document.getElementById("ob-rebuild-modal");
+      if (modal) modal.style.display = "none";
+    });
+  }
+}
+
+// ── Init ──────────────────────────────────────────────────────────
+
+document.addEventListener("DOMContentLoaded", async function() {
+  // If onboarding is already complete, go to dashboard
+  try {
+    var status = await apiFetch("/api/onboarding/status");
+    if (status.complete) {
+      window.location.href = "/";
+      return;
+    }
+  } catch (_) {}
+
+  wireNavButtons();
+  updateProgress(1);
+  loadStep1();
+});
@@ -0,0 +1,40 @@
+"""Thin wrapper around the systemctl CLI for Sovran_SystemsOS_Hub."""
+
+from __future__ import annotations
+
+import subprocess
+from typing import Literal
+
+
+def _run(cmd: list[str]) -> str:
+    try:
+        result = subprocess.run(cmd, capture_output=True, text=True, timeout=10)
+        return result.stdout.strip()
+    except Exception:
+        return ""
+
+
+def is_active(unit: str, scope: Literal["system", "user"] = "system") -> str:
+    return _run(["systemctl", f"--{scope}", "is-active", unit]) or "unknown"
+
+
+def is_enabled(unit: str, scope: Literal["system", "user"] = "system") -> str:
+    return _run(["systemctl", f"--{scope}", "is-enabled", unit]) or "unknown"
+
+
+def run_action(
+    action: str,
+    unit: str,
+    scope: Literal["system", "user"] = "system",
+    method: str = "systemctl",
+) -> bool:
+    base_cmd = ["systemctl", f"--{scope}", action, unit]
+    if scope == "system" and method == "pkexec":
+        cmd = ["pkexec", "--user", "root"] + base_cmd
+    else:
+        cmd = base_cmd
+    try:
+        result = subprocess.run(cmd, capture_output=True, text=True, timeout=30)
+        return result.returncode == 0
+    except Exception:
+        return False
@@ -0,0 +1,190 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="UTF-8" />
+  <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+  <title>Sovran_SystemsOS Hub</title>
+  <link rel="stylesheet" href="/static/style.css?v={{ style_css_hash }}" />
+</head>
+<body>
+
+  <!-- Header bar -->
+  <header class="header-bar">
+    <span class="title">
+      <img src="/static/logo-light.svg" alt="Sovran Systems" class="header-logo" />
+      Sovran_SystemsOS Hub
+    </span>
+    <span class="role-badge" id="role-badge">Loading…</span>
+    <button class="btn btn-update" id="btn-update" title="Run system update">
+      <span class="update-badge" id="update-badge"></span>
+      Update System
+    </button>
+    <button class="btn-icon" id="btn-refresh" title="Refresh service status">↺</button>
+  </header>
+
+  <!-- IP bar -->
+  <div class="ip-bar">
+    <span>
+      <span class="ip-label">Internal IP:</span>
+      <span class="ip-value" id="ip-internal">…</span>
+    </span>
+    <span class="ip-separator">|</span>
+    <span>
+      <span class="ip-label">External IP:</span>
+      <span class="ip-value" id="ip-external">…</span>
+    </span>
+  </div>
+
+  <!-- System status banner -->
+  <div id="system-status-banner" class="status-banner" style="display:none"></div>
+
+  <!-- Service tiles -->
+  <main class="main-content">
+    <aside class="sidebar" id="sidebar">
+      <div id="sidebar-support"></div>
+      <div id="sidebar-features"></div>
+    </aside>
+    <div id="tiles-area"></div>
+  </main>
+
+  <!-- Update modal -->
+  <div class="modal-overlay" id="update-modal" role="dialog" aria-modal="true" aria-labelledby="modal-title-text">
+    <div class="modal-dialog">
+      <div class="modal-header">
+        <span class="modal-title" id="modal-title-text">Sovran_SystemsOS Update</span>
+        <div class="modal-spinner" id="modal-spinner"></div>
+        <span class="modal-status" id="modal-status">Updating…</span>
+      </div>
+      <div class="modal-log" id="modal-log" aria-live="polite"></div>
+      <div class="modal-footer">
+        <button class="btn btn-save" id="btn-save-report" style="display:none">Save Error Report</button>
+        <button class="btn btn-reboot" id="btn-reboot" style="display:none">Reboot</button>
+        <button class="btn btn-close-modal" id="btn-close-modal" disabled>Close</button>
+      </div>
+    </div>
+  </div>
+
+  <!-- Credentials info modal -->
+  <div class="modal-overlay" id="creds-modal" role="dialog" aria-modal="true" aria-labelledby="creds-modal-title">
+    <div class="creds-dialog">
+      <div class="creds-header">
+        <span class="creds-title" id="creds-modal-title">Service Info</span>
+        <button class="creds-close-btn" id="creds-close-btn" title="Close">✕</button>
+      </div>
+      <div class="creds-body" id="creds-body">
+        <p class="creds-loading">Loading…</p>
+      </div>
+    </div>
+  </div>
+
+  <!-- Tech Support modal -->
+  <div class="modal-overlay" id="support-modal" role="dialog" aria-modal="true" aria-labelledby="support-modal-title">
+    <div class="creds-dialog">
+      <div class="creds-header">
+        <span class="creds-title" id="support-modal-title">Tech Support</span>
+        <button class="creds-close-btn" id="support-close-btn" title="Close">✕</button>
+      </div>
+      <div class="creds-body" id="support-body">
+        <p class="creds-loading">Loading…</p>
+      </div>
+    </div>
+  </div>
+
+  <!-- Domain Setup Modal -->
+  <div class="modal-overlay" id="domain-setup-modal" role="dialog" aria-modal="true" aria-labelledby="domain-setup-title">
+    <div class="creds-dialog">
+      <div class="creds-header">
+        <span class="creds-title" id="domain-setup-title">🌐 Domain Setup</span>
+        <button class="creds-close-btn" id="domain-setup-close-btn" title="Close">✕</button>
+      </div>
+      <div class="creds-body" id="domain-setup-body"></div>
+    </div>
+  </div>
+
+  <!-- SSL Email Modal -->
+  <div class="modal-overlay" id="ssl-email-modal" role="dialog" aria-modal="true" aria-labelledby="ssl-email-title">
+    <div class="creds-dialog domain-narrow-dialog">
+      <div class="creds-header">
+        <span class="creds-title" id="ssl-email-title">📧 SSL Certificate Email</span>
+        <button class="creds-close-btn" id="ssl-email-close-btn" title="Close">✕</button>
+      </div>
+      <div class="creds-body">
+        <p class="support-desc">Let's Encrypt needs an email address for SSL certificate notifications.</p>
+        <div class="domain-field-group">
+          <label class="domain-field-label" for="ssl-email-input">Email:</label>
+          <input class="domain-field-input" type="email" id="ssl-email-input" placeholder="you@example.com" />
+        </div>
+        <div class="domain-field-actions">
+          <button class="btn btn-close-modal" id="ssl-email-cancel-btn">Cancel</button>
+          <button class="btn btn-primary" id="ssl-email-save-btn">Save</button>
+        </div>
+      </div>
+    </div>
+  </div>
+
+  <!-- Feature Confirm Modal -->
+  <div class="modal-overlay" id="feature-confirm-modal" role="dialog" aria-modal="true" aria-labelledby="feature-confirm-title">
+    <div class="creds-dialog domain-narrow-dialog">
+      <div class="creds-header">
+        <span class="creds-title" id="feature-confirm-title">Confirm Action</span>
+        <button class="creds-close-btn" id="feature-confirm-close-btn" title="Close">✕</button>
+      </div>
+      <div class="creds-body">
+        <p class="support-desc" id="feature-confirm-message"></p>
+        <div class="domain-field-actions">
+          <button class="btn btn-close-modal" id="feature-confirm-cancel-btn">Cancel</button>
+          <button class="btn btn-primary" id="feature-confirm-ok-btn">Continue</button>
+        </div>
+      </div>
+    </div>
+  </div>
+
+  <!-- Port Requirements Modal -->
+  <div class="modal-overlay" id="port-requirements-modal" role="dialog" aria-modal="true" aria-labelledby="port-req-title">
+    <div class="creds-dialog">
+      <div class="creds-header">
+        <span class="creds-title" id="port-req-title">🔌 Router / Firewall Port Requirements</span>
+        <button class="creds-close-btn" id="port-req-close-btn" title="Close">✕</button>
+      </div>
+      <div class="creds-body" id="port-req-body"></div>
+    </div>
+  </div>
+
+  <!-- Rebuild Modal -->
+  <div class="modal-overlay" id="rebuild-modal" role="dialog" aria-modal="true" aria-labelledby="rebuild-modal-title">
+    <div class="modal-dialog">
+      <div class="modal-header">
+        <span class="modal-title" id="rebuild-modal-title">Sovran_SystemsOS Rebuild</span>
+        <div class="modal-spinner" id="rebuild-spinner"></div>
+        <span class="modal-status" id="rebuild-status">Rebuilding…</span>
+      </div>
+      <div class="modal-log" id="rebuild-log" aria-live="polite"></div>
+      <div class="modal-footer">
+        <button class="btn btn-save" id="rebuild-save-report" style="display:none">Save Error Report</button>
+        <button class="btn btn-reboot" id="rebuild-reboot-btn" style="display:none">Reboot</button>
+        <button class="btn btn-close-modal" id="rebuild-close-btn" disabled>Close</button>
+      </div>
+    </div>
+  </div>
+
+  <!-- Reboot overlay -->
+  <div class="reboot-overlay" id="reboot-overlay">
+    <div class="reboot-card">
+      <div class="reboot-icon">↻</div>
+      <h2 class="reboot-title">System Rebooting</h2>
+      <p class="reboot-message">
+        Sovran_SystemsOS is now restarting.<br />
+        This page will automatically reconnect once the system is back online.
+      </p>
+      <div class="reboot-dots">
+        <span class="reboot-dot"></span>
+        <span class="reboot-dot"></span>
+        <span class="reboot-dot"></span>
+      </div>
+      <p class="reboot-submessage">Stay tuned…</p>
+    </div>
+  </div>
+
+  <script src="/static/app.js?v={{ app_js_hash }}"></script>
+</body>
+</html>
@@ -0,0 +1,203 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="UTF-8" />
+  <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+  <title>Sovran_SystemsOS — First-Boot Setup</title>
+  <link rel="stylesheet" href="/static/style.css?v={{ style_css_hash }}" />
+</head>
+<body class="onboarding-body">
+
+  <!-- Onboarding wizard container -->
+  <div class="onboarding-shell">
+
+    <!-- Progress bar -->
+    <div class="onboarding-progress-bar">
+      <div class="onboarding-progress-fill" id="onboarding-progress-fill"></div>
+    </div>
+
+    <!-- Step indicators -->
+    <div class="onboarding-steps-nav" id="onboarding-steps-nav">
+      <span class="onboarding-step-dot" data-step="1">1</span>
+      <span class="onboarding-step-connector"></span>
+      <span class="onboarding-step-dot" data-step="2">2</span>
+      <span class="onboarding-step-connector"></span>
+      <span class="onboarding-step-dot" data-step="3">3</span>
+      <span class="onboarding-step-connector"></span>
+      <span class="onboarding-step-dot" data-step="4">4</span>
+      <span class="onboarding-step-connector"></span>
+      <span class="onboarding-step-dot" data-step="5">5</span>
+      <span class="onboarding-step-connector"></span>
+      <span class="onboarding-step-dot" data-step="6">6</span>
+    </div>
+
+    <!-- Step panels -->
+    <div class="onboarding-panel-wrap">
+
+      <!-- ── Step 1: Welcome ── -->
+      <div class="onboarding-panel" id="step-1">
+        <div class="onboarding-hero">
+          <div class="onboarding-logo">
+            <img src="/static/logo-light.svg" alt="Sovran Systems" class="onboarding-logo-img" />
+          </div>
+          <h1 class="onboarding-title">Welcome to Sovran_SystemsOS!</h1>
+          <p class="onboarding-subtitle">Be Digitally Sovereign</p>
+        </div>
+        <div class="onboarding-card">
+          <p class="onboarding-body-text">
+            Your system is installed and ready to configure. This wizard will guide
+            you through the final setup steps so everything works perfectly.
+          </p>
+          <div class="onboarding-role-row" id="onboarding-role-row">
+            <span class="onboarding-role-label">Your Role:</span>
+            <span class="onboarding-role-badge" id="onboarding-role-badge">Loading…</span>
+          </div>
+          <p class="onboarding-body-text onboarding-body-text--dim">
+            This setup only takes a few minutes. You can always revisit these
+            settings from the main Hub dashboard.
+          </p>
+        </div>
+        <div class="onboarding-footer">
+          <div></div>
+          <button class="btn btn-primary onboarding-btn-next" id="step-1-next">
+            Let's Go →
+          </button>
+        </div>
+      </div>
+
+      <!-- ── Step 2: Domain Configuration ── -->
+      <div class="onboarding-panel" id="step-2" style="display:none">
+        <div class="onboarding-step-header">
+          <span class="onboarding-step-icon">🌐</span>
+          <h2 class="onboarding-step-title">Domain Configuration</h2>
+          <p class="onboarding-step-desc">
+            Sovran_SystemsOS uses <strong><a href="https://njal.la" target="_blank" style="color: var(--accent-color);">Njal.la</a></strong> for domains and Dynamic DNS.
+            First, create an account at <strong>Njal.la</strong> and purchase your domain.
+            Then, in the Njal.la web interface, create a <strong>Dynamic</strong> record pointing to this machine's external IP address (shown below).
+            Finally, paste the DDNS curl command from your Njal.la dashboard for each service below.
+          </p>
+        </div>
+        <div class="onboarding-card onboarding-card--scroll" id="step-2-body">
+          <p class="onboarding-loading">Loading service information…</p>
+        </div>
+        <div id="step-2-status" class="onboarding-save-status"></div>
+        <div class="onboarding-footer">
+          <button class="btn btn-close-modal onboarding-btn-back" data-prev="1">← Back</button>
+          <button class="btn btn-primary onboarding-btn-next" id="step-2-next">
+            Save &amp; Continue →
+          </button>
+        </div>
+      </div>
+
+      <!-- ── Step 3: Port Forwarding ── -->
+      <div class="onboarding-panel" id="step-3" style="display:none">
+        <div class="onboarding-step-header">
+          <span class="onboarding-step-icon">🔌</span>
+          <h2 class="onboarding-step-title">Port Forwarding Check</h2>
+          <p class="onboarding-step-desc">
+            Forward these ports on your router to this machine. Each port only needs to be opened once — they are shared across all your services.
+            <strong>Ports 80 and 443 must be open for SSL certificates to work.</strong>
+          </p>
+        </div>
+        <div class="onboarding-card onboarding-card--ports" id="step-3-body">
+          <p class="onboarding-loading">Checking ports…</p>
+        </div>
+        <div class="onboarding-footer">
+          <button class="btn btn-close-modal onboarding-btn-back" data-prev="2">← Back</button>
+          <button class="btn btn-primary onboarding-btn-next" id="step-3-next">
+            Continue →
+          </button>
+        </div>
+      </div>
+
+      <!-- ── Step 4: Credentials ── -->
+      <div class="onboarding-panel" id="step-4" style="display:none">
+        <div class="onboarding-step-header">
+          <span class="onboarding-step-icon">🔑</span>
+          <h2 class="onboarding-step-title">Your Credentials</h2>
+          <p class="onboarding-step-desc">
+            These are your generated service passwords. Save them somewhere safe —
+            the Hub is your permanent credentials viewer.
+          </p>
+        </div>
+        <div class="onboarding-card onboarding-card--scroll" id="step-4-body">
+          <p class="onboarding-loading">Loading credentials…</p>
+        </div>
+        <div class="onboarding-footer">
+          <button class="btn btn-close-modal onboarding-btn-back" data-prev="3">← Back</button>
+          <button class="btn btn-primary onboarding-btn-next" id="step-4-next">
+            Continue →
+          </button>
+        </div>
+      </div>
+
+      <!-- ── Step 5: Feature Manager ── -->
+      <div class="onboarding-panel" id="step-5" style="display:none">
+        <div class="onboarding-step-header">
+          <span class="onboarding-step-icon">⚙️</span>
+          <h2 class="onboarding-step-title">Feature Manager</h2>
+          <p class="onboarding-step-desc">
+            Enable or disable optional features. Toggling a feature will start
+            a system rebuild in the background.
+          </p>
+        </div>
+        <div class="onboarding-card onboarding-card--scroll" id="step-5-body">
+          <p class="onboarding-loading">Loading features…</p>
+        </div>
+        <div id="step-5-rebuild-status" class="onboarding-save-status"></div>
+        <div class="onboarding-footer">
+          <button class="btn btn-close-modal onboarding-btn-back" data-prev="4">← Back</button>
+          <button class="btn btn-primary onboarding-btn-next" id="step-5-next">
+            Continue →
+          </button>
+        </div>
+      </div>
+
+      <!-- ── Step 6: Complete ── -->
+      <div class="onboarding-panel" id="step-6" style="display:none">
+        <div class="onboarding-hero">
+          <div class="onboarding-logo">✅</div>
+          <h1 class="onboarding-title">Your Sovran_SystemsOS is Ready!</h1>
+          <p class="onboarding-subtitle">Setup complete</p>
+        </div>
+        <div class="onboarding-card">
+          <p class="onboarding-body-text">
+            All configuration steps are done. Head to the main Hub dashboard to
+            monitor your services, manage credentials, and make changes at any time.
+          </p>
+          <ul class="onboarding-checklist" id="onboarding-checklist">
+            <li>✅ Domain configuration saved</li>
+            <li>✅ Port forwarding reviewed</li>
+            <li>✅ Credentials noted</li>
+            <li>✅ Features configured</li>
+          </ul>
+        </div>
+        <div class="onboarding-footer">
+          <button class="btn btn-close-modal onboarding-btn-back" data-prev="5">← Back</button>
+          <button class="btn btn-primary" id="step-6-finish">
+            Go to Dashboard →
+          </button>
+        </div>
+      </div>
+
+    </div><!-- /panel-wrap -->
+  </div><!-- /shell -->
+
+  <!-- Rebuild progress modal (reused from main app) -->
+  <div class="modal-overlay" id="ob-rebuild-modal" role="dialog" aria-modal="true" aria-labelledby="ob-rebuild-title">
+    <div class="modal-dialog">
+      <div class="modal-header">
+        <span class="modal-title" id="ob-rebuild-title">Rebuilding System…</span>
+        <div class="modal-spinner" id="ob-rebuild-spinner"></div>
+        <span class="modal-status" id="ob-rebuild-status">Please wait</span>
+      </div>
+      <div class="modal-log" id="ob-rebuild-log" aria-live="polite"></div>
+      <div class="modal-footer">
+        <button class="btn btn-close-modal" id="ob-rebuild-close" disabled>Close</button>
+      </div>
+    </div>
+  </div>
+
+  <script src="/static/onboarding.js?v={{ onboarding_js_hash }}"></script>
+</body>
+</html>
@@ -1,318 +1,146 @@
 { config, pkgs, lib, ... }:

-
-let
-	personalization = import ./modules/personalization.nix;		
-in
-
 {
-  
-  	imports =
-		
-		[ 
-			 
-			./modules/modules.nix
+  imports = [
+    ./modules/modules.nix
+    ./iso/branding.nix
+  ];

-		];
+  # ── Boot ────────────────────────────────────────────────────
+  boot.loader.systemd-boot.enable = true;
+  boot.loader.efi.canTouchEfiVariables = true;
+  boot.loader.efi.efiSysMountPoint = "/boot/efi";
+  boot.kernelPackages = pkgs.linuxPackages_latest;

+  # ── Filesystems ─────────────────────────────────────────────
+  fileSystems."/run/media/Second_Drive" = {
+    device = "LABEL=BTCEcoandBackup";
+    fsType = "ext4";
+    options = [ "nofail" ];
+  };

-	# Bootloader.
-	boot.loader.systemd-boot.enable = true;
-	boot.loader.efi.canTouchEfiVariables = true;
-	boot.loader.efi.efiSysMountPoint = "/boot/efi";
-	boot.kernelPackages =  pkgs.linuxPackages_latest;
-  boot.blacklistedKernelModules = [ "rxrpc" ];
+  fileSystems."/boot/efi".options = [ "umask=0077" "defaults" ];

-	# Enable Automount without Fail for Internal Drive.
-	fileSystems."/run/media/Second_Drive" = {
-		device = "LABEL=BTCEcoandBackup";
-		fsType = "ext4";
-		options = [ "nofail" ];
-	};
+  # ── Nix Settings ────────────────────────────────────────────
+  nix.settings = {
+    experimental-features = [ "nix-command" "flakes" ];
+    download-buffer-size = 524288000;
+  };

-	fileSystems."/boot/efi".options = [ "umask=0077" "defaults" ];
+  # ── Networking ──────────────────────────────────────────────
+  networking.hostName = "sovransystemsos";
+  networking.networkmanager.enable = true;
+  networking.firewall.enable = true;
+  networking.firewall.allowedTCPPorts = [ 80 443 8448 3051 ];
+  networking.firewall.allowedUDPPorts = [ 80 443 8448 3051 5353 ];
+  networking.firewall.allowedUDPPortRanges = [
+    { from = 49152; to = 65535; }
+  ];

-	nix.settings = {
-		
-		experimental-features = [ "nix-command" "flakes" ];
-		download-buffer-size = 524288000;
-		
-	};
+  # ── mDNS / Avahi (sovransystemsos.local) ──────────────────
+  services.avahi = {
+    enable = true;
+    nssmdns4 = true;
+    publish = {
+      enable = true;
+      addresses = true;
+    };
+  };

-	networking.hostName = "nixos"; # Define your hostname.
+  # ── Locale / Time ──────────────────────────────────────────
+  time.timeZone = "America/Los_Angeles";
+  i18n.defaultLocale = "en_US.UTF-8";

-	# Enable networking
-	networking.networkmanager.enable = true;
+  # ── Desktop ────────────────────────────────────────────────
+  services.displayManager.gdm.enable = true;
+  services.displayManager.gdm.autoSuspend = false;
+  services.displayManager.gdm.wayland = true;
+  services.desktopManager.gnome.enable = true;
+  services.printing.enable = true;
+  systemd.enableEmergencyMode = false;
+  environment.gnome.excludePackages = [ pkgs.gnome-tour ];

-	# Set your time zone.
-	time.timeZone = "America/Los_Angeles";
+  # ── Audio ──────────────────────────────────────────────────
+  services.pulseaudio.enable = false;
+  security.rtkit.enable = true;
+  services.pipewire = {
+    enable = true;
+    alsa.enable = true;
+    alsa.support32Bit = true;
+    pulse.enable = true;
+  };

-	# Select internationalisation properties.
-	i18n.defaultLocale = "en_US.UTF-8";
+  # ── Users ──────────────────────────────────────────────────
+  users.users.free = {
+    isNormalUser = true;
+    description = "free";
+    extraGroups = [ "networkmanager" ];
+  };

-	# Enable the X11 windowing system.
-	services.xserver.enable = true;
-
-	# Enable the GNOME Desktop Environment.
-	services.displayManager.gdm.enable = true;
-	services.desktopManager.gnome.enable = true;
-
-	# Configure keymap in X11
-	services.xserver.xkb = {
-		layout = "us";
-		variant = "";
-	};
-
-	# Enable CUPS to print documents.
-	services.printing.enable = true;
-
-	# Systemd Settings
-	systemd.enableEmergencyMode = false;
-
-	# Enable sound with pipewire.
-	services.pulseaudio.enable = false;
-	security.rtkit.enable = true;
-	services.pipewire = {
-		enable = true;
-		alsa.enable = true;
-		alsa.support32Bit = true;
-		pulse.enable = true;
-	};
-
-	users.users = {
-		free = {
-			isNormalUser = true;
-			description = "free";
-			extraGroups = [ "networkmanager" ];
-		};
-	};
-
-	# Enable automatic login for the user.
-	services.displayManager.autoLogin.enable = true;
-	services.displayManager.autoLogin.user = "free";
-
-	# Allow Flatpak
-	services.flatpak.enable = true;
+  services.displayManager.autoLogin.enable = true;
+  services.displayManager.autoLogin.user = "free";

+  # ── Flatpak ────────────────────────────────────────────────
+  services.flatpak.enable = true;
  systemd.services.flatpak-repo = {
    wantedBy = [ "multi-user.target" ];
    after = [ "network-online.target" ];
    wants = [ "network-online.target" ];
    path = [ pkgs.flatpak ];
-      script = ''
-        flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
+    script = ''
+      flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
    '';
  };

-	# Allow unfree packages
-	nixpkgs.config.allowUnfree = true;
+  # ── Packages ───────────────────────────────────────────────
+  nixpkgs.config.allowUnfree = true;
+  nixpkgs.config.permittedInsecurePackages = [ "jitsi-meet-1.0.8043" ];

-	nixpkgs.config.permittedInsecurePackages = [
-
-		"jitsi-meet-1.0.8043"
-	];
-	
-	# List packages installed
-	environment.systemPackages = with pkgs; [
-		git
-		wget
-		fish
-		htop
-		btop
+  environment.systemPackages = with pkgs; [
+    git wget fish htop btop
    gnomeExtensions.transparent-top-bar-adjustable-transparency
-		gnomeExtensions.systemd-manager
    gnomeExtensions.dash-to-dock
-		gnomeExtensions.vitals
-		gnomeExtensions.pop-shell
-		gnomeExtensions.just-perfection
-		gnomeExtensions.appindicator
-		gnomeExtensions.date-menu-formatter
-		gnome-tweaks
-		papirus-icon-theme
-		ranger
-		fastfetch
-		gedit
-		matrix-synapse
-		openssl
-		pwgen
-		aspell
-		aspellDicts.en
-		lm_sensors
-		hunspell
-		hunspellDicts.en_US
-		synadm
-		brave
-		dua
-		bitwarden-desktop
-		gparted
-		pv
-		unzip
-		parted
-		screen
-		zenity
-		libargon2
-		gnome-terminal
-		libreoffice-fresh
-		dig
-		firefox
-		element-desktop
-		wp-cli
-    axel
-    lk-jwt-service
-    livekit-libwebrtc
-    livekit-cli
-    livekit
-	];
+    gnomeExtensions.vitals
+    gnomeExtensions.pop-shell
+    gnomeExtensions.just-perfection
+    gnomeExtensions.appindicator
+    gnomeExtensions.date-menu-formatter
+    gnome-tweaks papirus-icon-theme
+    ranger fastfetch gedit openssl pwgen
+    aspell aspellDicts.en lm_sensors
+    hunspell hunspellDicts.en_US
+    synadm brave dua bitwarden-desktop
+    gparted pv unzip parted screen zenity
+    libargon2 gnome-terminal libreoffice-fresh
+    dig firefox element-desktop wp-cli axel
+    lk-jwt-service livekit-libwebrtc livekit-cli livekit
+    matrix-synapse age
+  ];

-	programs.nixvim = {
-		enable = true;
-		colorschemes.catppuccin.enable = true;
-		plugins.lualine.enable = true;
+  # ── Shell ──────────────────────────────────────────────────
+  programs.nixvim = {
+    enable = true;
+    colorschemes.catppuccin.enable = true;
+    plugins.lualine.enable = true;
  };

+  programs.bash.promptInit = "fish";
+  programs.fish = { enable = true; promptInit = "fastfetch"; };

-	programs.bash.promptInit = "fish";
-	
-	programs.fish = {
-		enable = true;
-		promptInit = "fastfetch";
-	};
-
-	####### CADDY  #######
-	services.caddy = {
-		enable = true;
-		user = "caddy";
-		group = "root";
-		email = "${personalization.caddy_email_for_acme}";
-
-		virtualHosts = {
-			"${personalization.wordpress_url}" = {
-				 extraConfig = ''
-					encode gzip zstd
-					root * /var/lib/www/wordpress
-					php_fastcgi unix//run/phpfpm/mypool.sock
-					file_server browse
-					'';
-			};
-
-			"${personalization.nextcloud_url}" = {
-				extraConfig = ''
-					encode gzip zstd
-					root * /var/lib/www/nextcloud
-					php_fastcgi unix//run/phpfpm/mypool.sock {
-						trusted_proxies private_ranges
-					}
-					file_server
-					redir /.well-known/carddav /remote.php/dav/ 301
-					redir /.well-known/caldav /remote.php/dav/ 301
-					header {
-						Strict-Transport-Security max-age=31536000;
-						}
-					'';
-			 };
-
-			"${personalization.matrix_url}" = {
-					extraConfig = ''
-						reverse_proxy /_matrix/* http://localhost:8008
-						reverse_proxy /_synapse/client/* http://localhost:8008
-					'';
-			};
-
-			"${personalization.matrix_url}:8448" = {
-					extraConfig = ''
-							reverse_proxy http://localhost:8008
-					'';
-			};
-
-			"${personalization.btcpayserver_url}" = {
-					extraConfig = ''
-						reverse_proxy http://localhost:23000
-						encode gzip zstd
-					'';
-			};
-			
-			"https://${personalization.vaultwarden_url}" = {
-					extraConfig = ''
-						reverse_proxy http://localhost:8777
-						encode gzip zstd
-					'';
-			};
-
-			":3051" = {
-					extraConfig = ''
-						reverse_proxy :3050
-						encode gzip zstd
-					'';
-			};
-		};
-	};
-
-	###### AGENIX ######
-	age.identityPaths = [ "/root/.ssh/agenix/agenix-secret-keys" ];
-
-	age.secrets.matrix_reg_secret = {
-
-		file = /var/lib/agenix-secrets/matrix_reg_secret.age;
-		mode = "770";
-		owner = "matrix-synapse";
-		group = "matrix-synapse";
-	
+  # ── PostgreSQL base ────────────────────────────────────────
+  services.postgresql = {
+    enable = true;
+    authentication = lib.mkForce ''
+      local   all   all                 trust
+      host    all   all   127.0.0.1/32  trust
+      host    all   all   ::1/128       trust
+    '';
  };

-	###### CREATE DATABASE (WORDPRESS, MATRIX_SYNAPSE, AND NEXTCLOUD) #######
-	services.postgresql = {
-		enable = true;
-	};
-
-	
-	services.postgresql.authentication = lib.mkForce ''
-			# Generated file; do not edit!
-			# TYPE  DATABASE        USER            ADDRESS                 METHOD
-			local   all             all                                     trust
-			host    all             all             127.0.0.1/32            trust
-			host    all             all             ::1/128                 trust
-			'';
-
-
-	services.mysql = {
-		enable = true;
-		package = pkgs.mariadb;
-	};
-
-	
-	services.postgresql.initialScript = pkgs.writeText "begin-init.sql" ''
-		CREATE ROLE "ncusr" WITH LOGIN PASSWORD '${personalization.nextclouddb}';
-		CREATE DATABASE "nextclouddb" WITH OWNER "ncusr"
-			TEMPLATE template0
-			LC_COLLATE = "C"
-			LC_CTYPE = "C";
-
-
-		CREATE ROLE "matrix-synapse" WITH LOGIN PASSWORD '${personalization.matrixdb}';
-		CREATE DATABASE "matrix-synapse" WITH OWNER "matrix-synapse"
-			TEMPLATE template0
-			LC_COLLATE = "C"
-			LC_CTYPE = "C";    
-	
-	''
-	;
-
-	services.mysql.initialScript = pkgs.writeText "wordpress-init.sql" ''
-		CREATE DATABASE wordpressdb;
-		CREATE USER 'wpusr'@'localhost' IDENTIFIED BY '${personalization.wordpressdb}';
-		GRANT ALL ON wordpressdb.* TO 'wpusr'@'localhost';
-		FLUSH PRIVILEGES;
-	''
-	;
-
-	####### KEEP AWAKE for DISPLAY and HEADLESS #######
-	services.displayManager.gdm.autoSuspend = false;
-
-
-	####### BACKUP TO INTERNAL DRIVE #######
-	services.rsnapshot = {
-		enable = true;
-		extraConfig = ''
+  # ── Backups ────────────────────────────────────────────────
+  services.rsnapshot = {
+    enable = true;
+    extraConfig = ''
 snapshot_root	/run/media/Second_Drive/BTCEcoandBackup/NixOS_Snapshot_Backup
 retain	hourly	5
 retain	daily	5
@@ -320,81 +148,43 @@ backup	/home/	localhost/
 backup	/var/lib/	localhost/
 backup	/etc/nixos/	localhost/
 backup	/etc/nix-bitcoin-secrets/	localhost/
-		'';
-	 	cronIntervals = {
-			daily = "50 21 * * *";
-			hourly = "0 * * * *";
-		};
-	};
+    '';
+    cronIntervals = {
+      daily = "50 21 * * *";
+      hourly = "0 * * * *";
+    };
+  };

+  # ── Cron ───────────────────────────────────────────────────
+  services.cron = {
+    enable = true;
+    systemCronJobs = [
+      "*/15 * * * * root /run/current-system/sw/bin/bash /var/lib/njalla/njalla.sh"
+      "*/15 * * * * root /run/current-system/sw/bin/bash /var/lib/external_ip/external_ip.sh"
+    ];
+  };

-	####### CRON #######
-	services.cron = {
-		enable = true;
-		systemCronJobs = [
-		
-		"*/5 * * * * caddy  /run/current-system/sw/bin/php -f /var/lib/www/nextcloud/cron.php"
-		"*/15 * * * * root  /run/current-system/sw/bin/bash /var/lib/njalla/njalla.sh"
-		"*/15 * * * * root  /run/current-system/sw/bin/bash /var/lib/external_ip/external_ip.sh"
-		"0 0 * * 0 docker-user  yes | /run/current-system/sw/bin/docker system prune -a"
-		
-		];
-	};
+  # ── Tor ────────────────────────────────────────────────────
+  services.tor = { enable = true; client.enable = true; torsocks.enable = true; };

+  # ── SSH ────────────────────────────────────────────────────
+  services.openssh = {
+    enable = true;
+    settings = {
+      PasswordAuthentication = false;
+      KbdInteractiveAuthentication = false;
+      PermitRootLogin = "yes";
+    };
+  };

-	####### TOR #######
-	services.tor = {
-		enable = true;
-		client.enable = true;
-		torsocks.enable = true;
-	};
-	
-	services.privoxy.enableTor = true;
+  # ── Fail2Ban ───────────────────────────────────────────────
+  services.fail2ban = {
+    enable = true;
+    ignoreIP = [ "127.0.0.0/8" "10.0.0.0/8" "172.16.0.0/12" "192.168.0.0/16" "8.8.8.8" ];
+  };

+  # ── Garbage Collection ─────────────────────────────────────
+  nix.gc = { automatic = true; dates = "weekly"; options = "--delete-older-than 7d"; };

-	####### Enable the SSH #######
-	services.openssh = {
-		enable = true;
-		settings = {
-			PasswordAuthentication = false;
-			KbdInteractiveAuthentication = false;
-			PermitRootLogin = "yes";
-		};
-	};
-
-
-	#######FailtoBan#######
-	services.fail2ban = {
-		enable = true;
-		ignoreIP = [
-		"127.0.0.0/8" 
-		"10.0.0.0/8" 
-		"172.16.0.0/12" 
-		"192.168.0.0/16"
-		"8.8.8.8"
-		];
-	};
-	
-
-	####### Open ports in the firewall #######
-	networking.firewall.allowedTCPPorts = [ 80 443 5349 8448 3051 ];
-	networking.firewall.allowedUDPPorts = [ 80 443 5349 8448 3051 ];
-	
-	networking.firewall.allowedUDPPortRanges = [
-		{ from=49152; to=65535; } # TURN relay
-	];
-
-	networking.firewall.enable = true;
-
-	
-	####### AUTO COLLECT GARABAGE #######
-	nix.gc = {
-		automatic = true;
-		dates = "weekly";
-		options = "--delete-older-than 7d";
-	};
-
-	
-	system.stateVersion = "22.05";
-
-}
+  system.stateVersion = "22.05";
+}
@@ -1,124 +0,0 @@
-## Custom Add-ons for Sovran_SystemsOS and The Sovran Pro
-
-Add-ons are extra features you can have enabled before your Sovran Pro is shipped to you or you can enable them yourself.
-
-## The information about each Feature
-
-1. Since Sovran_SystemsOS runs Bitcoin Knots by default as opposed to Bitcion Core, you can customize your Sovran Pro's Bitcoin node to run Bitcoin Core.
-
-https://github.com/bitcoin/bitcoin
-
-2. BIP-110 keeps Bitcoin more efficient as Peer to Peer Cash and you can run it along side your Bitocoin node.
-
-https://github.com/bitcoin/bips/blob/master/bip-0110.mediawiki
-
-3. The Bitcoin Mempool can be added and can be accessed via Tor or on your local network.
-
-https://github.com/mempool/mempool
-
-4. The Haven Relay for NOSTR (NOTES AND OTHER STUFF TRANSMITED BY RELAYS) is a Decenterized Social Media/File Sharing.
-
-https://github.com/barrydeen/haven
-
-5. You can run the new Element Voice and Video calling backend.
-
-https://github.com/element-hq/element-call
-
-6. You can run the Gnome Remote Desktop to view your desktop from another computer in the nextwork.
-
-https://gitlab.gnome.org/GNOME/gnome-remote-desktop
-
-
---
-
-## The DIY for each Feature
-
-All code belongs in the `custom.nix` file located at `/etc/nixos/custom.nix`.
-
-If you would like to enable these features yourself after you have received your Sovran Pro, then open the *terminal* app and type or paste in
-
-```bash
-ssh root@localhost
-```
-Type in the password in the diaolog box if necessary. It is the same password to run the Sovran_Systems_Updater app.
-
-Then press enter.
-
-Next, type or paste in
-```bash
-nano /etc/nixos/custom.nix
-```
-Then press enter.
-
-Next type or paste the codes below *(Code for each Feature)* each on their own line into the termainl/nano window right above the last `}`
-
-Once done, press `ctr s` then `ctr x` to save and exit.
-
-Last, type or paste in
-```bash
-nixos-rebuild switch --impure
-```
-Then press enter.
-
-After it is done bulding, reboot your Sovran Pro typeing or pasting in
-```bash
-reboot
-```
-
-
---
-
-## The code for each Feature (All Features are disabled by default)
-
-1. The code to enable Bitcoin Core is as follows:
-
-```nix
-sovran_systemsOS.features.bitcoin-core = lib.mkForce true;
-```
-
-2. The code to enable BIP-110 is as follows:
-
-```nix
-sovran_systemsOS.features.bip110 = lib.mkForce true;
-```
-
-3. The code to enable Mempool is as follows:
-
-```nix
-sovran_systemsOS.features.mempool = lib.mkForce true;
-```
-
-4. The code to enable Haven Relay is as follows (also Haven will need a new domain to work):
-
-```nix
-sovran_systemsOS.features.haven = lib.mkForce true;
-sovran_systemsOS.nostr_npub = "pasteyournpubhere";
-```
-
-5. The code to enable Element Calling is as follows (also Element Calling will need a new domain to work):
-
-```nix
-sovran_systemsOS.features.element-calling = lib.mkForce true;
-```
-
-6. The code to enable Gnome Remote Desktop is as follows:
-
-```nix
-sovran_systemsOS.features.rdp = lib.mkForce true;
-```
-Next, in a open the terminal app and in the new window paste this in:
-
-```bash
-ssh root@localhost
-```
-Press enter
-
-Type in the password if required. It will be the same password to run the Sovran_SystemsOS_Updater app.
-
-Last, paste in this command to see the log in information to log in from any RDP client software (i.e. Remmina) from any computer on your home network
-```bash
-cat /var/lib/gnome-remote-desktop/rdp-credentials
-```
-
-
-
@@ -0,0 +1,127 @@
+{ config, lib, ... }:
+
+{
+  ###########################################################
+  #                                                         #
+  #              Sovran_SystemsOS — custom.nix              #
+  #                                                         #
+  #  This is YOUR configuration file. Edit it to customize  #
+  #  which services and features run on your machine.       #
+  #                                                         #
+  #  After making changes, rebuild with:                    #
+  #                                                         #
+  #       nixos-rebuild switch                #
+  #                                                         #
+  ###########################################################
+
+
+  # ═══════════════════════════════════════════════════════════
+  #  STEP 1: CHOOSE YOUR ROLE
+  # ═══════════════════════════════════════════════════════════
+  #
+  #  Your initial role was selected during installation. 
+  #  To CHANGE your role, uncomment exactly ONE of the lines below.
+  #
+  #  Server+Desktop: Full server + desktop environment
+  #  Desktop Only: Desktop environment, no server services
+  #  Node (Bitcoin Only): Bitcoin ecosystem
+  #
+  # ───────────────────────────────────────────────────────────
+
+  # sovran_systemsOS.roles.server_plus_desktop = true;
+  # sovran_systemsOS.roles.desktop = true;
+  # sovran_systemsOS.roles.node = true;
+
+
+  # ═══════════════════════════════════════════════════════════
+  #  STEP 2: SERVICES (default: ON)
+  # ═══════════════════════════════════════════════════════════
+  #
+  #  These are all ON by default in the Server+Desktop role.
+  #  Set any to "false" to disable it.
+  #
+  #  ┌─────────────────────┬────────────────────────────────┐
+  #  │ Service              │ What it does                   │
+  #  ├─────────────────────┼────────────────────────────────┤
+  #  │ synapse              │ Matrix Synapse homeserver      │
+  #  │ bitcoin              │ Bitcoin ecosystem (bitcoind,   │
+  #  │                      │   electrs, lnd, rtl, btcpay)  │
+  #  │ vaultwarden          │ Vaultwarden password manager   │
+  #  │ wordpress            │ WordPress website              │
+  #  │ nextcloud            │ Nextcloud file hosting         │
+  #  └─────────────────────┴────────────────────────────────┘
+  #
+  #  Example — disable WordPress and Nextcloud:
+  #
+  #    sovran_systemsOS.services.wordpress = false;
+  #    sovran_systemsOS.services.nextcloud = false;
+  #
+  # ───────────────────────────────────────────────────────────
+
+  # sovran_systemsOS.services.wordpress = false;
+
+
+  # ═══════════════════════════════════════════════════════════
+  #  STEP 3: FEATURES (default: OFF)
+  # ═══════════════════════════════════════════════════════════
+  #
+  #  These are OFF by default. Set to "true" to enable.
+  #
+  #  ┌─────────────────────┬────────────────────────────────┐
+  #  │ Feature              │ What it does                   │
+  #  ├─────────────────────┼────────────────────────────────┤
+  #  │ haven                │ Haven NOSTR relay & Blossom    │
+  #  │ bip110               │ BIP-110 Bitcoin Better Money   │
+  #  │ mempool              │ Mempool.space block explorer   │
+  #  │ element-calling      │ LiveKit server for Matrix      │
+  #  │ rdp                  │ GNOME Remote Desktop (RDP)     │
+  #  │ bitcoin-core         │ Bitcoin Core GUI desktop app   │
+  #  └─────────────────────┴─────���──────────────────────────┘
+  #
+  #  Example — enable element video calling:
+  #
+  #    sovran_systemsOS.features.element-calling = true;
+  #
+  # ───────────────────────────────────────────────────────────
+
+  # sovran_systemsOS.features.element-calling = true;
+
+
+  # ═══════════════════════════════════════════════════════════
+  #  STEP 4: WEB EXPOSURE (default: ON)
+  # ═══════════════════════════════════════════════════════════
+  #
+  #  Controls whether Caddy serves this application to the web.
+  #  (Does not stop the application itself from running).
+  #
+  #  ┌─────────────────────┬────────────────────────────────┐
+  #  │ Option               │ Default                        │
+  #  ├─────────────────────┼────────────────────────────────┤
+  #  │ btcpayserver         │ true (false in Node role)      │
+  #  └─────────────────────┴────────────────────────────────┘
+  #
+  #  Example — hide BTCPay from the web:
+  #
+  #    sovran_systemsOS.web.btcpayserver = false;
+  #
+  # ───────────────────────────────────────────────────────────
+
+  # sovran_systemsOS.web.btcpayserver = false;
+
+
+  # ═══════════════════════════════════════════════════════════
+  #  STEP 5: NOSTR PUBLIC KEY (required for Haven)
+  # ═══════════════════════════════════════════════════════════
+  #
+  #  If you enabled Haven above, paste your npub here.
+  #  Haven will NOT start without a valid npub.
+  #
+  #  Example:
+  #
+  #    sovran_systemsOS.nostr_npub = "npub1abc123...";
+  #
+  # ───────────────────────────────────────────────────────────
+
+  # sovran_systemsOS.nostr_npub = "";
+
+}
@@ -1,36 +1,15 @@
 {
  "nodes": {
-    "agenix": {
-      "inputs": {
-        "darwin": [],
-        "home-manager": "home-manager",
-        "nixpkgs": "nixpkgs",
-        "systems": "systems"
-      },
-      "locked": {
-        "lastModified": 1770165109,
-        "narHash": "sha256-9VnK6Oqai65puVJ4WYtCTvlJeXxMzAp/69HhQuTdl/I=",
-        "owner": "ryantm",
-        "repo": "agenix",
-        "rev": "b027ee29d959fda4b60b57566d64c98a202e0feb",
-        "type": "github"
-      },
-      "original": {
-        "owner": "ryantm",
-        "repo": "agenix",
-        "type": "github"
-      }
-    },
    "bip110": {
      "inputs": {
-        "nixpkgs": "nixpkgs_2"
+        "nixpkgs": "nixpkgs"
      },
      "locked": {
-        "lastModified": 1777892922,
-        "narHash": "sha256-Yo53Ae0eQa5nByGoTsdJQAIK7kR9UlSDEWT88Qy/6g8=",
+        "lastModified": 1773169138,
+        "narHash": "sha256-6X41z8o2z8KjF4gMzLTPD41WjvCDGXTc0muPGmwcOMk=",
        "owner": "emmanuelrosa",
        "repo": "bitcoin-knots-bip-110-nix",
-        "rev": "dfe7221629f14d81ce1b4fc96d9500982d1baa58",
+        "rev": "b9d018b71e20ce8c1567cbc2401b6edc2c1c7793",
        "type": "github"
      },
      "original": {
@@ -41,15 +20,15 @@
    },
    "btc-clients": {
      "inputs": {
-        "nixpkgs": "nixpkgs_3",
+        "nixpkgs": "nixpkgs_2",
        "oldNixpkgs": "oldNixpkgs"
      },
      "locked": {
-        "lastModified": 1777892852,
-        "narHash": "sha256-A+jhf4vEQmn2/DBedQMrisrijDgYfrZOpjjSPhrJgJA=",
+        "lastModified": 1774797058,
+        "narHash": "sha256-URUOiKNjG3s7vDkTj554+3yzQ0qqNQoQwHdc7vs63X0=",
        "owner": "emmanuelrosa",
        "repo": "btc-clients-nix",
-        "rev": "7576625375f510bcb432caba0e331c6ed2942350",
+        "rev": "a10dae067da04b7b170eed73efc665d27fc0e0c5",
        "type": "github"
      },
      "original": {
@@ -92,11 +71,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1777932387,
-        "narHash": "sha256-nUYVPiqrzr36ThiQOAr5MKeGHDBSDM3OFWkz0uDjOvc=",
+        "lastModified": 1769996383,
+        "narHash": "sha256-AnYjnFWgS49RlqX7LrC4uA+sCCDBj0Ry/WOJ5XWAsa0=",
        "owner": "hercules-ci",
        "repo": "flake-parts",
-        "rev": "71a3a77326609675e9f8b51084cf23d5d1945899",
+        "rev": "57928607ea566b5db3ad13af0e57e921e6b12381",
        "type": "github"
      },
      "original": {
@@ -107,7 +86,7 @@
    },
    "flake-utils": {
      "inputs": {
-        "systems": "systems_2"
+        "systems": "systems"
      },
      "locked": {
        "lastModified": 1731533236,
@@ -123,32 +102,11 @@
        "type": "github"
      }
    },
-    "home-manager": {
-      "inputs": {
-        "nixpkgs": [
-          "agenix",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1745494811,
-        "narHash": "sha256-YZCh2o9Ua1n9uCvrvi5pRxtuVNml8X2a03qIFfRKpFs=",
-        "owner": "nix-community",
-        "repo": "home-manager",
-        "rev": "abfad3d2958c9e6300a883bd443512c55dfeb1be",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "home-manager",
-        "type": "github"
-      }
-    },
    "nix-bitcoin": {
      "inputs": {
        "extra-container": "extra-container",
        "flake-utils": "flake-utils",
-        "nixpkgs": "nixpkgs_4",
+        "nixpkgs": "nixpkgs_3",
        "nixpkgs-25_05": "nixpkgs-25_05",
        "nixpkgs-unstable": "nixpkgs-unstable"
      },
@@ -169,16 +127,16 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1754028485,
-        "narHash": "sha256-IiiXB3BDTi6UqzAZcf2S797hWEPCRZOwyNThJIYhUfk=",
+        "lastModified": 1772380631,
+        "narHash": "sha256-FhW0uxeXjefINP0vUD4yRBB52Us7fXZPk9RiPAopfiY=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "59e69648d345d6e8fef86158c555730fa12af9de",
+        "rev": "6d3b61b190a899042ce82a5355111976ba76d698",
        "type": "github"
      },
      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-25.05",
+        "owner": "nixos",
+        "ref": "master",
        "repo": "nixpkgs",
        "type": "github"
      }
@@ -233,36 +191,20 @@
    },
    "nixpkgs_2": {
      "locked": {
-        "lastModified": 1777728799,
-        "narHash": "sha256-z7jjYQqhkFKab92VQ3duB7QVO7f7Y62qTFrJYXO/lyo=",
+        "lastModified": 1772380631,
+        "narHash": "sha256-FhW0uxeXjefINP0vUD4yRBB52Us7fXZPk9RiPAopfiY=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "4b2287113c2f9a2331c04899b2e2e5ab92dea9c5",
+        "rev": "6d3b61b190a899042ce82a5355111976ba76d698",
        "type": "github"
      },
      "original": {
        "owner": "nixos",
-        "ref": "master",
        "repo": "nixpkgs",
        "type": "github"
      }
    },
    "nixpkgs_3": {
-      "locked": {
-        "lastModified": 1777728799,
-        "narHash": "sha256-z7jjYQqhkFKab92VQ3duB7QVO7f7Y62qTFrJYXO/lyo=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "4b2287113c2f9a2331c04899b2e2e5ab92dea9c5",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_4": {
      "locked": {
        "lastModified": 1767480499,
        "narHash": "sha256-8IQQUorUGiSmFaPnLSo2+T+rjHtiNWc+OAzeHck7N48=",
@@ -278,13 +220,13 @@
        "type": "github"
      }
    },
-    "nixpkgs_5": {
+    "nixpkgs_4": {
      "locked": {
-        "lastModified": 1777954456,
-        "narHash": "sha256-hGdgeU2Nk87RAuZyYjyDjFL6LK7dAZN5RE9+hrDTkDU=",
+        "lastModified": 1775036866,
+        "narHash": "sha256-ZojAnPuCdy657PbTq5V0Y+AHKhZAIwSIT2cb8UgAz/U=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "549bd84d6279f9852cae6225e372cc67fb91a4c1",
+        "rev": "6201e203d09599479a3b3450ed24fa81537ebc4e",
        "type": "github"
      },
      "original": {
@@ -294,13 +236,13 @@
        "type": "github"
      }
    },
-    "nixpkgs_6": {
+    "nixpkgs_5": {
      "locked": {
-        "lastModified": 1777918403,
-        "narHash": "sha256-7QiZv0LcW1yIOLo2LNuCQjWon1Z1r99FwK24hbtBOF4=",
+        "lastModified": 1770380644,
+        "narHash": "sha256-P7dWMHRUWG5m4G+06jDyThXO7kwSk46C1kgjEWcybkE=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "afc5551119aae6eab73a95c1960891cfe63204f6",
+        "rev": "ae67888ff7ef9dff69b3cf0cc0fbfbcd3a722abe",
        "type": "github"
      },
      "original": {
@@ -313,15 +255,15 @@
    "nixvim": {
      "inputs": {
        "flake-parts": "flake-parts",
-        "nixpkgs": "nixpkgs_6",
-        "systems": "systems_3"
+        "nixpkgs": "nixpkgs_5",
+        "systems": "systems_2"
      },
      "locked": {
-        "lastModified": 1777991353,
-        "narHash": "sha256-DFwjggMV+nzCZpwK6Obxj9F+P59rbLVowGqHETfctBk=",
+        "lastModified": 1774802402,
+        "narHash": "sha256-L1UJ/zxKTyyaGGmytH6OYlgQ0HGSMhvPkvU+iz4Mkb8=",
        "owner": "nix-community",
        "repo": "nixvim",
-        "rev": "7986a276960b4dfaed9bb2c3c438b5ba71ae08f1",
+        "rev": "cbd8536a05d1aae2593cb5c9ace1010c8c5845cb",
        "type": "github"
      },
      "original": {
@@ -348,11 +290,10 @@
    },
    "root": {
      "inputs": {
-        "agenix": "agenix",
        "bip110": "bip110",
        "btc-clients": "btc-clients",
        "nix-bitcoin": "nix-bitcoin",
-        "nixpkgs": "nixpkgs_5",
+        "nixpkgs": "nixpkgs_4",
        "nixpkgs-stable": "nixpkgs-stable",
        "nixvim": "nixvim"
      }
@@ -386,21 +327,6 @@
        "repo": "default",
        "type": "github"
      }
-    },
-    "systems_3": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
    }
  },
  "root": "root",
@@ -2,71 +2,69 @@
 	description = "The Ultimate Sovran_SystemsOS Configuration from Sovran Systems";

 	inputs = {
-		
 		nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
-
 		nix-bitcoin.url = "github:fort-nix/nix-bitcoin/release";
-		
-		agenix.url = "github:ryantm/agenix";
-
-		agenix.inputs.darwin.follows = "";
-
 		nixvim.url = "github:nix-community/nixvim";
-
 		btc-clients.url = "github:emmanuelrosa/btc-clients-nix";
-
 		nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-24.11";
-
 		bip110.url = "github:emmanuelrosa/bitcoin-knots-bip-110-nix";
-
 	};

-	outputs = { self, nixpkgs, nix-bitcoin, nixvim, agenix, btc-clients, nixpkgs-stable, bip110, ... }:
+	outputs = { self, nixpkgs, nix-bitcoin, nixvim, btc-clients, nixpkgs-stable, bip110, ... }:

 	let
-
 		overlay-stable = final: prev: {
-
 			stable = import nixpkgs-stable {
 				system = prev.stdenv.hostPlatform.system;
 				config.allowUnfree = true;
-
 			};
-
 		};
-
 	in
-
-	{ 
-		
+	{
 		nixosConfigurations.nixos = nixpkgs.lib.nixosSystem {
-			
 			modules = [
 				{ nixpkgs.hostPlatform = "x86_64-linux"; }
+				self.nixosModules.Sovran_SystemsOS
+				/etc/nixos/role-state.nix
+				/etc/nixos/custom.nix
 			];
-		
 		};
-		
-		nixosModules.Sovran_SystemsOS = { pkgs, lib, config, ... }: {

+		nixosConfigurations.sovran-iso-desktop = nixpkgs.lib.nixosSystem {
+			modules = [
+				{ nixpkgs.hostPlatform = "x86_64-linux"; }
+				({ config, pkgs, ... }: { nixpkgs.overlays = [ overlay-stable ]; })
+				./iso/desktop.nix
+				nix-bitcoin.nixosModules.default
+				nixvim.nixosModules.nixvim
+			];
+		};
+
+		nixosConfigurations.sovran-iso-server = nixpkgs.lib.nixosSystem {
+			modules = [
+				{ nixpkgs.hostPlatform = "x86_64-linux"; }
+				({ config, pkgs, ... }: { nixpkgs.overlays = [ overlay-stable ]; })
+				./iso/server.nix
+				nix-bitcoin.nixosModules.default
+				nixvim.nixosModules.nixvim
+			];
+		};
+
+		nixosModules.Sovran_SystemsOS = { pkgs, lib, config, ... }: {
 			imports = [
 				({ config, pkgs, ... }: {
 					nixpkgs.overlays = [ overlay-stable ];
 				})
-
 				./configuration.nix
 				nix-bitcoin.nixosModules.default
-				agenix.nixosModules.default
 				nixvim.nixosModules.nixvim
 			];
-
 			config = {
 				environment.systemPackages = with pkgs; [
 					btc-clients.packages.${pkgs.system}.bisq
 					btc-clients.packages.${pkgs.system}.bisq2
 					btc-clients.packages.${pkgs.system}.sparrow
 				];
-
 				sovran_systemsOS.packages.bip110 = bip110.packages.${pkgs.system}.bitcoind-knots-bip-110;
 			};
 		};
@@ -1,472 +0,0 @@
-[com/ftpix/transparentbar]
-dark-full-screen=false
-
-[org/gnome/Connections]
-first-run=false
-
-[org/gnome/Console]
-font-scale=1.6000000000000005
-last-window-size=(1912, 1037)
-
-[org/gnome/Geary]
-migrated-config=true
-window-height=516
-window-width=954
-
-[org/gnome/TextEditor]
-last-save-directory='file:///home/free/Downloads'
-
-[org/gnome/Totem]
-active-plugins=['mpris', 'vimeo', 'screenshot', 'movie-properties', 'autoload-subtitles', 'screensaver', 'apple-trailers', 'save-file', 'rotation', 'open-directory', 'recent', 'variable-rate', 'skipto']
-subtitle-encoding='UTF-8'
-
-[org/gnome/baobab/ui]
-is-maximized=false
-window-size=(1912, 1037)
-
-[org/gnome/calculator]
-accuracy=9
-angle-units='degrees'
-base=10
-button-mode='basic'
-number-format='automatic'
-show-thousands=false
-show-zeroes=false
-source-currency=''
-source-units='degree'
-target-currency=''
-target-units='radian'
-word-size=64
-
-[org/gnome/calendar]
-active-view='month'
-window-maximized=false
-window-size=(1912, 1037)
-
-[org/gnome/control-center]
-last-panel='background'
-window-state=(1912, 1040, false)
-
-[org/gnome/desktop/app-folders]
-folder-children=['Utilities', 'YaST', 'd737daeb-6dbb-4a5d-9ec7-e674398539ce', '7d66e46a-a135-4e42-91bb-d438e499d251', '3fea025e-f5e4-4905-9912-e70e38cd0419', '83d8148a-1f0b-4f83-814a-11c33ab8debc', '68c075b1-a254-4b7c-ba63-c45f88bc2a58', '534e2716-83c7-4a2a-9678-8144999213ed', '4acaa2d8-d284-4efd-bba3-40f150f1ace5', '1e62b69b-d9bb-4e80-be8d-5e9b4d777fc8']
-
-[org/gnome/desktop/app-folders/folders/1e62b69b-d9bb-4e80-be8d-5e9b4d777fc8]
-apps=['math.desktop', 'writer.desktop', 'impress.desktop', 'draw.desktop', 'calc.desktop', 'base.desktop', 'startcenter.desktop']
-name='Office'
-
-[org/gnome/desktop/app-folders/folders/3fea025e-f5e4-4905-9912-e70e38cd0419]
-apps=['cups.desktop', 'simple-scan.desktop']
-name='Printing'
-translate=false
-
-[org/gnome/desktop/app-folders/folders/4acaa2d8-d284-4efd-bba3-40f150f1ace5]
-apps=['org.gnome.DiskUtility.desktop', 'org.gnome.baobab.desktop', 'gparted.desktop', 'gnome-system-monitor.desktop']
-name='Utilities'
-
-[org/gnome/desktop/app-folders/folders/534e2716-83c7-4a2a-9678-8144999213ed]
-apps=['org.gnome.Epiphany.desktop', 'librewolf.desktop', 'io.lbry.lbry-app.desktop', 'bitwarden.desktop', 'com.nextcloud.desktopclient.nextcloud.desktop', 'brave-browser.desktop', 'chromium-browser.desktop']
-name='Internet'
-
-[org/gnome/desktop/app-folders/folders/68c075b1-a254-4b7c-ba63-c45f88bc2a58]
-apps=['org.gnome.Extensions.desktop', 'org.gnome.tweaks.desktop']
-name='Customize Look'
-translate=false
-
-[org/gnome/desktop/app-folders/folders/7d66e46a-a135-4e42-91bb-d438e499d251]
-apps=['org.gnome.Photos.desktop', 'org.gnome.Music.desktop', 'org.gnome.Totem.desktop', 'org.gnome.Cheese.desktop', 'org.gnome.Loupe.desktop', 'org.gnome.Snapshot.desktop']
-name='Media'
-translate=false
-
-[org/gnome/desktop/app-folders/folders/83d8148a-1f0b-4f83-814a-11c33ab8debc]
-apps=['org.gnome.Tour.desktop', 'yelp.desktop', 'nixos-manual.desktop']
-name='Help'
-translate=false
-
-[org/gnome/desktop/app-folders/folders/Utilities]
-apps=['gnome-abrt.desktop', 'gnome-system-log.desktop', 'nm-connection-editor.desktop', 'org.gnome.Connections.desktop', 'org.gnome.DejaDup.desktop', 'org.gnome.Dictionary.desktop', 'org.gnome.eog.desktop', 'org.gnome.Evince.desktop', 'org.gnome.FileRoller.desktop', 'org.gnome.fonts.desktop', 'org.gnome.seahorse.Application.desktop', 'org.gnome.Usage.desktop', 'vinagre.desktop', 'org.gnome.TextEditor.desktop', 'org.gnome.gedit.desktop', 'org.gnome.SystemMonitor.desktop']
-categories=['X-GNOME-Utilities']
-excluded-apps=['org.gnome.Console.desktop', 'org.gnome.tweaks.desktop', 'org.gnome.DiskUtility.desktop', 'org.gnome.baobab.desktop']
-name='X-GNOME-Utilities.directory'
-translate=true
-
-[org/gnome/desktop/app-folders/folders/YaST]
-categories=['X-SuSE-YaST']
-name='suse-yast.directory'
-translate=true
-
-[org/gnome/desktop/app-folders/folders/d737daeb-6dbb-4a5d-9ec7-e674398539ce]
-apps=['fish.desktop', 'org.gnome.Console.desktop', 'htop.desktop', 'ranger.desktop', 'xterm.desktop', 'org.gnome.Terminal.desktop']
-name='Terminal Fun'
-translate=false
-
-[org/gnome/desktop/background]
-color-shading-type='solid'
-picture-options='zoom'
-picture-uri='file:///run/current-system/sw/share/backgrounds/gnome/amber-l.jxl'
-picture-uri-dark='file:///run/current-system/sw/share/backgrounds/gnome/amber-d.jxl'
-primary-color='#ff7800'
-secondary-color='#000000'
-
-[org/gnome/desktop/calendar]
-show-weekdate=false
-
-[org/gnome/desktop/input-sources]
-sources=[('xkb', 'us')]
-xkb-options=['terminate:ctrl_alt_bksp']
-
-[org/gnome/desktop/interface]
-clock-format='12h'
-clock-show-seconds=false
-clock-show-weekday=false
-color-scheme='prefer-dark'
-enable-animations=true
-font-antialiasing='rgba'
-font-hinting='full'
-gtk-theme='Adwaita-dark'
-icon-theme='Papirus-Dark'
-text-scaling-factor=1.0
-
-[org/gnome/desktop/notifications]
-application-children=['gnome-power-panel', 'org-gnome-nautilus', 'org-gnome-software', 'gnome-network-panel', 'sparrow', 'org-gnome-settings', 'org-gnome-console', 'gnome-printers-panel', 'org-gnome-epiphany', 'com-obsproject-studio', 'io-github-seadve-kooha', 'xdg-desktop-portal-gnome', 'org-gnome-baobab', 'org-gnome-geary', 'sparrow-desktop', 'impress', 'brave-browser', 'org-gnome-connections']
-show-in-lock-screen=false
-
-[org/gnome/desktop/notifications/application/brave-browser]
-application-id='brave-browser.desktop'
-
-[org/gnome/desktop/notifications/application/com-obsproject-studio]
-application-id='com.obsproject.Studio.desktop'
-
-[org/gnome/desktop/notifications/application/gnome-network-panel]
-application-id='gnome-network-panel.desktop'
-
-[org/gnome/desktop/notifications/application/gnome-power-panel]
-application-id='gnome-power-panel.desktop'
-
-[org/gnome/desktop/notifications/application/gnome-printers-panel]
-application-id='gnome-printers-panel.desktop'
-
-[org/gnome/desktop/notifications/application/impress]
-application-id='impress.desktop'
-
-[org/gnome/desktop/notifications/application/io-github-seadve-kooha]
-application-id='io.github.seadve.Kooha.desktop'
-
-[org/gnome/desktop/notifications/application/org-gnome-baobab]
-application-id='org.gnome.baobab.desktop'
-
-[org/gnome/desktop/notifications/application/org-gnome-connections]
-application-id='org.gnome.Connections.desktop'
-
-[org/gnome/desktop/notifications/application/org-gnome-console]
-application-id='org.gnome.Console.desktop'
-
-[org/gnome/desktop/notifications/application/org-gnome-epiphany]
-application-id='org.gnome.Epiphany.desktop'
-
-[org/gnome/desktop/notifications/application/org-gnome-geary]
-application-id='org.gnome.Geary.desktop'
-
-[org/gnome/desktop/notifications/application/org-gnome-nautilus]
-application-id='org.gnome.Nautilus.desktop'
-
-[org/gnome/desktop/notifications/application/org-gnome-settings]
-application-id='org.gnome.Settings.desktop'
-
-[org/gnome/desktop/notifications/application/org-gnome-software]
-application-id='org.gnome.Software.desktop'
-
-[org/gnome/desktop/notifications/application/sparrow-desktop]
-application-id='sparrow-desktop.desktop'
-
-[org/gnome/desktop/notifications/application/sparrow]
-application-id='Sparrow.desktop'
-
-[org/gnome/desktop/notifications/application/xdg-desktop-portal-gnome]
-application-id='xdg-desktop-portal-gnome.desktop'
-
-[org/gnome/desktop/peripherals/keyboard]
-numlock-state=false
-
-[org/gnome/desktop/peripherals/mouse]
-natural-scroll=true
-speed=-0.63779527559055116
-
-[org/gnome/desktop/peripherals/touchpad]
-two-finger-scrolling-enabled=true
-
-[org/gnome/desktop/privacy]
-old-files-age=uint32 30
-recent-files-max-age=-1
-
-[org/gnome/desktop/screensaver]
-color-shading-type='solid'
-lock-enabled=false
-picture-options='zoom'
-picture-uri='file:///run/current-system/sw/share/backgrounds/gnome/amber-l.jxl'
-primary-color='#ff7800'
-secondary-color='#000000'
-
-[org/gnome/desktop/session]
-idle-delay=uint32 900
-
-[org/gnome/desktop/sound]
-event-sounds=true
-theme-name='__custom'
-
-[org/gnome/desktop/wm/preferences]
-button-layout='appmenu:minimize,maximize,close'
-
-[org/gnome/epiphany]
-ask-for-default=false
-
-[org/gnome/epiphany/state]
-is-maximized=false
-window-size=(1912, 1037)
-
-[org/gnome/evolution-data-server]
-migrated=true
-network-monitor-gio-name=''
-
-[org/gnome/file-roller/dialogs/extract]
-recreate-folders=true
-skip-newer=false
-
-[org/gnome/file-roller/listing]
-list-mode='as-folder'
-name-column-width=250
-show-path=false
-sort-method='name'
-sort-type='ascending'
-
-[org/gnome/file-roller/ui]
-sidebar-width=200
-window-height=993
-window-width=954
-
-[org/gnome/gnome-system-monitor]
-current-tab='processes'
-maximized=false
-network-total-in-bits=false
-show-dependencies=false
-show-whose-processes='all'
-window-height=1040
-window-state=(1912, 1040, 26, 23)
-window-width=1912
-
-[org/gnome/gnome-system-monitor/disktreenew]
-col-6-visible=true
-col-6-width=0
-
-[org/gnome/gnome-system-monitor/proctree]
-columns-order=[0, 1, 2, 3, 4, 6, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26]
-sort-col=8
-sort-order=0
-
-[org/gnome/maps]
-last-viewed-location=[34.015438242460405, -118.32766985901287]
-map-type='MapsStreetSource'
-transportation-type='pedestrian'
-window-maximized=false
-window-size=[1912, 1037]
-zoom-level=9
-
-[org/gnome/mutter]
-attach-modal-dialogs=true
-dynamic-workspaces=true
-edge-tiling=false
-focus-change-on-pointer-rest=true
-workspaces-only-on-primary=true
-
-[org/gnome/nautilus/icon-view]
-default-zoom-level='large'
-
-[org/gnome/nautilus/preferences]
-default-folder-viewer='icon-view'
-fts-enabled=false
-migrated-gtk-settings=true
-search-filter-time-type='last_modified'
-search-view='list-view'
-
-[org/gnome/nautilus/window-state]
-initial-size=(1912, 1040)
-maximized=false
-
-[org/gnome/nm-applet/eap/202ce1d2-7306-40ac-b3bb-5b092c0f9734]
-ignore-ca-cert=false
-ignore-phase2-ca-cert=false
-
-[org/gnome/nm-applet/eap/2afa07ed-64ca-44a0-948e-d8f265fa52b0]
-ignore-ca-cert=false
-ignore-phase2-ca-cert=false
-
-[org/gnome/nm-applet/eap/8da70f78-fe38-3e50-a305-8fa32b2af624]
-ignore-ca-cert=false
-ignore-phase2-ca-cert=false
-
-[org/gnome/nm-applet/eap/a9f5fb1c-2546-4fb9-82d0-7792e8982565]
-ignore-ca-cert=false
-ignore-phase2-ca-cert=false
-
-[org/gnome/nm-applet/eap/e5e312d5-e2db-3928-8c98-8ec8a7cf61f2]
-ignore-ca-cert=false
-ignore-phase2-ca-cert=false
-
-[org/gnome/portal/filechooser/brave-browser]
-last-folder-path='/home/free/Downloads'
-
-[org/gnome/portal/filechooser/chromium-browser]
-last-folder-path='/home/free/Downloads'
-
-[org/gnome/settings-daemon/plugins/color]
-night-light-enabled=true
-night-light-schedule-automatic=false
-night-light-schedule-from=18.0
-night-light-temperature=uint32 1744
-
-[org/gnome/settings-daemon/plugins/power]
-power-button-action='nothing'
-sleep-inactive-ac-type='nothing'
-
-[org/gnome/shell]
-app-picker-layout=[{'org.gnome.Weather.desktop': <{'position': <0>}>, 'org.gnome.clocks.desktop': <{'position': <1>}>, 'org.gnome.Maps.desktop': <{'position': <2>}>, 'org.gnome.Calculator.desktop': <{'position': <3>}>, '68c075b1-a254-4b7c-ba63-c45f88bc2a58': <{'position': <4>}>, '3fea025e-f5e4-4905-9912-e70e38cd0419': <{'position': <5>}>, '83d8148a-1f0b-4f83-814a-11c33ab8debc': <{'position': <6>}>, 'Utilities': <{'position': <7>}>, 'd737daeb-6dbb-4a5d-9ec7-e674398539ce': <{'position': <8>}>, '7d66e46a-a135-4e42-91bb-d438e499d251': <{'position': <9>}>, '534e2716-83c7-4a2a-9678-8144999213ed': <{'position': <10>}>, '4acaa2d8-d284-4efd-bba3-40f150f1ace5': <{'position': <11>}>, '1e62b69b-d9bb-4e80-be8d-5e9b4d777fc8': <{'position': <12>}>, 'Bisq-hidpi.desktop': <{'position': <13>}>, 'com.obsproject.Studio.desktop': <{'position': <14>}>, 'Sovran_SystemsOS_External_Backup.desktop': <{'position': <15>}>, 'firefox.desktop': <{'position': <16>}>}]
-disable-user-extensions=false
-disabled-extensions=['transparent-top-bar@zhanghai.me']
-enabled-extensions=['appindicatorsupport@rgcjonas.gmail.com', 'dash-to-dock-cosmic-@halfmexicanhalfamazing@gmail.com', 'Vitals@CoreCoding.com', 'dash-to-dock@micxgx.gmail.com', 'transparent-top-bar@ftpix.com', 'just-perfection-desktop@just-perfection', 'pop-shell@system76.com', 'date-menu-formatter@marcinjakubowski.github.com', 'systemd-manager@hardpixel.eu', 'light-style@gnome-shell-extensions.gcampax.github.com']
-favorite-apps=['firefox.desktop', 'org.gnome.Nautilus.desktop', 'Sovran_SystemsOS_Updater.desktop', 'org.gnome.Settings.desktop', 'org.gnome.Software.desktop', 'io.freetubeapp.FreeTube.desktop', 'org.onlyoffice.desktopeditors.desktop', 'org.gnome.Geary.desktop', 'org.gnome.Contacts.desktop', 'org.gnome.Calendar.desktop', 'Bisq.desktop', 'sparrow-desktop.desktop']
-last-selected-power-profile='performance'
-welcome-dialog-last-shown-version='42.3.1'
-
-[org/gnome/shell/extensions/dash-to-dock-pop]
-apply-glossy-effect=false
-background-color='rgb(0,0,0)'
-background-opacity=0.25
-border-radius=17
-custom-background-color=true
-custom-theme-shrink=false
-dash-max-icon-size=64
-dock-alignment='CENTRE'
-dock-position='BOTTOM'
-extend-height=false
-floating-margin=0
-force-straight-corner=false
-height-fraction=0.90000000000000002
-intellihide-mode='ALL_WINDOWS'
-preferred-monitor=-2
-preferred-monitor-by-connector='HDMI-1'
-preview-size-scale=0.059999999999999998
-running-indicator-style='DASHES'
-show-apps-at-top=false
-show-mounts=false
-show-show-apps-button=true
-show-trash=false
-transparency-mode='FIXED'
-unity-backlit-items=false
-
-[org/gnome/shell/extensions/dash-to-dock]
-apply-custom-theme=false
-background-color='rgb(0,0,0)'
-background-opacity=0.17000000000000001
-custom-background-color=true
-dash-max-icon-size=57
-dock-position='BOTTOM'
-extend-height=false
-height-fraction=0.89000000000000001
-icon-size-fixed=false
-intellihide-mode='ALL_WINDOWS'
-preferred-monitor=-2
-preferred-monitor-by-connector='HDMI-2'
-preview-size-scale=0.22
-running-indicator-style='DASHES'
-show-mounts=false
-show-mounts-only-mounted=false
-show-trash=false
-transparency-mode='FIXED'
-
-[org/gnome/shell/extensions/date-menu-formatter]
-font-size=14
-pattern='EEEE    MMMM  d     h: mm a'
-text-align='center'
-
-[org/gnome/shell/extensions/just-perfection]
-accessibility-menu=false
-
-[org/gnome/shell/extensions/pop-shell]
-active-hint-border-radius=uint32 3
-gap-inner=uint32 1
-gap-outer=uint32 1
-tile-by-default=true
-
-[org/gnome/shell/extensions/systemd-manager]
-command-method='systemctl'
-systemd=['{"name":"Bitcoind","service":"bitcoind.service","type":"system"}', '{"name":"Electrs","service":"electrs.service","type":"system"}', '{"name":"BTCPayserver","service":"btcpayserver.service","type":"system"}', '{"name":"Nbxplorer","service":"nbxplorer.service","type":"system"}', '{"name":"Caddy","service":"caddy.service","type":"system"}', '{"name":"Phpfpm-Mypool","service":"phpfpm-mypool.service","type":"system"}', '{"name":"Mysql","service":"mysql.service","type":"system"}', '{"name":"Postgresql","service":"postgresql.service","type":"system"}', '{"name":"Matrix-Synapse","service":"matrix-synapse.service","type":"system"}', '{"name":"Coturn","service":"coturn.service","type":"system"}', '{"name":"Tor","service":"tor.service","type":"system"}', '{"name":"VaultWarden","service":"vaultwarden.service","type":"system"}', '{"name":"LND","service":"lnd.service","type":"system"}', '{"name":"LND Loop","service":"lightning-loop.service","type":"system"}', '{"name":"Ride The Lightning","service":"rtl.service","type":"system"}']
-
-[org/gnome/shell/extensions/vitals]
-fixed-widths=false
-hot-sensors=['_memory_usage_', '__network-tx_max__', '_processor_usage_', '_storage_free_', '_temperature_processor_0_']
-show-fan=false
-show-storage=true
-show-voltage=false
-
-[org/gnome/shell/weather]
-automatic-location=true
-locations=@av []
-
-[org/gnome/shell/world-clocks]
-locations=@av []
-
-[org/gnome/software]
-check-timestamp=int64 1715525466
-first-run=false
-flatpak-purge-timestamp=int64 1715478601
-online-updates-timestamp=int64 1675355639
-update-notification-timestamp=int64 1666382024
-
-[org/gnome/terminal/legacy/profiles:/:b1dcc9dd-5262-4d8d-a863-c897e6d979b9]
-font='Monospace 14'
-use-system-font=false
-
-[org/gnome/tweaks]
-show-extensions-notice=false
-
-[org/gtk/gtk4/settings/color-chooser]
-selected-color=(true, 0.0, 0.0, 0.0, 1.0)
-
-[org/gtk/gtk4/settings/file-chooser]
-date-format='regular'
-location-mode='path-bar'
-show-hidden=false
-show-size-column=true
-show-type-column=true
-sidebar-width=140
-sort-column='name'
-sort-directories-first=false
-sort-order='ascending'
-type-format='category'
-view-type='list'
-window-size=(1912, 1040)
-
-[org/gtk/settings/file-chooser]
-clock-format='12h'
-date-format='regular'
-location-mode='path-bar'
-show-hidden=true
-show-size-column=true
-show-type-column=true
-sidebar-width=165
-sort-column='modified'
-sort-directories-first=false
-sort-order='descending'
-type-format='category'
-window-position=(26, 23)
-window-size=(1401, 998)
-
-[system/proxy]
-ignore-hosts=@as []
-mode='none'
-
-[system/proxy/http]
-port=0
-
-[system/proxy/socks]
-host='127.0.0.1'
-port=9050
@@ -1,30 +0,0 @@
-{
-	description = "Sovran_SystemsOS for the Sovran Pro from Sovran Systems";
-
-	inputs = {
-		
-		Sovran_Systems.url = "git+https://git.sovransystems.com/Sovran_Systems/Sovran_SystemsOS";
-	
-	};
-
-	outputs = { self, Sovran_Systems, ... }@inputs: {
-		
-		nixosConfigurations."nixos" = Sovran_Systems.inputs.nixpkgs.lib.nixosSystem {
- 			
- 			modules = [ 
-
-				{ nixpkgs.hostPlatform = "x86_64-linux"; }
-
- 				./hardware-configuration.nix
-
- 				./custom.nix
-
- 				Sovran_Systems.nixosModules.Sovran_SystemsOS 
-
- 			];
-		
-		};
-	
-	};
-
-}
@@ -1,30 +0,0 @@
-{
-	description = "Sovran_SystemsOS for the Sovran Pro from Sovran Systems";
-
-	inputs = {
-		
-		Sovran_Systems.url = "git+https://git.sovransystems.com/Sovran_Systems/Sovran_SystemsOS";
-	
-	};
-
-	outputs = { self, Sovran_Systems, ... }@inputs: {
-		
-		nixosConfigurations."nixos" = Sovran_Systems.inputs.nixpkgs.lib.nixosSystem {
- 			
- 			modules = [ 
-
-				{ nixpkgs.hostPlatform = "x86_64-linux"; }
-
- 				./hardware-configuration.nix
-
- 				./custom.nix
-
- 				Sovran_Systems.nixosModules.Sovran_SystemsOS 
-
- 			];
-		
-		};
-	
-	};
-
-}
@@ -1,89 +0,0 @@
-#!/usr/bin/env bash
-
-# Begin: curl https://git.sovransystems.com/Sovran_Systems/Sovran_SystemsOS/raw/branch/main/for_new_sovran_pros/psp.sh -o psp.sh
-
-GREEN="\e[32m"
-LIGHTBLUE="\e[94m"
-ENDCOLOR="\e[0m"
-
-lsblk
-
-echo -e "${GREEN}What block for file-tree-root of drive (usually nvme0n1)?${ENDCOLOR}";read commitroot
-
-parted /dev/"$commitroot" -- mklabel gpt
-parted /dev/"$commitroot" -- mkpart primary 512MB -16GB
-parted /dev/"$commitroot" -- mkpart swap linux-swap -16GB 100%
-parted /dev/"$commitroot" -- mkpart ESP fat32 1MB 512MB
-parted /dev/"$commitroot" -- set 3 esp on
-
-lsblk
-
-echo -e "${GREEN}What partition for Boot-Partition (usually nvme0n1p1)?${ENDCOLOR}";read commitbootpartition
-
-echo -e "${GREEN}What partition for Main-Partition (usually nvme0n1p2)?${ENDCOLOR}";read commitmainpartition
-
-echo -e "${GREEN}What partition for Swap-Partition (usually nvme0n1p3)?${ENDCOLOR}";read commitswappartition
-
-
-
-mkfs.ext4 -L nixos /dev/"$commitmainpartition"
-
-mkswap -L swap /dev/"$commitswappartition"
-
-mkfs.fat -F 32 -n boot /dev/"$commitbootpartition"
-
-mount /dev/disk/by-label/nixos /mnt
-
-mkdir -p /mnt/boot/efi                   
-
-mount /dev/disk/by-label/boot /mnt/boot/efi
-
-
-
-nixos-generate-config --root /mnt
-
-rm /mnt/etc/nixos/configuration.nix
-
-cat <<EOT >> /mnt/etc/nixos/configuration.nix         
-{ config, pkgs, ... }: {
-	
-	imports = [
-	
-	./hardware-configuration.nix
-	
-	];
-
-	boot.loader.systemd-boot.enable = true;
-	boot.loader.efi.canTouchEfiVariables = true;
-	boot.loader.efi.efiSysMountPoint = "/boot/efi";
-
-	nix.settings.experimental-features = [ "nix-command" "flakes" ];
-
-	users.users = {
-		free = {
-			isNormalUser = true;
-			description = "free";
-			extraGroups = [ "networkmanager" ];
-		};
-	};
-
-	environment.systemPackages = with pkgs; [
-		wget
-		git
-		ranger
-		fish
-		pwgen
-		openssl
-	];
-
-	services.openssh = {
-		enable = true;
-		permitRootLogin = "yes";
-	};
-}
-
-EOT
-
-nixos-install
-
-reboot
@@ -1,85 +0,0 @@
-#!/usr/bin/env bash
-
-# Begin: curl https://git.sovransystems.com/Sovran_Systems/Sovran_SystemsOS/raw/branch/main/for_new_sovran_pros/psp_physical_ram.sh -o psp_physical_ram.sh
-
-GREEN="\e[32m"
-LIGHTBLUE="\e[94m"
-ENDCOLOR="\e[0m"
-
-lsblk
-
-echo -e "${GREEN}What block for file-tree-root of drive (usually nvme0n1)?${ENDCOLOR}";read commitroot
-
-parted /dev/"$commitroot" -- mklabel gpt
-parted /dev/"$commitroot" -- mkpart ESP fat32 1MB 512MB
-parted /dev/"$commitroot" -- set 1 esp on
-parted /dev/"$commitroot" -- mkpart primary ext4 512MB 100%
-
-lsblk
-
-echo -e "${GREEN}What partition for Boot-Partition (usually nvme0n1p1)?${ENDCOLOR}";read commitbootpartition
-
-echo -e "${GREEN}What partition for Primary-Partition (usually nvme0n1p2)?${ENDCOLOR}";read commitprimarypartition
-
-
-mkfs.ext4 -L nixos /dev/"$commitprimarypartition"
-
-mkfs.fat -F 32 -n boot /dev/"$commitbootpartition"
-
-mount /dev/disk/by-label/nixos /mnt
-
-mkdir -p /mnt/boot/efi                   
-
-mount /dev/disk/by-label/boot /mnt/boot/efi
-
-### Disk Step-up Finished
-
-### Adding Configuration.nix
-
-nixos-generate-config --root /mnt
-
-rm /mnt/etc/nixos/configuration.nix
-
-cat <<EOT >> /mnt/etc/nixos/configuration.nix         
-{ config, pkgs, ... }: {
-	
-	imports = [
-	
-	./hardware-configuration.nix
-	
-	];
-
-	boot.loader.systemd-boot.enable = true;
-	boot.loader.efi.canTouchEfiVariables = true;
-	boot.loader.efi.efiSysMountPoint = "/boot/efi";
-
-	nix.settings.experimental-features = [ "nix-command" "flakes" ];
-
-	users.users = {
-		free = {
-			isNormalUser = true;
-			description = "free";
-			extraGroups = [ "networkmanager" ];
-		};
-	};
-
-	environment.systemPackages = with pkgs; [
-		wget
-		git
-		ranger
-		fish
-		pwgen
-		openssl
-	];
-
-	services.openssh = {
-		enable = true;
-		permitRootLogin = "yes";
-	};
-}
-
-EOT
-
-nixos-install
-
-reboot
@@ -1,51 +0,0 @@
-#!/usr/bin/env bash
-
-GREEN="\e[32m"
-LIGHTBLUE="\e[94m"
-ENDCOLOR="\e[0m"
-
-lsblk
-
-echo -e "${GREEN}What block for New Sovran Pro Second drive?${ENDCOLOR}";read commitroot
-
-parted /dev/"$commitroot" -- mklabel gpt
-parted /dev/"$commitroot" -- mkpart primary 0% 100%
-
-lsblk
-
-echo -e "${GREEN}What partition with New Sovran Pro Second Drive?${ENDCOLOR}";read commitsecond
-
-mkfs.ext4 -L "BTCEcoandBackup" /dev/"$commitsecond"
-
-sudo mkdir -p /mnt
-
-mount /dev/"$commitsecond" /mnt
-
-sudo mkdir -p /mnt/BTCEcoandBackup/Bitcoin_Node
-
-sudo mkdir -p /mnt/BTCEcoandBackup/Electrs_Data
-
-sudo mkdir -p /mnt/BTCEcoandBackup/NixOS_Snapshot_Backup
-
-sudo mkdir -p /mnt/BTCEcoandBackup/clightning_db_backup
-
-sudo systemctl stop bitcoind electrs nbxplorer btcpayserver lnd rtl lightning-loop clightning
-
-rsync -ar --info=progress2 --info=name0 /run/media/Second_Drive/BTCEcoandBackup/Bitcoin_Node/ /mnt/BTCEcoandBackup/Bitcoin_Node/
-
-rsync -ar --info=progress2 --info=name0 /run/media/Second_Drive/BTCEcoandBackup/Electrs_Data/ /mnt/BTCEcoandBackup/Electrs_Data/
-
-sudo systemctl start bitcoind electrs nbxplorer btcpayserver lnd rtl lightning-loop clightning
-
-sudo chown bitcoin:bitcoin /mnt/BTCEcoandBackup/Bitcoin_Node -R
-
-sudo chown electrs:electrs /mnt/BTCEcoandBackup/Electrs_Data -R
-
-sudo chmod 770 /mnt/BTCEcoandBackup/Bitcoin_Node -R
-
-sudo chmod 770 /mnt/BTCEcoandBackup/Electrs_Data -R
-
-sudo umount /dev/"$commitsecond"
-
-echo -e "All Finished!"
-
@@ -1,406 +0,0 @@
-#!/usr/bin/env bash
-
-# wget https://git.sovransystems.com/Sovran_Systems/Sovran_SystemsOS/raw/branch/main/for_new_sovran_pros/sp.sh
-
-
-GREEN="\e[32m"
-LIGHTBLUE="\e[94m"
-
-#
-
-pushd /etc/nixos/
-
-  wget https://git.sovransystems.com/Sovran_Systems/Sovran_SystemsOS/raw/branch/main/for_new_sovran_pros/flake.nix
-
-  chown root:root /etc/nixos/ -R
-  
-  chmod 770 /etc/nixos/ -R
-
-popd
-
-#
-
-mkdir /var/lib/domains
-
-touch /var/lib/domains/btcpayserver
-touch /var/lib/domains/matrix
-touch /var/lib/domains/nextcloud
-touch /var/lib/domains/sslemail
-touch /var/lib/domains/vaultwarden
-touch /var/lib/domains/wordpress
-
-#
-
-echo -e "${GREEN}What is your New Matrix (Element Chat) domain name?${ENDCOLOR}"
-read 
-echo -n $REPLY > /var/lib/domains/matrix
-
-echo -e "${GREEN}What is your New Wordpress domain name?${ENDCOLOR}"
-read 
-echo -n $REPLY > /var/lib/domains/wordpress
-
-echo -e "${GREEN}What is your New Nextcloud domain name?${ENDCOLOR}"
-read 
-echo -n $REPLY > /var/lib/domains/nextcloud
-
-echo -e "${GREEN}What is your New BTCPayserver domain name?${ENDCOLOR}"
-read 
-echo -n $REPLY > /var/lib/domains/btcpayserver
-
-echo -e "${GREEN}What is your New Vaultwarden domain name?${ENDCOLOR}"
-read 
-echo -n $REPLY > /var/lib/domains/vaultwarden
-
-echo -e "${GREEN}What is the email you would like to use to manage the SSL certificates for your domains?${ENDCOLOR}"
-read 
-echo -n $REPLY > /var/lib/domains/sslemail
-
-#
-
-mkdir /var/lib/nextcloudaddition
-
-cat > /var/lib/nextcloudaddition/nextcloudaddition <<- "EOF"
-
-'trusted_proxies' => 
-  array (
-    0 => '127.0.0.1',
-  ),
-  'default_locale' => 'en_US',
-  'default_phone_region' => 'US',
-  'memcache.local' =>'\OC\Memcache\APCu' ,
-
-EOF
-
-#
-
-mkdir /var/lib/njalla/
-
-cat > /var/lib/njalla/njalla.sh <<- "EOF"
-
-#!/usr/bin/env bash
-
-IP=$(dig @resolver4.opendns.com myip.opendns.com +short -4)
-
-## Manually Add DDNS Script From Njalla User Account AFTER Install
-
-curl "https://...${IP}"
-
-EOF
-
-#
-
-mkdir /var/lib/external_ip
-
-cat > /var/lib/external_ip/external_ip.sh <<- "EOF"
-
-#!/usr/bin/env bash
-
-IP=$(dig @resolver4.opendns.com myip.opendns.com +short -4)
-
-echo "${IP}" > /var/lib/secrets/external_ip
-
-EOF
-
-#
-
-mkdir /var/lib/internal_ip
-
-cat > /var/lib/internal_ip/internal_ip.sh <<- "EOF"
-
-#!/usr/bin/env bash
-
-sudo echo -n $(ip route get 1.2.3.4 | awk '{print $7}') > /var/lib/secrets/internal_ip
-
-exit 0
-
-
-EOF
-
-#
-
-touch /etc/nixos/custom.nix
-
-cat > /etc/nixos/custom.nix <<- "EOF"
-
-{config, pkgs, lib, ...}:
-
-let
-  personalization = import ./personalization.nix;
-  
-  in
-{
-}
-
-EOF
-
-#
-
-mkdir /var/lib/agenix-secrets/
-
-cat > /var/lib/agenix-secrets/secrets.nix <<- "EOF"
-
-let
-
-  root = "placeholder" ;
-
-in
-
-{
-
-  "wordpressdb.age".publicKeys = [ root ];
-  
-  "matrixdb.age".publicKeys = [ root ];
-
-  "nextclouddb.age".publicKeys = [ root ];
-
-  "turn.age".publicKeys = [ root ];
-
-  "matrix_reg_secret.age".publicKeys = [ root ];
-
-}
-
-EOF
-
-#
-
-mkdir /var/lib/secrets
-mkdir /var/lib/secrets/vaultwarden
-
-touch /var/lib/secrets/nextclouddb
-touch /var/lib/secrets/wordpressdb
-touch /var/lib/secrets/matrixdb
-touch /var/lib/secrets/turn
-touch /var/lib/secrets/matrix_reg_secret
-touch /var/lib/secrets/main
-touch /var/lib/secrets/vaultwarden/vaultwarden.env
-touch /var/lib/secrets/external_ip
-touch /var/lib/secrets/internal_ip
-
-echo -n $(pwgen -s 17 -1) > /var/lib/secrets/nextclouddb 
-echo -n $(pwgen -s 17 -1) > /var/lib/secrets/wordpressdb 
-echo -n $(pwgen -s 17 -1) > /var/lib/secrets/matrixdb
-echo -n $(pwgen -s 17 -1) > /var/lib/secrets/turn
-echo -n $(pwgen -s 17 -1) > /var/lib/secrets/matrix_reg_secret
-echo -n $(pwgen -s 17 -1) > /var/lib/secrets/main
-echo -n ADMIN_TOKEN=$(openssl rand -base64 48
-) > /var/lib/secrets/vaultwarden/vaultwarden.env
-
-#
-
-mkdir -p /root/.ssh/agenix
-
-ssh-keygen -q -N "" -t ed25519 -f /root/.ssh/agenix/agenix-secret-keys
-
-sed -i -e "0,/root.*/{s::root = $(cat /root/.ssh/agenix/agenix-secret-keys.pub):};s:root@nixos::" /var/lib/agenix-secrets/secrets.nix
-
-sed -i 's:\(root =[[:blank:]]*\)\(.*\):\1"\2";:' /var/lib/agenix-secrets/secrets.nix
-
-#
-
-pushd /var/lib/agenix-secrets
-
-  echo -n $(cat /var/lib/secrets/wordpressdb) | EDITOR='cp /dev/stdin' nix run github:ryantm/agenix -- -e wordpressdb.age -i /root/.ssh/agenix/agenix-secret-keys
-
-  echo -n $(cat /var/lib/secrets/nextclouddb) | EDITOR='cp /dev/stdin' nix run github:ryantm/agenix -- -e nextclouddb.age -i /root/.ssh/agenix/agenix-secret-keys
-
-  echo -n $(cat /var/lib/secrets/matrixdb) | EDITOR='cp /dev/stdin' nix run github:ryantm/agenix -- -e matrixdb.age -i /root/.ssh/agenix/agenix-secret-keys
-
-  echo -n $(cat /var/lib/secrets/turn) | EDITOR='cp /dev/stdin' nix run github:ryantm/agenix -- -e turn.age -i /root/.ssh/agenix/agenix-secret-keys
-
-  echo -n $(cat /var/lib/secrets/matrix_reg_secret) | EDITOR='cp /dev/stdin' nix run github:ryantm/agenix -- -e matrix_reg_secret.age -i /root/.ssh/agenix/agenix-secret-keys
-
-popd
-
-
-#
-
-pushd /etc/nixos
-
-  nix flake update
-
-  nixos-rebuild switch --impure
-
-popd
-
-#
-
-chown root:root /var/lib/secrets/main -R
-
-chown root:root /var/lib/secrets/external_ip -R
-
-chown root:root /var/lib/secrets/internal_ip -R
-
-chown matrix-synapse:matrix-synapse /var/lib/secrets/matrix_reg_secret -R
-
-chown matrix-synapse:matrix-synapse /var/lib/secrets/matrixdb -R
-
-chown postgres:postgres /var/lib/secrets/nextclouddb -R
-
-chown turnserver:turnserver /var/lib/secrets/turn -R
-
-chown mysql:mysql /var/lib/secrets/wordpressdb -R
-
-chown vaultwarden:vaultwarden /var/lib/secrets/vaultwarden -R
-
-
-chmod 770 /var/lib/secrets/ -R
-
-#
-
-chown caddy:php /var/lib/domains -R
-
-chmod 770 /var/lib/domains -R
-
-#
-
-set -x
-
-wget -P /var/lib/www/downloadwp https://wordpress.org/latest.zip
-
-wget -P /var/lib/www/downloadnc https://download.nextcloud.com/server/releases/latest.zip
-
-unzip /var/lib/www/downloadwp/latest.zip -d /var/lib/www/
-
-unzip /var/lib/www/downloadnc/latest.zip -d /var/lib/www/
-
-rm -rf /var/lib/www/downloadwp
-
-rm -rf /var/lib/www/downloadnc
-
-chown caddy:php /var/lib/www -R
-
-chmod 770 /var/lib/www -R
-
-#
-
-mkdir /var/lib/nextcloud
-
-chown caddy:php /var/lib/nextcloud -R
-
-chmod 770 /var/lib/nextcloud -R
-
-#
-
-mkdir /var/lib/coturn
-
-chown turnserver:turnserver /var/lib/coturn -R
-
-chmod 770 /var/lib/coturn -R
-
-#
-
-rm -rf /root/sp.sh
-
-#
-
-chown bitcoin:bitcoin /run/media/Second_Drive/BTCEcoandBackup/Bitcoin_Node -R
-
-chmod 770 /run/media/Second_Drive/BTCEcoandBackup/Bitcoin_Node -R
-
-chown electrs:electrs /run/media/Second_Drive/BTCEcoandBackup/Electrs_Data -R
-
-chmod 770 /run/media/Second_Drive/BTCEcoandBackup/Electrs_Data -R
-
-#
-
-mkdir -p /home/free/Downloads
-
-pushd /home/free/Downloads
-
-  wget https://git.sovransystems.com/Sovran_Systems/Software/raw/branch/main/Sovran_SystemsOS_Resetter/sovran_systemsOS_resetter_local_installer/sovran_systemsOS_resetter_install.sh
-
-  bash sovran_systemsOS_resetter_install.sh
-
-popd
-
-#
-
-pushd /home/free/Downloads
-
-  wget https://git.sovransystems.com/Sovran_Systems/Software/raw/branch/main/Sovran_SystemsOS_Updater/sovran_systemsOS_updater_local_installer/sovran_systemsOS_updater_install.sh
-
-  bash sovran_systemsOS_updater_install.sh
-
-popd
-
-#
-
-mkdir -p /home/free/Pictures
-
-pushd /home/free/Pictures
-
-  wget https://git.sovransystems.com/Sovran_Systems/Sovran_SystemsOS/raw/branch/main/for_new_sovran_pros/Wallpaper_Dark_Wide.png
-
-popd
-
-chown free:users /home/free -R
-
-chmod 700 /home/free -R
-
-#
-
-pushd /home/free/Downloads
-
-  sudo -u free wget https://git.sovransystems.com/Sovran_Systems/Sovran_SystemsOS/raw/branch/main/for_new_sovran_pros/Sovran_SystemsOS-Desktop
-
-popd
-
-#
-
-wp=$(cat /var/lib/secrets/wordpressdb)
-
-sudo mysql -u root -e "SET PASSWORD FOR wpusr@localhost = PASSWORD('${wp}')";
-
-#
-
-mkdir /root/.ssh
-
-mkdir -p /home/free/.ssh
-
-chown free:users /home/free/.ssh -R
-
-touch /root/.ssh/authorized_keys
-
-sudo -u free ssh-keygen -q -N "gosovransystems" -t ed25519 -f /home/free/.ssh/factory_login
-
-chmod 700 /home/free/.ssh -R
-
-echo "$(cat /home/free/.ssh/factory_login.pub)" >> /root/.ssh/authorized_keys
-
-#
-
-sudo matrix-synapse-register_new_matrix_user -u admin -p a -a
-
-sudo echo "no" | matrix-synapse-register_new_matrix_user -u test -p a
-
-#
-
-# This key is removed before shipping as it allows Sovran Systems to access the machine via root remotely. 
-
-echo "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCQa3DEhx9RUtV0WopfFuL3cjQt2fBzp5wOg/hkj0FXyZXpp+F47Td1B9mKMNvucINaMQB6T0mW6c70fyT92gZO2OqCff6aeWovtTd9ynRgtJbny/qvVSShDbJcR7nSMeVPoDRaYs18fuA50guYnfoYAkaXyXPmVQ0uK84HwIB5j8gq6GMji7vv+TTNhDP8qOceUzt1DYPo9Z2JSnkFey+Z/fmxWJGsu+MSrA0/PPENEmf6L0ZSgxnu3gHEtdyX2hrFzjE16y3G0wSQzbWJb8MJO0KRSMcyvz6AzOSW4RYdXR1c+4JiciKRdnIAYYHfg7tnZT9wC9AzHjdEbmmrlF05mtjXKnxbPgGY0tlRSYo7B5E0k2zfi30MkIJ6kIE9TMM2z/+1KstrQN4OKBTGomBTYQaRQCT6dGpRTR+b8lOvUcnCSuat1sUC2M2VGFcBbDbKD0FyXy/vOk1pgA4I7GoESWQClnl+ntRg8HrW4oVTX2KpqR2CXjlF956HJGqHW6k= free@nixos" >> /root/.ssh/authorized_keys
-
-#
-
-pushd /etc/nixos
-
-  nix flake update
-
-  nixos-rebuild switch --impure
-
-popd
-
-#
-
-echo "root:$(cat /var/lib/secrets/main)" | chpasswd -c SHA512
-
-echo "free:a" | chpasswd -c SHA512
-
-#
-
-chown free:users /home/free -R
-
-chmod 700 /home/free -R
-
-#
-
-echo -e "${GREEN}All Finished! Please Reboot then Enjoy your New Sovran Pro!"
@@ -0,0 +1,12 @@
+{ config, pkgs, lib, ... }:
+
+let
+  theme = pkgs.callPackage ./plymouth-theme.nix {};
+in
+{
+  boot.plymouth.enable = true;
+  boot.plymouth.theme = "sovran";
+  boot.plymouth.themePackages = [ theme ];
+  boot.kernelParams = [ "quiet" "splash" ];
+  boot.initrd.systemd.enable = true;
+}
@@ -0,0 +1,80 @@
+{ config, pkgs, lib, modulesPath, ... }:
+
+let
+  sovranSource = builtins.path { path = ../.; name = "sovran-systemsos"; };
+
+  pythonEnv = pkgs.python3.withPackages (ps: [ ps.pygobject3 ps.pycairo ]);
+
+  installerPy = pkgs.writeShellScriptBin "sovran-install" ''
+    export GI_TYPELIB_PATH=${pkgs.gtk4}/lib/girepository-1.0:${pkgs.libadwaita}/lib/girepository-1.0:${pkgs.glib}/lib/girepository-1.0:${pkgs.pango.out}/lib/girepository-1.0:${pkgs.gdk-pixbuf}/lib/girepository-1.0:${pkgs.graphene}/lib/girepository-1.0:${pkgs.cairo}/lib/girepository-1.0:${pkgs.harfbuzz}/lib/girepository-1.0:${pkgs.gobject-introspection}/lib/girepository-1.0
+export LD_LIBRARY_PATH=${pkgs.gtk4}/lib:${pkgs.libadwaita}/lib:${pkgs.glib}/lib:${pkgs.pango.out}/lib:${pkgs.gdk-pixbuf}/lib:${pkgs.graphene}/lib:${pkgs.cairo}/lib:${pkgs.harfbuzz}/lib
+    export GDK_PIXBUF_MODULE_FILE="${pkgs.gdk-pixbuf}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache"
+    export XDG_DATA_DIRS="${pkgs.gsettings-desktop-schemas}/share/gsettings-schemas/${pkgs.gsettings-desktop-schemas.name}:${pkgs.gtk4}/share:${pkgs.libadwaita}/share:${pkgs.adwaita-icon-theme}/share:${pkgs.hicolor-icon-theme}/share:$XDG_DATA_DIRS"
+    exec ${pythonEnv}/bin/python3 /etc/sovran/installer.py
+  '';
+in
+{
+  imports = [
+    "${modulesPath}/installer/cd-dvd/installation-cd-graphical-gnome.nix"
+    ./branding.nix
+  ];
+
+  image.baseName = lib.mkForce "Sovran_SystemsOS";
+  isoImage.splashImage = ./assets/splash-logo.png;
+
+  services.gnome.gnome-initial-setup.enable = false;
+  environment.gnome.excludePackages = with pkgs; [ gnome-tour gnome-user-docs ];
+
+  security.sudo.wheelNeedsPassword = false;
+  users.users.free = {
+    isNormalUser = true;
+    description = "free";
+    extraGroups = [ "networkmanager" "wheel" ];
+    initialPassword = "free";
+  };
+
+  services.displayManager.autoLogin.enable = true;
+  services.displayManager.autoLogin.user = lib.mkForce "free";
+  
+  nix-bitcoin.generateSecrets = lib.mkDefault true;
+ 
+  nix.settings.experimental-features = [ "nix-command" "flakes" ];
+
+  environment.systemPackages = with pkgs; [
+    installerPy
+    pythonEnv
+    gtk4
+    libadwaita
+    gobject-introspection
+    glib
+    pango
+    gdk-pixbuf
+    graphene
+    cairo
+    harfbuzz
+    gsettings-desktop-schemas
+    adwaita-icon-theme
+    util-linux
+    disko
+    parted
+    dosfstools
+    e2fsprogs
+    gptfdisk
+    nixos-install-tools
+    git
+    curl
+  ];
+
+  environment.etc."sovran/logo.png".source = ./assets/splash-logo.png;
+  environment.etc."sovran/flake".source = sovranSource;
+  environment.etc."sovran/installer.py".source = ./installer.py;
+
+  environment.etc."xdg/autostart/sovran-installer.desktop".text = ''
+[Desktop Entry]
+Type=Application
+Name=Sovran Guided Installer
+Exec=${installerPy}/bin/sovran-install
+Terminal=false
+X-GNOME-Autostart-enabled=true
+'';
+}
@@ -0,0 +1,5 @@
+{ config, pkgs, lib, ... }:
+
+{
+  imports = [ ./common.nix ];
+}
@@ -0,0 +1,62 @@
+{ device ? "/dev/sda", dataDevice ? "", ... }:
+
+{
+  disko.devices = {
+    disk = {
+      main = {
+        type = "disk";
+        device = builtins.toString device;
+        content = {
+          type = "gpt";
+          partitions = {
+            ESP = {
+              priority = 1;
+              name = "ESP";
+              start = "1M";
+              end = "512M";
+              type = "EF00";
+              content = {
+                type = "filesystem";
+                format = "vfat";
+                mountpoint = "/boot/efi";
+                mountOptions = [ "umask=0077" "defaults" ];
+              };
+            };
+            root = {
+              name = "root";
+              start = "512M";
+              end = "100%";
+              content = {
+                type = "filesystem";
+                format = "ext4";
+                mountpoint = "/";
+                extraArgs = [ "-L" "sovran_systemsos" ];
+              };
+            };
+          };
+        };
+      };
+    } // (if dataDevice != "" then {
+      data = {
+        type = "disk";
+        device = builtins.toString dataDevice;
+        content = {
+          type = "gpt";
+          partitions = {
+            primary = {
+              name = "primary";
+              start = "1M";
+              end = "100%";
+              content = {
+                type = "filesystem";
+                format = "ext4";
+                mountpoint = "/run/media/Second_Drive";
+                extraArgs = [ "-L" "BTCEcoandBackup" ];
+              };
+            };
+          };
+        };
+      };
+    } else {});
+  };
+}
@@ -0,0 +1,852 @@
+#!/usr/bin/env python3
+import gi
+gi.require_version("Gtk", "4.0")
+gi.require_version("Adw", "1")
+from gi.repository import Gtk, Adw, GLib
+import atexit
+import os
+import subprocess
+import sys
+import threading
+import time
+
+LOGO = "/etc/sovran/logo.png"
+LOG = "/tmp/sovran-install.log"
+FLAKE = "/etc/sovran/flake"
+
+try:
+    logfile = open(LOG, "a")
+    atexit.register(logfile.close)
+except OSError:
+    logfile = None
+
+def log(msg):
+    if logfile is not None:
+        logfile.write(msg + "\n")
+        logfile.flush()
+    else:
+        print(msg, file=sys.stderr)
+
+def run(cmd):
+    log(f"$ {' '.join(cmd)}")
+    result = subprocess.run(cmd, capture_output=True, text=True)
+    log(result.stdout)
+    if result.returncode != 0:
+        log(result.stderr)
+        raise RuntimeError(result.stderr.strip() or f"Command failed: {' '.join(cmd)}")
+    return result.stdout.strip()
+
+def run_stream(cmd, buf):
+    log(f"$ {' '.join(cmd)}")
+    proc = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, text=True)
+    for line in proc.stdout:
+        log(line.rstrip())
+        GLib.idle_add(append_text, buf, line)
+    proc.wait()
+    if proc.returncode != 0:
+        raise RuntimeError(f"Command failed (exit {proc.returncode}). See {LOG}")
+
+def append_text(buf, text):
+    buf.insert(buf.get_end_iter(), text)
+    return False
+
+def human_size(nbytes):
+    for unit in ["B", "KB", "MB", "GB", "TB"]:
+        if nbytes < 1024:
+            return f"{nbytes:.1f} {unit}"
+        nbytes /= 1024
+    return f"{nbytes:.1f} PB"
+
+def check_internet():
+    """Return True if the machine can reach the internet."""
+    try:
+        result = subprocess.run(
+            ["ping", "-c", "1", "-W", "5", "nixos.org"],
+            capture_output=True, text=True
+        )
+        if result.returncode == 0:
+            return True
+    except Exception:
+        pass
+    # Fallback: try a second host in case DNS for nixos.org is down
+    try:
+        result = subprocess.run(
+            ["ping", "-c", "1", "-W", "5", "1.1.1.1"],
+            capture_output=True, text=True
+        )
+        return result.returncode == 0
+    except Exception:
+        return False
+
+def symbolic_icon(name):
+    """Create a crisp symbolic icon suitable for use as an ActionRow prefix."""
+    icon = Gtk.Image.new_from_icon_name(name)
+    icon.set_icon_size(Gtk.IconSize.LARGE)
+    icon.add_css_class("dim-label")
+    return icon
+
+
+# ── Application ────────────────────────────────────────────────────────────────
+
+class InstallerApp(Adw.Application):
+    def __init__(self):
+        super().__init__(application_id="com.sovransystems.installer")
+        self.connect("activate", self.on_activate)
+
+    def on_activate(self, app):
+        self.win = InstallerWindow(application=app)
+        self.win.present()
+
+
+# ── Main Window ────────────────────────────────────────────────────────────────
+
+class InstallerWindow(Adw.ApplicationWindow):
+    def __init__(self, **kwargs):
+        super().__init__(**kwargs)
+        self.set_title("Sovran_SystemsOS Installer")
+        self.set_default_size(820, 600)
+        self.set_resizable(False)
+
+        self.role = None
+        self.boot_disk = None
+        self.boot_size = None
+        self.data_disk = None
+        self.data_size = None
+
+        # Root navigation view
+        self.nav = Adw.NavigationView()
+        self.set_content(self.nav)
+
+        # Check for internet before anything else
+        if check_internet():
+            self.push_welcome()
+        else:
+            self.push_no_internet()
+
+    # ── Navigation helpers ─────────────────────────────────────────────────
+
+    def push_page(self, title, child, show_back=False):
+        page = Adw.NavigationPage(title=title, tag=title)
+        toolbar = Adw.ToolbarView()
+
+        header = Adw.HeaderBar()
+        header.set_show_end_title_buttons(False)
+        if not show_back:
+            header.set_show_start_title_buttons(False)
+        toolbar.add_top_bar(header)
+        toolbar.set_content(child)
+
+        page.set_child(toolbar)
+        self.nav.push(page)
+
+    def replace_page(self, title, child):
+        # Pop all and push fresh
+        while self.nav.get_visible_page() is not None:
+            try:
+                self.nav.pop()
+            except Exception:
+                break
+        self.push_page(title, child)
+
+    # ── Shared widgets ───────────────��─────────────────────────────────────
+
+    def make_scrolled_log(self):
+        sw = Gtk.ScrolledWindow()
+        sw.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC)
+        sw.set_vexpand(True)
+
+        tv = Gtk.TextView()
+        tv.set_editable(False)
+        tv.set_cursor_visible(False)
+        tv.set_wrap_mode(Gtk.WrapMode.WORD_CHAR)
+        tv.set_monospace(True)
+        tv.add_css_class("log-view")
+        buf = tv.get_buffer()
+
+        def on_changed(b):
+            GLib.idle_add(lambda: sw.get_vadjustment().set_value(
+                sw.get_vadjustment().get_upper()
+            ))
+        buf.connect("changed", on_changed)
+
+        sw.set_child(tv)
+        return sw, buf
+
+    def nav_row(self, back_label=None, back_cb=None, next_label="Continue", next_cb=None):
+        box = Gtk.Box(orientation=Gtk.Orientation.HORIZONTAL, spacing=8)
+        box.set_margin_top(12)
+        box.set_margin_bottom(24)
+        box.set_margin_start(40)
+        box.set_margin_end(40)
+
+        if back_label and back_cb:
+            btn = Gtk.Button(label=back_label)
+            btn.connect("clicked", back_cb)
+            box.append(btn)
+
+        spacer = Gtk.Label()
+        spacer.set_hexpand(True)
+        box.append(spacer)
+
+        if next_cb:
+            btn = Gtk.Button(label=next_label)
+            btn.add_css_class("suggested-action")
+            btn.add_css_class("pill")
+            btn.connect("clicked", next_cb)
+            box.append(btn)
+
+        return box
+
+    # ── No Internet Screen ─────────────────────────────────────────────────
+
+    def push_no_internet(self):
+        outer = Gtk.Box(orientation=Gtk.Orientation.VERTICAL, spacing=0)
+
+        status = Adw.StatusPage()
+        status.set_title("No Internet Connection")
+        status.set_description(
+            "An active internet connection is required to install Sovran_SystemsOS.\n\n"
+            "Please connect an Ethernet cable or configure Wi-Fi,\n"
+            "then press Retry."
+        )
+        status.set_icon_name("network-offline-symbolic")
+        status.set_vexpand(True)
+        outer.append(status)
+
+        btn_box = Gtk.Box(orientation=Gtk.Orientation.HORIZONTAL, spacing=12)
+        btn_box.set_halign(Gtk.Align.CENTER)
+        btn_box.set_margin_bottom(32)
+
+        retry_btn = Gtk.Button(label="Retry")
+        retry_btn.add_css_class("suggested-action")
+        retry_btn.add_css_class("pill")
+        retry_btn.connect("clicked", self.on_retry_internet)
+        btn_box.append(retry_btn)
+
+        outer.append(btn_box)
+
+        self.push_page("No Internet", outer)
+
+    def on_retry_internet(self, btn):
+        if check_internet():
+            # Pop the no-internet page and proceed to welcome
+            try:
+                self.nav.pop()
+            except Exception:
+                pass
+            self.push_welcome()
+        else:
+            dlg = Adw.MessageDialog()
+            dlg.set_transient_for(self)
+            dlg.set_heading("Still Offline")
+            dlg.set_body(
+                "Could not reach the internet.\n"
+                "Please check your network connection and try again."
+            )
+            dlg.add_response("ok", "OK")
+            dlg.present()
+
+    # ── Step 1: Welcome & Role ─────────────────────────────────────────────
+
+    def push_welcome(self):
+        outer = Gtk.Box(orientation=Gtk.Orientation.VERTICAL, spacing=0)
+
+        # Hero
+        hero = Gtk.Box(orientation=Gtk.Orientation.VERTICAL, spacing=8)
+        hero.set_margin_top(32)
+        hero.set_margin_bottom(24)
+        hero.set_halign(Gtk.Align.CENTER)
+
+        if os.path.exists(LOGO):
+            try:
+                img = Gtk.Image.new_from_file(LOGO)
+                img.set_pixel_size(480)
+                hero.append(img)
+            except Exception:
+                pass
+
+        title = Gtk.Label()
+        title.set_markup("<span size='xx-large' weight='heavy'>Sovran Systems</span>")
+        hero.append(title)
+
+        sub = Gtk.Label()
+        sub.set_markup("<span size='large' style='italic' foreground='#888888'>Be Digitally Sovereign</span>")
+        hero.append(sub)
+
+        outer.append(hero)
+
+        sep = Gtk.Separator()
+        sep.set_margin_start(40)
+        sep.set_margin_end(40)
+        outer.append(sep)
+
+        # Role label
+        role_lbl = Gtk.Label()
+        role_lbl.set_markup("<span size='medium' weight='bold'>Choose your installation type:</span>")
+        role_lbl.set_halign(Gtk.Align.START)
+        role_lbl.set_margin_start(40)
+        role_lbl.set_margin_top(20)
+        role_lbl.set_margin_bottom(8)
+        outer.append(role_lbl)
+
+        # Role cards
+        roles = [
+            ("Server + Desktop",
+             "Full sovereign experience: beautiful desktop, your own cloud, secure messaging, Bitcoin node, and more.",
+             "Server+Desktop"),
+            ("Desktop Only",
+             "A beautiful, easy-to-use desktop without the background server applications.",
+             "Desktop Only"),
+            ("Node Only",
+             "Full Bitcoin node with Lightning and non-KYC buying and selling. No desktop.",
+             "Node (Bitcoin-only)"),
+        ]
+
+        self._role_radios = []
+        radio_group = None
+        cards_box = Gtk.Box(orientation=Gtk.Orientation.VERTICAL, spacing=8)
+        cards_box.set_margin_start(40)
+        cards_box.set_margin_end(40)
+
+        for label, desc, key in roles:
+            card = Adw.ActionRow()
+            card.set_title(label)
+            card.set_subtitle(desc)
+
+            radio = Gtk.CheckButton()
+            radio.set_name(key)
+            if radio_group is None:
+                radio_group = radio
+                radio.set_active(True)
+            else:
+                radio.set_group(radio_group)
+
+            card.add_prefix(radio)
+            card.set_activatable_widget(radio)
+            self._role_radios.append(radio)
+            cards_box.append(card)
+
+        outer.append(cards_box)
+
+        outer.append(Gtk.Label(label="", vexpand=True))
+        outer.append(self.nav_row(
+            next_label="Next  →",
+            next_cb=self.on_role_next
+        ))
+
+        self.push_page("Welcome to Sovran_SystemsOS Installer", outer)
+
+    def on_role_next(self, btn):
+        for radio in self._role_radios:
+            if radio.get_active():
+                self.role = radio.get_name()
+                break
+        self.push_port_requirements()
+
+    # ── Step 1b: Port Requirements Notice ─────────────────────────────────
+
+    def push_port_requirements(self):
+        """Inform the user about required router/firewall ports before install."""
+        outer = Gtk.Box(orientation=Gtk.Orientation.VERTICAL, spacing=0)
+
+        # Detect internal IP at install time
+        internal_ip = "this machine's LAN IP"
+        try:
+            import subprocess as _sp
+            _r = _sp.run(["hostname", "-I"], capture_output=True, text=True, timeout=5)
+            if _r.returncode == 0:
+                _parts = _r.stdout.strip().split()
+                if _parts:
+                    internal_ip = _parts[0]
+        except Exception:
+            pass
+
+        # Warning banner
+        banner = Adw.Banner()
+        banner.set_title(
+            "⚠  Port Forwarding Setup Required — configure your router before install"
+        )
+        banner.set_revealed(True)
+        banner.set_margin_top(16)
+        banner.set_margin_start(40)
+        banner.set_margin_end(40)
+        outer.append(banner)
+
+        intro = Gtk.Label()
+        intro.set_markup(
+            "<span foreground='#a6adc8'>"
+            "Many Sovran_SystemsOS features require <b>port forwarding</b> to be configured "
+            "in your router's admin panel. This means telling your router to forward "
+            "specific ports to <b>this machine's internal LAN IP</b>.\n\n"
+            "Services like Element Video/Audio Calling and Matrix Federation "
+            "<b>will not work for clients outside your LAN</b> unless these ports are "
+            "forwarded to this machine."
+            "</span>"
+        )
+        intro.set_wrap(True)
+        intro.set_justify(Gtk.Justification.FILL)
+        intro.set_margin_top(14)
+        intro.set_margin_start(40)
+        intro.set_margin_end(40)
+        outer.append(intro)
+
+        ip_label = Gtk.Label()
+        ip_label.set_markup(
+            f"<span foreground='#89b4fa' font_desc='monospace'>"
+            f"  Forward ports to this machine's internal IP:  <b>{internal_ip}</b>"
+            f"</span>"
+        )
+        ip_label.set_margin_top(10)
+        ip_label.set_margin_start(40)
+        ip_label.set_margin_end(40)
+        outer.append(ip_label)
+
+        sw = Gtk.ScrolledWindow()
+        sw.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC)
+        sw.set_vexpand(True)
+        sw.set_margin_start(40)
+        sw.set_margin_end(40)
+        sw.set_margin_top(12)
+        sw.set_margin_bottom(8)
+
+        ports_box = Gtk.Box(orientation=Gtk.Orientation.VERTICAL, spacing=12)
+
+        port_sections = [
+            (
+                "🌐  Web / HTTPS  (all domain-based services)",
+                [("80", "TCP", "HTTP (redirects to HTTPS)"),
+                 ("443", "TCP", "HTTPS")],
+            ),
+            (
+                "💬  Matrix Federation  (Matrix-Synapse)",
+                [("8448", "TCP", "Server-to-server federation")],
+            ),
+            (
+                "🎥  Element Video & Audio Calling  (LiveKit / Element-call)",
+                [("7881",         "TCP",     "LiveKit WebRTC signalling"),
+                 ("7882-7894",    "UDP",     "LiveKit media streams"),
+                 ("5349",         "TCP",     "TURN over TLS"),
+                 ("3478",         "UDP",     "TURN (STUN / relay)"),
+                 ("30000-40000",  "TCP/UDP", "TURN relay (WebRTC media)")],
+            ),
+            (
+                "🖥  Remote SSH  (optional — only if you want WAN SSH access)",
+                [("22", "TCP", "SSH")],
+            ),
+        ]
+
+        for section_title, rows in port_sections:
+            group = Adw.PreferencesGroup()
+            group.set_title(section_title)
+
+            for port, proto, desc in rows:
+                row = Adw.ActionRow()
+                row.set_title(f"Port {port}  ({proto})")
+                row.set_subtitle(desc)
+                group.add(row)
+
+            ports_box.append(group)
+
+        note = Gtk.Label()
+        note.set_markup(
+            "<span foreground='#6c7086' size='small'>"
+            "ℹ  In your router's admin panel (usually at 192.168.1.1), find the "
+            "\"<b>Port Forwarding</b>\" section and add a rule for each port above with "
+            "the destination set to <b>this machine's internal IP</b>.  "
+            "These ports only need to be forwarded to this specific machine — "
+            "this does <b>NOT</b> expose your entire network.\n"
+            "To verify forwarding is working, test from a device on a different network "
+            "(e.g. a phone on mobile data) or check your router's port forwarding page."
+            "</span>"
+        )
+        note.set_wrap(True)
+        note.set_justify(Gtk.Justification.FILL)
+        note.set_margin_top(8)
+        ports_box.append(note)
+
+        sw.set_child(ports_box)
+        outer.append(sw)
+
+        outer.append(self.nav_row(
+            back_label="←  Back",
+            back_cb=lambda b: self.nav.pop(),
+            next_label="I Understand  →",
+            next_cb=lambda b: self.push_disk_confirm(),
+        ))
+
+        self.push_page("Network Port Requirements", outer, show_back=True)
+
+    # ── Step 2: Disk Confirm ───────────────────────────────────────────────
+
+    def push_disk_confirm(self):
+        try:
+            raw = run(["lsblk", "-b", "-dno", "NAME,SIZE,TYPE,RO,TRAN", "-e", "7,11"])
+        except Exception as e:
+            self.show_error(str(e))
+            return
+
+        disks = []
+        for line in raw.splitlines():
+            parts = line.split()
+            if len(parts) >= 4 and parts[2] == "disk" and parts[3] == "0":
+                tran = parts[4] if len(parts) >= 5 else ""
+                if tran != "usb":
+                    disks.append((parts[0], int(parts[1])))
+
+        if not disks:
+            self.show_error("No valid internal drives found. USB drives are excluded.")
+            return
+
+        disks.sort(key=lambda x: x[1])
+        self.boot_disk, self.boot_size = disks[0]
+        self.data_disk, self.data_size = None, None
+
+        BYTES_2TB = 2 * 1024 ** 4
+        if len(disks) >= 2:
+            d, s = disks[-1]
+            if s >= BYTES_2TB:
+                self.data_disk, self.data_size = d, s
+
+        outer = Gtk.Box(orientation=Gtk.Orientation.VERTICAL, spacing=0)
+
+        # Disk info group
+        disk_group = Adw.PreferencesGroup()
+        disk_group.set_title("Drives to be erased")
+        disk_group.set_margin_top(24)
+        disk_group.set_margin_start(40)
+        disk_group.set_margin_end(40)
+
+        boot_row = Adw.ActionRow()
+        boot_row.set_title("Boot Disk")
+        boot_row.set_subtitle(f"/dev/{self.boot_disk}  —  {human_size(self.boot_size)}")
+        boot_row.add_prefix(symbolic_icon("drive-harddisk-symbolic"))
+        disk_group.add(boot_row)
+
+        if self.data_disk:
+            data_row = Adw.ActionRow()
+            data_row.set_title("Data Disk")
+            data_row.set_subtitle(f"/dev/{self.data_disk}  —  {human_size(self.data_size)}")
+            data_row.add_prefix(symbolic_icon("drive-harddisk-symbolic"))
+            disk_group.add(data_row)
+        else:
+            no_row = Adw.ActionRow()
+            no_row.set_title("Data Disk")
+            no_row.set_subtitle("None detected  (requires 2 TB or larger)")
+            no_row.add_prefix(symbolic_icon("drive-harddisk-symbolic"))
+            disk_group.add(no_row)
+
+        outer.append(disk_group)
+
+        # Warning banner
+        banner = Adw.Banner()
+        banner.set_title("⚠  All data on the above disk(s) will be permanently destroyed.")
+        banner.set_revealed(True)
+        banner.set_margin_top(16)
+        banner.set_margin_start(40)
+        banner.set_margin_end(40)
+        outer.append(banner)
+
+        # Confirm entry group
+        entry_group = Adw.PreferencesGroup()
+        entry_group.set_title("Type  ERASE  to confirm")
+        entry_group.set_margin_top(16)
+        entry_group.set_margin_start(40)
+        entry_group.set_margin_end(40)
+
+        entry_row = Adw.EntryRow()
+        entry_row.set_title("Confirmation")
+        self._confirm_entry = entry_row
+        entry_group.add(entry_row)
+
+        outer.append(entry_group)
+        outer.append(Gtk.Label(label="", vexpand=True))
+        outer.append(self.nav_row(
+            back_label="←  Back",
+            back_cb=lambda b: self.nav.pop(),
+            next_label="Begin Installation",
+            next_cb=self.on_confirm_next
+        ))
+
+        self.push_page("Confirm Installation", outer, show_back=True)
+
+    def on_confirm_next(self, btn):
+        if self._confirm_entry.get_text().strip() != "ERASE":
+            dlg = Adw.MessageDialog()
+            dlg.set_transient_for(self)
+            dlg.set_heading("Confirmation Required")
+            dlg.set_body("You must type ERASE exactly to proceed.")
+            dlg.add_response("ok", "OK")
+            dlg.present()
+            return
+        self.push_progress(
+            "Preparing Drives",
+            "Partitioning and formatting your drives...",
+            self.do_partition
+        )
+
+    # ── Step 3 & 5: Progress ──────────────────────────────────────────────
+
+    def push_progress(self, title, subtitle, worker_fn):
+        outer = Gtk.Box(orientation=Gtk.Orientation.VERTICAL, spacing=0)
+
+        status = Adw.StatusPage()
+        status.set_title(title)
+        status.set_description(subtitle)
+        status.set_icon_name("emblem-synchronizing-symbolic")
+        status.set_vexpand(False)
+        outer.append(status)
+
+        spinner = Gtk.Spinner()
+        spinner.set_size_request(32, 32)
+        spinner.set_halign(Gtk.Align.CENTER)
+        spinner.start()
+        outer.append(spinner)
+
+        sw, buf = self.make_scrolled_log()
+        sw.set_margin_start(40)
+        sw.set_margin_end(40)
+        sw.set_margin_top(12)
+        sw.set_margin_bottom(12)
+        sw.set_vexpand(True)
+        outer.append(sw)
+
+        self.push_page(title, outer)
+
+        def thread_fn():
+            try:
+                worker_fn(buf)
+            except Exception as e:
+                GLib.idle_add(self.show_error, str(e))
+
+        threading.Thread(target=thread_fn, daemon=True).start()
+
+    # ── Worker: partition ─────────────────────────────────────────────────
+
+    def do_partition(self, buf):
+        boot_path = f"/dev/{self.boot_disk}"
+
+        # ── Wipe disk(s) to clear stale GPT/MBR data before disko ──
+        GLib.idle_add(append_text, buf, "=== Wiping disk(s) ===\n")
+
+        run_stream(["sudo", "sgdisk", "--zap-all", boot_path], buf)
+        run_stream(["sudo", "wipefs", "--all", "--force", boot_path], buf)
+
+        if self.data_disk:
+            data_path = f"/dev/{self.data_disk}"
+            run_stream(["sudo", "sgdisk", "--zap-all", data_path], buf)
+            run_stream(["sudo", "wipefs", "--all", "--force", data_path], buf)
+
+        # Inform the kernel of the wiped partition tables
+        run_stream(["sudo", "partprobe", boot_path], buf)
+        if self.data_disk:
+            run_stream(["sudo", "partprobe", data_path], buf)
+
+        # Short settle so the kernel finishes re-reading
+        time.sleep(2)
+
+        # ── Now run disko on a clean disk ──
+        GLib.idle_add(append_text, buf, "\n=== Partitioning drives ===\n")
+        cmd = [
+            "sudo", "disko", "--mode", "disko",
+            f"{FLAKE}/iso/disko.nix",
+            "--arg", "device", f'"{boot_path}"'
+        ]
+        if self.data_disk:
+            cmd += ["--arg", "dataDevice", f'"/dev/{self.data_disk}"']
+        run_stream(cmd, buf)
+
+        GLib.idle_add(append_text, buf, "\n=== Generating hardware config ===\n")
+        run_stream(["sudo", "nixos-generate-config", "--root", "/mnt"], buf)
+
+        GLib.idle_add(append_text, buf, "\n=== Copying flake to /mnt ===\n")
+        run(["sudo", "cp", "/mnt/etc/nixos/hardware-configuration.nix", "/tmp/hardware-configuration.nix"])
+        run(["sudo", "rm", "-rf", "/mnt/etc/nixos/"])
+        run(["sudo", "mkdir", "-p", "/mnt/etc/nixos"])
+        run(["sudo", "cp", "-a", f"{FLAKE}/.", "/mnt/etc/nixos/"])
+        run(["sudo", "cp", "/tmp/hardware-configuration.nix", "/mnt/etc/nixos/hardware-configuration.nix"])
+
+        GLib.idle_add(append_text, buf, "\n=== Writing role config ===\n")
+        self.write_role_state()
+        GLib.idle_add(append_text, buf, "Done.\n")
+
+        GLib.idle_add(self.push_ready)
+
+    def write_role_state(self):
+        is_server = str(self.role == "Server+Desktop").lower()
+        is_desktop = str(self.role == "Desktop Only").lower()
+        is_node = str(self.role == "Node (Bitcoin-only)").lower()
+        content = f"""# THIS FILE IS AUTO-GENERATED BY THE INSTALLER. DO NOT EDIT.
+{{ config, lib, ... }}:
+{{
+  sovran_systemsOS.roles.server_plus_desktop = lib.mkDefault {is_server};
+  sovran_systemsOS.roles.desktop = lib.mkDefault {is_desktop};
+  sovran_systemsOS.roles.node = lib.mkDefault {is_node};
+}}
+"""
+        proc = subprocess.run(
+            ["sudo", "tee", "/mnt/etc/nixos/role-state.nix"],
+            input=content, text=True, capture_output=True
+        )
+        log(proc.stdout)
+        if proc.returncode != 0:
+            raise RuntimeError(f"Failed to write role-state.nix: {proc.stderr}")
+        run(["sudo", "cp", "/mnt/etc/nixos/custom.template.nix", "/mnt/etc/nixos/custom.nix"])
+
+    # ── Step 4: Ready to install ────────���──────────────────────────────────
+
+    def push_ready(self):
+        outer = Gtk.Box(orientation=Gtk.Orientation.VERTICAL, spacing=0)
+
+        status = Adw.StatusPage()
+        status.set_title("Drives Ready")
+        status.set_description("Your drives have been partitioned successfully.")
+        status.set_icon_name("emblem-ok-symbolic")
+        status.set_vexpand(True)
+
+        details = Adw.PreferencesGroup()
+        details.set_margin_start(40)
+        details.set_margin_end(40)
+
+        role_row = Adw.ActionRow()
+        role_row.set_title("Installation Type")
+        role_row.set_subtitle(self.role)
+        details.add(role_row)
+
+        boot_row = Adw.ActionRow()
+        boot_row.set_title("Boot Disk")
+        boot_row.set_subtitle(f"/dev/{self.boot_disk}  —  {human_size(self.boot_size)}")
+        details.add(boot_row)
+
+        if self.data_disk:
+            data_row = Adw.ActionRow()
+            data_row.set_title("Data Disk")
+            data_row.set_subtitle(f"/dev/{self.data_disk}  —  {human_size(self.data_size)}")
+            details.add(data_row)
+
+        status_box = Gtk.Box(orientation=Gtk.Orientation.VERTICAL, spacing=16)
+        status_box.append(status)
+        status_box.append(details)
+
+        note = Gtk.Label()
+        note.set_markup(
+            "<span foreground='#888888'>The next step will install the full system.\n"
+            "This may take <b>20–40 minutes</b> depending on your internet speed.\n"
+            "Do not turn off your computer.</span>"
+        )
+        note.set_justify(Gtk.Justification.CENTER)
+        note.set_wrap(True)
+        note.set_margin_top(16)
+        note.set_margin_start(40)
+        note.set_margin_end(40)
+        status_box.append(note)
+
+        outer.append(status_box)
+        outer.append(self.nav_row(
+            next_label="Install Now",
+            next_cb=lambda b: self.push_progress(
+                "Installing Sovran SystemsOS",
+                "Building and installing your system. Please wait...",
+                self.do_install
+            )
+        ))
+
+        self.push_page("Ready to Install", outer)
+        return False
+
+    # ── Worker: install ───────────────────────────────────────────────────
+
+    def do_install(self, buf):
+        GLib.idle_add(append_text, buf, "=== Running nixos-install ===\n")
+
+        for f in ["/mnt/etc/nixos/role-state.nix", "/mnt/etc/nixos/custom.nix"]:
+            if not os.path.exists(f):
+                raise RuntimeError(f"Required file missing: {f}")
+
+        run_stream([
+            "sudo", "nixos-install",
+            "--root", "/mnt",
+            "--flake", "/mnt/etc/nixos#nixos"
+        ], buf)
+
+        GLib.idle_add(self.push_complete)
+
+    # ── Step 6: Complete ───────────────────────────────────────────────────
+
+    def push_complete(self):
+        outer = Gtk.Box(orientation=Gtk.Orientation.VERTICAL, spacing=0)
+
+        status = Adw.StatusPage()
+        status.set_title("Installation Complete!")
+        status.set_description("Welcome to Sovran SystemsOS.")
+        status.set_icon_name("emblem-ok-symbolic")
+        status.set_vexpand(True)
+
+        creds_group = Adw.PreferencesGroup()
+        creds_group.set_title("⚠  Write down your login details before rebooting")
+        creds_group.set_margin_start(40)
+        creds_group.set_margin_end(40)
+
+        user_row = Adw.ActionRow()
+        user_row.set_title("Username")
+        user_row.set_subtitle("free")
+        creds_group.add(user_row)
+
+        pass_row = Adw.ActionRow()
+        pass_row.set_title("Password")
+        pass_row.set_subtitle("free")
+        creds_group.add(pass_row)
+
+        note_row = Adw.ActionRow()
+        note_row.set_title("App Passwords")
+        note_row.set_subtitle(
+            "After rebooting, all app passwords (Nextcloud, Bitcoin, Matrix, etc.) "
+            "will be saved to a secure PDF in your Documents folder."
+        )
+        creds_group.add(note_row)
+
+        content_box = Gtk.Box(orientation=Gtk.Orientation.VERTICAL, spacing=16)
+        content_box.append(status)
+        content_box.append(creds_group)
+        outer.append(content_box)
+
+        reboot_btn = Gtk.Button(label="Reboot Now")
+        reboot_btn.add_css_class("suggested-action")
+        reboot_btn.add_css_class("pill")
+        reboot_btn.add_css_class("destructive-action")
+        reboot_btn.connect("clicked", lambda b: subprocess.run(["sudo", "reboot"]))
+
+        nav = Gtk.Box()
+        nav.set_margin_bottom(24)
+        nav.set_margin_end(40)
+        nav.set_halign(Gtk.Align.END)
+        nav.append(reboot_btn)
+        outer.append(nav)
+
+        self.push_page("Complete", outer)
+        return False
+
+    # ── Error screen ───────────────────────────────────────────────────────
+
+    def show_error(self, msg):
+        outer = Gtk.Box(orientation=Gtk.Orientation.VERTICAL, spacing=0)
+
+        status = Adw.StatusPage()
+        status.set_title("Installation Error")
+        status.set_description(msg)
+        status.set_icon_name("dialog-error-symbolic")
+        status.set_vexpand(True)
+
+        log_lbl = Gtk.Label()
+        log_lbl.set_markup(f"<span foreground='#888888' size='small'>Full log: {LOG}</span>")
+        log_lbl.set_margin_bottom(24)
+
+        outer.append(status)
+        outer.append(log_lbl)
+
+        self.push_page("Error", outer)
+        return False
+
+
+if __name__ == "__main__":
+    app = InstallerApp()
+    app.run(None)
@@ -0,0 +1,44 @@
+{ pkgs, lib }:
+
+pkgs.stdenv.mkDerivation {
+  pname = "sovran-plymouth-theme";
+  version = "1.0";
+
+  src = ./.;
+
+  installPhase = ''
+    mkdir -p $out/share/plymouth/themes/sovran
+    cp ${./assets/splash-logo.png} $out/share/plymouth/themes/sovran/logo.png
+
+    cat > $out/share/plymouth/themes/sovran/sovran.plymouth <<'EOF'
+[Plymouth Theme]
+Name=Sovran Systems
+Description=Sovran Systems Splash
+ModuleName=script
+
+[script]
+ImageDir=/share/plymouth/themes/sovran
+ScriptFile=/share/plymouth/themes/sovran/sovran.script
+EOF
+
+    cat > $out/share/plymouth/themes/sovran/sovran.script <<'EOF'
+# Background color: #CFFFD7 (RGB 207,255,215)
+bg_r = 207/255.0
+bg_g = 255/255.0
+bg_b = 215/255.0
+
+Window.SetBackgroundTopColor (bg_r, bg_g, bg_b);
+Window.SetBackgroundBottomColor (bg_r, bg_g, bg_b);
+
+logo = Image("logo.png");
+logo_sprite = Sprite(logo);
+logo_sprite.SetX((Window.GetWidth() - logo.GetWidth()) / 2);
+logo_sprite.SetY((Window.GetHeight() - logo.GetHeight()) / 2);
+
+spinner = Sprite();
+spinner.SetImage(Spinner());
+spinner.SetX((Window.GetWidth() - spinner.GetImage().GetWidth()) / 2);
+spinner.SetY((Window.GetHeight() + logo.GetHeight()) / 2 + 20);
+EOF
+  '';
+}
@@ -0,0 +1,5 @@
+{ config, pkgs, lib, ... }:
+
+{
+  imports = [ ./common.nix ];
+}
@@ -4,14 +4,12 @@ let
  cfg = config.sovran_systemsOS;
 in
 {
-  # ✅ Option definition
  options.sovran_systemsOS.packages.bip110 = lib.mkOption {
    type = lib.types.nullOr lib.types.package;
    default = null;
    description = "BIP110 Bitcoin package";
  };

-  # ✅ Implementation
  config = lib.mkIf (
    cfg.features.bip110 &&
    cfg.packages.bip110 != null
@@ -1,95 +1,76 @@
 { config, pkgs, lib, ... }:

-lib.mkIf config.sovran_systemsOS.features.bitcoin {
-	
-	## Bitcoind
-	
-	services.bitcoind = {
-		enable = true;
+lib.mkIf config.sovran_systemsOS.services.bitcoin {
+
+  services.bitcoind = {
+    enable = true;
    package = config.nix-bitcoin.pkgs.bitcoind-knots;
-		dataDir = "/run/media/Second_Drive/BTCEcoandBackup/Bitcoin_Node";
-		txindex = true;
-		tor.proxy = true;
+    dataDir = "/run/media/Second_Drive/BTCEcoandBackup/Bitcoin_Node";
+    txindex = true;
+    tor.proxy = true;
    tor.enforce = true;
-		disablewallet = true;
-		extraConfig = ''
-			peerbloomfilters=1
-			server=1
-		'';
-	};
+    disablewallet = true;
+    extraConfig = ''
+      peerbloomfilters=1
+      server=1
+    '';
+  };

-	nix-bitcoin.onionServices.bitcoind.enable = true;
-	nix-bitcoin.onionServices.electrs.enable = true;
-	nix-bitcoin.onionServices.rtl.enable = true;
+  nix-bitcoin.onionServices.bitcoind.enable = true;
+  nix-bitcoin.onionServices.electrs.enable = true;
+  nix-bitcoin.onionServices.rtl.enable = true;

+  services.electrs = {
+    enable = true;
+    tor.enforce = true;
+    dataDir = "/run/media/Second_Drive/BTCEcoandBackup/Electrs_Data";
+  };

-	## Electrs
-	
-	services.electrs = {
-		enable = true;
-		tor.enforce = true;
-		dataDir = "/run/media/Second_Drive/BTCEcoandBackup/Electrs_Data";
-		};
+  services.lnd = {
+    enable = true;
+    tor.enforce = true;
+    tor.proxy = true;
+    extraConfig = ''
+      protocol.option-scid-alias=true
+    '';
+  };

+  nix-bitcoin.onionServices.lnd.public = true;

-  ## LND
-	
-	services.lnd = {
-		enable = true;
-		tor.enforce = true;
-		tor.proxy = true;
-		extraConfig = ''
-			protocol.option-scid-alias=true
-		'';
-	};
+  services.lnd.lndconnect = {
+    enable = true;
+    onion = true;
+  };

-	nix-bitcoin.onionServices.lnd.public = true;
+  services.rtl = {
+    enable = true;
+    tor.enforce = true;
+    port = 3050;
+    nightTheme = true;
+    nodes = {
+      lnd = {
+        enable = true;
+      };
+    };
+  };

+  services.btcpayserver = {
+    enable = true;
+  };

-  ## LNDconnect
+  services.btcpayserver.lightningBackend = "lnd";

-	services.lnd.lndconnect = {
-		enable = true;
-		onion = true;
-	};	
+  nix-bitcoin.generateSecrets = true;
+  nix-bitcoin.nodeinfo.enable = true;

-		
-	## RTL
-	
-	services.rtl = {
-		enable = true;
-		tor.enforce = true;
-		port = 3050;
-		nightTheme = true;
-		nodes = {
-			lnd = {
-				enable = true;
-			};
-		
-		};
-	};
+  nix-bitcoin.operator = {
+    enable = true;
+    name = "free";
+  };

-
-	## BTCpayserver
-	
-	services.btcpayserver = {
-		enable = true;
-		};
-		
-	services.btcpayserver.lightningBackend = "lnd";
-
-	
-	## System
-
-	nix-bitcoin.generateSecrets = true;
-
-	nix-bitcoin.nodeinfo.enable = true;
-		
-	nix-bitcoin.operator = {
-		enable = true;
-		name = "free";
-	};
-
-	nix-bitcoin.useVersionLockedPkgs = false;
-	
+  nix-bitcoin.useVersionLockedPkgs = false;
+  
+   sovran_systemsOS.domainRequirements = [
+    { name = "btcpayserver"; label = "BTCPay Server"; example = "pay.yourdomain.com"; }
+  ];
 }
@@ -0,0 +1,175 @@
+{ config, pkgs, lib, ... }:
+
+let
+  exposeBtcpay = config.sovran_systemsOS.web.btcpayserver;
+in
+{
+  services.caddy = {
+    enable = true;
+    user = "caddy";
+    group = "root";
+    configFile = "/run/caddy/Caddyfile";
+  };
+
+  systemd.services.caddy-generate-config = {
+    description = "Generate Caddyfile from /var/lib/domains at runtime";
+    before = [ "caddy.service" ];
+    requiredBy = [ "caddy.service" ];
+    wantedBy = [ "multi-user.target" ];
+    serviceConfig = {
+      Type = "oneshot";
+      RemainAfterExit = true;
+      RuntimeDirectory = "caddy";
+    };
+    path = [ pkgs.coreutils ];
+    script = ''
+      read_domain() {
+        if [ -f "/var/lib/domains/$1" ]; then
+          cat "/var/lib/domains/$1"
+        else
+          echo ""
+        fi
+      }
+
+      MATRIX=$(read_domain matrix)
+      WORDPRESS=$(read_domain wordpress)
+      NEXTCLOUD=$(read_domain nextcloud)
+      BTCPAY=$(read_domain btcpayserver)
+      VAULTWARDEN=$(read_domain vaultwarden)
+      HAVEN=$(read_domain haven)
+      ACME_EMAIL=$(read_domain sslemail)
+
+      # Start with global config
+      cat > /run/caddy/Caddyfile <<EOF
+{
+  email $ACME_EMAIL
+}
+EOF
+
+      # ── Matrix ──────────────────────────────────────
+      if [ -n "$MATRIX" ]; then
+        if [ -f /run/caddy/element-calling.snippet ]; then
+          cat /run/caddy/element-calling.snippet >> /run/caddy/Caddyfile
+        else
+          cat >> /run/caddy/Caddyfile <<EOF
+
+$MATRIX {
+  reverse_proxy /_matrix/* http://localhost:8008
+  reverse_proxy /_synapse/client/* http://localhost:8008
+}
+
+$MATRIX:8448 {
+  reverse_proxy http://localhost:8008
+}
+EOF
+        fi
+      fi
+
+      # ── WordPress ───────────────────────────────────
+      if [ -n "$WORDPRESS" ]; then
+        cat >> /run/caddy/Caddyfile <<EOF
+
+$WORDPRESS {
+  encode gzip zstd
+  root * /var/lib/www/wordpress
+  php_fastcgi unix//run/phpfpm/mypool.sock
+  file_server browse
+}
+EOF
+      fi
+
+      # ── Nextcloud ───────────────────────────────────
+      if [ -n "$NEXTCLOUD" ]; then
+        cat >> /run/caddy/Caddyfile <<EOF
+
+$NEXTCLOUD {
+  encode gzip zstd
+  root * /var/lib/www/nextcloud
+  php_fastcgi unix//run/phpfpm/mypool.sock {
+    trusted_proxies private_ranges
+  }
+  file_server
+  redir /.well-known/carddav /remote.php/dav/ 301
+  redir /.well-known/caldav /remote.php/dav/ 301
+  header {
+    Strict-Transport-Security max-age=31536000;
+  }
+}
+EOF
+      fi
+
+      # ── BTCPay (only if web exposure is enabled) ────
+      ${if exposeBtcpay then ''
+      if [ -n "$BTCPAY" ]; then
+        cat >> /run/caddy/Caddyfile <<EOF
+
+$BTCPAY {
+  reverse_proxy http://localhost:23000
+  encode gzip zstd
+}
+EOF
+      fi
+      '' else ''
+      # BTCPay web exposure disabled by sovran_systemsOS.web.btcpayserver = false
+      ''}
+
+      # ── Vaultwarden ─────────────────────────────────
+      if [ -n "$VAULTWARDEN" ]; then
+        cat >> /run/caddy/Caddyfile <<EOF
+
+$VAULTWARDEN {
+  reverse_proxy http://localhost:8777
+  encode gzip zstd
+}
+EOF
+      fi
+
+      # ── Haven ───────────────────────────────────────
+      if [ -n "$HAVEN" ]; then
+        cat >> /run/caddy/Caddyfile <<EOF
+
+$HAVEN {
+  reverse_proxy localhost:3355 {
+    header_up Host {host}
+    header_up X-Real-IP {remote_host}
+    header_up X-Forwarded-For {remote_host}
+    header_up X-Forwarded-Proto {scheme}
+    transport http {
+      versions 1.1
+    }
+  }
+  request_body {
+    max_size 100MB
+  }
+}
+EOF
+      fi
+
+      # ── Sovran Hub (LAN mDNS access) ────────────────
+      cat >> /run/caddy/Caddyfile <<EOF
+
+http://sovransystemsos.local {
+  reverse_proxy localhost:8937
+}
+EOF
+
+      # ── RTL (LAN access) ────────────────────────────
+      cat >> /run/caddy/Caddyfile <<EOF
+
+:3051 {
+  reverse_proxy :3050
+  encode gzip zstd
+}
+EOF
+
+      # ── Mempool (LAN access) ────────────────────────
+      cat >> /run/caddy/Caddyfile <<EOF
+
+:60847 {
+  reverse_proxy :60845
+  encode gzip zstd
+}
+EOF
+    '';
+  };
+}
@@ -0,0 +1,32 @@
+{ config, pkgs, lib, ... }:
+
+{
+  # ── Ensure njalla directory and base script exist on every build ──
+  systemd.tmpfiles.rules = [
+    "d /var/lib/njalla 0750 root root -"
+  ];
+
+  # ── Create base njalla.sh if it doesn't exist yet ────────────
+  systemd.services.njalla-init = {
+    description = "Initialize Njal.la DDNS script if missing";
+    wantedBy = [ "multi-user.target" ];
+    serviceConfig = {
+      Type = "oneshot";
+      RemainAfterExit = true;
+    };
+    unitConfig = {
+      ConditionPathExists = "!/var/lib/njalla/njalla.sh";
+    };
+    script = ''
+      cat > /var/lib/njalla/njalla.sh <<'SCRIPT'
+#!/usr/bin/env bash
+IP=$(dig @resolver4.opendns.com myip.opendns.com +short -4)
+
+## Add DDNS entries below — one curl per line
+## Run 'sudo sovran-setup-domains' to configure automatically
+SCRIPT
+
+      chmod 700 /var/lib/njalla/njalla.sh
+    '';
+  };
+}
@@ -3,34 +3,42 @@
 {
  config = lib.mkMerge [

-    # Server-Desktop Role most services enabled
-    (lib.mkIf config.sovran_systemsOS.roles.server-desktop {
-      sovran_systemsOS.features = {
-        synapse = true;
-        bitcoin = true;
-        coturn = true;
-        vaultwarden = true;
-        haven = false;
-        mempool = false;
-        bip110 = false;
-        element-calling = false;
-        bitcoin-core = false;
-        rdp = false;
-      };
+    # ── Server+Desktop Role (default) ─────────────────────────
+    (lib.mkIf config.sovran_systemsOS.roles.server_plus_desktop {
    })

-    # Desktop role
+    # ── Desktop Only Role ─────────────────────────────────────
    (lib.mkIf config.sovran_systemsOS.roles.desktop {
-      services.xserver.enable = true;
      services.desktopManager.gnome.enable = true;
+
+      sovran_systemsOS.services = {
+        synapse = lib.mkDefault false;
+        bitcoin = lib.mkDefault false;
+        vaultwarden = lib.mkDefault false;
+        wordpress = lib.mkDefault false;
+        nextcloud = lib.mkDefault false;
+      };
+
+      sovran_systemsOS.web.btcpayserver = lib.mkDefault false;
    })

-    # Bitcoin node role
+    # ── Bitcoin Node Only Role ────────────────────────────────
+    # Bitcoin ecosystem + mempool + bip110, BTCPay runs but not exposed via Caddy
    (lib.mkIf config.sovran_systemsOS.roles.node {
-      sovran_systemsOS.features = {
-        bitcoin = true;
-        bip110 = false;
+      sovran_systemsOS.services = {
+        bitcoin = lib.mkDefault true;
+        synapse = lib.mkDefault false;
+        vaultwarden = lib.mkDefault false;
+        wordpress = lib.mkDefault false;
+        nextcloud = lib.mkDefault false;
      };
+
+      sovran_systemsOS.features = {
+        mempool = lib.mkDefault true;
+        bip110 = lib.mkDefault true;
+      };
+
+      sovran_systemsOS.web.btcpayserver = lib.mkDefault false;
    })

  ];
@@ -3,7 +3,7 @@
 {
  options.sovran_systemsOS = {
    roles = {
-      server-desktop = lib.mkOption {
+      server_plus_desktop = lib.mkOption {
        type = lib.types.bool;
        default = !config.sovran_systemsOS.roles.desktop && !config.sovran_systemsOS.roles.node;
      };
@@ -11,11 +11,37 @@
      node = lib.mkEnableOption "Bitcoin Node Only Role";
    };

+    # ── Services (default ON — user can disable in custom.nix) ──
+    services = {
+      synapse = lib.mkOption {
+        type = lib.types.bool;
+        default = true;
+        description = "Matrix Synapse homeserver";
+      };
+      bitcoin = lib.mkOption {
+        type = lib.types.bool;
+        default = true;
+        description = "Bitcoin Ecosystem (bitcoind, electrs, lnd, rtl, btcpay)";
+      };
+      vaultwarden = lib.mkOption {
+        type = lib.types.bool;
+        default = true;
+        description = "Vaultwarden password manager";
+      };
+      wordpress = lib.mkOption {
+        type = lib.types.bool;
+        default = true;
+        description = "WordPress (raw PHP served by Caddy)";
+      };
+      nextcloud = lib.mkOption {
+        type = lib.types.bool;
+        default = true;
+        description = "Nextcloud (raw PHP served by Caddy)";
+      };
+    };
+
+    # ── Features (default OFF — user can enable in custom.nix) ──
    features = {
-      coturn = lib.mkEnableOption "TURN server";
-      synapse = lib.mkEnableOption "Matrix Synapse";
-      bitcoin = lib.mkEnableOption "Bitcoin Ecosystem";
-      vaultwarden = lib.mkEnableOption "Vaultwarden";
      haven = lib.mkEnableOption "Haven NOSTR relay";
      bip110 = lib.mkEnableOption "BIP-110 Bitcoin Better Money";
      mempool = lib.mkEnableOption "Bitcoin Mempool Explorer";
@@ -24,6 +50,29 @@
      rdp = lib.mkEnableOption "Gnome Remote Desktop";
    };

+    # ── Web exposure (controls Caddy vhosts) ──────────────────
+    web = {
+      btcpayserver = lib.mkOption {
+        type = lib.types.bool;
+        default = true;
+        description = "Expose BTCPay Server via Caddy";
+      };
+    };
+
+    # ── Domain setup registry ─────────────────────────────────
+    domainRequirements = lib.mkOption {
+      type = lib.types.listOf (lib.types.submodule {
+        options = {
+          name = lib.mkOption { type = lib.types.str; };
+          label = lib.mkOption { type = lib.types.str; };
+          example = lib.mkOption { type = lib.types.str; };
+          needsDDNS = lib.mkOption { type = lib.types.bool; default = true; };
+        };
+      });
+      default = [];
+      description = "Domain requirements registered by each module";
+    };
+
    nostr_npub = lib.mkOption {
      type = lib.types.str;
      default = "";
@@ -0,0 +1,292 @@
+{ config, lib, pkgs, ... }:
+
+let
+  cfg = config.sovran_systemsOS;
+
+  monitoredServices =
+    # ── Infrastructure (always present) ────────────────────────
+    [
+      { name = "Caddy"; unit = "caddy.service"; type = "system"; icon = "caddy"; enabled = true;  category = "infrastructure"; credentials = []; }
+      { name = "Tor";   unit = "tor.service";   type = "system"; icon = "tor";   enabled = true;  category = "infrastructure"; credentials = []; }
+      { name = "System Passwords"; unit = "root-password-setup.service"; type = "system"; icon = "system"; enabled = true; category = "infrastructure"; credentials = [
+        { label = "Free Account — Username"; value = "free"; }
+        { label = "Free Account — Password"; file = "/var/lib/secrets/free-password"; }
+        { label = "Root Password"; file = "/var/lib/secrets/root-password"; }
+        { label = "SSH Local Access"; value = "ssh root@localhost  /  Passphrase: gosovransystems"; }
+      ]; }
+      { name = "Remote Desktop"; unit = "gnome-remote-desktop.service"; type = "system"; icon = "rdp"; enabled = cfg.features.rdp; category = "infrastructure"; credentials = [
+        { label = "Username"; file = "/var/lib/gnome-remote-desktop/rdp-username"; }
+        { label = "Password"; file = "/var/lib/gnome-remote-desktop/rdp-password"; }
+        { label = "Address";  file = "/var/lib/secrets/internal-ip"; suffix = ":3389"; }
+        { label = "How to Connect"; value = "1. Install an RDP client (e.g. Remmina, Microsoft Remote Desktop)\n2. Create a new RDP connection\n3. Enter the Address above as the host\n4. Enter the Username and Password above\n5. Connect — you will see your desktop remotely"; }
+      ]; }
+    ]
+    # ── Bitcoin Base (node implementations) ────────────────────
+    ++ [
+      { name = "Bitcoin Knots + BIP110"; unit = "bitcoind.service"; type = "system"; icon = "bip110";        enabled = cfg.features.bip110;        category = "bitcoin-base"; credentials = [
+        { label = "Tor Address"; file = "/var/lib/tor/onion/bitcoind/hostname"; prefix = "http://"; }
+      ]; }
+      { name = "Bitcoin Knots";          unit = "bitcoind.service"; type = "system"; icon = "bitcoind";      enabled = cfg.services.bitcoin && !cfg.features.bitcoin-core && !cfg.features.bip110; category = "bitcoin-base"; credentials = [
+        { label = "Tor Address"; file = "/var/lib/tor/onion/bitcoind/hostname"; prefix = "http://"; }
+      ]; }
+      { name = "Bitcoin Core";           unit = "bitcoind.service"; type = "system"; icon = "bitcoin-core";  enabled = cfg.features.bitcoin-core;  category = "bitcoin-base"; credentials = [
+        { label = "Tor Address"; file = "/var/lib/tor/onion/bitcoind/hostname"; prefix = "http://"; }
+      ]; }
+    ]
+    # ── Bitcoin Apps (services on top of the node) ─────────────
+    ++ [
+      { name = "Electrs";            unit = "electrs.service";      type = "system"; icon = "electrs";      enabled = cfg.services.bitcoin;  category = "bitcoin-apps"; credentials = [
+        { label = "Tor Address"; file = "/var/lib/tor/onion/electrs/hostname"; prefix = "http://"; }
+        { label = "Port"; value = "50001"; }
+      ]; }
+      { name = "LND";                unit = "lnd.service";          type = "system"; icon = "lnd";          enabled = cfg.services.bitcoin;  category = "bitcoin-apps"; credentials = []; }
+      { name = "Ride The Lightning"; unit = "rtl.service";          type = "system"; icon = "rtl";          enabled = cfg.services.bitcoin;  category = "bitcoin-apps"; credentials = [
+        { label = "Tor Access"; file = "/var/lib/tor/onion/rtl/hostname"; prefix = "http://"; }
+        { label = "Local Network"; file = "/var/lib/secrets/internal-ip"; prefix = "http://"; suffix = ":3051"; }
+        { label = "Password"; file = "/etc/nix-bitcoin-secrets/rtl-password"; }
+      ]; }
+      { name = "BTCPayserver";       unit = "btcpayserver.service"; type = "system"; icon = "btcpayserver"; enabled = cfg.services.bitcoin;  category = "bitcoin-apps"; credentials = [
+        { label = "URL"; file = "/var/lib/domains/btcpayserver"; prefix = "https://"; }
+        { label = "Note"; value = "Create your admin account on first visit"; }
+      ]; }
+      { name = "Zeus Connect";       unit = "zeus-connect-setup.service"; type = "system"; icon = "zeus";   enabled = cfg.services.bitcoin;  category = "bitcoin-apps"; credentials = [
+        { label = "Connection URL"; file = "/var/lib/secrets/zeus-connect-url"; qrcode = true; }
+        { label = "How to Connect"; value = "1. Download Zeus from App Store or Google Play\n2. Open Zeus �� Scan Node Config\n3. Scan the QR code above or paste the Connection URL"; }
+      ]; }
+      { name = "Mempool";            unit = "mempool.service";      type = "system"; icon = "mempool";      enabled = cfg.features.mempool;  category = "bitcoin-apps"; credentials = [
+        { label = "Tor Access"; file = "/var/lib/tor/onion/mempool-frontend/hostname"; prefix = "http://"; }
+        { label = "Local Network"; file = "/var/lib/secrets/internal-ip"; prefix = "http://"; suffix = ":60847"; }
+      ]; }
+    ]
+    # ── Communication ──────────────────────────────────────────
+    ++ [
+      { name = "Matrix-Synapse"; unit = "matrix-synapse.service"; type = "system"; icon = "synapse"; enabled = cfg.services.synapse;          category = "communication"; credentials = [
+        { label = "Homeserver URL";   file = "/var/lib/secrets/matrix-homeserver-url"; }
+        { label = "Admin Username";   file = "/var/lib/secrets/matrix-admin-username"; }
+        { label = "Admin Password";   file = "/var/lib/secrets/matrix-admin-password"; }
+        { label = "Test Username";    file = "/var/lib/secrets/matrix-test-username"; }
+        { label = "Test Password";    file = "/var/lib/secrets/matrix-test-password"; }
+      ]; }
+      { name = "Element-Call";   unit = "livekit.service";        type = "system"; icon = "livekit"; enabled = cfg.features.element-calling;  category = "communication"; credentials = []; }
+    ]
+    # ── Self-Hosted Apps ───────────────────────────────────────
+    ++ [
+      { name = "VaultWarden"; unit = "vaultwarden.service";      type = "system"; icon = "vaultwarden"; enabled = cfg.services.vaultwarden; category = "apps"; credentials = [
+        { label = "URL"; file = "/var/lib/domains/vaultwarden"; prefix = "https://"; }
+        { label = "Admin Panel"; file = "/var/lib/domains/vaultwarden"; prefix = "https://"; suffix = "/admin"; }
+        { label = "Admin Token"; file = "/var/lib/secrets/vaultwarden/vaultwarden.env"; extract = "ADMIN_TOKEN"; }
+      ]; }
+      { name = "Nextcloud";   unit = "phpfpm-nextcloud.service"; type = "system"; icon = "nextcloud";   enabled = cfg.services.nextcloud;   category = "apps"; credentials = [
+        { label = "Credentials"; file = "/var/lib/secrets/nextcloud-admin"; multiline = true; }
+      ]; }
+      { name = "WordPress";   unit = "phpfpm-wordpress.service"; type = "system"; icon = "wordpress";   enabled = cfg.services.wordpress;   category = "apps"; credentials = [
+        { label = "Credentials"; file = "/var/lib/secrets/wordpress-admin"; multiline = true; }
+      ]; }
+    ]
+    # ── Nostr / Relay ──────────────────────────────────────────
+    ++ [
+      { name = "Haven Relay"; unit = "haven-relay.service"; type = "system"; icon = "haven"; enabled = cfg.features.haven; category = "nostr"; credentials = []; }
+    ]
+    # ── Support ────────────────────────────────────────────────
+    ++ [
+      { name = "Tech Support"; unit = "sovran-tech-support"; type = "support"; icon = "support"; enabled = true; category = "support"; credentials = []; }
+    ];
+
+  activeRole =
+    if cfg.roles.desktop then "desktop"
+    else if cfg.roles.node then "node"
+    else "server_plus_desktop";
+
+  generatedConfig = pkgs.writeText "sovran-hub-config.json"
+    (builtins.toJSON {
+      refresh_interval = 5;
+      command_method   = "systemctl";
+      role             = activeRole;
+      services         = monitoredServices;
+      feature_manager  = true;
+    });
+
+  # ── Update wrapper script ──────────────────────────────────────
+  update-script = pkgs.writeShellScript "sovran-hub-update.sh" ''
+    set -uo pipefail
+    export PATH="${lib.makeBinPath [ pkgs.nix pkgs.nixos-rebuild pkgs.git pkgs.flatpak pkgs.coreutils ]}:$PATH"
+
+    LOG="/var/log/sovran-hub-update.log"
+    STATUS="/var/log/sovran-hub-update.status"
+
+    echo "RUNNING" > "$STATUS"
+    : > "$LOG"
+    exec > >(tee -a "$LOG") 2>&1
+
+    echo "══════════════════════════════════════════════════"
+    echo "  Sovran_SystemsOS Update — $(date)"
+    echo "══════════════════════════════════════════════════"
+    echo ""
+
+    RC=0
+
+    echo "── Step 1/3: nix flake update ────────────────────"
+    if ! nix flake update --flake /etc/nixos --print-build-logs 2>&1; then
+      echo "[ERROR] nix flake update failed"
+      RC=1
+    fi
+    echo ""
+
+    if [ "$RC" -eq 0 ]; then
+      echo "── Step 2/3: nixos-rebuild switch ──────────────────"
+      if ! nixos-rebuild switch --flake /etc/nixos --print-build-logs 2>&1; then
+        echo "[ERROR] nixos-rebuild switch failed"
+        RC=1
+      fi
+      echo ""
+    fi
+
+    if [ "$RC" -eq 0 ]; then
+      echo "── Step 3/3: flatpak update ────────────────────────"
+      if ! flatpak update -y 2>&1; then
+        echo "[WARNING] flatpak update failed (non-fatal)"
+      fi
+      echo ""
+    fi
+
+    if [ "$RC" -eq 0 ]; then
+      echo "══════════════════════════════════════════════════"
+      echo "  ✓ Update completed successfully"
+      echo "══════════════════════════════════════════════════"
+      echo "SUCCESS" > "$STATUS"
+    else
+      echo "══════════════════════════════════════════════════"
+      echo "  ✗ Update failed — see errors above"
+      echo "══════════════════════════════════════════════════"
+      echo "FAILED" > "$STATUS"
+    fi
+
+    exit "$RC"
+  '';
+
+  # ── Rebuild wrapper script ─────────────────────────────────────
+  rebuild-script = pkgs.writeShellScript "sovran-hub-rebuild.sh" ''
+    set -uo pipefail
+    export PATH="${lib.makeBinPath [ pkgs.nix pkgs.nixos-rebuild pkgs.coreutils ]}:$PATH"
+
+    LOG="/var/log/sovran-hub-rebuild.log"
+    STATUS="/var/log/sovran-hub-rebuild.status"
+
+    echo "RUNNING" > "$STATUS"
+    : > "$LOG"
+    exec > >(tee -a "$LOG") 2>&1
+
+    echo "══════════════════════════════════════════════════"
+    echo "  Sovran_SystemsOS Rebuild — $(date)"
+    echo "══════════════════════════════════════════════════"
+    echo ""
+    echo "── Rebuilding system configuration ──────────────"
+    if nixos-rebuild switch --flake /etc/nixos --print-build-logs 2>&1; then
+      echo ""
+      echo "══════════════════════════════════════════════════"
+      echo "  ✓ Rebuild completed successfully"
+      echo "══════════════════════════════════════════════════"
+      echo "SUCCESS" > "$STATUS"
+    else
+      echo ""
+      echo "══════════════════════════════════════════════════"
+      echo "  ✗ Rebuild failed — see errors above"
+      echo "══════════════════════════════════════════════════"
+      echo "FAILED" > "$STATUS"
+      exit 1
+    fi
+  '';
+
+  sovran-hub-web = pkgs.python3Packages.buildPythonApplication {
+    pname   = "sovran-systemsos-hub-web";
+    version = "1.0.0";
+    format  = "other";
+
+    src = ../../app;
+
+    propagatedBuildInputs = with pkgs.python3Packages; [
+      fastapi
+      uvicorn
+      jinja2
+      python-multipart
+    ];
+
+    dontBuild = true;
+
+    installPhase = ''
+      runHook preInstall
+
+      install -d $out/lib/sovran-hub-web
+      cp -r sovran_systemsos_web $out/lib/sovran-hub-web/
+
+      cp ${generatedConfig} $out/lib/sovran-hub-web/config.json
+
+      install -d $out/share/sovran-hub/icons
+      cp icons/* $out/share/sovran-hub/icons/ 2>/dev/null || true
+
+      install -d $out/bin
+      cat > $out/bin/sovran-hub-web <<LAUNCHER
+#!${pkgs.python3}/bin/python3
+import os, sys
+base = os.path.join("$out", "lib", "sovran-hub-web")
+sys.path.insert(0, base)
+os.environ["SOVRAN_HUB_CONFIG"] = os.path.join(base, "config.json")
+os.environ["SOVRAN_HUB_ICONS"]  = os.path.join("$out", "share", "sovran-hub", "icons")
+import uvicorn
+uvicorn.run(
+    "sovran_systemsos_web.server:app",
+    host="0.0.0.0",
+    port=8937,
+    log_level="info",
+)
+LAUNCHER
+      chmod +x $out/bin/sovran-hub-web
+
+      runHook postInstall
+    '';
+
+    meta = {
+      description = "Sovran_SystemsOS Hub — web-based systemd service manager";
+      mainProgram = "sovran-hub-web";
+    };
+  };
+
+in
+{
+  config = {
+    systemd.services.sovran-hub-web = {
+      description = "Sovran_SystemsOS Hub Web Interface";
+      wantedBy    = [ "multi-user.target" ];
+      after       = [ "network.target" ];
+
+      serviceConfig = {
+        ExecStart      = "${sovran-hub-web}/bin/sovran-hub-web";
+        Restart        = "on-failure";
+        RestartSec     = "5s";
+        User           = "root";
+        StandardOutput = "journal";
+        StandardError  = "journal";
+      };
+
+      path = [ pkgs.qrencode ];
+    };
+
+    systemd.services.sovran-hub-update = {
+      description = "Sovran_SystemsOS System Update";
+      serviceConfig = {
+        Type       = "oneshot";
+        ExecStart  = "${update-script}";
+      };
+    };
+
+    systemd.services.sovran-hub-rebuild = {
+      description = "Sovran_SystemsOS System Rebuild";
+      serviceConfig = {
+        Type      = "oneshot";
+        ExecStart = "${rebuild-script}";
+      };
+    };
+
+    networking.firewall.allowedTCPPorts = [ 3051 8937 60847 ];
+  };
+}
@@ -0,0 +1,461 @@
+{ config, pkgs, lib, ... }:
+
+let
+  domains = config.sovran_systemsOS.domainRequirements;
+
+  domainNamesList = lib.concatMapStringsSep " " (d: d.name) domains;
+
+  ddnsPrompt = ''
+    read -p "  Njal.la DDNS curl command (paste full line, or Enter to skip): " DDNS_LINE
+    if [ -n "$DDNS_LINE" ]; then
+      # Strip any leading "curl " if they pasted the whole command
+      DDNS_LINE="''${DDNS_LINE#curl }"
+      # Strip surrounding quotes
+      DDNS_LINE="''${DDNS_LINE%\"}"
+      DDNS_LINE="''${DDNS_LINE#\"}"
+      # Replace &auto with &a=''${IP} at the end
+      DDNS_LINE="''${DDNS_LINE%auto}&a=''${DOLLAR}{IP}"
+      # Remove any trailing double &a= if they already had &a=
+      DDNS_LINE=$(echo "$DDNS_LINE" | sed 's/&a=&a=/\&a=/g')
+  '';
+
+  confirmDomain = name: ''
+    while true; do
+      echo ""
+      printf "%b%s%b\n" "$YELLOW" "  You entered:" "$NC"
+      printf "%b%s%b\n" "$CYAN" "    Domain:   $DOMAIN" "$NC"
+      if [ -n "''${DDNS_DISPLAY:-}" ]; then
+        printf "%b%s%b\n" "$CYAN" "    DDNS URL: $DDNS_DISPLAY" "$NC"
+      fi
+      echo ""
+      read -p "  Is this correct? (y/n): " CONFIRM
+      case "$CONFIRM" in
+        [yY])
+          echo "$DOMAIN" > "/var/lib/domains/${name}"
+          printf "%b%s%b\n" "$GREEN" "  Saved." "$NC"
+          break
+          ;;
+        [nN])
+          echo "  Let's try again."
+          REDO=true
+          break
+          ;;
+        *)
+          echo "  Please enter y or n."
+          ;;
+      esac
+    done
+  '';
+
+  domainPrompts = lib.concatMapStringsSep "\n" (d: ''
+    REDO=true
+    while [ "$REDO" = true ]; do
+      REDO=false
+      DDNS_DISPLAY=""
+      echo ""
+      printf "%b%s%b\n" "$GREEN" "── ${d.label} ──" "$NC"
+      EXISTING=""
+      if [ -f "/var/lib/domains/${d.name}" ]; then
+        EXISTING=$(cat "/var/lib/domains/${d.name}")
+        printf "%b%s%b\n" "$CYAN" "  Current: $EXISTING" "$NC"
+      fi
+      read -p "  Subdomain (e.g. ${d.example}) or Enter to keep current: " DOMAIN_INPUT
+      DOMAIN="''${DOMAIN_INPUT:-$EXISTING}"
+
+      if [ -n "$DOMAIN" ]; then
+        ${lib.optionalString d.needsDDNS ''
+        ${ddnsPrompt}
+          DDNS_DISPLAY="$DDNS_LINE"
+          PENDING_NJALLA="curl \"$DDNS_LINE\""
+        fi
+        ''}
+
+        ${confirmDomain d.name}
+
+        if [ "$REDO" = false ] && [ -n "''${PENDING_NJALLA:-}" ]; then
+          NJALLA_ENTRIES="$NJALLA_ENTRIES
+$PENDING_NJALLA"
+          PENDING_NJALLA=""
+        fi
+      else
+        echo "  Skipped."
+      fi
+    done
+  '') domains;
+
+  missingDomainPrompts = lib.concatMapStringsSep "\n" (d: ''
+    if [ ! -f "/var/lib/domains/${d.name}" ]; then
+      MISSING=true
+      REDO=true
+      while [ "$REDO" = true ]; do
+        REDO=false
+        DDNS_DISPLAY=""
+        echo ""
+        printf "%b%s%b\n" "$GREEN" "── ${d.label} (NEW) ──" "$NC"
+        read -p "  Subdomain (e.g. ${d.example}): " DOMAIN
+
+        if [ -n "$DOMAIN" ]; then
+          ${lib.optionalString d.needsDDNS ''
+          ${ddnsPrompt}
+            DDNS_DISPLAY="$DDNS_LINE"
+            PENDING_NJALLA="curl \"$DDNS_LINE\""
+          fi
+          ''}
+
+          ${confirmDomain d.name}
+
+          if [ "$REDO" = false ] && [ -n "''${PENDING_NJALLA:-}" ]; then
+            NEW_NJALLA_ENTRIES="$NEW_NJALLA_ENTRIES
+$PENDING_NJALLA"
+            PENDING_NJALLA=""
+          fi
+        else
+          echo "  Skipped."
+        fi
+      done
+    fi
+  '') domains;
+
+  domainSummary = lib.concatMapStringsSep "\n" (d: ''
+    if [ -f "/var/lib/domains/${d.name}" ]; then
+      printf "%b%s%b\n" "$NC" "  ${d.label}: $(cat /var/lib/domains/${d.name})" "$NC"
+    fi
+  '') domains;
+
+  setupScript = pkgs.writeShellScriptBin "sovran-setup-domains" ''
+    set -euo pipefail
+
+    GREEN='\033[0;32m'
+    YELLOW='\033[1;33m'
+    CYAN='\033[0;36m'
+    NC='\033[0m'
+    DOLLAR='$'
+
+    echo ""
+    printf "%b%s%b\n" "$CYAN" "══════════════════════════════════════════════" "$NC"
+    printf "%b%s%b\n" "$CYAN" "  Sovran_SystemsOS — Domain & DDNS Setup" "$NC"
+    printf "%b%s%b\n" "$CYAN" "══════════════════════════════════════════════" "$NC"
+    echo ""
+    printf "%b%s%b\n" "$YELLOW" "Before running this, you need:" "$NC"
+    echo ""
+    echo "  1. Domains/subdomains purchased on https://njal.la"
+    echo "  2. For each subdomain, add a Dynamic record in"
+    echo "     your Njal.la dashboard."
+    echo "  3. Njal.la will give you a curl command like:"
+    echo ""
+    printf "%b%s%b\n" "$CYAN" "     curl \"https://njal.la/update/?h=sub.domain.com&k=abc123&auto\"" "$NC"
+    echo ""
+    echo "  Have those curl commands ready."
+    echo ""
+    read -p "Press Enter to continue..."
+
+    # ── Create directories ────────────────────────────
+    mkdir -p /var/lib/domains
+
+    NJALLA_ENTRIES=""
+    PENDING_NJALLA=""
+
+    # ── SSL Email ─────────────────────────────────────
+    REDO=true
+    while [ "$REDO" = true ]; do
+      REDO=false
+      echo ""
+      printf "%b%s%b\n" "$GREEN" "── SSL Certificate Email ──" "$NC"
+      echo "Let's Encrypt needs an email for certificate notifications."
+      EXISTING_EMAIL=""
+      if [ -f "/var/lib/domains/sslemail" ]; then
+        EXISTING_EMAIL=$(cat /var/lib/domains/sslemail)
+        printf "%b%s%b\n" "$CYAN" "  Current: $EXISTING_EMAIL" "$NC"
+      fi
+      read -p "  Email address (or Enter to keep current): " EMAIL_INPUT
+      SSL_EMAIL="''${EMAIL_INPUT:-$EXISTING_EMAIL}"
+      if [ -n "$SSL_EMAIL" ]; then
+        while true; do
+          echo ""
+          printf "%b%s%b\n" "$YELLOW" "  You entered:" "$NC"
+          printf "%b%s%b\n" "$CYAN" "    Email: $SSL_EMAIL" "$NC"
+          echo ""
+          read -p "  Is this correct? (y/n): " CONFIRM
+          case "$CONFIRM" in
+            [yY])
+              echo "$SSL_EMAIL" > /var/lib/domains/sslemail
+              printf "%b%s%b\n" "$GREEN" "  Saved." "$NC"
+              break
+              ;;
+            [nN])
+              echo "  Let's try again."
+              REDO=true
+              break
+              ;;
+            *)
+              echo "  Please enter y or n."
+              ;;
+          esac
+        done
+      fi
+    done
+
+    # ── All module domains ────────────────────────────
+    ${domainPrompts}
+
+    # ── Final review ──────────────────────────────────
+    echo ""
+    printf "%b%s%b\n" "$CYAN" "══════════════════════════════════════════════" "$NC"
+    printf "%b%s%b\n" "$CYAN" "  Review All Entries" "$NC"
+    printf "%b%s%b\n" "$CYAN" "══════════════════════════════════════════════" "$NC"
+    echo ""
+    echo "  Configured domains:"
+    ${domainSummary}
+    echo ""
+    echo "  DDNS entries:"
+    if [ -n "$NJALLA_ENTRIES" ]; then
+      echo "$NJALLA_ENTRIES"
+    else
+      echo "    (none)"
+    fi
+    echo ""
+    read -p "  Does everything look correct? (y/n): " FINAL_CONFIRM
+    if [ "$FINAL_CONFIRM" != "y" ] && [ "$FINAL_CONFIRM" != "Y" ]; then
+      echo ""
+      printf "%b%s%b\n" "$YELLOW" "  Setup cancelled. Run 'sudo sovran-setup-domains' to start over." "$NC"
+      echo ""
+      exit 1
+    fi
+
+    # ── Append curl entries to njalla.sh ──────────────
+    if [ -n "$NJALLA_ENTRIES" ]; then
+      echo ""
+      printf "%b%s%b\n" "$GREEN" "── Updating DDNS script ──" "$NC"
+      echo "$NJALLA_ENTRIES" >> /var/lib/njalla/njalla.sh
+      echo "  Appended entries to /var/lib/njalla/njalla.sh"
+    fi
+
+    # ── Run DDNS update now ───────────────────────────
+    echo ""
+    read -p "Update Njal.la DNS records now? (y/n): " RUN_NOW
+    if [ "$RUN_NOW" = "y" ]; then
+      bash /var/lib/njalla/njalla.sh
+      echo "  DNS records updated."
+    fi
+
+    # ── Mark setup complete ───────────────────────────
+    touch /var/lib/domains/.setup-complete
+
+    # ── Summary ───────────────────────────────────────
+    echo ""
+    printf "%b%s%b\n" "$CYAN" "══════════════════════════════════════════════" "$NC"
+    printf "%b%s%b\n" "$CYAN" "  Setup Complete!" "$NC"
+    printf "%b%s%b\n" "$CYAN" "══════════════════════════════════════════════" "$NC"
+    echo ""
+    echo "  Domain files:   /var/lib/domains/"
+    echo "  DDNS script:    /var/lib/njalla/njalla.sh"
+    echo "  DDNS cron:      Every 15 minutes (already configured)"
+    echo ""
+
+    # ── Port Forwarding Reminder ──────────────────────
+    INTERNAL_IP=$(hostname -I 2>/dev/null | awk '{print $1}')
+    printf "%b%s%b\n" "$YELLOW" "══════════════════════════════════════════════" "$NC"
+    printf "%b  ⚠  Port Forwarding Reminder%b\n" "$YELLOW" "$NC"
+    printf "%b%s%b\n" "$YELLOW" "══════════════════════════════════════════════" "$NC"
+    echo ""
+    echo "  For your services to be reachable from the internet, you must"
+    echo "  set up PORT FORWARDING in your router's admin panel."
+    echo ""
+    if [ -n "$INTERNAL_IP" ]; then
+      printf "  Forward these ports to this machine's internal IP: %b%s%b\n" "$CYAN" "$INTERNAL_IP" "$NC"
+    else
+      echo "  Forward these ports to this machine's internal LAN IP."
+    fi
+    echo ""
+    echo "    80/TCP    — HTTP (redirects to HTTPS)"
+    echo "    443/TCP   — HTTPS (all domain-based services)"
+    echo "    8448/TCP  — Matrix federation (server-to-server)"
+    echo ""
+    echo "  If you enabled Element Calling, also forward:"
+    echo "    7881/TCP        — LiveKit WebRTC signalling"
+    echo "    7882-7894/UDP   — LiveKit media streams"
+    echo "    5349/TCP        — TURN over TLS"
+    echo "    3478/UDP        — TURN (STUN/relay)"
+    echo "    30000-40000/TCP+UDP — TURN relay"
+    echo ""
+    echo "  How: Log into your router (usually 192.168.1.1), find the"
+    echo "  \"Port Forwarding\" section, and add rules for each port above"
+    if [ -n "$INTERNAL_IP" ]; then
+      printf "  with the destination set to %b%s%b.\n" "$CYAN" "$INTERNAL_IP" "$NC"
+    else
+      echo "  with the destination set to this machine's IP."
+    fi
+    echo ""
+    echo "  These ports only need to be forwarded to this specific machine —"
+    echo "  this does NOT expose your entire network."
+    echo ""
+    printf "%b%s%b\n" "$YELLOW" "══════════════════════════════════════════════" "$NC"
+    echo ""
+    read -p "Press Enter to continue with the rebuild..."
+
+    printf "%b%s%b\n" "$YELLOW" "  Rebuilding to activate services with new domains..." "$NC"
+    echo ""
+    nixos-rebuild switch --flake /etc/nixos#nixos
+  '';
+
+  addDomainScript = pkgs.writeShellScriptBin "sovran-add-domains" ''
+    set -euo pipefail
+
+    GREEN='\033[0;32m'
+    YELLOW='\033[1;33m'
+    CYAN='\033[0;36m'
+    NC='\033[0m'
+    DOLLAR='$'
+
+    MISSING=false
+    NEW_NJALLA_ENTRIES=""
+    PENDING_NJALLA=""
+
+    echo ""
+    printf "%b%s%b\n" "$CYAN" "══════════════════════════════════════════════" "$NC"
+    printf "%b%s%b\n" "$CYAN" "  Sovran_SystemsOS — New Feature Domains" "$NC"
+    printf "%b%s%b\n" "$CYAN" "══════════════════════════════════════════════" "$NC"
+    echo ""
+    echo "  Checking for newly enabled features that need domains..."
+
+    mkdir -p /var/lib/domains
+
+    ${missingDomainPrompts}
+
+    if [ "$MISSING" = false ]; then
+      echo ""
+      printf "%b%s%b\n" "$GREEN" "  All domains are already configured. Nothing to do." "$NC"
+      echo ""
+      exit 0
+    fi
+
+    # ── Final review ──────────────────────────────────
+    echo ""
+    printf "%b%s%b\n" "$CYAN" "══════════════════════════════════════════════" "$NC"
+    printf "%b%s%b\n" "$CYAN" "  Review New Entries" "$NC"
+    printf "%b%s%b\n" "$CYAN" "══════════════════════════════════════════════" "$NC"
+    echo ""
+    echo "  All configured domains:"
+    ${domainSummary}
+    echo ""
+    echo "  New DDNS entries:"
+    if [ -n "$NEW_NJALLA_ENTRIES" ]; then
+      echo "$NEW_NJALLA_ENTRIES"
+    else
+      echo "    (none)"
+    fi
+    echo ""
+    read -p "  Does everything look correct? (y/n): " FINAL_CONFIRM
+    if [ "$FINAL_CONFIRM" != "y" ] && [ "$FINAL_CONFIRM" != "Y" ]; then
+      echo ""
+      printf "%b%s%b\n" "$YELLOW" "  Setup cancelled. Run 'sudo sovran-add-domains' to start over." "$NC"
+      echo ""
+      exit 1
+    fi
+
+    # ── Append new entries to njalla.sh ───────────────
+    if [ -n "$NEW_NJALLA_ENTRIES" ]; then
+      echo ""
+      printf "%b%s%b\n" "$GREEN" "── Updating DDNS script ──" "$NC"
+      echo "$NEW_NJALLA_ENTRIES" >> /var/lib/njalla/njalla.sh
+      echo "  Appended new entries to /var/lib/njalla/njalla.sh"
+
+      echo ""
+      read -p "Update Njal.la DNS records now? (y/n): " RUN_NOW
+      if [ "$RUN_NOW" = "y" ]; then
+        bash /var/lib/njalla/njalla.sh
+        echo "  DNS records updated."
+      fi
+    fi
+
+    # ── Summary ───────────────────────────────────────
+    echo ""
+    printf "%b%s%b\n" "$CYAN" "══════════════════════════════════════════════" "$NC"
+    printf "%b%s%b\n" "$CYAN" "  New Domains Added!" "$NC"
+    printf "%b%s%b\n" "$CYAN" "══════════════════════════════════════════════" "$NC"
+    echo ""
+    echo "  All configured domains:"
+    ${domainSummary}
+    echo ""
+
+    # ── Port Forwarding Reminder ──────────────────────
+    INTERNAL_IP=$(hostname -I 2>/dev/null | awk '{print $1}')
+    printf "%b%s%b\n" "$YELLOW" "══════════════════════════════════════════════" "$NC"
+    printf "%b  ⚠  Port Forwarding Reminder%b\n" "$YELLOW" "$NC"
+    printf "%b%s%b\n" "$YELLOW" "══════════════════════════════════════════════" "$NC"
+    echo ""
+    echo "  For your services to be reachable from the internet, you must"
+    echo "  set up PORT FORWARDING in your router's admin panel."
+    echo ""
+    if [ -n "$INTERNAL_IP" ]; then
+      printf "  Forward these ports to this machine's internal IP: %b%s%b\n" "$CYAN" "$INTERNAL_IP" "$NC"
+    else
+      echo "  Forward these ports to this machine's internal LAN IP."
+    fi
+    echo ""
+    echo "    80/TCP    — HTTP (redirects to HTTPS)"
+    echo "    443/TCP   — HTTPS (all domain-based services)"
+    echo "    8448/TCP  — Matrix federation (server-to-server)"
+    echo ""
+    echo "  If you enabled Element Calling, also forward:"
+    echo "    7881/TCP        — LiveKit WebRTC signalling"
+    echo "    7882-7894/UDP   — LiveKit media streams"
+    echo "    5349/TCP        — TURN over TLS"
+    echo "    3478/UDP        — TURN (STUN/relay)"
+    echo "    30000-40000/TCP+UDP — TURN relay"
+    echo ""
+    echo "  How: Log into your router (usually 192.168.1.1), find the"
+    echo "  \"Port Forwarding\" section, and add rules for each port above"
+    if [ -n "$INTERNAL_IP" ]; then
+      printf "  with the destination set to %b%s%b.\n" "$CYAN" "$INTERNAL_IP" "$NC"
+    else
+      echo "  with the destination set to this machine's IP."
+    fi
+    echo ""
+    echo "  These ports only need to be forwarded to this specific machine —"
+    echo "  this does NOT expose your entire network."
+    echo ""
+    printf "%b%s%b\n" "$YELLOW" "══════════════════════════════════════════════" "$NC"
+    echo ""
+    read -p "Press Enter to continue with the rebuild..."
+
+    printf "%b%s%b\n" "$YELLOW" "  Rebuilding to activate services with new domains..." "$NC"
+    echo ""
+    nixos-rebuild switch --impure
+  '';
+
+  needsSetup = pkgs.writeShellScriptBin "sovran-domains-need-setup" ''
+    # First boot — no setup done at all
+    if [ ! -f /var/lib/domains/.setup-complete ]; then
+      exit 0
+    fi
+
+    # Existing machine — check for missing domain files
+    for NAME in ${domainNamesList}; do
+      if [ ! -f "/var/lib/domains/$NAME" ]; then
+        exit 0
+      fi
+    done
+
+    # Everything is configured
+    exit 1
+  '';
+
+in
+{
+  environment.systemPackages = [
+    setupScript
+    addDomainScript
+    needsSetup
+  ];
+
+  environment.etc."xdg/autostart/sovran-setup-domains.desktop".text = ''
+    [Desktop Entry]
+    Type=Application
+    Name=Sovran_SystemsOS Domain Setup
+    Comment=Configure domains for newly enabled features
+    Exec=${pkgs.bash}/bin/bash -c 'if ${needsSetup}/bin/sovran-domains-need-setup; then if [ ! -f /var/lib/domains/.setup-complete ]; then ${pkgs.gnome-terminal}/bin/gnome-terminal -- sudo ${setupScript}/bin/sovran-setup-domains; else ${pkgs.gnome-terminal}/bin/gnome-terminal -- sudo ${addDomainScript}/bin/sovran-add-domains; fi; fi'
+    Terminal=false
+    X-GNOME-Autostart-enabled=true
+  '';
+}
@@ -0,0 +1,149 @@
+{ config, pkgs, lib, ... }: 
+
+let
+
+  customWallpaper = pkgs.stdenvNoCC.mkDerivation {
+    pname = "sovran-systemsos-wallpaper";
+    version = "1.0";
+    src = pkgs.fetchurl {
+      url = "https://git.sovransystems.com/Sovran_Systems/Sovran_SystemsOS_iso/raw/branch/main/post-install-scripts/Wallpaper_Dark_Wide.png";
+      sha256 = "0609gy0vp92fywl7pcr4y3mg05ca6pwxsnlsax14jd371fj4y7fn";
+    };
+    dontUnpack = true;
+    installPhase = ''
+      mkdir -p $out/share/backgrounds/sovran
+      cp $src $out/share/backgrounds/sovran/Wallpaper_Dark_Wide.png
+      '';
+  };
+
+in 
+
+{
+
+  environment.systemPackages = [ customWallpaper ];
+
+  programs.dconf.enable = true;
+
+  programs.dconf.profiles.user.databases = [
+  {
+    settings = {
+
+      "org/gnome/desktop/background" = {
+        picture-uri = "file:///run/current-system/sw/share/backgrounds/sovran/Wallpaper_Dark_Wide.png";
+        picture-uri-dark = "file:///run/current-system/sw/share/backgrounds/sovran/Wallpaper_Dark_Wide.png";
+        picture-options = "zoom";
+        primary-color = "#000000";
+        secondary-color = "#000000";
+      };
+
+      "org/gnome/desktop/input-sources" = {
+        sources = [ (lib.gvariant.mkTuple [ "xkb" "us" ]) ];
+        xkb-options = lib.gvariant.mkEmptyArray lib.gvariant.type.string;
+      };
+
+      "org/gnome/desktop/interface" = {
+        color-scheme = "prefer-dark";
+        enable-animations = true;
+        icon-theme = "Papirus-Dark";
+      };
+
+      "org/gnome/evolution-data-server" = {
+        migrated = true;
+      };
+
+      "org/gnome/mutter" = {
+        edge-tiling = false;
+      };
+
+      "org/gnome/nautilus/icon-view" = {
+        default-zoom-level = "large";
+      };
+
+      "org/gnome/nautilus/preferences" = {
+        default-folder-viewer = "icon-view";
+        migrated-gtk-settings = true;
+        search-filter-time-type = "last_modified";
+      };
+      
+      "org/gnome/shell" = {
+        disabled-extensions = [ "just-perfection-desktop@just-perfection" ];
+        
+        enabled-extensions = [
+          "appindicatorsupport@rgcjonas.gmail.com"
+          "dash-to-dock-cosmic-@halfmexicanhalfamazing@gmail.com"
+          "Vitals@CoreCoding.com"
+          "dash-to-dock@micxgx.gmail.com"
+          "pop-shell@system76.com"
+          "date-menu-formatter@marcinjakubowski.github.com"
+          "light-style@gnome-shell-extensions.gcampax.github.com"
+        ];
+
+        favorite-apps = [
+          "brave-browser.desktop"
+          "org.gnome.Settings.desktop"
+          "org.gnome.Nautilus.desktop"
+          "Sovran_SystemsOS_Updater.desktop"
+          "sovran-hub.desktop"
+          "org.gnome.Software.desktop"
+          "org.gnome.Geary.desktop"
+          "org.gnome.Contacts.desktop"
+          "org.gnome.Calendar.desktop"
+          "sparrow-desktop.desktop"
+          "Bisq.desktop"
+          "bisq2.desktop"
+        ];
+
+        welcome-dialog-last-shown-version = "48.4";
+      };
+
+      "org/gnome/shell/extensions/dash-to-dock" = {
+        background-color = "rgb(0,0,0)";
+        background-opacity = 0.50000000000000001;
+        custom-background-color = true;
+        dash-max-icon-size = lib.gvariant.mkInt32 47;
+        dock-position = "BOTTOM";
+        height-fraction = 0.90000000000000002;
+        preferred-monitor = lib.gvariant.mkInt32 (-2);
+        preferred-monitor-by-connector = "Virtual-1";
+        show-trash = false;
+        transparency-mode = "FIXED";
+      };
+
+      "org/gnome/shell/extensions/date-menu-formatter" = {
+        font-size = lib.gvariant.mkInt32 12;
+        pattern = "EEEE,  MMM d  h:mm a";
+        text-align = "center";
+        update-level = lib.gvariant.mkInt32 1;
+      };
+
+      "org/gnome/shell/extensions/just-perfection" = {
+        support-notifier-showed-version = lib.gvariant.mkInt32 34;
+        support-notifier-type = lib.gvariant.mkInt32 0;
+      };
+
+      "org/gnome/shell/extensions/pop-shell" = {
+        tile-by-default = true;
+      };
+
+      "org/gnome/shell/extensions/vitals" = {
+        hot-sensors = [
+          "_storage_free_"
+          "_processor_usage_"
+          "_memory_usage_"
+        ];
+      };
+
+      "org/gnome/software" = {
+        check-timestamp = lib.gvariant.mkInt64 1760848349;
+        first-run = false;
+      };
+
+      "org/gtk/gtk4/settings/color-chooser" = {
+        selected-color = lib.gvariant.mkTuple [ true 0.0 0.0 0.0 1.0 ];
+      };
+    };
+
+  }
+  ];
+
+}
@@ -0,0 +1,53 @@
+{ config, pkgs, lib, ... }:
+
+let
+  userName = "free";
+  keyPath = "/home/${userName}/.ssh/factory_login";
+  userExists = builtins.hasAttr userName config.users.users;
+in
+lib.mkIf userExists {
+
+  systemd.tmpfiles.rules = [
+    "d /root/.ssh 0700 root root -"
+    "d /home/${userName}/.ssh 0700 ${userName} users -"
+  ];
+
+  systemd.services.factory-ssh-keygen = {
+    description = "Generate factory SSH key for ${userName} if missing";
+    wantedBy = [ "multi-user.target" ];
+    serviceConfig = {
+      Type = "oneshot";
+      RemainAfterExit = true;
+    };
+    path = [ pkgs.openssh pkgs.coreutils ];
+    script = ''
+      if [ ! -f "${keyPath}" ]; then
+        ssh-keygen -q -N "gosovransystems" -t ed25519 -f "${keyPath}"
+        chown ${userName}:users "${keyPath}" "${keyPath}.pub"
+        chmod 600 "${keyPath}"
+        chmod 644 "${keyPath}.pub"
+      fi
+    '';
+  };
+
+  systemd.services.factory-ssh-authorize = {
+    description = "Authorize factory SSH key for root";
+    wantedBy = [ "multi-user.target" ];
+    after = [ "factory-ssh-keygen.service" ];
+    requires = [ "factory-ssh-keygen.service" ];
+    serviceConfig = {
+      Type = "oneshot";
+      RemainAfterExit = true;
+    };
+    path = [ pkgs.coreutils ];
+    script = ''
+      if [ -f "${keyPath}.pub" ]; then
+        PUB=$(cat "${keyPath}.pub")
+        mkdir -p /root/.ssh
+        touch /root/.ssh/authorized_keys
+        grep -qxF "$PUB" /root/.ssh/authorized_keys || echo "$PUB" >> /root/.ssh/authorized_keys
+        chmod 600 /root/.ssh/authorized_keys
+      fi
+    '';
+  };
+}
@@ -1,54 +0,0 @@
-{config, pkgs, lib, ...}:
-
-let
-	personalization = import ./personalization.nix;
-	
-	in
-lib.mkIf config.sovran_systemsOS.features.coturn {
-
-	systemd.services.coturn-helper = {
-	  
-	  script = ''
-	   
-	   systemctl restart coturn   
-	   
-	  '';
-
-	  unitConfig = {
-	  	Type = "simple";
-	    After = "btcpayserver.service";
-	    Requires = "network-online.target";
-	  };
-	   
-	  serviceConfig = {
-	    RemainAfterExit = "yes";
-	    Type = "oneshot";
-	  };
-
-	  wantedBy = [ "multi-user.target" ];
-	
-	};
-
-
-	services.coturn = {
-	
-	enable = true;
-	use-auth-secret = true;
-	static-auth-secret = "${personalization.coturn_static_auth_secret}";
-	realm = personalization.matrix_url;
-	cert = "/var/lib/coturn/${personalization.matrix_url}.crt.pem";
-	pkey = "/var/lib/coturn/${personalization.matrix_url}.key.pem";
-	min-port = 49152;
-	max-port = 65535;
-	listening-port = 5349;
-	no-cli = true;
-	extraConfig = ''
-		verbose
-		external-ip=${personalization.external_ip_secret}
-		stale-nonce
-		fingerprint
-	'';
-	
-	};
-
-}
@@ -0,0 +1,444 @@
+{ config, pkgs, lib, ... }:
+
+let
+  fonts = pkgs.liberation_ttf;
+
+  # ── Helper: change 'free' password and save it ─────────────
+  change-free-password = pkgs.writeShellScriptBin "change-free-password" ''
+    set -euo pipefail
+    SECRET_FILE="/var/lib/secrets/free-password"
+
+    if [ "$(id -u)" -ne 0 ]; then
+      echo "Error: must be run as root (use sudo)." >&2
+      exit 1
+    fi
+
+    echo -n "New password for free: "
+    read -rs NEW_PASS
+    echo
+    echo -n "Confirm password: "
+    read -rs CONFIRM
+    echo
+
+    if [ "$NEW_PASS" != "$CONFIRM" ]; then
+      echo "Passwords do not match." >&2
+      exit 1
+    fi
+
+    if [ -z "$NEW_PASS" ]; then
+      echo "Password cannot be empty." >&2
+      exit 1
+    fi
+
+    echo "free:$NEW_PASS" | ${pkgs.shadow}/bin/chpasswd
+    mkdir -p /var/lib/secrets
+    echo "$NEW_PASS" > "$SECRET_FILE"
+    chmod 600 "$SECRET_FILE"
+    echo "Password for 'free' updated and saved."
+  '';
+in
+{
+  # ── Make helper available system-wide ───────────────────────
+  environment.systemPackages = [ change-free-password ];
+
+  # ── Shell aliases: intercept 'passwd free' ─────────────────
+  programs.bash.interactiveShellInit = ''
+    passwd() {
+      if [ "$1" = "free" ]; then
+        echo ""
+        echo "╔══════════════════════════════════════════════════════╗"
+        echo "║  ⚠  Use 'sudo change-free-password' instead.       ║"
+        echo "║                                                      ║"
+        echo "║  'passwd free' only updates /etc/shadow.             ║"
+        echo "║  The Hub and Magic Keys PDF will NOT be updated.     ║"
+        echo "╚══════════════════════════════════════════════════════╝"
+        echo ""
+        return 1
+      fi
+      command passwd "$@"
+    }
+  '';
+
+  programs.fish.interactiveShellInit = ''
+    function passwd --wraps passwd
+      if test "$argv[1]" = "free"
+        echo ""
+        echo "╔══════════════════════════════════════════════════════╗"
+        echo "║  ⚠  Use 'sudo change-free-password' instead.       ║"
+        echo "║                                                      ║"
+        echo "║  'passwd free' only updates /etc/shadow.             ║"
+        echo "║  The Hub and Magic Keys PDF will NOT be updated.     ║"
+        echo "╚════════════════════════════��═════════════════════════╝"
+        echo ""
+        return 1
+      end
+      command passwd $argv
+    end
+  '';
+
+  # ── 1. Auto-Generate Root Password (Runs once) ─────────────
+  systemd.services.root-password-setup = {
+    description = "Generate and set a random root password";
+    wantedBy = [ "multi-user.target" ];
+    serviceConfig = {
+      Type = "oneshot";
+      RemainAfterExit = true;
+    };
+    path = [ pkgs.pwgen pkgs.shadow pkgs.coreutils ];
+    script = ''
+      SECRET_FILE="/var/lib/secrets/root-password"
+      if [ ! -f "$SECRET_FILE" ]; then
+        mkdir -p /var/lib/secrets
+        ROOT_PASS=$(pwgen -s 20 1)
+        echo "root:$ROOT_PASS" | chpasswd
+        echo "$ROOT_PASS" > "$SECRET_FILE"
+        chmod 600 "$SECRET_FILE"
+      fi
+    '';
+  };
+
+  # ── 1b. Save 'free' password on first boot ─────────────────
+  systemd.services.free-password-setup = {
+    description = "Save the initial 'free' user password";
+    wantedBy = [ "multi-user.target" ];
+    serviceConfig = {
+      Type = "oneshot";
+      RemainAfterExit = true;
+    };
+    path = [ pkgs.coreutils ];
+    script = ''
+      SECRET_FILE="/var/lib/secrets/free-password"
+      if [ ! -f "$SECRET_FILE" ]; then
+        mkdir -p /var/lib/secrets
+        echo "free" > "$SECRET_FILE"
+        chmod 600 "$SECRET_FILE"
+      fi
+    '';
+  };
+
+  # ── 1c. Save Zeus/lndconnect URL for hub credentials ────────
+  systemd.services.zeus-connect-setup = {
+    description = "Save Zeus lndconnect URL";
+    wantedBy = [ "multi-user.target" ];
+    after = [ "lnd.service" ];
+    serviceConfig = {
+      Type = "oneshot";
+      RemainAfterExit = true;
+    };
+    path = [ pkgs.coreutils "/run/current-system/sw" ];
+    script = ''
+      SECRET_FILE="/var/lib/secrets/zeus-connect-url"
+      mkdir -p /var/lib/secrets
+
+      URL=""
+      if command -v lndconnect >/dev/null 2>&1; then
+        URL=$(lndconnect --url 2>/dev/null || true)
+      elif command -v lnconnect-clnrest >/dev/null 2>&1; then
+        URL=$(lnconnect-clnrest --url 2>/dev/null || true)
+      fi
+
+      if [ -n "$URL" ]; then
+        echo "$URL" > "$SECRET_FILE"
+        chmod 600 "$SECRET_FILE"
+        echo "Zeus connect URL saved."
+      else
+        echo "No lndconnect URL available yet."
+      fi
+    '';
+  };
+
+  # ── Refresh Zeus URL periodically (certs/macaroons may rotate)
+  systemd.timers.zeus-connect-setup = {
+    wantedBy = [ "timers.target" ];
+    timerConfig = {
+      OnBootSec = "2min";
+      OnUnitActiveSec = "30min";
+      Unit = "zeus-connect-setup.service";
+    };
+  };
+
+  # ── 2. Timer: Check every 5 minutes ────────────────────────
+  systemd.timers.generate-credentials-pdf = {
+    description = "Periodically check if Magic Keys PDF needs regenerating";
+    wantedBy = [ "timers.target" ];
+    timerConfig = {
+      OnBootSec = "30s";
+      OnUnitActiveSec = "5min";
+      Unit = "generate-credentials-pdf.service";
+    };
+  };
+
+  # ── 3. Generate the Magic Keys PDF ─────────────────────────
+  systemd.services.generate-credentials-pdf = {
+    description = "Generate Magic Keys PDF for Sovran_SystemsOS";
+    serviceConfig = {
+      Type = "oneshot";
+    };
+
+    path = [
+      pkgs.pandoc
+      pkgs.typst
+      pkgs.coreutils
+      pkgs.qrencode
+      pkgs.gnugrep
+      fonts
+      "/run/current-system/sw"
+    ];
+
+    environment = {
+      TYPST_FONT_PATHS = "${fonts}/share/fonts";
+    };
+
+    script = ''
+      DOC_DIR="/home/free/Documents"
+      OUTPUT="$DOC_DIR/Sovran_SystemsOS_Magic_Keys.pdf"
+      WORK_DIR="/tmp/magic_keys_build"
+      FILE="$WORK_DIR/magic_keys.md"
+      HASH_FILE="/var/lib/secrets/.magic-keys-hash"
+
+      FENCE='```'
+
+      # ── Collect all secret sources into a single hash ──
+      SECRET_SOURCES=""
+      for f in \
+        /var/lib/secrets/root-password \
+        /var/lib/secrets/free-password \
+        /etc/nix-bitcoin-secrets/rtl-password \
+        /var/lib/tor/onion/rtl/hostname \
+        /var/lib/tor/onion/electrs/hostname \
+        /var/lib/tor/onion/bitcoind/hostname \
+        /var/lib/secrets/matrix-users \
+        /var/lib/gnome-remote-desktop/rdp-credentials \
+        /var/lib/secrets/nextcloud-admin \
+        /var/lib/secrets/wordpress-admin \
+        /var/lib/secrets/vaultwarden/vaultwarden.env \
+        /var/lib/domains/vaultwarden \
+        /var/lib/domains/btcpayserver \
+        /var/lib/secrets/zeus-connect-url; do
+        if [ -f "$f" ]; then
+          SECRET_SOURCES="$SECRET_SOURCES$(cat "$f")"
+        fi
+      done
+
+      # Add lndconnect URL to hash sources (changes if certs/macaroons rotate)
+      if command -v lndconnect >/dev/null 2>&1; then
+        SECRET_SOURCES="$SECRET_SOURCES$(lndconnect --url 2>/dev/null || true)"
+      elif command -v lnconnect-clnrest >/dev/null 2>&1; then
+        SECRET_SOURCES="$SECRET_SOURCES$(lnconnect-clnrest --url 2>/dev/null || true)"
+      fi
+
+      CURRENT_HASH=$(echo -n "$SECRET_SOURCES" | sha256sum | cut -d' ' -f1)
+      OLD_HASH=""
+      if [ -f "$HASH_FILE" ]; then
+        OLD_HASH=$(cat "$HASH_FILE")
+      fi
+
+      # ── Skip if PDF exists and nothing changed ──
+      if [ -f "$OUTPUT" ] && [ "$CURRENT_HASH" = "$OLD_HASH" ]; then
+        echo "No changes detected, skipping PDF regeneration."
+        exit 0
+      fi
+
+      echo "Changes detected (or PDF missing), regenerating..."
+      mkdir -p "$DOC_DIR" "$WORK_DIR"
+
+      # ── Read secrets (default to placeholder if missing) ──
+      read_secret() { if [ -f "$1" ]; then cat "$1"; else echo "$2"; fi; }
+
+      ROOT_PASS=$(read_secret /var/lib/secrets/root-password "Generating...")
+      FREE_PASS=$(read_secret /var/lib/secrets/free-password "free")
+      RTL_PASS=$(read_secret /etc/nix-bitcoin-secrets/rtl-password "Not found")
+      RTL_ONION=$(read_secret /var/lib/tor/onion/rtl/hostname "Not generated yet")
+      ELECTRS_ONION=$(read_secret /var/lib/tor/onion/electrs/hostname "Not generated yet")
+      BITCOIN_ONION=$(read_secret /var/lib/tor/onion/bitcoind/hostname "Not generated yet")
+
+      # ── Generate Zeus QR code PNG if lndconnect URL is available ──
+      ZEUS_URL=""
+      HAS_ZEUS_QR=""
+      if command -v lndconnect >/dev/null 2>&1; then
+        ZEUS_URL=$(lndconnect --url 2>/dev/null || true)
+      elif command -v lnconnect-clnrest >/dev/null 2>&1; then
+        ZEUS_URL=$(lnconnect-clnrest --url 2>/dev/null || true)
+      fi
+
+      if [ -n "$ZEUS_URL" ]; then
+        qrencode -o "$WORK_DIR/zeus-qr.png" -s 4 -m 1 -l H "$ZEUS_URL" 2>/dev/null && HAS_ZEUS_QR="1"
+      fi
+
+      # ── Build the Markdown document ──
+      cat > "$FILE" << ENDOFFILE
+---
+title: "Sovran SystemsOS Magic Keys"
+---
+
+# Your Sovran SystemsOS Magic Keys! 🗝️
+
+Welcome to your new computer! We have built a lot of cool secret forts (services) for you. To get into your forts, you need your magic keys (passwords).
+
+Here are all of your keys in one place. **Keep this document safe and do not share it with strangers!**
+
+> **How this document works:** This PDF is automatically generated by your computer. If any of your passwords, services, or connection details change, this document will automatically update itself within a few minutes. You can always find the latest version right here in your Documents folder. If you accidentally delete it, don't worry — your computer will recreate it for you!
+
+## 🖥️ Your Computer
+These are the master keys to the actual machine.
+
+### 1. Main Screen Unlock (The 'free' account)
+When you turn the computer on, it usually logs you in automatically. However, if the screen goes to sleep, or **if you enable Remote Desktop (RDP)**, you will need this to log in:
+- **Username:** \`free\`
+- **Password:** \`$FREE_PASS\`
+
+🚨 **VERY IMPORTANT:** You MUST write this password down and keep it safe! If you lose it, you will be locked out of your computer!
+
+### 2. The Big Boss (Root)
+Sometimes a pop-up box might ask for an Administrator (Root) password to change a setting. We created a super-secret password just for this!
+- **Root Password:** \`$ROOT_PASS\`
+
+### 3. The Hacker Terminal (\`ssh root@localhost\`)
+Because your main account is so safe, you cannot just type normal commands to become the boss. If you open a black terminal box and want to make big changes, you must use your special factory key!
+
+Type this exact command into the terminal:
+\`ssh root@localhost\`
+
+When it asks for a passphrase, type:
+- **Terminal Password:** \`gosovransystems\`
+ENDOFFILE
+
+      # --- BITCOIN ECOSYSTEM ---
+      if [ -f "/etc/nix-bitcoin-secrets/rtl-password" ] || [ -f "/var/lib/tor/onion/rtl/hostname" ]; then
+        cat >> "$FILE" << BITCOIN
+
+## ⚡ Your Bitcoin & Lightning Node
+Your computer is a real Bitcoin node! It talks to the network secretly using Tor. Here is how to connect your wallet apps to it:
+
+### 1. Ride The Lightning (RTL)
+*This is the control panel for your Lightning Node.*
+Open the **Tor Browser** and go to this website. Use this password to log in:
+- **Website:** \`http://$RTL_ONION\`
+- **Password:** \`$RTL_PASS\`
+
+### 2. Electrs (Your Private Bank Teller)
+*If you use a wallet app on your phone or computer (like Sparrow or BlueWallet), tell it to connect here so nobody can spy on your money!*
+- **Tor Address:** \`$ELECTRS_ONION\`
+- **Port:** \`50001\`
+
+### 3. Bitcoin Core
+*This is the heartbeat of your node. It uses this address to talk to other Bitcoiners securely.*
+- **Tor Address:** \`$BITCOIN_ONION\`
+BITCOIN
+      fi
+
+      # --- ZEUS MOBILE WALLET QR CODE ---
+      if [ "$HAS_ZEUS_QR" = "1" ]; then
+        echo "" >> "$FILE"
+        echo "## 📱 Connect Zeus Mobile Wallet" >> "$FILE"
+        echo "" >> "$FILE"
+        echo "Take your Bitcoin Lightning node anywhere in the world! Scan this QR code with the **Zeus** app on your phone to instantly connect your mobile wallet to your Lightning node." >> "$FILE"
+        echo "" >> "$FILE"
+        echo "1. Download **Zeus** from the App Store or Google Play" >> "$FILE"
+        echo "2. Open Zeus and tap **\"Scan Node Config\"**" >> "$FILE"
+        echo "3. Point your phone's camera at this QR code:" >> "$FILE"
+        echo "" >> "$FILE"
+        echo "![Zeus Connection QR Code](zeus-qr.png){ width=200px }" >> "$FILE"
+        echo "" >> "$FILE"
+        echo "That's it! You're now mobile. Send and receive Bitcoin anywhere in the world, powered by your very own node! ⚡" >> "$FILE"
+      elif [ -n "$ZEUS_URL" ]; then
+        echo "" >> "$FILE"
+        echo "## 📱 Connect Zeus Mobile Wallet" >> "$FILE"
+        echo "" >> "$FILE"
+        echo "Take your Bitcoin Lightning node anywhere in the world! Paste this connection URL into the **Zeus** app on your phone:" >> "$FILE"
+        echo "" >> "$FILE"
+        echo "1. Download **Zeus** from the App Store or Google Play" >> "$FILE"
+        echo "2. Open Zeus and tap **\"Scan Node Config\"** then **\"Paste Node Config\"**" >> "$FILE"
+        echo "3. Paste this URL:" >> "$FILE"
+        echo "" >> "$FILE"
+        echo "$FENCE" >> "$FILE"
+        echo "$ZEUS_URL" >> "$FILE"
+        echo "$FENCE" >> "$FILE"
+        echo "" >> "$FILE"
+        echo "That's it! You're now mobile. Send and receive Bitcoin anywhere in the world, powered by your very own node! ⚡" >> "$FILE"
+      fi
+
+      # --- MATRIX / ELEMENT ---
+      if [ -f "/var/lib/secrets/matrix-users" ]; then
+        echo "" >> "$FILE"
+        echo "## 💬 Your Private Chat (Matrix / Element)" >> "$FILE"
+        echo "This is your very own private messaging app! Log in using an app like Element with these details:" >> "$FILE"
+        echo "$FENCE" >> "$FILE"
+        cat /var/lib/secrets/matrix-users >> "$FILE"
+        echo "$FENCE" >> "$FILE"
+      fi
+
+      # --- GNOME RDP ---
+      if [ -f "/var/lib/gnome-remote-desktop/rdp-credentials" ]; then
+        echo "" >> "$FILE"
+        echo "## 🌎 Connect from Far Away (Remote Desktop)" >> "$FILE"
+        echo "This lets you control your computer screen from another device!" >> "$FILE"
+        echo "$FENCE" >> "$FILE"
+        cat /var/lib/gnome-remote-desktop/rdp-credentials >> "$FILE"
+        echo "$FENCE" >> "$FILE"
+      fi
+
+      # --- NEXTCLOUD ---
+      if [ -f "/var/lib/secrets/nextcloud-admin" ]; then
+        echo "" >> "$FILE"
+        echo "## ☁️ Your Personal Cloud (Nextcloud)" >> "$FILE"
+        echo "This is like your own private Google Drive!" >> "$FILE"
+        echo "$FENCE" >> "$FILE"
+        cat /var/lib/secrets/nextcloud-admin >> "$FILE"
+        echo "$FENCE" >> "$FILE"
+      fi
+
+      # --- WORDPRESS ---
+      if [ -f "/var/lib/secrets/wordpress-admin" ]; then
+        echo "" >> "$FILE"
+        echo "## 📝 Your Website (WordPress)" >> "$FILE"
+        echo "This is your very own website where you can write blogs or make pages." >> "$FILE"
+        echo "$FENCE" >> "$FILE"
+        cat /var/lib/secrets/wordpress-admin >> "$FILE"
+        echo "$FENCE" >> "$FILE"
+      fi
+
+      # --- VAULTWARDEN ---
+      if [ -f "/var/lib/domains/vaultwarden" ]; then
+        DOMAIN=$(cat /var/lib/domains/vaultwarden)
+        VW_ADMIN_TOKEN="Not found"
+        if [ -f "/var/lib/secrets/vaultwarden/vaultwarden.env" ]; then
+          VW_ADMIN_TOKEN=$(grep -oP 'ADMIN_TOKEN=\K.*' /var/lib/secrets/vaultwarden/vaultwarden.env || echo "Not found")
+        fi
+        echo "" >> "$FILE"
+        echo "## 🔐 Your Password Manager (Vaultwarden)" >> "$FILE"
+        echo "This keeps all your other passwords safe! Go to this website to use it:" >> "$FILE"
+        echo "- **Website:** https://$DOMAIN" >> "$FILE"
+        echo "- **Admin Panel:** https://$DOMAIN/admin" >> "$FILE"
+        echo "- **Admin Token:** \`$VW_ADMIN_TOKEN\`" >> "$FILE"
+        echo "" >> "$FILE"
+        echo "*(Create your own account on the main page. Use the Admin Token to access the admin panel and manage your server.)*" >> "$FILE"
+      fi
+
+      # --- BTCPAY SERVER ---
+      if [ -f "/var/lib/domains/btcpayserver" ]; then
+        DOMAIN=$(cat /var/lib/domains/btcpayserver)
+        echo "" >> "$FILE"
+        echo "## ₿ Your Bitcoin Store (BTCPay Server)" >> "$FILE"
+        echo "This lets you accept Bitcoin like a real shop!" >> "$FILE"
+        echo "- **Website:** https://$DOMAIN" >> "$FILE"
+        echo "*(You make up your own Admin Password the first time you visit!)*" >> "$FILE"
+      fi
+
+      # ── Generate PDF (cd into work dir so Typst finds images) ──
+      cd "$WORK_DIR"
+      pandoc magic_keys.md -o "$OUTPUT" --pdf-engine=typst \
+        -V mainfont="Liberation Sans" \
+        -V monofont="Liberation Mono"
+
+      chown free:users "$OUTPUT"
+
+      # ── Save hash so we skip next time if nothing changed ──
+      mkdir -p "$(dirname "$HASH_FILE")"
+      echo "$CURRENT_HASH" > "$HASH_FILE"
+
+      rm -rf "$WORK_DIR"
+      echo "PDF generated successfully."
+    '';
+  };
+}
@@ -1,7 +1,6 @@
 { config, pkgs, lib, ... }:

 let
-  personalization = import ./personalization.nix;
  livekitKeyFile = "/var/lib/livekit/livekit_keyFile";
 in

@@ -16,7 +15,6 @@ lib.mkIf config.sovran_systemsOS.features.element-calling {
    description = "Generate LiveKit key file if missing";
    wantedBy = [ "multi-user.target" ];
    before = [ "livekit.service" "lk-jwt-service.service" ];
-    requires = [];
    serviceConfig = {
      Type = "oneshot";
      RemainAfterExit = true;
@@ -41,36 +39,88 @@ lib.mkIf config.sovran_systemsOS.features.element-calling {
  systemd.services.lk-jwt-service.after = [ "livekit-key-setup.service" ];
  systemd.services.lk-jwt-service.wants = [ "livekit-key-setup.service" ];

-  ####### CADDY CONFIGS #######
-  services.caddy.virtualHosts = lib.mkForce {
-    "${personalization.matrix_url}" = {
-      extraConfig = ''
-        reverse_proxy /_matrix/* http://localhost:8008
-        reverse_proxy /_synapse/client/* http://localhost:8008
-        header /.well-known/matrix/* Content-Type "application/json"
-        header /.well-known/matrix/* Access-Control-Allow-Origin "*"
-        header /.well-known/matrix/* Access-Control-Allow-Methods "GET, POST, PUT, DELETE, OPTIONS"
-        header /.well-known/matrix/* Access-Control-Allow-Headers "X-Requested-With, Content-Type, Authorization"
-        respond /.well-known/matrix/client `{ "m.homeserver": {"base_url": "https://${personalization.matrix_url}" }, "org.matrix.msc4143.rtc_foci": [{ "type":"livekit", "livekit_service_url":"https://${personalization.element-calling_url}/livekit/jwt" }] }`
-      '';
+  ####### CADDY SNIPPET #######
+  systemd.services.element-calling-caddy-config = {
+    description = "Generate Element Calling Caddy config snippet";
+    before = [ "caddy-generate-config.service" ];
+    requiredBy = [ "caddy-generate-config.service" ];
+    wantedBy = [ "multi-user.target" ];
+    serviceConfig = {
+      Type = "oneshot";
+      RemainAfterExit = true;
    };
+    unitConfig = {
+      ConditionPathExists = "/var/lib/domains/element-calling";
+    };
+    path = [ pkgs.coreutils ];
+    script = ''
+      MATRIX=$(cat /var/lib/domains/matrix)
+      ELEMENT_CALLING=$(cat /var/lib/domains/element-calling)

-    "${personalization.element-calling_url}" = {
-      extraConfig = ''
-        handle /livekit/jwt/sfu/get {
-          uri strip_prefix /livekit/jwt
-          reverse_proxy [::1]:8073 {
-            header_up Host {host}
-            header_up X-Forwarded-Server {host}
-            header_up X-Real-IP {remote_host}
-            header_up X-Forwarded-For {remote_host}
-          }
-        }
-        handle {
-          reverse_proxy localhost:7880
-        }
-      '';
+      mkdir -p /run/caddy
+
+      cat > /run/caddy/element-calling.snippet <<EOF
+$MATRIX {
+  reverse_proxy /_matrix/* http://localhost:8008
+  reverse_proxy /_synapse/client/* http://localhost:8008
+  header /.well-known/matrix/* Content-Type "application/json"
+  header /.well-known/matrix/* Access-Control-Allow-Origin "*"
+  header /.well-known/matrix/* Access-Control-Allow-Methods "GET, POST, PUT, DELETE, OPTIONS"
+  header /.well-known/matrix/* Access-Control-Allow-Headers "X-Requested-With, Content-Type, Authorization"
+  respond /.well-known/matrix/client \`{ "m.homeserver": {"base_url": "https://$MATRIX" }, "org.matrix.msc4143.rtc_foci": [{ "type":"livekit", "livekit_service_url":"https://$ELEMENT_CALLING/livekit/jwt" }] }\`
+}
+
+$MATRIX:8448 {
+  reverse_proxy http://localhost:8008
+}
+
+$ELEMENT_CALLING {
+  handle /livekit/jwt/sfu/get {
+    uri strip_prefix /livekit/jwt
+    reverse_proxy [::1]:8073 {
+      header_up Host {host}
+      header_up X-Forwarded-Server {host}
+      header_up X-Real-IP {remote_host}
+      header_up X-Forwarded-For {remote_host}
+    }
+  }
+  handle {
+    reverse_proxy localhost:7880
+  }
+}
+EOF
+    '';
+  };
+
+  ####### LIVEKIT RUNTIME CONFIG #######
+  systemd.services.livekit-runtime-config = {
+    description = "Generate LiveKit runtime config from domain files";
+    before = [ "livekit.service" ];
+    after = [ "livekit-key-setup.service" ];
+    requiredBy = [ "livekit.service" ];
+    wantedBy = [ "multi-user.target" ];
+    serviceConfig = {
+      Type = "oneshot";
+      RemainAfterExit = true;
    };
+    unitConfig = {
+      ConditionPathExists = "/var/lib/domains/element-calling";
+    };
+    path = [ pkgs.coreutils ];
+    script = ''
+      MATRIX=$(cat /var/lib/domains/matrix)
+
+      mkdir -p /run/livekit
+
+      cat > /run/livekit/runtime-config.yaml <<EOF
+turn:
+  domain: $MATRIX
+  cert_file: /var/lib/livekit/$MATRIX.crt
+  key_file: /var/lib/livekit/$MATRIX.key
+EOF
+
+      chmod 640 /run/livekit/runtime-config.yaml
+    '';
  };

  ####### LIVEKIT SERVICE #######
@@ -84,11 +134,8 @@ lib.mkIf config.sovran_systemsOS.features.element-calling {
      room.auto_create = false;
      turn = {
        enabled = true;
-        domain = "${personalization.matrix_url}";
        tls_port = 5349;
        udp_port = 3478;
-        cert_file = "/var/lib/livekit/${personalization.matrix_url}.crt";
-        key_file = "/var/lib/livekit/${personalization.matrix_url}.key";
      };
    };
  };
@@ -98,56 +145,92 @@ lib.mkIf config.sovran_systemsOS.features.element-calling {
    { from = 7882; to = 7894; }
  ];

+  ####### JWT SERVICE RUNTIME CONFIG #######
+  systemd.services.lk-jwt-service-runtime-config = {
+    description = "Generate lk-jwt-service runtime config from domain files";
+    before = [ "lk-jwt-service.service" ];
+    after = [ "livekit-key-setup.service" ];
+    requiredBy = [ "lk-jwt-service.service" ];
+    wantedBy = [ "multi-user.target" ];
+    serviceConfig = {
+      Type = "oneshot";
+      RemainAfterExit = true;
+    };
+    unitConfig = {
+      ConditionPathExists = "/var/lib/domains/element-calling";
+    };
+    path = [ pkgs.coreutils ];
+    script = ''
+      ELEMENT_CALLING=$(cat /var/lib/domains/element-calling)
+
+      mkdir -p /run/lk-jwt-service
+
+      cat > /run/lk-jwt-service/env <<EOF
+LIVEKIT_URL=wss://$ELEMENT_CALLING
+EOF
+
+      chmod 640 /run/lk-jwt-service/env
+    '';
+  };
+
  ####### JWT SERVICE #######
  services.lk-jwt-service = {
    enable = true;
    port = 8073;
-    livekitUrl = "wss://${personalization.element-calling_url}";
    keyFile = livekitKeyFile;
+    livekitUrl = "wss://placeholder.local";
  };

-  ####### MATRIX-SYNAPSE SETTINGS #######
-  services.matrix-synapse = {
-    settings = lib.mkForce {
-      serve_server_wellknown = true;
-      public_baseurl = "${personalization.matrix_url}";
-      experimental_features = {
-        msc3266_enabled = true;
-        msc4222_enabled = true;
-      };
-      max_event_delay_duration = "24h";
-      rc_message = { per_second = 0.5; burst_count = 30; };
-      rc_delayed_event_mgmt = { per_second = 1; burst_count = 20; };
-      push.include_content = false;
-      server_name = personalization.matrix_url;
-      url_preview_enabled = true;
-      group_unread_count_by_room = false;
-      encryption_enabled_by_default_for_room_type = "invite";
-      allow_profile_lookup_over_federation = false;
-      allow_device_name_lookup_over_federation = false;
-      url_preview_ip_range_blacklist = [
-        "10.0.0.0/8" "100.64.0.0/10" "169.254.0.0/16" "172.16.0.0/12"
-        "192.0.0.0/24" "192.0.2.0/24" "192.168.0.0/16" "192.88.99.0/24"
-        "198.18.0.0/15" "198.51.100.0/24" "2001:db8::/32" "203.0.113.0/24"
-        "224.0.0.0/4" "::1/128" "fc00::/7" "fe80::/10" "fec0::/10" "ff00::/8"
-      ];
-      url_preview_ip_ranger_whitelist = [ "127.0.0.1" ];
-      presence.enabled = true;
-      enable_registration = false;
-      registration_shared_secret = config.age.secrets.matrix_reg_secret.path;
-      listeners = [
-        {
-          port = 8008;
-          bind_addresses = [ "::1" ];
-          type = "http";
-          tls = false;
-          x_forwarded = true;
-          resources = [
-            { names = [ "client" ]; compress = true; }
-            { names = [ "federation" ]; compress = false; }
-          ];
-        }
-      ];
+  systemd.services.lk-jwt-service.serviceConfig.EnvironmentFile = [
+    "/run/lk-jwt-service/env"
+  ];
+
+  ####### SYNAPSE RUNTIME CONFIG (element-calling additions) #######
+  systemd.services.element-calling-synapse-config = {
+    description = "Generate Synapse runtime config for Element Calling";
+    before = [ "matrix-synapse.service" ];
+    requiredBy = [ "matrix-synapse.service" ];
+    wantedBy = [ "multi-user.target" ];
+    serviceConfig = {
+      Type = "oneshot";
+      RemainAfterExit = true;
    };
+    unitConfig = {
+      ConditionPathExists = "/var/lib/domains/element-calling";
+    };
+    path = [ pkgs.coreutils ];
+    script = ''
+      MATRIX=$(cat /var/lib/domains/matrix)
+
+      mkdir -p /run/matrix-synapse
+
+      cat > /run/matrix-synapse/element-calling-config.yaml <<EOF
+server_name: "$MATRIX"
+public_baseurl: "https://$MATRIX"
+serve_server_wellknown: true
+experimental_features:
+  msc3266_enabled: true
+  msc4222_enabled: true
+max_event_delay_duration: "24h"
+rc_message:
+  per_second: 0.5
+  burst_count: 30
+rc_delayed_event_mgmt:
+  per_second: 1
+  burst_count: 20
+EOF
+
+      chown matrix-synapse:matrix-synapse /run/matrix-synapse/element-calling-config.yaml
+      chmod 640 /run/matrix-synapse/element-calling-config.yaml
+    '';
  };
+
+  ####### SYNAPSE OVERRIDES (element-calling needs) #######
+  services.matrix-synapse.extraConfigFiles = [
+    "/run/matrix-synapse/element-calling-config.yaml"
+  ];
+
+  sovran_systemsOS.domainRequirements = [
+    { name = "element-calling"; label = "Element Calling (LiveKit)"; example = "call.yourdomain.com"; }
+  ];
 }
@@ -1,17 +1,52 @@
 { config, pkgs, lib, ... }:

 let
-  personalization = import ./personalization.nix;
  npub = config.sovran_systemsOS.nostr_npub;
 in

 lib.mkIf (config.sovran_systemsOS.features.haven && npub != "") {

+  # ── Generate Haven runtime config from domain files ───────
+  systemd.services.haven-runtime-config = {
+    description = "Generate Haven runtime config from domain files";
+    before = [ "haven.service" ];
+    requiredBy = [ "haven.service" ];
+    wantedBy = [ "multi-user.target" ];
+    serviceConfig = {
+      Type = "oneshot";
+      RemainAfterExit = true;
+    };
+    unitConfig = {
+      ConditionPathExists = "/var/lib/domains/haven";
+    };
+    path = [ pkgs.coreutils ];
+    script = ''
+      HAVEN=$(cat /var/lib/domains/haven)
+
+      mkdir -p /run/haven
+
+      cat > /run/haven/runtime.env <<EOF
+RELAY_URL=$HAVEN
+PRIVATE_RELAY_NAME=$HAVEN private relay
+PRIVATE_RELAY_DESCRIPTION=The Relay From Sovran Systems
+CHAT_RELAY_NAME=$HAVEN chat relay
+CHAT_RELAY_DESCRIPTION=a relay for private chats
+OUTBOX_RELAY_NAME=$HAVEN outbox relay
+OUTBOX_RELAY_DESCRIPTION=a relay and Blossom server for public messages and media
+INBOX_RELAY_NAME=$HAVEN inbox relay
+INBOX_RELAY_DESCRIPTION=send your interactions with my notes here
+EOF
+
+      chmod 640 /run/haven/runtime.env
+      chown haven:haven /run/haven/runtime.env
+    '';
+  };
+
  services.haven = {
    enable = true;
    settings = {
      OWNER_NPUB = npub;
-      RELAY_URL = personalization.haven_url;
+      # RELAY_URL injected at runtime via EnvironmentFile

      RELAY_PORT = 3355;
      RELAY_BIND_ADDRESS = "0.0.0.0";
@@ -19,25 +54,13 @@ lib.mkIf (config.sovran_systemsOS.features.haven && npub != "") {
      LMDB_MAPSIZE = 3000000000;
      BLOSSOM_PATH = "blossom/";

-      PRIVATE_RELAY_NAME = "${personalization.haven_url} private relay";
+      # Relay names/descriptions injected at runtime via EnvironmentFile
      PRIVATE_RELAY_NPUB = npub;
-      PRIVATE_RELAY_DESCRIPTION = "The Relay From Sovran Systems";
-
-      CHAT_RELAY_NAME = "${personalization.haven_url} chat relay";
      CHAT_RELAY_NPUB = npub;
-      CHAT_RELAY_DESCRIPTION = "a relay for private chats";
-
-      OUTBOX_RELAY_NAME = "${personalization.haven_url} outbox relay";
      OUTBOX_RELAY_NPUB = npub;
-      OUTBOX_RELAY_DESCRIPTION = "a relay and Blossom server for public messages and media";
-
-      INBOX_RELAY_NAME = "${personalization.haven_url} inbox relay";
-      INBOX_RELAY_NPUB = npub;
-      INBOX_RELAY_DESCRIPTION = "send your interactions with my notes here";

      INBOX_PULL_INTERVAL_SECONDS = 600;

-      # ... all your rate limiter and WOT settings unchanged ...
      PRIVATE_RELAY_EVENT_IP_LIMITER_TOKENS_PER_INTERVAL = 50;
      PRIVATE_RELAY_EVENT_IP_LIMITER_INTERVAL = 1;
      PRIVATE_RELAY_EVENT_IP_LIMITER_MAX_TOKENS = 100;
@@ -102,6 +125,10 @@ lib.mkIf (config.sovran_systemsOS.features.haven && npub != "") {
    ];
  };

+  systemd.services.haven.serviceConfig.EnvironmentFile = [
+    "/run/haven/runtime.env"
+  ];
+
  systemd.tmpfiles.rules = [
    "d /var/lib/haven 0750 haven haven -"
  ];
@@ -127,25 +154,10 @@ lib.mkIf (config.sovran_systemsOS.features.haven && npub != "") {
    '';
  };

-  systemd.services.haven.after = [ "haven-whitelist-setup.service" ];
-  systemd.services.haven.wants = [ "haven-whitelist-setup.service" ];
-
-  services.caddy.virtualHosts = {
-    "${personalization.haven_url}" = {
-      extraConfig = ''
-        reverse_proxy localhost:3355 {
-          header_up Host {host}
-          header_up X-Real-IP {remote_host}
-          header_up X-Forwarded-For {remote_host}
-          header_up X-Forwarded-Proto {scheme}
-          transport http {
-            versions 1.1
-          }
-        }
-        request_body {
-          max_size 100MB
-        }
-      '';
-    };
-  };
+  systemd.services.haven.after = [ "haven-whitelist-setup.service" "haven-runtime-config.service" ];
+  systemd.services.haven.wants = [ "haven-whitelist-setup.service" "haven-runtime-config.service" ];
+  
+  sovran_systemsOS.domainRequirements = [
+    { name = "haven"; label = "Haven NOSTR Relay"; example = "relay.yourdomain.com"; }
+  ];
 }
@@ -11,15 +11,4 @@ lib.mkIf config.sovran_systemsOS.features.mempool {

  nix-bitcoin.onionServices.mempool-frontend.enable = true;

-  services.caddy = {
-      virtualHosts = {
-          ":60847" = {
-              extraConfig = ''
-                  reverse_proxy :60845
-                  encode gzip zstd
-              '';
-          };
-      };
-  };
-
 }
@@ -1,26 +1,35 @@
 { config, pkgs, lib, ... }:

 {
- 
  imports = [
-    
+    # ── Core (always loaded) ──────────────────────────────────
    ./core/roles.nix
    ./core/role-logic.nix
+    ./core/caddy.nix
+    ./core/njalla.nix
+    ./core/ssh-bootstrap.nix
+    ./core/sovran-manage-domains.nix
+    ./core/sovran_systemsos-desktop.nix
+    ./core/sovran-hub.nix
+
+    # ── Always on (no flag) ───────────────────────────────────
    ./php.nix
    ./Sovran_SystemsOS_File_Fixes_And_New_Services.nix
+    ./credentials-pdf.nix

-    # Always imported feature modules
+    # ── Services (default ON — disable in custom.nix) ─────────
    ./synapse.nix
-    ./coturn.nix
-    ./bitcoinecosystem.nix
+    ./wordpress.nix
+    ./nextcloud.nix
    ./vaultwarden.nix
+    ./bitcoinecosystem.nix
+
+    # ── Features (default OFF — enable in custom.nix) ─────────
    ./haven.nix
    ./bip110.nix
    ./element-calling.nix
    ./mempool.nix
    ./bitcoin-core.nix
    ./rdp.nix
-
  ];
-
-}
+}
@@ -0,0 +1,190 @@
+{ config, pkgs, lib, ... }:
+
+lib.mkIf config.sovran_systemsOS.services.nextcloud {
+
+  # ── PostgreSQL database ───────────────────────────────────
+  services.postgresql = {
+    enable = true;
+  };
+
+  # ── Auto-generate DB password and initialize ──────────────
+  systemd.services.nextcloud-db-init = {
+    description = "Initialize Nextcloud PostgreSQL database with auto-generated password";
+    after = [ "postgresql.service" ];
+    requires = [ "postgresql.service" ];
+    before = [ "nextcloud-init.service" ];
+    wantedBy = [ "multi-user.target" ];
+    serviceConfig = {
+      Type = "oneshot";
+      RemainAfterExit = true;
+    };
+    path = [ config.services.postgresql.package pkgs.pwgen pkgs.coreutils ];
+    script = ''
+      set -euo pipefail
+
+      SECRET_FILE="/var/lib/secrets/nextclouddb"
+
+      if [ ! -f "$SECRET_FILE" ]; then
+        mkdir -p /var/lib/secrets
+        pwgen -s 64 1 > "$SECRET_FILE"
+        chmod 600 "$SECRET_FILE"
+      fi
+
+      DB_PASS=$(cat "$SECRET_FILE")
+
+      psql -U postgres <<SQL
+        DO \$\$
+        BEGIN
+          IF NOT EXISTS (SELECT FROM pg_roles WHERE rolname = 'ncusr') THEN
+            CREATE ROLE "ncusr" WITH LOGIN PASSWORD '$DB_PASS';
+          ELSE
+            ALTER ROLE "ncusr" WITH LOGIN PASSWORD '$DB_PASS';
+          END IF;
+        END
+        \$\$;
+      SQL
+
+      if ! psql -U postgres -lqt | cut -d \| -f 1 | grep -qw "nextclouddb"; then
+        psql -U postgres -c "CREATE DATABASE nextclouddb WITH OWNER ncusr TEMPLATE template0 LC_COLLATE = 'C' LC_CTYPE = 'C';"
+      fi
+    '';
+  };
+
+  # ── Fully automated Nextcloud setup ───────────────────────
+  systemd.services.nextcloud-init = {
+    description = "Download, extract, and fully configure Nextcloud";
+    after = [ "network-online.target" "postgresql.service" "phpfpm-mypool.service" "nextcloud-db-init.service" ];
+    wants = [ "network-online.target" ];
+    requires = [ "postgresql.service" "nextcloud-db-init.service" ];
+    wantedBy = [ "multi-user.target" ];
+
+    unitConfig = {
+      ConditionPathExists = "!/var/lib/www/nextcloud/config/config.php";
+    };
+
+    serviceConfig = {
+      Type = "oneshot";
+      RemainAfterExit = true;
+    };
+
+    path = with pkgs; [ curl unzip php pwgen coreutils ];
+
+    script = ''
+      set -euo pipefail
+
+      INSTALL_DIR="/var/lib/www/nextcloud"
+      DATA_DIR="/var/lib/www/nextcloud-data"
+      DOMAIN=$(cat /var/lib/domains/nextcloud)
+      DB_NAME="nextclouddb"
+      DB_USER="ncusr"
+      DB_PASS=$(cat /var/lib/secrets/nextclouddb)
+      DB_HOST="localhost"
+      ADMIN_USER=$(pwgen -s 16 1)
+      ADMIN_PASS=$(pwgen -s 24 1)
+
+      echo "══════════════════════════════════════════════"
+      echo "  Nextcloud Automated Installation"
+      echo "══════════════════════════════════════════════"
+
+      if [ ! -f "$INSTALL_DIR/occ" ]; then
+          echo "Downloading Nextcloud..."
+          TEMP_DIR=$(mktemp -d)
+          curl -L -o "$TEMP_DIR/nextcloud.zip" "https://download.nextcloud.com/server/releases/latest.zip"
+          unzip -q "$TEMP_DIR/nextcloud.zip" -d "$TEMP_DIR"
+          mkdir -p "$INSTALL_DIR"
+          cp -a "$TEMP_DIR/nextcloud/"* "$INSTALL_DIR/"
+          rm -rf "$TEMP_DIR"
+          echo "Download complete."
+      fi
+
+      mkdir -p "$DATA_DIR"
+
+      chown -R caddy:root "$INSTALL_DIR"
+      chown -R caddy:root "$DATA_DIR"
+      find "$INSTALL_DIR" -type d -exec chmod 750 {} \;
+      find "$INSTALL_DIR" -type f -exec chmod 640 {} \;
+      chmod -R 770 "$INSTALL_DIR/apps"
+      chmod -R 770 "$INSTALL_DIR/config"
+      chmod -R 770 "$DATA_DIR"
+
+      echo "Waiting for PostgreSQL..."
+      for i in $(seq 1 30); do
+          if su -s /bin/sh caddy -c "php -r \"new PDO('pgsql:host=$DB_HOST;dbname=$DB_NAME', '$DB_USER', '$DB_PASS');\"" 2>/dev/null; then
+              echo "Database ready."
+              break
+          fi
+          sleep 2
+      done
+
+      echo "Running Nextcloud installation..."
+      su -s /bin/sh caddy -c "
+        php $INSTALL_DIR/occ maintenance:install \
+          --database 'pgsql' \
+          --database-name '$DB_NAME' \
+          --database-user '$DB_USER' \
+          --database-pass '$DB_PASS' \
+          --database-host '$DB_HOST' \
+          --admin-user '$ADMIN_USER' \
+          --admin-pass '$ADMIN_PASS' \
+          --data-dir '$DATA_DIR'
+      "
+
+      su -s /bin/sh caddy -c "
+        php $INSTALL_DIR/occ config:system:set trusted_domains 0 --value='$DOMAIN'
+        php $INSTALL_DIR/occ config:system:set overwrite.cli.url --value='https://$DOMAIN'
+        php $INSTALL_DIR/occ config:system:set overwriteprotocol --value='https'
+      "
+
+      su -s /bin/sh caddy -c "
+        php $INSTALL_DIR/occ config:system:set default_phone_region --value='US'
+        php $INSTALL_DIR/occ config:system:set memcache.local --value='\OC\Memcache\APCu'
+        php $INSTALL_DIR/occ background:cron
+      "
+
+      su -s /bin/sh caddy -c "
+        php $INSTALL_DIR/occ app:install calendar || true
+        php $INSTALL_DIR/occ app:install contacts || true
+        php $INSTALL_DIR/occ app:install tasks || true
+        php $INSTALL_DIR/occ app:install notes || true
+        php $INSTALL_DIR/occ app:install deck || true
+        php $INSTALL_DIR/occ app:enable calendar || true
+        php $INSTALL_DIR/occ app:enable contacts || true
+        php $INSTALL_DIR/occ app:enable tasks || true
+        php $INSTALL_DIR/occ app:enable notes || true
+        php $INSTALL_DIR/occ app:enable deck || true
+      "
+
+      CREDS_FILE="/var/lib/secrets/nextcloud-admin"
+      cat > "$CREDS_FILE" << CREDS
+Nextcloud Admin Credentials
+═══════════════════════════
+URL:      https://$DOMAIN/
+Username: $ADMIN_USER
+Password: $ADMIN_PASS
+CREDS
+      chmod 600 "$CREDS_FILE"
+
+      echo ""
+      echo "══════════════════════════════════════════════"
+      echo "  Nextcloud installation complete!"
+      echo "  Credentials saved to: $CREDS_FILE"
+      echo "══════════════════════════════════════════════"
+    '';
+  };
+
+  services.cron.systemCronJobs = [
+    "*/5 * * * * caddy /run/current-system/sw/bin/php -f /var/lib/www/nextcloud/cron.php"
+  ];
+
+  systemd.tmpfiles.rules = [
+    "d /var/lib/www 0755 caddy root -"
+    "d /var/lib/www/nextcloud 0750 caddy root -"
+    "d /var/lib/www/nextcloud-data 0770 caddy root -"
+  ];
+
+  environment.systemPackages = with pkgs; [ unzip ];
+  
+  sovran_systemsOS.domainRequirements = [
+    { name = "nextcloud"; label = "Nextcloud"; example = "cloud.yourdomain.com"; }
+  ];
+}
@@ -1,24 +0,0 @@
-{
-
-matrix_url = builtins.readFile /var/lib/domains/matrix;
-wordpress_url = builtins.readFile /var/lib/domains/wordpress;
-nextcloud_url = builtins.readFile /var/lib/domains/nextcloud;
-btcpayserver_url = builtins.readFile /var/lib/domains/btcpayserver;
-caddy_email_for_acme = builtins.readFile /var/lib/domains/sslemail;
-vaultwarden_url = builtins.readFile /var/lib/domains/vaultwarden;
-haven_url = builtins.readFile /var/lib/domains/haven;
-element-calling_url = builtins.readFile /var/lib/domains/element-calling;
-
-##
-
-external_ip_secret = builtins.readFile /var/lib/secrets/external_ip;
-coturn_static_auth_secret = builtins.readFile /var/lib/secrets/turn;
-
-##
-
-matrixdb = builtins.readFile /var/lib/secrets/matrixdb;
-nextclouddb = builtins.readFile /var/lib/secrets/nextclouddb;
-wordpressdb = builtins.readFile /var/lib/secrets/wordpressdb;
-
-
-}
@@ -1,22 +1,21 @@
-{ config, pkgs, lib, ... }:
+{ config, lib, pkgs, ... }:

 lib.mkIf config.sovran_systemsOS.features.rdp {

+  users.users.gnome-remote-desktop = {
+    isSystemUser = true;
+    group = "gnome-remote-desktop";
+    home = "/var/lib/gnome-remote-desktop";
+    createHome = true;
+  };
+  users.groups.gnome-remote-desktop = {};
+
+  # Enable the GNOME Remote Desktop service at the system level
  services.gnome.gnome-remote-desktop.enable = true;

+  # Open RDP port in the firewall
  networking.firewall.allowedTCPPorts = [ 3389 ];

-  environment.systemPackages = with pkgs; [
-    freerdp
-  ];
-
-  # The NixOS module installs the unit but doesn't enable it — we just need to start it and order it
-  systemd.services.gnome-remote-desktop = {
-    wantedBy = [ "graphical.target" ];
-    after = [ "gnome-remote-desktop-setup.service" ];
-    wants = [ "gnome-remote-desktop-setup.service" ];
-  };
-
  systemd.tmpfiles.rules = [
    "d /var/lib/gnome-remote-desktop 0750 gnome-remote-desktop gnome-remote-desktop -"
    "d /var/lib/gnome-remote-desktop/.local 0750 gnome-remote-desktop gnome-remote-desktop -"
@@ -49,20 +48,31 @@ lib.mkIf config.sovran_systemsOS.features.rdp {
      TLS_DIR="/var/lib/gnome-remote-desktop/tls"
      CRED_FILE="/var/lib/gnome-remote-desktop/rdp-credentials"

-      # Generate TLS certificate if it doesn't exist
-      if [ ! -f "$TLS_DIR/rdp-tls.crt" ]; then
+      # Regenerate TLS certificate if missing OR if ownership is wrong
+      # (disable/re-enable cycle can break ownership or grdctl state)
+      NEED_REGEN=0
+      if [ ! -f "$TLS_DIR/rdp-tls.crt" ] || [ ! -f "$TLS_DIR/rdp-tls.key" ]; then
+        NEED_REGEN=1
+      elif [ "$(stat -c '%U' "$TLS_DIR/rdp-tls.key" 2>/dev/null)" != "gnome-remote-desktop" ]; then
+        NEED_REGEN=1
+      fi
+
+      if [ "$NEED_REGEN" = "1" ]; then
        mkdir -p "$TLS_DIR"
+        rm -f "$TLS_DIR/rdp-tls.key" "$TLS_DIR/rdp-tls.crt"
        openssl req -x509 -newkey ec -pkeyopt ec_paramgen_curve:prime256v1 \
          -sha256 -nodes -days 3650 \
          -keyout "$TLS_DIR/rdp-tls.key" \
          -out "$TLS_DIR/rdp-tls.crt" \
          -subj "/CN=gnome-remote-desktop"
-        chown -R gnome-remote-desktop:gnome-remote-desktop "$TLS_DIR"
-        chmod 600 "$TLS_DIR/rdp-tls.key"
-        chmod 644 "$TLS_DIR/rdp-tls.crt"
-        echo "Generated RDP TLS certificate"
+        echo "Generated new RDP TLS certificate"
      fi

+      # Always fix ownership and permissions (handles re-enable after disable)
+      chown -R gnome-remote-desktop:gnome-remote-desktop "$TLS_DIR"
+      chmod 600 "$TLS_DIR/rdp-tls.key"
+      chmod 644 "$TLS_DIR/rdp-tls.crt"
+
      # Configure TLS certificate
      grdctl --system rdp set-tls-cert "$TLS_DIR/rdp-tls.crt"
      grdctl --system rdp set-tls-key "$TLS_DIR/rdp-tls.key"
@@ -77,6 +87,10 @@ lib.mkIf config.sovran_systemsOS.features.rdp {
        PASSWORD=$(cat /var/lib/gnome-remote-desktop/rdp-password)
      fi

+      # Write username to a separate file for the hub
+      echo "sovran" > /var/lib/gnome-remote-desktop/rdp-username
+      chmod 600 /var/lib/gnome-remote-desktop/rdp-username
+
      # Get current IP address
      LOCAL_IP=$(hostname -I | awk '{print $1}')

@@ -104,4 +118,4 @@ lib.mkIf config.sovran_systemsOS.features.rdp {
      echo "GNOME Remote Desktop RDP configured successfully"
    '';
  };
-}
+}
@@ -1,73 +1,257 @@
 { config, pkgs, lib, ... }:

+lib.mkIf config.sovran_systemsOS.services.synapse {

-####### CREATE NEW USER (ADMIN OR NOT) VIA TERMINAL #######
+  services.postgresql = {
+    ensureDatabases = [ "matrix-synapse" ];
+    ensureUsers = [
+      {
+        name = "matrix-synapse";
+        ensureDBOwnership = true;
+      }
+    ];
+  };

-#  (Run as root in terminal) matrix-synapse-register_new_matrix_user #
+  # ── Generate registration secret if missing ─────────────────
+  systemd.services.matrix-synapse-secret-init = {
+    description = "Generate Matrix Synapse registration secret if missing";
+    wantedBy = [ "multi-user.target" ];
+    before = [ "matrix-synapse.service" ];
+    serviceConfig = {
+      Type = "oneshot";
+      RemainAfterExit = true;
+    };
+    path = [ pkgs.pwgen pkgs.coreutils ];
+    script = ''
+      SECRET_FILE="/var/lib/matrix-synapse/registration-secret"
+      if [ ! -f "$SECRET_FILE" ]; then
+        mkdir -p /var/lib/matrix-synapse
+        pwgen -s 64 1 > "$SECRET_FILE"
+        chown matrix-synapse:matrix-synapse "$SECRET_FILE"
+        chmod 600 "$SECRET_FILE"
+        echo "Generated Matrix registration secret"
+      else
+        echo "Matrix registration secret already exists, skipping"
+      fi
+    '';
+  };

-####### #######
+  # ── Generate DB password if missing ─────────────────────────
+  systemd.services.matrix-synapse-db-init = {
+    description = "Generate Matrix Synapse DB password if missing";
+    wantedBy = [ "multi-user.target" ];
+    before = [ "matrix-synapse.service" ];
+    serviceConfig = {
+      Type = "oneshot";
+      RemainAfterExit = true;
+    };
+    path = [ pkgs.pwgen ];
+    script = ''
+      SECRET_FILE="/var/lib/matrix-synapse/db-password"
+      if [ ! -f "$SECRET_FILE" ]; then
+        mkdir -p /var/lib/matrix-synapse
+        pwgen -s 32 1 > "$SECRET_FILE"
+        chown matrix-synapse:matrix-synapse "$SECRET_FILE"
+        chmod 600 "$SECRET_FILE"
+        echo "Generated new DB password at $SECRET_FILE"
+      else
+        echo "DB password already exists, skipping"
+      fi
+    '';
+  };

-let
-	personalization = import ./personalization.nix;
-in
-lib.mkIf config.sovran_systemsOS.features.synapse {
-	services.matrix-synapse = {
-		enable = true;
-		settings = {
-			push.include_content = false;
-			group_unread_count_by_room = false;
-			encryption_enabled_by_default_for_room_type = "invite";
-			allow_profile_lookup_over_federation = false;
-			allow_device_name_lookup_over_federation = false;
-			server_name = personalization.matrix_url;
-		 	url_preview_enabled = true;
-		 	max_upload_size = "1024M";
-		 	url_preview_ip_range_blacklist = [
-				"10.0.0.0/8"
-				"100.64.0.0/10"
-				"169.254.0.0/16"
-				"172.16.0.0/12"
-				"192.0.0.0/24"
-				"192.0.2.0/24"
-				"192.168.0.0/16"
-				"192.88.99.0/24"
-				"198.18.0.0/15"
-				"198.51.100.0/24"
-				"2001:db8::/32"
-				"203.0.113.0/24"
-				"224.0.0.0/4"
-				"::1/128"
-				"fc00::/7"
-				"fe80::/10"
-				"fec0::/10"
-				"ff00::/8"
-				];
-		 	url_preview_ip_ranger_whitelist = [ "127.0.0.1" ];
-		 	turn_shared_secret = "${personalization.coturn_static_auth_secret}";
-    			turn_uris = [
-      				"turn:${personalization.matrix_url}:5349?transport=udp"
-      				"turn:${personalization.matrix_url}:5349?transport=tcp"
-			];
-			presence.enabled = true;
-			enable_registration = false;
-			registration_shared_secret = config.age.secrets.matrix_reg_secret.path;
-			listeners = [
-				{
-					port = 8008;
-					bind_addresses = [ "::1" ];
-					type = "http";
-					tls = false;
-					x_forwarded = true;
-					resources = [ {
-						names = [ "client" ];
-						compress = true;
-					} 
-					{
-						names = [ "federation" ];
-						compress = false;
-					} ];
-				}
-			];
-		};
- 	};
+  # ── Generate runtime config from domain files ───────────────
+  systemd.services.matrix-synapse-runtime-config = {
+    description = "Generate Synapse runtime config from domain files";
+    before = [ "matrix-synapse.service" ];
+    after = [ "matrix-synapse-db-init.service" "matrix-synapse-secret-init.service" ];
+    requiredBy = [ "matrix-synapse.service" ];
+    wantedBy = [ "multi-user.target" ];
+    serviceConfig = {
+      Type = "oneshot";
+      RemainAfterExit = true;
+    };
+    unitConfig = {
+      ConditionPathExists = "/var/lib/domains/matrix";
+    };
+    path = [ pkgs.coreutils ];
+    script = ''
+      MATRIX=$(cat /var/lib/domains/matrix)
+
+      mkdir -p /run/matrix-synapse
+
+      cat > /run/matrix-synapse/runtime-config.yaml <<EOF
+server_name: "$MATRIX"
+public_baseurl: "https://$MATRIX"
+registration_shared_secret_path: "/var/lib/matrix-synapse/registration-secret"
+EOF
+
+      chown matrix-synapse:matrix-synapse /run/matrix-synapse/runtime-config.yaml
+      chmod 640 /run/matrix-synapse/runtime-config.yaml
+    '';
+  };
+
+  # ── Synapse service ─────────────────────────────────────────
+  services.matrix-synapse = {
+    enable = true;
+    extraConfigFiles = [
+      "/run/matrix-synapse/runtime-config.yaml"
+    ];
+    settings = {
+      database = {
+        name = "psycopg2";
+        args = {
+          host = "localhost";
+          database = "matrix-synapse";
+          user = "matrix-synapse";
+        };
+      };
+      push.include_content = false;
+      url_preview_enabled = true;
+      group_unread_count_by_room = false;
+      encryption_enabled_by_default_for_room_type = "invite";
+      allow_profile_lookup_over_federation = false;
+      allow_device_name_lookup_over_federation = false;
+      url_preview_ip_range_blacklist = [
+        "10.0.0.0/8" "100.64.0.0/10" "169.254.0.0/16" "172.16.0.0/12"
+        "192.0.0.0/24" "192.0.2.0/24" "192.168.0.0/16" "192.88.99.0/24"
+        "198.18.0.0/15" "198.51.100.0/24" "2001:db8::/32" "203.0.113.0/24"
+        "224.0.0.0/4" "::1/128" "fc00::/7" "fe80::/10" "fec0::/10" "ff00::/8"
+      ];
+      url_preview_ip_ranger_whitelist = [ "127.0.0.1" ];
+      presence.enabled = true;
+      enable_registration = false;
+      listeners = [
+        {
+          port = 8008;
+          bind_addresses = [ "::1" ];
+          type = "http";
+          tls = false;
+          x_forwarded = true;
+          resources = [
+            { names = [ "client" ]; compress = true; }
+            { names = [ "federation" ]; compress = false; }
+          ];
+        }
+      ];
+    };
+  };
+
+  systemd.services.matrix-synapse.after = [ "matrix-synapse-secret-init.service" ];
+  systemd.services.matrix-synapse.wants = [ "matrix-synapse-secret-init.service" ];
+  
+  
+    # ── Auto-generate Admin and Test users ──────────────────────
+  systemd.services.matrix-synapse-create-users = {
+    description = "Create Admin and Test users for Matrix Synapse";
+    wantedBy = [ "multi-user.target" ];
+    after = [ "matrix-synapse.service" ];
+    requires = [ "matrix-synapse.service" ];
+    serviceConfig = {
+      Type = "oneshot";
+      RemainAfterExit = true;
+    };
+    path = [ pkgs.pwgen pkgs.matrix-synapse pkgs.curl pkgs.gawk pkgs.coreutils pkgs.jq ];
+    script = ''
+      set -uo pipefail
+
+      # Wait for Synapse to be fully responsive
+      for i in {1..30}; do
+        if curl -s http://localhost:8008/_matrix/client/versions > /dev/null; then
+          break
+        fi
+        sleep 2
+      done
+
+      DOMAIN=$(cat /var/lib/domains/matrix)
+      CREDS_FILE="/var/lib/secrets/matrix-users"
+      SECRET=$(cat /var/lib/matrix-synapse/registration-secret)
+
+      mkdir -p /var/lib/secrets
+
+      ADMIN_USER="admin"
+      TEST_USER="test"
+      ADMIN_PASS=""
+      TEST_PASS=""
+
+      # Only run user registration if we haven't already generated the credentials file
+      if [ ! -f "$CREDS_FILE" ]; then
+        ADMIN_PASS=$(pwgen -s 24 1)
+        TEST_PASS=$(pwgen -s 24 1)
+
+        ADMIN_CREATED=true
+        TEST_CREATED=true
+
+        # Create Admin user (tolerate "already exists")
+        if ! register_new_matrix_user -c /run/matrix-synapse/runtime-config.yaml \
+          -u "$ADMIN_USER" -p "$ADMIN_PASS" -a http://localhost:8008 2>&1; then
+          echo "Admin user already exists, skipping."
+          ADMIN_CREATED=false
+        fi
+
+        # Create Test user (tolerate "already exists")
+        if ! register_new_matrix_user -c /run/matrix-synapse/runtime-config.yaml \
+          -u "$TEST_USER" -p "$TEST_PASS" --no-admin http://localhost:8008 2>&1; then
+          echo "Test user already exists, skipping."
+          TEST_CREATED=false
+        fi
+
+        # Write credentials file
+        if [ "$ADMIN_CREATED" = true ] && [ "$TEST_CREATED" = true ]; then
+          cat > "$CREDS_FILE" << CREDS
+Matrix (Element) Credentials
+════════════════════════════
+Homeserver URL: https://$DOMAIN
+
+[ Admin Account ]
+Username: @$ADMIN_USER:$DOMAIN
+Password: $ADMIN_PASS
+
+[ Test Account ]
+Username: @$TEST_USER:$DOMAIN
+Password: $TEST_PASS
+CREDS
+        else
+          cat > "$CREDS_FILE" << CREDS
+Matrix (Element) Credentials
+════════════════════════════
+Homeserver URL: https://$DOMAIN
+
+[ Admin Account ]
+Username: @$ADMIN_USER:$DOMAIN
+Password: $(if [ "$ADMIN_CREATED" = true ]; then echo "$ADMIN_PASS"; else echo "(pre-existing — password set during original setup)"; fi)
+
+[ Test Account ]
+Username: @$TEST_USER:$DOMAIN
+Password: $(if [ "$TEST_CREATED" = true ]; then echo "$TEST_PASS"; else echo "(pre-existing — password set during original setup)"; fi)
+CREDS
+        fi
+
+        chmod 600 "$CREDS_FILE"
+      fi
+
+      # Always write individual credential files for the hub UI, even if the bulk
+      # credentials file already existed from a prior run (umask 077 ensures mode 600).
+      # If passwords were not freshly generated above, parse them from the bulk file.
+      if [ -z "$ADMIN_PASS" ]; then
+        ADMIN_PASS=$(awk '/\[ Admin Account \]/{f=1} f && /^Password:/{sub(/^Password: /,""); print; exit}' "$CREDS_FILE")
+        [ -z "$ADMIN_PASS" ] && ADMIN_PASS="Password not available — check $CREDS_FILE"
+      fi
+      if [ -z "$TEST_PASS" ]; then
+        TEST_PASS=$(awk '/\[ Test Account \]/{f=1} f && /^Password:/{sub(/^Password: /,""); print; exit}' "$CREDS_FILE")
+        [ -z "$TEST_PASS" ] && TEST_PASS="Password not available — check $CREDS_FILE"
+      fi
+      (umask 077; echo "https://$DOMAIN" > /var/lib/secrets/matrix-homeserver-url)
+      (umask 077; echo "@$ADMIN_USER:$DOMAIN" > /var/lib/secrets/matrix-admin-username)
+      (umask 077; echo "$ADMIN_PASS" > /var/lib/secrets/matrix-admin-password)
+      (umask 077; echo "@$TEST_USER:$DOMAIN" > /var/lib/secrets/matrix-test-username)
+      (umask 077; echo "$TEST_PASS" > /var/lib/secrets/matrix-test-password)
+
+      echo "Matrix users setup completed."
+    '';
+  };
+
+  sovran_systemsOS.domainRequirements = [
+    { name = "matrix"; label = "Matrix Synapse"; example = "matrix.yourdomain.com"; }
+  ];
 }
@@ -1,22 +1,76 @@
 { config, pkgs, lib, ... }:

-let
-	personalization = import ./personalization.nix;
-in
+lib.mkIf config.sovran_systemsOS.services.vaultwarden {

-lib.mkIf config.sovran_systemsOS.features.vaultwarden {
+  # ── Generate ADMIN_TOKEN if missing ─────────────────────────
+  systemd.services.vaultwarden-secret-init = {
+    description = "Generate Vaultwarden ADMIN_TOKEN if missing";
+    wantedBy = [ "multi-user.target" ];
+    before = [ "vaultwarden.service" ];
+    serviceConfig = {
+      Type = "oneshot";
+      RemainAfterExit = true;
+    };
+    path = [ pkgs.openssl pkgs.coreutils ];
+    script = ''
+      SECRET_DIR="/var/lib/secrets/vaultwarden"
+      SECRET_FILE="$SECRET_DIR/vaultwarden.env"

-	services.vaultwarden = {
-		enable = true;
-		    config = {
+      if [ ! -f "$SECRET_FILE" ]; then
+        mkdir -p "$SECRET_DIR"
+        echo -n "ADMIN_TOKEN=$(openssl rand -base64 48)" > "$SECRET_FILE"
+        chmod 600 "$SECRET_FILE"
+        echo "Generated Vaultwarden ADMIN_TOKEN"
+      else
+        echo "Vaultwarden ADMIN_TOKEN already exists, skipping"
+      fi
+    '';
+  };

-        		DOMAIN = "https://${personalization.vaultwarden_url}";
-        		SIGNUPS_ALLOWED = false;
-        		ROCKET_ADDRESS = "127.0.0.1";
-        		ROCKET_PORT = 8777;
-        		ROCKET_LOG = "critical";
-        	};
-		dbBackend = "sqlite";
-		environmentFile = "/var/lib/secrets/vaultwarden/vaultwarden.env";
-	};
+  # ── Generate runtime config from domain files ───────────────
+  systemd.services.vaultwarden-runtime-config = {
+    description = "Generate Vaultwarden runtime config from domain files";
+    before = [ "vaultwarden.service" ];
+    requiredBy = [ "vaultwarden.service" ];
+    wantedBy = [ "multi-user.target" ];
+    serviceConfig = {
+      Type = "oneshot";
+      RemainAfterExit = true;
+    };
+    unitConfig = {
+      ConditionPathExists = "/var/lib/domains/vaultwarden";
+    };
+    path = [ pkgs.coreutils ];
+    script = ''
+      VAULTWARDEN=$(cat /var/lib/domains/vaultwarden)
+
+      mkdir -p /run/vaultwarden
+
+      cat > /run/vaultwarden/runtime.env <<EOF
+DOMAIN=https://$VAULTWARDEN
+EOF
+
+      chmod 640 /run/vaultwarden/runtime.env
+    '';
+  };
+
+  services.vaultwarden = {
+    enable = true;
+    config = {
+      SIGNUPS_ALLOWED = false;
+      ROCKET_ADDRESS = "127.0.0.1";
+      ROCKET_PORT = 8777;
+      ROCKET_LOG = "critical";
+    };
+    dbBackend = "sqlite";
+    environmentFile = "/var/lib/secrets/vaultwarden/vaultwarden.env";
+  };
+
+  systemd.services.vaultwarden.serviceConfig.EnvironmentFile = lib.mkAfter [
+    "/run/vaultwarden/runtime.env"
+  ];
+
+  sovran_systemsOS.domainRequirements = [
+    { name = "vaultwarden"; label = "Vaultwarden"; example = "vault.yourdomain.com"; }
+  ];
 }
@@ -0,0 +1,171 @@
+{ config, pkgs, lib, ... }:
+
+lib.mkIf config.sovran_systemsOS.services.wordpress {
+
+  # ── MariaDB database ──────────────────────────────────────
+  services.mysql = {
+    enable = true;
+    package = pkgs.mariadb;
+  };
+
+  # ── Auto-generate DB password and initialize ────────���─────
+  systemd.services.wordpress-db-init = {
+    description = "Initialize WordPress MariaDB database with auto-generated password";
+    after = [ "mysql.service" ];
+    requires = [ "mysql.service" ];
+    before = [ "wordpress-init.service" ];
+    wantedBy = [ "multi-user.target" ];
+    serviceConfig = {
+      Type = "oneshot";
+      RemainAfterExit = true;
+    };
+    path = [ config.services.mysql.package pkgs.pwgen pkgs.coreutils ];
+    script = ''
+      set -euo pipefail
+
+      SECRET_FILE="/var/lib/secrets/wordpressdb"
+
+      if [ ! -f "$SECRET_FILE" ]; then
+        mkdir -p /var/lib/secrets
+        pwgen -s 64 1 > "$SECRET_FILE"
+        chmod 600 "$SECRET_FILE"
+      fi
+
+      DB_PASS=$(cat "$SECRET_FILE")
+
+      mysql -u root <<SQL
+        CREATE DATABASE IF NOT EXISTS wordpressdb;
+        CREATE USER IF NOT EXISTS 'wpusr'@'localhost' IDENTIFIED BY '$DB_PASS';
+        ALTER USER 'wpusr'@'localhost' IDENTIFIED BY '$DB_PASS';
+        GRANT ALL ON wordpressdb.* TO 'wpusr'@'localhost';
+        FLUSH PRIVILEGES;
+      SQL
+    '';
+  };
+
+  # ── Fully automated WordPress setup ───────────────────────
+  systemd.services.wordpress-init = {
+    description = "Download, extract, and fully configure WordPress";
+    after = [ "network-online.target" "mysql.service" "phpfpm-mypool.service" "wordpress-db-init.service" ];
+    wants = [ "network-online.target" ];
+    requires = [ "mysql.service" "wordpress-db-init.service" ];
+    wantedBy = [ "multi-user.target" ];
+
+    unitConfig = {
+      ConditionPathExists = "!/var/lib/www/wordpress/wp-config.php";
+    };
+
+    serviceConfig = {
+      Type = "oneshot";
+      RemainAfterExit = true;
+    };
+
+    path = with pkgs; [ curl unzip wp-cli pwgen php coreutils ];
+
+    script = ''
+      set -euo pipefail
+
+      INSTALL_DIR="/var/lib/www/wordpress"
+      DOMAIN=$(cat /var/lib/domains/wordpress)
+      DB_NAME="wordpressdb"
+      DB_USER="wpusr"
+      DB_PASS=$(cat /var/lib/secrets/wordpressdb)
+      DB_HOST="localhost"
+      ADMIN_USER=$(pwgen -s 16 1)
+      ADMIN_PASS=$(pwgen -s 24 1)
+      ADMIN_EMAIL="$ADMIN_USER@''${DOMAIN#*.}"
+
+      echo "══════════════════════════════════════════════"
+      echo "  WordPress Automated Installation"
+      echo "══════════════════════════════════════════════"
+
+      if [ ! -f "$INSTALL_DIR/wp-includes/version.php" ]; then
+          echo "Downloading WordPress..."
+          TEMP_DIR=$(mktemp -d)
+          curl -L -o "$TEMP_DIR/wordpress.zip" "https://wordpress.org/latest.zip"
+          unzip -q "$TEMP_DIR/wordpress.zip" -d "$TEMP_DIR"
+          mkdir -p "$INSTALL_DIR"
+          cp -a "$TEMP_DIR/wordpress/"* "$INSTALL_DIR/"
+          rm -rf "$TEMP_DIR"
+          echo "Download complete."
+      fi
+
+      chown -R caddy:root "$INSTALL_DIR"
+      find "$INSTALL_DIR" -type d -exec chmod 755 {} \;
+      find "$INSTALL_DIR" -type f -exec chmod 644 {} \;
+      chmod -R 775 "$INSTALL_DIR/wp-content"
+
+      echo "Generating wp-config.php..."
+      cd "$INSTALL_DIR"
+      su -s /bin/sh caddy -c "
+        wp config create \
+          --dbname='$DB_NAME' \
+          --dbuser='$DB_USER' \
+          --dbpass='$DB_PASS' \
+          --dbhost='$DB_HOST' \
+          --skip-check
+      "
+
+      echo "Waiting for database..."
+      for i in $(seq 1 30); do
+          if su -s /bin/sh caddy -c "wp db check" 2>/dev/null; then
+              break
+          fi
+          sleep 2
+      done
+
+      echo "Running WordPress core install..."
+      su -s /bin/sh caddy -c "
+        wp core install \
+          --url='https://$DOMAIN' \
+          --title='Sovran_SystemsOS' \
+          --admin_user='$ADMIN_USER' \
+          --admin_password='$ADMIN_PASS' \
+          --admin_email='$ADMIN_EMAIL' \
+          --skip-email
+      "
+
+      su -s /bin/sh caddy -c "
+        wp option update blogdescription 'Powered by Sovran_SystemsOS'
+        wp option update permalink_structure '/%postname%/'
+        wp option update default_ping_status 'closed'
+        wp option update default_comment_status 'closed'
+        wp rewrite flush
+      "
+
+      su -s /bin/sh caddy -c "
+        wp config set DISALLOW_FILE_EDIT true --raw
+        wp config set WP_AUTO_UPDATE_CORE true --raw
+        wp config set FORCE_SSL_ADMIN true --raw
+      "
+
+      CREDS_FILE="/var/lib/secrets/wordpress-admin"
+      cat > "$CREDS_FILE" << CREDS
+WordPress Admin Credentials
+═══════════════════════════
+URL:      https://$DOMAIN/wp-admin/
+Username: $ADMIN_USER
+Password: $ADMIN_PASS
+Email:    $ADMIN_EMAIL
+CREDS
+      chmod 600 "$CREDS_FILE"
+
+      echo ""
+      echo "══════════════════════════════════════════════"
+      echo "  WordPress installation complete!"
+      echo "  Credentials saved to: $CREDS_FILE"
+      echo "══════════════════════════════════════════════"
+    '';
+  };
+
+  systemd.tmpfiles.rules = [
+    "d /var/lib/www 0755 caddy root -"
+    "d /var/lib/www/wordpress 0755 caddy root -"
+  ];
+
+  environment.systemPackages = with pkgs; [ wp-cli unzip ];
+  
+  sovran_systemsOS.domainRequirements = [
+    { name = "wordpress"; label = "WordPress"; example = "blog.yourdomain.com"; }
+  ];
+}
@@ -0,0 +1,203 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="UTF-8" />
+  <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+  <title>Sovran_SystemsOS — First-Boot Setup</title>
+  <link rel="stylesheet" href="/static/style.css?v={{ style_css_hash }}" />
+</head>
+<body class="onboarding-body">
+
+  <!-- Onboarding wizard container -->
+  <div class="onboarding-shell">
+
+    <!-- Progress bar -->
+    <div class="onboarding-progress-bar">
+      <div class="onboarding-progress-fill" id="onboarding-progress-fill"></div>
+    </div>
+
+    <!-- Step indicators -->
+    <div class="onboarding-steps-nav" id="onboarding-steps-nav">
+      <span class="onboarding-step-dot" data-step="1">1</span>
+      <span class="onboarding-step-connector"></span>
+      <span class="onboarding-step-dot" data-step="2">2</span>
+      <span class="onboarding-step-connector"></span>
+      <span class="onboarding-step-dot" data-step="3">3</span>
+      <span class="onboarding-step-connector"></span>
+      <span class="onboarding-step-dot" data-step="4">4</span>
+      <span class="onboarding-step-connector"></span>
+      <span class="onboarding-step-dot" data-step="5">5</span>
+      <span class="onboarding-step-connector"></span>
+      <span class="onboarding-step-dot" data-step="6">6</span>
+    </div>
+
+    <!-- Step panels -->
+    <div class="onboarding-panel-wrap">
+
+      <!-- ── Step 1: Welcome ── -->
+      <div class="onboarding-panel" id="step-1">
+        <div class="onboarding-hero">
+          <div class="onboarding-logo">
+            <img src="/static/logo-light.svg" alt="Sovran Systems" class="onboarding-logo-img" />
+          </div>
+          <h1 class="onboarding-title">Welcome to Sovran_SystemsOS!</h1>
+          <p class="onboarding-subtitle">Be Digitally Sovereign</p>
+        </div>
+        <div class="onboarding-card">
+          <p class="onboarding-body-text">
+            Your system is installed and ready to configure. This wizard will guide
+            you through the final setup steps so everything works perfectly.
+          </p>
+          <div class="onboarding-role-row" id="onboarding-role-row">
+            <span class="onboarding-role-label">Your Role:</span>
+            <span class="onboarding-role-badge" id="onboarding-role-badge">Loading…</span>
+          </div>
+          <p class="onboarding-body-text onboarding-body-text--dim">
+            This setup only takes a few minutes. You can always revisit these
+            settings from the main Hub dashboard.
+          </p>
+        </div>
+        <div class="onboarding-footer">
+          <div></div>
+          <button class="btn btn-primary onboarding-btn-next" id="step-1-next">
+            Let's Go →
+          </button>
+        </div>
+      </div>
+
+      <!-- ── Step 2: Domain Configuration ── -->
+      <div class="onboarding-panel" id="step-2" style="display:none">
+        <div class="onboarding-step-header">
+          <span class="onboarding-step-icon">🌐</span>
+          <h2 class="onboarding-step-title">Domain Configuration</h2>
+          <p class="onboarding-step-desc">
+            Sovran_SystemsOS uses <strong><a href="https://njal.la" target="_blank" style="color: var(--accent-color);">Njal.la</a></strong> for domains and Dynamic DNS.
+            First, create an account at <strong>Njal.la</strong> and purchase your domain.
+            Then, in the Njal.la web interface, create a <strong>Dynamic</strong> record pointing to this machine's external IP address (shown below).
+            Finally, paste the DDNS curl command from your Njal.la dashboard for each service below.
+          </p>
+        </div>
+        <div class="onboarding-card onboarding-card--scroll" id="step-2-body">
+          <p class="onboarding-loading">Loading service information…</p>
+        </div>
+        <div id="step-2-status" class="onboarding-save-status"></div>
+        <div class="onboarding-footer">
+          <button class="btn btn-close-modal onboarding-btn-back" data-prev="1">← Back</button>
+          <button class="btn btn-primary onboarding-btn-next" id="step-2-next">
+            Save &amp; Continue →
+          </button>
+        </div>
+      </div>
+
+      <!-- ── Step 3: Port Forwarding ── -->
+      <div class="onboarding-panel" id="step-3" style="display:none">
+        <div class="onboarding-step-header">
+          <span class="onboarding-step-icon">🔌</span>
+          <h2 class="onboarding-step-title">Port Forwarding Check</h2>
+          <p class="onboarding-step-desc">
+            Forward these ports on your router to this machine. Each port only needs to be opened once — they are shared across all your services.
+            <strong>Ports 80 and 443 must be open for SSL certificates to work.</strong>
+          </p>
+        </div>
+        <div class="onboarding-card onboarding-card--ports" id="step-3-body">
+          <p class="onboarding-loading">Checking ports…</p>
+        </div>
+        <div class="onboarding-footer">
+          <button class="btn btn-close-modal onboarding-btn-back" data-prev="2">← Back</button>
+          <button class="btn btn-primary onboarding-btn-next" id="step-3-next">
+            Continue →
+          </button>
+        </div>
+      </div>
+
+      <!-- ── Step 4: Credentials ── -->
+      <div class="onboarding-panel" id="step-4" style="display:none">
+        <div class="onboarding-step-header">
+          <span class="onboarding-step-icon">🔑</span>
+          <h2 class="onboarding-step-title">Your Credentials</h2>
+          <p class="onboarding-step-desc">
+            These are your generated service passwords. Save them somewhere safe —
+            the Hub is your permanent credentials viewer.
+          </p>
+        </div>
+        <div class="onboarding-card onboarding-card--scroll" id="step-4-body">
+          <p class="onboarding-loading">Loading credentials…</p>
+        </div>
+        <div class="onboarding-footer">
+          <button class="btn btn-close-modal onboarding-btn-back" data-prev="3">← Back</button>
+          <button class="btn btn-primary onboarding-btn-next" id="step-4-next">
+            Continue →
+          </button>
+        </div>
+      </div>
+
+      <!-- ── Step 5: Feature Manager ── -->
+      <div class="onboarding-panel" id="step-5" style="display:none">
+        <div class="onboarding-step-header">
+          <span class="onboarding-step-icon">⚙️</span>
+          <h2 class="onboarding-step-title">Feature Manager</h2>
+          <p class="onboarding-step-desc">
+            Enable or disable optional features. Toggling a feature will start
+            a system rebuild in the background.
+          </p>
+        </div>
+        <div class="onboarding-card onboarding-card--scroll" id="step-5-body">
+          <p class="onboarding-loading">Loading features…</p>
+        </div>
+        <div id="step-5-rebuild-status" class="onboarding-save-status"></div>
+        <div class="onboarding-footer">
+          <button class="btn btn-close-modal onboarding-btn-back" data-prev="4">← Back</button>
+          <button class="btn btn-primary onboarding-btn-next" id="step-5-next">
+            Continue →
+          </button>
+        </div>
+      </div>
+
+      <!-- ── Step 6: Complete ── -->
+      <div class="onboarding-panel" id="step-6" style="display:none">
+        <div class="onboarding-hero">
+          <div class="onboarding-logo">✅</div>
+          <h1 class="onboarding-title">Your Sovran_SystemsOS is Ready!</h1>
+          <p class="onboarding-subtitle">Setup complete</p>
+        </div>
+        <div class="onboarding-card">
+          <p class="onboarding-body-text">
+            All configuration steps are done. Head to the main Hub dashboard to
+            monitor your services, manage credentials, and make changes at any time.
+          </p>
+          <ul class="onboarding-checklist" id="onboarding-checklist">
+            <li>✅ Domain configuration saved</li>
+            <li>✅ Port forwarding reviewed</li>
+            <li>✅ Credentials noted</li>
+            <li>✅ Features configured</li>
+          </ul>
+        </div>
+        <div class="onboarding-footer">
+          <button class="btn btn-close-modal onboarding-btn-back" data-prev="5">← Back</button>
+          <button class="btn btn-primary" id="step-6-finish">
+            Go to Dashboard →
+          </button>
+        </div>
+      </div>
+
+    </div><!-- /panel-wrap -->
+  </div><!-- /shell -->
+
+  <!-- Rebuild progress modal (reused from main app) -->
+  <div class="modal-overlay" id="ob-rebuild-modal" role="dialog" aria-modal="true" aria-labelledby="ob-rebuild-title">
+    <div class="modal-dialog">
+      <div class="modal-header">
+        <span class="modal-title" id="ob-rebuild-title">Rebuilding System…</span>
+        <div class="modal-spinner" id="ob-rebuild-spinner"></div>
+        <span class="modal-status" id="ob-rebuild-status">Please wait</span>
+      </div>
+      <div class="modal-log" id="ob-rebuild-log" aria-live="polite"></div>
+      <div class="modal-footer">
+        <button class="btn btn-close-modal" id="ob-rebuild-close" disabled>Close</button>
+      </div>
+    </div>
+  </div>
+
+  <script src="/static/onboarding.js?v={{ onboarding_js_hash }}"></script>
+</body>
+</html>
				`@@ -0,0 +1 @@`
				`<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64"><circle cx="32" cy="32" r="30" fill="#1E3A5F"/><text x="32" y="28" font-family="sans-serif" font-size="12" font-weight="bold" fill="#F7931A" text-anchor="middle">BIP</text><text x="32" y="46" font-family="sans-serif" font-size="18" font-weight="bold" fill="white" text-anchor="middle">110</text></svg>`