Merge pull request #13 from naturallaw777/copilot/add-rtl-mempool-lan-proxies

[WIP] Add RTL and Mempool LAN reverse proxies to Caddy
Add RTL and Mempool LAN reverse proxies, open firewall ports
2026-04-03 10:21:56 -05:00 · 2026-04-03 15:21:01 +00:00 · 2026-04-03 15:19:46 +00:00 · 2026-04-03 09:55:39 -05:00 · 2026-04-03 14:52:14 +00:00 · 2026-04-03 14:50:04 +00:00
70 changed files with 7989 additions and 2765 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1,4 @@
 __pycache__/
 *.pyc
 *.pyo
--- a/.gitignore.txt
+++ b/.gitignore.txt
@@ -0,0 +1,8 @@
 custom.nix
 role-state.nix
 *.iso
 *.zip
 *.pma
 __pycache__/
 *.pyc
 *.pyo
--- a/Sovran_SystemsOS.md
+++ b/Sovran_SystemsOS.md
@@ -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! 🎉
--- a/795
+++ b/795
@@ -1,202 +1,661 @@
                    GNU AFFERO GENERAL PUBLIC LICENSE
                       Version 3, 19 November 2007
-                                 Apache License
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
-                           Version 2.0, January 2004
+ Everyone is permitted to copy and distribute verbatim copies
-                        http://www.apache.org/licenses/
+ of this license document, but changing it is not allowed.
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+                            Preamble
-   1. Definitions.
+  The GNU Affero General Public License is a free, copyleft license for
 software and other kinds of works, specifically designed to ensure
 cooperation with the community in the case of network server software.
-      "License" shall mean the terms and conditions for use, reproduction,
+  The licenses for most software and other practical works are designed
-      and distribution as defined by Sections 1 through 9 of this document.
+to take away your freedom to share and change the works.  By contrast,
 our General Public Licenses are intended to guarantee your freedom to
 share and change all versions of a program--to make sure it remains free
 software for all its users.
-      "Licensor" shall mean the copyright owner or entity authorized by
+  When we speak of free software, we are referring to freedom, not
-      the copyright owner that is granting the License.
+price.  Our General Public Licenses are designed to make sure that you
 have the freedom to distribute copies of free software (and charge for
 them if you wish), that you receive source code or can get it if you
 want it, that you can change the software or use pieces of it in new
 free programs, and that you know you can do these things.
-      "Legal Entity" shall mean the union of the acting entity and all
+  Developers that use our General Public Licenses protect your rights
-      other entities that control, are controlled by, or are under common
+with two steps: (1) assert copyright on the software, and (2) offer
-      control with that entity. For the purposes of this definition,
+you this License which gives you legal permission to copy, distribute
-      "control" means (i) the power, direct or indirect, to cause the
+and/or modify the software.
      direction or management of such entity, whether by contract or
      otherwise, or (ii) ownership of fifty percent (50%) or more of the
      outstanding shares, or (iii) beneficial ownership of such entity.
-      "You" (or "Your") shall mean an individual or Legal Entity
+  A secondary benefit of defending all users' freedom is that
-      exercising permissions granted by this License.
+improvements made in alternate versions of the program, if they
 receive widespread use, become available for other developers to
 incorporate.  Many developers of free software are heartened and
 encouraged by the resulting cooperation.  However, in the case of
 software used on network servers, this result may fail to come about.
 The GNU General Public License permits making a modified version and
 letting the public access it on a server without ever releasing its
 source code to the public.
-      "Source" form shall mean the preferred form for making modifications,
+  The GNU Affero General Public License is designed specifically to
-      including but not limited to software source code, documentation
+ensure that, in such cases, the modified source code becomes available
-      source, and configuration files.
+to the community.  It requires the operator of a network server to
 provide the source code of the modified version running there to the
 users of that server.  Therefore, public use of a modified version, on
 a publicly accessible server, gives the public access to the source
 code of the modified version.
-      "Object" form shall mean any form resulting from mechanical
+  An older license, called the Affero General Public License and
-      transformation or translation of a Source form, including but
+published by Affero, was designed to accomplish similar goals.  This is
-      not limited to compiled object code, generated documentation,
+a different license, not a version of the Affero GPL, but Affero has
-      and conversions to other media types.
+released a new version of the Affero GPL which permits relicensing under
 this license.
-      "Work" shall mean the work of authorship, whether in Source or
+  The precise terms and conditions for copying, distribution and
-      Object form, made available under the License, as indicated by a
+modification follow.
      copyright notice that is included in or attached to the work
      (an example is provided in the Appendix below).
-      "Derivative Works" shall mean any work, whether in Source or Object
+                       TERMS AND CONDITIONS
      form, that is based on (or derived from) the Work and for which the
      editorial revisions, annotations, elaborations, or other modifications
      represent, as a whole, an original work of authorship. For the purposes
      of this License, Derivative Works shall not include works that remain
      separable from, or merely link (or bind by name) to the interfaces of,
      the Work and Derivative Works thereof.
-      "Contribution" shall mean any work of authorship, including
+  0. Definitions.
      the original version of the Work and any modifications or additions
      to that Work or Derivative Works thereof, that is intentionally
      submitted to Licensor for inclusion in the Work by the copyright owner
      or by an individual or Legal Entity authorized to submit on behalf of
      the copyright owner. For the purposes of this definition, "submitted"
      means any form of electronic, verbal, or written communication sent
      to the Licensor or its representatives, including but not limited to
      communication on electronic mailing lists, source code control systems,
      and issue tracking systems that are managed by, or on behalf of, the
      Licensor for the purpose of discussing and improving the Work, but
      excluding communication that is conspicuously marked or otherwise
      designated in writing by the copyright owner as "Not a Contribution."
-      "Contributor" shall mean Licensor and any individual or Legal Entity
+  "This License" refers to version 3 of the GNU Affero General Public License.
      on behalf of whom a Contribution has been received by Licensor and
      subsequently incorporated within the Work.
-   2. Grant of Copyright License. Subject to the terms and conditions of
+  "Copyright" also means copyright-like laws that apply to other kinds of
-      this License, each Contributor hereby grants to You a perpetual,
+works, such as semiconductor masks.
      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
      copyright license to reproduce, prepare Derivative Works of,
      publicly display, publicly perform, sublicense, and distribute the
      Work and such Derivative Works in Source or Object form.
-   3. Grant of Patent License. Subject to the terms and conditions of
+  "The Program" refers to any copyrightable work licensed under this
-      this License, each Contributor hereby grants to You a perpetual,
+License.  Each licensee is addressed as "you".  "Licensees" and
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+"recipients" may be individuals or organizations.
      (except as stated in this section) patent license to make, have made,
      use, offer to sell, sell, import, and otherwise transfer the Work,
      where such license applies only to those patent claims licensable
      by such Contributor that are necessarily infringed by their
      Contribution(s) alone or by combination of their Contribution(s)
      with the Work to which such Contribution(s) was submitted. If You
      institute patent litigation against any entity (including a
      cross-claim or counterclaim in a lawsuit) alleging that the Work
      or a Contribution incorporated within the Work constitutes direct
      or contributory patent infringement, then any patent licenses
      granted to You under this License for that Work shall terminate
      as of the date such litigation is filed.
-   4. Redistribution. You may reproduce and distribute copies of the
+  To "modify" a work means to copy from or adapt all or part of the work
-      Work or Derivative Works thereof in any medium, with or without
+in a fashion requiring copyright permission, other than the making of an
-      modifications, and in Source or Object form, provided that You
+exact copy.  The resulting work is called a "modified version" of the
-      meet the following conditions:
+earlier work or a work "based on" the earlier work.
-      (a) You must give any other recipients of the Work or
+  A "covered work" means either the unmodified Program or a work based
-          Derivative Works a copy of this License; and
+on the Program.
-      (b) You must cause any modified files to carry prominent notices
+  To "propagate" a work means to do anything with it that, without
-          stating that You changed the files; and
+permission, would make you directly or secondarily liable for
 infringement under applicable copyright law, except executing it on a
 computer or modifying a private copy.  Propagation includes copying,
 distribution (with or without modification), making available to the
 public, and in some countries other activities as well.
-      (c) You must retain, in the Source form of any Derivative Works
+  To "convey" a work means any kind of propagation that enables other
-          that You distribute, all copyright, patent, trademark, and
+parties to make or receive copies.  Mere interaction with a user through
-          attribution notices from the Source form of the Work,
+a computer network, with no transfer of a copy, is not conveying.
          excluding those notices that do not pertain to any part of
          the Derivative Works; and
-      (d) If the Work includes a "NOTICE" text file as part of its
+  An interactive user interface displays "Appropriate Legal Notices"
-          distribution, then any Derivative Works that You distribute must
+to the extent that it includes a convenient and prominently visible
-          include a readable copy of the attribution notices contained
+feature that (1) displays an appropriate copyright notice, and (2)
-          within such NOTICE file, excluding those notices that do not
+tells the user that there is no warranty for the work (except to the
-          pertain to any part of the Derivative Works, in at least one
+extent that warranties are provided), that licensees may convey the
-          of the following places: within a NOTICE text file distributed
+work under this License, and how to view a copy of this License.  If
-          as part of the Derivative Works; within the Source form or
+the interface presents a list of user commands or options, such as a
-          documentation, if provided along with the Derivative Works; or,
+menu, a prominent item in the list meets this criterion.
          within a display generated by the Derivative Works, if and
          wherever such third-party notices normally appear. The contents
          of the NOTICE file are for informational purposes only and
          do not modify the License. You may add Your own attribution
          notices within Derivative Works that You distribute, alongside
          or as an addendum to the NOTICE text from the Work, provided
          that such additional attribution notices cannot be construed
          as modifying the License.
-      You may add Your own copyright statement to Your modifications and
+  1. Source Code.
      may provide additional or different license terms and conditions
      for use, reproduction, or distribution of Your modifications, or
      for any such Derivative Works as a whole, provided Your use,
      reproduction, and distribution of the Work otherwise complies with
      the conditions stated in this License.
-   5. Submission of Contributions. Unless You explicitly state otherwise,
+  The "source code" for a work means the preferred form of the work
-      any Contribution intentionally submitted for inclusion in the Work
+for making modifications to it.  "Object code" means any non-source
-      by You to the Licensor shall be under the terms and conditions of
+form of a work.
      this License, without any additional terms or conditions.
      Notwithstanding the above, nothing herein shall supersede or modify
      the terms of any separate license agreement you may have executed
      with Licensor regarding such Contributions.
