updated to block rxrpc

revert Update Nixpkgs

DIY Install Sovran_SystemsOS.md

@@ -0,0 +1,251 @@
+# 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! 🎉

LICENSE

@@ -1,232 +1,662 @@
-GNU GENERAL PUBLIC LICENSE
+                    GNU AFFERO GENERAL PUBLIC LICENSE
-Version 3, 29 June 2007
+                       Version 3, 19 November 2007
-
+
-Copyright © 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
-
+ Everyone is permitted to copy and distribute verbatim copies
-Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed.
+ of this license document, but changing it is not allowed.
-
+
-Preamble
+                            Preamble
-
+
-The GNU General Public License is a free, copyleft license for software and other kinds of works.
+  The GNU Affero General Public License is a free, copyleft license for
-
+software and other kinds of works, specifically designed to ensure
-The licenses for most software and other practical works are designed to take away your freedom to share and change the works. By contrast, the GNU General Public License is 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. We, the Free Software Foundation, use the GNU General Public License for most of our software; it applies also to any other work released this way by its authors. You can apply it to your programs, too.
+cooperation with the community in the case of network server software.
-
+
-When we speak of free software, we are referring to freedom, not 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.
+  The licenses for most software and other practical works are designed
-
+to take away your freedom to share and change the works.  By contrast,
-To protect your rights, we need to prevent others from denying you these rights or asking you to surrender the rights. Therefore, you have certain responsibilities if you distribute copies of the software, or if you modify it: responsibilities to respect the freedom of others.
+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
-For example, if you distribute copies of such a program, whether gratis or for a fee, you must pass on to the recipients the same freedoms that you received. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights.
+software for all its users.
-
+
-Developers that use the GNU GPL protect your rights with two steps: (1) assert copyright on the software, and (2) offer you this License giving you legal permission to copy, distribute and/or modify it.
+  When we speak of free software, we are referring to freedom, not
-
+price.  Our General Public Licenses are designed to make sure that you
-For the developers' and authors' protection, the GPL clearly explains that there is no warranty for this free software. For both users' and authors' sake, the GPL requires that modified versions be marked as changed, so that their problems will not be attributed erroneously to authors of previous versions.
+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
-Some devices are designed to deny users access to install or run modified versions of the software inside them, although the manufacturer can do so. This is fundamentally incompatible with the aim of protecting users' freedom to change the software. The systematic pattern of such abuse occurs in the area of products for individuals to use, which is precisely where it is most unacceptable. Therefore, we have designed this version of the GPL to prohibit the practice for those products. If such problems arise substantially in other domains, we stand ready to extend this provision to those domains in future versions of the GPL, as needed to protect the freedom of users.
+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.
-Finally, every program is threatened constantly by software patents. States should not allow patents to restrict development and use of software on general-purpose computers, but in those that do, we wish to avoid the special danger that patents applied to a free program could make it effectively proprietary. To prevent this, the GPL assures that patents cannot be used to render the program non-free.
+
-
+  Developers that use our General Public Licenses protect your rights
-The precise terms and conditions for copying, distribution and modification follow.
+with two steps: (1) assert copyright on the software, and (2) offer
-
+you this License which gives you legal permission to copy, distribute
-TERMS AND CONDITIONS
+and/or modify the software.
-
+
-0. Definitions.
+  A secondary benefit of defending all users' freedom is that
-
+improvements made in alternate versions of the program, if they
-“This License” refers to version 3 of the GNU General Public License.
+receive widespread use, become available for other developers to
-
+incorporate.  Many developers of free software are heartened and
-“Copyright” also means copyright-like laws that apply to other kinds of works, such as semiconductor masks.
+encouraged by the resulting cooperation.  However, in the case of
-
+software used on network servers, this result may fail to come about.
-“The Program” refers to any copyrightable work licensed under this License. Each licensee is addressed as “you”. “Licensees” and “recipients” may be individuals or organizations.
+The GNU General Public License permits making a modified version and
-
+letting the public access it on a server without ever releasing its
-To “modify” a work means to copy from or adapt all or part of the work in a fashion requiring copyright permission, other than the making of an exact copy. The resulting work is called a “modified version” of the earlier work or a work “based on” the earlier work.
+source code to the public.
-
+
-A “covered work” means either the unmodified Program or a work based on the Program.
+  The GNU Affero General Public License is designed specifically to
-
+ensure that, in such cases, the modified source code becomes available
-To “propagate” a work means to do anything with it that, without 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.
+to the community.  It requires the operator of a network server to
-
+provide the source code of the modified version running there to the
-To “convey” a work means any kind of propagation that enables other parties to make or receive copies. Mere interaction with a user through a computer network, with no transfer of a copy, is not conveying.
+users of that server.  Therefore, public use of a modified version, on
-
+a publicly accessible server, gives the public access to the source
-An interactive user interface displays “Appropriate Legal Notices” to the extent that it includes a convenient and prominently visible feature that (1) displays an appropriate copyright notice, and (2) tells the user that there is no warranty for the work (except to the extent that warranties are provided), that licensees may convey the work under this License, and how to view a copy of this License. If the interface presents a list of user commands or options, such as a menu, a prominent item in the list meets this criterion.
+code of the modified version.
-
+
-1. Source Code.
+  An older license, called the Affero General Public License and
-The “source code” for a work means the preferred form of the work for making modifications to it. “Object code” means any non-source form of a work.
+published by Affero, was designed to accomplish similar goals.  This is
-
+a different license, not a version of the Affero GPL, but Affero has
-A “Standard Interface” means an interface that either is an official standard defined by a recognized standards body, or, in the case of interfaces specified for a particular programming language, one that is widely used among developers working in that language.
+released a new version of the Affero GPL which permits relicensing under
-
+this license.
-The “System Libraries” of an executable work include anything, other than the work as a whole, that (a) is included in the normal form of packaging a Major Component, but which is not part of that Major Component, and (b) serves only to enable use of the work with that Major Component, or to implement a Standard Interface for which an implementation is available to the public in source code form. A “Major Component”, in this context, means a major essential component (kernel, window system, and so on) of the specific operating system (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.
+
-
+  The precise terms and conditions for copying, distribution and
-The “Corresponding Source” for a work in object code form means all the source code needed to generate, install, and (for an executable work) run the object code and to modify the work, including scripts to control those activities. However, it does not include the work's System Libraries, or general-purpose tools or generally available free programs which are used unmodified in performing those activities but which are not part of the work. For example, Corresponding Source includes interface definition files associated with source files for the work, and the source code for shared libraries and dynamically linked subprograms that the work is specifically designed to require, such as by intimate data communication or control flow between those subprograms and other parts of the work.
+modification follow.
-
+
-The Corresponding Source need not include anything that users can regenerate automatically from other parts of the Corresponding Source.
+                       TERMS AND CONDITIONS
-
+
-The Corresponding Source for a work in source code form is that same work.
+  0. Definitions.
-
+
-2. Basic Permissions.
+  "This License" refers to version 3 of the GNU Affero General Public License.
-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.
+
-
+  "Copyright" also means copyright-like laws that apply to other kinds of
-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.
+works, such as semiconductor masks.
-
+
-Conveying under any other circumstances is permitted solely under the conditions stated below. Sublicensing is not allowed; section 10 makes it unnecessary.
+  "The Program" refers to any copyrightable work licensed under this
-
+License.  Each licensee is addressed as "you".  "Licensees" and
-3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+"recipients" may be individuals or organizations.
-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.
+
-
+  To "modify" a work means to copy from or adapt all or part of the work
-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.
+in a fashion requiring copyright permission, other than the making of an
-
+exact copy.  The resulting work is called a "modified version" of the
-4. Conveying Verbatim Copies.
+earlier work or a work "based on" the earlier work.
-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.
+
-
+  A "covered work" means either the unmodified Program or a work based
-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.
+on the Program.
-
+
-5. Conveying Modified Source Versions.
+  To "propagate" a work means to do anything with it that, without
-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:
+permission, would make you directly or secondarily liable for
-
+infringement under applicable copyright law, except executing it on a
-     a) The work must carry prominent notices stating that you modified it, and giving a relevant date.
+computer or modifying a private copy.  Propagation includes copying,
-
+distribution (with or without modification), making available to the
-     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”.
+public, and in some countries other activities as well.
-
+
-     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.
+  To "convey" a work means any kind of propagation that enables other
-
+parties to make or receive copies.  Mere interaction with a user through
-     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 computer network, with no transfer of a copy, is not conveying.
-
+
-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.
+  An interactive user interface displays "Appropriate Legal Notices"
-
+to the extent that it includes a convenient and prominently visible
-6. Conveying Non-Source Forms.
+feature that (1) displays an appropriate copyright notice, and (2)
-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:
+tells the user that there is no warranty for the work (except to the
-
+extent that warranties are provided), that licensees may convey the
-     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.
+work under this License, and how to view a copy of this License.  If
-
+the interface presents a list of user commands or options, such as a
-     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.
+menu, a prominent item in the list meets this criterion.
-
+
-     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.
+  1. Source Code.
-
+
-     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.
+  The "source code" for a work means the preferred form of the work
-
+for making modifications to it.  "Object code" means any non-source
-     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.
+form of a work.
-
+
-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 "Standard Interface" means an interface that either is an official
-
+standard defined by a recognized standards body, or, in the case of
-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.
+interfaces specified for a particular programming language, one that
-
+is widely used among developers working in that language.
-“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.
+
-
+  The "System Libraries" of an executable work include anything, other
-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).
+than the work as a whole, that (a) is included in the normal form of
-
+packaging a Major Component, but which is not part of that Major
-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.
+Component, and (b) serves only to enable use of the work with that
-
+Major Component, or to implement a Standard Interface for which an
-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.
+implementation is available to the public in source code form.  A
-
+"Major Component", in this context, means a major essential component
-7. Additional Terms.
+(kernel, window system, and so on) of the specific operating system
-“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.
+(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.
-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.
+
-
+  The "Corresponding Source" for a work in object code form means all
-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:
+the source code needed to generate, install, and (for an executable
-
+work) run the object code and to modify the work, including scripts to
-     a) Disclaiming warranty or limiting liability differently from the terms of sections 15 and 16 of this License; or
+control those activities.  However, it does not include the work's
-
+System Libraries, or general-purpose tools or generally available free
-     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
+programs which are used unmodified in performing those activities but
-
+which are not part of the work.  For example, Corresponding Source
-     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
+includes interface definition files associated with source files for
-
+the work, and the source code for shared libraries and dynamically
-     d) Limiting the use for publicity purposes of names of licensors or authors of the material; or
+linked subprograms that the work is specifically designed to require,
-
+such as by intimate data communication or control flow between those
-     e) Declining to grant rights under trademark law for use of some trade names, trademarks, or service marks; or
+subprograms and other parts of the work.
-
+
-     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.
+  The Corresponding Source need not include anything that users
-
+can regenerate automatically from other parts of the Corresponding
-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.
+Source.
-
+
-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.
+  The Corresponding Source for a work in source code form is that
-
+same work.
-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.
+
-
+  2. Basic Permissions.
-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).
+  All rights granted under this License are granted for the term of
-
+copyright on the Program, and are irrevocable provided the stated
-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.
+conditions are met.  This License explicitly affirms your unlimited
-
+permission to run the unmodified Program.  The output from running a
-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.
+covered work is covered by this License only if the output, given its
-
+content, constitutes a covered work.  This License acknowledges your
-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.
+rights of fair use or other equivalent, as provided by copyright law.
-
+
-9. Acceptance Not Required for Having Copies.
+  You may make, run and propagate covered works that you do not
-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.
+convey, without conditions so long as your license otherwise remains
-
+in force.  You may convey covered works to others for the sole purpose
-10. Automatic Licensing of Downstream Recipients.
+of having them make modifications exclusively for you, or provide you
-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.
+with facilities for running those works, provided that you comply with
-
+the terms of this License in conveying all material for which you do
-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.
+not control copyright.  Those thus making or running the covered works
-
+for you must do so exclusively on your behalf, under your direction
-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.
+and control, on terms that prohibit them from making any copies of
-
+your copyrighted material outside their relationship with you.
-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”.
+  Conveying under any other circumstances is permitted solely under
-
+the conditions stated below.  Sublicensing is not allowed; section 10
-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.
+makes it unnecessary.
-
+
-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.
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
+
-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.
+  No covered work shall be deemed part of an effective technological
-
+measure under any applicable law fulfilling obligations under article
-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.
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
-
+similar laws prohibiting or restricting circumvention of such
-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.
+measures.
-
+
-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.
+  When you convey a covered work, you waive any legal power to forbid
-
+circumvention of technological measures to the extent such circumvention
-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.
+is effected by exercising rights under this License with respect to
-
+the covered work, and you disclaim any intention to limit operation or
-12. No Surrender of Others' Freedom.
+modification of the work as a means of enforcing, against the work's
-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.
+users, your or third parties' legal rights to forbid circumvention of
-
+technological measures.
-13. Use with the GNU Affero General Public License.
+
-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 Affero 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 special requirements of the GNU Affero General Public License, section 13, concerning interaction through a network will apply to the combination as such.
+  4. Conveying Verbatim Copies.
-
+
-14. Revised Versions of this License.
+  You may convey verbatim copies of the Program's source code as you
-The Free Software Foundation may publish revised and/or new versions of the GNU 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.
+receive it, in any medium, provided that you conspicuously and
-
+appropriately publish on each copy an appropriate copyright notice;
-Each version is given a distinguishing version number. If the Program specifies that a certain numbered version of the GNU 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 General Public License, you may choose any version ever published by the Free Software Foundation.
+keep intact all notices stating that this License and any
-
+non-permissive terms added in accord with section 7 apply to the code;
-If the Program specifies that a proxy can decide which future versions of the GNU 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.
+keep intact all notices of the absence of any warranty; and give all
-
+recipients a copy of this License along with 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.
+
-
+  You may charge any price or no price for each copy that you convey,
-15. Disclaimer of Warranty.
+and you may offer support or warranty protection for a fee.
-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.
+
-
+  5. Conveying Modified Source Versions.
-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.
+  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
-17. Interpretation of Sections 15 and 16.
+terms of section 4, provided that you also meet all of these conditions:
-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.
+
-
+    a) The work must carry prominent notices stating that you modified
-END OF TERMS AND CONDITIONS
+    it, and giving a relevant date.
-
+
-How to Apply These Terms to Your New Programs
+    b) The work must carry prominent notices stating that it is
-
+    released under this License and any conditions added under section
-If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it free software which everyone can redistribute and change under these terms.
+    7.  This requirement modifies the requirement in section 4 to
-
+    "keep intact all notices".
-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.
+
-
+    c) You must license the entire work, as a whole, under this
-     <one line to give the program's name and a brief idea of what it does.>
+    License to anyone who comes into possession of a copy.  This
-     Copyright (C) <year>  <name of author>
+    License will therefore apply, along with any applicable section 7
-
+    additional terms, to the whole of the work, and all its parts,
-     This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+    regardless of how they are packaged.  This License gives no
-
+    permission to license the work in any other way, but it does not
-     This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+    invalidate such permission if you have separately received it.
-
+
-     You should have received a copy of the GNU General Public License along with this program.  If not, see <http://www.gnu.org/licenses/>.
+    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
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  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.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    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.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    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 the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode:
+  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.
 
