Merge pull request #23 from naturallaw777/copilot/fix-icon-display-issue

[WIP] Fix icon display issue due to mount order conflict

.gitignore

@@ -0,0 +1,4 @@
+__pycache__/
+*.pyc
+*.pyo
+

.gitignore.txt

@@ -0,0 +1,8 @@
+custom.nix
+role-state.nix
+*.iso
+*.zip
+*.pma
+__pycache__/
+*.pyc
+*.pyo

LICENSE

@@ -1,232 +1,661 @@
-GNU GENERAL PUBLIC LICENSE
-Version 3, 29 June 2007
-
-Copyright © 2007 Free Software Foundation, Inc. <http://fsf.org/>
-
-Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed.
-
-Preamble
-
-The GNU General Public License is a free, copyleft license for software and other kinds of works.
-
-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.
-
-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.
-
-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.
-
-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.
-
-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.
-
-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.
-
-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.
-
-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.
-
-The precise terms and conditions for copying, distribution and modification follow.
-
-TERMS AND CONDITIONS
-
-0. Definitions.
-
-“This License” refers to version 3 of the GNU General Public License.
-
-“Copyright” also means copyright-like laws that apply to other kinds of works, such as semiconductor masks.
-
-“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.
-
-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.
-
-A “covered work” means either the unmodified Program or a work based on the Program.
-
-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 “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.
-
-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.
-
-1. Source Code.
-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.
-
-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.
-
-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 “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.
-
-The Corresponding Source need not include anything that users can regenerate automatically from other parts of the Corresponding Source.
-
-The Corresponding Source for a work in source code form is that same work.
-
-2. Basic Permissions.
-All rights granted under this License are granted for the term of copyright on the Program, and are irrevocable provided the stated conditions are met. This License explicitly affirms your unlimited permission to run the unmodified Program. The output from running a covered work is covered by this License only if the output, given its content, constitutes a covered work. This License acknowledges your rights of fair use or other equivalent, as provided by copyright law.
-
-You may make, run and propagate covered works that you do not convey, without conditions so long as your license otherwise remains in force. You may convey covered works to others for the sole purpose of having them make modifications exclusively for you, or provide you with facilities for running those works, provided that you comply with the terms of this License in conveying all material for which you do not control copyright. Those thus making or running the covered works for you must do so exclusively on your behalf, under your direction and control, on terms that prohibit them from making any copies of your copyrighted material outside their relationship with you.
-
-Conveying under any other circumstances is permitted solely under the conditions stated below. Sublicensing is not allowed; section 10 makes it unnecessary.
-
-3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-No covered work shall be deemed part of an effective technological measure under any applicable law fulfilling obligations under article 11 of the WIPO copyright treaty adopted on 20 December 1996, or similar laws prohibiting or restricting circumvention of such measures.
-
-When you convey a covered work, you waive any legal power to forbid circumvention of technological measures to the extent such circumvention is effected by exercising rights under this License with respect to the covered work, and you disclaim any intention to limit operation or modification of the work as a means of enforcing, against the work's users, your or third parties' legal rights to forbid circumvention of technological measures.
-
-4. Conveying Verbatim Copies.
-You may convey verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice; keep intact all notices stating that this License and any non-permissive terms added in accord with section 7 apply to the code; keep intact all notices of the absence of any warranty; and give all recipients a copy of this License along with the Program.
-
-You may charge any price or no price for each copy that you convey, and you may offer support or warranty protection for a fee.
-
-5. Conveying Modified Source Versions.
-You may convey a work based on the Program, or the modifications to produce it from the Program, in the form of source code under the terms of section 4, provided that you also meet all of these conditions:
-
-     a) The work must carry prominent notices stating that you modified it, and giving a relevant date.
-
-     b) The work must carry prominent notices stating that it is released under this License and any conditions added under section 7. This requirement modifies the requirement in section 4 to “keep intact all notices”.
-
-     c) You must license the entire work, as a whole, under this License to anyone who comes into possession of a copy. This License will therefore apply, along with any applicable section 7 additional terms, to the whole of the work, and all its parts, regardless of how they are packaged. This License gives no permission to license the work in any other way, but it does not invalidate such permission if you have separately received it.
-
-     d) If the work has interactive user interfaces, each must display Appropriate Legal Notices; however, if the Program has interactive interfaces that do not display Appropriate Legal Notices, your work need not make them do so.
-
-A compilation of a covered work with other separate and independent works, which are not by their nature extensions of the covered work, and which are not combined with it such as to form a larger program, in or on a volume of a storage or distribution medium, is called an “aggregate” if the compilation and its resulting copyright are not used to limit the access or legal rights of the compilation's users beyond what the individual works permit. Inclusion of a covered work in an aggregate does not cause this License to apply to the other parts of the aggregate.
-
-6. Conveying Non-Source Forms.
-You may convey a covered work in object code form under the terms of sections 4 and 5, provided that you also convey the machine-readable Corresponding Source under the terms of this License, in one of these ways:
-
-     a) Convey the object code in, or embodied in, a physical product (including a physical distribution medium), accompanied by the Corresponding Source fixed on a durable physical medium customarily used for software interchange.
-
-     b) Convey the object code in, or embodied in, a physical product (including a physical distribution medium), accompanied by a written offer, valid for at least three years and valid for as long as you offer spare parts or customer support for that product model, to give anyone who possesses the object code either (1) a copy of the Corresponding Source for all the software in the product that is covered by this License, on a durable physical medium customarily used for software interchange, for a price no more than your reasonable cost of physically performing this conveying of source, or (2) access to copy the Corresponding Source from a network server at no charge.
-
-     c) Convey individual copies of the object code with a copy of the written offer to provide the Corresponding Source. This alternative is allowed only occasionally and noncommercially, and only if you received the object code with such an offer, in accord with subsection 6b.
-
-     d) Convey the object code by offering access from a designated place (gratis or for a charge), and offer equivalent access to the Corresponding Source in the same way through the same place at no further charge. You need not require recipients to copy the Corresponding Source along with the object code. If the place to copy the object code is a network server, the Corresponding Source may be on a different server (operated by you or a third party) that supports equivalent copying facilities, provided you maintain clear directions next to the object code saying where to find the Corresponding Source. Regardless of what server hosts the Corresponding Source, you remain obligated to ensure that it is available for as long as needed to satisfy these requirements.
-
-     e) Convey the object code using peer-to-peer transmission, provided you inform other peers where the object code and Corresponding Source of the work are being offered to the general public at no charge under subsection 6d.
-
-A separable portion of the object code, whose source code is excluded from the Corresponding Source as a System Library, need not be included in conveying the object code work.
-
-A “User Product” is either (1) a “consumer product”, which means any tangible personal property which is normally used for personal, family, or household purposes, or (2) anything designed or sold for incorporation into a dwelling. In determining whether a product is a consumer product, doubtful cases shall be resolved in favor of coverage. For a particular product received by a particular user, “normally used” refers to a typical or common use of that class of product, regardless of the status of the particular user or of the way in which the particular user actually uses, or expects or is expected to use, the product. A product is a consumer product regardless of whether the product has substantial commercial, industrial or non-consumer uses, unless such uses represent the only significant mode of use of the product.
-
-“Installation Information” for a User Product means any methods, procedures, authorization keys, or other information required to install and execute modified versions of a covered work in that User Product from a modified version of its Corresponding Source. The information must suffice to ensure that the continued functioning of the modified object code is in no case prevented or interfered with solely because modification has been made.
-
-If you convey an object code work under this section in, or with, or specifically for use in, a User Product, and the conveying occurs as part of a transaction in which the right of possession and use of the User Product is transferred to the recipient in perpetuity or for a fixed term (regardless of how the transaction is characterized), the Corresponding Source conveyed under this section must be accompanied by the Installation Information. But this requirement does not apply if neither you nor any third party retains the ability to install modified object code on the User Product (for example, the work has been installed in ROM).
-
-The requirement to provide Installation Information does not include a requirement to continue to provide support service, warranty, or updates for a work that has been modified or installed by the recipient, or for the User Product in which it has been modified or installed. Access to a network may be denied when the modification itself materially and adversely affects the operation of the network or violates the rules and protocols for communication across the network.
-
-Corresponding Source conveyed, and Installation Information provided, in accord with this section must be in a format that is publicly documented (and with an implementation available to the public in source code form), and must require no special password or key for unpacking, reading or copying.
-
-7. Additional Terms.
-“Additional permissions” are terms that supplement the terms of this License by making exceptions from one or more of its conditions. Additional permissions that are applicable to the entire Program shall be treated as though they were included in this License, to the extent that they are valid under applicable law. If additional permissions apply only to part of the Program, that part may be used separately under those permissions, but the entire Program remains governed by this License without regard to the additional permissions.
-
-When you convey a copy of a covered work, you may at your option remove any additional permissions from that copy, or from any part of it. (Additional permissions may be written to require their own removal in certain cases when you modify the work.) You may place additional permissions on material, added by you to a covered work, for which you have or can give appropriate copyright permission.
-
-Notwithstanding any other provision of this License, for material you add to a covered work, you may (if authorized by the copyright holders of that material) supplement the terms of this License with terms:
-
-     a) Disclaiming warranty or limiting liability differently from the terms of sections 15 and 16 of this License; or
-
-     b) Requiring preservation of specified reasonable legal notices or author attributions in that material or in the Appropriate Legal Notices displayed by works containing it; or
-
-     c) Prohibiting misrepresentation of the origin of that material, or requiring that modified versions of such material be marked in reasonable ways as different from the original version; or
-
-     d) Limiting the use for publicity purposes of names of licensors or authors of the material; or
-
-     e) Declining to grant rights under trademark law for use of some trade names, trademarks, or service marks; or
-
-     f) Requiring indemnification of licensors and authors of that material by anyone who conveys the material (or modified versions of it) with contractual assumptions of liability to the recipient, for any liability that these contractual assumptions directly impose on those licensors and authors.
-
-All other non-permissive additional terms are considered “further restrictions” within the meaning of section 10. If the Program as you received it, or any part of it, contains a notice stating that it is governed by this License along with a term that is a further restriction, you may remove that term. If a license document contains a further restriction but permits relicensing or conveying under this License, you may add to a covered work material governed by the terms of that license document, provided that the further restriction does not survive such relicensing or conveying.
-
-If you add terms to a covered work in accord with this section, you must place, in the relevant source files, a statement of the additional terms that apply to those files, or a notice indicating where to find the applicable terms.
-
-Additional terms, permissive or non-permissive, may be stated in the form of a separately written license, or stated as exceptions; the above requirements apply either way.
-
-8. Termination.
-You may not propagate or modify a covered work except as expressly provided under this License. Any attempt otherwise to propagate or modify it is void, and will automatically terminate your rights under this License (including any patent licenses granted under the third paragraph of section 11).
-
-However, if you cease all violation of this License, then your license from a particular copyright holder is reinstated (a) provisionally, unless and until the copyright holder explicitly and finally terminates your license, and (b) permanently, if the copyright holder fails to notify you of the violation by some reasonable means prior to 60 days after the cessation.
-
-Moreover, your license from a particular copyright holder is reinstated permanently if the copyright holder notifies you of the violation by some reasonable means, this is the first time you have received notice of violation of this License (for any work) from that copyright holder, and you cure the violation prior to 30 days after your receipt of the notice.
-
-Termination of your rights under this section does not terminate the licenses of parties who have received copies or rights from you under this License. If your rights have been terminated and not permanently reinstated, you do not qualify to receive new licenses for the same material under section 10.
-
-9. Acceptance Not Required for Having Copies.
-You are not required to accept this License in order to receive or run a copy of the Program. Ancillary propagation of a covered work occurring solely as a consequence of using peer-to-peer transmission to receive a copy likewise does not require acceptance. However, nothing other than this License grants you permission to propagate or modify any covered work. These actions infringe copyright if you do not accept this License. Therefore, by modifying or propagating a covered work, you indicate your acceptance of this License to do so.
-
-10. Automatic Licensing of Downstream Recipients.
-Each time you convey a covered work, the recipient automatically receives a license from the original licensors, to run, modify and propagate that work, subject to this License. You are not responsible for enforcing compliance by third parties with this License.
-
-An “entity transaction” is a transaction transferring control of an organization, or substantially all assets of one, or subdividing an organization, or merging organizations. If propagation of a covered work results from an entity transaction, each party to that transaction who receives a copy of the work also receives whatever licenses to the work the party's predecessor in interest had or could give under the previous paragraph, plus a right to possession of the Corresponding Source of the work from the predecessor in interest, if the predecessor has it or can get it with reasonable efforts.
-
-You may not impose any further restrictions on the exercise of the rights granted or affirmed under this License. For example, you may not impose a license fee, royalty, or other charge for exercise of rights granted under this License, and you may not initiate litigation (including a cross-claim or counterclaim in a lawsuit) alleging that any patent claim is infringed by making, using, selling, offering for sale, or importing the Program or any portion of it.
-
-11. Patents.
-A “contributor” is a copyright holder who authorizes use under this License of the Program or a work on which the Program is based. The work thus licensed is called the contributor's “contributor version”.
-
-A contributor's “essential patent claims” are all patent claims owned or controlled by the contributor, whether already acquired or hereafter acquired, that would be infringed by some manner, permitted by this License, of making, using, or selling its contributor version, but do not include claims that would be infringed only as a consequence of further modification of the contributor version. For purposes of this definition, “control” includes the right to grant patent sublicenses in a manner consistent with the requirements of this License.
-
-Each contributor grants you a non-exclusive, worldwide, royalty-free patent license under the contributor's essential patent claims, to make, use, sell, offer for sale, import and otherwise run, modify and propagate the contents of its contributor version.
-
-In the following three paragraphs, a “patent license” is any express agreement or commitment, however denominated, not to enforce a patent (such as an express permission to practice a patent or covenant not to sue for patent infringement). To “grant” such a patent license to a party means to make such an agreement or commitment not to enforce a patent against the party.
-
-If you convey a covered work, knowingly relying on a patent license, and the Corresponding Source of the work is not available for anyone to copy, free of charge and under the terms of this License, through a publicly available network server or other readily accessible means, then you must either (1) cause the Corresponding Source to be so available, or (2) arrange to deprive yourself of the benefit of the patent license for this particular work, or (3) arrange, in a manner consistent with the requirements of this License, to extend the patent license to downstream recipients. “Knowingly relying” means you have actual knowledge that, but for the patent license, your conveying the covered work in a country, or your recipient's use of the covered work in a country, would infringe one or more identifiable patents in that country that you have reason to believe are valid.
-
-If, pursuant to or in connection with a single transaction or arrangement, you convey, or propagate by procuring conveyance of, a covered work, and grant a patent license to some of the parties receiving the covered work authorizing them to use, propagate, modify or convey a specific copy of the covered work, then the patent license you grant is automatically extended to all recipients of the covered work and works based on it.
-
-A patent license is “discriminatory” if it does not include within the scope of its coverage, prohibits the exercise of, or is conditioned on the non-exercise of one or more of the rights that are specifically granted under this License. You may not convey a covered work if you are a party to an arrangement with a third party that is in the business of distributing software, under which you make payment to the third party based on the extent of your activity of conveying the work, and under which the third party grants, to any of the parties who would receive the covered work from you, a discriminatory patent license (a) in connection with copies of the covered work conveyed by you (or copies made from those copies), or (b) primarily for and in connection with specific products or compilations that contain the covered work, unless you entered into that arrangement, or that patent license was granted, prior to 28 March 2007.
-
-Nothing in this License shall be construed as excluding or limiting any implied license or other defenses to infringement that may otherwise be available to you under applicable patent law.
-
-12. No Surrender of Others' Freedom.
-If conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot convey a covered work so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not convey it at all. For example, if you agree to terms that obligate you to collect a royalty for further conveying from those to whom you convey the Program, the only way you could satisfy both those terms and this License would be to refrain entirely from conveying the Program.
-
-13. 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.
-
-14. Revised Versions of this License.
-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.
-
-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.
-
-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.
-
-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 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 General Public License for more details.
-
-     You should have received a copy of the GNU General Public License along with this program.  If not, see <http://www.gnu.org/licenses/>.
+                    GNU AFFERO GENERAL PUBLIC LICENSE
+                       Version 3, 19 November 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU Affero General Public License is a free, copyleft license for
+software and other kinds of works, specifically designed to ensure
+cooperation with the community in the case of network server software.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+our General Public Licenses are intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.
+
+  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.
+
+  Developers that use our General Public Licenses protect your rights
+with two steps: (1) assert copyright on the software, and (2) offer
+you this License which gives you legal permission to copy, distribute
+and/or modify the software.
+
+  A secondary benefit of defending all users' freedom is that
+improvements made in alternate versions of the program, if they
+receive widespread use, become available for other developers to
+incorporate.  Many developers of free software are heartened and
+encouraged by the resulting cooperation.  However, in the case of
+software used on network servers, this result may fail to come about.
+The GNU General Public License permits making a modified version and
+letting the public access it on a server without ever releasing its
+source code to the public.
+
+  The GNU Affero General Public License is designed specifically to
+ensure that, in such cases, the modified source code becomes available
+to the community.  It requires the operator of a network server to
+provide the source code of the modified version running there to the
+users of that server.  Therefore, public use of a modified version, on
+a publicly accessible server, gives the public access to the source
+code of the modified version.
+
+  An older license, called the Affero General Public License and
+published by Affero, was designed to accomplish similar goals.  This is
+a different license, not a version of the Affero GPL, but Affero has
+released a new version of the Affero GPL which permits relicensing under
+this license.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU Affero General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "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.
+
+  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.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  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 "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.
+
+  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.
+
+  1. Source Code.
+
+  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.
+
+  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.
+
+  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 "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.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Remote Network Interaction; Use with the GNU General Public License.
+
+  Notwithstanding any other provision of this License, if you modify the
+Program, your modified version must prominently offer all users
+interacting with it remotely through a computer network (if your version
+supports such interaction) an opportunity to receive the Corresponding
+Source of your version by providing access to the Corresponding Source
+from a network server at no charge, through some standard or customary
+means of facilitating copying of software.  This Corresponding Source
+shall include the Corresponding Source for any work covered by version 3
+of the GNU General Public License that is incorporated pursuant to the
+following paragraph.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the work with which it is combined will remain governed by version
+3 of the GNU General Public License.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU Affero General Public License from time to time.  Such new versions
+will be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU Affero General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU Affero General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU Affero General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            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>
-     This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-     This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details.
-
-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>.
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU AGPL, see
+<https://www.gnu.org/licenses/>.

README.md

@@ -1,30 +0,0 @@
-<br />
-<br />
-
-<center><img src="sovran_systems.png" alt="drawing" width="500"/></center>
-
-<br />
-<br />
-<br />
-
-# Complete Configuration for Sovran_SystemsOS and the Sovran Pro
-
-A Nix Flake Implementation
-
-Thanks to all the NixOS creators and developers for creating what is the future of computing. 
-
-https://www.sovransystems.com
-
-Connect on Matrix here: https://matrix.to/#/#sovran-systems:anarchyislove.xyz
-
-###
-
-## All Is Love. Fear Is Illusion. All Beings Are Free. Truth Can Never Be Destroyed.
-
-Created, Handcrafted, and Headquartered in Southern California – 2022-2023 🏖️.
-
-All Open Source Software Used Falls Under Its Specific Open Source License.
-
-This Gitea is Proudly Powered by a Sovran Pro 💚.
-
-GNU GPL 3.0+

app/icons/bip110.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64"><circle cx="32" cy="32" r="30" fill="#1E3A5F"/><text x="32" y="28" font-family="sans-serif" font-size="12" font-weight="bold" fill="#F7931A" text-anchor="middle">BIP</text><text x="32" y="46" font-family="sans-serif" font-size="18" font-weight="bold" fill="white" text-anchor="middle">110</text></svg>

app/icons/bitcoin-core.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64"><circle cx="32" cy="32" r="30" fill="#F7931A"/><circle cx="32" cy="32" r="22" fill="none" stroke="white" stroke-width="2"/><text x="32" y="44" font-family="sans-serif" font-size="30" font-weight="bold" fill="white" text-anchor="middle">₿</text></svg>

app/icons/bitcoind.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64"><circle cx="32" cy="32" r="30" fill="#F7931A"/><text x="32" y="44" font-family="sans-serif" font-size="36" font-weight="bold" fill="white" text-anchor="middle">₿</text></svg>

app/icons/btcpayserver.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64"><circle cx="32" cy="32" r="30" fill="#51B13E"/><text x="32" y="44" font-family="sans-serif" font-size="28" font-weight="bold" fill="white" text-anchor="middle">PAY</text></svg>

app/icons/caddy.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64"><circle cx="32" cy="32" r="30" fill="#1F2937"/><path d="M20 18h24v6H20z M20 28h24v6H20z M20 38h24v6H20z" fill="#22D3EE"/><circle cx="42" cy="21" r="2" fill="#4ADE80"/><circle cx="42" cy="31" r="2" fill="#4ADE80"/><circle cx="42" cy="41" r="2" fill="#FBBF24"/></svg>

app/icons/electrs.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64"><circle cx="32" cy="32" r="30" fill="#3B82F6"/><text x="32" y="44" font-family="sans-serif" font-size="36" fill="white" text-anchor="middle">⚡</text></svg>

app/icons/haven.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64"><circle cx="32" cy="32" r="30" fill="#8B5CF6"/><text x="32" y="44" font-family="sans-serif" font-size="28" font-weight="bold" fill="white" text-anchor="middle">N</text></svg>

app/icons/livekit.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64"><circle cx="32" cy="32" r="30" fill="#0DBD8B"/><text x="32" y="44" font-family="sans-serif" font-size="28" fill="white" text-anchor="middle">EC</text></svg>

app/icons/lnd.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64"><circle cx="32" cy="32" r="30" fill="#7B3FE4"/><polygon points="36,8 20,36 30,36 28,56 44,28 34,28" fill="white"/></svg>

app/icons/mempool.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64"><circle cx="32" cy="32" r="30" fill="#2D3348"/><rect x="14" y="38" width="8" height="12" rx="1" fill="#5E35B1"/><rect x="24" y="30" width="8" height="20" rx="1" fill="#7C4DFF"/><rect x="34" y="22" width="8" height="28" rx="1" fill="#B388FF"/><rect x="44" y="14" width="8" height="36" rx="1" fill="#E1BEE7"/></svg>

app/icons/nextcloud.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64"><circle cx="32" cy="32" r="30" fill="#0082C9"/><ellipse cx="32" cy="34" rx="18" ry="12" fill="white" opacity="0.9"/><ellipse cx="22" cy="36" rx="10" ry="8" fill="white"/><ellipse cx="42" cy="36" rx="10" ry="8" fill="white"/></svg>

app/icons/rdp.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64"><rect x="6" y="12" width="52" height="34" rx="4" fill="#3584E4" stroke="#fff" stroke-width="2"/><rect x="12" y="18" width="40" height="22" rx="2" fill="#1A1A2E"/><rect x="26" y="46" width="12" height="4" rx="1" fill="#aaa"/><rect x="20" y="50" width="24" height="3" rx="1.5" fill="#888"/></svg>

app/icons/rtl.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64"><circle cx="32" cy="32" r="30" fill="#16A34A"/><text x="32" y="43" font-family="sans-serif" font-size="32" font-weight="bold" fill="white" text-anchor="middle">RTL</text></svg>

app/icons/support.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64"><circle cx="32" cy="32" r="30" fill="#374151"/><path d="M32 14C22.06 14 14 22.06 14 32c0 5.25 2.27 9.97 5.88 13.24V50a2 2 0 0 0 2 2h20a2 2 0 0 0 2-2v-4.76A17.94 17.94 0 0 0 50 32c0-9.94-8.06-18-18-18zm-7 22a4 4 0 0 1 0-8v8zm14 0v-8a4 4 0 0 1 0 8z" fill="#cdd6f4"/></svg>

app/icons/synapse.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64"><circle cx="32" cy="32" r="30" fill="#0DBD8B"/><text x="32" y="44" font-family="sans-serif" font-size="30" font-weight="bold" fill="white" text-anchor="middle">[M]</text></svg>

app/icons/system.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64"><circle cx="32" cy="32" r="30" fill="#374151"/><path d="M32 20a12 12 0 1 0 0 24 12 12 0 0 0 0-24zm0 18a6 6 0 1 1 0-12 6 6 0 0 1 0 12z" fill="#cdd6f4"/><path d="M30 12h4v6h-4zm0 34h4v6h-4zm-18-16v-4h6v4zm34 0v-4h6v4zm-28.97-13.97 2.83-2.83 4.24 4.24-2.83 2.83zm18.38 18.38 2.83-2.83 4.24 4.24-2.83 2.83zm-24.08 1.41 2.83 2.83 4.24-4.24-2.83-2.83zm18.38-18.38 2.83 2.83 4.24-4.24-2.83-2.83z" fill="#cdd6f4"/></svg>

app/icons/tor.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64"><circle cx="32" cy="32" r="30" fill="#7D4698"/><text x="32" y="44" font-family="sans-serif" font-size="30" font-weight="bold" fill="white" text-anchor="middle">TOR</text></svg>

app/icons/vaultwarden.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64"><circle cx="32" cy="32" r="30" fill="#175DDC"/><path d="M32 10 L48 20 L48 36 C48 48 32 54 32 54 C32 54 16 48 16 36 L16 20 Z" fill="white" opacity="0.9"/><text x="32" y="40" font-family="sans-serif" font-size="18" font-weight="bold" fill="#175DDC" text-anchor="middle">VW</text></svg>

app/icons/wordpress.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64"><circle cx="32" cy="32" r="30" fill="#21759B"/><text x="32" y="44" font-family="serif" font-size="38" font-weight="bold" fill="white" text-anchor="middle">W</text></svg>

app/icons/zeus.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64"><circle cx="32" cy="32" r="30" fill="#374151"/><polygon points="36,10 22,34 30,34 28,54 42,30 34,30" fill="#cdd6f4"/></svg>

app/sovran_systemsos_web/config.py

@@ -0,0 +1,20 @@
+"""Load the Nix-generated config for Sovran_SystemsOS_Hub."""
+
+import json
+import os
+
+
+def load_config() -> dict:
+    """Read config from the path injected by the Nix derivation."""
+    path = os.environ.get(
+        "SOVRAN_HUB_CONFIG",
+        os.path.join(
+            os.path.dirname(os.path.dirname(os.path.abspath(__file__))),
+            "config.json",
+        ),
+    )
+    try:
+        with open(path, "r") as fh:
+            return json.load(fh)
+    except (FileNotFoundError, json.JSONDecodeError):
+        return {"refresh_interval": 5, "command_method": "systemctl", "services": []}

app/sovran_systemsos_web/systemctl.py

@@ -0,0 +1,40 @@
+"""Thin wrapper around the systemctl CLI for Sovran_SystemsOS_Hub."""
+
+from __future__ import annotations
+
+import subprocess
+from typing import Literal
+
+
+def _run(cmd: list[str]) -> str:
+    try:
+        result = subprocess.run(cmd, capture_output=True, text=True, timeout=10)
+        return result.stdout.strip()
+    except Exception:
+        return ""
+
+
+def is_active(unit: str, scope: Literal["system", "user"] = "system") -> str:
+    return _run(["systemctl", f"--{scope}", "is-active", unit]) or "unknown"
+
+
+def is_enabled(unit: str, scope: Literal["system", "user"] = "system") -> str:
+    return _run(["systemctl", f"--{scope}", "is-enabled", unit]) or "unknown"
+
+
+def run_action(
+    action: str,
+    unit: str,
+    scope: Literal["system", "user"] = "system",
+    method: str = "systemctl",
+) -> bool:
+    base_cmd = ["systemctl", f"--{scope}", action, unit]
+    if scope == "system" and method == "pkexec":
+        cmd = ["pkexec", "--user", "root"] + base_cmd
+    else:
+        cmd = base_cmd
+    try:
+        result = subprocess.run(cmd, capture_output=True, text=True, timeout=30)
+        return result.returncode == 0
+    except Exception:
+        return False

app/sovran_systemsos_web/templates/index.html