-   6. Trademarks. This License does not grant permission to use the trade
+  A "Standard Interface" means an interface that either is an official
-      names, trademarks, service marks, or product names of the Licensor,
+standard defined by a recognized standards body, or, in the case of
-      except as required for reasonable and customary use in describing the
+interfaces specified for a particular programming language, one that
-      origin of the Work and reproducing the content of the NOTICE file.
+is widely used among developers working in that language.
-   7. Disclaimer of Warranty. Unless required by applicable law or
+  The "System Libraries" of an executable work include anything, other
-      agreed to in writing, Licensor provides the Work (and each
+than the work as a whole, that (a) is included in the normal form of
-      Contributor provides its Contributions) on an "AS IS" BASIS,
+packaging a Major Component, but which is not part of that Major
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+Component, and (b) serves only to enable use of the work with that
-      implied, including, without limitation, any warranties or conditions
+Major Component, or to implement a Standard Interface for which an
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+implementation is available to the public in source code form.  A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
+"Major Component", in this context, means a major essential component
-      appropriateness of using or redistributing the Work and assume any
+(kernel, window system, and so on) of the specific operating system
-      risks associated with Your exercise of permissions under this License.
+(if any) on which the executable work runs, or a compiler used to
 produce the work, or an object code interpreter used to run it.
-   8. Limitation of Liability. In no event and under no legal theory,
+  The "Corresponding Source" for a work in object code form means all
-      whether in tort (including negligence), contract, or otherwise,
+the source code needed to generate, install, and (for an executable
-      unless required by applicable law (such as deliberate and grossly
+work) run the object code and to modify the work, including scripts to
-      negligent acts) or agreed to in writing, shall any Contributor be
+control those activities.  However, it does not include the work's
-      liable to You for damages, including any direct, indirect, special,
+System Libraries, or general-purpose tools or generally available free
-      incidental, or consequential damages of any character arising as a
+programs which are used unmodified in performing those activities but
-      result of this License or out of the use or inability to use the
+which are not part of the work.  For example, Corresponding Source
-      Work (including but not limited to damages for loss of goodwill,
+includes interface definition files associated with source files for
-      work stoppage, computer failure or malfunction, or any and all
+the work, and the source code for shared libraries and dynamically
-      other commercial damages or losses), even if such Contributor
+linked subprograms that the work is specifically designed to require,
-      has been advised of the possibility of such damages.
+such as by intimate data communication or control flow between those
 subprograms and other parts of the work.