-     <program>  Copyright (C) <year>  <name of author>
+  You should also get your employer (if you work as a programmer) or school,
-     This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+if any, to sign a "copyright disclaimer" for the program, if necessary.
-     This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details.
+For more information on this, and how to apply and follow the GNU AGPL, see
+<https://www.gnu.org/licenses/>.
 
-The hypothetical commands `show w' and `show c' should show the appropriate parts of the General Public License. Of course, your program's commands might be different; for a GUI interface, you would use an “about box”.
-
-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 GPL, see <http://www.gnu.org/licenses/>.
-
-The GNU General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the library. If this is what you want to do, use the GNU Lesser General Public License instead of this License. But first, please read <http://www.gnu.org/philosophy/why-not-lgpl.html>.

README.md

@@ -1,30 +1,180 @@
-<br />
+# Sovran_SystemsOS
-<br />
 
-<center><img src="sovran_systems.png" alt="drawing" width="500"/></center>
+### The Officaly Repository of Sovran_SystemsOS and the Sovran Pro
 
-<br />
+**A declarative, self-hosted server and desktop operating system built on NixOS by [Sovran Systems](https://sovransystems.com)**
-<br />
-<br />
 
-# Complete Configuration for Sovran_SystemsOS and the Sovran Pro
+---
 
-A Nix Flake Implementation
+## Overview
 
-Thanks to all the NixOS creators and developers for creating what is the future of computing. 
+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.
 
-https://www.sovransystems.com
+**It comes preinstalled on The Sovran Pro**
 
-Connect on Matrix here: https://matrix.to/#/#sovran-systems:anarchyislove.xyz
+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.
 
-###
+---
 
-## All Is Love. Fear Is Illusion. All Beings Are Free. Truth Can Never Be Destroyed.
+## Architecture
 
-Created, Handcrafted, and Headquartered in Southern California – 2022-2023 🏖️.
+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.
 
-All Open Source Software Used Falls Under Its Specific Open Source License.
+```
+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
+```
 
-This Gitea is Proudly Powered by a Sovran Pro 💚.
+## Features
+
+### Feature Toggles
+
+[Custom Add-On Guide](custom-add-ons.md)
+
+Every major service is gated behind a feature flag. Enable only what you need:
+
+```nix
+# custom.nix
+{ config, pkgs, lib, ... }:
+
+{
+  
+  sovran_systemsOS = {
+    features = {
+        bip110          = lib.mkForce true;
+        element-calling = lib.mkForce true;
+        haven           = lib.mkForce true;
+        mempool         = lib.mkForce true;
+        rdp             = lib.mkForce true;
+    };
+    nostr_npub = "pasteyournpubhere";
+  };
+
+}
+```
+
+No unnecessary services run. No wasted resources.
+
+---
+
+### Service Stack
+
+| Category | Service | Description |
+|---|---|---|
+| **Web** | Caddy | Automatic HTTPS, reverse proxy for all services |
+| **Cloud** | Nextcloud | File storage, sync, and collaboration |
+| **CMS** | WordPress | Self-hosted publishing and content management |
+| **Passwords** | Vaultwarden | Bitwarden-compatible password vault |
+| **Messaging** | Element/Matrix Synapse | Federated, decentralized messaging backend |
+| **Video/Voice Calling** | Element Video and Voice Calling | Decentralized Voice Over IP for Matrix with optional TURN/STUN |
+| **Bitcoin** | Bitcoin Core / Knots | **Full node with optional BIP-110 consensus policy** |
+| **Bitcoin Lightning** | LND | Full LND Node Connected over Tor intergrated into BTCPay Server |
+| **Payments** | BTCPay Server | Self-hosted Bitcoin payment processor |
+| **Explorer** | Mempool | Bitcoin mempool visualizer and block explorer |
+| **Nostr** | Haven | Nostr relay server |
+| **Remote Access** | GNOME Remote Desktop | RDP access with auto-generated TLS and credentials |
+
+---
+
+### Security
+
+- **SSH hardened** — password authentication disabled by default
+- **Fail2ban** — active on https
+- **Agenix** — encrypted secrets management integrated into the flake
+- **Tor** — integration into the bitcoin ecosystem
+- **Firewall** — ports managed per-module; only enabled services are exposed
+
+### Reliability
+
+- **Automated backups** via rsnapshot
+- **Scheduled maintenance** via systemd timers
+- **Database initialization** handled declaratively
+- **Reproducible builds** — the main system is defined in code and can be rebuilt to match most systems
+
+---
+
+### Network Configuration
+
+Sovran_SystemsOS hosts public-facing services (Wordpress, Element/Element Calling, Nextcloud, BTCPayserver, Haven Relay, and Vaultwarden) that require inbound connections from the internet. To make these services accessible outside your local network, you must configure **port forwarding** on your home router.
+
+**Before deploying, ensure you have:**
+
+- Access to your router's administration interface (typically at `192.168.1.1` or `192.168.0.1`)
+- The ability to create port forwarding rules
+- The local/private IP address of the machine running Sovran_SystemsOS
+- The external public IP address of the machine running Sovran_SystemsOS
+
+**Required port forwards (depending on enabled features):**
+
+Forward each port to the **private IP address** of your Sovran_SystemsOS machine. Only forward ports for services you have enabled.
+
+> **Tip:** Assign a static IP or DHCP reservation to your Sovran_SystemsOS machine so the forwarding rules remain valid after reboots.
+
+> **Note:** If your ISP uses CGNAT (Carrier-Grade NAT), standard port forwarding will not work. Contact your ISP to request a public IP address. 
+
+---
+
+## Installation
+
+### Full Guide (Outdated as of now... will be working on a full .iso soon)
+
+👉 [DIY Install Sovran_SystemsOS](https://git.sovransystems.com/Sovran_Systems/Sovran_SystemsOS/src/branch/main/DIY%20Install%20Sovran_SystemsOS.md)
+
+---
+
+## Requirements
+
+| Resource | Minimum | Recommended |
+|---|---|---|
+| CPU | 4 cores | 8+ cores |
+| RAM | 16 GB | 32+ GB |
+| Storage | 512 GB SSD + 4 TB SSD | 2GB SSD + 4+ TB SSD (Bitcoin node requires significant disk) |
+| Network | 100 Mbs Down/20 Mbs Up + No need for DDNS if domains are brought through https://njal.la | 1 Gbs Down/1 Gbs Up + No need for DDNS if domains are brought through https://njal.la  |
+
+---
+
+## Community
+
+| Channel | Link |
+|---|---|
+| General Chat | [#sovran-systems:anarchyislove.xyz](https://matrix.to/#/#sovran-systems:anarchyislove.xyz) |
+| DIY Support | [#DIY_Sovran_SystemsOS:anarchyislove.xyz](https://matrix.to/#/#DIY_Sovran_SystemsOS:anarchyislove.xyz) |
+
+---
+
+## License
+
+[GNU Affero General Public License v3.0](LICENSE)
+
+---
+
+## Project Philosophy
+
+Sovran_SystemsOS exists to provide a complete, self-hosted infrastructure stack that eliminates dependency on third-party platforms. It is opinionated by design — services are pre-integrated so you spend time using your system, not assembling it.
+
+You retain full visibility into every module, every service definition, and every configuration choice. Nothing is hidden. Everything is reproducible.
+
+---
+
+**Be Digitally Sovereign**
 
-GNU GPL 3.0+

configuration.nix

@@ -2,52 +2,44 @@
 
 
 let
-	personalization = import ./personalization.nix;
+	personalization = import ./modules/personalization.nix;		
-		
-		
-	custom-php = pkgs.php81.buildEnv {
-		extensions = { enabled, all }: enabled ++ (with all; [ apcu redis imagick memcached ]);
-		extraConfig = ''
-			display_errors = On
-			display_startup_errors = On
-			max_execution_time = 6000
-			max_input_time = 3000
-			memory_limit = 8G;
-			opcache.enable=1;
-			opcache.memory_consumption=512;
-			opcache_revalidate_freq = 240;
-			opcache.max_accelerated_files=4000;
-			auto_prepend_file = '/var/lib/www/wordpress/wordfence-waf.php'
-			post_max_size = 2048M
-			upload_max_filesize = 2048M
-			opcache.interned_strings_buffer = 32
-			apc.enable_cli=1
-		'';
-	};
 in
+
 {
+  
+  	imports =
+		
+		[ 
+			 
+			./modules/modules.nix
+
+		];
+
+
 	# Bootloader.
 	boot.loader.systemd-boot.enable = true;
 	boot.loader.efi.canTouchEfiVariables = true;
 	boot.loader.efi.efiSysMountPoint = "/boot/efi";
 	boot.kernelPackages =  pkgs.linuxPackages_latest;
+  boot.blacklistedKernelModules = [ "rxrpc" ];
 
 	# Enable Automount without Fail for Internal Drive.
 	fileSystems."/run/media/Second_Drive" = {
 		device = "LABEL=BTCEcoandBackup";
 		fsType = "ext4";
 		options = [ "nofail" ];
-		};
+	};
 
-	nix = {
+	fileSystems."/boot/efi".options = [ "umask=0077" "defaults" ];
-		package = pkgs.nixUnstable;
+
-		extraOptions = ''
+	nix.settings = {
-				experimental-features = nix-command flakes
+		
-			'';
+		experimental-features = [ "nix-command" "flakes" ];
-		};
+		download-buffer-size = 524288000;
+		
+	};
 
 	networking.hostName = "nixos"; # Define your hostname.
-	# networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.
 
 	# Enable networking
 	networking.networkmanager.enable = true;
@@ -62,13 +54,13 @@ in
 	services.xserver.enable = true;
 
 	# Enable the GNOME Desktop Environment.
-	services.xserver.displayManager.gdm.enable = true;
+	services.displayManager.gdm.enable = true;
-	services.xserver.desktopManager.gnome.enable = true;
+	services.desktopManager.gnome.enable = true;
 
 	# Configure keymap in X11
-	services.xserver = {
+	services.xserver.xkb = {
 		layout = "us";
-		xkbVariant = "";
+		variant = "";
 	};
 
 	# Enable CUPS to print documents.
@@ -78,8 +70,7 @@ in
 	systemd.enableEmergencyMode = false;
 
 	# Enable sound with pipewire.
-	sound.enable = true;
+	services.pulseaudio.enable = false;
-	hardware.pulseaudio.enable = false;
 	security.rtkit.enable = true;
 	services.pipewire = {
 		enable = true;
@@ -94,57 +85,53 @@ in
 			description = "free";
 			extraGroups = [ "networkmanager" ];
 		};
-
-
-####### PHP user for PHPFPM #######
-		php = {
-			isSystemUser = true;
-			createHome = false;
-			uid = 7777;
-		};
 	};
 
-	users.users.php.group = "php";
-	users.groups.php = {};
-
-
-
 	# Enable automatic login for the user.
-	services.xserver.displayManager.autoLogin.enable = true;
+	services.displayManager.autoLogin.enable = true;
-	services.xserver.displayManager.autoLogin.user = "free";
+	services.displayManager.autoLogin.user = "free";
-
-	# Workaround for GNOME autologin: https://github.com/NixOS/nixpkgs/issues/103746#issuecomment-945091229
-	systemd.services."getty@tty1".enable = true;
-	systemd.services."autovt@tty1".enable = true;
 
 	# Allow Flatpak
 	services.flatpak.enable = true;
 
+  systemd.services.flatpak-repo = {
+    wantedBy = [ "multi-user.target" ];
+    after = [ "network-online.target" ];
+    wants = [ "network-online.target" ];
+    path = [ pkgs.flatpak ];
+      script = ''
+        flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
+    '';
+  };
+
 	# Allow unfree packages
 	nixpkgs.config.allowUnfree = true;
 
-	# List packages installed in system profile. To search, run:
+	nixpkgs.config.permittedInsecurePackages = [
-	# $ nix search wget
+
+		"jitsi-meet-1.0.8043"
+	];
+	
+	# List packages installed
 	environment.systemPackages = with pkgs; [
 		git
 		wget
-		librewolf
 		fish
 		htop
-		gnomeExtensions.dash-to-dock
+		btop
-		gnomeExtensions.transparent-top-bar-adjustable-transparency
+    gnomeExtensions.transparent-top-bar-adjustable-transparency
+		gnomeExtensions.systemd-manager
+    gnomeExtensions.dash-to-dock
 		gnomeExtensions.vitals
 		gnomeExtensions.pop-shell
 		gnomeExtensions.just-perfection
 		gnomeExtensions.appindicator
-		gnomeExtensions.systemd-manager
+		gnomeExtensions.date-menu-formatter
-		gnome.gnome-tweaks
+		gnome-tweaks
 		papirus-icon-theme
 		ranger
-		gnome.gnome-tweaks
+		fastfetch
-		bisq-desktop
+		gedit
-		neofetch
-		gnome.gedit
 		matrix-synapse
 		openssl
 		pwgen
@@ -153,62 +140,51 @@ in
 		lm_sensors
 		hunspell
 		hunspellDicts.en_US
-		custom-php
+		synadm
-		matrix-synapse-tools.synadm
 		brave
-		ncdu_2
+		dua
-		bitwarden
+		bitwarden-desktop
 		gparted
 		pv
 		unzip
 		parted
 		screen
-		gnome.zenity
+		zenity
 		libargon2
-
+		gnome-terminal
+		libreoffice-fresh
+		dig
+		firefox
+		element-desktop
+		wp-cli
+    axel
+    lk-jwt-service
+    livekit-libwebrtc
+    livekit-cli
+    livekit
 	];
 
-	nixpkgs.config.permittedInsecurePackages = [
+	programs.nixvim = {
-	               "nodejs-16.20.0"
+		enable = true;
-	               "nodejs-slim-16.20.0"
+		colorschemes.catppuccin.enable = true;
-	             ];
+		plugins.lualine.enable = true;
+  };
 
 
 	programs.bash.promptInit = "fish";
+	
 	programs.fish = {
 		enable = true;
-		promptInit = "neofetch";
+		promptInit = "fastfetch";
 	};
 
-
+	####### CADDY  #######
-####### PHPFMP  #######
-	services.phpfpm.pools = {
-		mypool = {
-			user = "caddy";
-			group = "php";
-			phpPackage = custom-php;
-			settings = {
-				"pm" = "dynamic";
-				"pm.max_children" = 75;
-				"pm.start_servers" = 10;
-				"pm.min_spare_servers" = 5;
-				"pm.max_spare_servers" = 20;
-				"pm.max_requests" = 500;
-				"clear_env" = "no";
-			};
-		};			
-	};
-
-	#networking.enableIPv6 = false;
-
-####### CADDY  #######
 	services.caddy = {
 		enable = true;
-		package = pkgs.caddy;
 		user = "caddy";
 		group = "root";
-		email = "${personalization.caddy_email_for_zerossl}";
+		email = "${personalization.caddy_email_for_acme}";
-		acmeCA = "https://acme.zerossl.com/v2/DV90";
+
 		virtualHosts = {
 			"${personalization.wordpress_url}" = {
 				 extraConfig = ''
@@ -219,27 +195,20 @@ in
 					'';
 			};
 
-			"www.${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 = ''
+				extraConfig = ''
-						encode gzip zstd
+					encode gzip zstd
-						root * /var/lib/www/nextcloud
+					root * /var/lib/www/nextcloud
-						php_fastcgi unix//run/phpfpm/mypool.sock
+					php_fastcgi unix//run/phpfpm/mypool.sock {
-						file_server
+						trusted_proxies private_ranges
-						redir /.well-known/carddav /remote.php/carddav 301
+					}
-						redir /.well-known/caldav /remote.php/caldav 301
+					file_server
-						header {
+					redir /.well-known/carddav /remote.php/dav/ 301
-									Strict-Transport-Security max-age=31536000;
+					redir /.well-known/caldav /remote.php/dav/ 301
-									}
+					header {
-						'';
+						Strict-Transport-Security max-age=31536000;
+						}
+					'';
 			 };
 
 			"${personalization.matrix_url}" = {
@@ -273,25 +242,29 @@ in
 					extraConfig = ''
 						reverse_proxy :3050
 						encode gzip zstd
-						tls internal
-					'';
-			};
-
-			"https://${personalization.onlyoffice_url}" = {
-						extraConfig = ''
-							reverse_proxy http://localhost:8000
 					'';
 			};
 		};
 	};
 
+	###### AGENIX ######
+	age.identityPaths = [ "/root/.ssh/agenix/agenix-secret-keys" ];
 
-###### CREATE DATABASE (WORDPRESS, MATRIX_SYNAPSE, AND NEXTCLOUD) #######
+	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;
+		enable = true;
-			package = pkgs.postgresql_14;
+	};
-			};
 