@@ -0,0 +1,180 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="UTF-8" />
+  <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+  <title>Sovran_SystemsOS Hub</title>
+  <link rel="stylesheet" href="/static/style.css?v={{ style_css_hash }}" />
+</head>
+<body>
+
+  <!-- Header bar -->
+  <header class="header-bar">
+    <span class="title">Sovran_SystemsOS Hub</span>
+    <span class="role-badge" id="role-badge">Loading…</span>
+    <button class="btn btn-update" id="btn-update" title="Run system update">
+      <span class="update-badge" id="update-badge"></span>
+      Update System
+    </button>
+    <button class="btn-icon" id="btn-refresh" title="Refresh service status">↺</button>
+  </header>
+
+  <!-- IP bar -->
+  <div class="ip-bar">
+    <span>
+      <span class="ip-label">Internal IP:</span>
+      <span class="ip-value" id="ip-internal">…</span>
+    </span>
+    <span class="ip-separator">|</span>
+    <span>
+      <span class="ip-label">External IP:</span>
+      <span class="ip-value" id="ip-external">…</span>
+    </span>
+  </div>
+
+  <!-- Service tiles -->
+  <main class="main-content">
+    <div id="tiles-area"></div>
+  </main>
+
+  <!-- Update modal -->
+  <div class="modal-overlay" id="update-modal" role="dialog" aria-modal="true" aria-labelledby="modal-title-text">
+    <div class="modal-dialog">
+      <div class="modal-header">
+        <span class="modal-title" id="modal-title-text">Sovran_SystemsOS Update</span>
+        <div class="modal-spinner" id="modal-spinner"></div>
+        <span class="modal-status" id="modal-status">Updating…</span>
+      </div>
+      <div class="modal-log" id="modal-log" aria-live="polite"></div>
+      <div class="modal-footer">
+        <button class="btn btn-save" id="btn-save-report" style="display:none">Save Error Report</button>
+        <button class="btn btn-reboot" id="btn-reboot" style="display:none">Reboot</button>
+        <button class="btn btn-close-modal" id="btn-close-modal" disabled>Close</button>
+      </div>
+    </div>
+  </div>
+
+  <!-- Credentials info modal -->
+  <div class="modal-overlay" id="creds-modal" role="dialog" aria-modal="true" aria-labelledby="creds-modal-title">
+    <div class="creds-dialog">
+      <div class="creds-header">
+        <span class="creds-title" id="creds-modal-title">Service Info</span>
+        <button class="creds-close-btn" id="creds-close-btn" title="Close">✕</button>
+      </div>
+      <div class="creds-body" id="creds-body">
+        <p class="creds-loading">Loading…</p>
+      </div>
+    </div>
+  </div>
+
+  <!-- Tech Support modal -->
+  <div class="modal-overlay" id="support-modal" role="dialog" aria-modal="true" aria-labelledby="support-modal-title">
+    <div class="creds-dialog">
+      <div class="creds-header">
+        <span class="creds-title" id="support-modal-title">Tech Support</span>
+        <button class="creds-close-btn" id="support-close-btn" title="Close">✕</button>
+      </div>
+      <div class="creds-body" id="support-body">
+        <p class="creds-loading">Loading…</p>
+      </div>
+    </div>
+  </div>
+
+  <!-- Domain Setup Modal -->
+  <div class="modal-overlay" id="domain-setup-modal" role="dialog" aria-modal="true" aria-labelledby="domain-setup-title">
+    <div class="creds-dialog">
+      <div class="creds-header">
+        <span class="creds-title" id="domain-setup-title">🌐 Domain Setup</span>
+        <button class="creds-close-btn" id="domain-setup-close-btn" title="Close">✕</button>
+      </div>
+      <div class="creds-body" id="domain-setup-body"></div>
+    </div>
+  </div>
+
+  <!-- SSL Email Modal -->
+  <div class="modal-overlay" id="ssl-email-modal" role="dialog" aria-modal="true" aria-labelledby="ssl-email-title">
+    <div class="creds-dialog domain-narrow-dialog">
+      <div class="creds-header">
+        <span class="creds-title" id="ssl-email-title">📧 SSL Certificate Email</span>
+        <button class="creds-close-btn" id="ssl-email-close-btn" title="Close">✕</button>
+      </div>
+      <div class="creds-body">
+        <p class="support-desc">Let's Encrypt needs an email address for SSL certificate notifications.</p>
+        <div class="domain-field-group">
+          <label class="domain-field-label" for="ssl-email-input">Email:</label>
+          <input class="domain-field-input" type="email" id="ssl-email-input" placeholder="you@example.com" />
+        </div>
+        <div class="domain-field-actions">
+          <button class="btn btn-close-modal" id="ssl-email-cancel-btn">Cancel</button>
+          <button class="btn btn-primary" id="ssl-email-save-btn">Save</button>
+        </div>
+      </div>
+    </div>
+  </div>
+
+  <!-- Feature Confirm Modal -->
+  <div class="modal-overlay" id="feature-confirm-modal" role="dialog" aria-modal="true" aria-labelledby="feature-confirm-title">
+    <div class="creds-dialog domain-narrow-dialog">
+      <div class="creds-header">
+        <span class="creds-title" id="feature-confirm-title">Confirm Action</span>
+        <button class="creds-close-btn" id="feature-confirm-close-btn" title="Close">✕</button>
+      </div>
+      <div class="creds-body">
+        <p class="support-desc" id="feature-confirm-message"></p>
+        <div class="domain-field-actions">
+          <button class="btn btn-close-modal" id="feature-confirm-cancel-btn">Cancel</button>
+          <button class="btn btn-primary" id="feature-confirm-ok-btn">Continue</button>
+        </div>
+      </div>
+    </div>
+  </div>
+
+  <!-- Port Requirements Modal -->
+  <div class="modal-overlay" id="port-requirements-modal" role="dialog" aria-modal="true" aria-labelledby="port-req-title">
+    <div class="creds-dialog">
+      <div class="creds-header">
+        <span class="creds-title" id="port-req-title">🔌 Router / Firewall Port Requirements</span>
+        <button class="creds-close-btn" id="port-req-close-btn" title="Close">✕</button>
+      </div>
+      <div class="creds-body" id="port-req-body"></div>
+    </div>
+  </div>
+
+  <!-- Rebuild Modal -->
+  <div class="modal-overlay" id="rebuild-modal" role="dialog" aria-modal="true" aria-labelledby="rebuild-modal-title">
+    <div class="modal-dialog">
+      <div class="modal-header">
+        <span class="modal-title" id="rebuild-modal-title">Sovran_SystemsOS Rebuild</span>
+        <div class="modal-spinner" id="rebuild-spinner"></div>
+        <span class="modal-status" id="rebuild-status">Rebuilding…</span>
+      </div>
+      <div class="modal-log" id="rebuild-log" aria-live="polite"></div>
+      <div class="modal-footer">
+        <button class="btn btn-save" id="rebuild-save-report" style="display:none">Save Error Report</button>
+        <button class="btn btn-reboot" id="rebuild-reboot-btn" style="display:none">Reboot</button>
+        <button class="btn btn-close-modal" id="rebuild-close-btn" disabled>Close</button>
+      </div>
+    </div>
+  </div>
+
+  <!-- Reboot overlay -->
+  <div class="reboot-overlay" id="reboot-overlay">
+    <div class="reboot-card">
+      <div class="reboot-icon">↻</div>
+      <h2 class="reboot-title">System Rebooting</h2>
+      <p class="reboot-message">
+        Sovran_SystemsOS is now restarting.<br />
+        This page will automatically reconnect once the system is back online.
+      </p>
+      <div class="reboot-dots">
+        <span class="reboot-dot"></span>
+        <span class="reboot-dot"></span>
+        <span class="reboot-dot"></span>
+      </div>
+      <p class="reboot-submessage">Stay tuned…</p>
+    </div>
+  </div>
+
+  <script src="/static/app.js?v={{ app_js_hash }}"></script>
+</body>
+</html>

configuration.nix

@@ -0,0 +1,180 @@
+{ config, pkgs, lib, ... }:
+
+{
+  imports = [
+    ./modules/modules.nix
+    ./iso/branding.nix
+  ];
+
+  # ── Boot ────────────────────────────────────────────────────
+  boot.loader.systemd-boot.enable = true;
+  boot.loader.efi.canTouchEfiVariables = true;
+  boot.loader.efi.efiSysMountPoint = "/boot/efi";
+  boot.kernelPackages = pkgs.linuxPackages_latest;
+
+  # ── Filesystems ─────────────────────────────────────────────
+  fileSystems."/run/media/Second_Drive" = {
+    device = "LABEL=BTCEcoandBackup";
+    fsType = "ext4";
+    options = [ "nofail" ];
+  };
+
+  fileSystems."/boot/efi".options = [ "umask=0077" "defaults" ];
+
+  # ── Nix Settings ────────────────────────────────────────────
+  nix.settings = {
+    experimental-features = [ "nix-command" "flakes" ];
+    download-buffer-size = 524288000;
+  };
+
+  # ── Networking ──────────────────────────────────────────────
+  networking.hostName = "nixos";
+  networking.networkmanager.enable = true;
+  networking.firewall.enable = true;
+  networking.firewall.allowedTCPPorts = [ 80 443 8448 3051 ];
+  networking.firewall.allowedUDPPorts = [ 80 443 8448 3051 ];
+  networking.firewall.allowedUDPPortRanges = [
+    { from = 49152; to = 65535; }
+  ];
+
+  # ── Locale / Time ──────────────────────────────────────────
+  time.timeZone = "America/Los_Angeles";
+  i18n.defaultLocale = "en_US.UTF-8";
+
+  # ── Desktop ────────────────────────────────────────────────
+  services.displayManager.gdm.enable = true;
+  services.displayManager.gdm.autoSuspend = false;
+  services.displayManager.gdm.wayland = true;
+  services.desktopManager.gnome.enable = true;
+  services.printing.enable = true;
+  systemd.enableEmergencyMode = false;
+  environment.gnome.excludePackages = [ pkgs.gnome-tour ];
+
+  # ── Audio ──────────────────────────────────────────────────
+  services.pulseaudio.enable = false;
+  security.rtkit.enable = true;
+  services.pipewire = {
+    enable = true;
+    alsa.enable = true;
+    alsa.support32Bit = true;
+    pulse.enable = true;
+  };
+
+  # ── Users ──────────────────────────────────────────────────
+  users.users.free = {
+    isNormalUser = true;
+    description = "free";
+    extraGroups = [ "networkmanager" ];
+  };
+
+  services.displayManager.autoLogin.enable = true;
+  services.displayManager.autoLogin.user = "free";
+
+  # ── Flatpak ────────────────────────────────────────────────
+  services.flatpak.enable = true;
+  systemd.services.flatpak-repo = {
+    wantedBy = [ "multi-user.target" ];
+    after = [ "network-online.target" ];
+    wants = [ "network-online.target" ];
+    path = [ pkgs.flatpak ];
+    script = ''
+      flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
+    '';
+  };
+
+  # ── Packages ───────────────────────────────────────────────
+  nixpkgs.config.allowUnfree = true;
+  nixpkgs.config.permittedInsecurePackages = [ "jitsi-meet-1.0.8043" ];
+
+  environment.systemPackages = with pkgs; [
+    git wget fish htop btop
+    gnomeExtensions.transparent-top-bar-adjustable-transparency
+    gnomeExtensions.dash-to-dock
+    gnomeExtensions.vitals
+    gnomeExtensions.pop-shell
+    gnomeExtensions.just-perfection
+    gnomeExtensions.appindicator
+    gnomeExtensions.date-menu-formatter
+    gnome-tweaks papirus-icon-theme
+    ranger fastfetch gedit openssl pwgen
+    aspell aspellDicts.en lm_sensors
+    hunspell hunspellDicts.en_US
+    synadm brave dua bitwarden-desktop
+    gparted pv unzip parted screen zenity
+    libargon2 gnome-terminal libreoffice-fresh
+    dig firefox element-desktop wp-cli axel
+    lk-jwt-service livekit-libwebrtc livekit-cli livekit
+    matrix-synapse age
+  ];
+
+  # ── Shell ──────────────────────────────────────────────────
+  programs.nixvim = {
+    enable = true;
+    colorschemes.catppuccin.enable = true;
+    plugins.lualine.enable = true;
+  };
+
+  programs.bash.promptInit = "fish";
+  programs.fish = { enable = true; promptInit = "fastfetch"; };
+
+  # ── PostgreSQL base ────────────────────────────────────────
+  services.postgresql = {
+    enable = true;
+    authentication = lib.mkForce ''
+      local   all   all                 trust
+      host    all   all   127.0.0.1/32  trust
+      host    all   all   ::1/128       trust
+    '';
+  };
+
+  # ── Backups ────────────────────────────────────────────────
+  services.rsnapshot = {
+    enable = true;
+    extraConfig = ''
+snapshot_root	/run/media/Second_Drive/BTCEcoandBackup/NixOS_Snapshot_Backup
+retain	hourly	5
+retain	daily	5
+backup	/home/	localhost/
+backup	/var/lib/	localhost/
+backup	/etc/nixos/	localhost/
+backup	/etc/nix-bitcoin-secrets/	localhost/
+    '';
+    cronIntervals = {
+      daily = "50 21 * * *";
+      hourly = "0 * * * *";
+    };
+  };
+
+  # ── Cron ───────────────────────────────────────────────────
+  services.cron = {
+    enable = true;
+    systemCronJobs = [
+      "*/15 * * * * root /run/current-system/sw/bin/bash /var/lib/njalla/njalla.sh"
+      "*/15 * * * * root /run/current-system/sw/bin/bash /var/lib/external_ip/external_ip.sh"
+    ];
+  };
+
+  # ── Tor ────────────────────────────────────────────────────
+  services.tor = { enable = true; client.enable = true; torsocks.enable = true; };
+
+  # ── SSH ────────────────────────────────────────────────────
+  services.openssh = {
+    enable = true;
+    settings = {
+      PasswordAuthentication = false;
+      KbdInteractiveAuthentication = false;
+      PermitRootLogin = "yes";
+    };
+  };
+
+  # ── Fail2Ban ───────────────────────────────────────────────
+  services.fail2ban = {
+    enable = true;
+    ignoreIP = [ "127.0.0.0/8" "10.0.0.0/8" "172.16.0.0/12" "192.168.0.0/16" "8.8.8.8" ];
+  };
+
+  # ── Garbage Collection ─────────────────────────────────────
+  nix.gc = { automatic = true; dates = "weekly"; options = "--delete-older-than 7d"; };
+
+  system.stateVersion = "22.05";
+}

custom.template.nix

@@ -0,0 +1,127 @@
+{ config, lib, ... }:
+
+{
+  ###########################################################
+  #                                                         #
+  #              Sovran_SystemsOS — custom.nix              #
+  #                                                         #
+  #  This is YOUR configuration file. Edit it to customize  #
+  #  which services and features run on your machine.       #
+  #                                                         #
+  #  After making changes, rebuild with:                    #
+  #                                                         #
+  #       nixos-rebuild switch                #
+  #                                                         #
+  ###########################################################
+
+
+  # ═══════════════════════════════════════════════════════════
+  #  STEP 1: CHOOSE YOUR ROLE
+  # ═══════════════════════════════════════════════════════════
+  #
+  #  Your initial role was selected during installation. 
+  #  To CHANGE your role, uncomment exactly ONE of the lines below.
+  #
+  #  Server+Desktop: Full server + desktop environment
+  #  Desktop Only: Desktop environment, no server services
+  #  Node (Bitcoin Only): Bitcoin ecosystem
+  #
+  # ───────────────────────────────────────────────────────────
+
+  # sovran_systemsOS.roles.server_plus_desktop = true;
+  # sovran_systemsOS.roles.desktop = true;
+  # sovran_systemsOS.roles.node = true;
+
+
+  # ═══════════════════════════════════════════════════════════
+  #  STEP 2: SERVICES (default: ON)
+  # ═══════════════════════════════════════════════════════════
+  #
+  #  These are all ON by default in the Server+Desktop role.
+  #  Set any to "false" to disable it.
+  #
+  #  ┌─────────────────────┬────────────────────────────────┐
+  #  │ Service              │ What it does                   │
+  #  ├─────────────────────┼────────────────────────────────┤
+  #  │ synapse              │ Matrix Synapse homeserver      │
+  #  │ bitcoin              │ Bitcoin ecosystem (bitcoind,   │
+  #  │                      │   electrs, lnd, rtl, btcpay)  │
+  #  │ vaultwarden          │ Vaultwarden password manager   │
+  #  │ wordpress            │ WordPress website              │
+  #  │ nextcloud            │ Nextcloud file hosting         │
+  #  └─────────────────────┴────────────────────────────────┘
+  #
+  #  Example — disable WordPress and Nextcloud:
+  #
+  #    sovran_systemsOS.services.wordpress = false;
+  #    sovran_systemsOS.services.nextcloud = false;
+  #
+  # ───────────────────────────────────────────────────────────
+
+  # sovran_systemsOS.services.wordpress = false;
+
+
+  # ═══════════════════════════════════════════════════════════
+  #  STEP 3: FEATURES (default: OFF)
+  # ═══════════════════════════════════════════════════════════
+  #
+  #  These are OFF by default. Set to "true" to enable.
+  #
+  #  ┌─────────────────────┬────────────────────────────────┐
+  #  │ Feature              │ What it does                   │
+  #  ├─────────────────────┼────────────────────────────────┤
+  #  │ haven                │ Haven NOSTR relay & Blossom    │
+  #  │ bip110               │ BIP-110 Bitcoin Better Money   │
+  #  │ mempool              │ Mempool.space block explorer   │
+  #  │ element-calling      │ LiveKit server for Matrix      │
+  #  │ rdp                  │ GNOME Remote Desktop (RDP)     │
+  #  │ bitcoin-core         │ Bitcoin Core GUI desktop app   │
+  #  └─────────────────────┴─────���──────────────────────────┘
+  #
+  #  Example — enable element video calling:
+  #
+  #    sovran_systemsOS.features.element-calling = true;
+  #
+  # ───────────────────────────────────────────────────────────
+
+  # sovran_systemsOS.features.element-calling = true;
+
+
+  # ═══════════════════════════════════════════════════════════
+  #  STEP 4: WEB EXPOSURE (default: ON)
+  # ═══════════════════════════════════════════════════════════
+  #
+  #  Controls whether Caddy serves this application to the web.
+  #  (Does not stop the application itself from running).
+  #
+  #  ┌─────────────────────┬────────────────────────────────┐
+  #  │ Option               │ Default                        │
+  #  ├─────────────────────┼────────────────────────────────┤
+  #  │ btcpayserver         │ true (false in Node role)      │
+  #  └─────────────────────┴────────────────────────────────┘
+  #
+  #  Example — hide BTCPay from the web:
+  #
+  #    sovran_systemsOS.web.btcpayserver = false;
+  #
+  # ───────────────────────────────────────────────────────────
+
+  # sovran_systemsOS.web.btcpayserver = false;
+
+
+  # ═══════════════════════════════════════════════════════════
+  #  STEP 5: NOSTR PUBLIC KEY (required for Haven)
+  # ═══════════════════════════════════════════════════════════
+  #
+  #  If you enabled Haven above, paste your npub here.
+  #  Haven will NOT start without a valid npub.
+  #
+  #  Example:
+  #
+  #    sovran_systemsOS.nostr_npub = "npub1abc123...";
+  #
+  # ───────────────────────────────────────────────────────────
+
+  # sovran_systemsOS.nostr_npub = "";
+
+}

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/test.sh
+rm -rf /home/free/Downloads/sovran-pro-flake-update.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

@@ -1,22 +1,39 @@
 {
   "nodes": {
-    "agenix": {
+    "bip110": {
       "inputs": {
-        "darwin": [],
-        "home-manager": "home-manager",
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1684153753,
-        "narHash": "sha256-PVbWt3qrjYAK+T5KplFcO+h7aZWfEj1UtyoKlvcDxh0=",
-        "owner": "ryantm",
-        "repo": "agenix",
-        "rev": "db5637d10f797bb251b94ef9040b237f4702cde3",
+        "lastModified": 1773169138,
+        "narHash": "sha256-6X41z8o2z8KjF4gMzLTPD41WjvCDGXTc0muPGmwcOMk=",
+        "owner": "emmanuelrosa",
+        "repo": "bitcoin-knots-bip-110-nix",
+        "rev": "b9d018b71e20ce8c1567cbc2401b6edc2c1c7793",
         "type": "github"
       },
       "original": {
-        "owner": "ryantm",
-        "repo": "agenix",
+        "owner": "emmanuelrosa",
+        "repo": "bitcoin-knots-bip-110-nix",
+        "type": "github"
+      }
+    },
+    "btc-clients": {
+      "inputs": {
+        "nixpkgs": "nixpkgs_2",
+        "oldNixpkgs": "oldNixpkgs"
+      },
+      "locked": {
+        "lastModified": 1774797058,
+        "narHash": "sha256-URUOiKNjG3s7vDkTj554+3yzQ0qqNQoQwHdc7vs63X0=",
+        "owner": "emmanuelrosa",
+        "repo": "btc-clients-nix",
+        "rev": "a10dae067da04b7b170eed73efc665d27fc0e0c5",
+        "type": "github"
+      },
+      "original": {
+        "owner": "emmanuelrosa",
+        "repo": "btc-clients-nix",
         "type": "github"
       }
     },
@@ -32,29 +49,51 @@
         ]
       },
       "locked": {
-        "lastModified": 1686656049,
-        "narHash": "sha256-rkYYVslFtRnhzryUFqJeYjPxorasymOg00z30GtR3iE=",
+        "lastModified": 1766155727,
+        "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": 1769996383,
+        "narHash": "sha256-AnYjnFWgS49RlqX7LrC4uA+sCCDBj0Ry/WOJ5XWAsa0=",
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "rev": "57928607ea566b5db3ad13af0e57e921e6b12381",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "type": "github"
+      }
+    },
     "flake-utils": {
       "inputs": {
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1685518550,
-        "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=",
+        "lastModified": 1731533236,
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
         "type": "github"
       },
       "original": {
@@ -63,40 +102,20 @@
         "type": "github"
       }
     },
-    "home-manager": {
-      "inputs": {
-        "nixpkgs": [
-          "agenix",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1682203081,
-        "narHash": "sha256-kRL4ejWDhi0zph/FpebFYhzqlOBrk0Pl3dzGEKSAlEw=",
-        "owner": "nix-community",
-        "repo": "home-manager",
-        "rev": "32d3e39c491e2f91152c84f8ad8b003420eab0a1",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "home-manager",
-        "type": "github"
-      }
-    },
     "nix-bitcoin": {
       "inputs": {
         "extra-container": "extra-container",
         "flake-utils": "flake-utils",
-        "nixpkgs": "nixpkgs_2",
+        "nixpkgs": "nixpkgs_3",
+        "nixpkgs-25_05": "nixpkgs-25_05",
         "nixpkgs-unstable": "nixpkgs-unstable"
       },
       "locked": {
-        "lastModified": 1686687332,
-        "narHash": "sha256-GDpCwn05ZniaKgODBqGlW3pnbHVq6bybnTNnoCK/XUk=",
+        "lastModified": 1767721199,
+        "narHash": "sha256-UzRxDiJlopBGPTjyhCdMP+QdTwXK+l+y45urXCyH69A=",
         "owner": "fort-nix",
         "repo": "nix-bitcoin",
-        "rev": "f2a970406ba35a21fa916de9d201859a7860447a",
+        "rev": "5b532698ce9e8bd79b07d77ab4fc60e1a8408f73",
         "type": "github"
       },
       "original": {
@@ -108,27 +127,59 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1677676435,
-        "narHash": "sha256-6FxdcmQr5JeZqsQvfinIMr0XcTyTuR7EXX0H3ANShpQ=",
+        "lastModified": 1772380631,
+        "narHash": "sha256-FhW0uxeXjefINP0vUD4yRBB52Us7fXZPk9RiPAopfiY=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "a08d6979dd7c82c4cef0dcc6ac45ab16051c1169",
+        "rev": "6d3b61b190a899042ce82a5355111976ba76d698",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "master",
+        "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-unstable",
+        "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,
-        "narHash": "sha256-vtflsfKkHtF8IduxDNtbme4cojiqvlvjp5QNYhvoHXc=",
+        "lastModified": 1767364772,
+        "narHash": "sha256-fFUnEYMla8b7UKjijLnMe+oVFOz6HjijGGNS1l7dYaQ=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "7e63eed145566cca98158613f3700515b4009ce3",
+        "rev": "16c7794d0a28b5a37904d55bcca36003b9109aaa",
         "type": "github"
       },
       "original": {
@@ -140,27 +191,42 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1686476475,
-        "narHash": "sha256-W9yUePvCSDghn+YUXewuodyPxt+kJl/a7zdY4Q6r4MU=",
+        "lastModified": 1772380631,
+        "narHash": "sha256-FhW0uxeXjefINP0vUD4yRBB52Us7fXZPk9RiPAopfiY=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "eef86b8a942913a828b9ef13722835f359deef29",
+        "rev": "6d3b61b190a899042ce82a5355111976ba76d698",
         "type": "github"
       },
       "original": {
-        "owner": "NixOS",
-        "ref": "nixos-22.11",
+        "owner": "nixos",
         "repo": "nixpkgs",
         "type": "github"
       }
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1686960236,
-        "narHash": "sha256-AYCC9rXNLpUWzD9hm+askOfpliLEC9kwAo7ITJc4HIw=",
+        "lastModified": 1767480499,
+        "narHash": "sha256-8IQQUorUGiSmFaPnLSo2+T+rjHtiNWc+OAzeHck7N48=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "04af42f3b31dba0ef742d254456dc4c14eedac86",
+        "rev": "30a3c519afcf3f99e2c6df3b359aec5692054d92",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-25.11",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_4": {
+      "locked": {
+        "lastModified": 1775036866,
+        "narHash": "sha256-ZojAnPuCdy657PbTq5V0Y+AHKhZAIwSIT2cb8UgAz/U=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "6201e203d09599479a3b3450ed24fa81537ebc4e",
         "type": "github"
       },
       "original": {
@@ -170,11 +236,66 @@
         "type": "github"
       }
     },
+    "nixpkgs_5": {
+      "locked": {
+        "lastModified": 1770380644,
+        "narHash": "sha256-P7dWMHRUWG5m4G+06jDyThXO7kwSk46C1kgjEWcybkE=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "ae67888ff7ef9dff69b3cf0cc0fbfbcd3a722abe",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixvim": {
+      "inputs": {
+        "flake-parts": "flake-parts",
+        "nixpkgs": "nixpkgs_5",
+        "systems": "systems_2"
+      },
+      "locked": {
+        "lastModified": 1774802402,
+        "narHash": "sha256-L1UJ/zxKTyyaGGmytH6OYlgQ0HGSMhvPkvU+iz4Mkb8=",
+        "owner": "nix-community",
+        "repo": "nixvim",
+        "rev": "cbd8536a05d1aae2593cb5c9ace1010c8c5845cb",
+        "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_4",
+        "nixpkgs-stable": "nixpkgs-stable",
+        "nixvim": "nixvim"
       }
     },
     "systems": {
@@ -191,6 +312,21 @@
         "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"
+      }
     }
   },
   "root": "root",

flake.nix

@@ -1,46 +1,72 @@
 {
-	description = "The Ultimate Sovran_SystemsOS Configuration for the Sovran Pro from Sovran Systems";
+	description = "The Ultimate Sovran_SystemsOS Configuration from Sovran Systems";
 
 	inputs = {
-		
 		nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
-
 		nix-bitcoin.url = "github:fort-nix/nix-bitcoin/release";
-		
-		agenix.url = "github:ryantm/agenix";
-
-		agenix.inputs.darwin.follows = "";
-
-		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, 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"; }
+				self.nixosModules.Sovran_SystemsOS
+				/etc/nixos/role-state.nix
+				/etc/nixos/custom.nix
+			];
 		};
-		
-		nixosModules.Sovran_SystemsOS = { pkgs, ... }: {
-			
-			imports = [
-
-				./modules/modules.nix 
 
+		nixosConfigurations.sovran-iso-desktop = nixpkgs.lib.nixosSystem {
+			modules = [
+				{ nixpkgs.hostPlatform = "x86_64-linux"; }
+				({ config, pkgs, ... }: { nixpkgs.overlays = [ overlay-stable ]; })
+				./iso/desktop.nix
 				nix-bitcoin.nixosModules.default
+				nixvim.nixosModules.nixvim
+			];
+		};
 
-				agenix.nixosModules.default
+		nixosConfigurations.sovran-iso-server = nixpkgs.lib.nixosSystem {
+			modules = [
+				{ nixpkgs.hostPlatform = "x86_64-linux"; }
+				({ config, pkgs, ... }: { nixpkgs.overlays = [ overlay-stable ]; })
+				./iso/server.nix
+				nix-bitcoin.nixosModules.default
+				nixvim.nixosModules.nixvim
+			];
+		};
 
- 			];
-
- 			environment.systemPackages = with pkgs; [
- 			  
- 			  erosanix.packages.x86_64-linux.sparrow
- 			
- 			];
+		nixosModules.Sovran_SystemsOS = { pkgs, lib, config, ... }: {
+			imports = [
+				({ config, pkgs, ... }: {
+					nixpkgs.overlays = [ overlay-stable ];
+				})
+				./configuration.nix
+				nix-bitcoin.nixosModules.default
+				nixvim.nixosModules.nixvim
+			];
+			config = {
+				environment.systemPackages = with pkgs; [
+					btc-clients.packages.${pkgs.system}.bisq
+					btc-clients.packages.${pkgs.system}.bisq2
+					btc-clients.packages.${pkgs.system}.sparrow
+				];
+				sovran_systemsOS.packages.bip110 = bip110.packages.${pkgs.system}.bitcoind-knots-bip-110;
+			};
 		};
 	};
-}
+}

for_new_sovran_pros/Sovran_SystemsOS-Desktop