-   9. Accepting Warranty or Additional Liability. While redistributing
+  The Corresponding Source need not include anything that users
-      the Work or Derivative Works thereof, You may choose to offer,
+can regenerate automatically from other parts of the Corresponding
-      and charge a fee for, acceptance of support, warranty, indemnity,
+Source.
-      or other liability obligations and/or rights consistent with this
+
-      License. However, in accepting such obligations, You may act only
+  The Corresponding Source for a work in source code form is that
-      on Your own behalf and on Your sole responsibility, not on behalf
+same work.
-      of any other Contributor, and only if You agree to indemnify,
+
-      defend, and hold each Contributor harmless for any liability
+  2. Basic Permissions.
-      incurred by, or claims asserted against, such Contributor by reason
+
-      of your accepting any such warranty or additional liability.
+  All rights granted under this License are granted for the term of
 copyright on the Program, and are irrevocable provided the stated
 conditions are met.  This License explicitly affirms your unlimited
 permission to run the unmodified Program.  The output from running a
 covered work is covered by this License only if the output, given its
 content, constitutes a covered work.  This License acknowledges your
 rights of fair use or other equivalent, as provided by copyright law.
  You may make, run and propagate covered works that you do not
 convey, without conditions so long as your license otherwise remains
 in force.  You may convey covered works to others for the sole purpose
 of having them make modifications exclusively for you, or provide you
 with facilities for running those works, provided that you comply with
 the terms of this License in conveying all material for which you do
 not control copyright.  Those thus making or running the covered works
 for you must do so exclusively on your behalf, under your direction
 and control, on terms that prohibit them from making any copies of
 your copyrighted material outside their relationship with you.
  Conveying under any other circumstances is permitted solely under
 the conditions stated below.  Sublicensing is not allowed; section 10
 makes it unnecessary.
  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
  No covered work shall be deemed part of an effective technological
 measure under any applicable law fulfilling obligations under article
 11 of the WIPO copyright treaty adopted on 20 December 1996, or
 similar laws prohibiting or restricting circumvention of such
 measures.
  When you convey a covered work, you waive any legal power to forbid
 circumvention of technological measures to the extent such circumvention
 is effected by exercising rights under this License with respect to
 the covered work, and you disclaim any intention to limit operation or
 modification of the work as a means of enforcing, against the work's
 users, your or third parties' legal rights to forbid circumvention of
 technological measures.
  4. Conveying Verbatim Copies.
  You may convey verbatim copies of the Program's source code as you
 receive it, in any medium, provided that you conspicuously and
 appropriately publish on each copy an appropriate copyright notice;
 keep intact all notices stating that this License and any
 non-permissive terms added in accord with section 7 apply to the code;
 keep intact all notices of the absence of any warranty; and give all
 recipients a copy of this License along with the Program.
  You may charge any price or no price for each copy that you convey,
 and you may offer support or warranty protection for a fee.
  5. Conveying Modified Source Versions.
  You may convey a work based on the Program, or the modifications to
 produce it from the Program, in the form of source code under the
 terms of section 4, provided that you also meet all of these conditions:
    a) The work must carry prominent notices stating that you modified
    it, and giving a relevant date.
    b) The work must carry prominent notices stating that it is
    released under this License and any conditions added under section
    7.  This requirement modifies the requirement in section 4 to
    "keep intact all notices".
    c) You must license the entire work, as a whole, under this
    License to anyone who comes into possession of a copy.  This
    License will therefore apply, along with any applicable section 7
    additional terms, to the whole of the work, and all its parts,
    regardless of how they are packaged.  This License gives no
    permission to license the work in any other way, but it does not
    invalidate such permission if you have separately received it.
    d) If the work has interactive user interfaces, each must display
    Appropriate Legal Notices; however, if the Program has interactive
    interfaces that do not display Appropriate Legal Notices, your
    work need not make them do so.
  A compilation of a covered work with other separate and independent
 works, which are not by their nature extensions of the covered work,
 and which are not combined with it such as to form a larger program,
 in or on a volume of a storage or distribution medium, is called an
 "aggregate" if the compilation and its resulting copyright are not
 used to limit the access or legal rights of the compilation's users
 beyond what the individual works permit.  Inclusion of a covered work
 in an aggregate does not cause this License to apply to the other
 parts of the aggregate.
  6. Conveying Non-Source Forms.
  You may convey a covered work in object code form under the terms
 of sections 4 and 5, provided that you also convey the
 machine-readable Corresponding Source under the terms of this License,
 in one of these ways:
    a) Convey the object code in, or embodied in, a physical product
    (including a physical distribution medium), accompanied by the
    Corresponding Source fixed on a durable physical medium
    customarily used for software interchange.
    b) Convey the object code in, or embodied in, a physical product
    (including a physical distribution medium), accompanied by a
    written offer, valid for at least three years and valid for as
    long as you offer spare parts or customer support for that product
    model, to give anyone who possesses the object code either (1) a
    copy of the Corresponding Source for all the software in the
    product that is covered by this License, on a durable physical
    medium customarily used for software interchange, for a price no
    more than your reasonable cost of physically performing this
    conveying of source, or (2) access to copy the
    Corresponding Source from a network server at no charge.
    c) Convey individual copies of the object code with a copy of the
    written offer to provide the Corresponding Source.  This
    alternative is allowed only occasionally and noncommercially, and
    only if you received the object code with such an offer, in accord
    with subsection 6b.
    d) Convey the object code by offering access from a designated
    place (gratis or for a charge), and offer equivalent access to the
    Corresponding Source in the same way through the same place at no
    further charge.  You need not require recipients to copy the
    Corresponding Source along with the object code.  If the place to
    copy the object code is a network server, the Corresponding Source
    may be on a different server (operated by you or a third party)
    that supports equivalent copying facilities, provided you maintain
    clear directions next to the object code saying where to find the
    Corresponding Source.  Regardless of what server hosts the
    Corresponding Source, you remain obligated to ensure that it is
    available for as long as needed to satisfy these requirements.
    e) Convey the object code using peer-to-peer transmission, provided
    you inform other peers where the object code and Corresponding
    Source of the work are being offered to the general public at no
    charge under subsection 6d.
  A separable portion of the object code, whose source code is excluded
 from the Corresponding Source as a System Library, need not be
 included in conveying the object code work.
  A "User Product" is either (1) a "consumer product", which means any
 tangible personal property which is normally used for personal, family,
 or household purposes, or (2) anything designed or sold for incorporation
 into a dwelling.  In determining whether a product is a consumer product,
 doubtful cases shall be resolved in favor of coverage.  For a particular
 product received by a particular user, "normally used" refers to a
 typical or common use of that class of product, regardless of the status
 of the particular user or of the way in which the particular user
 actually uses, or expects or is expected to use, the product.  A product
 is a consumer product regardless of whether the product has substantial
 commercial, industrial or non-consumer uses, unless such uses represent
 the only significant mode of use of the product.
  "Installation Information" for a User Product means any methods,
 procedures, authorization keys, or other information required to install
 and execute modified versions of a covered work in that User Product from
 a modified version of its Corresponding Source.  The information must
 suffice to ensure that the continued functioning of the modified object
 code is in no case prevented or interfered with solely because
 modification has been made.
  If you convey an object code work under this section in, or with, or
 specifically for use in, a User Product, and the conveying occurs as
 part of a transaction in which the right of possession and use of the
 User Product is transferred to the recipient in perpetuity or for a
 fixed term (regardless of how the transaction is characterized), the
 Corresponding Source conveyed under this section must be accompanied
 by the Installation Information.  But this requirement does not apply
 if neither you nor any third party retains the ability to install
 modified object code on the User Product (for example, the work has
 been installed in ROM).
  The requirement to provide Installation Information does not include a
 requirement to continue to provide support service, warranty, or updates
 for a work that has been modified or installed by the recipient, or for
 the User Product in which it has been modified or installed.  Access to a
 network may be denied when the modification itself materially and
 adversely affects the operation of the network or violates the rules and
 protocols for communication across the network.
  Corresponding Source conveyed, and Installation Information provided,
 in accord with this section must be in a format that is publicly
 documented (and with an implementation available to the public in
 source code form), and must require no special password or key for
 unpacking, reading or copying.
  7. Additional Terms.
  "Additional permissions" are terms that supplement the terms of this
 License by making exceptions from one or more of its conditions.
 Additional permissions that are applicable to the entire Program shall
 be treated as though they were included in this License, to the extent
 that they are valid under applicable law.  If additional permissions
 apply only to part of the Program, that part may be used separately
 under those permissions, but the entire Program remains governed by
 this License without regard to the additional permissions.
  When you convey a copy of a covered work, you may at your option
 remove any additional permissions from that copy, or from any part of
 it.  (Additional permissions may be written to require their own
 removal in certain cases when you modify the work.)  You may place
 additional permissions on material, added by you to a covered work,
 for which you have or can give appropriate copyright permission.
  Notwithstanding any other provision of this License, for material you
 add to a covered work, you may (if authorized by the copyright holders of
 that material) supplement the terms of this License with terms:
    a) Disclaiming warranty or limiting liability differently from the
    terms of sections 15 and 16 of this License; or
    b) Requiring preservation of specified reasonable legal notices or
    author attributions in that material or in the Appropriate Legal
    Notices displayed by works containing it; or
    c) Prohibiting misrepresentation of the origin of that material, or
    requiring that modified versions of such material be marked in
    reasonable ways as different from the original version; or
    d) Limiting the use for publicity purposes of names of licensors or
    authors of the material; or
    e) Declining to grant rights under trademark law for use of some
    trade names, trademarks, or service marks; or
    f) Requiring indemnification of licensors and authors of that
    material by anyone who conveys the material (or modified versions of
    it) with contractual assumptions of liability to the recipient, for
    any liability that these contractual assumptions directly impose on
    those licensors and authors.
  All other non-permissive additional terms are considered "further
 restrictions" within the meaning of section 10.  If the Program as you
 received it, or any part of it, contains a notice stating that it is
 governed by this License along with a term that is a further
 restriction, you may remove that term.  If a license document contains
 a further restriction but permits relicensing or conveying under this
 License, you may add to a covered work material governed by the terms
 of that license document, provided that the further restriction does
 not survive such relicensing or conveying.
  If you add terms to a covered work in accord with this section, you
 must place, in the relevant source files, a statement of the
 additional terms that apply to those files, or a notice indicating
 where to find the applicable terms.
  Additional terms, permissive or non-permissive, may be stated in the
 form of a separately written license, or stated as exceptions;
 the above requirements apply either way.
  8. Termination.
  You may not propagate or modify a covered work except as expressly
 provided under this License.  Any attempt otherwise to propagate or
 modify it is void, and will automatically terminate your rights under
 this License (including any patent licenses granted under the third
 paragraph of section 11).
  However, if you cease all violation of this License, then your
 license from a particular copyright holder is reinstated (a)
 provisionally, unless and until the copyright holder explicitly and
 finally terminates your license, and (b) permanently, if the copyright
 holder fails to notify you of the violation by some reasonable means
 prior to 60 days after the cessation.
  Moreover, your license from a particular copyright holder is
 reinstated permanently if the copyright holder notifies you of the
 violation by some reasonable means, this is the first time you have
 received notice of violation of this License (for any work) from that
 copyright holder, and you cure the violation prior to 30 days after
 your receipt of the notice.
  Termination of your rights under this section does not terminate the
 licenses of parties who have received copies or rights from you under
 this License.  If your rights have been terminated and not permanently
 reinstated, you do not qualify to receive new licenses for the same
 material under section 10.
  9. Acceptance Not Required for Having Copies.
  You are not required to accept this License in order to receive or
 run a copy of the Program.  Ancillary propagation of a covered work
 occurring solely as a consequence of using peer-to-peer transmission
 to receive a copy likewise does not require acceptance.  However,
 nothing other than this License grants you permission to propagate or
 modify any covered work.  These actions infringe copyright if you do
 not accept this License.  Therefore, by modifying or propagating a
 covered work, you indicate your acceptance of this License to do so.
  10. Automatic Licensing of Downstream Recipients.
  Each time you convey a covered work, the recipient automatically
 receives a license from the original licensors, to run, modify and
 propagate that work, subject to this License.  You are not responsible
 for enforcing compliance by third parties with this License.
  An "entity transaction" is a transaction transferring control of an
 organization, or substantially all assets of one, or subdividing an
 organization, or merging organizations.  If propagation of a covered
 work results from an entity transaction, each party to that
 transaction who receives a copy of the work also receives whatever
 licenses to the work the party's predecessor in interest had or could
 give under the previous paragraph, plus a right to possession of the
 Corresponding Source of the work from the predecessor in interest, if
 the predecessor has it or can get it with reasonable efforts.
  You may not impose any further restrictions on the exercise of the
 rights granted or affirmed under this License.  For example, you may
 not impose a license fee, royalty, or other charge for exercise of
 rights granted under this License, and you may not initiate litigation
 (including a cross-claim or counterclaim in a lawsuit) alleging that
 any patent claim is infringed by making, using, selling, offering for
 sale, or importing the Program or any portion of it.
  11. Patents.
  A "contributor" is a copyright holder who authorizes use under this
 License of the Program or a work on which the Program is based.  The
 work thus licensed is called the contributor's "contributor version".
  A contributor's "essential patent claims" are all patent claims
 owned or controlled by the contributor, whether already acquired or
 hereafter acquired, that would be infringed by some manner, permitted
 by this License, of making, using, or selling its contributor version,
 but do not include claims that would be infringed only as a
 consequence of further modification of the contributor version.  For
 purposes of this definition, "control" includes the right to grant
 patent sublicenses in a manner consistent with the requirements of
 this License.
  Each contributor grants you a non-exclusive, worldwide, royalty-free
 patent license under the contributor's essential patent claims, to
 make, use, sell, offer for sale, import and otherwise run, modify and
 propagate the contents of its contributor version.
  In the following three paragraphs, a "patent license" is any express
 agreement or commitment, however denominated, not to enforce a patent
 (such as an express permission to practice a patent or covenant not to
 sue for patent infringement).  To "grant" such a patent license to a
 party means to make such an agreement or commitment not to enforce a
 patent against the party.
  If you convey a covered work, knowingly relying on a patent license,
 and the Corresponding Source of the work is not available for anyone
 to copy, free of charge and under the terms of this License, through a
 publicly available network server or other readily accessible means,
 then you must either (1) cause the Corresponding Source to be so
 available, or (2) arrange to deprive yourself of the benefit of the
 patent license for this particular work, or (3) arrange, in a manner
 consistent with the requirements of this License, to extend the patent
 license to downstream recipients.  "Knowingly relying" means you have
 actual knowledge that, but for the patent license, your conveying the
 covered work in a country, or your recipient's use of the covered work
 in a country, would infringe one or more identifiable patents in that
 country that you have reason to believe are valid.
  If, pursuant to or in connection with a single transaction or
 arrangement, you convey, or propagate by procuring conveyance of, a
 covered work, and grant a patent license to some of the parties
 receiving the covered work authorizing them to use, propagate, modify
 or convey a specific copy of the covered work, then the patent license
 you grant is automatically extended to all recipients of the covered
 work and works based on it.
  A patent license is "discriminatory" if it does not include within
 the scope of its coverage, prohibits the exercise of, or is
 conditioned on the non-exercise of one or more of the rights that are
 specifically granted under this License.  You may not convey a covered
 work if you are a party to an arrangement with a third party that is
 in the business of distributing software, under which you make payment
 to the third party based on the extent of your activity of conveying
 the work, and under which the third party grants, to any of the
 parties who would receive the covered work from you, a discriminatory
 patent license (a) in connection with copies of the covered work
 conveyed by you (or copies made from those copies), or (b) primarily
 for and in connection with specific products or compilations that
 contain the covered work, unless you entered into that arrangement,
 or that patent license was granted, prior to 28 March 2007.
  Nothing in this License shall be construed as excluding or limiting
 any implied license or other defenses to infringement that may
 otherwise be available to you under applicable patent law.
  12. No Surrender of Others' Freedom.
  If conditions are imposed on you (whether by court order, agreement or
 otherwise) that contradict the conditions of this License, they do not
 excuse you from the conditions of this License.  If you cannot convey a
 covered work so as to satisfy simultaneously your obligations under this
 License and any other pertinent obligations, then as a consequence you may
 not convey it at all.  For example, if you agree to terms that obligate you
 to collect a royalty for further conveying from those to whom you convey
 the Program, the only way you could satisfy both those terms and this
 License would be to refrain entirely from conveying the Program.
  13. Remote Network Interaction; Use with the GNU General Public License.
  Notwithstanding any other provision of this License, if you modify the
 Program, your modified version must prominently offer all users
 interacting with it remotely through a computer network (if your version
 supports such interaction) an opportunity to receive the Corresponding
 Source of your version by providing access to the Corresponding Source
 from a network server at no charge, through some standard or customary
 means of facilitating copying of software.  This Corresponding Source
 shall include the Corresponding Source for any work covered by version 3
 of the GNU General Public License that is incorporated pursuant to the
 following paragraph.
  Notwithstanding any other provision of this License, you have
 permission to link or combine any covered work with a work licensed
 under version 3 of the GNU General Public License into a single
 combined work, and to convey the resulting work.  The terms of this
 License will continue to apply to the part which is the covered work,
 but the work with which it is combined will remain governed by version
 3 of the GNU General Public License.
  14. Revised Versions of this License.
  The Free Software Foundation may publish revised and/or new versions of
 the GNU Affero General Public License from time to time.  Such new versions
 will be similar in spirit to the present version, but may differ in detail to
 address new problems or concerns.
  Each version is given a distinguishing version number.  If the
 Program specifies that a certain numbered version of the GNU Affero General
 Public License "or any later version" applies to it, you have the
 option of following the terms and conditions either of that numbered
 version or of any later version published by the Free Software
 Foundation.  If the Program does not specify a version number of the
 GNU Affero General Public License, you may choose any version ever published
 by the Free Software Foundation.
  If the Program specifies that a proxy can decide which future
 versions of the GNU Affero General Public License can be used, that proxy's
 public statement of acceptance of a version permanently authorizes you
 to choose that version for the Program.
  Later license versions may give you additional or different
 permissions.  However, no additional obligations are imposed on any
 author or copyright holder as a result of your choosing to follow a
 later version.
  15. Disclaimer of Warranty.
  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
 APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
 HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
 OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
 THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
 PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
 IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
 ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
  16. Limitation of Liability.
  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
 WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
 THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
 GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
 USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
 DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
 PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
 EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
 SUCH DAMAGES.
  17. Interpretation of Sections 15 and 16.
  If the disclaimer of warranty and limitation of liability provided
 above cannot be given local legal effect according to their terms,
 reviewing courts shall apply local law that most closely approximates
 an absolute waiver of all civil liability in connection with the
 Program, unless a warranty or assumption of liability accompanies a
 copy of the Program in return for a fee.
                     END OF TERMS AND CONDITIONS
-   APPENDIX: How to apply the Apache License to your work.
+            How to Apply These Terms to Your New Programs
-      To apply the Apache License to your work, attach the following
+  If you develop a new program, and you want it to be of the greatest
-      boilerplate notice, with the fields enclosed by brackets "[]"
+possible use to the public, the best way to achieve this is to make it
-      replaced with your own identifying information. (Don't include
+free software which everyone can redistribute and change under these terms.
      the brackets!)  The text should be enclosed in the appropriate
      comment syntax for the file format. We also recommend that a
      file or class name and description of purpose be included on the
      same "printed page" as the copyright notice for easier
      identification within third-party archives.
-   Copyright [yyyy] [name of copyright owner]
+  To do so, attach the following notices to the program.  It is safest
 to attach them to the start of each source file to most effectively
 state the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.
-   Licensed under the Apache License, Version 2.0 (the "License");
+    <one line to give the program's name and a brief idea of what it does.>
-   you may not use this file except in compliance with the License.
+    Copyright (C) <year>  <name of author>
   You may obtain a copy of the License at
-       http://www.apache.org/licenses/LICENSE-2.0
+    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU Affero General Public License as published by
    the Free Software Foundation, either version 3 of the License, or
    (at your option) any later version.