+	
 	services.postgresql.authentication = lib.mkForce ''
 			# Generated file; do not edit!
 			# TYPE  DATABASE        USER            ADDRESS                 METHOD
@@ -302,19 +275,20 @@ in
 
 
 	services.mysql = {
-			enable = true;
+		enable = true;
-			package = pkgs.mariadb_1011;
+		package = pkgs.mariadb;
-			};
+	};
 
+	
 	services.postgresql.initialScript = pkgs.writeText "begin-init.sql" ''
-		CREATE ROLE "ncusr" WITH LOGIN PASSWORD '${personalization.age.secrets.nextclouddb.file}';
+		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.age.secrets.matrixdb.file}';
+		CREATE ROLE "matrix-synapse" WITH LOGIN PASSWORD '${personalization.matrixdb}';
 		CREATE DATABASE "matrix-synapse" WITH OWNER "matrix-synapse"
 			TEMPLATE template0
 			LC_COLLATE = "C"
@@ -325,61 +299,60 @@ in
 
 	services.mysql.initialScript = pkgs.writeText "wordpress-init.sql" ''
 		CREATE DATABASE wordpressdb;
-		GRANT ALL ON *.* TO 'wpusr'@'localhost' IDENTIFIED BY '${personalization.age.secrets.wordpressdb.file}';
+		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;
 
 
-####### KEEP AWAKE for DISPLAY and HEADLESS #######
+	####### BACKUP TO INTERNAL DRIVE #######
-	services.xserver.displayManager.gdm.autoSuspend = false;
-
-
-
-####### BACKUP TO INTERNAL DRIVE #######
 	services.rsnapshot = {
 		enable = true;
 		extraConfig = ''
 snapshot_root	/run/media/Second_Drive/BTCEcoandBackup/NixOS_Snapshot_Backup
-retain	hourly	12
+retain	hourly	5
-retain	daily	12
+retain	daily	5
 backup	/home/	localhost/
 backup	/var/lib/	localhost/
 backup	/etc/nixos/	localhost/
 backup	/etc/nix-bitcoin-secrets/	localhost/
-					'';
+		'';
-	 cronIntervals = {
+	 	cronIntervals = {
 			daily = "50 21 * * *";
 			hourly = "0 * * * *";
-						};
+		};
-				};
+	};
 
 
-
+	####### CRON #######
-####### CRON #######
 	services.cron = {
 		enable = true;
 		systemCronJobs = [
-		"*/5  *  *  *  * caddy  /run/current-system/sw/bin/php -f /var/lib/www/nextcloud/cron.php"
+		
-		"15 * * * *  root /var/lib/njalla/njalla.sh"
+		"*/5 * * * * caddy  /run/current-system/sw/bin/php -f /var/lib/www/nextcloud/cron.php"
-		"0 */2 * * * root /var/lib/external_ip/external_ip.sh"
+		"*/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 #######
+	####### TOR #######
 	services.tor = {
 		enable = true;
-	client.enable = true;
+		client.enable = true;
-	torsocks.enable = true;
+		torsocks.enable = true;
 	};
+	
 	services.privoxy.enableTor = true;
 
 
-
+	####### Enable the SSH #######
-
-####### Enable the OpenSSH daemon #######
 	services.openssh = {
 		enable = true;
 		settings = {
@@ -388,9 +361,9 @@ backup	/etc/nix-bitcoin-secrets/	localhost/
 			PermitRootLogin = "yes";
 		};
 	};
-	programs.ssh.agentTimeout = "3m";
 
-#######FailtoBan#######
+
+	#######FailtoBan#######
 	services.fail2ban = {
 		enable = true;
 		ignoreIP = [
@@ -403,24 +376,25 @@ backup	/etc/nix-bitcoin-secrets/	localhost/
 	};
 	
 
-####### Open ports in the firewall #######
+	####### Open ports in the firewall #######
-	networking.firewall.allowedTCPPorts = [ 80 443 5349 8448 3050 3051 ];
+	networking.firewall.allowedTCPPorts = [ 80 443 5349 8448 3051 ];
-	networking.firewall.allowedUDPPorts = [ 80 443 5349 8448 3050 3051 ];
+	networking.firewall.allowedUDPPorts = [ 80 443 5349 8448 3051 ];
+	
 	networking.firewall.allowedUDPPortRanges = [
-			{ from=49152; to=65535; } # TURN relay
+		{ from=49152; to=65535; } # TURN relay
-		];
+	];
 
-	# Or disable the firewall altogether.
 	networking.firewall.enable = true;
 
 	
-####### AUTO COLLECT GARABAGE #######
+	####### AUTO COLLECT GARABAGE #######
 	nix.gc = {
 		automatic = true;
 		dates = "weekly";
 		options = "--delete-older-than 7d";
 	};
 
+	
 	system.stateVersion = "22.05";
 
 }

custom-add-ons.md

@@ -0,0 +1,124 @@
+## 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
+```
+
+
+

file_fixes_and_new_services/Sovran_SystemsOS_File_Fixes_And_New_Services.sh

@@ -3,22 +3,68 @@
 cd /home/free/Downloads
 
 
+#### SCRIPT 1 ####
 
-#### TEST SCRIPT 1 ####
+/run/current-system/sw/bin/wget "https://git.sovransystems.com/Sovran_Systems/Sovran_SystemsOS/raw/branch/main/file_fixes_and_new_services/sovran-pro-flake-update.sh"
 
-/run/current-system/sw/bin/wget "https://git.sovransystems.com/Sovran_Systems/Sovran_SystemsOS/raw/branch/main/file_fixes_and_new_services/test.sh"
+/run/current-system/sw/bin/bash /home/free/Downloads/sovran-pro-flake-update.sh
 
-/run/current-system/sw/bin/bash /home/free/Downloads/test.sh
+rm -rf /home/free/Downloads/sovran-pro-flake-update.sh
-
-rm -rf /home/free/Downloads/test.sh
 
 
+#### SCRIPT 2 ####
 
-#### TEST SCRIPT 2 ####
+/run/current-system/sw/bin/wget "https://git.sovransystems.com/Sovran_Systems/Sovran_SystemsOS/raw/branch/main/file_fixes_and_new_services/add-custom-nix.sh"
+
+/run/current-system/sw/bin/bash /home/free/Downloads/add-custom-nix.sh
+
+rm -rf /home/free/Downloads/add-custom-nix.sh
 
 
+#### SCRIPT 3 ####
+
+/run/current-system/sw/bin/wget "https://git.sovransystems.com/Sovran_Systems/Sovran_SystemsOS/raw/branch/main/file_fixes_and_new_services/sovran-pro-flake-update2.sh"
+
+/run/current-system/sw/bin/bash /home/free/Downloads/sovran-pro-flake-update2.sh
+
+rm -rf /home/free/Downloads/sovran-pro-flake-update2.sh
+
+
+#### SCRIPT 4 ####
+
+/run/current-system/sw/bin/wget "https://git.sovransystems.com/Sovran_Systems/Sovran_SystemsOS/raw/branch/main/file_fixes_and_new_services/nextcloud_maintenance_window_fix.sh"
+
+/run/current-system/sw/bin/bash /home/free/Downloads/nextcloud_maintenance_window_fix.sh
+
+rm -rf /home/free/Downloads/nextcloud_maintenance_window_fix.sh
+
+
+#### SCRIPT 5 ####
+
+/run/current-system/sw/bin/wget "https://git.sovransystems.com/Sovran_Systems/Sovran_SystemsOS/raw/branch/main/file_fixes_and_new_services/add_external_backup_app.sh"
+
+/run/current-system/sw/bin/bash /home/free/Downloads/add_external_backup_app.sh
+
+rm -rf /home/free/Downloads/add_external_backup_app.sh
+
+
+#### SCRIPT 6 ####
+
+/run/current-system/sw/bin/wget "https://git.sovransystems.com/Sovran_Systems/Sovran_SystemsOS/raw/branch/main/file_fixes_and_new_services/update-agenix.sh"
+
+/run/current-system/sw/bin/bash /home/free/Downloads/update-agenix.sh
+
+rm -rf /home/free/Downloads/update-agenix.sh
+
+#### SCRIPT 7 ####
+
+/run/current-system/sw/bin/wget "https://git.sovransystems.com/Sovran_Systems/Sovran_SystemsOS/raw/branch/main/file_fixes_and_new_services/element-calling_haven"
+
+/run/current-system/sw/bin/bash /home/free/Downloads/element-calling_haven.sh
+
+rm -rf /home/free/Downloads/element-calling_haven.sh
 
 
 #### REMOVAL OF MAIN SCRIPT ####
 
-rm -rf /home/free/Downloads/Sovran_SystemsOS_File_Fixes_And_New_Services.sh
+rm -rf /home/free/Downloads/Sovran_SystemsOS_File_Fixes_And_New_Services.sh

file_fixes_and_new_services/add-custom-nix.sh

@@ -0,0 +1,81 @@
+#!/usr/bin/env bash
+   
+function log_console () {
+  echo "`date` :: $1" >> /var/lib/beacons/awesome.log
+  echo $1
+}
+
+
+#### CHECK TO SEE IF IT HAS BEEN RUN BEFORE ####
+
+FILE=/var/lib/beacons/file_fixes_and_new_services/add-custom-nix/completed
+
+   if [ -e $FILE ]; then
+
+      /run/current-system/sw/bin/echo "File Found :), No Need to Run ... Exiting"
+         
+      exit 1
+
+   fi
+
+
+#### CREATE INITIAL TAG ####
+
+/run/current-system/sw/bin/mkdir -p /var/lib/beacons/file_fixes_and_new_services/add-custom-nix ; touch /var/lib/beacons/file_fixes_and_new_services/add-custom-nix/started
+
+   if [[ $? != 0 ]]; then
+
+      /run/current-system/sw/bin/echo "Could Not Create Initial Tag"
+
+      exit 1
+
+   fi
+
+
+#### MAIN SCRIPT ####
+
+touch /etc/nixos/custom.nix
+
+/run/current-system/sw/bin/cat > /etc/nixos/custom.nix <<- "EOF"
+
+{config, pkgs, lib, ...}:
+
+# Add custom NixOS modules here.
+
+let
+   personalization = import ./personalization.nix;
+   
+   in
+{
+
+
+
+}
+
+EOF
+
+
+   if [[ $? != 0 ]]; then
+
+      /run/current-system/sw/bin/echo "Could Not Run add-custom-nix"
+
+      exit 1
+
+   fi
+
+
+
+#### CREATE COMPELETE TAG ####
+
+/run/current-system/sw/bin/touch /var/lib/beacons/file_fixes_and_new_services/add-custom-nix/completed
+
+   if [[ $? != 0 ]]; then
+
+      /run/current-system/sw/bin/echo "Could Not Create Completed Tag"
+
+      exit 1
+
+   fi
+
+      
+exit 0

file_fixes_and_new_services/add_external_backup_app.sh

@@ -0,0 +1,66 @@
+#!/usr/bin/env bash
+   
+function log_console () {
+  echo "`date` :: $1" >> /var/lib/beacons/awesome.log
+  echo $1
+}
+
+
+#### CHECK TO SEE IF IT HAS BEEN RUN BEFORE ####
+
+FILE=/var/lib/beacons/file_fixes_and_new_services/add_external_backup_app/completed
+
+   if [ -e $FILE ]; then
+
+      /run/current-system/sw/bin/echo "File Found :), No Need to Run ... Exiting"
+         
+      exit 1
+
+   fi
+
+
+#### CREATE INITIAL TAG ####
+
+/run/current-system/sw/bin/mkdir -p /var/lib/beacons/file_fixes_and_new_services/add_external_backup_app ; touch /var/lib/beacons/file_fixes_and_new_services/add_external_backup_app/started
+
+   if [[ $? != 0 ]]; then
+
+      /run/current-system/sw/bin/echo "Could Not Create Initial Tag"
+
+      exit 1
+
+   fi
+
+
+#### MAIN SCRIPT ####
+
+cd /home/free/Downloads
+
+/run/current-system/sw/bin/wget "https://git.sovransystems.com/Sovran_Systems/Software/raw/branch/main/Sovran_SystemsOS_External_Backup/sovran_systemsOS_external_backup_local_installer/sovran_systemsOS_external_backup_install.sh"
+
+/run/current-system/sw/bin/bash "sovran_systemsOS_external_backup_install.sh"
+
+   if [[ $? != 0 ]]; then
+
+      /run/current-system/sw/bin/echo "Could Not Run add_external_backup_app"
+
+      exit 1
+
+   fi
+
+
+
+#### CREATE COMPELETE TAG ####
+
+/run/current-system/sw/bin/touch /var/lib/beacons/file_fixes_and_new_services/add_external_backup_app/completed
+
+   if [[ $? != 0 ]]; then
+
+      /run/current-system/sw/bin/echo "Could Not Create Completed Tag"
+
+      exit 1
+
+   fi
+
+      
+exit 0

file_fixes_and_new_services/element-calling_haven.sh

@@ -8,7 +8,7 @@ function log_console () {
 
 #### CHECK TO SEE IF IT HAS BEEN RUN BEFORE ####
 
-FILE=/var/lib/beacons/file_fixes_and_new_services/jitsi/completed
+FILE=/var/lib/beacons/file_fixes_and_new_services/element-calling_haven/completed
 
    if [ -e $FILE ]; then
 
@@ -21,7 +21,7 @@ FILE=/var/lib/beacons/file_fixes_and_new_services/jitsi/completed
 
 #### CREATE INITIAL TAG ####
 
-/run/current-system/sw/bin/mkdir -p /var/lib/beacons/file_fixes_and_new_services/jitsi ; touch /var/lib/beacons/file_fixes_and_new_services/jitsi/started
+/run/current-system/sw/bin/mkdir -p /var/lib/beacons/file_fixes_and_new_services/element-calling_haven ; touch /var/lib/beacons/file_fixes_and_new_services/element-calling_haven/started
 
    if [[ $? != 0 ]]; then
 
@@ -34,11 +34,12 @@ FILE=/var/lib/beacons/file_fixes_and_new_services/jitsi/completed
 
 #### MAIN SCRIPT ####
 
-/run/current-system/sw/bin/mkdir /var/lib/cool
+  touch /var/lib/domains/haven
+  touch /var/lib/domains/element-calling
 
    if [[ $? != 0 ]]; then
 
-      /run/current-system/sw/bin/echo "Could Not Create Cool"
+      /run/current-system/sw/bin/echo "Could Not Run element-calling_haven"
 
       exit 1
 
@@ -48,7 +49,7 @@ FILE=/var/lib/beacons/file_fixes_and_new_services/jitsi/completed
 
 #### CREATE COMPELETE TAG ####
 
-/run/current-system/sw/bin/touch /var/lib/beacons/file_fixes_and_new_services/jitsi/completed
+/run/current-system/sw/bin/touch /var/lib/beacons/file_fixes_and_new_services/element-calling_haven/completed
 
    if [[ $? != 0 ]]; then
 
@@ -59,4 +60,4 @@ FILE=/var/lib/beacons/file_fixes_and_new_services/jitsi/completed
    fi
 
       
-exit 0
+exit 0

file_fixes_and_new_services/nextcloud_maintenance_window_fix.sh

@@ -0,0 +1,62 @@
+#!/usr/bin/env bash
+   
+function log_console () {
+  echo "`date` :: $1" >> /var/lib/beacons/awesome.log
+  echo $1
+}
+
+
+#### CHECK TO SEE IF IT HAS BEEN RUN BEFORE ####
+
+FILE=/var/lib/beacons/file_fixes_and_new_services/nextcloud_maintenance_window_fix/completed
+
+   if [ -e $FILE ]; then
+
+      /run/current-system/sw/bin/echo "File Found :), No Need to Run ... Exiting"
+         
+      exit 1
+
+   fi
+
+
+#### CREATE INITIAL TAG ####
+
+/run/current-system/sw/bin/mkdir -p /var/lib/beacons/file_fixes_and_new_services/nextcloud_maintenance_window_fix ; touch /var/lib/beacons/file_fixes_and_new_services/nextcloud_maintenance_window_fix/started
+
+   if [[ $? != 0 ]]; then
+
+      /run/current-system/sw/bin/echo "Could Not Create Initial Tag"
+
+      exit 1
+
+   fi
+
+
+#### MAIN SCRIPT ####
+
+/run/wrappers/bin/sudo -u caddy /run/current-system/sw/bin/php /var/lib/www/nextcloud/occ config:system:set maintenance_window_start --type=integer --value=1
+
+   if [[ $? != 0 ]]; then
+
+      /run/current-system/sw/bin/echo "Could Not Run add-custom-nix"
+
+      exit 1
+
+   fi
+
+
+
+#### CREATE COMPELETE TAG ####
+
+/run/current-system/sw/bin/touch /var/lib/beacons/file_fixes_and_new_services/nextcloud_maintenance_window_fix/completed
+
+   if [[ $? != 0 ]]; then
+
+      /run/current-system/sw/bin/echo "Could Not Create Completed Tag"
+
+      exit 1
+
+   fi
+
+      
+exit 0

file_fixes_and_new_services/sovran-pro-flake-update.sh

@@ -0,0 +1,96 @@
+#!/usr/bin/env bash
+   
+function log_console () {
+  echo "`date` :: $1" >> /var/lib/beacons/awesome.log
+  echo $1
+}
+
+
+#### CHECK TO SEE IF IT HAS BEEN RUN BEFORE ####
+
+FILE=/var/lib/beacons/file_fixes_and_new_services/sovran-pro-flake-update/completed
+
+   if [ -e $FILE ]; then
+
+      /run/current-system/sw/bin/echo "File Found :), No Need to Run ... Exiting"
+         
+      exit 1
+
+   fi
+
+
+#### CREATE INITIAL TAG ####
+
+/run/current-system/sw/bin/mkdir -p /var/lib/beacons/file_fixes_and_new_services/sovran-pro-flake-update ; touch /var/lib/beacons/file_fixes_and_new_services/sovran-pro-flake-update/started
+
+   if [[ $? != 0 ]]; then
+
+      /run/current-system/sw/bin/echo "Could Not Create Initial Tag"
+
+      exit 1
+
+   fi
+
+
+#### MAIN SCRIPT ####
+
+/run/current-system/sw/bin/rm /etc/nixos/flake.nix
+
+/run/current-system/sw/bin/cat > /etc/nixos/flake.nix <<- "EOF"
+
+{
+   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 {
+         
+         system = "x86_64-linux";
+         
+         modules = [ 
+
+            ./hardware-configuration.nix
+
+            Sovran_Systems.nixosModules.Sovran_SystemsOS 
+
+         ];
+      
+      };
+   
+   };
+
+}
+
+EOF
+
+
+   if [[ $? != 0 ]]; then
+
+      /run/current-system/sw/bin/echo "Could Not Run sovran-pro-flake-update"
+
+      exit 1
+
+   fi
+
+
+
+#### CREATE COMPELETE TAG ####
+
+/run/current-system/sw/bin/touch /var/lib/beacons/file_fixes_and_new_services/sovran-pro-flake-update/completed
+
+   if [[ $? != 0 ]]; then
+
+      /run/current-system/sw/bin/echo "Could Not Create Completed Tag"
+
+      exit 1
+
+   fi
+
+      
+exit 0

file_fixes_and_new_services/sovran-pro-flake-update2.sh

@@ -0,0 +1,98 @@
+#!/usr/bin/env bash
+   
+function log_console () {
+  echo "`date` :: $1" >> /var/lib/beacons/awesome.log
+  echo $1
+}
+
+
+#### CHECK TO SEE IF IT HAS BEEN RUN BEFORE ####
+
+FILE=/var/lib/beacons/file_fixes_and_new_services/sovran-pro-flake-update2/completed
+
+   if [ -e $FILE ]; then
+
+      /run/current-system/sw/bin/echo "File Found :), No Need to Run ... Exiting"
+         
+      exit 1
+
+   fi
+
+
+#### CREATE INITIAL TAG ####
+
+/run/current-system/sw/bin/mkdir -p /var/lib/beacons/file_fixes_and_new_services/sovran-pro-flake-update2 ; touch /var/lib/beacons/file_fixes_and_new_services/sovran-pro-flake-update2/started
+
+   if [[ $? != 0 ]]; then
+
+      /run/current-system/sw/bin/echo "Could Not Create Initial Tag"
+
+      exit 1
+
+   fi
+
+
+#### MAIN SCRIPT ####
+
+/run/current-system/sw/bin/rm /etc/nixos/flake.nix
+
+/run/current-system/sw/bin/cat > /etc/nixos/flake.nix <<- "EOF"
+
+{
+   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 {
+         
+         system = "x86_64-linux";
+         
+         modules = [ 
+
+            ./custom.nix  
+
+            ./hardware-configuration.nix
+
+            Sovran_Systems.nixosModules.Sovran_SystemsOS 
+
+         ];
+      
+      };
+   
+   };
+
+}
+
+EOF
+
+
+   if [[ $? != 0 ]]; then
+
+      /run/current-system/sw/bin/echo "Could Not Run sovran-pro-flake-update2"
+
+      exit 1
+
+   fi
+
+
+
+#### CREATE COMPELETE TAG ####
+
+/run/current-system/sw/bin/touch /var/lib/beacons/file_fixes_and_new_services/sovran-pro-flake-update2/completed
+
+   if [[ $? != 0 ]]; then
+
+      /run/current-system/sw/bin/echo "Could Not Create Completed Tag"
+
+      exit 1
+
+   fi
+
+      
+exit 0

file_fixes_and_new_services/update-agenix.sh

@@ -0,0 +1,83 @@
+#!/usr/bin/env bash
+   
+#### CHECK TO SEE IF IT HAS BEEN RUN BEFORE ####
+
+FILE=/var/lib/beacons/file_fixes_and_new_services/update-agenix/completed
+
+   if [ -e $FILE ]; then
+
+      /run/current-system/sw/bin/echo "File Found :), No Need to Run ... Exiting"
+         
+      exit 1
+
+   fi
+
+
+#### CREATE INITIAL TAG ####
+
+/run/current-system/sw/bin/mkdir -p /var/lib/beacons/file_fixes_and_new_services/update-agenix ; touch /var/lib/beacons/file_fixes_and_new_services/update-agenix/started
+
+   if [[ $? != 0 ]]; then
+
+      /run/current-system/sw/bin/echo "Could Not Create Initial Tag"
+
+      exit 1
+
+   fi
+
+
+#### MAIN SCRIPT ####
+
+/run/current-system/sw/bin/rm -rf /var/lib/agenix-secrets/nextclouddb.age
+
+/run/current-system/sw/bin/rm -rf /var/lib/agenix-secrets/wordpressdb.age
+
+/run/current-system/sw/bin/rm -rf /var/lib/agenix-secrets/turn.age
+
+/run/current-system/sw/bin/rm -rf /var/lib/agenix-secrets/matrixdb.age 
+
+/run/current-system/sw/bin/rm -rf /var/lib/agenix-secrets/matrix_reg_secret.age 
+
+
+pushd /var/lib/agenix-secrets/
+
+		
+	/run/current-system/sw/bin/echo -n $(/run/current-system/sw/bin/cat /var/lib/secrets/wordpressdb) | EDITOR='/run/current-system/sw/bin/cp /dev/stdin' /run/current-system/sw/bin/nix run github:ryantm/agenix -- -e wordpressdb.age -i /root/.ssh/agenix/agenix-secret-keys
+
+	/run/current-system/sw/bin/echo -n $(/run/current-system/sw/bin/cat /var/lib/secrets/nextclouddb) | EDITOR='/run/current-system/sw/bin/cp /dev/stdin' /run/current-system/sw/bin/nix run github:ryantm/agenix -- -e nextclouddb.age -i /root/.ssh/agenix/agenix-secret-keys
+
+	/run/current-system/sw/bin/echo -n $(/run/current-system/sw/bin/cat /var/lib/secrets/matrixdb) | EDITOR='/run/current-system/sw/bin/cp /dev/stdin' /run/current-system/sw/bin/nix run github:ryantm/agenix -- -e matrixdb.age -i /root/.ssh/agenix/agenix-secret-keys
+
+	/run/current-system/sw/bin/echo -n $(/run/current-system/sw/bin/cat /var/lib/secrets/turn) | EDITOR='/run/current-system/sw/bin/cp /dev/stdin' /run/current-system/sw/bin/nix run github:ryantm/agenix -- -e turn.age -i /root/.ssh/agenix/agenix-secret-keys
+
+	/run/current-system/sw/bin/echo -n $(/run/current-system/sw/bin/cat /var/lib/secrets/matrix_reg_secret) | EDITOR='/run/current-system/sw/bin/cp /dev/stdin' /run/current-system/sw/bin/nix run github:ryantm/agenix -- -e matrix_reg_secret.age -i /root/.ssh/agenix/agenix-secret-keys
+
+
+popd
+
+
+   if [[ $? != 0 ]]; then
+
+      /run/current-system/sw/bin/echo "Could Not Run update-agenix"
+
+      exit 1
+
+   fi
+
+
+
+#### CREATE COMPELETE TAG ####
+
+/run/current-system/sw/bin/touch /var/lib/beacons/file_fixes_and_new_services/update-agenix/completed
+
+   if [[ $? != 0 ]]; then
+
+      /run/current-system/sw/bin/echo "Could Not Create Completed Tag"
+
+      exit 1
+
+   fi
+
+      
+exit 0
+

flake.lock

@@ -4,14 +4,15 @@
       "inputs": {
         "darwin": [],
         "home-manager": "home-manager",
-        "nixpkgs": "nixpkgs"
+        "nixpkgs": "nixpkgs",
+        "systems": "systems"
       },
       "locked": {
-        "lastModified": 1684153753,
+        "lastModified": 1770165109,
-        "narHash": "sha256-PVbWt3qrjYAK+T5KplFcO+h7aZWfEj1UtyoKlvcDxh0=",
+        "narHash": "sha256-9VnK6Oqai65puVJ4WYtCTvlJeXxMzAp/69HhQuTdl/I=",
         "owner": "ryantm",
         "repo": "agenix",
-        "rev": "db5637d10f797bb251b94ef9040b237f4702cde3",
+        "rev": "b027ee29d959fda4b60b57566d64c98a202e0feb",
         "type": "github"
       },
       "original": {
@@ -20,6 +21,43 @@
         "type": "github"
       }
     },
+    "bip110": {
+      "inputs": {
+        "nixpkgs": "nixpkgs_2"
+      },
+      "locked": {
+        "lastModified": 1777892922,
+        "narHash": "sha256-Yo53Ae0eQa5nByGoTsdJQAIK7kR9UlSDEWT88Qy/6g8=",
+        "owner": "emmanuelrosa",
+        "repo": "bitcoin-knots-bip-110-nix",
+        "rev": "dfe7221629f14d81ce1b4fc96d9500982d1baa58",
+        "type": "github"
+      },
+      "original": {
+        "owner": "emmanuelrosa",
+        "repo": "bitcoin-knots-bip-110-nix",
+        "type": "github"
+      }
+    },
+    "btc-clients": {
+      "inputs": {
+        "nixpkgs": "nixpkgs_3",
+        "oldNixpkgs": "oldNixpkgs"
+      },
+      "locked": {
+        "lastModified": 1777892852,
+        "narHash": "sha256-A+jhf4vEQmn2/DBedQMrisrijDgYfrZOpjjSPhrJgJA=",
+        "owner": "emmanuelrosa",
+        "repo": "btc-clients-nix",
+        "rev": "7576625375f510bcb432caba0e331c6ed2942350",
+        "type": "github"
+      },
+      "original": {
+        "owner": "emmanuelrosa",
+        "repo": "btc-clients-nix",
+        "type": "github"
+      }
+    },
     "extra-container": {
       "inputs": {
         "flake-utils": [
@@ -32,29 +70,51 @@
         ]
       },
       "locked": {
-        "lastModified": 1686656049,
+        "lastModified": 1766155727,
-        "narHash": "sha256-rkYYVslFtRnhzryUFqJeYjPxorasymOg00z30GtR3iE=",
+        "narHash": "sha256-XGp4HHH6D6ZKiO5RnMzqYJYnZB538EnEflvlTsOKpvo=",
         "owner": "erikarvstedt",
         "repo": "extra-container",
-        "rev": "a6f74b9deb7bb2fdd346b74483c6a56946d5d332",
+        "rev": "b450bdb24fca1076973c852d87bcb49b8eb5fd49",
         "type": "github"
       },
       "original": {
         "owner": "erikarvstedt",
+        "ref": "0.14",
         "repo": "extra-container",
         "type": "github"
       }
     },
+    "flake-parts": {
+      "inputs": {
+        "nixpkgs-lib": [
+          "nixvim",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1777932387,
+        "narHash": "sha256-nUYVPiqrzr36ThiQOAr5MKeGHDBSDM3OFWkz0uDjOvc=",
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "rev": "71a3a77326609675e9f8b51084cf23d5d1945899",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "type": "github"
+      }
+    },
     "flake-utils": {
       "inputs": {
-        "systems": "systems"
+        "systems": "systems_2"
       },
       "locked": {
-        "lastModified": 1685518550,
+        "lastModified": 1731533236,
-        "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=",
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
         "type": "github"
       },
       "original": {
@@ -71,11 +131,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1682203081,
+        "lastModified": 1745494811,
-        "narHash": "sha256-kRL4ejWDhi0zph/FpebFYhzqlOBrk0Pl3dzGEKSAlEw=",
+        "narHash": "sha256-YZCh2o9Ua1n9uCvrvi5pRxtuVNml8X2a03qIFfRKpFs=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "32d3e39c491e2f91152c84f8ad8b003420eab0a1",
+        "rev": "abfad3d2958c9e6300a883bd443512c55dfeb1be",
         "type": "github"
       },
       "original": {
@@ -88,15 +148,16 @@
       "inputs": {
         "extra-container": "extra-container",
         "flake-utils": "flake-utils",
-        "nixpkgs": "nixpkgs_2",
+        "nixpkgs": "nixpkgs_4",
+        "nixpkgs-25_05": "nixpkgs-25_05",
         "nixpkgs-unstable": "nixpkgs-unstable"
       },
       "locked": {
-        "lastModified": 1686687332,
+        "lastModified": 1767721199,
-        "narHash": "sha256-GDpCwn05ZniaKgODBqGlW3pnbHVq6bybnTNnoCK/XUk=",
+        "narHash": "sha256-UzRxDiJlopBGPTjyhCdMP+QdTwXK+l+y45urXCyH69A=",
         "owner": "fort-nix",
         "repo": "nix-bitcoin",
-        "rev": "f2a970406ba35a21fa916de9d201859a7860447a",
+        "rev": "5b532698ce9e8bd79b07d77ab4fc60e1a8408f73",
         "type": "github"
       },
       "original": {
@@ -108,27 +169,59 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1677676435,
+        "lastModified": 1754028485,
-        "narHash": "sha256-6FxdcmQr5JeZqsQvfinIMr0XcTyTuR7EXX0H3ANShpQ=",
+        "narHash": "sha256-IiiXB3BDTi6UqzAZcf2S797hWEPCRZOwyNThJIYhUfk=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "a08d6979dd7c82c4cef0dcc6ac45ab16051c1169",
+        "rev": "59e69648d345d6e8fef86158c555730fa12af9de",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixos-unstable",
+        "ref": "nixos-25.05",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs-25_05": {
+      "locked": {
+        "lastModified": 1767051569,
+        "narHash": "sha256-0MnuWoN+n1UYaGBIpqpPs9I9ZHW4kynits4mrnh1Pk4=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "40ee5e1944bebdd128f9fbada44faefddfde29bd",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-25.05",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs-stable": {
+      "locked": {
+        "lastModified": 1751274312,
+        "narHash": "sha256-/bVBlRpECLVzjV19t5KMdMFWSwKLtb5RyXdjz3LJT+g=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "50ab793786d9de88ee30ec4e4c24fb4236fc2674",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-24.11",
         "repo": "nixpkgs",
         "type": "github"
       }
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1686582075,
+        "lastModified": 1767364772,
-        "narHash": "sha256-vtflsfKkHtF8IduxDNtbme4cojiqvlvjp5QNYhvoHXc=",
+        "narHash": "sha256-fFUnEYMla8b7UKjijLnMe+oVFOz6HjijGGNS1l7dYaQ=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "7e63eed145566cca98158613f3700515b4009ce3",
+        "rev": "16c7794d0a28b5a37904d55bcca36003b9109aaa",
         "type": "github"
       },
       "original": {
@@ -140,27 +233,58 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1686476475,
+        "lastModified": 1777728799,
-        "narHash": "sha256-W9yUePvCSDghn+YUXewuodyPxt+kJl/a7zdY4Q6r4MU=",
+        "narHash": "sha256-z7jjYQqhkFKab92VQ3duB7QVO7f7Y62qTFrJYXO/lyo=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "eef86b8a942913a828b9ef13722835f359deef29",
+        "rev": "4b2287113c2f9a2331c04899b2e2e5ab92dea9c5",
         "type": "github"
       },
       "original": {
-        "owner": "NixOS",
+        "owner": "nixos",
-        "ref": "nixos-22.11",
+        "ref": "master",
         "repo": "nixpkgs",
         "type": "github"
       }
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1686960236,
+        "lastModified": 1777728799,
-        "narHash": "sha256-AYCC9rXNLpUWzD9hm+askOfpliLEC9kwAo7ITJc4HIw=",
+        "narHash": "sha256-z7jjYQqhkFKab92VQ3duB7QVO7f7Y62qTFrJYXO/lyo=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "04af42f3b31dba0ef742d254456dc4c14eedac86",
+        "rev": "4b2287113c2f9a2331c04899b2e2e5ab92dea9c5",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_4": {
+      "locked": {
+        "lastModified": 1767480499,
+        "narHash": "sha256-8IQQUorUGiSmFaPnLSo2+T+rjHtiNWc+OAzeHck7N48=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "30a3c519afcf3f99e2c6df3b359aec5692054d92",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-25.11",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_5": {
+      "locked": {
+        "lastModified": 1777954456,
+        "narHash": "sha256-hGdgeU2Nk87RAuZyYjyDjFL6LK7dAZN5RE9+hrDTkDU=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "549bd84d6279f9852cae6225e372cc67fb91a4c1",
         "type": "github"
       },
       "original": {
@@ -170,11 +294,67 @@
         "type": "github"
       }
     },
+    "nixpkgs_6": {
+      "locked": {
+        "lastModified": 1777918403,
+        "narHash": "sha256-7QiZv0LcW1yIOLo2LNuCQjWon1Z1r99FwK24hbtBOF4=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "afc5551119aae6eab73a95c1960891cfe63204f6",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixvim": {
+      "inputs": {
+        "flake-parts": "flake-parts",
+        "nixpkgs": "nixpkgs_6",
+        "systems": "systems_3"
+      },
+      "locked": {
+        "lastModified": 1777991353,
+        "narHash": "sha256-DFwjggMV+nzCZpwK6Obxj9F+P59rbLVowGqHETfctBk=",
+        "owner": "nix-community",
+        "repo": "nixvim",
+        "rev": "7986a276960b4dfaed9bb2c3c438b5ba71ae08f1",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "nixvim",
+        "type": "github"
+      }
+    },
+    "oldNixpkgs": {
+      "locked": {
+        "lastModified": 1727619874,
+        "narHash": "sha256-a4Jcd+vjQAzF675/7B1LN3U2ay22jfDAVA8pOml5J/0=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "6710d0dd013f55809648dfb1265b8f85447d30a6",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "6710d0dd013f55809648dfb1265b8f85447d30a6",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "root": {
       "inputs": {
         "agenix": "agenix",
+        "bip110": "bip110",
+        "btc-clients": "btc-clients",
         "nix-bitcoin": "nix-bitcoin",
-        "nixpkgs": "nixpkgs_3"
+        "nixpkgs": "nixpkgs_5",
+        "nixpkgs-stable": "nixpkgs-stable",
+        "nixvim": "nixvim"
       }
     },
     "systems": {
@@ -191,6 +371,36 @@
         "repo": "default",
         "type": "github"
       }
+    },
+    "systems_2": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "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",

flake.nix

@@ -1,5 +1,5 @@
 {
-	description = "The Ultimate Sovran_SystemsOS Configuration for the Sovran Pro from Sovran Systems";
+	description = "The Ultimate Sovran_SystemsOS Configuration from Sovran Systems";
 
 	inputs = {
 		
@@ -11,36 +11,64 @@
 
 		agenix.inputs.darwin.follows = "";
 
-		erosanix.url = "github:emmanuelrosa/erosanix";
+		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, agenix, erosanix, ... }: 
+	outputs = { self, nixpkgs, nix-bitcoin, nixvim, agenix, 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 {
-			system ="x86_64-linux";
+			
+			modules = [
+				{ nixpkgs.hostPlatform = "x86_64-linux"; }
+			];
 		
 		};
 		
-		nixosModules.Sovran_SystemsOS = { pkgs, ... }: {
+		nixosModules.Sovran_SystemsOS = { pkgs, lib, config, ... }: {
-			
+
 			imports = [
+				({ config, pkgs, ... }: {
+					nixpkgs.overlays = [ overlay-stable ];
+				})
 
-				./modules/modules.nix 
+				./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
+				];
 
- 			environment.systemPackages = with pkgs; [
+				sovran_systemsOS.packages.bip110 = bip110.packages.${pkgs.system}.bitcoind-knots-bip-110;
- 			  
+			};
- 			  erosanix.packages.x86_64-linux.sparrow
- 			
- 			];
 		};
 	};
-}
+}

for_new_sovran_pros/Sovran_SystemsOS-Desktop

@@ -1,15 +1,21 @@
 [com/ftpix/transparentbar]
 dark-full-screen=false
 
+[org/gnome/Connections]
+first-run=false
+
 [org/gnome/Console]
-font-scale=1.7000000000000006
+font-scale=1.6000000000000005
 last-window-size=(1912, 1037)
 
 [org/gnome/Geary]
 migrated-config=true
-window-height=1037
+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'
@@ -39,10 +45,14 @@ window-size=(1912, 1037)
 
 [org/gnome/control-center]
 last-panel='background'
-window-state=(1912, 1037, false)
+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']
+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']
@@ -50,11 +60,11 @@ 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']
+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']
+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]
@@ -63,7 +73,7 @@ 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']
+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
 
@@ -73,7 +83,7 @@ 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']
+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'
@@ -85,36 +95,44 @@ 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']
+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/blobs-l.svg'
+picture-uri='file:///run/current-system/sw/share/backgrounds/gnome/amber-l.jxl'
-picture-uri-dark='file:///run/current-system/sw/share/backgrounds/gnome/blobs-d.svg'
+picture-uri-dark='file:///run/current-system/sw/share/backgrounds/gnome/amber-d.jxl'
-primary-color='#241f31'
+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.0700000000000001
+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']
+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'
 
@@ -127,15 +145,27 @@ 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'
 
@@ -145,6 +175,9 @@ 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'
 
@@ -156,6 +189,7 @@ numlock-state=false
 
 [org/gnome/desktop/peripherals/mouse]
 natural-scroll=true
+speed=-0.63779527559055116
 
 [org/gnome/desktop/peripherals/touchpad]
 two-finger-scrolling-enabled=true
@@ -168,8 +202,8 @@ recent-files-max-age=-1
 color-shading-type='solid'
 lock-enabled=false
 picture-options='zoom'
-picture-uri='file:///run/current-system/sw/share/backgrounds/gnome/blobs-l.svg'
+picture-uri='file:///run/current-system/sw/share/backgrounds/gnome/amber-l.jxl'
-primary-color='#241f31'
+primary-color='#ff7800'
 secondary-color='#000000'
 
 [org/gnome/desktop/session]
@@ -193,6 +227,10 @@ window-size=(1912, 1037)
 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
@@ -202,20 +240,22 @@ sort-type='ascending'
 
 [org/gnome/file-roller/ui]
 sidebar-width=200
-window-height=990
+window-height=993
 window-width=954
 
 [org/gnome/gnome-system-monitor]
-current-tab='disks'
+current-tab='processes'
 maximized=false
 network-total-in-bits=false
 show-dependencies=false
 show-whose-processes='all'
-window-state=(1912, 1037, 26, 23)
+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=1502
+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]
@@ -223,12 +263,12 @@ sort-col=8
 sort-order=0
 
 [org/gnome/maps]
-last-viewed-location=[33.98678824432703, -118.33063362501532]
+last-viewed-location=[34.015438242460405, -118.32766985901287]
 map-type='MapsStreetSource'
 transportation-type='pedestrian'
 window-maximized=false
 window-size=[1912, 1037]
-zoom-level=19
+zoom-level=9
 
 [org/gnome/mutter]
 attach-modal-dialogs=true
@@ -242,14 +282,19 @@ 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=(954, 1037)
+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
@@ -262,19 +307,32 @@ ignore-phase2-ca-cert=false
 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-temperature=uint32 1700
+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='interactive'
+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>}>, 'bitwarden.desktop': <{'position': <12>}>, 'gnome-system-monitor.desktop': <{'position': <13>}>, 'Sovran_SystemsOS_Reseter.desktop': <{'position': <14>}>}]
+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', 'systemd-manager@hardpixel.eu']
+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=['brave-browser.desktop', 'org.gnome.Nautilus.desktop', 'org.gnome.Console.desktop', 'Sovran_SystemsOS_Updater.desktop', 'Sovran_SystemsOS_Reseter.desktop', 'org.gnome.Settings.desktop', 'org.gnome.Software.desktop', 'org.gnome.Geary.desktop', 'org.gnome.Contacts.desktop', 'org.gnome.Calendar.desktop', 'Bisq.desktop', 'sparrow-desktop.desktop']
+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'
 
@@ -309,17 +367,26 @@ apply-custom-theme=false
 background-color='rgb(0,0,0)'
 background-opacity=0.17000000000000001
 custom-background-color=true
-dash-max-icon-size=76
+dash-max-icon-size=57
 dock-position='BOTTOM'
-height-fraction=0.79000000000000004
+extend-height=false
+height-fraction=0.89000000000000001
+icon-size-fixed=false
+intellihide-mode='ALL_WINDOWS'
 preferred-monitor=-2
-preferred-monitor-by-connector='HDMI-1'
+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
 
@@ -331,11 +398,11 @@ 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"}', '{"name":"OnlyOffice (docservice)","service":"onlyoffice-docservice.service","type":"system"}', '{"name":"OnlyOffice (converterservice)","service":"onlyoffice-converter.service","type":"system"}', '{"name":"OnlyOffice (rabbitmq)","service":"rabbitmq.service","type":"system"}', '{"name":"OnlyOffice (nginx)","service":"nginx.service","type":"system"}']
+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_avg__']
+hot-sensors=['_memory_usage_', '__network-tx_max__', '_processor_usage_', '_storage_free_', '_temperature_processor_0_']
 show-fan=false
 show-storage=true
 show-voltage=false
@@ -348,12 +415,16 @@ locations=@av []
 locations=@av []
 
 [org/gnome/software]
-check-timestamp=int64 1689340502
+check-timestamp=int64 1715525466
 first-run=false
-flatpak-purge-timestamp=int64 1689380924
+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
 
@@ -363,20 +434,31 @@ 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=true
+show-hidden=false
 show-size-column=true
 show-type-column=true
-sidebar-width=177
+sidebar-width=140
 sort-column='name'
 sort-directories-first=false
 sort-order='ascending'
 type-format='category'
 view-type='list'
-window-size=(938, 374)
+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 []

for_new_sovran_pros/flake.nix

@@ -10,13 +10,21 @@
 	outputs = { self, Sovran_Systems, ... }@inputs: {
 		
 		nixosConfigurations."nixos" = Sovran_Systems.inputs.nixpkgs.lib.nixosSystem {
-			
-			system = "x86_64-linux";
  			
- 			modules = [ Sovran_Systems.nixosModules.Sovran_SystemsOS ];
+ 			modules = [ 
+
+				{ nixpkgs.hostPlatform = "x86_64-linux"; }
+
+ 				./hardware-configuration.nix
+
+ 				./custom.nix
+
+ 				Sovran_Systems.nixosModules.Sovran_SystemsOS 
+
+ 			];
 		
 		};
 	
 	};
 
-}
+}

for_new_sovran_pros/flake_consume.nix

@@ -0,0 +1,30 @@
+{
+	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 
+
+ 			];
+		
+		};
+	
+	};
+
+}

for_new_sovran_pros/psp.sh

@@ -8,20 +8,27 @@ ENDCOLOR="\e[0m"
 
 lsblk
 
-echo -e "${GREEN}What block for Root drive (usually sda)?${ENDCOLOR}";read commitroot
+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 -7MB
+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 2 esp on
+parted /dev/"$commitroot" -- set 3 esp on
 
 lsblk
 
-echo -e "${GREEN}What partition for Root drive (usually sda1)?${ENDCOLOR}";read commitrootpartition
+echo -e "${GREEN}What partition for Boot-Partition (usually nvme0n1p1)?${ENDCOLOR}";read commitbootpartition
 
-echo -e "${GREEN}What partition for Boot drive (usually sda2)?${ENDCOLOR}";read commitbootpartition
+echo -e "${GREEN}What partition for Main-Partition (usually nvme0n1p2)?${ENDCOLOR}";read commitmainpartition
 
-mkfs.ext4 -L nixos /dev/"$commitrootpartition"
+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"
 
@@ -31,26 +38,26 @@ 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 = [
+	
+	imports = [
+	
 	./hardware-configuration.nix
-  ];
+	
+	];
 
-  boot.loader.systemd-boot.enable = true;
+	boot.loader.systemd-boot.enable = true;
-  boot.loader.efi.canTouchEfiVariables = true;
+	boot.loader.efi.canTouchEfiVariables = true;
 	boot.loader.efi.efiSysMountPoint = "/boot/efi";
 
-  nix = {
+	nix.settings.experimental-features = [ "nix-command" "flakes" ];
-  package = pkgs.nixUnstable;
-	extraOptions = ''
-		experimental-features = nix-command flakes
-	'';
-  };
 
 	users.users = {
 		free = {
@@ -58,6 +65,7 @@ cat <<EOT >> /mnt/etc/nixos/configuration.nix
 			description = "free";
 			extraGroups = [ "networkmanager" ];
 		};
+	};
 
 	environment.systemPackages = with pkgs; [
 		wget
@@ -71,7 +79,7 @@ cat <<EOT >> /mnt/etc/nixos/configuration.nix
 	services.openssh = {
 		enable = true;
 		permitRootLogin = "yes";
-		};
+	};
 }
 
 EOT

for_new_sovran_pros/psp_physical_ram.sh

@@ -0,0 +1,85 @@
+#!/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

for_new_sovran_pros/sdpsp.sh

@@ -0,0 +1,51 @@
+#!/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!"
+

for_new_sovran_pros/sp.sh

@@ -5,7 +5,6 @@
 
 GREEN="\e[32m"
 LIGHTBLUE="\e[94m"
-ENDCOLOR="\e[0m"
 
 #
 
@@ -26,7 +25,6 @@ mkdir /var/lib/domains
 touch /var/lib/domains/btcpayserver
 touch /var/lib/domains/matrix
 touch /var/lib/domains/nextcloud
-touch /var/lib/domains/onlyoffice
 touch /var/lib/domains/sslemail
 touch /var/lib/domains/vaultwarden
 touch /var/lib/domains/wordpress
@@ -53,10 +51,6 @@ echo -e "${GREEN}What is your New Vaultwarden domain name?${ENDCOLOR}"
 read 
 echo -n $REPLY > /var/lib/domains/vaultwarden
 
-echo -e "${GREEN}What is your New OnlyOffice domain name?${ENDCOLOR}"
-read 
-echo -n $REPLY > /var/lib/domains/onlyoffice
-
 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
@@ -65,60 +59,92 @@ echo -n $REPLY > /var/lib/domains/sslemail
 
 mkdir /var/lib/nextcloudaddition
 
-cat <<EOT >> /var/lib/nextcloudaddition/nextcloudaddition       
+cat > /var/lib/nextcloudaddition/nextcloudaddition <<- "EOF"
 
-'trusted_proxies' =>
+'trusted_proxies' => 
   array (
     0 => '127.0.0.1',
   ),
-'default_locale' => 'en_US',
+  'default_locale' => 'en_US',
-'default_phone_region' => 'US',
+  'default_phone_region' => 'US',
-'filelocking.enabled' => true,
+  'memcache.local' =>'\OC\Memcache\APCu' ,
-'memcache.local' => '\OC\Memcache\APCu',
 
-EOT
+EOF
 
 #
 
 mkdir /var/lib/njalla/
 
-cat <<EOT >> /var/lib/njalla/njalla.sh
+cat > /var/lib/njalla/njalla.sh <<- "EOF"
 
 #!/usr/bin/env bash
 
-# IP=$(wget -qO- https://ipecho.net/plain ; echo)
+IP=$(dig @resolver4.opendns.com myip.opendns.com +short -4)
 
 ## Manually Add DDNS Script From Njalla User Account AFTER Install
 
-#curl "https://...${IP}"
+curl "https://...${IP}"
 
-
+EOF
-EOT
 
 #
 
 mkdir /var/lib/external_ip
 
-cat <<EOT >> /var/lib/external_ip/external_ip.sh
+cat > /var/lib/external_ip/external_ip.sh <<- "EOF"
 
 #!/usr/bin/env bash
 
-wget -qO- https://ipecho.net/plain ; echo > /var/lib/secrets/external_ip
+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
 
 
-EOT
+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 <<EOT >> /var/lib/agenix-secrets/secrets.nix
+cat > /var/lib/agenix-secrets/secrets.nix <<- "EOF"
 
 let
 
   root = "placeholder" ;
 
 in
+
 {
 
   "wordpressdb.age".publicKeys = [ root ];
@@ -133,8 +159,7 @@ in
 
 }
 
-
+EOF
-EOT
 
 #
 
@@ -147,9 +172,9 @@ 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/onlyofficejwtSecretFile
 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 
@@ -157,7 +182,6 @@ 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 $(pwgen -s 17 -1) > /var/lib/secrets/onlyofficejwtSecretFile
 echo -n ADMIN_TOKEN=$(openssl rand -base64 48
 ) > /var/lib/secrets/vaultwarden/vaultwarden.env
 
@@ -188,6 +212,8 @@ pushd /var/lib/agenix-secrets
 popd
 
 
+#
+
 pushd /etc/nixos
 
   nix flake update
@@ -196,13 +222,14 @@ pushd /etc/nixos
 
 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
@@ -215,7 +242,6 @@ chown mysql:mysql /var/lib/secrets/wordpressdb -R
 
 chown vaultwarden:vaultwarden /var/lib/secrets/vaultwarden -R
 
-chown onlyoffice:onlyoffice /var/lib/secrets/onlyofficejwtSecretFile
 
 chmod 770 /var/lib/secrets/ -R
 
@@ -227,16 +253,6 @@ chmod 770 /var/lib/domains -R
 
 #
 
-pushd /etc/nixos
-
-  nix flake update
-
-  nixos-rebuild switch --impure
-
-popd
-
-#
-
 set -x
 
 wget -P /var/lib/www/downloadwp https://wordpress.org/latest.zip
@@ -271,28 +287,6 @@ chown turnserver:turnserver /var/lib/coturn -R
 
 chmod 770 /var/lib/coturn -R
 
-#
-
-echo "root:$(cat /var/lib/secrets/main)" | chpasswd -c SHA512
-
-echo "free:a" | chpasswd -c SHA512
-
-#
-
-sudo -u free flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
-flatpak update
-
-#
-
-mkdir /root/.ssh
-
-touch /root/.ssh/authorized_keys
-
-sudo -u free ssh-keygen -q -N "gosovransytems" -t ed25519 -f /home/free/.ssh/factory_login
-
-echo "$(cat /home/free/.ssh/factory_login.pub)" >> /root/.ssh/authorized_keys
-
-
 #
 
 rm -rf /root/sp.sh
@@ -309,21 +303,13 @@ chmod 770 /run/media/Second_Drive/BTCEcoandBackup/Electrs_Data -R
 
 #
 
-pushd /etc/nixos
+mkdir -p /home/free/Downloads
-
-  nix flake update
-
-  nixos-rebuild switch --impure
-
-popd
-
-#
 
 pushd /home/free/Downloads
 
-  wget https://git.sovransystems.com/Sovran_Systems/Software/raw/branch/main/Sovran_SystemsOS_Reseter/sovran_systemsOS_reseter_local_installer/sovran_systemsOS_reseter_install.sh
+  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_reseter_install.sh
+  bash sovran_systemsOS_resetter_install.sh
 
 popd
 
@@ -339,27 +325,82 @@ 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
 
 #
 
-set +x
+pushd /etc/nixos
 
-echo -e "${GREEN}These four passwords are generated for convenience to use for the Web front end setup UI accounts for Nextcloud, Wordpress, VaultWarden, and BTCPayserver (if you want to use them).${ENDCOLOR} \n"
+  nix flake update
 
-echo -e "$(pwgen -s 17 -1) \n"
+  nixos-rebuild switch --impure
-echo -e "$(pwgen -s 17 -1) \n"
+
-echo -e "$(pwgen -s 17 -1) \n"
+popd
-echo -e "$(pwgen -s 17 -1) \n"
 
 #
 
-echo -e "${LIGHTBLUE}One last thing, you need to put the Njalla DDNS info from Njalla into njalla.sh.${ENDCOLOR} \n"
+echo "root:$(cat /var/lib/secrets/main)" | chpasswd -c SHA512
 
-echo -e "${GREEN}All Finished! Please Reboot then Enjoy your New Sovran Pro!${ENDCOLOR} \n"
+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!"

modules/Sovran_SystemsOS_File_Fixes_And_New_Services.nix

@@ -3,21 +3,21 @@
 {
 
 	systemd.services.Sovran_SystemsOS_File_Fixes_And_New_Services = {
-	  
 
-	  unitConfig = {
+		unitConfig = {
-	    After = "btcpayserver.service";
+			After = "btcpayserver.service";
-	    Requires = "network-online.target";
+			Requires = "network-online.target";
-	  };
+		};
-	   
+		 
-	  serviceConfig = {
+		serviceConfig = {
-	    ExecStart = "/run/current-system/sw/bin/wget https://git.sovransystems.com/Sovran_Systems/Sovran_SystemsOS/raw/branch/main/file_fixes_and_new_services/Sovran_SystemsOS_File_Fixes_And_New_Services.sh -O /home/free/Downloads/Sovran_SystemsOS_File_Fixes_And_New_Services.sh ; /run/current-system/sw/bin/bash /home/free/Downloads/Sovran_SystemsOS_File_Fixes_And_New_Services.sh";
+			ExecStartPre= "/run/current-system/sw/bin/sleep 30";
-	    RemainAfterExit = "yes";
+			ExecStart = "/run/current-system/sw/bin/wget https://git.sovransystems.com/Sovran_Systems/Sovran_SystemsOS/raw/branch/main/file_fixes_and_new_services/Sovran_SystemsOS_File_Fixes_And_New_Services.sh -O /home/free/Downloads/Sovran_SystemsOS_File_Fixes_And_New_Services.sh ; /run/current-system/sw/bin/bash /home/free/Downloads/Sovran_SystemsOS_File_Fixes_And_New_Services.sh";
-	    User = "root";
+			RemainAfterExit = "yes";
-	    Type = "oneshot";
+			User = "root";
-	  };
+			Type = "oneshot";
+		};
 
-	  wantedBy = [ "multi-user.target" ];
+		wantedBy = [ "multi-user.target" ];
 	
 	};
 

modules/bip110.nix

@@ -0,0 +1,25 @@
+{ config, lib, pkgs, ... }:
+
+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
+  ) {
+    services.bitcoind.package = lib.mkForce cfg.packages.bip110;
+
+    environment.systemPackages = [
+      cfg.packages.bip110
+    ];
+  };
+}

modules/bitcoin-core.nix

@@ -0,0 +1,7 @@
+{ config, pkgs, lib, ... }:
+
+lib.mkIf config.sovran_systemsOS.features.bitcoin-core {
+  
+  services.bitcoind.package = lib.mkForce config.nix-bitcoin.pkgs.bitcoind;
+
+}

modules/bitcoinecosystem.nix

@@ -1,76 +1,95 @@
 { config, pkgs, lib, ... }:
 
-{
+lib.mkIf config.sovran_systemsOS.features.bitcoin {
-	nix-bitcoin.generateSecrets = true;
+	
+	## Bitcoind
 	
 	services.bitcoind = {
 		enable = true;
+    package = config.nix-bitcoin.pkgs.bitcoind-knots;
 		dataDir = "/run/media/Second_Drive/BTCEcoandBackup/Bitcoin_Node";
 		txindex = true;
 		tor.proxy = true;
+    tor.enforce = true;
 		disablewallet = true;
 		extraConfig = ''
 			peerbloomfilters=1
 			server=1
-			'';
+		'';
-		};
+	};
 
 	nix-bitcoin.onionServices.bitcoind.enable = true;
 	nix-bitcoin.onionServices.electrs.enable = true;
+	nix-bitcoin.onionServices.rtl.enable = true;
 
-	services.lnd = {
-		enable = true;
-	};
-
-	services.lightning-loop = {
-		enable = true;
-	};
-
-	services.lightning-pool = {
-		enable = true;
-	};
-
-	services.rtl = {
-		enable = true;
-		port = 3050;
-		nightTheme = true;
-		nodes = {
-			lnd = {
-				enable = true;
-				loop = true;
-			};
-		reverseOrder = true;
-		};
-	};
-
-  nix-bitcoin.onionServices.lnd.public = true;
-  services.lnd.lndconnect = {
-    enable = true;
-    onion = true;
-  };
-  services.charge-lnd.enable = true;
-
-  services.btcpayserver.lightningBackend = "lnd";
-		
 
+	## Electrs
+	
 	services.electrs = {
 		enable = true;
 		tor.enforce = true;
 		dataDir = "/run/media/Second_Drive/BTCEcoandBackup/Electrs_Data";
 		};
+
+
+  ## LND
 	
+	services.lnd = {
+		enable = true;
+		tor.enforce = true;
+		tor.proxy = true;
+		extraConfig = ''
+			protocol.option-scid-alias=true
+		'';
+	};
+
+	nix-bitcoin.onionServices.lnd.public = true;
+
+
+  ## LNDconnect
+
+	services.lnd.lndconnect = {
+		enable = true;
+		onion = true;
+	};	
+
+		
+	## RTL
+	
+	services.rtl = {
+		enable = true;
+		tor.enforce = true;
+		port = 3050;
+		nightTheme = true;
+		nodes = {
+			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 = {
 		enable = true;
 		name = "free";
 	};
+
+	nix-bitcoin.useVersionLockedPkgs = false;
 	
 }

modules/core/role-logic.nix

@@ -0,0 +1,37 @@
+{ config, lib, ... }:
+
+{
+  config = lib.mkMerge [
+
+    # Server-Desktop Role most services enabled
+    (lib.mkIf config.sovran_systemsOS.roles.server-desktop {
+      sovran_systemsOS.features = {
+        synapse = true;
+        bitcoin = true;
+        coturn = true;
+        vaultwarden = true;
+        haven = false;
+        mempool = false;
+        bip110 = false;
+        element-calling = false;
+        bitcoin-core = false;
+        rdp = false;
+      };
+    })
+
+    # Desktop role
+    (lib.mkIf config.sovran_systemsOS.roles.desktop {
+      services.xserver.enable = true;
+      services.desktopManager.gnome.enable = true;
+    })
+
+    # Bitcoin node role
+    (lib.mkIf config.sovran_systemsOS.roles.node {
+      sovran_systemsOS.features = {
+        bitcoin = true;
+        bip110 = false;
+      };
+    })
+
+  ];
+}

modules/core/roles.nix

@@ -0,0 +1,33 @@
+{ config, lib, ... }:
+
+{
+  options.sovran_systemsOS = {
+    roles = {
+      server-desktop = lib.mkOption {
+        type = lib.types.bool;
+        default = !config.sovran_systemsOS.roles.desktop && !config.sovran_systemsOS.roles.node;
+      };
+      desktop = lib.mkEnableOption "Desktop Role";
+      node = lib.mkEnableOption "Bitcoin Node Only Role";
+    };
+
+    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";
+      element-calling = lib.mkEnableOption "Element Video and Audio Calling";
+      bitcoin-core = lib.mkEnableOption "Bitcoin Core";
+      rdp = lib.mkEnableOption "Gnome Remote Desktop";
+    };
+
+    nostr_npub = lib.mkOption {
+      type = lib.types.str;
+      default = "";
+      description = "Nostr public key (npub1...) for Haven relay";
+    };
+  };
+}

modules/coturn.nix

@@ -4,7 +4,7 @@ let
 	personalization = import ./personalization.nix;
 	
 	in
-{
+lib.mkIf config.sovran_systemsOS.features.coturn {
 
 	systemd.services.coturn-helper = {
 	  
@@ -16,7 +16,7 @@ let
 
 	  unitConfig = {
 	  	Type = "simple";
-	    After = "NetworkManager.service";
+	    After = "btcpayserver.service";
 	    Requires = "network-online.target";
 	  };
 	   
@@ -34,16 +34,19 @@ let
 	
 	enable = true;
 	use-auth-secret = true;
-	static-auth-secret = "${personalization.age.secrets.turn.file}";
+	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
 	'';
 	
 	};

modules/element-calling.nix

@@ -0,0 +1,153 @@
+{ config, pkgs, lib, ... }:
+
+let
+  personalization = import ./personalization.nix;
+  livekitKeyFile = "/var/lib/livekit/livekit_keyFile";
+in
+
+lib.mkIf config.sovran_systemsOS.features.element-calling {
+
+  ####### LIVEKIT KEY GENERATION #######
+  systemd.tmpfiles.rules = [
+    "d /var/lib/livekit 0750 root root -"
+  ];
+
+  systemd.services.livekit-key-setup = {
+    description = "Generate LiveKit key file if missing";
+    wantedBy = [ "multi-user.target" ];
+    before = [ "livekit.service" "lk-jwt-service.service" ];
+    requires = [];
+    serviceConfig = {
+      Type = "oneshot";
+      RemainAfterExit = true;
+    };
+    path = [ pkgs.openssl ];
+    script = ''
+      if [ ! -f ${livekitKeyFile} ]; then
+        API_KEY="devkey_$(openssl rand -hex 16)"
+        API_SECRET="$(openssl rand -base64 36 | tr -d '\n')"
+        echo "$API_KEY: $API_SECRET" > ${livekitKeyFile}
+        chmod 600 ${livekitKeyFile}
+        echo "LiveKit key file generated at ${livekitKeyFile}"
+      else
+        echo "LiveKit key file already exists, skipping generation"
+      fi
+    '';
+  };
+
+  ####### ENSURE SERVICES START AFTER KEY EXISTS #######
+  systemd.services.livekit.after = [ "livekit-key-setup.service" ];
+  systemd.services.livekit.wants = [ "livekit-key-setup.service" ];
+  systemd.services.lk-jwt-service.after = [ "livekit-key-setup.service" ];
+  systemd.services.lk-jwt-service.wants = [ "livekit-key-setup.service" ];
+
+  ####### CADDY CONFIGS #######
+  services.caddy.virtualHosts = lib.mkForce {
+    "${personalization.matrix_url}" = {
+      extraConfig = ''
+        reverse_proxy /_matrix/* http://localhost:8008
+        reverse_proxy /_synapse/client/* http://localhost:8008
+        header /.well-known/matrix/* Content-Type "application/json"
+        header /.well-known/matrix/* Access-Control-Allow-Origin "*"
+        header /.well-known/matrix/* Access-Control-Allow-Methods "GET, POST, PUT, DELETE, OPTIONS"
+        header /.well-known/matrix/* Access-Control-Allow-Headers "X-Requested-With, Content-Type, Authorization"
+        respond /.well-known/matrix/client `{ "m.homeserver": {"base_url": "https://${personalization.matrix_url}" }, "org.matrix.msc4143.rtc_foci": [{ "type":"livekit", "livekit_service_url":"https://${personalization.element-calling_url}/livekit/jwt" }] }`
+      '';
+    };
+
+    "${personalization.element-calling_url}" = {
+      extraConfig = ''
+        handle /livekit/jwt/sfu/get {
+          uri strip_prefix /livekit/jwt
+          reverse_proxy [::1]:8073 {
+            header_up Host {host}
+            header_up X-Forwarded-Server {host}
+            header_up X-Real-IP {remote_host}
+            header_up X-Forwarded-For {remote_host}
+          }
+        }
+        handle {
+          reverse_proxy localhost:7880
+        }
+      '';
+    };
+  };
+
+  ####### LIVEKIT SERVICE #######
+  services.livekit = {
+    enable = true;
+    openFirewall = true;
+    keyFile = livekitKeyFile;
+    settings = {
+      rtc.use_external_ip = true;
+      rtc.udp_port = "7882-7894";
+      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";
+      };
+    };
+  };
+
+  networking.firewall.allowedTCPPorts = [ 7881 ];
+  networking.firewall.allowedUDPPortRanges = [
+    { from = 7882; to = 7894; }
+  ];
+
+  ####### JWT SERVICE #######
+  services.lk-jwt-service = {
+    enable = true;
+    port = 8073;
+    livekitUrl = "wss://${personalization.element-calling_url}";
+    keyFile = livekitKeyFile;
+  };
+
+  ####### MATRIX-SYNAPSE SETTINGS #######
+  services.matrix-synapse = {
+    settings = lib.mkForce {
+      serve_server_wellknown = true;
+      public_baseurl = "${personalization.matrix_url}";
+      experimental_features = {
+        msc3266_enabled = true;
+        msc4222_enabled = true;
+      };
+      max_event_delay_duration = "24h";
+      rc_message = { per_second = 0.5; burst_count = 30; };
+      rc_delayed_event_mgmt = { per_second = 1; burst_count = 20; };
+      push.include_content = false;
+      server_name = personalization.matrix_url;
+      url_preview_enabled = true;
+      group_unread_count_by_room = false;
+      encryption_enabled_by_default_for_room_type = "invite";
+      allow_profile_lookup_over_federation = false;
+      allow_device_name_lookup_over_federation = false;
+      url_preview_ip_range_blacklist = [
+        "10.0.0.0/8" "100.64.0.0/10" "169.254.0.0/16" "172.16.0.0/12"
+        "192.0.0.0/24" "192.0.2.0/24" "192.168.0.0/16" "192.88.99.0/24"
+        "198.18.0.0/15" "198.51.100.0/24" "2001:db8::/32" "203.0.113.0/24"
+        "224.0.0.0/4" "::1/128" "fc00::/7" "fe80::/10" "fec0::/10" "ff00::/8"
+      ];
+      url_preview_ip_ranger_whitelist = [ "127.0.0.1" ];
+      presence.enabled = true;
+      enable_registration = false;
+      registration_shared_secret = config.age.secrets.matrix_reg_secret.path;
+      listeners = [
+        {
+          port = 8008;
+          bind_addresses = [ "::1" ];
+          type = "http";
+          tls = false;
+          x_forwarded = true;
+          resources = [
+            { names = [ "client" ]; compress = true; }
+            { names = [ "federation" ]; compress = false; }
+          ];
+        }
+      ];
+    };
+  };
+}

modules/haven.nix

@@ -0,0 +1,151 @@
+{ config, pkgs, lib, ... }:
+
+let
+  personalization = import ./personalization.nix;
+  npub = config.sovran_systemsOS.nostr_npub;
+in
+
+lib.mkIf (config.sovran_systemsOS.features.haven && npub != "") {
+
+  services.haven = {
+    enable = true;
+    settings = {
+      OWNER_NPUB = npub;
+      RELAY_URL = personalization.haven_url;
+
+      RELAY_PORT = 3355;
+      RELAY_BIND_ADDRESS = "0.0.0.0";
+      DB_ENGINE = "badger";
+      LMDB_MAPSIZE = 3000000000;
+      BLOSSOM_PATH = "blossom/";
+
+      PRIVATE_RELAY_NAME = "${personalization.haven_url} private relay";
+      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;
+      PRIVATE_RELAY_ALLOW_EMPTY_FILTERS = true;
+      PRIVATE_RELAY_ALLOW_COMPLEX_FILTERS = true;
+      PRIVATE_RELAY_CONNECTION_RATE_LIMITER_TOKENS_PER_INTERVAL = 3;
+      PRIVATE_RELAY_CONNECTION_RATE_LIMITER_INTERVAL = 5;
+      PRIVATE_RELAY_CONNECTION_RATE_LIMITER_MAX_TOKENS = 9;
+
+      CHAT_RELAY_WOT_DEPTH = 3;
+      CHAT_RELAY_WOT_REFRESH_INTERVAL_HOURS = 24;
+      CHAT_RELAY_MINIMUM_FOLLOWERS = 3;
+      CHAT_RELAY_EVENT_IP_LIMITER_TOKENS_PER_INTERVAL = 50;
+      CHAT_RELAY_EVENT_IP_LIMITER_INTERVAL = 1;
+      CHAT_RELAY_EVENT_IP_LIMITER_MAX_TOKENS = 100;
+      CHAT_RELAY_ALLOW_EMPTY_FILTERS = false;
+      CHAT_RELAY_ALLOW_COMPLEX_FILTERS = false;
+      CHAT_RELAY_CONNECTION_RATE_LIMITER_TOKENS_PER_INTERVAL = 3;
+      CHAT_RELAY_CONNECTION_RATE_LIMITER_INTERVAL = 3;
+      CHAT_RELAY_CONNECTION_RATE_LIMITER_MAX_TOKENS = 9;
+
+      OUTBOX_RELAY_EVENT_IP_LIMITER_TOKENS_PER_INTERVAL = 100;
+      OUTBOX_RELAY_EVENT_IP_LIMITER_INTERVAL = 600;
+      OUTBOX_RELAY_EVENT_IP_LIMITER_MAX_TOKENS = 1000;
+      OUTBOX_RELAY_ALLOW_EMPTY_FILTERS = true;
+      OUTBOX_RELAY_ALLOW_COMPLEX_FILTERS = true;
+      OUTBOX_RELAY_CONNECTION_RATE_LIMITER_TOKENS_PER_INTERVAL = 30;
+      OUTBOX_RELAY_CONNECTION_RATE_LIMITER_INTERVAL = 10;
+      OUTBOX_RELAY_CONNECTION_RATE_LIMITER_MAX_TOKENS = 90;
+
+      INBOX_RELAY_EVENT_IP_LIMITER_TOKENS_PER_INTERVAL = 10;
+      INBOX_RELAY_EVENT_IP_LIMITER_INTERVAL = 1;
+      INBOX_RELAY_EVENT_IP_LIMITER_MAX_TOKENS = 20;
+      INBOX_RELAY_ALLOW_EMPTY_FILTERS = false;
+      INBOX_RELAY_ALLOW_COMPLEX_FILTERS = false;
+      INBOX_RELAY_CONNECTION_RATE_LIMITER_TOKENS_PER_INTERVAL = 3;
+      INBOX_RELAY_CONNECTION_RATE_LIMITER_INTERVAL = 1;
+      INBOX_RELAY_CONNECTION_RATE_LIMITER_MAX_TOKENS = 9;
+
+      WOT_FETCH_TIMEOUT_SECONDS = 60;
+      WHITELISTED_NPUBS_FILE = "/var/lib/haven/whitelisted_npubs.json";
+      BLACKLISTED_NPUBS_FILE = "";
+      HAVEN_LOG_LEVEL = "INFO";
+    };
+
+    blastrRelays = [
+      "nos.lol"
+      "relay.nostr.band"
+      "relay.snort.social"
+      "nostr.mom"
+      "relay.primal.net"
+      "no.str.cr"
+      "nostr21.com"
+      "nostrue.com"
+      "wot.nostr.party"
+      "wot.sovbit.host"
+      "wot.girino.org"
+      "relay.lexingtonbitcoin.org"
+      "zap.watch"
+      "satsage.xyz"
+      "wons.calva.dev"
+    ];
+  };
+
+  systemd.tmpfiles.rules = [
+    "d /var/lib/haven 0750 haven haven -"
+  ];
+
+  systemd.services.haven-whitelist-setup = {
+    description = "Ensure Haven whitelisted_npubs.json is valid";
+    wantedBy = [ "multi-user.target" ];
+    before = [ "haven.service" ];
+    serviceConfig = {
+      Type = "oneshot";
+      RemainAfterExit = true;
+    };
+    script = ''
+      FILE="/var/lib/haven/whitelisted_npubs.json"
+      if [ ! -s "$FILE" ] || ! ${pkgs.jq}/bin/jq empty "$FILE" 2>/dev/null; then
+        echo '[]' > "$FILE"
+        chown haven:haven "$FILE"
+        chmod 770 "$FILE"
+        echo "Wrote valid empty JSON array to $FILE"
+      else
+        echo "$FILE already contains valid JSON, skipping"
+      fi
+    '';
+  };
+
+  systemd.services.haven.after = [ "haven-whitelist-setup.service" ];
+  systemd.services.haven.wants = [ "haven-whitelist-setup.service" ];
+
+  services.caddy.virtualHosts = {
+    "${personalization.haven_url}" = {
+      extraConfig = ''
+        reverse_proxy localhost:3355 {
+          header_up Host {host}
+          header_up X-Real-IP {remote_host}
+          header_up X-Forwarded-For {remote_host}
+          header_up X-Forwarded-Proto {scheme}
+          transport http {
+            versions 1.1
+          }
+        }
+        request_body {
+          max_size 100MB
+        }
+      '';
+    };
+  };
+}

modules/mempool.nix

@@ -0,0 +1,25 @@
+{ config, pkgs, lib, ... }:
+
+lib.mkIf config.sovran_systemsOS.features.mempool {
+
+  services.mempool = {
+      enable = true;
+      frontend.enable = true;
+  };
+
+  services.mysql.package = lib.mkForce pkgs.mariadb;
+
+  nix-bitcoin.onionServices.mempool-frontend.enable = true;
+
+  services.caddy = {
+      virtualHosts = {
+          ":60847" = {
+              extraConfig = ''
+                  reverse_proxy :60845
+                  encode gzip zstd
+              '';
+          };
+      };
+  };
+
+}

modules/modules.nix

@@ -1,15 +1,26 @@
 { config, pkgs, lib, ... }:
 
 {
+ 
+  imports = [
+    
+    ./core/roles.nix
+    ./core/role-logic.nix
+    ./php.nix
+    ./Sovran_SystemsOS_File_Fixes_And_New_Services.nix
 
-	imports = [	
+    # Always imported feature modules
-		./configuration.nix
+    ./synapse.nix
-		./synapse.nix
+    ./coturn.nix
-		./coturn.nix
+    ./bitcoinecosystem.nix
-		./bitcoinecosystem.nix
+    ./vaultwarden.nix
-		./vaultwarden.nix
+    ./haven.nix
-		./onlyoffice.nix
+    ./bip110.nix
-		./Sovran_SystemsOS_File_Fixes_And_New_Services.nix
+    ./element-calling.nix
-		/etc/nixos/hardware-configuration.nix
+    ./mempool.nix
-		];
+    ./bitcoin-core.nix
-}
+    ./rdp.nix
+
+  ];
+
+}

modules/onlyoffice.nix

@@ -1,17 +0,0 @@
-{config, pkgs, lib, ...}:
-
-let
-	personalization = import ./personalization.nix;
-	in
-{
-	
-	services.onlyoffice = {
-		enable = true;
-		jwtSecretFile = "${personalization.onlyofficejwtSecretFile}";
-	};	
-
-	services.nginx.defaultSSLListenPort = 9443;
-	services.nginx.defaultHTTPListenPort = 9080;
-
-}
-

modules/personalization.nix

@@ -4,25 +4,21 @@ 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_zerossl = builtins.readFile /var/lib/domains/sslemail;
+caddy_email_for_acme = builtins.readFile /var/lib/domains/sslemail;
 vaultwarden_url = builtins.readFile /var/lib/domains/vaultwarden;
-onlyoffice_url = builtins.readFile /var/lib/domains/onlyoffice;
+haven_url = builtins.readFile /var/lib/domains/haven;
-
+element-calling_url = builtins.readFile /var/lib/domains/element-calling;
-##
-
-age.identityPaths = [ "/root/.ssh/agenix/agenix-secret-keys" ];
-
-##
-
-age.secrets.turn.file = /var/lib/agenix-secrets/turn.age;
-age.secrets.matrix_reg_secret.file = /var/lib/agenix-secrets/matrix_reg_secret.age;
-age.secrets.matrixdb.file = /var/lib/agenix-secrets/matrixdb.age;
-age.secrets.nextclouddb.file = /var/lib/agenix-secrets/nextclouddb.age;
-age.secrets.wordpressdb.file = /var/lib/agenix-secrets/wordpressdb.age;
 
 ##
 
 external_ip_secret = builtins.readFile /var/lib/secrets/external_ip;
-onlyofficejwtSecretFile = /var/lib/secrets/onlyofficejwtSecretFile;
+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;
+
 
 }

modules/php.nix

@@ -0,0 +1,66 @@
+{ config, pkgs, lib, ... }:
+
+
+let
+
+	custom-php = pkgs.php83.buildEnv {
+		extensions = { enabled, all }: enabled ++ (with all; [ bz2 apcu redis imagick memcached ]);
+		extraConfig = ''
+			
+			display_errors = On
+			display_startup_errors = On
+			max_execution_time = 10000
+			max_input_time = 3000
+			memory_limit = 1G;
+			opcache.enable=1;
+			opcache.memory_consumption=512;
+			opcache_revalidate_freq = 240;
+			opcache.max_accelerated_files=20000;
+			post_max_size = 3G
+			upload_max_filesize = 3G
+			apc.enable_cli=1
+			opcache.interned_strings_buffer = 192
+			redis.session.locking_enabled=1
+			redis.session.lock_retries=-1
+			redis.session.lock_wait_time=10000
+			
+		'';
+	};
+in
+
+{	
+	users.users = {
+
+		php = {
+			isSystemUser = true;
+			createHome = false;
+			uid = 7777;
+		};
+	};
+
+	users.users.php.group = "php";
+	
+	users.groups.php = {};
+
+	environment.systemPackages = with pkgs; [
+		
+		custom-php
+	];
+
+	services.phpfpm.pools = {
+		mypool = {
+			user = "caddy";
+			group = "php";
+			phpPackage = custom-php;
+			settings = {
+				"pm" = "dynamic";
+				"pm.max_children" = 75;
+				"pm.start_servers" = 10;
+				"pm.min_spare_servers" = 5;
+				"pm.max_spare_servers" = 20;
+				"pm.max_requests" = 500;
+				"clear_env" = "no";
+			};
+		};			
+	};
+}

modules/rdp.nix

@@ -0,0 +1,107 @@
+{ config, pkgs, lib, ... }:
+
+lib.mkIf config.sovran_systemsOS.features.rdp {
+
+  services.gnome.gnome-remote-desktop.enable = true;
+
+  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 -"
+    "d /var/lib/gnome-remote-desktop/.local/share 0750 gnome-remote-desktop gnome-remote-desktop -"
+    "d /var/lib/gnome-remote-desktop/.local/share/gnome-remote-desktop 0750 gnome-remote-desktop gnome-remote-desktop -"
+  ];
+
+  systemd.services.gnome-remote-desktop-setup = {
+    description = "Configure GNOME Remote Desktop RDP";
+    wantedBy = [ "multi-user.target" ];
+    before = [ "gnome-remote-desktop.service" ];
+    after = [ "systemd-tmpfiles-setup.service" "network-online.target" ];
+    wants = [ "network-online.target" ];
+    serviceConfig = {
+      Type = "oneshot";
+      RemainAfterExit = true;
+    };
+    path = [
+      pkgs.gnome-remote-desktop
+      pkgs.polkit
+      pkgs.openssl
+      pkgs.hostname
+      pkgs.gawk
+    ];
+    script = ''
+      # Ensure directory structure exists
+      mkdir -p /var/lib/gnome-remote-desktop/.local/share/gnome-remote-desktop
+      chown -R gnome-remote-desktop:gnome-remote-desktop /var/lib/gnome-remote-desktop
+
+      TLS_DIR="/var/lib/gnome-remote-desktop/tls"
+      CRED_FILE="/var/lib/gnome-remote-desktop/rdp-credentials"
+
+      # Generate TLS certificate if it doesn't exist
+      if [ ! -f "$TLS_DIR/rdp-tls.crt" ]; then
+        mkdir -p "$TLS_DIR"
+        openssl req -x509 -newkey ec -pkeyopt ec_paramgen_curve:prime256v1 \
+          -sha256 -nodes -days 3650 \
+          -keyout "$TLS_DIR/rdp-tls.key" \
+          -out "$TLS_DIR/rdp-tls.crt" \
+          -subj "/CN=gnome-remote-desktop"
+        chown -R gnome-remote-desktop:gnome-remote-desktop "$TLS_DIR"
+        chmod 600 "$TLS_DIR/rdp-tls.key"
+        chmod 644 "$TLS_DIR/rdp-tls.crt"
+        echo "Generated RDP TLS certificate"
+      fi
+
+      # Configure TLS certificate
+      grdctl --system rdp set-tls-cert "$TLS_DIR/rdp-tls.crt"
+      grdctl --system rdp set-tls-key "$TLS_DIR/rdp-tls.key"
+
+      # Generate password on first boot only
+      PASSWORD=""
+      if [ ! -f /var/lib/gnome-remote-desktop/rdp-password ]; then
+        PASSWORD=$(openssl rand -base64 16)
+        echo "$PASSWORD" > /var/lib/gnome-remote-desktop/rdp-password
+        chmod 600 /var/lib/gnome-remote-desktop/rdp-password
+      else
+        PASSWORD=$(cat /var/lib/gnome-remote-desktop/rdp-password)
+      fi
+
+      # Get current IP address
+      LOCAL_IP=$(hostname -I | awk '{print $1}')
+
+      # Always rewrite the credentials file with the current IP
+      cat > "$CRED_FILE" <<EOF
+      ========================================
+       GNOME Remote Desktop (RDP) Credentials
+      ========================================
+
+       Username: sovran
+       Password: $PASSWORD
+
+       Connect from any RDP client to:
+         $LOCAL_IP:3389
+
+      ========================================
+      EOF
+
+      chmod 600 "$CRED_FILE"
+
+      # Enable RDP backend and set credentials
+      grdctl --system rdp enable
+      grdctl --system rdp set-credentials sovran "$PASSWORD"
+
+      echo "GNOME Remote Desktop RDP configured successfully"
+    '';
+  };
+}

modules/synapse.nix

@@ -10,11 +10,11 @@
 let
 	personalization = import ./personalization.nix;
 in
-{
+lib.mkIf config.sovran_systemsOS.features.synapse {
 	services.matrix-synapse = {
 		enable = true;
 		settings = {
-			include_content = false;
+			push.include_content = false;
 			group_unread_count_by_room = false;
 			encryption_enabled_by_default_for_room_type = "invite";
 			allow_profile_lookup_over_federation = false;
@@ -43,16 +43,14 @@ in
 				"ff00::/8"
 				];
 		 	url_preview_ip_ranger_whitelist = [ "127.0.0.1" ];
-		 	turn_shared_secret = "${personalization.age.secrets.turn.file}";
+		 	turn_shared_secret = "${personalization.coturn_static_auth_secret}";
-    		turn_uris = [
+    			turn_uris = [
-      			"turn:${personalization.matrix_url}:5349?transport=udp"
+      				"turn:${personalization.matrix_url}:5349?transport=udp"
-      			"turn:${personalization.matrix_url}:5349?transport=tcp"
+      				"turn:${personalization.matrix_url}:5349?transport=tcp"
-      			"turns:${personalization.matrix_url}:5349?transport=udp"
+			];
-      			"turns:${personalization.matrix_url}:5349?transport=tcp"
-          	];
 			presence.enabled = true;
 			enable_registration = false;
-			registration_shared_secret = "${personalization.age.secrets.matrix_reg_secret.file}";
+			registration_shared_secret = config.age.secrets.matrix_reg_secret.path;
 			listeners = [
 				{
 					port = 8008;

modules/vaultwarden.nix

@@ -3,7 +3,8 @@
 let
 	personalization = import ./personalization.nix;
 in
-{
+
+lib.mkIf config.sovran_systemsOS.features.vaultwarden {
 
 	services.vaultwarden = {
 		enable = true;
@@ -18,4 +19,4 @@ in
 		dbBackend = "sqlite";
 		environmentFile = "/var/lib/secrets/vaultwarden/vaultwarden.env";
 	};
-}
+}