@@ -1,390 +0,0 @@
-[com/ftpix/transparentbar]
-dark-full-screen=false
-
-[org/gnome/Console]
-font-scale=1.7000000000000006
-last-window-size=(1912, 1037)
-
-[org/gnome/Geary]
-migrated-config=true
-window-height=1037
-window-width=954
-
-[org/gnome/Totem]
-active-plugins=['mpris', 'vimeo', 'screenshot', 'movie-properties', 'autoload-subtitles', 'screensaver', 'apple-trailers', 'save-file', 'rotation', 'open-directory', 'recent', 'variable-rate', 'skipto']
-subtitle-encoding='UTF-8'
-
-[org/gnome/baobab/ui]
-is-maximized=false
-window-size=(1912, 1037)
-
-[org/gnome/calculator]
-accuracy=9
-angle-units='degrees'
-base=10
-button-mode='basic'
-number-format='automatic'
-show-thousands=false
-show-zeroes=false
-source-currency=''
-source-units='degree'
-target-currency=''
-target-units='radian'
-word-size=64
-
-[org/gnome/calendar]
-active-view='month'
-window-maximized=false
-window-size=(1912, 1037)
-
-[org/gnome/control-center]
-last-panel='background'
-window-state=(1912, 1037, 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']
-
-[org/gnome/desktop/app-folders/folders/3fea025e-f5e4-4905-9912-e70e38cd0419]
-apps=['cups.desktop', 'simple-scan.desktop']
-name='Printing'
-translate=false
-
-[org/gnome/desktop/app-folders/folders/4acaa2d8-d284-4efd-bba3-40f150f1ace5]
-apps=['org.gnome.DiskUtility.desktop', 'org.gnome.baobab.desktop', 'gparted.desktop']
-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']
-name='Internet'
-
-[org/gnome/desktop/app-folders/folders/68c075b1-a254-4b7c-ba63-c45f88bc2a58]
-apps=['org.gnome.Extensions.desktop', 'org.gnome.tweaks.desktop']
-name='Customize Look'
-translate=false
-
-[org/gnome/desktop/app-folders/folders/7d66e46a-a135-4e42-91bb-d438e499d251]
-apps=['org.gnome.Photos.desktop', 'org.gnome.Music.desktop', 'org.gnome.Totem.desktop', 'org.gnome.Cheese.desktop']
-name='Media'
-translate=false
-
-[org/gnome/desktop/app-folders/folders/83d8148a-1f0b-4f83-814a-11c33ab8debc]
-apps=['org.gnome.Tour.desktop', 'yelp.desktop', 'nixos-manual.desktop']
-name='Help'
-translate=false
-
-[org/gnome/desktop/app-folders/folders/Utilities]
-apps=['gnome-abrt.desktop', 'gnome-system-log.desktop', 'nm-connection-editor.desktop', 'org.gnome.Connections.desktop', 'org.gnome.DejaDup.desktop', 'org.gnome.Dictionary.desktop', 'org.gnome.eog.desktop', 'org.gnome.Evince.desktop', 'org.gnome.FileRoller.desktop', 'org.gnome.fonts.desktop', 'org.gnome.seahorse.Application.desktop', 'org.gnome.Usage.desktop', 'vinagre.desktop', 'org.gnome.TextEditor.desktop', 'org.gnome.gedit.desktop']
-categories=['X-GNOME-Utilities']
-excluded-apps=['org.gnome.Console.desktop', 'org.gnome.tweaks.desktop', 'org.gnome.DiskUtility.desktop', 'org.gnome.baobab.desktop']
-name='X-GNOME-Utilities.directory'
-translate=true
-
-[org/gnome/desktop/app-folders/folders/YaST]
-categories=['X-SuSE-YaST']
-name='suse-yast.directory'
-translate=true
-
-[org/gnome/desktop/app-folders/folders/d737daeb-6dbb-4a5d-9ec7-e674398539ce]
-apps=['fish.desktop', 'org.gnome.Console.desktop', 'htop.desktop', 'ranger.desktop', 'xterm.desktop']
-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-dark='file:///run/current-system/sw/share/backgrounds/gnome/blobs-d.svg'
-primary-color='#241f31'
-secondary-color='#000000'
-
-[org/gnome/desktop/input-sources]
-sources=[('xkb', 'us')]
-xkb-options=['terminate:ctrl_alt_bksp']
-
-[org/gnome/desktop/interface]
-clock-format='12h'
-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
-
-[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']
-show-in-lock-screen=false
-
-[org/gnome/desktop/notifications/application/com-obsproject-studio]
-application-id='com.obsproject.Studio.desktop'
-
-[org/gnome/desktop/notifications/application/gnome-network-panel]
-application-id='gnome-network-panel.desktop'
-
-[org/gnome/desktop/notifications/application/gnome-power-panel]
-application-id='gnome-power-panel.desktop'
-
-[org/gnome/desktop/notifications/application/gnome-printers-panel]
-application-id='gnome-printers-panel.desktop'
-
-[org/gnome/desktop/notifications/application/io-github-seadve-kooha]
-application-id='io.github.seadve.Kooha.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-nautilus]
-application-id='org.gnome.Nautilus.desktop'
-
-[org/gnome/desktop/notifications/application/org-gnome-settings]
-application-id='org.gnome.Settings.desktop'
-
-[org/gnome/desktop/notifications/application/org-gnome-software]
-application-id='org.gnome.Software.desktop'
-
-[org/gnome/desktop/notifications/application/sparrow]
-application-id='Sparrow.desktop'
-
-[org/gnome/desktop/notifications/application/xdg-desktop-portal-gnome]
-application-id='xdg-desktop-portal-gnome.desktop'
-
-[org/gnome/desktop/peripherals/keyboard]
-numlock-state=false
-
-[org/gnome/desktop/peripherals/mouse]
-natural-scroll=true
-
-[org/gnome/desktop/peripherals/touchpad]
-two-finger-scrolling-enabled=true
-
-[org/gnome/desktop/privacy]
-old-files-age=uint32 30
-recent-files-max-age=-1
-
-[org/gnome/desktop/screensaver]
-color-shading-type='solid'
-lock-enabled=false
-picture-options='zoom'
-picture-uri='file:///run/current-system/sw/share/backgrounds/gnome/blobs-l.svg'
-primary-color='#241f31'
-secondary-color='#000000'
-
-[org/gnome/desktop/session]
-idle-delay=uint32 900
-
-[org/gnome/desktop/sound]
-event-sounds=true
-theme-name='__custom'
-
-[org/gnome/desktop/wm/preferences]
-button-layout='appmenu:minimize,maximize,close'
-
-[org/gnome/epiphany]
-ask-for-default=false
-
-[org/gnome/epiphany/state]
-is-maximized=false
-window-size=(1912, 1037)
-
-[org/gnome/evolution-data-server]
-migrated=true
-network-monitor-gio-name=''
-
-[org/gnome/file-roller/listing]
-list-mode='as-folder'
-name-column-width=250
-show-path=false
-sort-method='name'
-sort-type='ascending'
-
-[org/gnome/file-roller/ui]
-sidebar-width=200
-window-height=990
-window-width=954
-
-[org/gnome/gnome-system-monitor]
-current-tab='disks'
-maximized=false
-network-total-in-bits=false
-show-dependencies=false
-show-whose-processes='all'
-window-state=(1912, 1037, 26, 23)
-
-[org/gnome/gnome-system-monitor/disktreenew]
-col-6-visible=true
-col-6-width=1502
-
-[org/gnome/gnome-system-monitor/proctree]
-columns-order=[0, 1, 2, 3, 4, 6, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26]
-sort-col=8
-sort-order=0
-
-[org/gnome/maps]
-last-viewed-location=[33.98678824432703, -118.33063362501532]
-map-type='MapsStreetSource'
-transportation-type='pedestrian'
-window-maximized=false
-window-size=[1912, 1037]
-zoom-level=19
-
-[org/gnome/mutter]
-attach-modal-dialogs=true
-dynamic-workspaces=true
-edge-tiling=false
-focus-change-on-pointer-rest=true
-workspaces-only-on-primary=true
-
-[org/gnome/nautilus/icon-view]
-default-zoom-level='large'
-
-[org/gnome/nautilus/preferences]
-default-folder-viewer='icon-view'
-migrated-gtk-settings=true
-search-filter-time-type='last_modified'
-search-view='list-view'
-
-[org/gnome/nautilus/window-state]
-initial-size=(954, 1037)
-maximized=false
-
-[org/gnome/nm-applet/eap/2afa07ed-64ca-44a0-948e-d8f265fa52b0]
-ignore-ca-cert=false
-ignore-phase2-ca-cert=false
-
-[org/gnome/nm-applet/eap/8da70f78-fe38-3e50-a305-8fa32b2af624]
-ignore-ca-cert=false
-ignore-phase2-ca-cert=false
-
-[org/gnome/nm-applet/eap/a9f5fb1c-2546-4fb9-82d0-7792e8982565]
-ignore-ca-cert=false
-ignore-phase2-ca-cert=false
-
-[org/gnome/settings-daemon/plugins/color]
-night-light-enabled=true
-night-light-temperature=uint32 1700
-
-[org/gnome/settings-daemon/plugins/power]
-power-button-action='interactive'
-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>}>}]
-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']
-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']
-last-selected-power-profile='performance'
-welcome-dialog-last-shown-version='42.3.1'
-
-[org/gnome/shell/extensions/dash-to-dock-pop]
-apply-glossy-effect=false
-background-color='rgb(0,0,0)'
-background-opacity=0.25
-border-radius=17
-custom-background-color=true
-custom-theme-shrink=false
-dash-max-icon-size=64
-dock-alignment='CENTRE'
-dock-position='BOTTOM'
-extend-height=false
-floating-margin=0
-force-straight-corner=false
-height-fraction=0.90000000000000002
-intellihide-mode='ALL_WINDOWS'
-preferred-monitor=-2
-preferred-monitor-by-connector='HDMI-1'
-preview-size-scale=0.059999999999999998
-running-indicator-style='DASHES'
-show-apps-at-top=false
-show-mounts=false
-show-show-apps-button=true
-show-trash=false
-transparency-mode='FIXED'
-unity-backlit-items=false
-
-[org/gnome/shell/extensions/dash-to-dock]
-apply-custom-theme=false
-background-color='rgb(0,0,0)'
-background-opacity=0.17000000000000001
-custom-background-color=true
-dash-max-icon-size=76
-dock-position='BOTTOM'
-height-fraction=0.79000000000000004
-preferred-monitor=-2
-preferred-monitor-by-connector='HDMI-1'
-running-indicator-style='DASHES'
-show-mounts=false
-show-mounts-only-mounted=false
-show-trash=false
-transparency-mode='FIXED'
-
-[org/gnome/shell/extensions/just-perfection]
-accessibility-menu=false
-
-[org/gnome/shell/extensions/pop-shell]
-active-hint-border-radius=uint32 3
-gap-inner=uint32 1
-gap-outer=uint32 1
-tile-by-default=true
-
-[org/gnome/shell/extensions/systemd-manager]
-command-method='systemctl'
-systemd=['{"name":"Bitcoind","service":"bitcoind.service","type":"system"}', '{"name":"Electrs","service":"electrs.service","type":"system"}', '{"name":"BTCPayserver","service":"btcpayserver.service","type":"system"}', '{"name":"Nbxplorer","service":"nbxplorer.service","type":"system"}', '{"name":"Caddy","service":"caddy.service","type":"system"}', '{"name":"Phpfpm-Mypool","service":"phpfpm-mypool.service","type":"system"}', '{"name":"Mysql","service":"mysql.service","type":"system"}', '{"name":"Postgresql","service":"postgresql.service","type":"system"}', '{"name":"Matrix-Synapse","service":"matrix-synapse.service","type":"system"}', '{"name":"Coturn","service":"coturn.service","type":"system"}', '{"name":"Tor","service":"tor.service","type":"system"}', '{"name":"VaultWarden","service":"vaultwarden.service","type":"system"}', '{"name":"LND","service":"lnd.service","type":"system"}', '{"name":"LND Loop","service":"lightning-loop.service","type":"system"}', '{"name":"Ride The Lightning","service":"rtl.service","type":"system"}', '{"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"}']
-
-[org/gnome/shell/extensions/vitals]
-fixed-widths=false
-hot-sensors=['_memory_usage_', '__network-tx_max__', '_processor_usage_', '_storage_free_', '__temperature_avg__']
-show-fan=false
-show-storage=true
-show-voltage=false
-
-[org/gnome/shell/weather]
-automatic-location=true
-locations=@av []
-
-[org/gnome/shell/world-clocks]
-locations=@av []
-
-[org/gnome/software]
-check-timestamp=int64 1689340502
-first-run=false
-flatpak-purge-timestamp=int64 1689380924
-online-updates-timestamp=int64 1675355639
-update-notification-timestamp=int64 1666382024
-
-[org/gnome/tweaks]
-show-extensions-notice=false
-
-[org/gtk/gtk4/settings/color-chooser]
-selected-color=(true, 0.0, 0.0, 0.0, 1.0)
-
-[org/gtk/gtk4/settings/file-chooser]
-date-format='regular'
-location-mode='path-bar'
-show-hidden=true
-show-size-column=true
-show-type-column=true
-sidebar-width=177
-sort-column='name'
-sort-directories-first=false
-sort-order='ascending'
-type-format='category'
-view-type='list'
-window-size=(938, 374)
-
-[org/gtk/settings/file-chooser]
-clock-format='12h'
-show-hidden=true
-
-[system/proxy]
-ignore-hosts=@as []
-mode='none'
-
-[system/proxy/http]
-port=0
-
-[system/proxy/socks]
-host='127.0.0.1'
-port=9050

for_new_sovran_pros/flake.nix

@@ -1,22 +0,0 @@
-{
-	description = "Sovran_SystemsOS for the Sovran Pro from Sovran Systems";
-
-	inputs = {
-		
-		Sovran_Systems.url = "git+https://git.sovransystems.com/Sovran_Systems/Sovran_SystemsOS";
-	
-	};
-
-	outputs = { self, Sovran_Systems, ... }@inputs: {
-		
-		nixosConfigurations."nixos" = Sovran_Systems.inputs.nixpkgs.lib.nixosSystem {
-			
-			system = "x86_64-linux";
- 			
- 			modules = [ Sovran_Systems.nixosModules.Sovran_SystemsOS ];
-		
-		};
-	
-	};
-
-}

for_new_sovran_pros/psp.sh

@@ -1,81 +0,0 @@
-#!/usr/bin/env bash
-
-# Begin: curl https://git.sovransystems.com/Sovran_Systems/Sovran_SystemsOS/raw/branch/main/for_new_sovran_pros/psp.sh -o psp.sh
-
-GREEN="\e[32m"
-LIGHTBLUE="\e[94m"
-ENDCOLOR="\e[0m"
-
-lsblk
-
-echo -e "${GREEN}What block for Root drive (usually sda)?${ENDCOLOR}";read commitroot
-
-parted /dev/"$commitroot" -- mklabel gpt
-parted /dev/"$commitroot" -- mkpart primary 512MB -7MB
-parted /dev/"$commitroot" -- mkpart ESP fat32 1MB 512MB
-parted /dev/"$commitroot" -- set 2 esp on
-
-lsblk
-
-echo -e "${GREEN}What partition for Root drive (usually sda1)?${ENDCOLOR}";read commitrootpartition
-
-echo -e "${GREEN}What partition for Boot drive (usually sda2)?${ENDCOLOR}";read commitbootpartition
-
-mkfs.ext4 -L nixos /dev/"$commitrootpartition"
-
-mkfs.fat -F 32 -n boot /dev/"$commitbootpartition"
-
-mount /dev/disk/by-label/nixos /mnt
-
-mkdir -p /mnt/boot/efi                   
-
-mount /dev/disk/by-label/boot /mnt/boot/efi
-
-nixos-generate-config --root /mnt
-
-rm /mnt/etc/nixos/configuration.nix
-
-cat <<EOT >> /mnt/etc/nixos/configuration.nix         
-{ config, pkgs, ... }: {
-  imports = [
-	./hardware-configuration.nix
-  ];
-
-  boot.loader.systemd-boot.enable = true;
-  boot.loader.efi.canTouchEfiVariables = true;
-	boot.loader.efi.efiSysMountPoint = "/boot/efi";
-
-  nix = {
-  package = pkgs.nixUnstable;
-	extraOptions = ''
-		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/sp.sh

@@ -1,365 +0,0 @@
-#!/usr/bin/env bash
-
-# wget https://git.sovransystems.com/Sovran_Systems/Sovran_SystemsOS/raw/branch/main/for_new_sovran_pros/sp.sh
-
-
-GREEN="\e[32m"
-LIGHTBLUE="\e[94m"
-ENDCOLOR="\e[0m"
-
-#
-
-pushd /etc/nixos/
-
-  wget https://git.sovransystems.com/Sovran_Systems/Sovran_SystemsOS/raw/branch/main/for_new_sovran_pros/flake.nix
-
-  chown root:root /etc/nixos/ -R
-  
-  chmod 770 /etc/nixos/ -R
-
-popd
-
-#
-
-mkdir /var/lib/domains
-
-touch /var/lib/domains/btcpayserver
-touch /var/lib/domains/matrix
-touch /var/lib/domains/nextcloud
-touch /var/lib/domains/onlyoffice
-touch /var/lib/domains/sslemail
-touch /var/lib/domains/vaultwarden
-touch /var/lib/domains/wordpress
-
-#
-
-echo -e "${GREEN}What is your New Matrix (Element Chat) domain name?${ENDCOLOR}"
-read 
-echo -n $REPLY > /var/lib/domains/matrix
-
-echo -e "${GREEN}What is your New Wordpress domain name?${ENDCOLOR}"
-read 
-echo -n $REPLY > /var/lib/domains/wordpress
-
-echo -e "${GREEN}What is your New Nextcloud domain name?${ENDCOLOR}"
-read 
-echo -n $REPLY > /var/lib/domains/nextcloud
-
-echo -e "${GREEN}What is your New BTCPayserver domain name?${ENDCOLOR}"
-read 
-echo -n $REPLY > /var/lib/domains/btcpayserver
-
-echo -e "${GREEN}What is your New Vaultwarden domain name?${ENDCOLOR}"
-read 
-echo -n $REPLY > /var/lib/domains/vaultwarden
-
-echo -e "${GREEN}What is 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
-
-#
-
-mkdir /var/lib/nextcloudaddition
-
-cat <<EOT >> /var/lib/nextcloudaddition/nextcloudaddition       
-
-'trusted_proxies' =>
-  array (
-    0 => '127.0.0.1',
-  ),
-'default_locale' => 'en_US',
-'default_phone_region' => 'US',
-'filelocking.enabled' => true,
-'memcache.local' => '\OC\Memcache\APCu',
-
-EOT
-
-#
-
-mkdir /var/lib/njalla/
-
-cat <<EOT >> /var/lib/njalla/njalla.sh
-
-#!/usr/bin/env bash
-
-# IP=$(wget -qO- https://ipecho.net/plain ; echo)
-
-## Manually Add DDNS Script From Njalla User Account AFTER Install
-
-#curl "https://...${IP}"
-
-
-EOT
-
-#
-
-mkdir /var/lib/external_ip
-
-cat <<EOT >> /var/lib/external_ip/external_ip.sh
-
-#!/usr/bin/env bash
-
-wget -qO- https://ipecho.net/plain ; echo > /var/lib/secrets/external_ip
-
-
-EOT
-
-#
-
-mkdir /var/lib/agenix-secrets/
-
-cat <<EOT >> /var/lib/agenix-secrets/secrets.nix
-
-let
-
-  root = "placeholder" ;
-
-in
-{
-
-  "wordpressdb.age".publicKeys = [ root ];
-  
-  "matrixdb.age".publicKeys = [ root ];
-
-  "nextclouddb.age".publicKeys = [ root ];
-
-  "turn.age".publicKeys = [ root ];
-
-  "matrix_reg_secret.age".publicKeys = [ root ];
-
-}
-
-
-EOT
-
-#
-
-mkdir /var/lib/secrets
-mkdir /var/lib/secrets/vaultwarden
-
-touch /var/lib/secrets/nextclouddb
-touch /var/lib/secrets/wordpressdb
-touch /var/lib/secrets/matrixdb
-touch /var/lib/secrets/turn
-touch /var/lib/secrets/matrix_reg_secret
-touch /var/lib/secrets/main
-touch /var/lib/secrets/onlyofficejwtSecretFile
-touch /var/lib/secrets/vaultwarden/vaultwarden.env
-touch /var/lib/secrets/external_ip
-
-echo -n $(pwgen -s 17 -1) > /var/lib/secrets/nextclouddb 
-echo -n $(pwgen -s 17 -1) > /var/lib/secrets/wordpressdb 
-echo -n $(pwgen -s 17 -1) > /var/lib/secrets/matrixdb
-echo -n $(pwgen -s 17 -1) > /var/lib/secrets/turn
-echo -n $(pwgen -s 17 -1) > /var/lib/secrets/matrix_reg_secret
-echo -n $(pwgen -s 17 -1) > /var/lib/secrets/main
-echo -n $(pwgen -s 17 -1) > /var/lib/secrets/onlyofficejwtSecretFile
-echo -n ADMIN_TOKEN=$(openssl rand -base64 48
-) > /var/lib/secrets/vaultwarden/vaultwarden.env
-
-#
-
-mkdir -p /root/.ssh/agenix
-
-ssh-keygen -q -N "" -t ed25519 -f /root/.ssh/agenix/agenix-secret-keys
-
-sed -i -e "0,/root.*/{s::root = $(cat /root/.ssh/agenix/agenix-secret-keys.pub):};s:root@nixos::" /var/lib/agenix-secrets/secrets.nix
-
-sed -i 's:\(root =[[:blank:]]*\)\(.*\):\1"\2";:' /var/lib/agenix-secrets/secrets.nix
-
-#
-
-pushd /var/lib/agenix-secrets
-
-  echo -n $(cat /var/lib/secrets/wordpressdb) | EDITOR='cp /dev/stdin' nix run github:ryantm/agenix -- -e wordpressdb.age -i /root/.ssh/agenix/agenix-secret-keys
-
-  echo -n $(cat /var/lib/secrets/nextclouddb) | EDITOR='cp /dev/stdin' nix run github:ryantm/agenix -- -e nextclouddb.age -i /root/.ssh/agenix/agenix-secret-keys
-
-  echo -n $(cat /var/lib/secrets/matrixdb) | EDITOR='cp /dev/stdin' nix run github:ryantm/agenix -- -e matrixdb.age -i /root/.ssh/agenix/agenix-secret-keys
-
-  echo -n $(cat /var/lib/secrets/turn) | EDITOR='cp /dev/stdin' nix run github:ryantm/agenix -- -e turn.age -i /root/.ssh/agenix/agenix-secret-keys
-
-  echo -n $(cat /var/lib/secrets/matrix_reg_secret) | EDITOR='cp /dev/stdin' nix run github:ryantm/agenix -- -e matrix_reg_secret.age -i /root/.ssh/agenix/agenix-secret-keys
-
-popd
-
-
-pushd /etc/nixos
-
-  nix flake update
-
-  nixos-rebuild switch --impure
-
-popd
-
-
-#
-
-chown root:root /var/lib/secrets/main -R
-
-chown root:root /var/lib/secrets/external_ip -R
-
-chown matrix-synapse:matrix-synapse /var/lib/secrets/matrix_reg_secret -R
-
-chown matrix-synapse:matrix-synapse /var/lib/secrets/matrixdb -R
-
-chown postgres:postgres /var/lib/secrets/nextclouddb -R
-
-chown turnserver:turnserver /var/lib/secrets/turn -R
-
-chown mysql:mysql /var/lib/secrets/wordpressdb -R
-
-chown vaultwarden:vaultwarden /var/lib/secrets/vaultwarden -R
-
-chown onlyoffice:onlyoffice /var/lib/secrets/onlyofficejwtSecretFile
-
-chmod 770 /var/lib/secrets/ -R
-
-#
-
-chown caddy:php /var/lib/domains -R
-
-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
-
-wget -P /var/lib/www/downloadnc https://download.nextcloud.com/server/releases/latest.zip
-
-unzip /var/lib/www/downloadwp/latest.zip -d /var/lib/www/
-
-unzip /var/lib/www/downloadnc/latest.zip -d /var/lib/www/
-
-rm -rf /var/lib/www/downloadwp
-
-rm -rf /var/lib/www/downloadnc
-
-chown caddy:php /var/lib/www -R
-
-chmod 770 /var/lib/www -R
-
-#
-
-mkdir /var/lib/nextcloud
-
-chown caddy:php /var/lib/nextcloud -R
-
-chmod 770 /var/lib/nextcloud -R
-
-#
-
-mkdir /var/lib/coturn
-
-chown turnserver:turnserver /var/lib/coturn -R
-
-chmod 770 /var/lib/coturn -R
-
-#
-
-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
-
-#
-
-chown bitcoin:bitcoin /run/media/Second_Drive/BTCEcoandBackup/Bitcoin_Node -R
-
-chmod 770 /run/media/Second_Drive/BTCEcoandBackup/Bitcoin_Node -R
-
-chown electrs:electrs /run/media/Second_Drive/BTCEcoandBackup/Electrs_Data -R
-
-chmod 770 /run/media/Second_Drive/BTCEcoandBackup/Electrs_Data -R
-
-#
-
-pushd /etc/nixos
-
-  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
-
-  bash sovran_systemsOS_reseter_install.sh
-
-popd
-
-#
-
-pushd /home/free/Downloads
-
-  wget https://git.sovransystems.com/Sovran_Systems/Software/raw/branch/main/Sovran_SystemsOS_Updater/sovran_systemsOS_updater_local_installer/sovran_systemsOS_updater_install.sh
-
-  bash sovran_systemsOS_updater_install.sh
-
-popd
-
-#
-
-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
-
-#
-
-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
-
-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"
-
-echo -e "$(pwgen -s 17 -1) \n"
-echo -e "$(pwgen -s 17 -1) \n"
-echo -e "$(pwgen -s 17 -1) \n"
-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 -e "${GREEN}All Finished! Please Reboot then Enjoy your New Sovran Pro!${ENDCOLOR} \n"

iso/branding.nix

@@ -0,0 +1,12 @@
+{ config, pkgs, lib, ... }:
+
+let
+  theme = pkgs.callPackage ./plymouth-theme.nix {};
+in
+{
+  boot.plymouth.enable = true;
+  boot.plymouth.theme = "sovran";
+  boot.plymouth.themePackages = [ theme ];
+  boot.kernelParams = [ "quiet" "splash" ];
+  boot.initrd.systemd.enable = true;
+}

iso/common.nix

@@ -0,0 +1,80 @@
+{ config, pkgs, lib, modulesPath, ... }:
+
+let
+  sovranSource = builtins.path { path = ../.; name = "sovran-systemsos"; };
+
+  pythonEnv = pkgs.python3.withPackages (ps: [ ps.pygobject3 ps.pycairo ]);
+
+  installerPy = pkgs.writeShellScriptBin "sovran-install" ''
+    export GI_TYPELIB_PATH=${pkgs.gtk4}/lib/girepository-1.0:${pkgs.libadwaita}/lib/girepository-1.0:${pkgs.glib}/lib/girepository-1.0:${pkgs.pango.out}/lib/girepository-1.0:${pkgs.gdk-pixbuf}/lib/girepository-1.0:${pkgs.graphene}/lib/girepository-1.0:${pkgs.cairo}/lib/girepository-1.0:${pkgs.harfbuzz}/lib/girepository-1.0:${pkgs.gobject-introspection}/lib/girepository-1.0
+export LD_LIBRARY_PATH=${pkgs.gtk4}/lib:${pkgs.libadwaita}/lib:${pkgs.glib}/lib:${pkgs.pango.out}/lib:${pkgs.gdk-pixbuf}/lib:${pkgs.graphene}/lib:${pkgs.cairo}/lib:${pkgs.harfbuzz}/lib
+    export GDK_PIXBUF_MODULE_FILE="${pkgs.gdk-pixbuf}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache"
+    export XDG_DATA_DIRS="${pkgs.gsettings-desktop-schemas}/share/gsettings-schemas/${pkgs.gsettings-desktop-schemas.name}:${pkgs.gtk4}/share:${pkgs.libadwaita}/share:${pkgs.adwaita-icon-theme}/share:${pkgs.hicolor-icon-theme}/share:$XDG_DATA_DIRS"
+    exec ${pythonEnv}/bin/python3 /etc/sovran/installer.py
+  '';
+in
+{
+  imports = [
+    "${modulesPath}/installer/cd-dvd/installation-cd-graphical-gnome.nix"
+    ./branding.nix
+  ];
+
+  image.baseName = lib.mkForce "Sovran_SystemsOS";
+  isoImage.splashImage = ./assets/splash-logo.png;
+
+  services.gnome.gnome-initial-setup.enable = false;
+  environment.gnome.excludePackages = with pkgs; [ gnome-tour gnome-user-docs ];
+
+  security.sudo.wheelNeedsPassword = false;
+  users.users.free = {
+    isNormalUser = true;
+    description = "free";
+    extraGroups = [ "networkmanager" "wheel" ];
+    initialPassword = "free";
+  };
+
+  services.displayManager.autoLogin.enable = true;
+  services.displayManager.autoLogin.user = lib.mkForce "free";
+  
+  nix-bitcoin.generateSecrets = lib.mkDefault true;
+ 
+  nix.settings.experimental-features = [ "nix-command" "flakes" ];
+
+  environment.systemPackages = with pkgs; [
+    installerPy
+    pythonEnv
+    gtk4
+    libadwaita
+    gobject-introspection
+    glib
+    pango
+    gdk-pixbuf
+    graphene
+    cairo
+    harfbuzz
+    gsettings-desktop-schemas
+    adwaita-icon-theme
+    util-linux
+    disko
+    parted
+    dosfstools
+    e2fsprogs
+    gptfdisk
+    nixos-install-tools
+    git
+    curl
+  ];
+
+  environment.etc."sovran/logo.png".source = ./assets/splash-logo.png;
+  environment.etc."sovran/flake".source = sovranSource;
+  environment.etc."sovran/installer.py".source = ./installer.py;
+
+  environment.etc."xdg/autostart/sovran-installer.desktop".text = ''
+[Desktop Entry]
+Type=Application
+Name=Sovran Guided Installer
+Exec=${installerPy}/bin/sovran-install
+Terminal=false
+X-GNOME-Autostart-enabled=true
+'';
+}

iso/desktop.nix

@@ -0,0 +1,5 @@
+{ config, pkgs, lib, ... }:
+
+{
+  imports = [ ./common.nix ];
+}

iso/disko.nix

@@ -0,0 +1,62 @@
+{ device ? "/dev/sda", dataDevice ? "", ... }:
+
+{
+  disko.devices = {
+    disk = {
+      main = {
+        type = "disk";
+        device = builtins.toString device;
+        content = {
+          type = "gpt";
+          partitions = {
+            ESP = {
+              priority = 1;
+              name = "ESP";
+              start = "1M";
+              end = "512M";
+              type = "EF00";
+              content = {
+                type = "filesystem";
+                format = "vfat";
+                mountpoint = "/boot/efi";
+                mountOptions = [ "umask=0077" "defaults" ];
+              };
+            };
+            root = {
+              name = "root";
+              start = "512M";
+              end = "100%";
+              content = {
+                type = "filesystem";
+                format = "ext4";
+                mountpoint = "/";
+                extraArgs = [ "-L" "sovran_systemsos" ];
+              };
+            };
+          };
+        };
+      };
+    } // (if dataDevice != "" then {
+      data = {
+        type = "disk";
+        device = builtins.toString dataDevice;
+        content = {
+          type = "gpt";
+          partitions = {
+            primary = {
+              name = "primary";
+              start = "1M";
+              end = "100%";
+              content = {
+                type = "filesystem";
+                format = "ext4";
+                mountpoint = "/run/media/Second_Drive";
+                extraArgs = [ "-L" "BTCEcoandBackup" ];
+              };
+            };
+          };
+        };
+      };
+    } else {});
+  };
+}