-   Unless required by applicable law or agreed to in writing, software
+    This program is distributed in the hope that it will be useful,
-   distributed under the License is distributed on an "AS IS" BASIS,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   See the License for the specific language governing permissions and
+    GNU Affero General Public License for more details.
-   limitations under the License.
+
    You should have received a copy of the GNU Affero General Public License
    along with this program.  If not, see <https://www.gnu.org/licenses/>.
 Also add information on how to contact you by electronic and paper mail.
  If your software can interact with users remotely through a computer
 network, you should also make sure that it provides a way for users to
 get its source.  For example, if your program is a web application, its
 interface could display a "Source" link that leads users to an archive
 of the code.  There are many ways you could offer source, and different
 solutions will be better for different programs; see section 13 for the
 specific requirements.
  You should also get your employer (if you work as a programmer) or school,
 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/>.
--- a/README.md
+++ b/README.md
@@ -1,193 +0,0 @@
 <br />
 <br />
 <p align="center">
  <img width="600" src="sovran_systems_grey.png">
 </p>
 <br />
 <br />
 <br />
 # 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 (A bit outdated as of now... will be working on a smoother DIY 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
 See [LICENSE](LICENSE) for details.
 ---
 ## 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.
 This is not a toolkit. It is a working system.
 You retain full visibility into every module, every service definition, and every configuration choice. Nothing is hidden. Everything is reproducible.
 ---
 **Be Digitally Sovereign**
--- a/app/icons/bip110.svg
+++ b/app/icons/bip110.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="#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>
--- a/app/icons/bitcoin-core.svg
+++ b/app/icons/bitcoin-core.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>
--- a/app/icons/bitcoind.svg
+++ b/app/icons/bitcoind.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>
--- a/app/icons/btcpayserver.svg
+++ b/app/icons/btcpayserver.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>
--- a/app/icons/caddy.svg
+++ b/app/icons/caddy.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>
--- a/app/icons/electrs.svg
+++ b/app/icons/electrs.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>
--- a/app/icons/haven.svg
+++ b/app/icons/haven.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>
--- a/app/icons/livekit.svg
+++ b/app/icons/livekit.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>
--- a/app/icons/lnd.svg
+++ b/app/icons/lnd.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>
--- a/app/icons/mempool.svg
+++ b/app/icons/mempool.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>
--- a/app/icons/nextcloud.svg
+++ b/app/icons/nextcloud.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>
--- a/app/icons/rdp.svg
+++ b/app/icons/rdp.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>
--- a/app/icons/rtl.svg
+++ b/app/icons/rtl.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>
--- a/app/icons/synapse.svg
+++ b/app/icons/synapse.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>
--- a/app/icons/tor.svg
+++ b/app/icons/tor.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>
--- a/app/icons/vaultwarden.svg
+++ b/app/icons/vaultwarden.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>
--- a/app/icons/wordpress.svg
+++ b/app/icons/wordpress.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>
--- a/app/sovran_systemsos_web/init.py
+++ b/app/sovran_systemsos_web/init.py
--- a/app/sovran_systemsos_web/config.py
+++ b/app/sovran_systemsos_web/config.py
@@ -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": []}
--- a/app/sovran_systemsos_web/server.py
+++ b/app/sovran_systemsos_web/server.py
--- a/app/sovran_systemsos_web/static/app.js
+++ b/app/sovran_systemsos_web/static/app.js
--- a/app/sovran_systemsos_web/static/style.css
+++ b/app/sovran_systemsos_web/static/style.css
--- a/app/sovran_systemsos_web/systemctl.py
+++ b/app/sovran_systemsos_web/systemctl.py
@@ -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
--- a/app/sovran_systemsos_web/templates/index.html
+++ b/app/sovran_systemsos_web/templates/index.html
@@ -0,0 +1,169 @@
 <!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">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>
  <!-- Service tiles -->
  <main class="main-content">
    <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>
  <!-- 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>
--- a/configuration.nix
+++ b/configuration.nix
@@ -1,28 +1,18 @@
 { config, pkgs, lib, ... }:
 let
 	personalization = import ./modules/personalization.nix;		
 in
 {
-  
+  imports = [
  	imports =
 		[ 
    ./modules/modules.nix
-
+    ./iso/branding.nix
  ];
-
+  # ── Boot ────────────────────────────────────────────────────
 	# Bootloader.
  boot.loader.systemd-boot.enable = true;
  boot.loader.efi.canTouchEfiVariables = true;
  boot.loader.efi.efiSysMountPoint = "/boot/efi";
  boot.kernelPackages = pkgs.linuxPackages_latest;
-	# Enable Automount without Fail for Internal Drive.
+  # ── Filesystems ─────────────────────────────────────────────
  fileSystems."/run/media/Second_Drive" = {
    device = "LABEL=BTCEcoandBackup";
    fsType = "ext4";
@@ -31,44 +21,36 @@ in
  fileSystems."/boot/efi".options = [ "umask=0077" "defaults" ];
  # ── Nix Settings ────────────────────────────────────────────
  nix.settings = {
    experimental-features = [ "nix-command" "flakes" ];
    download-buffer-size = 524288000;
  };
-	networking.hostName = "nixos"; # Define your hostname.
+  # ── Networking ──────────────────────────────────────────────
-
+  networking.hostName = "nixos";
 	# Enable networking
  networking.networkmanager.enable = true;
  networking.firewall.enable = true;
  networking.firewall.allowedTCPPorts = [ 80 443 8448 3051 ];
  networking.firewall.allowedUDPPorts = [ 80 443 8448 3051 ];
  networking.firewall.allowedUDPPortRanges = [
    { from = 49152; to = 65535; }
  ];
-	# Set your time zone.
+  # ── Locale / Time ──────────────────────────────────────────
  time.timeZone = "America/Los_Angeles";
 	# Select internationalisation properties.
  i18n.defaultLocale = "en_US.UTF-8";
-	# Enable the X11 windowing system.
+  # ── Desktop ────────────────────────────────────────────────
 	services.xserver.enable = true;
 	# Enable the GNOME Desktop Environment.
  services.displayManager.gdm.enable = true;
  services.displayManager.gdm.autoSuspend = false;
  services.displayManager.gdm.wayland = 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;
  environment.gnome.excludePackages = [ pkgs.gnome-tour ];
-	# Enable sound with pipewire.
+  # ── Audio ──────────────────────────────────────────────────
  services.pulseaudio.enable = false;
  security.rtkit.enable = true;
  services.pipewire = {
@@ -78,21 +60,18 @@ in
    pulse.enable = true;
  };
-	users.users = {
+  # ── Users ──────────────────────────────────────────────────
-		free = {
+  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
+  # ── Flatpak ────────────────────────────────────────────────
  services.flatpak.enable = true;
  systemd.services.flatpak-repo = {
    wantedBy = [ "multi-user.target" ];
    after = [ "network-online.target" ];
@@ -103,212 +82,52 @@ in
    '';
  };
-	# Allow unfree packages
+  # ── 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
+    git wget fish htop btop
 		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
+    gnome-tweaks papirus-icon-theme
-		papirus-icon-theme
+    ranger fastfetch gedit openssl pwgen
-		ranger
+    aspell aspellDicts.en lm_sensors
-		fastfetch
+    hunspell hunspellDicts.en_US
-		gedit
+    synadm brave dua bitwarden-desktop
-		matrix-synapse
+    gparted pv unzip parted screen zenity
-		openssl
+    libargon2 gnome-terminal libreoffice-fresh
-		pwgen
+    dig firefox element-desktop wp-cli axel
-		aspell
+    lk-jwt-service livekit-libwebrtc livekit-cli livekit
-		aspellDicts.en
+    matrix-synapse age
 		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
  ];
  # ── Shell ──────────────────────────────────────────────────
  programs.nixvim = {
    enable = true;
    colorschemes.catppuccin.enable = true;
    plugins.lualine.enable = true;
  };
  programs.bash.promptInit = "fish";
  programs.fish = { enable = true; promptInit = "fastfetch"; };
-	programs.fish = {
+  # ── PostgreSQL base ────────────────────────────────────────
 		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";
  };
 	###### CREATE DATABASE (WORDPRESS, MATRIX_SYNAPSE, AND NEXTCLOUD) #######
  services.postgresql = {
    enable = true;
-	};
+    authentication = lib.mkForce ''
 	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;
  };
-	
+  # ── Backups ────────────────────────────────────────────────
 	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 = ''
@@ -326,32 +145,19 @@ backup	/etc/nix-bitcoin-secrets/	localhost/
    };
  };
-
+  # ── Cron ───────────────────────────────────────────────────
 	####### 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; };
-	####### TOR #######
+  # ── SSH ────────────────────────────────────────────────────
 	services.tor = {
 		enable = true;
 		client.enable = true;
 		torsocks.enable = true;
 	};
 	services.privoxy.enableTor = true;
 	####### Enable the SSH #######
  services.openssh = {
    enable = true;
    settings = {
@@ -361,39 +167,14 @@ backup	/etc/nix-bitcoin-secrets/	localhost/
    };
  };
-
+  # ── Fail2Ban ───────────────────────────────────────────────
 	#######FailtoBan#######
  services.fail2ban = {
    enable = true;
-		ignoreIP = [
+    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" ];
 		"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";
  };
  # ── Garbage Collection ─────────────────────────────────────
  nix.gc = { automatic = true; dates = "weekly"; options = "--delete-older-than 7d"; };
  system.stateVersion = "22.05";
 }
--- a/custom-add-ons.md
+++ b/custom-add-ons.md
@@ -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
 ```
--- a/custom.template.nix
+++ b/custom.template.nix
@@ -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   │
  #  └─────────────────────┴─────<E29480><E29480><EFBFBD>──────────────────────────┘
  #
  #  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 = "";
 }
--- a/flake.lock
+++ b/flake.lock
@@ -1,29 +1,8 @@
 {
  "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": 1773169138,
@@ -41,15 +20,15 @@
    },
    "btc-clients": {
      "inputs": {
-        "nixpkgs": "nixpkgs_3",
+        "nixpkgs": "nixpkgs_2",
        "oldNixpkgs": "oldNixpkgs"
      },
      "locked": {
-        "lastModified": 1774138208,
+        "lastModified": 1774797058,
-        "narHash": "sha256-a0jEd8Q9DI0uSWKQcDRRLfYvQUWojKtyY61jZ5W+6Js=",
+        "narHash": "sha256-URUOiKNjG3s7vDkTj554+3yzQ0qqNQoQwHdc7vs63X0=",
        "owner": "emmanuelrosa",
        "repo": "btc-clients-nix",
-        "rev": "8671254e14ed042384729662c8ab8e970b4a6d87",
+        "rev": "a10dae067da04b7b170eed73efc665d27fc0e0c5",
        "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,
+        "lastModified": 1772380631,
-        "narHash": "sha256-IiiXB3BDTi6UqzAZcf2S797hWEPCRZOwyNThJIYhUfk=",
+        "narHash": "sha256-FhW0uxeXjefINP0vUD4yRBB52Us7fXZPk9RiPAopfiY=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "59e69648d345d6e8fef86158c555730fa12af9de",
+        "rev": "6d3b61b190a899042ce82a5355111976ba76d698",
        "type": "github"
      },
      "original": {
-        "owner": "NixOS",
+        "owner": "nixos",
-        "ref": "nixos-25.05",
+        "ref": "master",
        "repo": "nixpkgs",
        "type": "github"
      }
@@ -242,27 +200,11 @@
      },
      "original": {
        "owner": "nixos",
        "ref": "master",
        "repo": "nixpkgs",
        "type": "github"
      }
    },
    "nixpkgs_3": {
      "locked": {
        "lastModified": 1772380631,
        "narHash": "sha256-FhW0uxeXjefINP0vUD4yRBB52Us7fXZPk9RiPAopfiY=",
        "owner": "NixOS",
        "repo": "nixpkgs",
        "rev": "6d3b61b190a899042ce82a5355111976ba76d698",
        "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": 1774106199,
+        "lastModified": 1775036866,
-        "narHash": "sha256-US5Tda2sKmjrg2lNHQL3jRQ6p96cgfWh3J1QBliQ8Ws=",
+        "narHash": "sha256-ZojAnPuCdy657PbTq5V0Y+AHKhZAIwSIT2cb8UgAz/U=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "6c9a78c09ff4d6c21d0319114873508a6ec01655",
+        "rev": "6201e203d09599479a3b3450ed24fa81537ebc4e",
        "type": "github"
      },
      "original": {
@@ -294,7 +236,7 @@
        "type": "github"
      }
    },
-    "nixpkgs_6": {
+    "nixpkgs_5": {
      "locked": {
        "lastModified": 1770380644,
        "narHash": "sha256-P7dWMHRUWG5m4G+06jDyThXO7kwSk46C1kgjEWcybkE=",
@@ -313,15 +255,15 @@
    "nixvim": {
      "inputs": {
        "flake-parts": "flake-parts",
-        "nixpkgs": "nixpkgs_6",
+        "nixpkgs": "nixpkgs_5",
-        "systems": "systems_3"
+        "systems": "systems_2"
      },
      "locked": {
-        "lastModified": 1774309640,
+        "lastModified": 1774802402,
-        "narHash": "sha256-8oWL7YLwElBY9ebYri1LlSlhf/gd1Qoqj0nbBwG2yso=",
+        "narHash": "sha256-L1UJ/zxKTyyaGGmytH6OYlgQ0HGSMhvPkvU+iz4Mkb8=",
        "owner": "nix-community",
        "repo": "nixvim",
-        "rev": "28c58bf023bf537354f78d6e496a349d7a0ed554",
+        "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",
--- a/flake.nix
+++ b/flake.nix
@@ -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
 			];
 		};
 		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;
 			};
 		};
--- a/for_new_sovran_pros/Sovran_SystemsOS-Desktop
+++ b/for_new_sovran_pros/Sovran_SystemsOS-Desktop
@@ -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
--- a/for_new_sovran_pros/flake.nix
+++ b/for_new_sovran_pros/flake.nix
@@ -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 
 			];
 		};
 	};
 }
--- a/for_new_sovran_pros/psp.sh
+++ b/for_new_sovran_pros/psp.sh
@@ -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
--- a/for_new_sovran_pros/psp_physical_ram.sh
+++ b/for_new_sovran_pros/psp_physical_ram.sh
@@ -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
--- a/for_new_sovran_pros/sdpsp.sh
+++ b/for_new_sovran_pros/sdpsp.sh
@@ -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!"
--- a/for_new_sovran_pros/sp.sh
+++ b/for_new_sovran_pros/sp.sh
@@ -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!"
--- a/iso/assets/splash-logo.png
+++ b/iso/assets/splash-logo.png
--- a/iso/branding.nix
+++ b/iso/branding.nix
@@ -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;
 }
--- a/iso/common.nix
+++ b/iso/common.nix
@@ -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
 '';
 }
--- a/iso/desktop.nix
+++ b/iso/desktop.nix
@@ -0,0 +1,5 @@
 { config, pkgs, lib, ... }:
 {
  imports = [ ./common.nix ];
 }
--- a/iso/disko.nix
+++ b/iso/disko.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 {});
  };
 }
--- a/iso/installer.py
+++ b/iso/installer.py
@@ -0,0 +1,719 @@
 #!/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 ───────────────<E29480><E29480>─────────────────────────────────────
    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_disk_confirm()
    # ── 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 ────────<E29480><E29480><EFBFBD>──────────────────────────────────
    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)
--- a/iso/plymouth-theme.nix
+++ b/iso/plymouth-theme.nix
@@ -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
  '';
 }
--- a/iso/server.nix
+++ b/iso/server.nix
@@ -0,0 +1,5 @@
 { config, pkgs, lib, ... }:
 {
  imports = [ ./common.nix ];
 }
--- a/modules/bip110.nix
+++ b/modules/bip110.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
--- a/modules/bitcoinecosystem.nix
+++ b/modules/bitcoinecosystem.nix
@@ -1,8 +1,6 @@
 { config, pkgs, lib, ... }:
-lib.mkIf config.sovran_systemsOS.features.bitcoin {
+lib.mkIf config.sovran_systemsOS.services.bitcoin {
 	## Bitcoind
  services.bitcoind = {
    enable = true;
@@ -22,18 +20,12 @@ lib.mkIf config.sovran_systemsOS.features.bitcoin {
  nix-bitcoin.onionServices.electrs.enable = true;
  nix-bitcoin.onionServices.rtl.enable = true;
 	## Electrs
  services.electrs = {
    enable = true;
    tor.enforce = true;
    dataDir = "/run/media/Second_Drive/BTCEcoandBackup/Electrs_Data";
  };
  ## LND
  services.lnd = {
    enable = true;
    tor.enforce = true;
@@ -45,17 +37,11 @@ lib.mkIf config.sovran_systemsOS.features.bitcoin {
  nix-bitcoin.onionServices.lnd.public = true;
  ## LNDconnect
  services.lnd.lndconnect = {
    enable = true;
    onion = true;
  };
 	## RTL
  services.rtl = {
    enable = true;
    tor.enforce = true;
@@ -65,24 +51,16 @@ lib.mkIf config.sovran_systemsOS.features.bitcoin {
      lnd = {
        enable = true;
      };
    };
  };
 	## BTCpayserver
  services.btcpayserver = {
    enable = true;
  };
  services.btcpayserver.lightningBackend = "lnd";
 	## System
  nix-bitcoin.generateSecrets = true;
  nix-bitcoin.nodeinfo.enable = true;
  nix-bitcoin.operator = {
@@ -92,4 +70,7 @@ lib.mkIf config.sovran_systemsOS.features.bitcoin {
  nix-bitcoin.useVersionLockedPkgs = false;
   sovran_systemsOS.domainRequirements = [
    { name = "btcpayserver"; label = "BTCPay Server"; example = "pay.yourdomain.com"; }
  ];
 }
--- a/modules/core/caddy.nix
+++ b/modules/core/caddy.nix
@@ -0,0 +1,167 @@
 { 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
      # ── 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
    '';
  };
 }
--- a/modules/core/njalla.nix
+++ b/modules/core/njalla.nix
@@ -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
    '';
  };
 }
--- a/modules/core/role-logic.nix
+++ b/modules/core/role-logic.nix
@@ -3,34 +3,42 @@
 {
  config = lib.mkMerge [
-    # Server-Desktop Role most services enabled
+    # ── Server+Desktop Role (default) ─────────────────────────
-    (lib.mkIf config.sovran_systemsOS.roles.server-desktop {
+    (lib.mkIf config.sovran_systemsOS.roles.server_plus_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;
      };
    })
-    # 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 = {
+      sovran_systemsOS.services = {
-        bitcoin = true;
+        bitcoin = lib.mkDefault true;
-        bip110 = false;
+        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;
    })
  ];
--- a/modules/core/roles.nix
+++ b/modules/core/roles.nix
@@ -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 = "";
--- a/modules/core/sovran-hub.nix
+++ b/modules/core/sovran-hub.nix
@@ -0,0 +1,288 @@
 { 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 <EFBFBD><EFBFBD> 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 = "Users"; file = "/var/lib/secrets/matrix-users"; multiline = true; }
      ]; }
      { 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 ];
  };
 }
--- a/modules/core/sovran-manage-domains.nix
+++ b/modules/core/sovran-manage-domains.nix
@@ -0,0 +1,377 @@
 { 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 ""
    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 ""
    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
  '';
 }
--- a/modules/core/sovran_systemsos-desktop.nix
+++ b/modules/core/sovran_systemsos-desktop.nix
@@ -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 ];
      };
    };
  }
  ];
 }
--- a/modules/core/ssh-bootstrap.nix
+++ b/modules/core/ssh-bootstrap.nix
@@ -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
    '';
  };
 }
--- a/modules/coturn.nix
+++ b/modules/coturn.nix
@@ -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
 	'';
 	};
 }
--- a/modules/credentials-pdf.nix
+++ b/modules/credentials-pdf.nix
@@ -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 "╚════════════════════════════<EFBFBD><EFBFBD>═════════════════════════╝"
        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."
    '';
  };
 }
--- a/modules/element-calling.nix
+++ b/modules/element-calling.nix
@@ -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,22 +39,42 @@ 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 #######
+  ####### CADDY SNIPPET #######
-  services.caddy.virtualHosts = lib.mkForce {
+  systemd.services.element-calling-caddy-config = {
-    "${personalization.matrix_url}" = {
+    description = "Generate Element Calling Caddy config snippet";
-      extraConfig = ''
+    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)
      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://${personalization.matrix_url}" }, "org.matrix.msc4143.rtc_foci": [{ "type":"livekit", "livekit_service_url":"https://${personalization.element-calling_url}/livekit/jwt" }] }`
+  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" }] }\`
-      '';
+}
    };