iso/installer.py

@@ -0,0 +1,852 @@
+#!/usr/bin/env python3
+import gi
+gi.require_version("Gtk", "4.0")
+gi.require_version("Adw", "1")
+from gi.repository import Gtk, Adw, GLib
+import atexit
+import os
+import subprocess
+import sys
+import threading
+import time
+
+LOGO = "/etc/sovran/logo.png"
+LOG = "/tmp/sovran-install.log"
+FLAKE = "/etc/sovran/flake"
+
+try:
+    logfile = open(LOG, "a")
+    atexit.register(logfile.close)
+except OSError:
+    logfile = None
+
+def log(msg):
+    if logfile is not None:
+        logfile.write(msg + "\n")
+        logfile.flush()
+    else:
+        print(msg, file=sys.stderr)
+
+def run(cmd):
+    log(f"$ {' '.join(cmd)}")
+    result = subprocess.run(cmd, capture_output=True, text=True)
+    log(result.stdout)
+    if result.returncode != 0:
+        log(result.stderr)
+        raise RuntimeError(result.stderr.strip() or f"Command failed: {' '.join(cmd)}")
+    return result.stdout.strip()
+
+def run_stream(cmd, buf):
+    log(f"$ {' '.join(cmd)}")
+    proc = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, text=True)
+    for line in proc.stdout:
+        log(line.rstrip())
+        GLib.idle_add(append_text, buf, line)
+    proc.wait()
+    if proc.returncode != 0:
+        raise RuntimeError(f"Command failed (exit {proc.returncode}). See {LOG}")
+
+def append_text(buf, text):
+    buf.insert(buf.get_end_iter(), text)
+    return False
+
+def human_size(nbytes):
+    for unit in ["B", "KB", "MB", "GB", "TB"]:
+        if nbytes < 1024:
+            return f"{nbytes:.1f} {unit}"
+        nbytes /= 1024
+    return f"{nbytes:.1f} PB"
+
+def check_internet():
+    """Return True if the machine can reach the internet."""
+    try:
+        result = subprocess.run(
+            ["ping", "-c", "1", "-W", "5", "nixos.org"],
+            capture_output=True, text=True
+        )
+        if result.returncode == 0:
+            return True
+    except Exception:
+        pass
+    # Fallback: try a second host in case DNS for nixos.org is down
+    try:
+        result = subprocess.run(
+            ["ping", "-c", "1", "-W", "5", "1.1.1.1"],
+            capture_output=True, text=True
+        )
+        return result.returncode == 0
+    except Exception:
+        return False
+
+def symbolic_icon(name):
+    """Create a crisp symbolic icon suitable for use as an ActionRow prefix."""
+    icon = Gtk.Image.new_from_icon_name(name)
+    icon.set_icon_size(Gtk.IconSize.LARGE)
+    icon.add_css_class("dim-label")
+    return icon
+
+
+# ── Application ────────────────────────────────────────────────────────────────
+
+class InstallerApp(Adw.Application):
+    def __init__(self):
+        super().__init__(application_id="com.sovransystems.installer")
+        self.connect("activate", self.on_activate)
+
+    def on_activate(self, app):
+        self.win = InstallerWindow(application=app)
+        self.win.present()
+
+
+# ── Main Window ────────────────────────────────────────────────────────────────
+
+class InstallerWindow(Adw.ApplicationWindow):
+    def __init__(self, **kwargs):
+        super().__init__(**kwargs)
+        self.set_title("Sovran_SystemsOS Installer")
+        self.set_default_size(820, 600)
+        self.set_resizable(False)
+
+        self.role = None
+        self.boot_disk = None
+        self.boot_size = None
+        self.data_disk = None
+        self.data_size = None
+
+        # Root navigation view
+        self.nav = Adw.NavigationView()
+        self.set_content(self.nav)
+
+        # Check for internet before anything else
+        if check_internet():
+            self.push_welcome()
+        else:
+            self.push_no_internet()
+
+    # ── Navigation helpers ─────────────────────────────────────────────────
+
+    def push_page(self, title, child, show_back=False):
+        page = Adw.NavigationPage(title=title, tag=title)
+        toolbar = Adw.ToolbarView()
+
+        header = Adw.HeaderBar()
+        header.set_show_end_title_buttons(False)
+        if not show_back:
+            header.set_show_start_title_buttons(False)
+        toolbar.add_top_bar(header)
+        toolbar.set_content(child)
+
+        page.set_child(toolbar)
+        self.nav.push(page)
+
+    def replace_page(self, title, child):
+        # Pop all and push fresh
+        while self.nav.get_visible_page() is not None:
+            try:
+                self.nav.pop()
+            except Exception:
+                break
+        self.push_page(title, child)
+
+    # ── Shared widgets ───────────────��─────────────────────────────────────
+
+    def make_scrolled_log(self):
+        sw = Gtk.ScrolledWindow()
+        sw.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC)
+        sw.set_vexpand(True)
+
+        tv = Gtk.TextView()
+        tv.set_editable(False)
+        tv.set_cursor_visible(False)
+        tv.set_wrap_mode(Gtk.WrapMode.WORD_CHAR)
+        tv.set_monospace(True)
+        tv.add_css_class("log-view")
+        buf = tv.get_buffer()
+
+        def on_changed(b):
+            GLib.idle_add(lambda: sw.get_vadjustment().set_value(
+                sw.get_vadjustment().get_upper()
+            ))
+        buf.connect("changed", on_changed)
+
+        sw.set_child(tv)
+        return sw, buf
+
+    def nav_row(self, back_label=None, back_cb=None, next_label="Continue", next_cb=None):
+        box = Gtk.Box(orientation=Gtk.Orientation.HORIZONTAL, spacing=8)
+        box.set_margin_top(12)
+        box.set_margin_bottom(24)
+        box.set_margin_start(40)
+        box.set_margin_end(40)
+
+        if back_label and back_cb:
+            btn = Gtk.Button(label=back_label)
+            btn.connect("clicked", back_cb)
+            box.append(btn)
+
+        spacer = Gtk.Label()
+        spacer.set_hexpand(True)
+        box.append(spacer)
+
+        if next_cb:
+            btn = Gtk.Button(label=next_label)
+            btn.add_css_class("suggested-action")
+            btn.add_css_class("pill")
+            btn.connect("clicked", next_cb)
+            box.append(btn)
+
+        return box
+
+    # ── No Internet Screen ─────────────────────────────────────────────────
+
+    def push_no_internet(self):
+        outer = Gtk.Box(orientation=Gtk.Orientation.VERTICAL, spacing=0)
+
+        status = Adw.StatusPage()
+        status.set_title("No Internet Connection")
+        status.set_description(
+            "An active internet connection is required to install Sovran_SystemsOS.\n\n"
+            "Please connect an Ethernet cable or configure Wi-Fi,\n"
+            "then press Retry."
+        )
+        status.set_icon_name("network-offline-symbolic")
+        status.set_vexpand(True)
+        outer.append(status)
+
+        btn_box = Gtk.Box(orientation=Gtk.Orientation.HORIZONTAL, spacing=12)
+        btn_box.set_halign(Gtk.Align.CENTER)
+        btn_box.set_margin_bottom(32)
+
+        retry_btn = Gtk.Button(label="Retry")
+        retry_btn.add_css_class("suggested-action")
+        retry_btn.add_css_class("pill")
+        retry_btn.connect("clicked", self.on_retry_internet)
+        btn_box.append(retry_btn)
+
+        outer.append(btn_box)
+
+        self.push_page("No Internet", outer)
+
+    def on_retry_internet(self, btn):
+        if check_internet():
+            # Pop the no-internet page and proceed to welcome
+            try:
+                self.nav.pop()
+            except Exception:
+                pass
+            self.push_welcome()
+        else:
+            dlg = Adw.MessageDialog()
+            dlg.set_transient_for(self)
+            dlg.set_heading("Still Offline")
+            dlg.set_body(
+                "Could not reach the internet.\n"
+                "Please check your network connection and try again."
+            )
+            dlg.add_response("ok", "OK")
+            dlg.present()
+
+    # ── Step 1: Welcome & Role ─────────────────────────────────────────────
+
+    def push_welcome(self):
+        outer = Gtk.Box(orientation=Gtk.Orientation.VERTICAL, spacing=0)
+
+        # Hero
+        hero = Gtk.Box(orientation=Gtk.Orientation.VERTICAL, spacing=8)
+        hero.set_margin_top(32)
+        hero.set_margin_bottom(24)
+        hero.set_halign(Gtk.Align.CENTER)
+
+        if os.path.exists(LOGO):
+            try:
+                img = Gtk.Image.new_from_file(LOGO)
+                img.set_pixel_size(480)
+                hero.append(img)
+            except Exception:
+                pass
+
+        title = Gtk.Label()
+        title.set_markup("<span size='xx-large' weight='heavy'>Sovran Systems</span>")
+        hero.append(title)
+
+        sub = Gtk.Label()
+        sub.set_markup("<span size='large' style='italic' foreground='#888888'>Be Digitally Sovereign</span>")
+        hero.append(sub)
+
+        outer.append(hero)
+
+        sep = Gtk.Separator()
+        sep.set_margin_start(40)
+        sep.set_margin_end(40)
+        outer.append(sep)
+
+        # Role label
+        role_lbl = Gtk.Label()
+        role_lbl.set_markup("<span size='medium' weight='bold'>Choose your installation type:</span>")
+        role_lbl.set_halign(Gtk.Align.START)
+        role_lbl.set_margin_start(40)
+        role_lbl.set_margin_top(20)
+        role_lbl.set_margin_bottom(8)
+        outer.append(role_lbl)
+
+        # Role cards
+        roles = [
+            ("Server + Desktop",
+             "Full sovereign experience: beautiful desktop, your own cloud, secure messaging, Bitcoin node, and more.",
+             "Server+Desktop"),
+            ("Desktop Only",
+             "A beautiful, easy-to-use desktop without the background server applications.",
+             "Desktop Only"),
+            ("Node Only",
+             "Full Bitcoin node with Lightning and non-KYC buying and selling. No desktop.",
+             "Node (Bitcoin-only)"),
+        ]
+
+        self._role_radios = []
+        radio_group = None
+        cards_box = Gtk.Box(orientation=Gtk.Orientation.VERTICAL, spacing=8)
+        cards_box.set_margin_start(40)
+        cards_box.set_margin_end(40)
+
+        for label, desc, key in roles:
+            card = Adw.ActionRow()
+            card.set_title(label)
+            card.set_subtitle(desc)
+
+            radio = Gtk.CheckButton()
+            radio.set_name(key)
+            if radio_group is None:
+                radio_group = radio
+                radio.set_active(True)
+            else:
+                radio.set_group(radio_group)
+
+            card.add_prefix(radio)
+            card.set_activatable_widget(radio)
+            self._role_radios.append(radio)
+            cards_box.append(card)
+
+        outer.append(cards_box)
+
+        outer.append(Gtk.Label(label="", vexpand=True))
+        outer.append(self.nav_row(
+            next_label="Next  →",
+            next_cb=self.on_role_next
+        ))
+
+        self.push_page("Welcome to Sovran_SystemsOS Installer", outer)
+
+    def on_role_next(self, btn):
+        for radio in self._role_radios:
+            if radio.get_active():
+                self.role = radio.get_name()
+                break
+        self.push_port_requirements()
+
+    # ── Step 1b: Port Requirements Notice ─────────────────────────────────
+
+    def push_port_requirements(self):
+        """Inform the user about required router/firewall ports before install."""
+        outer = Gtk.Box(orientation=Gtk.Orientation.VERTICAL, spacing=0)
+
+        # Detect internal IP at install time
+        internal_ip = "this machine's LAN IP"
+        try:
+            import subprocess as _sp
+            _r = _sp.run(["hostname", "-I"], capture_output=True, text=True, timeout=5)
+            if _r.returncode == 0:
+                _parts = _r.stdout.strip().split()
+                if _parts:
+                    internal_ip = _parts[0]
+        except Exception:
+            pass
+
+        # Warning banner
+        banner = Adw.Banner()
+        banner.set_title(
+            "⚠  Port Forwarding Setup Required — configure your router before install"
+        )
+        banner.set_revealed(True)
+        banner.set_margin_top(16)
+        banner.set_margin_start(40)
+        banner.set_margin_end(40)
+        outer.append(banner)
+
+        intro = Gtk.Label()
+        intro.set_markup(
+            "<span foreground='#a6adc8'>"
+            "Many Sovran_SystemsOS features require <b>port forwarding</b> to be configured "
+            "in your router's admin panel. This means telling your router to forward "
+            "specific ports to <b>this machine's internal LAN IP</b>.\n\n"
+            "Services like Element Video/Audio Calling and Matrix Federation "
+            "<b>will not work for clients outside your LAN</b> unless these ports are "
+            "forwarded to this machine."
+            "</span>"
+        )
+        intro.set_wrap(True)
+        intro.set_justify(Gtk.Justification.FILL)
+        intro.set_margin_top(14)
+        intro.set_margin_start(40)
+        intro.set_margin_end(40)
+        outer.append(intro)
+
+        ip_label = Gtk.Label()
+        ip_label.set_markup(
+            f"<span foreground='#89b4fa' font_desc='monospace'>"
+            f"  Forward ports to this machine's internal IP:  <b>{internal_ip}</b>"
+            f"</span>"
+        )
+        ip_label.set_margin_top(10)
+        ip_label.set_margin_start(40)
+        ip_label.set_margin_end(40)
+        outer.append(ip_label)
+
+        sw = Gtk.ScrolledWindow()
+        sw.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC)
+        sw.set_vexpand(True)
+        sw.set_margin_start(40)
+        sw.set_margin_end(40)
+        sw.set_margin_top(12)
+        sw.set_margin_bottom(8)
+
+        ports_box = Gtk.Box(orientation=Gtk.Orientation.VERTICAL, spacing=12)
+
+        port_sections = [
+            (
+                "🌐  Web / HTTPS  (all domain-based services)",
+                [("80", "TCP", "HTTP (redirects to HTTPS)"),
+                 ("443", "TCP", "HTTPS")],
+            ),
+            (
+                "💬  Matrix Federation  (Matrix-Synapse)",
+                [("8448", "TCP", "Server-to-server federation")],
+            ),
+            (
+                "🎥  Element Video & Audio Calling  (LiveKit / Element-call)",
+                [("7881",         "TCP",     "LiveKit WebRTC signalling"),
+                 ("7882-7894",    "UDP",     "LiveKit media streams"),
+                 ("5349",         "TCP",     "TURN over TLS"),
+                 ("3478",         "UDP",     "TURN (STUN / relay)"),
+                 ("30000-40000",  "TCP/UDP", "TURN relay (WebRTC media)")],
+            ),
+            (
+                "🖥  Remote SSH  (optional — only if you want WAN SSH access)",
+                [("22", "TCP", "SSH")],
+            ),
+        ]
+
+        for section_title, rows in port_sections:
+            group = Adw.PreferencesGroup()
+            group.set_title(section_title)
+
+            for port, proto, desc in rows:
+                row = Adw.ActionRow()
+                row.set_title(f"Port {port}  ({proto})")
+                row.set_subtitle(desc)
+                group.add(row)
+
+            ports_box.append(group)
+
+        note = Gtk.Label()
+        note.set_markup(
+            "<span foreground='#6c7086' size='small'>"
+            "ℹ  In your router's admin panel (usually at 192.168.1.1), find the "
+            "\"<b>Port Forwarding</b>\" section and add a rule for each port above with "
+            "the destination set to <b>this machine's internal IP</b>.  "
+            "These ports only need to be forwarded to this specific machine — "
+            "this does <b>NOT</b> expose your entire network.\n"
+            "To verify forwarding is working, test from a device on a different network "
+            "(e.g. a phone on mobile data) or check your router's port forwarding page."
+            "</span>"
+        )
+        note.set_wrap(True)
+        note.set_justify(Gtk.Justification.FILL)
+        note.set_margin_top(8)
+        ports_box.append(note)
+
+        sw.set_child(ports_box)
+        outer.append(sw)
+
+        outer.append(self.nav_row(
+            back_label="←  Back",
+            back_cb=lambda b: self.nav.pop(),
+            next_label="I Understand  →",
+            next_cb=lambda b: self.push_disk_confirm(),
+        ))
+
+        self.push_page("Network Port Requirements", outer, show_back=True)
+
+    # ── Step 2: Disk Confirm ───────────────────────────────────────────────
+
+    def push_disk_confirm(self):
+        try:
+            raw = run(["lsblk", "-b", "-dno", "NAME,SIZE,TYPE,RO,TRAN", "-e", "7,11"])
+        except Exception as e:
+            self.show_error(str(e))
+            return
+
+        disks = []
+        for line in raw.splitlines():
+            parts = line.split()
+            if len(parts) >= 4 and parts[2] == "disk" and parts[3] == "0":
+                tran = parts[4] if len(parts) >= 5 else ""
+                if tran != "usb":
+                    disks.append((parts[0], int(parts[1])))
+
+        if not disks:
+            self.show_error("No valid internal drives found. USB drives are excluded.")
+            return
+
+        disks.sort(key=lambda x: x[1])
+        self.boot_disk, self.boot_size = disks[0]
+        self.data_disk, self.data_size = None, None
+
+        BYTES_2TB = 2 * 1024 ** 4
+        if len(disks) >= 2:
+            d, s = disks[-1]
+            if s >= BYTES_2TB:
+                self.data_disk, self.data_size = d, s
+
+        outer = Gtk.Box(orientation=Gtk.Orientation.VERTICAL, spacing=0)
+
+        # Disk info group
+        disk_group = Adw.PreferencesGroup()
+        disk_group.set_title("Drives to be erased")
+        disk_group.set_margin_top(24)
+        disk_group.set_margin_start(40)
+        disk_group.set_margin_end(40)
+
+        boot_row = Adw.ActionRow()
+        boot_row.set_title("Boot Disk")
+        boot_row.set_subtitle(f"/dev/{self.boot_disk}  —  {human_size(self.boot_size)}")
+        boot_row.add_prefix(symbolic_icon("drive-harddisk-symbolic"))
+        disk_group.add(boot_row)
+
+        if self.data_disk:
+            data_row = Adw.ActionRow()
+            data_row.set_title("Data Disk")
+            data_row.set_subtitle(f"/dev/{self.data_disk}  —  {human_size(self.data_size)}")
+            data_row.add_prefix(symbolic_icon("drive-harddisk-symbolic"))
+            disk_group.add(data_row)
+        else:
+            no_row = Adw.ActionRow()
+            no_row.set_title("Data Disk")
+            no_row.set_subtitle("None detected  (requires 2 TB or larger)")
+            no_row.add_prefix(symbolic_icon("drive-harddisk-symbolic"))
+            disk_group.add(no_row)
+
+        outer.append(disk_group)
+
+        # Warning banner
+        banner = Adw.Banner()
+        banner.set_title("⚠  All data on the above disk(s) will be permanently destroyed.")
+        banner.set_revealed(True)
+        banner.set_margin_top(16)
+        banner.set_margin_start(40)
+        banner.set_margin_end(40)
+        outer.append(banner)
+
+        # Confirm entry group
+        entry_group = Adw.PreferencesGroup()
+        entry_group.set_title("Type  ERASE  to confirm")
+        entry_group.set_margin_top(16)
+        entry_group.set_margin_start(40)
+        entry_group.set_margin_end(40)
+
+        entry_row = Adw.EntryRow()
+        entry_row.set_title("Confirmation")
+        self._confirm_entry = entry_row
+        entry_group.add(entry_row)
+
+        outer.append(entry_group)
+        outer.append(Gtk.Label(label="", vexpand=True))
+        outer.append(self.nav_row(
+            back_label="←  Back",
+            back_cb=lambda b: self.nav.pop(),
+            next_label="Begin Installation",
+            next_cb=self.on_confirm_next
+        ))
+
+        self.push_page("Confirm Installation", outer, show_back=True)
+
+    def on_confirm_next(self, btn):
+        if self._confirm_entry.get_text().strip() != "ERASE":
+            dlg = Adw.MessageDialog()
+            dlg.set_transient_for(self)
+            dlg.set_heading("Confirmation Required")
+            dlg.set_body("You must type ERASE exactly to proceed.")
+            dlg.add_response("ok", "OK")
+            dlg.present()
+            return
+        self.push_progress(
+            "Preparing Drives",
+            "Partitioning and formatting your drives...",
+            self.do_partition
+        )
+
+    # ── Step 3 & 5: Progress ──────────────────────────────────────────────
+
+    def push_progress(self, title, subtitle, worker_fn):
+        outer = Gtk.Box(orientation=Gtk.Orientation.VERTICAL, spacing=0)
+
+        status = Adw.StatusPage()
+        status.set_title(title)
+        status.set_description(subtitle)
+        status.set_icon_name("emblem-synchronizing-symbolic")
+        status.set_vexpand(False)
+        outer.append(status)
+
+        spinner = Gtk.Spinner()
+        spinner.set_size_request(32, 32)
+        spinner.set_halign(Gtk.Align.CENTER)
+        spinner.start()
+        outer.append(spinner)
+
+        sw, buf = self.make_scrolled_log()
+        sw.set_margin_start(40)
+        sw.set_margin_end(40)
+        sw.set_margin_top(12)
+        sw.set_margin_bottom(12)
+        sw.set_vexpand(True)
+        outer.append(sw)
+
+        self.push_page(title, outer)
+
+        def thread_fn():
+            try:
+                worker_fn(buf)
+            except Exception as e:
+                GLib.idle_add(self.show_error, str(e))
+
+        threading.Thread(target=thread_fn, daemon=True).start()
+
+    # ── Worker: partition ─────────────────────────────────────────────────
+
+    def do_partition(self, buf):
+        boot_path = f"/dev/{self.boot_disk}"
+
+        # ── Wipe disk(s) to clear stale GPT/MBR data before disko ──
+        GLib.idle_add(append_text, buf, "=== Wiping disk(s) ===\n")
+
+        run_stream(["sudo", "sgdisk", "--zap-all", boot_path], buf)
+        run_stream(["sudo", "wipefs", "--all", "--force", boot_path], buf)
+
+        if self.data_disk:
+            data_path = f"/dev/{self.data_disk}"
+            run_stream(["sudo", "sgdisk", "--zap-all", data_path], buf)
+            run_stream(["sudo", "wipefs", "--all", "--force", data_path], buf)
+
+        # Inform the kernel of the wiped partition tables
+        run_stream(["sudo", "partprobe", boot_path], buf)
+        if self.data_disk:
+            run_stream(["sudo", "partprobe", data_path], buf)
+
+        # Short settle so the kernel finishes re-reading
+        time.sleep(2)
+
+        # ── Now run disko on a clean disk ──
+        GLib.idle_add(append_text, buf, "\n=== Partitioning drives ===\n")
+        cmd = [
+            "sudo", "disko", "--mode", "disko",
+            f"{FLAKE}/iso/disko.nix",
+            "--arg", "device", f'"{boot_path}"'
+        ]
+        if self.data_disk:
+            cmd += ["--arg", "dataDevice", f'"/dev/{self.data_disk}"']
+        run_stream(cmd, buf)
+
+        GLib.idle_add(append_text, buf, "\n=== Generating hardware config ===\n")
+        run_stream(["sudo", "nixos-generate-config", "--root", "/mnt"], buf)
+
+        GLib.idle_add(append_text, buf, "\n=== Copying flake to /mnt ===\n")
+        run(["sudo", "cp", "/mnt/etc/nixos/hardware-configuration.nix", "/tmp/hardware-configuration.nix"])
+        run(["sudo", "rm", "-rf", "/mnt/etc/nixos/"])
+        run(["sudo", "mkdir", "-p", "/mnt/etc/nixos"])
+        run(["sudo", "cp", "-a", f"{FLAKE}/.", "/mnt/etc/nixos/"])
+        run(["sudo", "cp", "/tmp/hardware-configuration.nix", "/mnt/etc/nixos/hardware-configuration.nix"])
+
+        GLib.idle_add(append_text, buf, "\n=== Writing role config ===\n")
+        self.write_role_state()
+        GLib.idle_add(append_text, buf, "Done.\n")
+
+        GLib.idle_add(self.push_ready)
+
+    def write_role_state(self):
+        is_server = str(self.role == "Server+Desktop").lower()
+        is_desktop = str(self.role == "Desktop Only").lower()
+        is_node = str(self.role == "Node (Bitcoin-only)").lower()
+        content = f"""# THIS FILE IS AUTO-GENERATED BY THE INSTALLER. DO NOT EDIT.
+{{ config, lib, ... }}:
+{{
+  sovran_systemsOS.roles.server_plus_desktop = lib.mkDefault {is_server};
+  sovran_systemsOS.roles.desktop = lib.mkDefault {is_desktop};
+  sovran_systemsOS.roles.node = lib.mkDefault {is_node};
+}}
+"""
+        proc = subprocess.run(
+            ["sudo", "tee", "/mnt/etc/nixos/role-state.nix"],
+            input=content, text=True, capture_output=True
+        )
+        log(proc.stdout)
+        if proc.returncode != 0:
+            raise RuntimeError(f"Failed to write role-state.nix: {proc.stderr}")
+        run(["sudo", "cp", "/mnt/etc/nixos/custom.template.nix", "/mnt/etc/nixos/custom.nix"])
+
+    # ── Step 4: Ready to install ────────���──────────────────────────────────
+
+    def push_ready(self):
+        outer = Gtk.Box(orientation=Gtk.Orientation.VERTICAL, spacing=0)
+
+        status = Adw.StatusPage()
+        status.set_title("Drives Ready")
+        status.set_description("Your drives have been partitioned successfully.")
+        status.set_icon_name("emblem-ok-symbolic")
+        status.set_vexpand(True)
+
+        details = Adw.PreferencesGroup()
+        details.set_margin_start(40)
+        details.set_margin_end(40)
+
+        role_row = Adw.ActionRow()
+        role_row.set_title("Installation Type")
+        role_row.set_subtitle(self.role)
+        details.add(role_row)
+
+        boot_row = Adw.ActionRow()
+        boot_row.set_title("Boot Disk")
+        boot_row.set_subtitle(f"/dev/{self.boot_disk}  —  {human_size(self.boot_size)}")
+        details.add(boot_row)
+
+        if self.data_disk:
+            data_row = Adw.ActionRow()
+            data_row.set_title("Data Disk")
+            data_row.set_subtitle(f"/dev/{self.data_disk}  —  {human_size(self.data_size)}")
+            details.add(data_row)
+
+        status_box = Gtk.Box(orientation=Gtk.Orientation.VERTICAL, spacing=16)
+        status_box.append(status)
+        status_box.append(details)
+
+        note = Gtk.Label()
+        note.set_markup(
+            "<span foreground='#888888'>The next step will install the full system.\n"
+            "This may take <b>20–40 minutes</b> depending on your internet speed.\n"
+            "Do not turn off your computer.</span>"
+        )
+        note.set_justify(Gtk.Justification.CENTER)
+        note.set_wrap(True)
+        note.set_margin_top(16)
+        note.set_margin_start(40)
+        note.set_margin_end(40)
+        status_box.append(note)
+
+        outer.append(status_box)
+        outer.append(self.nav_row(
+            next_label="Install Now",
+            next_cb=lambda b: self.push_progress(
+                "Installing Sovran SystemsOS",
+                "Building and installing your system. Please wait...",
+                self.do_install
+            )
+        ))
+
+        self.push_page("Ready to Install", outer)
+        return False
+
+    # ── Worker: install ───────────────────────────────────────────────────
+
+    def do_install(self, buf):
+        GLib.idle_add(append_text, buf, "=== Running nixos-install ===\n")
+
+        for f in ["/mnt/etc/nixos/role-state.nix", "/mnt/etc/nixos/custom.nix"]:
+            if not os.path.exists(f):
+                raise RuntimeError(f"Required file missing: {f}")
+
+        run_stream([
+            "sudo", "nixos-install",
+            "--root", "/mnt",
+            "--flake", "/mnt/etc/nixos#nixos"
+        ], buf)
+
+        GLib.idle_add(self.push_complete)
+
+    # ── Step 6: Complete ───────────────────────────────────────────────────
+
+    def push_complete(self):
+        outer = Gtk.Box(orientation=Gtk.Orientation.VERTICAL, spacing=0)
+
+        status = Adw.StatusPage()
+        status.set_title("Installation Complete!")
+        status.set_description("Welcome to Sovran SystemsOS.")
+        status.set_icon_name("emblem-ok-symbolic")
+        status.set_vexpand(True)
+
+        creds_group = Adw.PreferencesGroup()
+        creds_group.set_title("⚠  Write down your login details before rebooting")
+        creds_group.set_margin_start(40)
+        creds_group.set_margin_end(40)
+
+        user_row = Adw.ActionRow()
+        user_row.set_title("Username")
+        user_row.set_subtitle("free")
+        creds_group.add(user_row)
+
+        pass_row = Adw.ActionRow()
+        pass_row.set_title("Password")
+        pass_row.set_subtitle("free")
+        creds_group.add(pass_row)
+
+        note_row = Adw.ActionRow()
+        note_row.set_title("App Passwords")
+        note_row.set_subtitle(
+            "After rebooting, all app passwords (Nextcloud, Bitcoin, Matrix, etc.) "
+            "will be saved to a secure PDF in your Documents folder."
+        )
+        creds_group.add(note_row)
+
+        content_box = Gtk.Box(orientation=Gtk.Orientation.VERTICAL, spacing=16)
+        content_box.append(status)
+        content_box.append(creds_group)
+        outer.append(content_box)
+
+        reboot_btn = Gtk.Button(label="Reboot Now")
+        reboot_btn.add_css_class("suggested-action")
+        reboot_btn.add_css_class("pill")
+        reboot_btn.add_css_class("destructive-action")
+        reboot_btn.connect("clicked", lambda b: subprocess.run(["sudo", "reboot"]))
+
+        nav = Gtk.Box()
+        nav.set_margin_bottom(24)
+        nav.set_margin_end(40)
+        nav.set_halign(Gtk.Align.END)
+        nav.append(reboot_btn)
+        outer.append(nav)
+
+        self.push_page("Complete", outer)
+        return False
+
+    # ── Error screen ───────────────────────────────────────────────────────
+
+    def show_error(self, msg):
+        outer = Gtk.Box(orientation=Gtk.Orientation.VERTICAL, spacing=0)
+
+        status = Adw.StatusPage()
+        status.set_title("Installation Error")
+        status.set_description(msg)
+        status.set_icon_name("dialog-error-symbolic")
+        status.set_vexpand(True)
+
+        log_lbl = Gtk.Label()
+        log_lbl.set_markup(f"<span foreground='#888888' size='small'>Full log: {LOG}</span>")
+        log_lbl.set_margin_bottom(24)
+
+        outer.append(status)
+        outer.append(log_lbl)
+
+        self.push_page("Error", outer)
+        return False
+
+
+if __name__ == "__main__":
+    app = InstallerApp()
+    app.run(None)