-    "${personalization.element-calling_url}" = {
+$MATRIX:8448 {
-      extraConfig = ''
+  reverse_proxy http://localhost:8008
 }
 $ELEMENT_CALLING {
  handle /livekit/jwt/sfu/get {
    uri strip_prefix /livekit/jwt
    reverse_proxy [::1]:8073 {
@@ -69,8 +87,40 @@ lib.mkIf config.sovran_systemsOS.features.element-calling {
  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 #######
+  systemd.services.lk-jwt-service.serviceConfig.EnvironmentFile = [
-  services.matrix-synapse = {
+    "/run/lk-jwt-service/env"
    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;
+  ####### SYNAPSE RUNTIME CONFIG (element-calling additions) #######
-      enable_registration = false;
+  systemd.services.element-calling-synapse-config = {
-      registration_shared_secret = config.age.secrets.matrix_reg_secret.path;
+    description = "Generate Synapse runtime config for Element Calling";
-      listeners = [
+    before = [ "matrix-synapse.service" ];
-        {
+    requiredBy = [ "matrix-synapse.service" ];
-          port = 8008;
+    wantedBy = [ "multi-user.target" ];
-          bind_addresses = [ "::1" ];
+    serviceConfig = {
-          type = "http";
+      Type = "oneshot";
-          tls = false;
+      RemainAfterExit = true;
-          x_forwarded = true;
+    };
-          resources = [
+    unitConfig = {
-            { names = [ "client" ]; compress = true; }
+      ConditionPathExists = "/var/lib/domains/element-calling";
-            { names = [ "federation" ]; compress = false; }
+    };
    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"; }
  ];
 }
      ];
    };
  };
 }
--- a/modules/haven.nix
+++ b/modules/haven.nix
@@ -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.after = [ "haven-whitelist-setup.service" "haven-runtime-config.service" ];
-  systemd.services.haven.wants = [ "haven-whitelist-setup.service" ];
+  systemd.services.haven.wants = [ "haven-whitelist-setup.service" "haven-runtime-config.service" ];
-  services.caddy.virtualHosts = {
+  sovran_systemsOS.domainRequirements = [
-    "${personalization.haven_url}" = {
+    { name = "haven"; label = "Haven NOSTR Relay"; example = "relay.yourdomain.com"; }
-      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
        }
      '';
    };
  };
 }
--- a/modules/mempool.nix
+++ b/modules/mempool.nix
@@ -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
              '';
          };
      };
  };
 }
--- a/modules/modules.nix
+++ b/modules/modules.nix
@@ -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
+    ./wordpress.nix
-    ./bitcoinecosystem.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
  ];
 }
--- a/modules/nextcloud.nix
+++ b/modules/nextcloud.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"; }
  ];
 }
--- a/modules/personalization.nix
+++ b/modules/personalization.nix
@@ -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;
 }
--- a/modules/rdp.nix
+++ b/modules/rdp.nix
@@ -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,19 +48,30 @@ 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
+      # Regenerate TLS certificate if missing OR if ownership is wrong
-      if [ ! -f "$TLS_DIR/rdp-tls.crt" ]; then
+      # (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"
        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"
        echo "Generated RDP TLS certificate"
      fi
      # Configure TLS certificate
      grdctl --system rdp set-tls-cert "$TLS_DIR/rdp-tls.crt"
@@ -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}')
--- a/modules/synapse.nix
+++ b/modules/synapse.nix
@@ -1,56 +1,126 @@
 { 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
+  # ── Generate runtime config from domain files ───────────────
-	personalization = import ./personalization.nix;
+  systemd.services.matrix-synapse-runtime-config = {
-in
+    description = "Generate Synapse runtime config from domain files";
-lib.mkIf config.sovran_systemsOS.features.synapse {
+    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;
 			server_name = personalization.matrix_url;
 		 	url_preview_enabled = true;
 		 	max_upload_size = "1024M";
      url_preview_ip_range_blacklist = [
-				"10.0.0.0/8"
+        "10.0.0.0/8" "100.64.0.0/10" "169.254.0.0/16" "172.16.0.0/12"
-				"100.64.0.0/10"
+        "192.0.0.0/24" "192.0.2.0/24" "192.168.0.0/16" "192.88.99.0/24"
-				"169.254.0.0/16"
+        "198.18.0.0/15" "198.51.100.0/24" "2001:db8::/32" "203.0.113.0/24"
-				"172.16.0.0/12"
+        "224.0.0.0/4" "::1/128" "fc00::/7" "fe80::/10" "fec0::/10" "ff00::/8"
 				"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;
@@ -58,16 +128,85 @@ lib.mkIf config.sovran_systemsOS.features.synapse {
          type = "http";
          tls = false;
          x_forwarded = true;
-					resources = [ {
+          resources = [
-						names = [ "client" ];
+            { names = [ "client" ]; compress = true; }
-						compress = true;
+            { names = [ "federation" ]; compress = false; }
-					} 
+          ];
 					{
 						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.coreutils pkgs.jq ];
    script = ''
      set -euo 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)
      # Only run if we haven't already generated the file
      if [ ! -f "$CREDS_FILE" ]; then
        mkdir -p /var/lib/secrets
        ADMIN_USER="admin"
        ADMIN_PASS=$(pwgen -s 24 1)
        TEST_USER="test"
        TEST_PASS=$(pwgen -s 24 1)
        # Create Admin user
        register_new_matrix_user -c /run/matrix-synapse/runtime-config.yaml \
          -u "$ADMIN_USER" -p "$ADMIN_PASS" -a http://localhost:8008
        # Create Test user (non-admin)
        register_new_matrix_user -c /run/matrix-synapse/runtime-config.yaml \
          -u "$TEST_USER" -p "$TEST_PASS" --no-admin http://localhost:8008
        # Save the credentials
        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
        chmod 600 "$CREDS_FILE"
        echo "Matrix users created successfully."
      fi
    '';
  };
  sovran_systemsOS.domainRequirements = [
    { name = "matrix"; label = "Matrix Synapse"; example = "matrix.yourdomain.com"; }
  ];
 }
--- a/modules/vaultwarden.nix
+++ b/modules/vaultwarden.nix
@@ -1,16 +1,62 @@
 { config, pkgs, lib, ... }:
-let
+lib.mkIf config.sovran_systemsOS.services.vaultwarden {
 	personalization = import ./personalization.nix;
 in
-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"
      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
    '';
  };
  # ── 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 = {
        		DOMAIN = "https://${personalization.vaultwarden_url}";
      SIGNUPS_ALLOWED = false;
      ROCKET_ADDRESS = "127.0.0.1";
      ROCKET_PORT = 8777;
@@ -19,4 +65,12 @@ lib.mkIf config.sovran_systemsOS.features.vaultwarden {
    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"; }
  ];
 }
--- a/modules/wordpress.nix
+++ b/modules/wordpress.nix
@@ -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 ────────<E29480><E29480><EFBFBD>─────
  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"; }
  ];
 }
Author	SHA1	Message	Date
Sovran_Systems	0086a47938	Merge pull request #13 from naturallaw777/copilot/add-rtl-mempool-lan-proxies [WIP] Add RTL and Mempool LAN reverse proxies to Caddy	2026-04-03 10:21:56 -05:00
copilot-swe-agent[bot]	e6cdb3b840	Add RTL and Mempool LAN reverse proxies, open firewall ports Agent-Logs-Url: https://github.com/naturallaw777/staging_alpha/sessions/d29c1b82-a70e-4092-88c7-b521a1b3cac3 Co-authored-by: naturallaw777 <99053422+naturallaw777@users.noreply.github.com>	2026-04-03 15:21:01 +00:00
copilot-swe-agent[bot]	dfe45bdbb2	Initial plan	2026-04-03 15:19:46 +00:00
Sovran_Systems	e42bea8edf	Merge pull request #12 from naturallaw777/copilot/fix-service-tiles-runtime-state Fix Feature Manager: runtime state not reflected in service tiles, missing feature_manager config key, empty domain false positive	2026-04-03 09:55:39 -05:00
copilot-swe-agent[bot]	9cc237fb5b	Fix all 4 Feature Manager bugs in server.py Agent-Logs-Url: https://github.com/naturallaw777/staging_alpha/sessions/77921fb1-4d4b-4d10-b982-b3768b858b86 Co-authored-by: naturallaw777 <99053422+naturallaw777@users.noreply.github.com>	2026-04-03 14:52:14 +00:00
copilot-swe-agent[bot]	ab60d2b504	Initial plan	2026-04-03 14:50:04 +00:00
Sovran_Systems	478a8b0189	Merge pull request #11 from naturallaw777/copilot/eliminate-hub-overrides Eliminate hub-overrides.nix: write feature toggles directly into custom.nix	2026-04-03 09:30:43 -05:00
copilot-swe-agent[bot]	3c6106d06a	Eliminate hub-overrides.nix: write feature toggles into custom.nix instead Agent-Logs-Url: https://github.com/naturallaw777/staging_alpha/sessions/db82f216-af3e-4d7f-a972-86c03f23e069 Co-authored-by: naturallaw777 <99053422+naturallaw777@users.noreply.github.com>	2026-04-03 14:28:24 +00:00
copilot-swe-agent[bot]	8d05f43594	Initial plan	2026-04-03 14:24:14 +00:00
naturallaw77	f5180767b1	updated wiring for hub feature enable	2026-04-03 09:07:07 -05:00
naturallaw77	f3d75b9ba5	updated wiring for hub feature enable	2026-04-03 08:37:21 -05:00
naturallaw77	304df327e3	UX update for feature manager	2026-04-03 07:31:17 -05:00
naturallaw77	801b46b95f	deeper fix for RDP regeneration	2026-04-03 07:16:01 -05:00
naturallaw77	bc7a9d96da	deeper fix for RDP regeneration	2026-04-03 07:10:40 -05:00
naturallaw77	1f273d9229	fix for RDP regeneration	2026-04-03 07:08:09 -05:00
Sovran_Systems	60638cd1e3	Merge pull request #10 from naturallaw777/copilot/fix-rebuild-modal-race-condition Fix stale rebuild modal race condition in Features Manager	2026-04-02 20:41:28 -05:00
copilot-swe-agent[bot]	c139496af9	fix: clear stale rebuild log before new rebuild and delay first poll Agent-Logs-Url: https://github.com/naturallaw777/staging_alpha/sessions/eee95839-bfd2-4733-9799-a034178bcdd6 Co-authored-by: naturallaw777 <99053422+naturallaw777@users.noreply.github.com>	2026-04-03 01:40:43 +00:00
copilot-swe-agent[bot]	e0447c551a	Initial plan	2026-04-03 01:38:04 +00:00
Sovran_Systems	81ad77567a	Merge pull request #9 from naturallaw777/copilot/overlay-runtime-feature-states [WIP] Update /api/services endpoint to overlay feature states	2026-04-02 20:29:45 -05:00
copilot-swe-agent[bot]	cba66e86df	Fix service tiles showing stale enabled state by overlaying runtime hub-overrides Agent-Logs-Url: https://github.com/naturallaw777/staging_alpha/sessions/e840f6c9-69a3-4ced-b6ef-128a0775321c Co-authored-by: naturallaw777 <99053422+naturallaw777@users.noreply.github.com>	2026-04-03 01:29:21 +00:00
copilot-swe-agent[bot]	12eb68abdf	Initial plan	2026-04-03 01:26:13 +00:00
naturallaw77	0670f1248a	fix for feature manager	2026-04-02 20:15:57 -05:00
naturallaw77	69c01d605f	fix for feature manager	2026-04-02 20:03:13 -05:00
naturallaw77	1090aa056b	fix for feature manager	2026-04-02 20:00:27 -05:00
naturallaw77	2378a278f2	reverted to old file	2026-04-02 19:49:51 -05:00
Sovran_Systems	280e7a4132	Merge pull request #8 from naturallaw777/copilot/fix-feature-manager-bugs [WIP] Fix Feature Manager bugs in Sovran Hub	2026-04-02 18:59:55 -05:00
copilot-swe-agent[bot]	6a0a4e0489	Initial plan	2026-04-02 23:50:44 +00:00
naturallaw77	a54beaffad	updated Feature Manager	2026-04-02 18:42:00 -05:00
Sovran_Systems	064ede9a75	Merge pull request #7 from naturallaw777/copilot/add-feature-manager-ui Add Feature Manager to Sovran Hub dashboard	2026-04-02 18:30:03 -05:00
copilot-swe-agent[bot]	e43552373c	fix: validate domain_name to prevent path injection; fix toggle revert logic Agent-Logs-Url: https://github.com/naturallaw777/staging_alpha/sessions/9088415a-efc3-4dd1-9c22-877a543af47b Co-authored-by: naturallaw777 <99053422+naturallaw777@users.noreply.github.com>	2026-04-02 23:27:14 +00:00
copilot-swe-agent[bot]	b9c8c20347	feat: add Feature Manager to Sovran Hub dashboard - flake.nix: import /etc/nixos/hub-overrides.nix alongside custom.nix - sovran-hub.nix: add hub-overrides-init service (seeds file if missing), sovran-hub-rebuild service (nixos-rebuild switch only), and feature_manager=true in generated config.json - server.py: add FEATURE_REGISTRY with 6 features (rdp, haven, element-calling, mempool, bip110, bitcoin-core); add hub-overrides.nix read/write helpers; add /api/features, /api/features/toggle, /api/rebuild/status, /api/domains/set, /api/domains/set-email, /api/domains/status endpoints; update /api/config to expose feature_manager - index.html: add domain setup modal, SSL email modal, feature confirm modal, and rebuild modal HTML - app.js: add Feature Manager rendering with sub-category layout, feature toggle cards with sliding toggles, domain setup flow, SSL email collection, conflict confirmation, rebuild polling - style.css: add Feature Manager styles (feature cards, toggle switch, domain badge, conflict warning, domain input fields)" Agent-Logs-Url: https://github.com/naturallaw777/staging_alpha/sessions/9088415a-efc3-4dd1-9c22-877a543af47b Co-authored-by: naturallaw777 <99053422+naturallaw777@users.noreply.github.com>	2026-04-02 23:24:17 +00:00
copilot-swe-agent[bot]	971b0797df	Initial plan	2026-04-02 23:15:35 +00:00
naturallaw77	19c7e01b2a	updated public key	2026-04-02 17:39:51 -05:00
naturallaw77	f8c15bdaa4	added public key	2026-04-02 17:25:21 -05:00
naturallaw77	71a25c12ab	fixed service layout	2026-04-02 17:20:14 -05:00
naturallaw77	e436b2f7a6	added service feature	2026-04-02 17:08:20 -05:00
naturallaw77	c4307f358c	fixed RDP layout	2026-04-02 16:48:01 -05:00
naturallaw77	b63ad15cc1	fixed RDP layout	2026-04-02 16:45:27 -05:00
naturallaw77	51c458c33a	added RDP	2026-04-02 16:39:01 -05:00
naturallaw77	8546ff073a	removed start stop toggles	2026-04-02 16:35:18 -05:00
naturallaw77	4d23197aa3	added qr code	2026-04-02 16:23:45 -05:00
naturallaw77	2fefbf47e4	added qr code	2026-04-02 16:17:39 -05:00
naturallaw77	d391905e92	added qr code	2026-04-02 16:10:44 -05:00
naturallaw77	13f38f6254	added lndconnet	2026-04-02 16:03:55 -05:00
naturallaw77	195f616ca8	frontend onion links	2026-04-02 15:55:57 -05:00
naturallaw77	78c1d2f2bc	frontend link fix	2026-04-02 15:50:31 -05:00
naturallaw77	31539510d5	frontend link fix	2026-04-02 15:46:23 -05:00
naturallaw77	ad0f04c0bf	frontend link fix	2026-04-02 15:43:32 -05:00
naturallaw77	b6dfbc4a56	frontend uses weblinks	2026-04-02 15:37:07 -05:00
naturallaw77	ae1f39f0c8	updated BIP110	2026-04-02 15:24:24 -05:00
naturallaw77	987d62ce4d	updated security	2026-04-02 15:14:15 -05:00
naturallaw77	bb2c66a4dc	added passwd fix for user account	2026-04-02 15:09:04 -05:00
naturallaw77	f1e79d6408	added password tile	2026-04-02 14:55:32 -05:00
naturallaw77	a7d3af4ddd	fixed cache	2026-04-02 14:50:07 -05:00
naturallaw77	9f179295d8	fixed app.js	2026-04-02 14:25:04 -05:00
naturallaw77	64c32a7f53	added info dialog for each tile	2026-04-02 14:20:06 -05:00
naturallaw77	d9a5416012	fixed stale info	2026-04-02 14:07:47 -05:00
naturallaw77	9a61994dde	fixed reboot menu	2026-04-02 14:01:08 -05:00
naturallaw77	868e6e3315	fixed the color of buttons	2026-04-02 13:54:03 -05:00
naturallaw77	bb7db0693a	fixed updater	2026-04-02 13:42:24 -05:00
naturallaw77	a66e8e736f	updated logging	2026-04-02 13:34:29 -05:00
naturallaw77	3e1f672c00	updated logging	2026-04-02 13:27:25 -05:00
naturallaw77	eb11231e34	updated logging	2026-04-02 13:21:33 -05:00
naturallaw77	150666d7c3	updated logging	2026-04-02 13:15:19 -05:00
naturallaw77	38733daffc	updated logging	2026-04-02 13:09:07 -05:00
naturallaw77	08492cef94	added new systemd update unit	2026-04-02 12:54:32 -05:00
naturallaw77	ad688a1d29	fixed ssh access	2026-04-02 12:37:43 -05:00
naturallaw77	fb940b055d	fixed for update button in web	2026-04-02 12:31:04 -05:00
naturallaw77	ea28f9b303	changed port	2026-04-02 12:15:53 -05:00
Sovran_Systems	d60a51e033	Merge pull request #6 from naturallaw777/copilot/remove-gtk-app-add-web-app Replace GTK4/Libadwaita desktop app with FastAPI web app (Sovran_SystemsOS Hub)	2026-04-02 12:04:10 -05:00
copilot-swe-agent[bot]	92a9d2cfa1	Add .gitignore to exclude __pycache__, remove pyc files Agent-Logs-Url: https://github.com/naturallaw777/staging_alpha/sessions/5c173acb-776f-4cd2-bc89-bb7675e38677 Co-authored-by: naturallaw777 <99053422+naturallaw777@users.noreply.github.com>	2026-04-02 17:02:28 +00:00
copilot-swe-agent[bot]	592faeecca	Remove __pycache__ from tracking, add to .gitignore Agent-Logs-Url: https://github.com/naturallaw777/staging_alpha/sessions/5c173acb-776f-4cd2-bc89-bb7675e38677 Co-authored-by: naturallaw777 <99053422+naturallaw777@users.noreply.github.com>	2026-04-02 17:02:00 +00:00
copilot-swe-agent[bot]	42900608f6	Replace GTK4 desktop app with FastAPI web app (Sovran_SystemsOS Hub) Agent-Logs-Url: https://github.com/naturallaw777/staging_alpha/sessions/5c173acb-776f-4cd2-bc89-bb7675e38677 Co-authored-by: naturallaw777 <99053422+naturallaw777@users.noreply.github.com>	2026-04-02 17:01:42 +00:00
copilot-swe-agent[bot]	af1ad09e2e	Initial plan	2026-04-02 16:50:57 +00:00
naturallaw77	f8336ff995	update	2026-04-02 11:35:53 -05:00
naturallaw77	c685bca80d	update	2026-04-02 11:33:49 -05:00
naturallaw77	92efd42d9e	update	2026-04-02 09:45:59 -05:00
naturallaw77	89df4195f0	Nixpkgs Udpate	2026-04-01 21:12:32 -05:00
naturallaw77	be61de7a2d	Fix CSS errors (remove unsupported properties), fix missing _fetch_ips_once method	2026-03-31 21:04:41 -05:00
naturallaw77	25f07a6016	Scale up all tiles and fonts, lock all dimensions proportionally	2026-03-31 20:58:13 -05:00
naturallaw77	9ab24557df	Scale up all tiles and fonts, lock all dimensions proportionally	2026-03-31 20:55:39 -05:00
naturallaw77	ca20cf6e90	format tile size	2026-03-31 20:41:30 -05:00
naturallaw77	f217b6af0d	format tile size	2026-03-31 20:36:24 -05:00
naturallaw77	e0c292eb06	Align section labels and tile grid to same left edge	2026-03-31 20:27:02 -05:00
naturallaw77	65d0364cc6	Align section labels and tile grid to same left edge	2026-03-31 20:22:05 -05:00
naturallaw77	2861834647	Keep section labels inside fixed-width grid container	2026-03-31 20:10:30 -05:00
naturallaw77	95ce30a209	Green update indicator, fixed-width tile grid for fullscreen	2026-03-31 20:00:46 -05:00
naturallaw77	209ad0010e	Add internal/external IP display bar to Hub	2026-03-31 17:28:56 -05:00
naturallaw77	0590c706e5	Fix update check: read branch from flake.lock, query Gitea API	2026-03-31 17:23:24 -05:00
naturallaw77	2b01fefb24	Show update indicator when repo has new commits	2026-03-31 17:08:36 -05:00
naturallaw77	d93f5b9eda	Bigger update modal, error report to Downloads, reboot button	2026-03-31 17:03:52 -05:00
naturallaw77	68c24f6ec1	added updater to hub	2026-03-31 16:58:10 -05:00
naturallaw77	9ad9b7505e	Remove systemd-manager GNOME extension, replaced by Sovran Hub	2026-03-31 16:46:02 -05:00
naturallaw77	6b6a90da2a	Add autostart toggle, dock pinning, Bitcoin Base/Apps split	2026-03-31 16:40:04 -05:00
naturallaw77	dfa0249ec4	updated layout in hub	2026-03-31 16:31:15 -05:00
naturallaw77	4178ed07fb	updated layout in hub	2026-03-31 16:20:13 -05:00
naturallaw77	b24870dcb1	icon update	2026-03-31 16:08:55 -05:00
naturallaw77	b1bb53e562	hub update	2026-03-31 15:46:21 -05:00
naturallaw77	435a2ed5b2	new visulation in Hub	2026-03-31 14:45:05 -05:00
naturallaw77	8f3b9d4156	renamed livekit to element-call	2026-03-31 14:31:57 -05:00
naturallaw77	d8c961f985	update py script	2026-03-31 14:23:52 -05:00
naturallaw77	e145ba949b	refiled directories	2026-03-31 13:58:19 -05:00
naturallaw77	b669e6349d	updated icons	2026-03-31 13:35:22 -05:00
naturallaw77	e686cb60aa	updated icons	2026-03-31 11:04:48 -05:00
naturallaw77	de93dc89ba	updated icons	2026-03-31 11:01:12 -05:00
naturallaw77	c6024ca968	updated name	2026-03-31 10:58:11 -05:00
naturallaw77	fb4b750a29	updated hub	2026-03-31 10:55:32 -05:00
naturallaw77	8dd394914f	got icons	2026-03-31 10:54:50 -05:00
naturallaw77	ce153d6b6e	btcpayserver logo	2026-03-31 10:44:21 -05:00
naturallaw77	5cb3940388	updated flake.nix	2026-03-31 10:32:23 -05:00
naturallaw77	f342f6d286	updated look of hub	2026-03-31 10:30:11 -05:00
naturallaw77	690ea64df6	updated hub to remove units	2026-03-31 10:10:44 -05:00
naturallaw77	1468489e17	fixed file structure	2026-03-30 21:35:07 -05:00
naturallaw77	3ce192bef7	add new app for systemd monitoring	2026-03-30 21:31:36 -05:00
naturallaw77	51c3e5969d	updade PDF generator	2026-03-30 20:41:39 -05:00
naturallaw77	f6c09910fa	continued fix lndconnect to PDF	2026-03-30 20:36:17 -05:00
naturallaw77	d8ee571420	continued fix lndconnect to PDF	2026-03-30 20:30:48 -05:00
naturallaw77	e08c8ce792	continued fix lndconnect to PDF	2026-03-30 20:23:33 -05:00
naturallaw77	a9d76a08a4	fix lndconnect to PDF	2026-03-30 20:19:11 -05:00
naturallaw77	af8a24be8c	fix lndconnect to PDF	2026-03-30 20:16:50 -05:00
naturallaw77	fe38f37ec8	updated vaultwarden and lndconnect to PDF	2026-03-30 20:07:33 -05:00
naturallaw77	abf3495ca7	updated vaultwarden to make key	2026-03-30 19:57:44 -05:00
naturallaw77	a0a28be7ca	retooled pdf creator	2026-03-30 19:45:05 -05:00
naturallaw77	25e511f8b4	updated pdf to fix crashes	2026-03-30 19:32:52 -05:00
naturallaw77	b8c8c71f3a	updated pdf with loop guard	2026-03-29 21:36:41 -05:00
naturallaw77	5a4c18f7d7	updated pdf with font links	2026-03-29 21:05:50 -05:00
naturallaw77	80b10c6d95	updated pdf with font	2026-03-29 21:00:58 -05:00
naturallaw77	49be01696f	updated pdf builder	2026-03-29 20:55:03 -05:00
naturallaw77	4dc1ebcaa6	updated python installer	2026-03-29 16:23:09 -05:00
naturallaw77	edd7d43456	updated python installer	2026-03-29 16:02:19 -05:00
naturallaw77	e1deac6a53	updated common	2026-03-29 15:27:17 -05:00
naturallaw77	70120a3829	updated common	2026-03-29 15:19:29 -05:00
naturallaw77	24eb763e1c	updated common	2026-03-29 15:17:50 -05:00
naturallaw77	bae2ffe1c2	removed result	2026-03-29 15:15:41 -05:00
naturallaw77	63c7af3b65	added flakes to common.nix	2026-03-29 15:15:15 -05:00
naturallaw77	ce84d2c501	removed old result and updated common	2026-03-29 14:58:32 -05:00
naturallaw77	ae46d23c5d	removed old result and updated common	2026-03-29 14:46:39 -05:00
naturallaw77	3e470d361b	removed old result and updated common	2026-03-29 14:20:24 -05:00
naturallaw77	5402b2a82e	removed old result and updated common	2026-03-29 14:04:48 -05:00
naturallaw77	1033b51d6b	removed old result and updated common	2026-03-29 13:51:25 -05:00
naturallaw77	15e28af004	removed old result and updated common	2026-03-29 13:41:08 -05:00
naturallaw77	41581e25d1	removed old result and updated common	2026-03-29 13:29:46 -05:00
naturallaw77	6600ba0816	removed old result and updated common	2026-03-29 13:13:36 -05:00
naturallaw77	d55ce60889	removed old result	2026-03-29 12:52:49 -05:00
naturallaw77	063e4aa2c1	added iso	2026-03-29 12:45:24 -05:00
naturallaw77	2c72145264	removed old result	2026-03-29 12:39:12 -05:00
naturallaw77	d9a886dac1	updated common	2026-03-29 12:27:04 -05:00
naturallaw77	3644584512	updated common to include GTK4	2026-03-29 12:15:22 -05:00
naturallaw77	309b8f9d1b	added python installer and common	2026-03-29 12:02:25 -05:00
naturallaw77	ac24f0fb44	added python installer removed bash script	2026-03-29 10:20:00 -05:00
naturallaw77	5e497fcab3	updated installer	2026-03-29 09:56:00 -05:00
naturallaw77	1157d58d81	updated installer	2026-03-29 09:40:49 -05:00
naturallaw77	0d8c43a460	updated common	2026-03-29 09:23:54 -05:00
naturallaw77	d8484796fb	updated common and install	2026-03-29 09:12:30 -05:00
naturallaw77	6502dc7e58	updated common	2026-03-29 08:55:42 -05:00
naturallaw77	74f15aab7d	updated license	2026-03-29 08:49:14 -05:00
naturallaw77	d5aa7a4cdb	updated iso and license	2026-03-29 08:46:28 -05:00
naturallaw77	bc06c0e610	updated common	2026-03-29 08:31:17 -05:00
naturallaw77	cf8cb777e1	iso update	2026-03-29 08:20:24 -05:00
naturallaw77	a63f3dfe17	udpate some toolling	2026-03-29 08:06:21 -05:00
naturallaw77	0a737a14d5	updated flake.nix	2026-03-29 07:45:08 -05:00
naturallaw77	ff27c3fb4c	fixed retooling for flake.nix	2026-03-29 07:41:26 -05:00
naturallaw77	5747a18691	small retooling for flake.nix	2026-03-29 07:38:06 -05:00
naturallaw77	5accb18e7c	updated branding and some retooling	2026-03-29 07:13:22 -05:00
naturallaw77	39d9596756	updated iso	2026-03-29 05:02:15 -05:00
naturallaw77	e132bf18dc	updated synapse	2026-03-29 00:54:41 -05:00
naturallaw77	fe5eb58b87	updated synapse	2026-03-29 00:51:44 -05:00
naturallaw77	f09d954e6a	updated desktop nix	2026-03-29 00:43:02 -05:00
naturallaw77	0343077c7c	remove erronius gnome setting	2026-03-29 00:38:38 -05:00
naturallaw77	fc56919ee8	updated pdf creator and overall theme	2026-03-29 00:33:21 -05:00
naturallaw77	78b7ecb26b	updated iso	2026-03-28 12:09:15 -05:00
naturallaw77	df721e8f07	fixed iso common	2026-03-28 09:22:46 -05:00
naturallaw77	160f91090f	fixed iso common	2026-03-28 09:17:27 -05:00
naturallaw77	51ea035baa	fixed iso common	2026-03-28 09:10:45 -05:00
naturallaw77	3778b95dbb	fixed iso common	2026-03-28 09:09:05 -05:00
naturallaw77	40095aa242	restructure iso directory	2026-03-28 08:54:48 -05:00
naturallaw77	cf7d127f0b	rename	2026-03-28 08:53:25 -05:00
naturallaw77	9b460cda4d	rename	2026-03-28 08:52:22 -05:00
naturallaw77	01f2912960	added robust iso	2026-03-28 08:47:35 -05:00
naturallaw77	01e25b5b88	added .iso	2026-03-28 08:11:24 -05:00
naturallaw77	13598f5465	updated ssh-bootstrap	2026-03-28 07:54:29 -05:00
naturallaw77	2017c28425	added ssh-bootstrap	2026-03-28 07:52:48 -05:00
naturallaw77	ea2bc2fb79	updated element-calling	2026-03-27 20:52:42 -05:00
naturallaw77	5aae35d219	updated synapse	2026-03-27 20:49:11 -05:00
naturallaw77	4fafa1cd17	removed agenix	2026-03-27 20:45:09 -05:00
naturallaw77	1b385f9720	no longer needed	2026-03-27 19:40:03 -05:00
naturallaw77	a419a196f0	no longer needed	2026-03-27 19:36:08 -05:00
naturallaw77	c9df350780	no longer needed	2026-03-27 19:34:33 -05:00
naturallaw77	61eb338990	file name change	2026-03-27 19:22:41 -05:00
naturallaw77	81c99d9d92	update domain script	2026-03-27 19:20:39 -05:00
naturallaw77	076fad8186	added njalla script	2026-03-27 19:17:27 -05:00
naturallaw77	27d3f90e14	updated domain script	2026-03-27 19:06:23 -05:00
naturallaw77	7a8d047572	updated domain script	2026-03-27 18:11:24 -05:00
naturallaw77	d40548ef31	updated script for domains	2026-03-27 18:05:28 -05:00
naturallaw77	edbbfd08ca	updated script for domains	2026-03-27 18:01:25 -05:00
naturallaw77	17dab96d74	added script for domains	2026-03-27 17:50:57 -05:00
naturallaw77	20c28e8be5	added script for domains	2026-03-27 17:46:52 -05:00
naturallaw77	7509807938	added tooling for domains	2026-03-27 17:12:11 -05:00
naturallaw77	0175c497a5	added manual config for domains	2026-03-27 16:49:30 -05:00
naturallaw77	4630ff0e1b	updated element calling	2026-03-27 16:27:10 -05:00
naturallaw77	d7af813c71	typo flake.nix	2026-03-27 16:10:04 -05:00
naturallaw77	02f6bd3ad3	updated custom.nix	2026-03-27 16:07:34 -05:00
naturallaw77	aa8d6066e6	updated custom.nix	2026-03-27 16:05:10 -05:00
naturallaw77	4b8a90ff38	removed unecessary files	2026-03-27 15:59:04 -05:00
naturallaw77	143a6a07ff	formated flake.nix	2026-03-27 15:57:35 -05:00
naturallaw77	be984d0293	removed x11	2026-03-27 15:53:24 -05:00
naturallaw77	49e70d0ad8	Update Node Role	2026-03-27 15:46:19 -05:00
naturallaw77	46c007e02c	Update Node Role	2026-03-27 15:45:03 -05:00
naturallaw77	8161796fdb	fixed roles	2026-03-27 15:42:21 -05:00
naturallaw77	aaed7170f5	fixed caddy	2026-03-27 15:21:15 -05:00
naturallaw77	5e9a01e061	fixed bip110 declar	2026-03-27 15:16:50 -05:00
naturallaw77	424962412f	fixed synce errors	2026-03-27 15:13:15 -05:00
naturallaw77	46ab127ea0	updated haven	2026-03-27 15:07:22 -05:00
naturallaw77	0899ddd55c	updated configuration	2026-03-27 15:04:54 -05:00
naturallaw77	3a77231a1e	ownership	2026-03-27 15:00:05 -05:00
naturallaw77	bec00bd506	set services to default retooling	2026-03-27 14:58:45 -05:00
naturallaw77	0af9dce098	initial retooling	2026-03-27 14:29:26 -05:00
naturallaw77	e1e9376792	initial retooling	2026-03-27 14:23:08 -05:00
		`@@ -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>`