iso/plymouth-theme.nix

@@ -0,0 +1,44 @@
+{ pkgs, lib }:
+
+pkgs.stdenv.mkDerivation {
+  pname = "sovran-plymouth-theme";
+  version = "1.0";
+
+  src = ./.;
+
+  installPhase = ''
+    mkdir -p $out/share/plymouth/themes/sovran
+    cp ${./assets/splash-logo.png} $out/share/plymouth/themes/sovran/logo.png
+
+    cat > $out/share/plymouth/themes/sovran/sovran.plymouth <<'EOF'
+[Plymouth Theme]
+Name=Sovran Systems
+Description=Sovran Systems Splash
+ModuleName=script
+
+[script]
+ImageDir=/share/plymouth/themes/sovran
+ScriptFile=/share/plymouth/themes/sovran/sovran.script
+EOF
+
+    cat > $out/share/plymouth/themes/sovran/sovran.script <<'EOF'
+# Background color: #CFFFD7 (RGB 207,255,215)
+bg_r = 207/255.0
+bg_g = 255/255.0
+bg_b = 215/255.0
+
+Window.SetBackgroundTopColor (bg_r, bg_g, bg_b);
+Window.SetBackgroundBottomColor (bg_r, bg_g, bg_b);
+
+logo = Image("logo.png");
+logo_sprite = Sprite(logo);
+logo_sprite.SetX((Window.GetWidth() - logo.GetWidth()) / 2);
+logo_sprite.SetY((Window.GetHeight() - logo.GetHeight()) / 2);
+
+spinner = Sprite();
+spinner.SetImage(Spinner());
+spinner.SetX((Window.GetWidth() - spinner.GetImage().GetWidth()) / 2);
+spinner.SetY((Window.GetHeight() + logo.GetHeight()) / 2 + 20);
+EOF
+  '';
+}

iso/server.nix

@@ -0,0 +1,5 @@
+{ config, pkgs, lib, ... }:
+
+{
+  imports = [ ./common.nix ];
+}

modules/Sovran_SystemsOS_File_Fixes_And_New_Services.nix

@@ -3,21 +3,21 @@
 {
 
 	systemd.services.Sovran_SystemsOS_File_Fixes_And_New_Services = {
-	  
 
-	  unitConfig = {
-	    After = "btcpayserver.service";
-	    Requires = "network-online.target";
-	  };
-	   
-	  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";
-	    RemainAfterExit = "yes";
-	    User = "root";
-	    Type = "oneshot";
-	  };
+		unitConfig = {
+			After = "btcpayserver.service";
+			Requires = "network-online.target";
+		};
+		 
+		serviceConfig = {
+			ExecStartPre= "/run/current-system/sw/bin/sleep 30";
+			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";
+			RemainAfterExit = "yes";
+			User = "root";
+			Type = "oneshot";
+		};
 
-	  wantedBy = [ "multi-user.target" ];
+		wantedBy = [ "multi-user.target" ];
 	
 	};
 

modules/bip110.nix

@@ -0,0 +1,23 @@
+{ config, lib, pkgs, ... }:
+
+let
+  cfg = config.sovran_systemsOS;
+in
+{
+  options.sovran_systemsOS.packages.bip110 = lib.mkOption {
+    type = lib.types.nullOr lib.types.package;
+    default = null;
+    description = "BIP110 Bitcoin package";
+  };
+
+  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,76 @@
 { config, pkgs, lib, ... }:
 
-{
-	nix-bitcoin.generateSecrets = true;
-	
-	services.bitcoind = {
-		enable = true;
-		dataDir = "/run/media/Second_Drive/BTCEcoandBackup/Bitcoin_Node";
-		txindex = true;
-		tor.proxy = true;
-		disablewallet = true;
-		extraConfig = ''
-			peerbloomfilters=1
-			server=1
-			'';
-		};
+lib.mkIf config.sovran_systemsOS.services.bitcoin {
 
-	nix-bitcoin.onionServices.bitcoind.enable = true;
-	nix-bitcoin.onionServices.electrs.enable = true;
+  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
+    '';
+  };
 
-	services.lnd = {
-		enable = true;
-	};
+  nix-bitcoin.onionServices.bitcoind.enable = true;
+  nix-bitcoin.onionServices.electrs.enable = true;
+  nix-bitcoin.onionServices.rtl.enable = true;
 
-	services.lightning-loop = {
-		enable = true;
-	};
+  services.electrs = {
+    enable = true;
+    tor.enforce = true;
+    dataDir = "/run/media/Second_Drive/BTCEcoandBackup/Electrs_Data";
+  };
 
-	services.lightning-pool = {
-		enable = true;
-	};
-
-	services.rtl = {
-		enable = true;
-		port = 3050;
-		nightTheme = true;
-		nodes = {
-			lnd = {
-				enable = true;
-				loop = true;
-			};
-		reverseOrder = true;
-		};
-	};
+  services.lnd = {
+    enable = true;
+    tor.enforce = true;
+    tor.proxy = true;
+    extraConfig = ''
+      protocol.option-scid-alias=true
+    '';
+  };
 
   nix-bitcoin.onionServices.lnd.public = true;
+
   services.lnd.lndconnect = {
     enable = true;
     onion = true;
   };
-  services.charge-lnd.enable = true;
+
+  services.rtl = {
+    enable = true;
+    tor.enforce = true;
+    port = 3050;
+    nightTheme = true;
+    nodes = {
+      lnd = {
+        enable = true;
+      };
+    };
+  };
+
+  services.btcpayserver = {
+    enable = true;
+  };
 
   services.btcpayserver.lightningBackend = "lnd";
-		
 
-	services.electrs = {
-		enable = true;
-		tor.enforce = true;
-		dataDir = "/run/media/Second_Drive/BTCEcoandBackup/Electrs_Data";
-		};
-	
-	
-	services.btcpayserver = {
-		enable = true;
-		};
-		
+  nix-bitcoin.generateSecrets = true;
+  nix-bitcoin.nodeinfo.enable = true;
 
-	nix-bitcoin.nodeinfo.enable = true;
-		
+  nix-bitcoin.operator = {
+    enable = true;
+    name = "free";
+  };
 
-	nix-bitcoin.operator = {
-		enable = true;
-		name = "free";
-	};
-	
+  nix-bitcoin.useVersionLockedPkgs = false;
+  
+   sovran_systemsOS.domainRequirements = [
+    { name = "btcpayserver"; label = "BTCPay Server"; example = "pay.yourdomain.com"; }
+  ];
 }

modules/configuration.nix

@@ -1,426 +0,0 @@
-{ config, pkgs, lib, ... }:
-
-
-let
-	personalization = import ./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
-{
-	# Bootloader.
-	boot.loader.systemd-boot.enable = true;
-	boot.loader.efi.canTouchEfiVariables = true;
-	boot.loader.efi.efiSysMountPoint = "/boot/efi";
-	boot.kernelPackages =  pkgs.linuxPackages_latest;
-
-	# Enable Automount without Fail for Internal Drive.
-	fileSystems."/run/media/Second_Drive" = {
-		device = "LABEL=BTCEcoandBackup";
-		fsType = "ext4";
-		options = [ "nofail" ];
-		};
-
-	nix = {
-		package = pkgs.nixUnstable;
-		extraOptions = ''
-				experimental-features = nix-command flakes
-			'';
-		};
-
-	networking.hostName = "nixos"; # Define your hostname.
-	# networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.
-
-	# Enable networking
-	networking.networkmanager.enable = true;
-
-	# Set your time zone.
-	time.timeZone = "America/Los_Angeles";
-
-	# Select internationalisation properties.
-	i18n.defaultLocale = "en_US.UTF-8";
-
-	# Enable the X11 windowing system.
-	services.xserver.enable = true;
-
-	# Enable the GNOME Desktop Environment.
-	services.xserver.displayManager.gdm.enable = true;
-	services.xserver.desktopManager.gnome.enable = true;
-
-	# Configure keymap in X11
-	services.xserver = {
-		layout = "us";
-		xkbVariant = "";
-	};
-
-	# Enable CUPS to print documents.
-	services.printing.enable = true;
-
-	# Systemd Settings
-	systemd.enableEmergencyMode = false;
-
-	# Enable sound with pipewire.
-	sound.enable = true;
-	hardware.pulseaudio.enable = false;
-	security.rtkit.enable = true;
-	services.pipewire = {
-		enable = true;
-		alsa.enable = true;
-		alsa.support32Bit = true;
-		pulse.enable = true;
-	};
-
-	users.users = {
-		free = {
-			isNormalUser = true;
-			description = "free";
-			extraGroups = [ "networkmanager" ];
-		};
-
-
-####### 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.xserver.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;
-
-	# Allow unfree packages
-	nixpkgs.config.allowUnfree = true;
-
-	# List packages installed in system profile. To search, run:
-	# $ nix search wget
-	environment.systemPackages = with pkgs; [
-		git
-		wget
-		librewolf
-		fish
-		htop
-		gnomeExtensions.dash-to-dock
-		gnomeExtensions.transparent-top-bar-adjustable-transparency
-		gnomeExtensions.vitals
-		gnomeExtensions.pop-shell
-		gnomeExtensions.just-perfection
-		gnomeExtensions.appindicator
-		gnomeExtensions.systemd-manager
-		gnome.gnome-tweaks
-		papirus-icon-theme
-		ranger
-		gnome.gnome-tweaks
-		bisq-desktop
-		neofetch
-		gnome.gedit
-		matrix-synapse
-		openssl
-		pwgen
-		aspell
-		aspellDicts.en
-		lm_sensors
-		hunspell
-		hunspellDicts.en_US
-		custom-php
-		matrix-synapse-tools.synadm
-		brave
-		ncdu_2
-		bitwarden
-		gparted
-		pv
-		unzip
-		parted
-		screen
-		gnome.zenity
-		libargon2
-
-	];
-
-	nixpkgs.config.permittedInsecurePackages = [
-	               "nodejs-16.20.0"
-	               "nodejs-slim-16.20.0"
-	             ];
-
-
-	programs.bash.promptInit = "fish";
-	programs.fish = {
-		enable = true;
-		promptInit = "neofetch";
-	};
-
-
-####### 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}";
-		acmeCA = "https://acme.zerossl.com/v2/DV90";
-		virtualHosts = {
-			"${personalization.wordpress_url}" = {
-				 extraConfig = ''
-					encode gzip zstd
-					root * /var/lib/www/wordpress
-					php_fastcgi unix//run/phpfpm/mypool.sock
-					file_server browse
-					'';
-			};
-
-			"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 = ''
-						encode gzip zstd
-						root * /var/lib/www/nextcloud
-						php_fastcgi unix//run/phpfpm/mypool.sock
-						file_server
-						redir /.well-known/carddav /remote.php/carddav 301
-						redir /.well-known/caldav /remote.php/caldav 301
-						header {
-									Strict-Transport-Security max-age=31536000;
-									}
-						'';
-			 };
-
-			"${personalization.matrix_url}" = {
-					extraConfig = ''
-						reverse_proxy /_matrix/* http://localhost:8008
-						reverse_proxy /_synapse/client/* http://localhost:8008
-					'';
-			};
-
-			"${personalization.matrix_url}:8448" = {
-					extraConfig = ''
-							reverse_proxy http://localhost:8008
-					'';
-			};
-
-			"${personalization.btcpayserver_url}" = {
-					extraConfig = ''
-						reverse_proxy http://localhost:23000
-						encode gzip zstd
-					'';
-			};
-			
-			"https://${personalization.vaultwarden_url}" = {
-					extraConfig = ''
-						reverse_proxy http://localhost:8777
-						encode gzip zstd
-					'';
-			};
-
-			":3051" = {
-					extraConfig = ''
-						reverse_proxy :3050
-						encode gzip zstd
-						tls internal
-					'';
-			};
-
-			"https://${personalization.onlyoffice_url}" = {
-						extraConfig = ''
-							reverse_proxy http://localhost:8000
-					'';
-			};
-		};
-	};
-
-
-###### CREATE DATABASE (WORDPRESS, MATRIX_SYNAPSE, AND NEXTCLOUD) #######
-	services.postgresql = {
-			enable = true;
-			package = pkgs.postgresql_14;
-			};
-
-	services.postgresql.authentication = lib.mkForce ''
-			# Generated file; do not edit!
-			# TYPE  DATABASE        USER            ADDRESS                 METHOD
-			local   all             all                                     trust
-			host    all             all             127.0.0.1/32            trust
-			host    all             all             ::1/128                 trust
-			'';
-
-
-	services.mysql = {
-			enable = true;
-			package = pkgs.mariadb_1011;
-			};
-
-	services.postgresql.initialScript = pkgs.writeText "begin-init.sql" ''
-		CREATE ROLE "ncusr" WITH LOGIN PASSWORD '${personalization.age.secrets.nextclouddb.file}';
-		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 DATABASE "matrix-synapse" WITH OWNER "matrix-synapse"
-			TEMPLATE template0
-			LC_COLLATE = "C"
-			LC_CTYPE = "C";    
-	
-	''
-	;
-
-	services.mysql.initialScript = pkgs.writeText "wordpress-init.sql" ''
-		CREATE DATABASE wordpressdb;
-		GRANT ALL ON *.* TO 'wpusr'@'localhost' IDENTIFIED BY '${personalization.age.secrets.wordpressdb.file}';
-		FLUSH PRIVILEGES;
-	''
-	;
-
-
-
-####### KEEP AWAKE for DISPLAY and HEADLESS #######
-	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	daily	12
-backup	/home/	localhost/
-backup	/var/lib/	localhost/
-backup	/etc/nixos/	localhost/
-backup	/etc/nix-bitcoin-secrets/	localhost/
-					'';
-	 cronIntervals = {
-			daily = "50 21 * * *";
-			hourly = "0 * * * *";
-						};
-				};
-
-
-
-####### 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"
-		"0 */2 * * * root /var/lib/external_ip/external_ip.sh"
-		];
-	};
-
-
-####### TOR #######
-	services.tor = {
-		enable = true;
-	client.enable = true;
-	torsocks.enable = true;
-	};
-	services.privoxy.enableTor = true;
-
-
-
-
-####### Enable the OpenSSH daemon #######
-	services.openssh = {
-		enable = true;
-		settings = {
-			PasswordAuthentication = false;
-			KbdInteractiveAuthentication = false;
-			PermitRootLogin = "yes";
-		};
-	};
-	programs.ssh.agentTimeout = "3m";
-
-#######FailtoBan#######
-	services.fail2ban = {
-		enable = true;
-		ignoreIP = [
-		"127.0.0.0/8" 
-		"10.0.0.0/8" 
-		"172.16.0.0/12" 
-		"192.168.0.0/16"
-		"8.8.8.8"
-		];
-	};
-	
-
-####### Open ports in the firewall #######
-	networking.firewall.allowedTCPPorts = [ 80 443 5349 8448 3050 3051 ];
-	networking.firewall.allowedUDPPorts = [ 80 443 5349 8448 3050 3051 ];
-	networking.firewall.allowedUDPPortRanges = [
-			{ from=49152; to=65535; } # TURN relay
-		];
-
-	# Or disable the firewall altogether.
-	networking.firewall.enable = true;
-
-	
-####### AUTO COLLECT GARABAGE #######
-	nix.gc = {
-		automatic = true;
-		dates = "weekly";
-		options = "--delete-older-than 7d";
-	};
-
-	system.stateVersion = "22.05";
-
-}

modules/core/caddy.nix

@@ -0,0 +1,167 @@
+{ config, pkgs, lib, ... }:
+
+let
+  exposeBtcpay = config.sovran_systemsOS.web.btcpayserver;
+in
+{
+  services.caddy = {
+    enable = true;
+    user = "caddy";
+    group = "root";
+    configFile = "/run/caddy/Caddyfile";
+  };
+
+  systemd.services.caddy-generate-config = {
+    description = "Generate Caddyfile from /var/lib/domains at runtime";
+    before = [ "caddy.service" ];
+    requiredBy = [ "caddy.service" ];
+    wantedBy = [ "multi-user.target" ];
+    serviceConfig = {
+      Type = "oneshot";
+      RemainAfterExit = true;
+      RuntimeDirectory = "caddy";
+    };
+    path = [ pkgs.coreutils ];
+    script = ''
+      read_domain() {
+        if [ -f "/var/lib/domains/$1" ]; then
+          cat "/var/lib/domains/$1"
+        else
+          echo ""
+        fi
+      }
+
+      MATRIX=$(read_domain matrix)
+      WORDPRESS=$(read_domain wordpress)
+      NEXTCLOUD=$(read_domain nextcloud)
+      BTCPAY=$(read_domain btcpayserver)
+      VAULTWARDEN=$(read_domain vaultwarden)
+      HAVEN=$(read_domain haven)
+      ACME_EMAIL=$(read_domain sslemail)
+
+      # Start with global config
+      cat > /run/caddy/Caddyfile <<EOF
+{
+  email $ACME_EMAIL
+}
+EOF
+
+      # ── Matrix ──────────────────────────────────────
+      if [ -n "$MATRIX" ]; then
+        if [ -f /run/caddy/element-calling.snippet ]; then
+          cat /run/caddy/element-calling.snippet >> /run/caddy/Caddyfile
+        else
+          cat >> /run/caddy/Caddyfile <<EOF
+
+$MATRIX {
+  reverse_proxy /_matrix/* http://localhost:8008
+  reverse_proxy /_synapse/client/* http://localhost:8008
+}
+
+$MATRIX:8448 {
+  reverse_proxy http://localhost:8008
+}
+EOF
+        fi
+      fi
+
+      # ── WordPress ───────────────────────────────────
+      if [ -n "$WORDPRESS" ]; then
+        cat >> /run/caddy/Caddyfile <<EOF
+
+$WORDPRESS {
+  encode gzip zstd
+  root * /var/lib/www/wordpress
+  php_fastcgi unix//run/phpfpm/mypool.sock
+  file_server browse
+}
+EOF
+      fi
+
+      # ── Nextcloud ───────────────────────────────────
+      if [ -n "$NEXTCLOUD" ]; then
+        cat >> /run/caddy/Caddyfile <<EOF
+
+$NEXTCLOUD {
+  encode gzip zstd
+  root * /var/lib/www/nextcloud
+  php_fastcgi unix//run/phpfpm/mypool.sock {
+    trusted_proxies private_ranges
+  }
+  file_server
+  redir /.well-known/carddav /remote.php/dav/ 301
+  redir /.well-known/caldav /remote.php/dav/ 301
+  header {
+    Strict-Transport-Security max-age=31536000;
+  }
+}
+EOF
+      fi
+
+      # ── BTCPay (only if web exposure is enabled) ────
+      ${if exposeBtcpay then ''
+      if [ -n "$BTCPAY" ]; then
+        cat >> /run/caddy/Caddyfile <<EOF
+
+$BTCPAY {
+  reverse_proxy http://localhost:23000
+  encode gzip zstd
+}
+EOF
+      fi
+      '' else ''
+      # BTCPay web exposure disabled by sovran_systemsOS.web.btcpayserver = false
+      ''}
+
+      # ── Vaultwarden ─────────────────────────────────
+      if [ -n "$VAULTWARDEN" ]; then
+        cat >> /run/caddy/Caddyfile <<EOF
+
+$VAULTWARDEN {
+  reverse_proxy http://localhost:8777
+  encode gzip zstd
+}
+EOF
+      fi
+
+      # ── Haven ───────────────────────────────────────
+      if [ -n "$HAVEN" ]; then
+        cat >> /run/caddy/Caddyfile <<EOF
+
+$HAVEN {
+  reverse_proxy localhost:3355 {
+    header_up Host {host}
+    header_up X-Real-IP {remote_host}
+    header_up X-Forwarded-For {remote_host}
+    header_up X-Forwarded-Proto {scheme}
+    transport http {
+      versions 1.1
+    }
+  }
+  request_body {
+    max_size 100MB
+  }
+}
+EOF
+      fi
+
+      # ── RTL (LAN access) ────────────────────────────
+      cat >> /run/caddy/Caddyfile <<EOF
+
+:3051 {
+  reverse_proxy :3050
+  encode gzip zstd
+}
+EOF
+
+      # ── Mempool (LAN access) ────────────────────────
+      cat >> /run/caddy/Caddyfile <<EOF
+
+:60847 {
+  reverse_proxy :60845
+  encode gzip zstd
+}
+EOF
+    '';
+  };
+}

modules/core/njalla.nix

@@ -0,0 +1,32 @@
+{ config, pkgs, lib, ... }:
+
+{
+  # ── Ensure njalla directory and base script exist on every build ──
+  systemd.tmpfiles.rules = [
+    "d /var/lib/njalla 0750 root root -"
+  ];
+
+  # ── Create base njalla.sh if it doesn't exist yet ────────────
+  systemd.services.njalla-init = {
+    description = "Initialize Njal.la DDNS script if missing";
+    wantedBy = [ "multi-user.target" ];
+    serviceConfig = {
+      Type = "oneshot";
+      RemainAfterExit = true;
+    };
+    unitConfig = {
+      ConditionPathExists = "!/var/lib/njalla/njalla.sh";
+    };
+    script = ''
+      cat > /var/lib/njalla/njalla.sh <<'SCRIPT'
+#!/usr/bin/env bash
+IP=$(dig @resolver4.opendns.com myip.opendns.com +short -4)
+
+## Add DDNS entries below — one curl per line
+## Run 'sudo sovran-setup-domains' to configure automatically
+SCRIPT
+
+      chmod 700 /var/lib/njalla/njalla.sh
+    '';
+  };
+}

modules/core/role-logic.nix

@@ -0,0 +1,45 @@
+{ config, lib, ... }:
+
+{
+  config = lib.mkMerge [
+
+    # ── Server+Desktop Role (default) ─────────────────────────
+    (lib.mkIf config.sovran_systemsOS.roles.server_plus_desktop {
+    })
+
+    # ── Desktop Only Role ─────────────────────────────────────
+    (lib.mkIf config.sovran_systemsOS.roles.desktop {
+      services.desktopManager.gnome.enable = true;
+
+      sovran_systemsOS.services = {
+        synapse = lib.mkDefault false;
+        bitcoin = lib.mkDefault false;
+        vaultwarden = lib.mkDefault false;
+        wordpress = lib.mkDefault false;
+        nextcloud = lib.mkDefault false;
+      };
+
+      sovran_systemsOS.web.btcpayserver = lib.mkDefault false;
+    })
+
+    # ── Bitcoin Node Only Role ────────────────────────────────
+    # Bitcoin ecosystem + mempool + bip110, BTCPay runs but not exposed via Caddy
+    (lib.mkIf config.sovran_systemsOS.roles.node {
+      sovran_systemsOS.services = {
+        bitcoin = lib.mkDefault true;
+        synapse = lib.mkDefault false;
+        vaultwarden = lib.mkDefault false;
+        wordpress = lib.mkDefault false;
+        nextcloud = lib.mkDefault false;
+      };
+
+      sovran_systemsOS.features = {
+        mempool = lib.mkDefault true;
+        bip110 = lib.mkDefault true;
+      };
+
+      sovran_systemsOS.web.btcpayserver = lib.mkDefault false;
+    })
+
+  ];
+}

modules/core/roles.nix

@@ -0,0 +1,82 @@
+{ config, lib, ... }:
+
+{
+  options.sovran_systemsOS = {
+    roles = {
+      server_plus_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";
+    };
+
+    # ── Services (default ON — user can disable in custom.nix) ──
+    services = {
+      synapse = lib.mkOption {
+        type = lib.types.bool;
+        default = true;
+        description = "Matrix Synapse homeserver";
+      };
+      bitcoin = lib.mkOption {
+        type = lib.types.bool;
+        default = true;
+        description = "Bitcoin Ecosystem (bitcoind, electrs, lnd, rtl, btcpay)";
+      };
+      vaultwarden = lib.mkOption {
+        type = lib.types.bool;
+        default = true;
+        description = "Vaultwarden password manager";
+      };
+      wordpress = lib.mkOption {
+        type = lib.types.bool;
+        default = true;
+        description = "WordPress (raw PHP served by Caddy)";
+      };
+      nextcloud = lib.mkOption {
+        type = lib.types.bool;
+        default = true;
+        description = "Nextcloud (raw PHP served by Caddy)";
+      };
+    };
+
+    # ── Features (default OFF — user can enable in custom.nix) ──
+    features = {
+      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";
+    };
+
+    # ── Web exposure (controls Caddy vhosts) ──────────────────
+    web = {
+      btcpayserver = lib.mkOption {
+        type = lib.types.bool;
+        default = true;
+        description = "Expose BTCPay Server via Caddy";
+      };
+    };
+
+    # ── Domain setup registry ─────────────────────────────────
+    domainRequirements = lib.mkOption {
+      type = lib.types.listOf (lib.types.submodule {
+        options = {
+          name = lib.mkOption { type = lib.types.str; };
+          label = lib.mkOption { type = lib.types.str; };
+          example = lib.mkOption { type = lib.types.str; };
+          needsDDNS = lib.mkOption { type = lib.types.bool; default = true; };
+        };
+      });
+      default = [];
+      description = "Domain requirements registered by each module";
+    };
+
+    nostr_npub = lib.mkOption {
+      type = lib.types.str;
+      default = "";
+      description = "Nostr public key (npub1...) for Haven relay";
+    };
+  };
+}

modules/core/sovran-hub.nix

@@ -0,0 +1,292 @@
+{ config, lib, pkgs, ... }:
+
+let
+  cfg = config.sovran_systemsOS;
+
+  monitoredServices =
+    # ── Infrastructure (always present) ────────────────────────
+    [
+      { name = "Caddy"; unit = "caddy.service"; type = "system"; icon = "caddy"; enabled = true;  category = "infrastructure"; credentials = []; }
+      { name = "Tor";   unit = "tor.service";   type = "system"; icon = "tor";   enabled = true;  category = "infrastructure"; credentials = []; }
+      { name = "System Passwords"; unit = "root-password-setup.service"; type = "system"; icon = "system"; enabled = true; category = "infrastructure"; credentials = [
+        { label = "Free Account — Username"; value = "free"; }
+        { label = "Free Account — Password"; file = "/var/lib/secrets/free-password"; }
+        { label = "Root Password"; file = "/var/lib/secrets/root-password"; }
+        { label = "SSH Local Access"; value = "ssh root@localhost  /  Passphrase: gosovransystems"; }
+      ]; }
+      { name = "Remote Desktop"; unit = "gnome-remote-desktop.service"; type = "system"; icon = "rdp"; enabled = cfg.features.rdp; category = "infrastructure"; credentials = [
+        { label = "Username"; file = "/var/lib/gnome-remote-desktop/rdp-username"; }
+        { label = "Password"; file = "/var/lib/gnome-remote-desktop/rdp-password"; }
+        { label = "Address";  file = "/var/lib/secrets/internal-ip"; suffix = ":3389"; }
+        { label = "How to Connect"; value = "1. Install an RDP client (e.g. Remmina, Microsoft Remote Desktop)\n2. Create a new RDP connection\n3. Enter the Address above as the host\n4. Enter the Username and Password above\n5. Connect — you will see your desktop remotely"; }
+      ]; }
+    ]
+    # ── Bitcoin Base (node implementations) ────────────────────
+    ++ [
+      { name = "Bitcoin Knots + BIP110"; unit = "bitcoind.service"; type = "system"; icon = "bip110";        enabled = cfg.features.bip110;        category = "bitcoin-base"; credentials = [
+        { label = "Tor Address"; file = "/var/lib/tor/onion/bitcoind/hostname"; prefix = "http://"; }
+      ]; }
+      { name = "Bitcoin Knots";          unit = "bitcoind.service"; type = "system"; icon = "bitcoind";      enabled = cfg.services.bitcoin && !cfg.features.bitcoin-core && !cfg.features.bip110; category = "bitcoin-base"; credentials = [
+        { label = "Tor Address"; file = "/var/lib/tor/onion/bitcoind/hostname"; prefix = "http://"; }
+      ]; }
+      { name = "Bitcoin Core";           unit = "bitcoind.service"; type = "system"; icon = "bitcoin-core";  enabled = cfg.features.bitcoin-core;  category = "bitcoin-base"; credentials = [
+        { label = "Tor Address"; file = "/var/lib/tor/onion/bitcoind/hostname"; prefix = "http://"; }
+      ]; }
+    ]
+    # ── Bitcoin Apps (services on top of the node) ─────────────
+    ++ [
+      { name = "Electrs";            unit = "electrs.service";      type = "system"; icon = "electrs";      enabled = cfg.services.bitcoin;  category = "bitcoin-apps"; credentials = [
+        { label = "Tor Address"; file = "/var/lib/tor/onion/electrs/hostname"; prefix = "http://"; }
+        { label = "Port"; value = "50001"; }
+      ]; }
+      { name = "LND";                unit = "lnd.service";          type = "system"; icon = "lnd";          enabled = cfg.services.bitcoin;  category = "bitcoin-apps"; credentials = []; }
+      { name = "Ride The Lightning"; unit = "rtl.service";          type = "system"; icon = "rtl";          enabled = cfg.services.bitcoin;  category = "bitcoin-apps"; credentials = [
+        { label = "Tor Access"; file = "/var/lib/tor/onion/rtl/hostname"; prefix = "http://"; }
+        { label = "Local Network"; file = "/var/lib/secrets/internal-ip"; prefix = "http://"; suffix = ":3051"; }
+        { label = "Password"; file = "/etc/nix-bitcoin-secrets/rtl-password"; }
+      ]; }
+      { name = "BTCPayserver";       unit = "btcpayserver.service"; type = "system"; icon = "btcpayserver"; enabled = cfg.services.bitcoin;  category = "bitcoin-apps"; credentials = [
+        { label = "URL"; file = "/var/lib/domains/btcpayserver"; prefix = "https://"; }
+        { label = "Note"; value = "Create your admin account on first visit"; }
+      ]; }
+      { name = "Zeus Connect";       unit = "zeus-connect-setup.service"; type = "system"; icon = "zeus";   enabled = cfg.services.bitcoin;  category = "bitcoin-apps"; credentials = [
+        { label = "Connection URL"; file = "/var/lib/secrets/zeus-connect-url"; qrcode = true; }
+        { label = "How to Connect"; value = "1. Download Zeus from App Store or Google Play\n2. Open Zeus �� Scan Node Config\n3. Scan the QR code above or paste the Connection URL"; }
+      ]; }
+      { name = "Mempool";            unit = "mempool.service";      type = "system"; icon = "mempool";      enabled = cfg.features.mempool;  category = "bitcoin-apps"; credentials = [
+        { label = "Tor Access"; file = "/var/lib/tor/onion/mempool-frontend/hostname"; prefix = "http://"; }
+        { label = "Local Network"; file = "/var/lib/secrets/internal-ip"; prefix = "http://"; suffix = ":60847"; }
+      ]; }
+    ]
+    # ── Communication ──────────────────────────────────────────
+    ++ [
+      { name = "Matrix-Synapse"; unit = "matrix-synapse.service"; type = "system"; icon = "synapse"; enabled = cfg.services.synapse;          category = "communication"; credentials = [
+        { label = "Homeserver URL";   file = "/var/lib/secrets/matrix-homeserver-url"; }
+        { label = "Admin Username";   file = "/var/lib/secrets/matrix-admin-username"; }
+        { label = "Admin Password";   file = "/var/lib/secrets/matrix-admin-password"; }
+        { label = "Test Username";    file = "/var/lib/secrets/matrix-test-username"; }
+        { label = "Test Password";    file = "/var/lib/secrets/matrix-test-password"; }
+      ]; }
+      { name = "Element-Call";   unit = "livekit.service";        type = "system"; icon = "livekit"; enabled = cfg.features.element-calling;  category = "communication"; credentials = []; }
+    ]
+    # ── Self-Hosted Apps ───────────────────────────────────────
+    ++ [
+      { name = "VaultWarden"; unit = "vaultwarden.service";      type = "system"; icon = "vaultwarden"; enabled = cfg.services.vaultwarden; category = "apps"; credentials = [
+        { label = "URL"; file = "/var/lib/domains/vaultwarden"; prefix = "https://"; }
+        { label = "Admin Panel"; file = "/var/lib/domains/vaultwarden"; prefix = "https://"; suffix = "/admin"; }
+        { label = "Admin Token"; file = "/var/lib/secrets/vaultwarden/vaultwarden.env"; extract = "ADMIN_TOKEN"; }
+      ]; }
+      { name = "Nextcloud";   unit = "phpfpm-nextcloud.service"; type = "system"; icon = "nextcloud";   enabled = cfg.services.nextcloud;   category = "apps"; credentials = [
+        { label = "Credentials"; file = "/var/lib/secrets/nextcloud-admin"; multiline = true; }
+      ]; }
+      { name = "WordPress";   unit = "phpfpm-wordpress.service"; type = "system"; icon = "wordpress";   enabled = cfg.services.wordpress;   category = "apps"; credentials = [
+        { label = "Credentials"; file = "/var/lib/secrets/wordpress-admin"; multiline = true; }
+      ]; }
+    ]
+    # ── Nostr / Relay ──────────────────────────────────────────
+    ++ [
+      { name = "Haven Relay"; unit = "haven-relay.service"; type = "system"; icon = "haven"; enabled = cfg.features.haven; category = "nostr"; credentials = []; }
+    ]
+    # ── Support ────────────────────────────────────────────────
+    ++ [
+      { name = "Tech Support"; unit = "sovran-tech-support"; type = "support"; icon = "support"; enabled = true; category = "support"; credentials = []; }
+    ];
+
+  activeRole =
+    if cfg.roles.desktop then "desktop"
+    else if cfg.roles.node then "node"
+    else "server_plus_desktop";
+
+  generatedConfig = pkgs.writeText "sovran-hub-config.json"
+    (builtins.toJSON {
+      refresh_interval = 5;
+      command_method   = "systemctl";
+      role             = activeRole;
+      services         = monitoredServices;
+      feature_manager  = true;
+    });
+
+  # ── Update wrapper script ──────────────────────────────────────
+  update-script = pkgs.writeShellScript "sovran-hub-update.sh" ''
+    set -uo pipefail
+    export PATH="${lib.makeBinPath [ pkgs.nix pkgs.nixos-rebuild pkgs.git pkgs.flatpak pkgs.coreutils ]}:$PATH"
+
+    LOG="/var/log/sovran-hub-update.log"
+    STATUS="/var/log/sovran-hub-update.status"
+
+    echo "RUNNING" > "$STATUS"
+    : > "$LOG"
+    exec > >(tee -a "$LOG") 2>&1
+
+    echo "══════════════════════════════════════════════════"
+    echo "  Sovran_SystemsOS Update — $(date)"
+    echo "══════════════════════════════════════════════════"
+    echo ""
+
+    RC=0
+
+    echo "── Step 1/3: nix flake update ────────────────────"
+    if ! nix flake update --flake /etc/nixos --print-build-logs 2>&1; then
+      echo "[ERROR] nix flake update failed"
+      RC=1
+    fi
+    echo ""
+
+    if [ "$RC" -eq 0 ]; then
+      echo "── Step 2/3: nixos-rebuild switch ──────────────────"
+      if ! nixos-rebuild switch --flake /etc/nixos --print-build-logs 2>&1; then
+        echo "[ERROR] nixos-rebuild switch failed"
+        RC=1
+      fi
+      echo ""
+    fi
+
+    if [ "$RC" -eq 0 ]; then
+      echo "── Step 3/3: flatpak update ────────────────────────"
+      if ! flatpak update -y 2>&1; then
+        echo "[WARNING] flatpak update failed (non-fatal)"
+      fi
+      echo ""
+    fi
+
+    if [ "$RC" -eq 0 ]; then
+      echo "══════════════════════════════════════════════════"
+      echo "  ✓ Update completed successfully"
+      echo "══════════════════════════════════════════════════"
+      echo "SUCCESS" > "$STATUS"
+    else
+      echo "══════════════════════════════════════════════════"
+      echo "  ✗ Update failed — see errors above"
+      echo "══════════════════════════════════════════════════"
+      echo "FAILED" > "$STATUS"
+    fi
+
+    exit "$RC"
+  '';
+
+  # ── Rebuild wrapper script ─────────────────────────────────────
+  rebuild-script = pkgs.writeShellScript "sovran-hub-rebuild.sh" ''
+    set -uo pipefail
+    export PATH="${lib.makeBinPath [ pkgs.nix pkgs.nixos-rebuild pkgs.coreutils ]}:$PATH"
+
+    LOG="/var/log/sovran-hub-rebuild.log"
+    STATUS="/var/log/sovran-hub-rebuild.status"
+
+    echo "RUNNING" > "$STATUS"
+    : > "$LOG"
+    exec > >(tee -a "$LOG") 2>&1
+
+    echo "══════════════════════════════════════════════════"
+    echo "  Sovran_SystemsOS Rebuild — $(date)"
+    echo "══════════════════════════════════════════════════"
+    echo ""
+    echo "── Rebuilding system configuration ──────────────"
+    if nixos-rebuild switch --flake /etc/nixos --print-build-logs 2>&1; then
+      echo ""
+      echo "══════════════════════════════════════════════════"
+      echo "  ✓ Rebuild completed successfully"
+      echo "══════════════════════════════════════════════════"
+      echo "SUCCESS" > "$STATUS"
+    else
+      echo ""
+      echo "══════════════════════════════════════════════════"
+      echo "  ✗ Rebuild failed — see errors above"
+      echo "══════════════════════════════════════════════════"
+      echo "FAILED" > "$STATUS"
+      exit 1
+    fi
+  '';
+
+  sovran-hub-web = pkgs.python3Packages.buildPythonApplication {
+    pname   = "sovran-systemsos-hub-web";
+    version = "1.0.0";
+    format  = "other";
+
+    src = ../../app;
+
+    propagatedBuildInputs = with pkgs.python3Packages; [
+      fastapi
+      uvicorn
+      jinja2
+      python-multipart
+    ];
+
+    dontBuild = true;
+
+    installPhase = ''
+      runHook preInstall
+
+      install -d $out/lib/sovran-hub-web
+      cp -r sovran_systemsos_web $out/lib/sovran-hub-web/
+
+      cp ${generatedConfig} $out/lib/sovran-hub-web/config.json
+
+      install -d $out/share/sovran-hub/icons
+      cp icons/* $out/share/sovran-hub/icons/ 2>/dev/null || true
+
+      install -d $out/bin
+      cat > $out/bin/sovran-hub-web <<LAUNCHER
+#!${pkgs.python3}/bin/python3
+import os, sys
+base = os.path.join("$out", "lib", "sovran-hub-web")
+sys.path.insert(0, base)
+os.environ["SOVRAN_HUB_CONFIG"] = os.path.join(base, "config.json")
+os.environ["SOVRAN_HUB_ICONS"]  = os.path.join("$out", "share", "sovran-hub", "icons")
+import uvicorn
+uvicorn.run(
+    "sovran_systemsos_web.server:app",
+    host="0.0.0.0",
+    port=8937,
+    log_level="info",
+)
+LAUNCHER
+      chmod +x $out/bin/sovran-hub-web
+
+      runHook postInstall
+    '';
+
+    meta = {
+      description = "Sovran_SystemsOS Hub — web-based systemd service manager";
+      mainProgram = "sovran-hub-web";
+    };
+  };
+
+in
+{
+  config = {
+    systemd.services.sovran-hub-web = {
+      description = "Sovran_SystemsOS Hub Web Interface";
+      wantedBy    = [ "multi-user.target" ];
+      after       = [ "network.target" ];
+
+      serviceConfig = {
+        ExecStart      = "${sovran-hub-web}/bin/sovran-hub-web";
+        Restart        = "on-failure";
+        RestartSec     = "5s";
+        User           = "root";
+        StandardOutput = "journal";
+        StandardError  = "journal";
+      };
+
+      path = [ pkgs.qrencode ];
+    };
+
+    systemd.services.sovran-hub-update = {
+      description = "Sovran_SystemsOS System Update";
+      serviceConfig = {
+        Type       = "oneshot";
+        ExecStart  = "${update-script}";
+      };
+    };
+
+    systemd.services.sovran-hub-rebuild = {
+      description = "Sovran_SystemsOS System Rebuild";
+      serviceConfig = {
+        Type      = "oneshot";
+        ExecStart = "${rebuild-script}";
+      };
+    };
+
+    networking.firewall.allowedTCPPorts = [ 3051 8937 60847 ];
+  };
+}

modules/core/sovran-manage-domains.nix

@@ -0,0 +1,461 @@
+{ config, pkgs, lib, ... }:
+
+let
+  domains = config.sovran_systemsOS.domainRequirements;
+
+  domainNamesList = lib.concatMapStringsSep " " (d: d.name) domains;
+
+  ddnsPrompt = ''
+    read -p "  Njal.la DDNS curl command (paste full line, or Enter to skip): " DDNS_LINE
+    if [ -n "$DDNS_LINE" ]; then
+      # Strip any leading "curl " if they pasted the whole command
+      DDNS_LINE="''${DDNS_LINE#curl }"
+      # Strip surrounding quotes
+      DDNS_LINE="''${DDNS_LINE%\"}"
+      DDNS_LINE="''${DDNS_LINE#\"}"
+      # Replace &auto with &a=''${IP} at the end
+      DDNS_LINE="''${DDNS_LINE%auto}&a=''${DOLLAR}{IP}"
+      # Remove any trailing double &a= if they already had &a=
+      DDNS_LINE=$(echo "$DDNS_LINE" | sed 's/&a=&a=/\&a=/g')
+  '';
+
+  confirmDomain = name: ''
+    while true; do
+      echo ""
+      printf "%b%s%b\n" "$YELLOW" "  You entered:" "$NC"
+      printf "%b%s%b\n" "$CYAN" "    Domain:   $DOMAIN" "$NC"
+      if [ -n "''${DDNS_DISPLAY:-}" ]; then
+        printf "%b%s%b\n" "$CYAN" "    DDNS URL: $DDNS_DISPLAY" "$NC"
+      fi
+      echo ""
+      read -p "  Is this correct? (y/n): " CONFIRM
+      case "$CONFIRM" in
+        [yY])
+          echo "$DOMAIN" > "/var/lib/domains/${name}"
+          printf "%b%s%b\n" "$GREEN" "  Saved." "$NC"
+          break
+          ;;
+        [nN])
+          echo "  Let's try again."
+          REDO=true
+          break
+          ;;
+        *)
+          echo "  Please enter y or n."
+          ;;
+      esac
+    done
+  '';
+
+  domainPrompts = lib.concatMapStringsSep "\n" (d: ''
+    REDO=true
+    while [ "$REDO" = true ]; do
+      REDO=false
+      DDNS_DISPLAY=""
+      echo ""
+      printf "%b%s%b\n" "$GREEN" "── ${d.label} ──" "$NC"
+      EXISTING=""
+      if [ -f "/var/lib/domains/${d.name}" ]; then
+        EXISTING=$(cat "/var/lib/domains/${d.name}")
+        printf "%b%s%b\n" "$CYAN" "  Current: $EXISTING" "$NC"
+      fi
+      read -p "  Subdomain (e.g. ${d.example}) or Enter to keep current: " DOMAIN_INPUT
+      DOMAIN="''${DOMAIN_INPUT:-$EXISTING}"
+
+      if [ -n "$DOMAIN" ]; then
+        ${lib.optionalString d.needsDDNS ''
+        ${ddnsPrompt}
+          DDNS_DISPLAY="$DDNS_LINE"
+          PENDING_NJALLA="curl \"$DDNS_LINE\""
+        fi
+        ''}
+
+        ${confirmDomain d.name}
+
+        if [ "$REDO" = false ] && [ -n "''${PENDING_NJALLA:-}" ]; then
+          NJALLA_ENTRIES="$NJALLA_ENTRIES
+$PENDING_NJALLA"
+          PENDING_NJALLA=""
+        fi
+      else
+        echo "  Skipped."
+      fi
+    done
+  '') domains;
+
+  missingDomainPrompts = lib.concatMapStringsSep "\n" (d: ''
+    if [ ! -f "/var/lib/domains/${d.name}" ]; then
+      MISSING=true
+      REDO=true
+      while [ "$REDO" = true ]; do
+        REDO=false
+        DDNS_DISPLAY=""
+        echo ""
+        printf "%b%s%b\n" "$GREEN" "── ${d.label} (NEW) ──" "$NC"
+        read -p "  Subdomain (e.g. ${d.example}): " DOMAIN
+
+        if [ -n "$DOMAIN" ]; then
+          ${lib.optionalString d.needsDDNS ''
+          ${ddnsPrompt}
+            DDNS_DISPLAY="$DDNS_LINE"
+            PENDING_NJALLA="curl \"$DDNS_LINE\""
+          fi
+          ''}
+
+          ${confirmDomain d.name}
+
+          if [ "$REDO" = false ] && [ -n "''${PENDING_NJALLA:-}" ]; then
+            NEW_NJALLA_ENTRIES="$NEW_NJALLA_ENTRIES
+$PENDING_NJALLA"
+            PENDING_NJALLA=""
+          fi
+        else
+          echo "  Skipped."
+        fi
+      done
+    fi
+  '') domains;
+
+  domainSummary = lib.concatMapStringsSep "\n" (d: ''
+    if [ -f "/var/lib/domains/${d.name}" ]; then
+      printf "%b%s%b\n" "$NC" "  ${d.label}: $(cat /var/lib/domains/${d.name})" "$NC"
+    fi
+  '') domains;
+
+  setupScript = pkgs.writeShellScriptBin "sovran-setup-domains" ''
+    set -euo pipefail
+
+    GREEN='\033[0;32m'
+    YELLOW='\033[1;33m'
+    CYAN='\033[0;36m'
+    NC='\033[0m'
+    DOLLAR='$'
+
+    echo ""
+    printf "%b%s%b\n" "$CYAN" "══════════════════════════════════════════════" "$NC"
+    printf "%b%s%b\n" "$CYAN" "  Sovran_SystemsOS — Domain & DDNS Setup" "$NC"
+    printf "%b%s%b\n" "$CYAN" "══════════════════════════════════════════════" "$NC"
+    echo ""
+    printf "%b%s%b\n" "$YELLOW" "Before running this, you need:" "$NC"
+    echo ""
+    echo "  1. Domains/subdomains purchased on https://njal.la"
+    echo "  2. For each subdomain, add a Dynamic record in"
+    echo "     your Njal.la dashboard."
+    echo "  3. Njal.la will give you a curl command like:"
+    echo ""
+    printf "%b%s%b\n" "$CYAN" "     curl \"https://njal.la/update/?h=sub.domain.com&k=abc123&auto\"" "$NC"
+    echo ""
+    echo "  Have those curl commands ready."
+    echo ""
+    read -p "Press Enter to continue..."
+
+    # ── Create directories ────────────────────────────
+    mkdir -p /var/lib/domains
+
+    NJALLA_ENTRIES=""
+    PENDING_NJALLA=""
+
+    # ── SSL Email ─────────────────────────────────────
+    REDO=true
+    while [ "$REDO" = true ]; do
+      REDO=false
+      echo ""
+      printf "%b%s%b\n" "$GREEN" "── SSL Certificate Email ──" "$NC"
+      echo "Let's Encrypt needs an email for certificate notifications."
+      EXISTING_EMAIL=""
+      if [ -f "/var/lib/domains/sslemail" ]; then
+        EXISTING_EMAIL=$(cat /var/lib/domains/sslemail)
+        printf "%b%s%b\n" "$CYAN" "  Current: $EXISTING_EMAIL" "$NC"
+      fi
+      read -p "  Email address (or Enter to keep current): " EMAIL_INPUT
+      SSL_EMAIL="''${EMAIL_INPUT:-$EXISTING_EMAIL}"
+      if [ -n "$SSL_EMAIL" ]; then
+        while true; do
+          echo ""
+          printf "%b%s%b\n" "$YELLOW" "  You entered:" "$NC"
+          printf "%b%s%b\n" "$CYAN" "    Email: $SSL_EMAIL" "$NC"
+          echo ""
+          read -p "  Is this correct? (y/n): " CONFIRM
+          case "$CONFIRM" in
+            [yY])
+              echo "$SSL_EMAIL" > /var/lib/domains/sslemail
+              printf "%b%s%b\n" "$GREEN" "  Saved." "$NC"
+              break
+              ;;
+            [nN])
+              echo "  Let's try again."
+              REDO=true
+              break
+              ;;
+            *)
+              echo "  Please enter y or n."
+              ;;
+          esac
+        done
+      fi
+    done
+
+    # ── All module domains ────────────────────────────
+    ${domainPrompts}
+
+    # ── Final review ──────────────────────────────────
+    echo ""
+    printf "%b%s%b\n" "$CYAN" "══════════════════════════════════════════════" "$NC"
+    printf "%b%s%b\n" "$CYAN" "  Review All Entries" "$NC"
+    printf "%b%s%b\n" "$CYAN" "══════════════════════════════════════════════" "$NC"
+    echo ""
+    echo "  Configured domains:"
+    ${domainSummary}
+    echo ""
+    echo "  DDNS entries:"
+    if [ -n "$NJALLA_ENTRIES" ]; then
+      echo "$NJALLA_ENTRIES"
+    else
+      echo "    (none)"
+    fi
+    echo ""
+    read -p "  Does everything look correct? (y/n): " FINAL_CONFIRM
+    if [ "$FINAL_CONFIRM" != "y" ] && [ "$FINAL_CONFIRM" != "Y" ]; then
+      echo ""
+      printf "%b%s%b\n" "$YELLOW" "  Setup cancelled. Run 'sudo sovran-setup-domains' to start over." "$NC"
+      echo ""
+      exit 1
+    fi
+
+    # ── Append curl entries to njalla.sh ──────────────
+    if [ -n "$NJALLA_ENTRIES" ]; then
+      echo ""
+      printf "%b%s%b\n" "$GREEN" "── Updating DDNS script ──" "$NC"
+      echo "$NJALLA_ENTRIES" >> /var/lib/njalla/njalla.sh
+      echo "  Appended entries to /var/lib/njalla/njalla.sh"
+    fi
+
+    # ── Run DDNS update now ───────────────────────────
+    echo ""
+    read -p "Update Njal.la DNS records now? (y/n): " RUN_NOW
+    if [ "$RUN_NOW" = "y" ]; then
+      bash /var/lib/njalla/njalla.sh
+      echo "  DNS records updated."
+    fi
+
+    # ── Mark setup complete ───────────────────────────
+    touch /var/lib/domains/.setup-complete
+
+    # ── Summary ───────────────────────────────────────
+    echo ""
+    printf "%b%s%b\n" "$CYAN" "══════════════════════════════════════════════" "$NC"
+    printf "%b%s%b\n" "$CYAN" "  Setup Complete!" "$NC"
+    printf "%b%s%b\n" "$CYAN" "══════════════════════════════════════════════" "$NC"
+    echo ""
+    echo "  Domain files:   /var/lib/domains/"
+    echo "  DDNS script:    /var/lib/njalla/njalla.sh"
+    echo "  DDNS cron:      Every 15 minutes (already configured)"
+    echo ""
+
+    # ── Port Forwarding Reminder ──────────────────────
+    INTERNAL_IP=$(hostname -I 2>/dev/null | awk '{print $1}')
+    printf "%b%s%b\n" "$YELLOW" "══════════════════════════════════════════════" "$NC"
+    printf "%b  ⚠  Port Forwarding Reminder%b\n" "$YELLOW" "$NC"
+    printf "%b%s%b\n" "$YELLOW" "══════════════════════════════════════════════" "$NC"
+    echo ""
+    echo "  For your services to be reachable from the internet, you must"
+    echo "  set up PORT FORWARDING in your router's admin panel."
+    echo ""
+    if [ -n "$INTERNAL_IP" ]; then
+      printf "  Forward these ports to this machine's internal IP: %b%s%b\n" "$CYAN" "$INTERNAL_IP" "$NC"
+    else
+      echo "  Forward these ports to this machine's internal LAN IP."
+    fi
+    echo ""
+    echo "    80/TCP    — HTTP (redirects to HTTPS)"
+    echo "    443/TCP   — HTTPS (all domain-based services)"
+    echo "    8448/TCP  — Matrix federation (server-to-server)"
+    echo ""
+    echo "  If you enabled Element Calling, also forward:"
+    echo "    7881/TCP        — LiveKit WebRTC signalling"
+    echo "    7882-7894/UDP   — LiveKit media streams"
+    echo "    5349/TCP        — TURN over TLS"
+    echo "    3478/UDP        — TURN (STUN/relay)"
+    echo "    30000-40000/TCP+UDP — TURN relay"
+    echo ""
+    echo "  How: Log into your router (usually 192.168.1.1), find the"
+    echo "  \"Port Forwarding\" section, and add rules for each port above"
+    if [ -n "$INTERNAL_IP" ]; then
+      printf "  with the destination set to %b%s%b.\n" "$CYAN" "$INTERNAL_IP" "$NC"
+    else
+      echo "  with the destination set to this machine's IP."
+    fi
+    echo ""
+    echo "  These ports only need to be forwarded to this specific machine —"
+    echo "  this does NOT expose your entire network."
+    echo ""
+    printf "%b%s%b\n" "$YELLOW" "══════════════════════════════════════════════" "$NC"
+    echo ""
+    read -p "Press Enter to continue with the rebuild..."
+
+    printf "%b%s%b\n" "$YELLOW" "  Rebuilding to activate services with new domains..." "$NC"
+    echo ""
+    nixos-rebuild switch --flake /etc/nixos#nixos
+  '';
+
+  addDomainScript = pkgs.writeShellScriptBin "sovran-add-domains" ''
+    set -euo pipefail
+
+    GREEN='\033[0;32m'
+    YELLOW='\033[1;33m'
+    CYAN='\033[0;36m'
+    NC='\033[0m'
+    DOLLAR='$'
+
+    MISSING=false
+    NEW_NJALLA_ENTRIES=""
+    PENDING_NJALLA=""
+
+    echo ""
+    printf "%b%s%b\n" "$CYAN" "══════════════════════════════════════════════" "$NC"
+    printf "%b%s%b\n" "$CYAN" "  Sovran_SystemsOS — New Feature Domains" "$NC"
+    printf "%b%s%b\n" "$CYAN" "══════════════════════════════════════════════" "$NC"
+    echo ""
+    echo "  Checking for newly enabled features that need domains..."
+
+    mkdir -p /var/lib/domains
+
+    ${missingDomainPrompts}
+
+    if [ "$MISSING" = false ]; then
+      echo ""
+      printf "%b%s%b\n" "$GREEN" "  All domains are already configured. Nothing to do." "$NC"
+      echo ""
+      exit 0
+    fi
+
+    # ── Final review ──────────────────────────────────
+    echo ""
+    printf "%b%s%b\n" "$CYAN" "══════════════════════════════════════════════" "$NC"
+    printf "%b%s%b\n" "$CYAN" "  Review New Entries" "$NC"
+    printf "%b%s%b\n" "$CYAN" "══════════════════════════════════════════════" "$NC"
+    echo ""
+    echo "  All configured domains:"
+    ${domainSummary}
+    echo ""
+    echo "  New DDNS entries:"
+    if [ -n "$NEW_NJALLA_ENTRIES" ]; then
+      echo "$NEW_NJALLA_ENTRIES"
+    else
+      echo "    (none)"
+    fi
+    echo ""
+    read -p "  Does everything look correct? (y/n): " FINAL_CONFIRM
+    if [ "$FINAL_CONFIRM" != "y" ] && [ "$FINAL_CONFIRM" != "Y" ]; then
+      echo ""
+      printf "%b%s%b\n" "$YELLOW" "  Setup cancelled. Run 'sudo sovran-add-domains' to start over." "$NC"
+      echo ""
+      exit 1
+    fi
+
+    # ── Append new entries to njalla.sh ───────────────
+    if [ -n "$NEW_NJALLA_ENTRIES" ]; then
+      echo ""
+      printf "%b%s%b\n" "$GREEN" "── Updating DDNS script ──" "$NC"
+      echo "$NEW_NJALLA_ENTRIES" >> /var/lib/njalla/njalla.sh
+      echo "  Appended new entries to /var/lib/njalla/njalla.sh"
+
+      echo ""
+      read -p "Update Njal.la DNS records now? (y/n): " RUN_NOW
+      if [ "$RUN_NOW" = "y" ]; then
+        bash /var/lib/njalla/njalla.sh
+        echo "  DNS records updated."
+      fi
+    fi
+
+    # ── Summary ───────────────────────────────────────
+    echo ""
+    printf "%b%s%b\n" "$CYAN" "══════════════════════════════════════════════" "$NC"
+    printf "%b%s%b\n" "$CYAN" "  New Domains Added!" "$NC"
+    printf "%b%s%b\n" "$CYAN" "══════════════════════════════════════════════" "$NC"
+    echo ""
+    echo "  All configured domains:"
+    ${domainSummary}
+    echo ""
+
+    # ── Port Forwarding Reminder ──────────────────────
+    INTERNAL_IP=$(hostname -I 2>/dev/null | awk '{print $1}')
+    printf "%b%s%b\n" "$YELLOW" "══════════════════════════════════════════════" "$NC"
+    printf "%b  ⚠  Port Forwarding Reminder%b\n" "$YELLOW" "$NC"
+    printf "%b%s%b\n" "$YELLOW" "══════════════════════════════════════════════" "$NC"
+    echo ""
+    echo "  For your services to be reachable from the internet, you must"
+    echo "  set up PORT FORWARDING in your router's admin panel."
+    echo ""
+    if [ -n "$INTERNAL_IP" ]; then
+      printf "  Forward these ports to this machine's internal IP: %b%s%b\n" "$CYAN" "$INTERNAL_IP" "$NC"
+    else
+      echo "  Forward these ports to this machine's internal LAN IP."
+    fi
+    echo ""
+    echo "    80/TCP    — HTTP (redirects to HTTPS)"
+    echo "    443/TCP   — HTTPS (all domain-based services)"
+    echo "    8448/TCP  — Matrix federation (server-to-server)"
+    echo ""
+    echo "  If you enabled Element Calling, also forward:"
+    echo "    7881/TCP        — LiveKit WebRTC signalling"
+    echo "    7882-7894/UDP   — LiveKit media streams"
+    echo "    5349/TCP        — TURN over TLS"
+    echo "    3478/UDP        — TURN (STUN/relay)"
+    echo "    30000-40000/TCP+UDP — TURN relay"
+    echo ""
+    echo "  How: Log into your router (usually 192.168.1.1), find the"
+    echo "  \"Port Forwarding\" section, and add rules for each port above"
+    if [ -n "$INTERNAL_IP" ]; then
+      printf "  with the destination set to %b%s%b.\n" "$CYAN" "$INTERNAL_IP" "$NC"
+    else
+      echo "  with the destination set to this machine's IP."
+    fi
+    echo ""
+    echo "  These ports only need to be forwarded to this specific machine —"
+    echo "  this does NOT expose your entire network."
+    echo ""
+    printf "%b%s%b\n" "$YELLOW" "══════════════════════════════════════════════" "$NC"
+    echo ""
+    read -p "Press Enter to continue with the rebuild..."
+
+    printf "%b%s%b\n" "$YELLOW" "  Rebuilding to activate services with new domains..." "$NC"
+    echo ""
+    nixos-rebuild switch --impure
+  '';
+
+  needsSetup = pkgs.writeShellScriptBin "sovran-domains-need-setup" ''
+    # First boot — no setup done at all
+    if [ ! -f /var/lib/domains/.setup-complete ]; then
+      exit 0
+    fi
+
+    # Existing machine — check for missing domain files
+    for NAME in ${domainNamesList}; do
+      if [ ! -f "/var/lib/domains/$NAME" ]; then
+        exit 0
+      fi
+    done
+
+    # Everything is configured
+    exit 1
+  '';
+
+in
+{
+  environment.systemPackages = [
+    setupScript
+    addDomainScript
+    needsSetup
+  ];
+
+  environment.etc."xdg/autostart/sovran-setup-domains.desktop".text = ''
+    [Desktop Entry]
+    Type=Application
+    Name=Sovran_SystemsOS Domain Setup
+    Comment=Configure domains for newly enabled features
+    Exec=${pkgs.bash}/bin/bash -c 'if ${needsSetup}/bin/sovran-domains-need-setup; then if [ ! -f /var/lib/domains/.setup-complete ]; then ${pkgs.gnome-terminal}/bin/gnome-terminal -- sudo ${setupScript}/bin/sovran-setup-domains; else ${pkgs.gnome-terminal}/bin/gnome-terminal -- sudo ${addDomainScript}/bin/sovran-add-domains; fi; fi'
+    Terminal=false
+    X-GNOME-Autostart-enabled=true
+  '';
+}

modules/core/sovran_systemsos-desktop.nix

@@ -0,0 +1,149 @@
+{ config, pkgs, lib, ... }: 
+
+let
+
+  customWallpaper = pkgs.stdenvNoCC.mkDerivation {
+    pname = "sovran-systemsos-wallpaper";
+    version = "1.0";
+    src = pkgs.fetchurl {
+      url = "https://git.sovransystems.com/Sovran_Systems/Sovran_SystemsOS_iso/raw/branch/main/post-install-scripts/Wallpaper_Dark_Wide.png";
+      sha256 = "0609gy0vp92fywl7pcr4y3mg05ca6pwxsnlsax14jd371fj4y7fn";
+    };
+    dontUnpack = true;
+    installPhase = ''
+      mkdir -p $out/share/backgrounds/sovran
+      cp $src $out/share/backgrounds/sovran/Wallpaper_Dark_Wide.png
+      '';
+  };
+
+in 
+
+{
+
+  environment.systemPackages = [ customWallpaper ];
+
+  programs.dconf.enable = true;
+
+  programs.dconf.profiles.user.databases = [
+  {
+    settings = {
+
+      "org/gnome/desktop/background" = {
+        picture-uri = "file:///run/current-system/sw/share/backgrounds/sovran/Wallpaper_Dark_Wide.png";
+        picture-uri-dark = "file:///run/current-system/sw/share/backgrounds/sovran/Wallpaper_Dark_Wide.png";
+        picture-options = "zoom";
+        primary-color = "#000000";
+        secondary-color = "#000000";
+      };
+
+      "org/gnome/desktop/input-sources" = {
+        sources = [ (lib.gvariant.mkTuple [ "xkb" "us" ]) ];
+        xkb-options = lib.gvariant.mkEmptyArray lib.gvariant.type.string;
+      };
+
+      "org/gnome/desktop/interface" = {
+        color-scheme = "prefer-dark";
+        enable-animations = true;
+        icon-theme = "Papirus-Dark";
+      };
+
+      "org/gnome/evolution-data-server" = {
+        migrated = true;
+      };
+
+      "org/gnome/mutter" = {
+        edge-tiling = false;
+      };
+
+      "org/gnome/nautilus/icon-view" = {
+        default-zoom-level = "large";
+      };
+
+      "org/gnome/nautilus/preferences" = {
+        default-folder-viewer = "icon-view";
+        migrated-gtk-settings = true;
+        search-filter-time-type = "last_modified";
+      };
+      
+      "org/gnome/shell" = {
+        disabled-extensions = [ "just-perfection-desktop@just-perfection" ];
+        
+        enabled-extensions = [
+          "appindicatorsupport@rgcjonas.gmail.com"
+          "dash-to-dock-cosmic-@halfmexicanhalfamazing@gmail.com"
+          "Vitals@CoreCoding.com"
+          "dash-to-dock@micxgx.gmail.com"
+          "pop-shell@system76.com"
+          "date-menu-formatter@marcinjakubowski.github.com"
+          "light-style@gnome-shell-extensions.gcampax.github.com"
+        ];
+
+        favorite-apps = [
+          "brave-browser.desktop"
+          "org.gnome.Settings.desktop"
+          "org.gnome.Nautilus.desktop"
+          "Sovran_SystemsOS_Updater.desktop"
+          "sovran-hub.desktop"
+          "org.gnome.Software.desktop"
+          "org.gnome.Geary.desktop"
+          "org.gnome.Contacts.desktop"
+          "org.gnome.Calendar.desktop"
+          "sparrow-desktop.desktop"
+          "Bisq.desktop"
+          "bisq2.desktop"
+        ];
+
+        welcome-dialog-last-shown-version = "48.4";
+      };
+
+      "org/gnome/shell/extensions/dash-to-dock" = {
+        background-color = "rgb(0,0,0)";
+        background-opacity = 0.50000000000000001;
+        custom-background-color = true;
+        dash-max-icon-size = lib.gvariant.mkInt32 47;
+        dock-position = "BOTTOM";
+        height-fraction = 0.90000000000000002;
+        preferred-monitor = lib.gvariant.mkInt32 (-2);
+        preferred-monitor-by-connector = "Virtual-1";
+        show-trash = false;
+        transparency-mode = "FIXED";
+      };
+
+      "org/gnome/shell/extensions/date-menu-formatter" = {
+        font-size = lib.gvariant.mkInt32 12;
+        pattern = "EEEE,  MMM d  h:mm a";
+        text-align = "center";
+        update-level = lib.gvariant.mkInt32 1;
+      };
+
+      "org/gnome/shell/extensions/just-perfection" = {
+        support-notifier-showed-version = lib.gvariant.mkInt32 34;
+        support-notifier-type = lib.gvariant.mkInt32 0;
+      };
+
+      "org/gnome/shell/extensions/pop-shell" = {
+        tile-by-default = true;
+      };
+
+      "org/gnome/shell/extensions/vitals" = {
+        hot-sensors = [
+          "_storage_free_"
+          "_processor_usage_"
+          "_memory_usage_"
+        ];
+      };
+
+      "org/gnome/software" = {
+        check-timestamp = lib.gvariant.mkInt64 1760848349;
+        first-run = false;
+      };
+
+      "org/gtk/gtk4/settings/color-chooser" = {
+        selected-color = lib.gvariant.mkTuple [ true 0.0 0.0 0.0 1.0 ];
+      };
+    };
+
+  }
+  ];
+
+}

modules/core/ssh-bootstrap.nix

@@ -0,0 +1,53 @@
+{ config, pkgs, lib, ... }:
+
+let
+  userName = "free";
+  keyPath = "/home/${userName}/.ssh/factory_login";
+  userExists = builtins.hasAttr userName config.users.users;
+in
+lib.mkIf userExists {
+
+  systemd.tmpfiles.rules = [
+    "d /root/.ssh 0700 root root -"
+    "d /home/${userName}/.ssh 0700 ${userName} users -"
+  ];
+
+  systemd.services.factory-ssh-keygen = {
+    description = "Generate factory SSH key for ${userName} if missing";
+    wantedBy = [ "multi-user.target" ];
+    serviceConfig = {
+      Type = "oneshot";
+      RemainAfterExit = true;
+    };
+    path = [ pkgs.openssh pkgs.coreutils ];
+    script = ''
+      if [ ! -f "${keyPath}" ]; then
+        ssh-keygen -q -N "gosovransystems" -t ed25519 -f "${keyPath}"
+        chown ${userName}:users "${keyPath}" "${keyPath}.pub"
+        chmod 600 "${keyPath}"
+        chmod 644 "${keyPath}.pub"
+      fi
+    '';
+  };
+
+  systemd.services.factory-ssh-authorize = {
+    description = "Authorize factory SSH key for root";
+    wantedBy = [ "multi-user.target" ];
+    after = [ "factory-ssh-keygen.service" ];
+    requires = [ "factory-ssh-keygen.service" ];
+    serviceConfig = {
+      Type = "oneshot";
+      RemainAfterExit = true;
+    };
+    path = [ pkgs.coreutils ];
+    script = ''
+      if [ -f "${keyPath}.pub" ]; then
+        PUB=$(cat "${keyPath}.pub")
+        mkdir -p /root/.ssh
+        touch /root/.ssh/authorized_keys
+        grep -qxF "$PUB" /root/.ssh/authorized_keys || echo "$PUB" >> /root/.ssh/authorized_keys
+        chmod 600 /root/.ssh/authorized_keys
+      fi
+    '';
+  };
+}

modules/coturn.nix

@@ -1,51 +0,0 @@
-{config, pkgs, lib, ...}:
-
-let
-	personalization = import ./personalization.nix;
-	
-	in
-{
-
-	systemd.services.coturn-helper = {
-	  
-	  script = ''
-	   
-	   systemctl restart coturn   
-	   
-	  '';
-
-	  unitConfig = {
-	  	Type = "simple";
-	    After = "NetworkManager.service";
-	    Requires = "network-online.target";
-	  };
-	   
-	  serviceConfig = {
-	    RemainAfterExit = "yes";
-	    Type = "oneshot";
-	  };
-
-	  wantedBy = [ "multi-user.target" ];
-	
-	};
-
-
-	services.coturn = {
-	
-	enable = true;
-	use-auth-secret = true;
-	static-auth-secret = "${personalization.age.secrets.turn.file}";
-	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;
-	no-cli = true;
-	extraConfig = ''
-		verbose
-		external-ip=${personalization.external_ip_secret}
-	'';
-	
-	};
-
-}

modules/credentials-pdf.nix

@@ -0,0 +1,444 @@
+{ config, pkgs, lib, ... }:
+
+let
+  fonts = pkgs.liberation_ttf;
+
+  # ── Helper: change 'free' password and save it ─────────────
+  change-free-password = pkgs.writeShellScriptBin "change-free-password" ''
+    set -euo pipefail
+    SECRET_FILE="/var/lib/secrets/free-password"
+
+    if [ "$(id -u)" -ne 0 ]; then
+      echo "Error: must be run as root (use sudo)." >&2
+      exit 1
+    fi
+
+    echo -n "New password for free: "
+    read -rs NEW_PASS
+    echo
+    echo -n "Confirm password: "
+    read -rs CONFIRM
+    echo
+
+    if [ "$NEW_PASS" != "$CONFIRM" ]; then
+      echo "Passwords do not match." >&2
+      exit 1
+    fi
+
+    if [ -z "$NEW_PASS" ]; then
+      echo "Password cannot be empty." >&2
+      exit 1
+    fi
+
+    echo "free:$NEW_PASS" | ${pkgs.shadow}/bin/chpasswd
+    mkdir -p /var/lib/secrets
+    echo "$NEW_PASS" > "$SECRET_FILE"
+    chmod 600 "$SECRET_FILE"
+    echo "Password for 'free' updated and saved."
+  '';
+in
+{
+  # ── Make helper available system-wide ───────────────────────
+  environment.systemPackages = [ change-free-password ];
+
+  # ── Shell aliases: intercept 'passwd free' ─────────────────
+  programs.bash.interactiveShellInit = ''
+    passwd() {
+      if [ "$1" = "free" ]; then
+        echo ""
+        echo "╔══════════════════════════════════════════════════════╗"
+        echo "║  ⚠  Use 'sudo change-free-password' instead.       ║"
+        echo "║                                                      ║"
+        echo "║  'passwd free' only updates /etc/shadow.             ║"
+        echo "║  The Hub and Magic Keys PDF will NOT be updated.     ║"
+        echo "╚══════════════════════════════════════════════════════╝"
+        echo ""
+        return 1
+      fi
+      command passwd "$@"
+    }
+  '';
+
+  programs.fish.interactiveShellInit = ''
+    function passwd --wraps passwd
+      if test "$argv[1]" = "free"
+        echo ""
+        echo "╔══════════════════════════════════════════════════════╗"
+        echo "║  ⚠  Use 'sudo change-free-password' instead.       ║"
+        echo "║                                                      ║"
+        echo "║  'passwd free' only updates /etc/shadow.             ║"
+        echo "║  The Hub and Magic Keys PDF will NOT be updated.     ║"
+        echo "╚════════════════════════════��═════════════════════════╝"
+        echo ""
+        return 1
+      end
+      command passwd $argv
+    end
+  '';
+
+  # ── 1. Auto-Generate Root Password (Runs once) ─────────────
+  systemd.services.root-password-setup = {
+    description = "Generate and set a random root password";
+    wantedBy = [ "multi-user.target" ];
+    serviceConfig = {
+      Type = "oneshot";
+      RemainAfterExit = true;
+    };
+    path = [ pkgs.pwgen pkgs.shadow pkgs.coreutils ];
+    script = ''
+      SECRET_FILE="/var/lib/secrets/root-password"
+      if [ ! -f "$SECRET_FILE" ]; then
+        mkdir -p /var/lib/secrets
+        ROOT_PASS=$(pwgen -s 20 1)
+        echo "root:$ROOT_PASS" | chpasswd
+        echo "$ROOT_PASS" > "$SECRET_FILE"
+        chmod 600 "$SECRET_FILE"
+      fi
+    '';
+  };
+
+  # ── 1b. Save 'free' password on first boot ─────────────────
+  systemd.services.free-password-setup = {
+    description = "Save the initial 'free' user password";
+    wantedBy = [ "multi-user.target" ];
+    serviceConfig = {
+      Type = "oneshot";
+      RemainAfterExit = true;
+    };
+    path = [ pkgs.coreutils ];
+    script = ''
+      SECRET_FILE="/var/lib/secrets/free-password"
+      if [ ! -f "$SECRET_FILE" ]; then
+        mkdir -p /var/lib/secrets
+        echo "free" > "$SECRET_FILE"
+        chmod 600 "$SECRET_FILE"
+      fi
+    '';
+  };
+
+  # ── 1c. Save Zeus/lndconnect URL for hub credentials ────────
+  systemd.services.zeus-connect-setup = {
+    description = "Save Zeus lndconnect URL";
+    wantedBy = [ "multi-user.target" ];
+    after = [ "lnd.service" ];
+    serviceConfig = {
+      Type = "oneshot";
+      RemainAfterExit = true;
+    };
+    path = [ pkgs.coreutils "/run/current-system/sw" ];
+    script = ''
+      SECRET_FILE="/var/lib/secrets/zeus-connect-url"
+      mkdir -p /var/lib/secrets
+
+      URL=""
+      if command -v lndconnect >/dev/null 2>&1; then
+        URL=$(lndconnect --url 2>/dev/null || true)
+      elif command -v lnconnect-clnrest >/dev/null 2>&1; then
+        URL=$(lnconnect-clnrest --url 2>/dev/null || true)
+      fi
+
+      if [ -n "$URL" ]; then
+        echo "$URL" > "$SECRET_FILE"
+        chmod 600 "$SECRET_FILE"
+        echo "Zeus connect URL saved."
+      else
+        echo "No lndconnect URL available yet."
+      fi
+    '';
+  };
+
+  # ── Refresh Zeus URL periodically (certs/macaroons may rotate)
+  systemd.timers.zeus-connect-setup = {
+    wantedBy = [ "timers.target" ];
+    timerConfig = {
+      OnBootSec = "2min";
+      OnUnitActiveSec = "30min";
+      Unit = "zeus-connect-setup.service";
+    };
+  };
+
+  # ── 2. Timer: Check every 5 minutes ────────────────────────
+  systemd.timers.generate-credentials-pdf = {
+    description = "Periodically check if Magic Keys PDF needs regenerating";
+    wantedBy = [ "timers.target" ];
+    timerConfig = {
+      OnBootSec = "30s";
+      OnUnitActiveSec = "5min";
+      Unit = "generate-credentials-pdf.service";
+    };
+  };
+
+  # ── 3. Generate the Magic Keys PDF ─────────────────────────
+  systemd.services.generate-credentials-pdf = {
+    description = "Generate Magic Keys PDF for Sovran_SystemsOS";
+    serviceConfig = {
+      Type = "oneshot";
+    };
+
+    path = [
+      pkgs.pandoc
+      pkgs.typst
+      pkgs.coreutils
+      pkgs.qrencode
+      pkgs.gnugrep
+      fonts
+      "/run/current-system/sw"
+    ];
+
+    environment = {
+      TYPST_FONT_PATHS = "${fonts}/share/fonts";
+    };
+
+    script = ''
+      DOC_DIR="/home/free/Documents"
+      OUTPUT="$DOC_DIR/Sovran_SystemsOS_Magic_Keys.pdf"
+      WORK_DIR="/tmp/magic_keys_build"
+      FILE="$WORK_DIR/magic_keys.md"
+      HASH_FILE="/var/lib/secrets/.magic-keys-hash"
+
+      FENCE='```'
+
+      # ── Collect all secret sources into a single hash ──
+      SECRET_SOURCES=""
+      for f in \
+        /var/lib/secrets/root-password \
+        /var/lib/secrets/free-password \
+        /etc/nix-bitcoin-secrets/rtl-password \
+        /var/lib/tor/onion/rtl/hostname \
+        /var/lib/tor/onion/electrs/hostname \
+        /var/lib/tor/onion/bitcoind/hostname \
+        /var/lib/secrets/matrix-users \
+        /var/lib/gnome-remote-desktop/rdp-credentials \
+        /var/lib/secrets/nextcloud-admin \
+        /var/lib/secrets/wordpress-admin \
+        /var/lib/secrets/vaultwarden/vaultwarden.env \
+        /var/lib/domains/vaultwarden \
+        /var/lib/domains/btcpayserver \
+        /var/lib/secrets/zeus-connect-url; do
+        if [ -f "$f" ]; then
+          SECRET_SOURCES="$SECRET_SOURCES$(cat "$f")"
+        fi
+      done
+
+      # Add lndconnect URL to hash sources (changes if certs/macaroons rotate)
+      if command -v lndconnect >/dev/null 2>&1; then
+        SECRET_SOURCES="$SECRET_SOURCES$(lndconnect --url 2>/dev/null || true)"
+      elif command -v lnconnect-clnrest >/dev/null 2>&1; then
+        SECRET_SOURCES="$SECRET_SOURCES$(lnconnect-clnrest --url 2>/dev/null || true)"
+      fi
+
+      CURRENT_HASH=$(echo -n "$SECRET_SOURCES" | sha256sum | cut -d' ' -f1)
+      OLD_HASH=""
+      if [ -f "$HASH_FILE" ]; then
+        OLD_HASH=$(cat "$HASH_FILE")
+      fi
+
+      # ── Skip if PDF exists and nothing changed ──
+      if [ -f "$OUTPUT" ] && [ "$CURRENT_HASH" = "$OLD_HASH" ]; then
+        echo "No changes detected, skipping PDF regeneration."
+        exit 0
+      fi
+
+      echo "Changes detected (or PDF missing), regenerating..."
+      mkdir -p "$DOC_DIR" "$WORK_DIR"
+
+      # ── Read secrets (default to placeholder if missing) ──
+      read_secret() { if [ -f "$1" ]; then cat "$1"; else echo "$2"; fi; }
+
+      ROOT_PASS=$(read_secret /var/lib/secrets/root-password "Generating...")
+      FREE_PASS=$(read_secret /var/lib/secrets/free-password "free")
+      RTL_PASS=$(read_secret /etc/nix-bitcoin-secrets/rtl-password "Not found")
+      RTL_ONION=$(read_secret /var/lib/tor/onion/rtl/hostname "Not generated yet")
+      ELECTRS_ONION=$(read_secret /var/lib/tor/onion/electrs/hostname "Not generated yet")
+      BITCOIN_ONION=$(read_secret /var/lib/tor/onion/bitcoind/hostname "Not generated yet")
+
+      # ── Generate Zeus QR code PNG if lndconnect URL is available ──
+      ZEUS_URL=""
+      HAS_ZEUS_QR=""
+      if command -v lndconnect >/dev/null 2>&1; then
+        ZEUS_URL=$(lndconnect --url 2>/dev/null || true)
+      elif command -v lnconnect-clnrest >/dev/null 2>&1; then
+        ZEUS_URL=$(lnconnect-clnrest --url 2>/dev/null || true)
+      fi
+
+      if [ -n "$ZEUS_URL" ]; then
+        qrencode -o "$WORK_DIR/zeus-qr.png" -s 4 -m 1 -l H "$ZEUS_URL" 2>/dev/null && HAS_ZEUS_QR="1"
+      fi
+
+      # ── Build the Markdown document ──
+      cat > "$FILE" << ENDOFFILE
+---
+title: "Sovran SystemsOS Magic Keys"
+---
+
+# Your Sovran SystemsOS Magic Keys! 🗝️
+
+Welcome to your new computer! We have built a lot of cool secret forts (services) for you. To get into your forts, you need your magic keys (passwords).
+
+Here are all of your keys in one place. **Keep this document safe and do not share it with strangers!**
+
+> **How this document works:** This PDF is automatically generated by your computer. If any of your passwords, services, or connection details change, this document will automatically update itself within a few minutes. You can always find the latest version right here in your Documents folder. If you accidentally delete it, don't worry — your computer will recreate it for you!
+
+## 🖥️ Your Computer
+These are the master keys to the actual machine.
+
+### 1. Main Screen Unlock (The 'free' account)
+When you turn the computer on, it usually logs you in automatically. However, if the screen goes to sleep, or **if you enable Remote Desktop (RDP)**, you will need this to log in:
+- **Username:** \`free\`
+- **Password:** \`$FREE_PASS\`
+
+🚨 **VERY IMPORTANT:** You MUST write this password down and keep it safe! If you lose it, you will be locked out of your computer!
+
+### 2. The Big Boss (Root)
+Sometimes a pop-up box might ask for an Administrator (Root) password to change a setting. We created a super-secret password just for this!
+- **Root Password:** \`$ROOT_PASS\`
+
+### 3. The Hacker Terminal (\`ssh root@localhost\`)
+Because your main account is so safe, you cannot just type normal commands to become the boss. If you open a black terminal box and want to make big changes, you must use your special factory key!
+
+Type this exact command into the terminal:
+\`ssh root@localhost\`
+
+When it asks for a passphrase, type:
+- **Terminal Password:** \`gosovransystems\`
+ENDOFFILE
+
+      # --- BITCOIN ECOSYSTEM ---
+      if [ -f "/etc/nix-bitcoin-secrets/rtl-password" ] || [ -f "/var/lib/tor/onion/rtl/hostname" ]; then
+        cat >> "$FILE" << BITCOIN
+
+## ⚡ Your Bitcoin & Lightning Node
+Your computer is a real Bitcoin node! It talks to the network secretly using Tor. Here is how to connect your wallet apps to it:
+
+### 1. Ride The Lightning (RTL)
+*This is the control panel for your Lightning Node.*
+Open the **Tor Browser** and go to this website. Use this password to log in:
+- **Website:** \`http://$RTL_ONION\`
+- **Password:** \`$RTL_PASS\`
+
+### 2. Electrs (Your Private Bank Teller)
+*If you use a wallet app on your phone or computer (like Sparrow or BlueWallet), tell it to connect here so nobody can spy on your money!*
+- **Tor Address:** \`$ELECTRS_ONION\`
+- **Port:** \`50001\`
+
+### 3. Bitcoin Core
+*This is the heartbeat of your node. It uses this address to talk to other Bitcoiners securely.*
+- **Tor Address:** \`$BITCOIN_ONION\`
+BITCOIN
+      fi
+
+      # --- ZEUS MOBILE WALLET QR CODE ---
+      if [ "$HAS_ZEUS_QR" = "1" ]; then
+        echo "" >> "$FILE"
+        echo "## 📱 Connect Zeus Mobile Wallet" >> "$FILE"
+        echo "" >> "$FILE"
+        echo "Take your Bitcoin Lightning node anywhere in the world! Scan this QR code with the **Zeus** app on your phone to instantly connect your mobile wallet to your Lightning node." >> "$FILE"
+        echo "" >> "$FILE"
+        echo "1. Download **Zeus** from the App Store or Google Play" >> "$FILE"
+        echo "2. Open Zeus and tap **\"Scan Node Config\"**" >> "$FILE"
+        echo "3. Point your phone's camera at this QR code:" >> "$FILE"
+        echo "" >> "$FILE"
+        echo "![Zeus Connection QR Code](zeus-qr.png){ width=200px }" >> "$FILE"
+        echo "" >> "$FILE"
+        echo "That's it! You're now mobile. Send and receive Bitcoin anywhere in the world, powered by your very own node! ⚡" >> "$FILE"
+      elif [ -n "$ZEUS_URL" ]; then
+        echo "" >> "$FILE"
+        echo "## 📱 Connect Zeus Mobile Wallet" >> "$FILE"
+        echo "" >> "$FILE"
+        echo "Take your Bitcoin Lightning node anywhere in the world! Paste this connection URL into the **Zeus** app on your phone:" >> "$FILE"
+        echo "" >> "$FILE"
+        echo "1. Download **Zeus** from the App Store or Google Play" >> "$FILE"
+        echo "2. Open Zeus and tap **\"Scan Node Config\"** then **\"Paste Node Config\"**" >> "$FILE"
+        echo "3. Paste this URL:" >> "$FILE"
+        echo "" >> "$FILE"
+        echo "$FENCE" >> "$FILE"
+        echo "$ZEUS_URL" >> "$FILE"
+        echo "$FENCE" >> "$FILE"
+        echo "" >> "$FILE"
+        echo "That's it! You're now mobile. Send and receive Bitcoin anywhere in the world, powered by your very own node! ⚡" >> "$FILE"
+      fi
+
+      # --- MATRIX / ELEMENT ---
+      if [ -f "/var/lib/secrets/matrix-users" ]; then
+        echo "" >> "$FILE"
+        echo "## 💬 Your Private Chat (Matrix / Element)" >> "$FILE"
+        echo "This is your very own private messaging app! Log in using an app like Element with these details:" >> "$FILE"
+        echo "$FENCE" >> "$FILE"
+        cat /var/lib/secrets/matrix-users >> "$FILE"
+        echo "$FENCE" >> "$FILE"
+      fi
+
+      # --- GNOME RDP ---
+      if [ -f "/var/lib/gnome-remote-desktop/rdp-credentials" ]; then
+        echo "" >> "$FILE"
+        echo "## 🌎 Connect from Far Away (Remote Desktop)" >> "$FILE"
+        echo "This lets you control your computer screen from another device!" >> "$FILE"
+        echo "$FENCE" >> "$FILE"
+        cat /var/lib/gnome-remote-desktop/rdp-credentials >> "$FILE"
+        echo "$FENCE" >> "$FILE"
+      fi
+
+      # --- NEXTCLOUD ---
+      if [ -f "/var/lib/secrets/nextcloud-admin" ]; then
+        echo "" >> "$FILE"
+        echo "## ☁️ Your Personal Cloud (Nextcloud)" >> "$FILE"
+        echo "This is like your own private Google Drive!" >> "$FILE"
+        echo "$FENCE" >> "$FILE"
+        cat /var/lib/secrets/nextcloud-admin >> "$FILE"
+        echo "$FENCE" >> "$FILE"
+      fi
+
+      # --- WORDPRESS ---
+      if [ -f "/var/lib/secrets/wordpress-admin" ]; then
+        echo "" >> "$FILE"
+        echo "## 📝 Your Website (WordPress)" >> "$FILE"
+        echo "This is your very own website where you can write blogs or make pages." >> "$FILE"
+        echo "$FENCE" >> "$FILE"
+        cat /var/lib/secrets/wordpress-admin >> "$FILE"
+        echo "$FENCE" >> "$FILE"
+      fi
+
+      # --- VAULTWARDEN ---
+      if [ -f "/var/lib/domains/vaultwarden" ]; then
+        DOMAIN=$(cat /var/lib/domains/vaultwarden)
+        VW_ADMIN_TOKEN="Not found"
+        if [ -f "/var/lib/secrets/vaultwarden/vaultwarden.env" ]; then
+          VW_ADMIN_TOKEN=$(grep -oP 'ADMIN_TOKEN=\K.*' /var/lib/secrets/vaultwarden/vaultwarden.env || echo "Not found")
+        fi
+        echo "" >> "$FILE"
+        echo "## 🔐 Your Password Manager (Vaultwarden)" >> "$FILE"
+        echo "This keeps all your other passwords safe! Go to this website to use it:" >> "$FILE"
+        echo "- **Website:** https://$DOMAIN" >> "$FILE"
+        echo "- **Admin Panel:** https://$DOMAIN/admin" >> "$FILE"
+        echo "- **Admin Token:** \`$VW_ADMIN_TOKEN\`" >> "$FILE"
+        echo "" >> "$FILE"
+        echo "*(Create your own account on the main page. Use the Admin Token to access the admin panel and manage your server.)*" >> "$FILE"
+      fi
+
+      # --- BTCPAY SERVER ---
+      if [ -f "/var/lib/domains/btcpayserver" ]; then
+        DOMAIN=$(cat /var/lib/domains/btcpayserver)
+        echo "" >> "$FILE"
+        echo "## ₿ Your Bitcoin Store (BTCPay Server)" >> "$FILE"
+        echo "This lets you accept Bitcoin like a real shop!" >> "$FILE"
+        echo "- **Website:** https://$DOMAIN" >> "$FILE"
+        echo "*(You make up your own Admin Password the first time you visit!)*" >> "$FILE"
+      fi
+
+      # ── Generate PDF (cd into work dir so Typst finds images) ──
+      cd "$WORK_DIR"
+      pandoc magic_keys.md -o "$OUTPUT" --pdf-engine=typst \
+        -V mainfont="Liberation Sans" \
+        -V monofont="Liberation Mono"
+
+      chown free:users "$OUTPUT"
+
+      # ── Save hash so we skip next time if nothing changed ──
+      mkdir -p "$(dirname "$HASH_FILE")"
+      echo "$CURRENT_HASH" > "$HASH_FILE"
+
+      rm -rf "$WORK_DIR"
+      echo "PDF generated successfully."
+    '';
+  };
+}

modules/element-calling.nix

@@ -0,0 +1,236 @@
+{ config, pkgs, lib, ... }:
+
+let
+  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" ];
+    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 SNIPPET #######
+  systemd.services.element-calling-caddy-config = {
+    description = "Generate Element Calling Caddy config snippet";
+    before = [ "caddy-generate-config.service" ];
+    requiredBy = [ "caddy-generate-config.service" ];
+    wantedBy = [ "multi-user.target" ];
+    serviceConfig = {
+      Type = "oneshot";
+      RemainAfterExit = true;
+    };
+    unitConfig = {
+      ConditionPathExists = "/var/lib/domains/element-calling";
+    };
+    path = [ pkgs.coreutils ];
+    script = ''
+      MATRIX=$(cat /var/lib/domains/matrix)
+      ELEMENT_CALLING=$(cat /var/lib/domains/element-calling)
+
+      mkdir -p /run/caddy
+
+      cat > /run/caddy/element-calling.snippet <<EOF
+$MATRIX {
+  reverse_proxy /_matrix/* http://localhost:8008
+  reverse_proxy /_synapse/client/* http://localhost:8008
+  header /.well-known/matrix/* Content-Type "application/json"
+  header /.well-known/matrix/* Access-Control-Allow-Origin "*"
+  header /.well-known/matrix/* Access-Control-Allow-Methods "GET, POST, PUT, DELETE, OPTIONS"
+  header /.well-known/matrix/* Access-Control-Allow-Headers "X-Requested-With, Content-Type, Authorization"
+  respond /.well-known/matrix/client \`{ "m.homeserver": {"base_url": "https://$MATRIX" }, "org.matrix.msc4143.rtc_foci": [{ "type":"livekit", "livekit_service_url":"https://$ELEMENT_CALLING/livekit/jwt" }] }\`
+}
+
+$MATRIX:8448 {
+  reverse_proxy http://localhost:8008
+}
+
+$ELEMENT_CALLING {
+  handle /livekit/jwt/sfu/get {
+    uri strip_prefix /livekit/jwt
+    reverse_proxy [::1]:8073 {
+      header_up Host {host}
+      header_up X-Forwarded-Server {host}
+      header_up X-Real-IP {remote_host}
+      header_up X-Forwarded-For {remote_host}
+    }
+  }
+  handle {
+    reverse_proxy localhost:7880
+  }
+}
+EOF
+    '';
+  };
+
+  ####### LIVEKIT RUNTIME CONFIG #######
+  systemd.services.livekit-runtime-config = {
+    description = "Generate LiveKit runtime config from domain files";
+    before = [ "livekit.service" ];
+    after = [ "livekit-key-setup.service" ];
+    requiredBy = [ "livekit.service" ];
+    wantedBy = [ "multi-user.target" ];
+    serviceConfig = {
+      Type = "oneshot";
+      RemainAfterExit = true;
+    };
+    unitConfig = {
+      ConditionPathExists = "/var/lib/domains/element-calling";
+    };
+    path = [ pkgs.coreutils ];
+    script = ''
+      MATRIX=$(cat /var/lib/domains/matrix)
+
+      mkdir -p /run/livekit
+
+      cat > /run/livekit/runtime-config.yaml <<EOF
+turn:
+  domain: $MATRIX
+  cert_file: /var/lib/livekit/$MATRIX.crt
+  key_file: /var/lib/livekit/$MATRIX.key
+EOF
+
+      chmod 640 /run/livekit/runtime-config.yaml
+    '';
+  };
+
+  ####### LIVEKIT SERVICE #######
+  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;
+        tls_port = 5349;
+        udp_port = 3478;
+      };
+    };
+  };
+
+  networking.firewall.allowedTCPPorts = [ 7881 ];
+  networking.firewall.allowedUDPPortRanges = [
+    { from = 7882; to = 7894; }
+  ];
+
+  ####### JWT SERVICE RUNTIME CONFIG #######
+  systemd.services.lk-jwt-service-runtime-config = {
+    description = "Generate lk-jwt-service runtime config from domain files";
+    before = [ "lk-jwt-service.service" ];
+    after = [ "livekit-key-setup.service" ];
+    requiredBy = [ "lk-jwt-service.service" ];
+    wantedBy = [ "multi-user.target" ];
+    serviceConfig = {
+      Type = "oneshot";
+      RemainAfterExit = true;
+    };
+    unitConfig = {
+      ConditionPathExists = "/var/lib/domains/element-calling";
+    };
+    path = [ pkgs.coreutils ];
+    script = ''
+      ELEMENT_CALLING=$(cat /var/lib/domains/element-calling)
+
+      mkdir -p /run/lk-jwt-service
+
+      cat > /run/lk-jwt-service/env <<EOF
+LIVEKIT_URL=wss://$ELEMENT_CALLING
+EOF
+
+      chmod 640 /run/lk-jwt-service/env
+    '';
+  };
+
+  ####### JWT SERVICE #######
+  services.lk-jwt-service = {
+    enable = true;
+    port = 8073;
+    keyFile = livekitKeyFile;
+    livekitUrl = "wss://placeholder.local";
+  };
+
+  systemd.services.lk-jwt-service.serviceConfig.EnvironmentFile = [
+    "/run/lk-jwt-service/env"
+  ];
+
+  ####### SYNAPSE RUNTIME CONFIG (element-calling additions) #######
+  systemd.services.element-calling-synapse-config = {
+    description = "Generate Synapse runtime config for Element Calling";
+    before = [ "matrix-synapse.service" ];
+    requiredBy = [ "matrix-synapse.service" ];
+    wantedBy = [ "multi-user.target" ];
+    serviceConfig = {
+      Type = "oneshot";
+      RemainAfterExit = true;
+    };
+    unitConfig = {
+      ConditionPathExists = "/var/lib/domains/element-calling";
+    };
+    path = [ pkgs.coreutils ];
+    script = ''
+      MATRIX=$(cat /var/lib/domains/matrix)
+
+      mkdir -p /run/matrix-synapse
+
+      cat > /run/matrix-synapse/element-calling-config.yaml <<EOF
+server_name: "$MATRIX"
+public_baseurl: "https://$MATRIX"
+serve_server_wellknown: true
+experimental_features:
+  msc3266_enabled: true
+  msc4222_enabled: true
+max_event_delay_duration: "24h"
+rc_message:
+  per_second: 0.5
+  burst_count: 30
+rc_delayed_event_mgmt:
+  per_second: 1
+  burst_count: 20
+EOF
+
+      chown matrix-synapse:matrix-synapse /run/matrix-synapse/element-calling-config.yaml
+      chmod 640 /run/matrix-synapse/element-calling-config.yaml
+    '';
+  };
+
+  ####### SYNAPSE OVERRIDES (element-calling needs) #######
+  services.matrix-synapse.extraConfigFiles = [
+    "/run/matrix-synapse/element-calling-config.yaml"
+  ];
+
+  sovran_systemsOS.domainRequirements = [
+    { name = "element-calling"; label = "Element Calling (LiveKit)"; example = "call.yourdomain.com"; }
+  ];
+}

modules/haven.nix

@@ -0,0 +1,163 @@
+{ config, pkgs, lib, ... }:
+
+let
+  npub = config.sovran_systemsOS.nostr_npub;
+in
+
+lib.mkIf (config.sovran_systemsOS.features.haven && npub != "") {
+
+  # ── Generate Haven runtime config from domain files ───────
+  systemd.services.haven-runtime-config = {
+    description = "Generate Haven runtime config from domain files";
+    before = [ "haven.service" ];
+    requiredBy = [ "haven.service" ];
+    wantedBy = [ "multi-user.target" ];
+    serviceConfig = {
+      Type = "oneshot";
+      RemainAfterExit = true;
+    };
+    unitConfig = {
+      ConditionPathExists = "/var/lib/domains/haven";
+    };
+    path = [ pkgs.coreutils ];
+    script = ''
+      HAVEN=$(cat /var/lib/domains/haven)
+
+      mkdir -p /run/haven
+
+      cat > /run/haven/runtime.env <<EOF
+RELAY_URL=$HAVEN
+PRIVATE_RELAY_NAME=$HAVEN private relay
+PRIVATE_RELAY_DESCRIPTION=The Relay From Sovran Systems
+CHAT_RELAY_NAME=$HAVEN chat relay
+CHAT_RELAY_DESCRIPTION=a relay for private chats
+OUTBOX_RELAY_NAME=$HAVEN outbox relay
+OUTBOX_RELAY_DESCRIPTION=a relay and Blossom server for public messages and media
+INBOX_RELAY_NAME=$HAVEN inbox relay
+INBOX_RELAY_DESCRIPTION=send your interactions with my notes here
+EOF
+
+      chmod 640 /run/haven/runtime.env
+      chown haven:haven /run/haven/runtime.env
+    '';
+  };
+
+  services.haven = {
+    enable = true;
+    settings = {
+      OWNER_NPUB = npub;
+      # RELAY_URL injected at runtime via EnvironmentFile
+
+      RELAY_PORT = 3355;
+      RELAY_BIND_ADDRESS = "0.0.0.0";
+      DB_ENGINE = "badger";
+      LMDB_MAPSIZE = 3000000000;
+      BLOSSOM_PATH = "blossom/";
+
+      # Relay names/descriptions injected at runtime via EnvironmentFile
+      PRIVATE_RELAY_NPUB = npub;
+      CHAT_RELAY_NPUB = npub;
+      OUTBOX_RELAY_NPUB = npub;
+
+      INBOX_PULL_INTERVAL_SECONDS = 600;
+
+      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.services.haven.serviceConfig.EnvironmentFile = [
+    "/run/haven/runtime.env"
+  ];
+
+  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" "haven-runtime-config.service" ];
+  systemd.services.haven.wants = [ "haven-whitelist-setup.service" "haven-runtime-config.service" ];
+  
+  sovran_systemsOS.domainRequirements = [
+    { name = "haven"; label = "Haven NOSTR Relay"; example = "relay.yourdomain.com"; }
+  ];
+}

modules/mempool.nix

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

modules/modules.nix

@@ -1,15 +1,35 @@
 { config, pkgs, lib, ... }:
 
 {
+  imports = [
+    # ── Core (always loaded) ──────────────────────────────────
+    ./core/roles.nix
+    ./core/role-logic.nix
+    ./core/caddy.nix
+    ./core/njalla.nix
+    ./core/ssh-bootstrap.nix
+    ./core/sovran-manage-domains.nix
+    ./core/sovran_systemsos-desktop.nix
+    ./core/sovran-hub.nix
 
-	imports = [	
-		./configuration.nix
-		./synapse.nix
-		./coturn.nix
-		./bitcoinecosystem.nix
-		./vaultwarden.nix
-		./onlyoffice.nix
-		./Sovran_SystemsOS_File_Fixes_And_New_Services.nix
-		/etc/nixos/hardware-configuration.nix
-		];
+    # ── Always on (no flag) ───────────────────────────────────
+    ./php.nix
+    ./Sovran_SystemsOS_File_Fixes_And_New_Services.nix
+    ./credentials-pdf.nix
+
+    # ── Services (default ON — disable in custom.nix) ─────────
+    ./synapse.nix
+    ./wordpress.nix
+    ./nextcloud.nix
+    ./vaultwarden.nix
+    ./bitcoinecosystem.nix
+
+    # ── Features (default OFF — enable in custom.nix) ─────────
+    ./haven.nix
+    ./bip110.nix
+    ./element-calling.nix
+    ./mempool.nix
+    ./bitcoin-core.nix
+    ./rdp.nix
+  ];
 }

modules/nextcloud.nix

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

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

@@ -1,28 +0,0 @@
-{
-
-matrix_url = builtins.readFile /var/lib/domains/matrix;
-wordpress_url = builtins.readFile /var/lib/domains/wordpress;
-nextcloud_url = builtins.readFile /var/lib/domains/nextcloud;
-btcpayserver_url = builtins.readFile /var/lib/domains/btcpayserver;
-caddy_email_for_zerossl = builtins.readFile /var/lib/domains/sslemail;
-vaultwarden_url = builtins.readFile /var/lib/domains/vaultwarden;
-onlyoffice_url = builtins.readFile /var/lib/domains/onlyoffice;
-
-##
-
-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;
-
-}

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,121 @@
+{ config, lib, pkgs, ... }:
+
+lib.mkIf config.sovran_systemsOS.features.rdp {
+
+  users.users.gnome-remote-desktop = {
+    isSystemUser = true;
+    group = "gnome-remote-desktop";
+    home = "/var/lib/gnome-remote-desktop";
+    createHome = true;
+  };
+  users.groups.gnome-remote-desktop = {};
+
+  # Enable the GNOME Remote Desktop service at the system level
+  services.gnome.gnome-remote-desktop.enable = true;
+
+  # Open RDP port in the firewall
+  networking.firewall.allowedTCPPorts = [ 3389 ];
+
+  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"
+
+      # Regenerate TLS certificate if missing OR if ownership is wrong
+      # (disable/re-enable cycle can break ownership or grdctl state)
+      NEED_REGEN=0
+      if [ ! -f "$TLS_DIR/rdp-tls.crt" ] || [ ! -f "$TLS_DIR/rdp-tls.key" ]; then
+        NEED_REGEN=1
+      elif [ "$(stat -c '%U' "$TLS_DIR/rdp-tls.key" 2>/dev/null)" != "gnome-remote-desktop" ]; then
+        NEED_REGEN=1
+      fi
+
+      if [ "$NEED_REGEN" = "1" ]; then
+        mkdir -p "$TLS_DIR"
+        rm -f "$TLS_DIR/rdp-tls.key" "$TLS_DIR/rdp-tls.crt"
+        openssl req -x509 -newkey ec -pkeyopt ec_paramgen_curve:prime256v1 \
+          -sha256 -nodes -days 3650 \
+          -keyout "$TLS_DIR/rdp-tls.key" \
+          -out "$TLS_DIR/rdp-tls.crt" \
+          -subj "/CN=gnome-remote-desktop"
+        echo "Generated new RDP TLS certificate"
+      fi
+
+      # Always fix ownership and permissions (handles re-enable after disable)
+      chown -R gnome-remote-desktop:gnome-remote-desktop "$TLS_DIR"
+      chmod 600 "$TLS_DIR/rdp-tls.key"
+      chmod 644 "$TLS_DIR/rdp-tls.crt"
+
+      # Configure TLS certificate
+      grdctl --system rdp set-tls-cert "$TLS_DIR/rdp-tls.crt"
+      grdctl --system rdp set-tls-key "$TLS_DIR/rdp-tls.key"
+
+      # 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
+
+      # Write username to a separate file for the hub
+      echo "sovran" > /var/lib/gnome-remote-desktop/rdp-username
+      chmod 600 /var/lib/gnome-remote-desktop/rdp-username
+
+      # Get current IP address
+      LOCAL_IP=$(hostname -I | awk '{print $1}')
+
+      # 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

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

modules/vaultwarden.nix

@@ -1,21 +1,76 @@
 { config, pkgs, lib, ... }:
 
-let
-	personalization = import ./personalization.nix;
-in
-{
+lib.mkIf config.sovran_systemsOS.services.vaultwarden {
 
-	services.vaultwarden = {
-		enable = true;
-		    config = {
+  # ── Generate ADMIN_TOKEN if missing ─────────────────────────
+  systemd.services.vaultwarden-secret-init = {
+    description = "Generate Vaultwarden ADMIN_TOKEN if missing";
+    wantedBy = [ "multi-user.target" ];
+    before = [ "vaultwarden.service" ];
+    serviceConfig = {
+      Type = "oneshot";
+      RemainAfterExit = true;
+    };
+    path = [ pkgs.openssl pkgs.coreutils ];
+    script = ''
+      SECRET_DIR="/var/lib/secrets/vaultwarden"
+      SECRET_FILE="$SECRET_DIR/vaultwarden.env"
 
-        		DOMAIN = "https://${personalization.vaultwarden_url}";
-        		SIGNUPS_ALLOWED = false;
-        		ROCKET_ADDRESS = "127.0.0.1";
-        		ROCKET_PORT = 8777;
-        		ROCKET_LOG = "critical";
-        	};
-		dbBackend = "sqlite";
-		environmentFile = "/var/lib/secrets/vaultwarden/vaultwarden.env";
-	};
-}
+      if [ ! -f "$SECRET_FILE" ]; then
+        mkdir -p "$SECRET_DIR"
+        echo -n "ADMIN_TOKEN=$(openssl rand -base64 48)" > "$SECRET_FILE"
+        chmod 600 "$SECRET_FILE"
+        echo "Generated Vaultwarden ADMIN_TOKEN"
+      else
+        echo "Vaultwarden ADMIN_TOKEN already exists, skipping"
+      fi
+    '';
+  };
+
+  # ── Generate runtime config from domain files ───────────────
+  systemd.services.vaultwarden-runtime-config = {
+    description = "Generate Vaultwarden runtime config from domain files";
+    before = [ "vaultwarden.service" ];
+    requiredBy = [ "vaultwarden.service" ];
+    wantedBy = [ "multi-user.target" ];
+    serviceConfig = {
+      Type = "oneshot";
+      RemainAfterExit = true;
+    };
+    unitConfig = {
+      ConditionPathExists = "/var/lib/domains/vaultwarden";
+    };
+    path = [ pkgs.coreutils ];
+    script = ''
+      VAULTWARDEN=$(cat /var/lib/domains/vaultwarden)
+
+      mkdir -p /run/vaultwarden
+
+      cat > /run/vaultwarden/runtime.env <<EOF
+DOMAIN=https://$VAULTWARDEN
+EOF
+
+      chmod 640 /run/vaultwarden/runtime.env
+    '';
+  };
+
+  services.vaultwarden = {
+    enable = true;
+    config = {
+      SIGNUPS_ALLOWED = false;
+      ROCKET_ADDRESS = "127.0.0.1";
+      ROCKET_PORT = 8777;
+      ROCKET_LOG = "critical";
+    };
+    dbBackend = "sqlite";
+    environmentFile = "/var/lib/secrets/vaultwarden/vaultwarden.env";
+  };
+
+  systemd.services.vaultwarden.serviceConfig.EnvironmentFile = lib.mkAfter [
+    "/run/vaultwarden/runtime.env"
+  ];
+
+  sovran_systemsOS.domainRequirements = [
+    { name = "vaultwarden"; label = "Vaultwarden"; example = "vault.yourdomain.com"; }
+  ];
+}

modules/wordpress.nix

@@ -0,0 +1,171 @@
+{ config, pkgs, lib, ... }:
+
+lib.mkIf config.sovran_systemsOS.services.wordpress {
+
+  # ── MariaDB database ──────────────────────────────────────
+  services.mysql = {
+    enable = true;
+    package = pkgs.mariadb;
+  };
+
+  # ── Auto-generate DB password and initialize ────────���─────
+  systemd.services.wordpress-db-init = {
+    description = "Initialize WordPress MariaDB database with auto-generated password";
+    after = [ "mysql.service" ];
+    requires = [ "mysql.service" ];
+    before = [ "wordpress-init.service" ];
+    wantedBy = [ "multi-user.target" ];
+    serviceConfig = {
+      Type = "oneshot";
+      RemainAfterExit = true;
+    };
+    path = [ config.services.mysql.package pkgs.pwgen pkgs.coreutils ];
+    script = ''
+      set -euo pipefail
+
+      SECRET_FILE="/var/lib/secrets/wordpressdb"
+
+      if [ ! -f "$SECRET_FILE" ]; then
+        mkdir -p /var/lib/secrets
+        pwgen -s 64 1 > "$SECRET_FILE"
+        chmod 600 "$SECRET_FILE"
+      fi
+
+      DB_PASS=$(cat "$SECRET_FILE")
+
+      mysql -u root <<SQL
+        CREATE DATABASE IF NOT EXISTS wordpressdb;
+        CREATE USER IF NOT EXISTS 'wpusr'@'localhost' IDENTIFIED BY '$DB_PASS';
+        ALTER USER 'wpusr'@'localhost' IDENTIFIED BY '$DB_PASS';
+        GRANT ALL ON wordpressdb.* TO 'wpusr'@'localhost';
+        FLUSH PRIVILEGES;
+      SQL
+    '';
+  };
+
+  # ── Fully automated WordPress setup ───────────────────────
+  systemd.services.wordpress-init = {
+    description = "Download, extract, and fully configure WordPress";
+    after = [ "network-online.target" "mysql.service" "phpfpm-mypool.service" "wordpress-db-init.service" ];
+    wants = [ "network-online.target" ];
+    requires = [ "mysql.service" "wordpress-db-init.service" ];
+    wantedBy = [ "multi-user.target" ];
+
+    unitConfig = {
+      ConditionPathExists = "!/var/lib/www/wordpress/wp-config.php";
+    };
+
+    serviceConfig = {
+      Type = "oneshot";
+      RemainAfterExit = true;
+    };
+
+    path = with pkgs; [ curl unzip wp-cli pwgen php coreutils ];
+
+    script = ''
+      set -euo pipefail
+
+      INSTALL_DIR="/var/lib/www/wordpress"
+      DOMAIN=$(cat /var/lib/domains/wordpress)
+      DB_NAME="wordpressdb"
+      DB_USER="wpusr"
+      DB_PASS=$(cat /var/lib/secrets/wordpressdb)
+      DB_HOST="localhost"
+      ADMIN_USER=$(pwgen -s 16 1)
+      ADMIN_PASS=$(pwgen -s 24 1)
+      ADMIN_EMAIL="$ADMIN_USER@''${DOMAIN#*.}"
+
+      echo "══════════════════════════════════════════════"
+      echo "  WordPress Automated Installation"
+      echo "══════════════════════════════════════════════"
+
+      if [ ! -f "$INSTALL_DIR/wp-includes/version.php" ]; then
+          echo "Downloading WordPress..."
+          TEMP_DIR=$(mktemp -d)
+          curl -L -o "$TEMP_DIR/wordpress.zip" "https://wordpress.org/latest.zip"
+          unzip -q "$TEMP_DIR/wordpress.zip" -d "$TEMP_DIR"
+          mkdir -p "$INSTALL_DIR"
+          cp -a "$TEMP_DIR/wordpress/"* "$INSTALL_DIR/"
+          rm -rf "$TEMP_DIR"
+          echo "Download complete."
+      fi
+
+      chown -R caddy:root "$INSTALL_DIR"
+      find "$INSTALL_DIR" -type d -exec chmod 755 {} \;
+      find "$INSTALL_DIR" -type f -exec chmod 644 {} \;
+      chmod -R 775 "$INSTALL_DIR/wp-content"
+
+      echo "Generating wp-config.php..."
+      cd "$INSTALL_DIR"
+      su -s /bin/sh caddy -c "
+        wp config create \
+          --dbname='$DB_NAME' \
+          --dbuser='$DB_USER' \
+          --dbpass='$DB_PASS' \
+          --dbhost='$DB_HOST' \
+          --skip-check
+      "
+
+      echo "Waiting for database..."
+      for i in $(seq 1 30); do
+          if su -s /bin/sh caddy -c "wp db check" 2>/dev/null; then
+              break
+          fi
+          sleep 2
+      done
+
+      echo "Running WordPress core install..."
+      su -s /bin/sh caddy -c "
+        wp core install \
+          --url='https://$DOMAIN' \
+          --title='Sovran_SystemsOS' \
+          --admin_user='$ADMIN_USER' \
+          --admin_password='$ADMIN_PASS' \
+          --admin_email='$ADMIN_EMAIL' \
+          --skip-email
+      "
+
+      su -s /bin/sh caddy -c "
+        wp option update blogdescription 'Powered by Sovran_SystemsOS'
+        wp option update permalink_structure '/%postname%/'
+        wp option update default_ping_status 'closed'
+        wp option update default_comment_status 'closed'
+        wp rewrite flush
+      "
+
+      su -s /bin/sh caddy -c "
+        wp config set DISALLOW_FILE_EDIT true --raw
+        wp config set WP_AUTO_UPDATE_CORE true --raw
+        wp config set FORCE_SSL_ADMIN true --raw
+      "
+
+      CREDS_FILE="/var/lib/secrets/wordpress-admin"
+      cat > "$CREDS_FILE" << CREDS
+WordPress Admin Credentials
+═══════════════════════════
+URL:      https://$DOMAIN/wp-admin/
+Username: $ADMIN_USER
+Password: $ADMIN_PASS
+Email:    $ADMIN_EMAIL
+CREDS
+      chmod 600 "$CREDS_FILE"
+
+      echo ""
+      echo "══════════════════════════════════════════════"
+      echo "  WordPress installation complete!"
+      echo "  Credentials saved to: $CREDS_FILE"
+      echo "══════════════════════════════════════════════"
+    '';
+  };
+
+  systemd.tmpfiles.rules = [
+    "d /var/lib/www 0755 caddy root -"
+    "d /var/lib/www/wordpress 0755 caddy root -"
+  ];
+
+  environment.systemPackages = with pkgs; [ wp-cli unzip ];
+  
+  sovran_systemsOS.domainRequirements = [
+    { name = "wordpress"; label = "WordPress"; example = "blog.yourdomain.com"; }
+  ];
+}