From 8c5ed0c98206dc81db560beee054b7946774e1bc Mon Sep 17 00:00:00 2001 From: naturallaw777 Date: Thu, 1 Jun 2023 05:16:57 -0700 Subject: [PATCH 001/667] Initial commit --- LICENSE | 232 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ README.md | 3 + 2 files changed, 235 insertions(+) create mode 100644 LICENSE create mode 100644 README.md diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..d41c0bd --- /dev/null +++ b/LICENSE @@ -0,0 +1,232 @@ +GNU GENERAL PUBLIC LICENSE +Version 3, 29 June 2007 + +Copyright © 2007 Free Software Foundation, Inc. + +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. + + + Copyright (C) + + 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 . + +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: + + Copyright (C) + 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 . + +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 . diff --git a/README.md b/README.md new file mode 100644 index 0000000..b8fcfa8 --- /dev/null +++ b/README.md @@ -0,0 +1,3 @@ +# Sovran_SystemsOS + +The Official Repository of Sovran_SystemsOS. \ No newline at end of file From 355e35b9f6cda972b995b581f80a7117b86b04f3 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Thu, 1 Jun 2023 05:47:05 -0700 Subject: [PATCH 002/667] initial add --- For_NEW_Sovran_Pros_Upload/flake.nix | 14 + For_NEW_Sovran_Pros_Upload/sp | 197 ++++++++++++ README.md | 30 +- flake.lock | 122 ++++++++ flake.nix | 28 ++ modules/bitcoinecosystem.nix | 76 +++++ modules/configuration.nix | 434 +++++++++++++++++++++++++++ modules/coturn.nix | 51 ++++ modules/modules.nix | 13 + modules/personalization.nix | 17 ++ modules/synapse.nix | 75 +++++ modules/vaultwarden.nix | 21 ++ sovran_systems.png | Bin 0 -> 23137 bytes 13 files changed, 1076 insertions(+), 2 deletions(-) create mode 100644 For_NEW_Sovran_Pros_Upload/flake.nix create mode 100644 For_NEW_Sovran_Pros_Upload/sp create mode 100644 flake.lock create mode 100644 flake.nix create mode 100644 modules/bitcoinecosystem.nix create mode 100644 modules/configuration.nix create mode 100644 modules/coturn.nix create mode 100644 modules/modules.nix create mode 100644 modules/personalization.nix create mode 100644 modules/synapse.nix create mode 100644 modules/vaultwarden.nix create mode 100644 sovran_systems.png diff --git a/For_NEW_Sovran_Pros_Upload/flake.nix b/For_NEW_Sovran_Pros_Upload/flake.nix new file mode 100644 index 0000000..7d9c4e8 --- /dev/null +++ b/For_NEW_Sovran_Pros_Upload/flake.nix @@ -0,0 +1,14 @@ +{ + description = "The Ultimate Sovran Pro Configuration from Sovran Systems"; + + inputs = { + Sovran_Systems.url = "git+https://git.sovransystems.com/Sovran_Systems/Sovran_Pro"; + }; + + outputs = { self, Sovran_Systems, ... }@inputs: { + nixosConfigurations."nixos" = Sovran_Systems.inputs.nixpkgs.lib.nixosSystem { + system = "x86_64-linux"; + modules = [ Sovran_Systems.nixosModules.Sovran_Pro ]; + }; + }; +} \ No newline at end of file diff --git a/For_NEW_Sovran_Pros_Upload/sp b/For_NEW_Sovran_Pros_Upload/sp new file mode 100644 index 0000000..701e52e --- /dev/null +++ b/For_NEW_Sovran_Pros_Upload/sp @@ -0,0 +1,197 @@ +#!/usr/bin/env bash + +GREEN="\e[32m" +LIGHTBLUE="\e[94m" +ENDCOLOR="\e[0m" + +# + +pushd /etc/nixos/ + +sudo wget https://git.sovransystems.com/Sovran_Systems/Sovran_Pro/raw/branch/main/For_NEW_Sovran_Pros_Upload/flake.nix + +sudo chown root:root /etc/nixos/ -R + +sudo chmod 770 /etc/nixos/ -R + +popd + +# + +sudo rsync -av -e "ssh -i /root/sovransystems" root@192.168.1.32:/home/ /home + +sudo rsync -av -e "ssh -i /root/sovransystems" root@192.168.1.32:/var/lib/www/ /var/lib/www + +sudo rsync -av -e "ssh -i /root/sovransystems" root@192.168.1.32:/var/lib/domains/ /var/lib/domains + +sudo rsync -av -e "ssh -i /root/sovransystems" root@192.168.1.32:/var/lib/nextcloudaddition/ /var/lib/nextcloudaddition + +sudo rsync -av -e "ssh -i /root/sovransystems" root@192.168.1.32:/var/lib/njalla/ /var/lib/njalla + +sudo rsync -av -e "ssh -i /root/sovransystems" root@192.168.1.32:/var/lib/external_ip/ /var/lib/external_ip + +sudo rsync -av -e "ssh -i /root/sovransystems" root@192.168.1.32:/var/lib/secrets/ /var/lib/secrets + +# + +nixos-rebuild switch --flake '/etc/nixos/#' --impure --update-input Sovran_Systems --commit-lock-file + +# + +sudo chown root:root /var/lib/secrets/main -R + +sudo chown matrix-synapse:matrix-synapse /var/lib/secrets/matrix_reg_secret -R + +sudo chown matrix-synapse:matrix-synapse /var/lib/secrets/matrixdb -R + +sudo chown postgres:postgres /var/lib/secrets/nextclouddb -R + +sudo chown turnserver:turnserver /var/lib/secrets/turn -R + +sudo chown mysql:mysql /var/lib/secrets/wordpressdb -R + +sudo chmod 770 /var/lib/secrets/ -R + +# + +sudo echo -e "${GREEN}What is your New Matrix (Element Chat) domain name?${ENDCOLOR}" +read +sudo echo -n $REPLY > /var/lib/domains/matrix + +sudo echo -e "${GREEN}What is your New Wordpress domain name?${ENDCOLOR}" +read +sudo echo -n $REPLY > /var/lib/domains/wordpress + +sudo echo -e "${GREEN}What is your New Nextcloud domain name?${ENDCOLOR}" +read +sudo echo -n $REPLY > /var/lib/domains/nextcloud + +sudo echo -e "${GREEN}What is your New BTCPayserver domain name?${ENDCOLOR}" +read +sudo echo -n $REPLY > /var/lib/domains/btcpayserver + +sudo echo -e "${GREEN}What is your New Vaultwarden domain name?${ENDCOLOR}" +read +sudo echo -n $REPLY > /var/lib/domains/vaultwarden + +sudo echo -e "${GREEN}What is the email you would like to use to manage the SSL certificates for your domains?${ENDCOLOR}" +read +sudo echo -n $REPLY > /var/lib/domains/sslemail + + +sudo chown caddy:php /var/lib/domains -R + +sudo chmod 770 /var/lib/domains -R + +# + +set -x + + +sudo rm -rf /home/free/.config/BraveSoftware + +sudo rm -rf /home/free/.local/share/fish/fish_history + +# + +sudo rm -rf /var/lib/www/wordpress/wp-config.php + +sudo rm -rf /var/lib/www/nextcloud/config/config.php + +sudo touch /var/lib/www/nextcloud/config/CAN_INSTALL + +sudo sed -i '$e cat /var/lib/nextcloudaddition/nextcloudaddition' /var/lib/www/nextcloud/config/config.php + + +sudo chown caddy:php /var/lib/www -R + +sudo chmod 770 /var/lib/www -R + +# + +sudo mkdir /var/lib/nextcloud + +sudo chown caddy:php /var/lib/nextcloud -R + +sudo chmod 770 /var/lib/nextcloud -R + +# + +sudo mkdir /var/lib/coturn + +sudo chown turnserver:turnserver /var/lib/coturn -R + +sudo chmod 770 /var/lib/coturn -R + +# + +sudo touch /var/lib/vaultwarden.env + +sudo chown vaultwarden:vaultwarden /var/lib/vaultwarden.env + +sudo chmod 770 /var/lib/vaultwarden.env + +# + +sudo echo -n $(pwgen -s 17 -1) > /var/lib/secrets/nextclouddb +sudo echo -n $(pwgen -s 17 -1) > /var/lib/secrets/wordpressdb +sudo echo -n $(pwgen -s 17 -1) > /var/lib/secrets/matrixdb +sudo echo -n $(pwgen -s 17 -1) > /var/lib/secrets/turn +sudo echo -n $(pwgen -s 17 -1) > /var/lib/secrets/matrix_reg_secret +sudo echo -n $(pwgen -s 17 -1) > /var/lib/secrets/main +sudo echo -n ADMIN_TOKEN=$(openssl rand -base64 48 +) > /var/lib/vaultwarden.env + +# + +sudo echo "root:$(cat /var/lib/secrets/main)" | chpasswd -c SHA512 + +# + +flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo +flatpak update + +# + +sudo echo "free:a" | chpasswd -c SHA512 + +# + +sudo rm -rf /root/sp + +sudo rm -rf /root/Step_2_psp + +sudo rm -rf /root/.ssh + +sudo rm -rf /home/free/.ssh + +sudo rm -rf /root/sovransystems + + +sudo chown bitcoin:bitcoin /run/media/Second_Drive/BTCEcoandBackup/Bitcoin_Node -R + +sudo chmod 770 /run/media/Second_Drive/BTCEcoandBackup/Bitcoin_Node -R + +sudo chown electrs:electrs /run/media/Second_Drive/BTCEcoandBackup/Electrs_Data -R + +sudo chmod 770 /run/media/Second_Drive/BTCEcoandBackup/Electrs_Data -R + +nixos-rebuild switch --flake '/etc/nixos/#' --impure --update-input Sovran_Systems --commit-lock-file + + +# + +set +x + +sudo 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" + +sudo echo -e "$(pwgen -s 17 -1) \n" +sudo echo -e "$(pwgen -s 17 -1) \n" +sudo echo -e "$(pwgen -s 17 -1) \n" +sudo echo -e "$(pwgen -s 17 -1) \n" + +# + +sudo echo -e "${LIGHTBLUE}One last thing, you need to put the Njalla DDNS info from Njalla into njalla.sh.${ENDCOLOR} \n" + +sudo echo -e "${GREEN}All Finished! Please Reboot then Enjoy your New Sovran Pro!${ENDCOLOR} \n" \ No newline at end of file diff --git a/README.md b/README.md index b8fcfa8..62621c7 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,29 @@ -# Sovran_SystemsOS +
+
-The Official Repository of Sovran_SystemsOS. \ No newline at end of file +
drawing
+ +
+
+
+# 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 + +_________________________________________________________ +GNU GPL 3.0+ + +All Open Source Software Used Falls Under Its Specific Open Source License. + +Created, Handcrafted, and Headquartered in Southern California – 2022-2023 🏖️. + +This Gitea is Proudly Powered by a Sovran Pro 💚. + +All Is Love. Fear Is Illusion. All Beings Are Free. Truth Can Never Be Destroyed. \ No newline at end of file diff --git a/flake.lock b/flake.lock new file mode 100644 index 0000000..8a39b31 --- /dev/null +++ b/flake.lock @@ -0,0 +1,122 @@ +{ + "nodes": { + "extra-container": { + "inputs": { + "flake-utils": [ + "nix-bitcoin", + "flake-utils" + ], + "nixpkgs": [ + "nix-bitcoin", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1678566036, + "narHash": "sha256-dq+gCYplCTkbHOH1ERCzuTnwY/RvwMyw/kijPy7C3vE=", + "owner": "erikarvstedt", + "repo": "extra-container", + "rev": "a4fe3227bf63bf8479938e1457ebe1c04fe51ef5", + "type": "github" + }, + "original": { + "owner": "erikarvstedt", + "repo": "extra-container", + "type": "github" + } + }, + "flake-utils": { + "locked": { + "lastModified": 1678901627, + "narHash": "sha256-U02riOqrKKzwjsxc/400XnElV+UtPUQWpANPlyazjH0=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "93a2b84fc4b70d9e089d029deacc3583435c2ed6", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "nix-bitcoin": { + "inputs": { + "extra-container": "extra-container", + "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs", + "nixpkgs-unstable": "nixpkgs-unstable" + }, + "locked": { + "lastModified": 1679384842, + "narHash": "sha256-SMJW+QZt3iRuoezjE12sopBsdLHDihXe/RerLfRpqoI=", + "owner": "fort-nix", + "repo": "nix-bitcoin", + "rev": "481050bdf75106bff652016bfe5c39736bdd03ef", + "type": "github" + }, + "original": { + "owner": "fort-nix", + "ref": "release", + "repo": "nix-bitcoin", + "type": "github" + } + }, + "nixpkgs": { + "locked": { + "lastModified": 1679139072, + "narHash": "sha256-Gtw2Yj8DfETie3u7iHv1y5Wt+plGRmp6nTQ0EEfaPho=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "08ef7dc8334521605a5c8b7086cc248e74ee338b", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-22.11", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-unstable": { + "locked": { + "lastModified": 1679198465, + "narHash": "sha256-VfXpHpniNWgg7pBzxb20pRX7kqn80LApPDQYTReiFCw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "5a05160f7671434e1c833b1b01284b876e04eca4", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_2": { + "locked": { + "lastModified": 1681217261, + "narHash": "sha256-RbxCHWN3Vhyv/WEsXcJlDwF7bpvZ9NxDjfSouQxXEKo=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "3fb8eedc450286d5092e4953118212fa21091b3b", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "root": { + "inputs": { + "nix-bitcoin": "nix-bitcoin", + "nixpkgs": "nixpkgs_2" + } + } + }, + "root": "root", + "version": 7 +} \ No newline at end of file diff --git a/flake.nix b/flake.nix new file mode 100644 index 0000000..243b4e3 --- /dev/null +++ b/flake.nix @@ -0,0 +1,28 @@ +{ + description = "The Ultimate Sovran Pro Configuration from Sovran Systems"; + + inputs = { + nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + + nix-bitcoin.url = "github:fort-nix/nix-bitcoin/release"; + }; + + outputs = { self, nixpkgs, nix-bitcoin, ... }: + { + + nixosConfigurations.nixos = nixpkgs.lib.nixosSystem { + system ="x86_64-linux"; + }; + + nixosModules.Sovran_Pro = { pkgs, ... }: { + + imports = [ + + ./modules/modules.nix + + nix-bitcoin.nixosModules.default + + ]; + }; + }; +} \ No newline at end of file diff --git a/modules/bitcoinecosystem.nix b/modules/bitcoinecosystem.nix new file mode 100644 index 0000000..0f8e45d --- /dev/null +++ b/modules/bitcoinecosystem.nix @@ -0,0 +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 + ''; + }; + + nix-bitcoin.onionServices.bitcoind.enable = true; + nix-bitcoin.onionServices.electrs.enable = true; + + services.lnd = { + enable = true; + }; + + services.lightning-loop = { + enable = true; + }; + + services.lightning-pool = { + enable = true; + }; + + services.rtl = { + enable = true; + port = 3050; + nightTheme = true; + nodes = { + lnd = { + enable = true; + loop = true; + }; + reverseOrder = true; + }; + }; + + nix-bitcoin.onionServices.lnd.public = true; + services.lnd.lndconnect = { + enable = true; + onion = true; + }; + services.charge-lnd.enable = true; + + services.btcpayserver.lightningBackend = "lnd"; + + + services.electrs = { + enable = true; + tor.enforce = true; + dataDir = "/run/media/Second_Drive/BTCEcoandBackup/Electrs_Data"; + }; + + + services.btcpayserver = { + enable = true; + }; + + + nix-bitcoin.nodeinfo.enable = true; + + + nix-bitcoin.operator = { + enable = true; + name = "free"; + }; + +} diff --git a/modules/configuration.nix b/modules/configuration.nix new file mode 100644 index 0000000..bf43b2e --- /dev/null +++ b/modules/configuration.nix @@ -0,0 +1,434 @@ +{ config, pkgs, lib, ... }: + + +let + personalization = import ./personalization.nix; + + + custom-php = pkgs.php81.buildEnv { + extensions = { enabled, all }: enabled ++ (with all; [ apcu 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-for-cosmic + gnomeExtensions.vitals + gnomeExtensions.pop-shell + gnomeExtensions.transparent-top-bar + gnomeExtensions.just-perfection + gnomeExtensions.appindicator + gnomeExtensions.systemd-manager + gnome.gnome-tweaks + papirus-icon-theme + ranger + gnome.gnome-tweaks + sparrow + 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 + + ]; + + 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"; + }; + }; + }; + + + +####### 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 + ''; + }; + }; + }; + + +###### 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.nextclouddb_pass}'; + CREATE DATABASE "nextclouddb" WITH OWNER "ncusr" + TEMPLATE template0 + LC_COLLATE = "C" + LC_CTYPE = "C"; + + + CREATE ROLE "matrix-synapse" WITH LOGIN PASSWORD '${personalization.matrix-synapsedb_pass}'; + 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.wordpressdb_pass}'; + 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"; + }; + }; + + +#######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 UPDATE ####### +# system.autoUpgrade = { +# enable = true; +# flags = [ "--impure" "--update-input" "Sovran_Systems" "--commit-lock-file" ]; +# flake = "/etc/nixos"; +# persistent = true; +# allowReboot = true; +# rebootWindow = { lower = "02:00"; upper = "05:00"; }; +# }; + + + +####### AUTO COLLECT GARABAGE ####### + nix.gc = { + automatic = true; + dates = "weekly"; + options = "--delete-older-than 7d"; + }; + + system.stateVersion = "22.05"; + +} diff --git a/modules/coturn.nix b/modules/coturn.nix new file mode 100644 index 0000000..d6de653 --- /dev/null +++ b/modules/coturn.nix @@ -0,0 +1,51 @@ +{config, pkgs, lib, ...}: + +let + personalization = import ./personalization.nix; + in +{ + systemd.services.sslcoturn = { + script = '' + cp -n /var/lib/caddy/.local/share/caddy/certificates/acme.zerossl.com-v2-dv90/${personalization.matrix_url}/${personalization.matrix_url}.crt /var/lib/coturn/${personalization.matrix_url}.crt.pem + + cp -n /var/lib/caddy/.local/share/caddy/certificates/acme.zerossl.com-v2-dv90/${personalization.matrix_url}/${personalization.matrix_url}.key /var/lib/coturn/${personalization.matrix_url}.key.pem + + chown turnserver:turnserver /var/lib/coturn -R + + chmod 770 /var/lib/coturn -R + + 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.turn_shared}"; + 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; + #listening-ips = [ "127.0.0.1" ]; + extraConfig = '' + verbose + external-ip=${personalization.external_ip_secret} + ''; + }; +} diff --git a/modules/modules.nix b/modules/modules.nix new file mode 100644 index 0000000..518304e --- /dev/null +++ b/modules/modules.nix @@ -0,0 +1,13 @@ +{ config, pkgs, lib, ... }: + +{ + + imports = [ + ./configuration.nix + ./synapse.nix + ./coturn.nix + ./bitcoinecosystem.nix + ./vaultwarden.nix + /etc/nixos/hardware-configuration.nix + ]; +} \ No newline at end of file diff --git a/modules/personalization.nix b/modules/personalization.nix new file mode 100644 index 0000000..3310da5 --- /dev/null +++ b/modules/personalization.nix @@ -0,0 +1,17 @@ +{ + +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; + +wordpressdb_pass = builtins.readFile /var/lib/secrets/wordpressdb; +matrix-synapsedb_pass = builtins.readFile /var/lib/secrets/matrixdb; +nextclouddb_pass = builtins.readFile /var/lib/secrets/nextclouddb; +turn_shared = builtins.readFile /var/lib/secrets/turn; +matrix_reg_secret = builtins.readFile /var/lib/secrets/matrix_reg_secret; +external_ip_secret = builtins.readFile /var/lib/secrets/external_ip; + +} diff --git a/modules/synapse.nix b/modules/synapse.nix new file mode 100644 index 0000000..76839ae --- /dev/null +++ b/modules/synapse.nix @@ -0,0 +1,75 @@ +{ config, pkgs, lib, ... }: + + +####### CREATE NEW USER (ADMIN OR NOT) VIA TERMINAL ####### + +# (Run as root in terminal) matrix-synapse-register_new_matrix_user # + +####### ####### + +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.turn_shared}"; + 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.matrix_reg_secret}"; + listeners = [ + { + port = 8008; + bind_addresses = [ "::1" ]; + type = "http"; + tls = false; + x_forwarded = true; + resources = [ { + names = [ "client" ]; + compress = true; + } + { + names = [ "federation" ]; + compress = false; + } ]; + } + ]; + }; + }; +} diff --git a/modules/vaultwarden.nix b/modules/vaultwarden.nix new file mode 100644 index 0000000..46b0678 --- /dev/null +++ b/modules/vaultwarden.nix @@ -0,0 +1,21 @@ +{ config, pkgs, lib, ... }: + +let + personalization = import ./personalization.nix; +in +{ + + services.vaultwarden = { + enable = true; + config = { + + 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/vaultwarden.env"; + }; +} \ No newline at end of file diff --git a/sovran_systems.png b/sovran_systems.png new file mode 100644 index 0000000000000000000000000000000000000000..618f61e62581d9214459805f1f7a35bc1f977514 GIT binary patch literal 23137 zcmeAS@N?(olHy`uVBq!ia0y~yU|!F_z<7p(je&u|Dt(>_0|R4grn7T^r?ay{K~a8M zW=<*tgT}<#iMAex9b}Hi2X`+DW$*5=NLis5B_LXOMN4F%(+bh3QiGjexM!KD=<4+~ zWgk4)e{@xI_vUqc>zWjPFg|+mWXTI9)qnb$TRJ{I*dhP^o$b4Oj81D$n5@o~x$tGv z%nsM1AyuI{^{(Q-E;a|Uq@+m}PZDW={$p2r|N3&lc~5KKoxiv?O^5A=%cID&8L5wW zAH6)g>0sr2izA;ldDZyYq+Md|l;62-$Dd=C&o>+}c1|-g^p{Z*E7o1J#o+X8sgELs z5m!r2i3jPep0nK|`zTlToyq$RW?T%Pw$rbe!%!!QQ^-YQ#exQu zf5GGFCzeiF&EVF@I%R=l*`EjXA9hD;TU$OvnXq{BnMWNxQo4GqATG@aWrg-S*zyi??p?PnY`pmm%g?(Y%Y|c8m-R3~Wi>?k)^* zAUI{>);SCe44efXk;M!Q{D~mUxWayUCIbTldx@v7EBiBUF+OeWdzMaq3=9eko-U3d z6}R5r-B|Sa#I|R@ukMf)E>tez$qPOvk@J2>PIig!w4Jtr{R}(Jo!Xwn`J4P;IHWA{ z^6keiz2rG_9Y+;hubI_PgY*j#3=Lw$_Ce8={yI0((^$Yh_;b{1&7{2b0 zD?`aMv)%K%PuzLjZ!_=G-HFQF3=9n$f44d_ShQYf?Kt!0|C;}w-^5zPmi@U@B&d1s z@BR1xWgEpA7#Lc@6I32g@;K+C%fP_EvA!WXp!PpIOB4eG zgFswk+~HS2r;d3P|Gh8iuDZ%$_xgX|r@Z6h;{+?6;S?}8(_w8|$aLm<@Atcz%_R^2 zRz1T6vbHOb?OJQcnyiJUYQM`5t_gboM0=rkM(MYmM%CqW?v;D@>7EI5EIWOZkAZ>V zkan9$Sh`f$>I=8hB|rR&HMraDQRr3vlS7UpWZ|}~7*S{C)obNm>&EsnGB7w)xb`Hj zirRkb_?xV&DK8>gudXzgzI1-^zV*3V=k4%5u64#pn;UHCFCLFj&4TdFtH0KI_XoX; z^m32ceLg3Sd(+ix&Y%12cCQVH;{ln+YQ<&GE$C^@vF7W7UDJ!c^*wV)w7ZvW88QHtF0bx6m|M^Nw@%Vy?|s!)yF!284m#b~NR%TSw%zRc|&&Z9nzqRmu6aT1S4>C!_TKVSa;evhS$dV$<8zD+x)7;lsew`5>ocqn?9mn$^$!{#5ED>hFp;(cBA!nY)E z-n(g1^IoZ5{#qaR?T^sv+PtTC|BES2ns45o#PWRkd4=eyBI`3huzI2VR3ERB2TJk{8+IfdVJF9P>pD4f$vdlGw z`QOsEYuh$=g?biDdCgvGwv}snvE+4~tngJgZ)x3lwsGCouQy`WybACsRtG1EDyci? zU7xH??dUH0J#qH(-C4V*W`#{%AayP7@S8xFZ-%Tsxh*74-d`n06!y60=1pnhn-rt$6gm948z-S`1Y}QxxZ3f%x z#htouZCu?ht?%2vMd#Pz=Hg%spb?I>8D0 zP?bVlYuNMy;livkfr!=Twq5Pf>MhyzGv{^n>us40BB>Lu z=9b0D-WPwJ2#&DHeCt9pw#H7rk?Fa3+T1YJ8H(5Z-L~>_*ZsP)+CVz%{oPe7Bd%R_ z?h?yR;^y6ueGXgzy$*4D?Q}{g@wU-fzu6~W=wydVy$RlH{dV5Ws|Q0xELE#SQEE**7y3P*X+wiS%2s{hg>XU59r&-i+G#cPeH&a-q% zgxB3NeOa_G*bAJSWm5}E-zx19pLjfY7q^vl<>!)c*0A}T*X*34x-dE|++99pb>HQc zKeYANT|2hUdA|KEgSA{6w>kcPI_2HAIjo@2xW2GG?E1}Xi`%XxY@V{U@8G)XB%z3p z7b`>0-us>N>x!r6M!S?M(cd$ltc_cL<`B4WVwa2w4?4H)))Zy7e6Ga{uWk*QbfC+w zIY(XfXy4f@T)Z1#>V%`72c5fjBTs#@XJnH^O2E3MbM=-^oZs5vxBEzw!f!ndHeJoU zK+}y^U(a|AF5{(23rc6^o?SX;<4NYWu;~VWZyu<*{q)})iPQi(HwX_56c$L6nX-Sh3e%PG^@^_J^` z=gP*!wG-&N{j5>x$J(*`Rkw&iVC=^vJK9S2v}LdOdsp zukzkQ?_1a9Bt+i-tN%H}dBQvGIbOSS%bVIFj;k^roV^~LX%dZQ)QavlEj%b?RLQmW z>VtZb&1<&ayi}<><=p+&s|z)k=$MNCy}x+M<{gVU+@pf_d@7M^=h~=un)%woRiIqX zv3`eH#oX5quBOSxOb~MNU$|9^H?IB7BdH(8k=LAFB|Tu=diHt6n$}x3SE63=Ipth6 zSn1omJV7x`zGqM8U7Z{~C4Q4)CQ!v)B04EZ)0^G5`C{OycZ=gr=iBC17GG(sH9N2% ziuH=tnnzU`tD4@{Wo+IO6|_facf0F*=QrLRpJUD+HScbSeeqY}@fH@4IW1g1dcHHA z&Td;K6%(7j8&o@yNQPpQ|F;zkYbb$qgzyKNtyYeXI6n z@8TC{FUN+idb4Sr>8T69^2$n83(dk-m4BUD{y*mb|Cwy_&wp!LYo*YAW&HF7VEO!H+7|0ii zHV^(}88UpkHN|r`$8EE=Uz#q*g`%qY)`VKDEx&d4xDZbk<94o1wYmILUYl;{RXwqd zXXDJa8;2f0Pbsz)SNfE?B3cHVpmuY!nB9I*k$b4mK{ecS#;U3-2uQPy+CDyHo4 zxsBhY{J4K^^xHh+h2@{X6>nb^uV~5~j`!`$KiNw0*H%kmYf=_?uL%-TUp*T(-`$JtM>J zWGgSaRd?b%-~XR+r@Y!0FF$`^+p6Z$4PYbZvrXBSS{rwL>0O(>z|VA`iFI8)ePRRKV_dD&&kQ3Ki5uS(@Un9$}cz1oJ{n;@n*_9 zIm={528M@I8UOgW?Cbnl<&$r$sLOVF@A~YkLMH-J4}Lwjt>tQ-yi16qS;&mLuhMTt zTdqk}-r{~gwj=xa?Pb!1dQYt)q%0X37!JL5VSjC=S`+s@sU)U5yu+jHo=jYoRoqpb z)vveN`Zj;wJH@v?BSiT8SHZ0Jcb!gcdUP)>nRnX)F0q*G;}t8vD@=ZU@^uiXFg*0S zfbE%C^Rbxb?AMNq*X`e|DY@oLn9>@>Wn63RalN}Ye>I-G>2><+f~8NpmNo9Qi>Q5>rSRABK)u-h zr3YEAJ&d>CT<&=7y3U`tQ=9&rJN@wfR3ZDa+P#)NwJNRVy==Pme*OE(;)<6qB5b<eDqMxVMEK-MYj=}S*Yzx-gy*Dwpd+Yd^vO?hdyd%e@@?8s*-UPgj-vQM@P=pFJL)!bwD0Vw;k-M=ll_1GqqsKD zjH41xZvxkU{_D}-|1xd^O9Uu!^yVm}2W!1i-Z6_$M*C)EamAYl5;vyl3r88Y2>jN1 z_w>kOT~)OMOrW07!L6D*_I3S~y5!^%cW$<`*bj*#IoB;a8{~3o)6w<`cU!iG{PMlyrLDd>T+L1VTHMjMj%PJ?3kfHHGH$8O!L1h< zXBT%|={pp!>+~qDIa~0<-~C;;?Pe~{&uI3H`F&pZ-2bndch|a?`SdWq(Y*WjTqFx9 zi9P07SIoO^S@yf8yyoPafj{^9oSLbg7H2T+x5HO~gH`JP^@Q} zc^K>7|9dG-ce%6s!{ZZPN0)B9ntDF$+Sa5q-R=Uz)*<)i@i>}!MO?A500rX4hW z@o%l}wQXWS=k!uzv}PRGdvNQNI(;SnHFygQEh=wACQ`&A-9sYkQ@ z#?(0bZPBlLmi63FI$#$xml5PeX6cr@Hg{+Klbcv{yZ5-m!P1rM4_7_VJ+qDJYH3KR z>b6+*dES=X)iMVS4QgL}Kd>zlOl3}m)Q}K|CVQe%VF(V zr$0UNMqrM9s$fF>;v!~H4Rx1owp#VhGRc_coYuz{#wAlWUFn}Gbl^`^ab|;ASN2(h z1J8oa9S}-jWN0Wqd8GMu9m_#e)0*|A*@8dkKH$1>v2^Z!&z)&^uf(|Q%lshwsk;73 zLDktqkLGcJlH}A)2R(vkoOXSZ_~78z&^Kv~tKQng&5&fA;~Z1yRnD*UY0>p5oijUX zuCjSJe>HF$RVMt1nLFl{VAK+G@7?{exA;r{j<2>7Uxm7Vf0|;C)ny=FR-A zA&Qf}=Unn`&@BOV>%N{^khOH-I?WwcD~vWcy<4Lb2F8k@LXg3-fuF`J^$=`L4XDa+mR6+18F4%Y42{|MwgJ zS;_gm%sao5k7YmmO|xRD5@q$ne>cB$;9+3cBYAYz^;>3!YN0ZDkx6hKn5xU2^C6)$)S1QpPh+ z`MrGiJ$RROQ5W-Ewp}sIYhF4pb~G=#^pwN*`&CxnISdR9{LT8(*BtL>ACAABRUR z!7iEbRqprFhwDRCFBzZXVPG&=`C-+;t(gK}E+u)-F&8w0 z#+S3*r+?cvCbN!7AR)P?ei{G6h*t~@3~P8+Ggp% z>mU4TeZa+IcVOMoJ=|5I3F6FE^=h&A#FMt!Ff%YDL_7@rUYz@C-|H(2JhvY)agy|&Y8t>aZTU$wKr za@Abxc6R)6D_}k5x&E#Gr9EyTOYUT)W!!#YW46b9avW$V`D1(dU9sgWL*891oVz-+ zdD-#L&o+GhQs?76W%Ywoa_blvx8()+&f)o9ANy*r90NnbjE7&%cE@+!tXp^OV9@oQ zvrICg=9{;lx%_)&-SasQxEAC#$X=*E?Xu*h-K=|Q-;2+&FfbVG_z*RFVGdWtI_bN! zr@Vdk{OrS{kAEB9{5|0Tmq0=<)0%gZ)*|{r>u&z#d3qRZMd&HX>&psWM(O1Qb-mdW zuX9k;!JW}e)~jLd+y7N(gRD<8GcfQd?~$6uy*saav(b;6N^;weOe`{Me883Pit*Z# zsAn@jB{DD=bbMH~d5SOd#=n|(Bd2rUx4C=v=o+23N0ZYZnhP4W`|z#f(icCOPtL9260B6%!IUAG zFh76u?-GUlwVBz*r`j1A9PT^}{cdmiQt!>KbEP*wT=&^lVog!afsKjq~ZD$t8cFuK{%at11Hl+Vbc>7wwNgf;+ z8y<#U&(@V{y0`f4`Ky0p_DlV_di?XVf-fKJR{a%EXRDw4fa`$Co7A@N2WGO}xXEyD zn&;0CUHOBH12(-sTziSQr={Znd|Hu6&!hE7)`WG;Z^=P4CXnKHS~@J;Cbm z?C#(HwlI7MY^a^^Ot+-%(t(#tAMU-dhm(QfP__Nd?v(o*4uCX4Vsl68@r2p_Mbazm**DFbt!tT=RUC`GizBH8a~|Oy}K>(rhq{#)BVjc`TtauK3yt{mXZB3(=4Ov zp$PK@#mQ`b%Y2{xx^iWYX7Ao+BL)VEii)cbu75f5=jcMu%ZDC3e|LVi^RtJ!Hr}7D zt~vp!n9akri~r*iyo#6Mwcrm7AmIGL zIQGBP?{AjA_jya?*cci{Kwbzmu#BP zK$Xo(i#2XvTR81f%(2(W{@2rY?o(guag+D+#9&T`BR<#muS?REzqV>xHa`b6w)z}T zu6_L`<1&xqy)yss!?u~Or*aE#oELT2V)AF^o$UKby7Fcfe<2}~yEN0_q0#GGTf*0L zM1Nl1&s20-Auso~q9j8V*M{t!`^rMT-1{Z-@^$(*QBZ=GuzLNfbnWWA-peK%Zp|}q zuRVQz-=t@oo-Fkzn?9=o*iZ;qmFdhFJeb1CMSpRlS90{d(TU9~Jjx>au_CnqAlKadS!M2QG$*JI=n_ zfAVYB%=_R5XHUcXO^NG`mzevP7k{*w{QKa8^t=zdK&4~{-`sXkez0miur#KgX)2T+v`fFKKr^wDK*`X!NH~E^rr0BW#PMYSU^6jms2tMQ@wh^&5KdjmmYk7WAk!t z2A9{j%1`^u0B7T0dMsvB@9kna@IbbWm)-QtE+&U1elPVVzxG`kCZh_9iBjLq)Aeqj zHsQ61TI*=4Q7oo8+vMUKW`;*)Z>`hTMehKYxXBl6UQI4cHuo=I8FPQ%!-{({x87~P zW%4@8wbEFsyWR{mq_ddMM669<(nYg3Hi;m`2ORwi_5m>XAf4&t}2_86ZQSb8f^xi%V8OJKqdUwW`!GD%&wNL zeSJn@&olcdkmT7POFIX87g$ zSPc|*_N)h&MP6F#yjX4h>va2sONlc;+6_Qj9V)i|{j@#z%9W6&IrGii_r9Ke#mLZ# zhxvesiD_O`K?eiF48MxKVl4g3OVX{qUzzgMH$;Xr%;;P8o+mAykzs~Yh3SpkSIe$# zefhj|%Z=Mt7aWOf0U6Fa`Is*_1O(!En-=6=i0M4>=GOV_&9;3e=XaU$7BMg!F3w$f zGG_J#*h#Jj^3h6zblVc7H4d(^}W0%Z{gDv zh6X|FrMqL+mCMEzOkrS<2&}j|^NgN%+ikYf3E7#949(6j4ZtbSXw9UD%eL-p31^rw zE&IM^aqb6p1_n2wxb?LgkB1rgELLMUP|kMR<%Jaw!-0-NueWZ}%a~9F zcHNtYp{G}-?K`x(MOV@+^NPz!0|uY-Ti;J>{Z_`nz~Icc{!+lBYOnHbiN+}>3xW;Q zb}$_)Y!vT&tmtqx_c0MkbWnk#A-6NGV z@p19Bt52U_jn57~`62N8Z)OIc%kw^PF&ywXoZYaYGPgirR|+T*&DfTGpV@fZ8AgVL z8xODE7PB<>FW;A5nA>djP?SN{tKuMOJS85$Vd zuHSxBr&qWAM5dI;mYJ1HQzRHJnC-b#D8bO6*mixH!;6N;f}XIo0F~Wy{_L@oiQdES z)yBw>dwBJowC_{+m>CQXe0Y^xyXv5rWv*A->^d{m!wd|9f*0d>uggsnieqGuh^*Mk z+kEiaZm!Mi7#OVARI@T9G}Qfl@jr9J{?)k^d%tb&`ut3wXz%NJ{gMnH-c=|5yIC#- zc3$gshQfp`j^K2+syyHe&odo|k z-E(5LyMRyZ@#l8xADtFB`XFVgfey-kOkd(p04_4nL%$(VLuI*-GU|=}V za`^Stnc?RdH=jN8`s)0%VwPZ4cR#$^e7T_Rp3EGx=KW{iJuj+loACf_Uo!9dTP!c7 z9?!fqd-?8}&lO_Ci{3|o^f;V(7`pC!n%MG^bmQP#A}zN|nC1z`fmUuL?0Q)G&`_W) z=DpYQM37R2Jyo2uuWvgs@$<6>B60bfe=jR~viK>FAxJJE;o;XP%XR1d4(Ci{1_^B7 zUvIVerSTp;+kZNj=W8FT3I~Zw_=B}w}$f8JLkl2Chir$rxm-i^9KipNSx7)46R?pd4zE7{?!fi5xaPIxqNm!x-udz{w5H|yfw^tY>z0B>uo;fXfIP9f zdilIdbA2DY(cUAryu|&c0my(J(>+yuvlS1&-r9HK%r0<&tE? z9?}M@v)|Ko{KKo_{ot@<*w=o2b+)H&{WF_@iriV1OD{tVv)S`&jxMh#I8+&g`PX;% z9m<}acOZQGNz0|yX<*@mClJ?F@9|m?zymV6;|^$yV(X-bGrm>q-S%v%-{Fp+Nh;hs zJ6+$NUvqeRK*x#GPm4}6?LR+t-}%r5 z-^1sAK7H%Gj*E)$#M~7MvsFB`l-BFszZ_`ay!LT(!}?1xM+KkAT=@KbwMn`8`$KU` zwG|7GzchXD^Z&okcV4AOvDC%uJ^vrL{-ikn{`<#&&X3ibew?wcT<7bq*{}cR-}~qt zvAd?tbJCu!6UFlTcbDC{7bUlT`st^e=KV^arE)T+|7lQLroIxt*>_L>`#)nXx=uWP zT6EKTPP^T`?%S5mfBo34o2qa`RwJpSH6Gt zSpIqRsY^O;amR^YQ{Kg~)biPgDNQOfnPK|T{62H6><0VS)pNf8`PXOV5nEl?|NqmM zpQ6)GKh5Xc|9`dI{e5-&`x`S(G@dm3(kyxS@t3vjjQ9Q(?X2Pav+vfN|2sQsGK=qj ztoUbttYDr*TWiSwBOmsD+F>SYi~H}#R`b?Z{j&S@wrHo!@;@`xJU=a4Uwxv- zxu-AlpXq|{)8h4}-Yj=O~_UhGsO*L;{|4S{@J#O$!wANs=sHU`8sVPIIu*$5w zh7zfFg&!6&ud`SBwMpn>4BvYHNu~Z3?}g*lF;##5r2YDwv$p2% zKZ$eF=cg%sS~maZqT|_hnt#vu=*XU5x$fNm*7n8|mmdFBeD=O~rk%#BcPlq{tlMa3 zx8Cggyh@(uK1b%i%+k5;+weKV@X>d%SGN1I6!L2MrxZ=I-&OdY{rV@HZRhPj{%Kxc zyP)#EJjWh>haldys|EKTkDR1Z|H4=8*rr)KJ8FCH-b3&2skZe;%;EY_D=}mFR)zwvVnJKF|5FA>D3j_D;<`&tl~* zc(isLlX|g-HC*%b)%Fh`Ql7qS>v~x6x{57qeW%^&SC<%VmUw<$X=*1YQ9IkoWB!Bm zQ$P5FCuVuBeQjzyo#XW7_7Yun<(&^Nv~ImEyeCV*u*{ir-B;;X(&;a@Fy&l-9>Mec zCxhMe=W^-ClK6d!$M8(acDeeR@f&-DdEv*>&K! z+=e^d0;j*L92C_!>$~gp>+e^ME@f91NS?lJx8B^pe2Zs#!xysYpORb8VqIgj zd9g4t&4amcTaZim_pd+M4}Q(skQ(#8OgEl){hRq+jaG4b(`^}LKO`N^{@iDq@OaB} zfu3{M9=(4y=WyU@rTSX=(5p7wQ@QS~e;S`$zjXUeTlrrVqKx}=xCA4Qi!AxtHoIPI zMfTgv?fYE$v-GB))}Q~^y4LBpRP~Qb#m3Jfr&Uf;IW5M&`qvjz&q?~zPq)5WXtB?H z)9I&&&b;2?bp6&R3{L6gZ;E!>_$5sE`uk~-rj*mUIG1mplX6_2NHdlR9sH)D#P2!jk7T9A z7twXaf|xp%R>xcWF-CaGfWwhKSkzLaZxzfI}WiH}lu9lk5JoezmWy!hY7Nh&AJ zKW-06uiqK7kLT^JJu!OvbIyHQ#jnc!w{P~Pig(N3|C}&s-Mx#I#Sc2wUM(w_9DO_H zh!ykX!YrRW13A^$)sJ7V{OJ8RYDbJ-_DA#TX?zv@S3Tb|zE)7)@$aeBQ)AXg8wDoX ze?9o+%C;#{<)ymnbJAZNcGxr@? z|Bzc+C~3eqH}>@YqBR#MhsU1TCqA)hnW}@$LsQR5tv_a8{b{fyPH(!6=cL6yDxLOv zOiD5Q@SB7G%Pd=U&rg5nbS(&+e*X2kTS1SHevpdoQ#oUwow5EHQ;0lc%;}bJmzBR3 z)m_t1nkXNu(*Nsx==WW7Obri&?sJ~K-m$Q7XUw{(?D34;geTtT zVcPTFwA9@$_y>n>u8OBo>s*ax$G$|_z1p$wW7IpHJ@;(x>Ykg;>>u*rF;m1fzkh4z zy(xKlRN&`~hdHzEZjrV5ap&=etct6b9v-^^9!7*R<`}5V;jqbKx{62k)elhRH`&$G>E|fd`{dRJ`y~~sM zN6SsjFWUy!e%gAkG~0rCQ~!sphv&~oKe*~1cYO?JcklIt1=qiQJ81hf^iWQJ@^86M zjWx?`&M>)EfU^Den|}qI82mFNTCV6u^SLn0fBwk5zGm+1{(aZkUW&J@uU>U=`l9DX z_h(MCRhDzsaG(47d)rrL)!0o!k8Jf`-By3O^{32(?{D01JuKH#y1(KC)3I`0b+-Qp z1@4JRwEQt?5S_Sw3UB1+zXgY0tu*JCSrhv7(|Nhoyu0)y%YN?eZLag{UBQ$2_SWjh zwHhJKGfg}v{r8#l#NPEu^n&{jFFnceNc`UWUMwNz`lj=n60P+1Y;n&E*40HyP6IKdxloXRc*D{XOs8oiY3$Hb?Hh^PSxy_;dur z#(Sr$_D*Z7(ye}NR&!6L&)mO!&aKCM=D$@u`;6w?d}rc0$yE2t+8=*v#62gS(e2xR z{(|9Fw|ryG^xkJmpB`Px4b~Q|IU69d%Wge?w~A+)ZMlr>rCOse-`ysvoUC);7oFxg zNk^8gH2dRj9fd7_HuoKCGy1rFY1o?injikniSM|d_otHO`>}(ur}w{VeElfx_OtFe zjSe=~jMkjJ7;bb%{n1|D44e3Dx8w2Nj$-rf9~W8r>*%isLceP24u1L5y644D#$(-6 zUJGl6|FOKm`?C7*t3MYf{L@IS%zxt@#&x{9(nbAFt$ZtA}K-lBXr@`LtG zU&fpH|L)Sqzt0@a<;}bIqHB3G!EKB6UI=e_6GeoZKwqd{}MPr;>b+ zW}|ESZ+^5r5F=qG{OPBq=sfEid>1!6AKqkm*Sor2-%6oEpoZVaXimFV@pZKfs~x?T zS5oEP_v;7$@M$c+#kN;z+lCe19BoCq=WE)p2dGNg?CpE4V&8S*y-|;lj9lK0+HI~4 z4ArG!rVb}RO!E&)ONwVRS=M;hX430S{fAZ;`99wJlUYJBleweSfwfSa-Daep*`^YxQP# z%8Uud~UQsaaxAo2IN}pyQiM2Z-KJ9P9?dP=%SC-sJKlx!|-z3LA?OURPe-pTL;Y z`>Xa{NY41#^UnXvE6+<&&R$z%56t=G#MN__QF8wKRDE92)jz5{j zJyCi7SD*i_jNIKhdVc)b;%sxzNlWEcA8pugE|-13zP7dN_zC;VI|CfeOKvN&8pl75 z-Mf5t&fLez)vN5@pO3CI=l=aJYFhc@KMx+3@ z)c==u4wM1yGlCuzr`37*=NO)St#$q2x$wTWiyv3*Gv6j(lOJ+l{Pc|d=3f>bZSMGU z@v?VC$IE>gA7^&`xv^cU@K|gd-HMD4jPJtg zpI@*Kc49Q>`@MO4_Rs6VyKdi4`yRWuZr;3uS3-6t9RH?p?D?(hu9H;G|4KNNDt~F& zb;;XjZ&fMGRXG_pBXh>7=|7Vj+EQ!skE~t&b^YEo#i=?B3%av+7C!rGwtM@}q}*A$ z*`HNwa}_+?Zwsz0)sfqEL*bgz*J{4XTyQh&Uh1#D(rQMZ{-K=R>)-cg z-OYY;yi0A&lJW*zy z>m-%A3%FsKziRH~i)2yV^8#`B+ewHj{PpVar{I$=n!>wL+O?_9@_-J^lXh>#YYRie;}oihkC#Z9U7q-|ENyv+t&}WhY;J z$5Jo4|Mqg9gI+FSo|CS8cQ~DWJ*+hL$RF0Xy9^_N z_VnK#L8rR+y;E%oU-$HVcHHMS$L+n@_N&hZf1U6;Gcj$&@f&Hp4{x0Euk9@L)s&4k zoW@{%&GBY{yw3AR`}a~zjr$JiNO35t^|Dbhd4vF_=T$CF!4*S|;($S8i-v$C@5 ze0JLht^_ZMVg`pJ55L~Jta1D1w$=XH(Qm$s7?puB>Ir|EW z!lVbQe)lHddd$cm*d9Lrb%^si-@RtqZsmS8N3;rFHY}ZS>$jOmbh3(+DWk-xzrwcl z@gFt_OC0}eDVRC$YEQ=c>&vctdYAs-ut?@`y~iFu{j_Sg#*ND>I2j&_?mM=Op-m)i z>hzn}KR>&0{mg2P-;EFNa=wfBW%{LbitB;z0;e}7uGMZ3=yM7^exv1&AIpW0TVwdw z+wErgezkDMrNk?irSGpCuzsSyYeKdo=X!=?Ilh%Ie;i|~S$3e}-T8azam?-EX>p0g zP1`kvt0pF{t3B(Sw^Pvbv6_@ABS+%;)5->Nmh&|YW@T6Ee)=3{>E7S?IZI$)<*s6` znQXG{oa+TNrH!|66-f2%8k$}b&j}!M`pXz@4hw>ttztr^=H#1hTpr7>^`bb@}%zY3H>1Q+4+bzt+5KdNxhsd{)-+huQ2K z&z^aG@%rnQtrF>b`hwQ^|9xAulSNZ~Z;am2r$v<_6Ync=`_J6>-fmXl7sKDTT#ui) z^Eg}f*7V5r@9%z=JH7Mp`|p+Y#cQwKa4-1Ry2JhWkG&hkCf;9d8e)4=`ER7*U%lz) zzqFn&+Ax3d`|8f^@3&5?4cR3T{(gCpuDV$Mq4eVqD-U${ez011;M2tgInmY|>vzZK zz3w}e+Ao##UoADWNM8JJSpE0=HRp|P%W=Qlw&a(_-7|XWa`%E2`{u68UVreocvRZY z)ZO1c-21L8Z}1~yN?7g3ogV~KuDzcx6#ehtqUYxiY~T7tK7rd-FI!W)WL0}z?f!LV zE^o9f`!h3L=(uy|47a-rydoi)?{Nvr(pq*k3i;t)k+)Mj@Ecn**vj?M@SNI>wUNN5+JOXODM{3Hg zUpcp~EZb+5VgOp20~)jCZCaSCvFF?7XXgIperG-WUap()dh-$P)3uqPVO|Di?)9;` z)0KtFzLlOl4zhvaG4J~0e2247l&)`q3_=%H>=olm-+ps%;RBm|zT<5MXU>2}a}U_< znRh8x@9DnD`d)F@qF6;$64%;XD{DvX1wHfTm5;^ zJU9bGkHwx}I$wDs@15QSwqiy>#a^q=RkQC(pWipnynUI`6SJjq}qPt?#-79$=r5RAI_7$MEfUFVH*@1A~vno@a8*i6?FbLI#N&KKxqP zdN%6Pgx`Cm@@8&+v=|g54TWvt_hXyZpPg_nf8M)WZ%&?qILXHl@|zF+JE+4uXpYF+0KekhklTa^M84+ zT!F{zw-#usg@NIK3CMsYB@&=85pb>8yX*eyr_(Hb8H-&Zjy|Be=NDhg^}2gLx2AqK z+k5SbS`OIHY(jDVFW+g@Z9l_lW}OvarK2?I(?*cYffI*TJ3iRLHCu2BA9My_$-}F+ zr&+c!ZuWgyaP7nU*f@QVZ3^E$WNk?8%e}!9X;mYV77vQ@zdX6G{Xv3SeM3CK@;O{iTPshxh02)+@dH z;e9Z~?FxDOZ~SB5W&djbx<6CjOnE1lTlehj<-7Zr+}Zccc>hbCwHEvC*-O{`1C3x? z$TBRb-nIVwRjnDHpB=E3Vrb~xJg@TVrH9$sq2W>zxh&DYvp!V0p1OHmayc`@m!zc+ zzizhY<`ZOK@R0exJA3IqSMLZH?N1M#WOC5Huo?07TkHQe1SzipQJk%1A~h0zuVc(oYQqPYVr?% zo_F$%_S|;H1<}6zYMkpB7!)!pOeH7$ahbm+e)ieeSHe~5%S*0r(e3BRj%Qq83|d8y zS!du`!OFn!_R#9KgLlF!cm+FT>+CkKXSgtTS@o}LTQA#yR{z{;Ie0U-Y<|_BN+l)j z+MxGRJHB7qvtDQOdIo_RdHv2O4Hy_+=E+^_##aZl!( zj2Z*O1JylQ;`g&(d&Eka&pfm5T-2UtdpEq-X83Zf;9BX~iA)R(_YSR2ys;(s&J^#@ zcAL)ZV>(ct!DYm+S>0|SSA+|>8E#XeHy zTjtj4wyZ5?P%uf0Wn^%$c^JC=?9OfOuTPczp85IN2PNLQ?MrJvFI)4lw0p|t_1u1v z3>yxw(Pm)i(A%@>*xz8;y0pjp*5{_h>$3To+WzOSES#*pB)`;hT#E(V52-0RzzCthc;H{M&hYj$nKRfK7zFh8 ztlD>NpWf{~FM@YPcYECXaDCdFzg!ISFMCN`0~z4ha($W59f8g3*Dd_9*S&fF;d|>D zKI~k^B?|Vk%)`*{{=A02Z;9wk-=*t3`}#cYr-vCHxM(NLT9pu2qMy&e&`@`HHJ9P< zUEGZ`2d9&xO1D5#vyoNgDN9BjSA`3=ADwdsZ!z^qGD$eDb;j=X1B8ySO)AQ=W}s^MkBQUu)~{$!wF+Wnd79 zt+*N;8xq8UO4;i{vs>J89Tyv?lbM<08L^mT>G$!aobAof~whf zqjL)v_u9>J`uOVE%e<$GHTDvJuBPAq&cKko(0A6XSx?uVpY43^A`=6{#kT8N7cPnX z%c*}*S!{4~^4G1opVbb3N)(*9K4(62!lD~e>VkZFeC^(3^hHs@7B4PSJy0k&)U!1x@7HI_sqEe zr@mP-EE9=&ekn$8PkOct1B1be534q>zy2+wbgrr?=hS?;xO%;`)co~p>RAm0^PMKE zF)$cx`>@IFKZQmdhm?HeNdBR^`vYAmIu+7r-`l zw%nDAOE?)Ac#QXCeO|omli}+LE6>jU=6mqRvzK`fALh^4HMbICwocG zGGSzBc-R(xbxZlHQybrWyZGS!4-I*pB zmj2ZIe<=9phqyD>3YYf9PGMB=YI}O<_UC6Co@OvIG&r`0Z=Lo!`ngWbu5a_q*(dAf z?wP_Ly{5i)_t|&ibMhG61Y&$ox5`^aF)$>EJPh^D-#{YEq06$ z6a4Acz-qu0-&&N&z+kWx6tS7F=ghQN6L|I9wBEbzM;Ds>oGg%c>%hyihCR#+r{2qa2N;@P z2c0?9dh@a<14EDTo~#eqvsAav+jwP?>Ed^XceSm4`};=M&1nK93Ty^j9%MzaeqPc0 znSp`fn0Q?1 zYzz#G`PXkPU3}eU_nW^}_hhcIH5R>0{w?!WA&qy=yqiw!4sS}L=PY|F>b@{Wf`P$D zaZgsmU9ZpEjMwq@%PrZt@Y3dWFFy$$*)Q>D->bg@35-XiV#JfezB-kIf@SW9DBcDs zr}-!UHPt6>{CD;AH%pcX24#+Q#)h}W(rZD*z9D#deb&bBtH0K*+$E-+{Uh7>;}zZ; zij#=Cxm*y*%fw`CjvGYSOk= zK1MMIo`Y9Y?860*=N9H|{=NRra|VV38K8ntcInO|-+!9zj=%XY=dRuH6tgd(v#0*3 zu-9jM-_F3j;Qa%u=|yw1CvQEy&0_n_+N(Qf{FY&0*znE!jQ%^b-T$3WMP55EqV#F@ zx~W@bm+bBIxcuf-piABNtFE8TcANj4d-eCPMX%Es7j!>}TKhAfYwGXM&psS|_;0(w zMEf1*85tPDJ)f*!zp`e>tG3Lydn|3dKG&@&zCQo|#Nb`kB54VXM_!&)*kQG{_^KRh zKE%m~SKCd@kJ8_DCCEfv?e~7YTGN6ceYS-&8)X~LNtk5_304-YajE>PB2he_nStRk z$9k!R>q?ilYGt3LBzI~}%Wt+gcfgy=w-O3rJ8C8Wh&xd~B=qLTI_+0B3`NknfIsp`2Htg5)+3HQN%Q0>{xHane ztuFx|1Fg@1R>j-z$+~gd`}42sTU-wqXFgC-`m}aAgEmV9!@Q=|nH$!;3)HiVejYV_ z?xnla{8<3Kamlv@5{wW3SJ`{^-Twm4mki51xBrcj z`g8SbW$}re`h7>Ou8Z%T&dk6d@q2&Uk466<%m26ebNl}PzhUdn%bofE_Wl2V_5Y9C z|I6IF_3;0H^8Y{2|NnIV-|PQXmFn}kHh|f;|NpiB_q_i5mwo^K|Nn8^{{QZS)xYh+ zL?%An|M&0x&tM_(<;D$d53)9;*;(iF{a=6j{g3VY|NpjkdGbH=*U#l8-~WH?WME*3 zKG_hz`{b|d&u_n}d-~~c>9vC?*&QM5t@q|!y1RJB`2%__dlMLA_}8gr2e`Uy)0^As z>QbWVe0h!D>lj9c178kh=l+(N{5O7X)7{GA3PYZW3z^ou+}C9+__NvX2!kExI<@cW zmsN%3S;Hq6#B`is2J3oqXf@lO#Rn5s-%`F>n!Dm8PyPyq-$|A;Y8FovW;p)f)vd^i z#2?l-&WkcI_?Yj>I&j~F=a3=Fw{ji#9w&AwYNI&s<8wKJzZ-o?Y>``t}MmLqN6{rgV! z`(N@Dg)Z9u+=QKDUHCiUc$w`-4EL(%`M-SE=+DZ)uw`n`i@i2o9>JbbRkQC}pY6Gp zmf(Bp-o26!FM9K|KhB=g%e3gt@{d)9sjd1aj&=4Lj;M*c}}U3$&hb6Xi191KpLxPQOdr2M(5Zu9R6 z-kclrc0WF=c~{gbVav?7GdfSa&Mo^NdRU*KDSP$)I_D!ZE(zi0fqsthV=SptuI1zVh>joYN!^&R@FMLn2TSxM&_iSG6IpdAhj=Dr%TadP2(jDuT z%$b<;NclkB)J?ndCx=z*O6_@`uDSj4#<{I$Gj=p_wqNU)`)Bh_HsR~Nq+4^=UU;yJ zS0={Q1++=-G^oGNvA&Ld>9X6NTX;9jJ=-U-Cw+R}5v3B9VA z(Y(#S?Rnly_HR7n#SGf1J%u@E^;Du8-5hh86HezW@MgNpUc7nCmip7%20 zMylAi6~~j$FKrgQ!@TPCrEiITdQYv+C-k0`vEthPE+MbbKW4L<94G<0OC^*VWEnRX zU16BbUh_Uw{p!xc^?u<=JU@5k7r$fY&jWP;HMLd5#I8Sfc0af^)E?AvK9p_Fxb5qL z(Ch2=O8)!mbgFbio(+jI1}VHE*B2eD_qg8-8rd+uq;bs$3|#$=FH9O)83;ckRLJ<@apv+GbBM zxw`7)?5AZGEa9L%n7tVdzt0vFyjDJNE2moVQKIeahlT|=#it2$8@7c_?9<|wxwd`V zt;1IpcYw3DF&D^>k0oD}S#dwS(79tmQS5EI4}}FU_jz@=`dt4Mb9g~^#@i(>5$~C~ zHBYxZ7rP#Qdu>6^JKLQdH4me}#k~ddoA8%;Y}d+;xw@p(-jj*5vJlHnU(2!ah4Pkd zwI4oRx+-Qc?f3RN{z~)P_jdm1Ayxul_Q_hDQ2RC|{ z3Y?LxcM(l8-X*Mj!E)Dy*QU82lZ|-S9c-TU*m3K8Wvp>jo(y^I4eI?t0rvc|Y_nyn${<1RXc4-XrzL!?jP1>L= z&}VbNZdUJsaKD9Pv;NP z`CcXVal^i;kmSg6!=HVY-K;%#K%0EeoeDga=2z){{787mS<{;Q$Z+;%hH0l5{f`_Iszn+nKHAFlYyzJFqS9$D*?__jLYm_M2tN%CWI^ig9A3xNMx^ zitO|5nFaa_L)Rxyf4h87%<=6v_n!56pB&!13cQ8&F3%$0!%t3Y-d$_UQqQFI= zXY0}uzuwsL)+eTXiahVU8NG9#Z8e+zsnO&1r3bHSsw|i8&Yk|=F+DnW`|FRJ`eMCT z$1i=%o(DeuDEO&u#mqCA{sf{VYf*D9fd+H#sni$LG7!rw7SwAD_KE_w4&M_7DBf&nDjgX!t4A zFJ|SbF3wGlcTG!^3Jdmc+`8-8CcAUO$8UxS)~6oYHdP9eYUdtUaC=$x^67p@tSsie zd~l_zU=8z=MUNjp$?leIdh>(nb{%x$5|N z${i!(B@pnzG2PzN!P`)FYYx-T_u}7+wVoRru?Fh z6F`0VICYzV?UD|^V%VdnKDD#{^L+0Vq3eA!&-ZPTPYm03`+RXA_o~$n`Xw{ z#;qwosW1;zc5Bm{;JH&DdXZ7nMK2Z3|mNU%AY%rO-@}u2_oQ-FWsJV*^H)b$=j|z z-qx#|aM$MU(ntH2UXD9;^ICHM_X(f@%ALQ#$0WqC&EI=|)|Lzt;oOd^$=25eq&FR2 ztM97&Agpieg6yn+2X|fx&0N1a=KO1$ZIWUB3%5=v`n~eZ=bgF1YB3%^KXf1S0qx=M zI>)}Ke;@lVU2nz3yc^%kiG(5Vyr{ zN90zXwL9Cc?S20Fa@jUhk5bSm`$N(9?5ntCSKM0T_|=YkHS@2f`^2svtO-?;Ix1#8 zZN9T;+G;m9mRtSJSzB8Jw&s-v#O7pQWm~ypJ@2=D>q5^vPQMv;ss)@*=eDcg_FLqx znI8RZUwn7Fk=I3m*+1t^ef99*p_saRuS>L4k5}rhc&2!6bD#6;80PHT7o?UPI*_<6 zw8bb9lqOvJ6Eihajn!8(u3?$c`c)$7yV9oK+SoPDD{A-aXN7jzh`itab>*r0{^VIl zFK0D{+$vqbCm9v%^-WV4R11akIf@)Sv9!eCMZ&e<4%<`xH*Y*XVSl(vVCDbf+HC3j zzt_awu6zD_zw|GjRS$n!O_txhCbxg%cfLbgKOb58*gW+RxF~$VG~x7tvek-aC#;Ul zUcP&kbJ6Wum+eZMxv=T&;krWmp;y`-)=pS1DY{<-?08^f+24NE+-yjJ(bvpKxYe5;FX?N`~`$ydlcbr0U4^x^A{E3Yq>@mlmKp1`MO~j#|LdAP4BbcWn-Gxy}r2m z`p-j9M|vq<+iK{uTrsTKTg(2Glk*Mlo4J+uT`L+drth0DKRw*}ME1h1FCNUAeY$^b ze$2Ux(}Q;{&H~NfeXzPIa69eytaZ*grqZvI&)--U5X^dOj%}*-&z#kgSGBgBWBR*l zkyym%zI7YT7H*wf`W%!x!g*8=oXcv?o_^s%X2;bHns7uPx>?snRl#X1yh0`?TyfjyuNAWFH@(&^+{U%dJuSoj zPtK|WtI6`lt2gu2mFhQMeO$UF?R*%hr=dNI{l2$s&F*!kZ*o7}4W6);eOb)^kpD3~ zwadaz?|fY^wzdAA}B4*81Q3Rx0x~@%$>+jMP|gjEhcexv{q+=eNup(BAnc$A6u& zOH0k|3$>kbmHAw{@y+>c3A(rcp7~vGzFKyA<&xtoCdj|;-(EW{>vieGZ5$ugWP{J~ zQ@SKjedS=)weJbB-m&3A`*!R8Vfm%C=9z6gv)wm&wJqQzeDNZ~zpIxY*mf_~^j&+T zBJOwm7wNFYH_NX(XBsR7C)cidY@c(tUth^SH8w6cxdY!g9z&iEo+NL7S?+4B*+n1+*O732|ZSKmKpkWz@ilYur zIa|#(@D@DZ$0p8@f+*Q zpNr0i@`K92qZ;tbhN1H4?2o4J$gNP-M)|YJN+VuMsziga(xnC&1yV$(*+7snBudz`8mp4g| z8V^6u$yq9w!YTXMrhb**`K$8tS4Gx-O9#gulRc~8{p{rX?1E{j?e%?U?zLXs`8+;w zZR%1US+Ly_ty8krCP}>reGH%c?=2D>?7f@9c|utgq*bIjvVmZNGXx>ohY5IG(>wGm?lU2to;&kefhbsjfd8JJAdi$^Nm;8xz{9u<~bjV2DY!Ln(;O` zkbCR#g>AQ^45pShZn2wvOFb2ZwX!Z{D=*+t&JZ?YFYRzVBU}>#=(3`+eW{ zwQT=oZP;?@yuohJ#PDbyH2v+TH1EwSC#LV z%st(&<{qqPyDlwo^{4wMbER3p{xn#U5Z!uX)teo&R>~Gh7Hxg&zx8XsNACRF!Mn77 fJOLdWH~T;H$3@y3f-EETKz&e8S3j3^P6 Date: Thu, 1 Jun 2023 05:50:47 -0700 Subject: [PATCH 003/667] update readme.md --- README.md | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 62621c7..870b922 100644 --- a/README.md +++ b/README.md @@ -6,8 +6,10 @@


-# Complete Configuration for Sovran_SystemsOS and the Sovran Pro -________________________________________________________ + +#Complete Configuration for Sovran_SystemsOS and the Sovran Pro + +________________________________________________________________________________________ A Nix Flake Implementation @@ -17,7 +19,7 @@ https://www.sovransystems.com Connect on Matrix here: https://matrix.to/#/#sovran-systems:anarchyislove.xyz -_________________________________________________________ +__________________________________________________________________________________________ GNU GPL 3.0+ All Open Source Software Used Falls Under Its Specific Open Source License. From 71b74b9bfda5a66615b934b2c02db236711ee9a7 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Thu, 1 Jun 2023 05:51:38 -0700 Subject: [PATCH 004/667] update readme.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 870b922..e40513b 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@

-#Complete Configuration for Sovran_SystemsOS and the Sovran Pro +# Complete Configuration for Sovran_SystemsOS and the Sovran Pro ________________________________________________________________________________________ From af036caec9a3f15ba2446637fcdfdbda06030aeb Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Thu, 1 Jun 2023 05:52:33 -0700 Subject: [PATCH 005/667] update readme.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index e40513b..17c5056 100644 --- a/README.md +++ b/README.md @@ -7,9 +7,9 @@

-# Complete Configuration for Sovran_SystemsOS and the Sovran Pro +## Complete Configuration for Sovran_SystemsOS and the Sovran Pro -________________________________________________________________________________________ +__________________________________________________________________________________________ A Nix Flake Implementation From b653eeee722719a609960df5846deb6cf41266d1 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Thu, 1 Jun 2023 05:57:27 -0700 Subject: [PATCH 006/667] update readme.md --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 17c5056..37b2a74 100644 --- a/README.md +++ b/README.md @@ -9,8 +9,8 @@ ## 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. @@ -19,6 +19,7 @@ https://www.sovransystems.com Connect on Matrix here: https://matrix.to/#/#sovran-systems:anarchyislove.xyz + __________________________________________________________________________________________ GNU GPL 3.0+ From 8936bcc83bcf3860fee651c1e19e841fbb8f123e Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Thu, 1 Jun 2023 05:59:04 -0700 Subject: [PATCH 007/667] update readme.md --- README.md | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 37b2a74..6f57d6c 100644 --- a/README.md +++ b/README.md @@ -7,10 +7,8 @@

-## Complete Configuration for Sovran_SystemsOS and the Sovran Pro +### 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. @@ -20,8 +18,8 @@ https://www.sovransystems.com Connect on Matrix here: https://matrix.to/#/#sovran-systems:anarchyislove.xyz -__________________________________________________________________________________________ -GNU GPL 3.0+ + +##### GNU GPL 3.0+ All Open Source Software Used Falls Under Its Specific Open Source License. From ac90f350e0b41cd780861ef804739a9a5c4a33a1 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Thu, 1 Jun 2023 05:59:46 -0700 Subject: [PATCH 008/667] update readme.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 6f57d6c..1151a51 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@

-### Complete Configuration for Sovran_SystemsOS and the Sovran Pro +## Complete Configuration for Sovran_SystemsOS and the Sovran Pro A Nix Flake Implementation From 14d2b891b23bfe9272f9e94caabc29c4f8b890c6 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Thu, 1 Jun 2023 06:01:09 -0700 Subject: [PATCH 009/667] update readme.md --- README.md | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 1151a51..a247fd3 100644 --- a/README.md +++ b/README.md @@ -19,12 +19,13 @@ Connect on Matrix here: https://matrix.to/#/#sovran-systems:anarchyislove.xyz -##### GNU GPL 3.0+ + +### Created, Handcrafted, and Headquartered in Southern California – 2022-2023 🏖️. All Open Source Software Used Falls Under Its Specific Open Source License. -Created, Handcrafted, and Headquartered in Southern California – 2022-2023 🏖️. - This Gitea is Proudly Powered by a Sovran Pro 💚. -All Is Love. Fear Is Illusion. All Beings Are Free. Truth Can Never Be Destroyed. \ No newline at end of file +All Is Love. Fear Is Illusion. All Beings Are Free. Truth Can Never Be Destroyed. + +GNU GPL 3.0+ \ No newline at end of file From f7341ccf3abe3026ce77c7ebd372f5485290311b Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Thu, 1 Jun 2023 06:03:59 -0700 Subject: [PATCH 010/667] update readme.md --- README.md | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index a247fd3..61c386d 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@

-## Complete Configuration for Sovran_SystemsOS and the Sovran Pro +# Complete Configuration for Sovran_SystemsOS and the Sovran Pro A Nix Flake Implementation @@ -17,15 +17,16 @@ 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 🏖️. +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 💚. -All Is Love. Fear Is Illusion. All Beings Are Free. Truth Can Never Be Destroyed. - GNU GPL 3.0+ \ No newline at end of file From 34576ef2de2e12ee025fcbb76eaa75ed96448447 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Thu, 1 Jun 2023 06:04:40 -0700 Subject: [PATCH 011/667] update readme.md --- README.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/README.md b/README.md index 61c386d..539bdbc 100644 --- a/README.md +++ b/README.md @@ -19,8 +19,6 @@ 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 🏖️. From f0cb0694db360cf9902c9c81a1314545b958907e Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Thu, 1 Jun 2023 09:51:02 -0700 Subject: [PATCH 012/667] added agenix --- flake.nix | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/flake.nix b/flake.nix index 243b4e3..b32e69e 100644 --- a/flake.nix +++ b/flake.nix @@ -1,17 +1,25 @@ { - description = "The Ultimate Sovran Pro Configuration from Sovran Systems"; + description = "The Ultimate Sovran_SystemsOS Configuration for the Sovran Pro 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 = ""; + }; - outputs = { self, nixpkgs, nix-bitcoin, ... }: + outputs = { self, nixpkgs, nix-bitcoin, agenix, ... }: + { nixosConfigurations.nixos = nixpkgs.lib.nixosSystem { system ="x86_64-linux"; + }; nixosModules.Sovran_Pro = { pkgs, ... }: { @@ -21,7 +29,9 @@ ./modules/modules.nix nix-bitcoin.nixosModules.default - + + agenix.nixosModules.default + ]; }; }; From aeeceae9802bb33cd786faef1afcd1fdf29bb2e9 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Thu, 1 Jun 2023 09:56:06 -0700 Subject: [PATCH 013/667] updated local Sovran Pro Flake --- For_NEW_Sovran_Pros_Upload/flake.nix | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/For_NEW_Sovran_Pros_Upload/flake.nix b/For_NEW_Sovran_Pros_Upload/flake.nix index 7d9c4e8..b3ed03d 100644 --- a/For_NEW_Sovran_Pros_Upload/flake.nix +++ b/For_NEW_Sovran_Pros_Upload/flake.nix @@ -1,14 +1,22 @@ { - description = "The Ultimate Sovran Pro Configuration from Sovran Systems"; + description = "Sovran_SystemsOS for the Sovran Pro from Sovran Systems"; inputs = { - Sovran_Systems.url = "git+https://git.sovransystems.com/Sovran_Systems/Sovran_Pro"; + + 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_Pro ]; + + modules = [ Sovran_Systems.nixosModules.Sovran_SystemsOS]; + }; + }; + } \ No newline at end of file From b987011e6235249bf904026886d86d92b9f30978 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Thu, 1 Jun 2023 21:40:58 -0700 Subject: [PATCH 014/667] added agenix file links throughout configurations --- modules/configuration.nix | 6 +++--- modules/coturn.nix | 2 +- modules/personalization.nix | 12 +++++++----- modules/synapse.nix | 4 ++-- 4 files changed, 13 insertions(+), 11 deletions(-) diff --git a/modules/configuration.nix b/modules/configuration.nix index bf43b2e..e107093 100644 --- a/modules/configuration.nix +++ b/modules/configuration.nix @@ -301,14 +301,14 @@ in }; services.postgresql.initialScript = pkgs.writeText "begin-init.sql" '' - CREATE ROLE "ncusr" WITH LOGIN PASSWORD '${personalization.nextclouddb_pass}'; + CREATE ROLE "ncusr" WITH LOGIN PASSWORD '${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.matrix-synapsedb_pass}'; + CREATE ROLE "matrix-synapse" WITH LOGIN PASSWORD '${age.secrets.matrixdb.file}'; CREATE DATABASE "matrix-synapse" WITH OWNER "matrix-synapse" TEMPLATE template0 LC_COLLATE = "C" @@ -319,7 +319,7 @@ in services.mysql.initialScript = pkgs.writeText "wordpress-init.sql" '' CREATE DATABASE wordpressdb; - GRANT ALL ON *.* TO 'wpusr'@'localhost' IDENTIFIED BY '${personalization.wordpressdb_pass}'; + GRANT ALL ON *.* TO 'wpusr'@'localhost' IDENTIFIED BY '${age.secrets.wordpressdb.file}'; FLUSH PRIVILEGES; '' ; diff --git a/modules/coturn.nix b/modules/coturn.nix index d6de653..9e55287 100644 --- a/modules/coturn.nix +++ b/modules/coturn.nix @@ -35,7 +35,7 @@ let services.coturn = { enable = true; use-auth-secret = true; - static-auth-secret = "${personalization.turn_shared}"; + static-auth-secret = "${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"; diff --git a/modules/personalization.nix b/modules/personalization.nix index 3310da5..5f8dfd9 100644 --- a/modules/personalization.nix +++ b/modules/personalization.nix @@ -7,11 +7,13 @@ 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; -wordpressdb_pass = builtins.readFile /var/lib/secrets/wordpressdb; -matrix-synapsedb_pass = builtins.readFile /var/lib/secrets/matrixdb; -nextclouddb_pass = builtins.readFile /var/lib/secrets/nextclouddb; -turn_shared = builtins.readFile /var/lib/secrets/turn; -matrix_reg_secret = builtins.readFile /var/lib/secrets/matrix_reg_secret; + +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; } diff --git a/modules/synapse.nix b/modules/synapse.nix index 76839ae..9bcb20c 100644 --- a/modules/synapse.nix +++ b/modules/synapse.nix @@ -43,7 +43,7 @@ in "ff00::/8" ]; url_preview_ip_ranger_whitelist = [ "127.0.0.1" ]; - turn_shared_secret = "${personalization.turn_shared}"; + turn_shared_secret = "${age.secrets.turn.file}"; turn_uris = [ "turn:${personalization.matrix_url}:5349?transport=udp" "turn:${personalization.matrix_url}:5349?transport=tcp" @@ -52,7 +52,7 @@ in ]; presence.enabled = true; enable_registration = false; - registration_shared_secret = "${personalization.matrix_reg_secret}"; + registration_shared_secret = "${age.secrets.matrix_reg_secret.file}"; listeners = [ { port = 8008; From b12881cbec588513734f357fdd2448d7ae33491e Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Thu, 1 Jun 2023 22:25:20 -0700 Subject: [PATCH 015/667] update path for agenix --- modules/personalization.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/personalization.nix b/modules/personalization.nix index 5f8dfd9..524a7b4 100644 --- a/modules/personalization.nix +++ b/modules/personalization.nix @@ -8,6 +8,9 @@ caddy_email_for_zerossl = builtins.readFile /var/lib/domains/sslemail; vaultwarden_url = builtins.readFile /var/lib/domains/vaultwarden; + +age.identityPaths = [ "/root/.ssh/ssh_host_ed25519_key" ]; + 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; From 805f28c195aed14132ab0cabab56996b6f018f2f Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Thu, 1 Jun 2023 22:26:42 -0700 Subject: [PATCH 016/667] update path for agenix --- modules/personalization.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/modules/personalization.nix b/modules/personalization.nix index 524a7b4..6cfff10 100644 --- a/modules/personalization.nix +++ b/modules/personalization.nix @@ -7,8 +7,6 @@ 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; - - age.identityPaths = [ "/root/.ssh/ssh_host_ed25519_key" ]; age.secrets.turn.file = /var/lib/agenix-secrets/turn.age; From ba3702b4a5e5446b3a419fa6de8918e14f5ef2b9 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Sat, 3 Jun 2023 13:07:21 -0700 Subject: [PATCH 017/667] added agenix id path --- modules/personalization.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/personalization.nix b/modules/personalization.nix index 6cfff10..fe01a9f 100644 --- a/modules/personalization.nix +++ b/modules/personalization.nix @@ -7,7 +7,7 @@ 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; -age.identityPaths = [ "/root/.ssh/ssh_host_ed25519_key" ]; +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; From d5f8dbaae0c4921ab49262f3b078526569b42ba8 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Sat, 3 Jun 2023 14:30:01 -0700 Subject: [PATCH 018/667] updated local flake --- For_NEW_Sovran_Pros_Upload/flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/For_NEW_Sovran_Pros_Upload/flake.nix b/For_NEW_Sovran_Pros_Upload/flake.nix index b3ed03d..aa77d3a 100644 --- a/For_NEW_Sovran_Pros_Upload/flake.nix +++ b/For_NEW_Sovran_Pros_Upload/flake.nix @@ -13,7 +13,7 @@ system = "x86_64-linux"; - modules = [ Sovran_Systems.nixosModules.Sovran_SystemsOS]; + modules = [ Sovran_Systems.nixosModules.Sovran_SystemsOS ]; }; From 387348524a8f73d82be6a81bdbc848559d3db66a Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Sat, 3 Jun 2023 15:59:28 -0700 Subject: [PATCH 019/667] updated global flake --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index b32e69e..2950732 100644 --- a/flake.nix +++ b/flake.nix @@ -22,7 +22,7 @@ }; - nixosModules.Sovran_Pro = { pkgs, ... }: { + nixosModules.Sovran_SystemsOS = { pkgs, ... }: { imports = [ From dde1de7e3b927b61211934c4205e3d1ceccffbbc Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Sat, 3 Jun 2023 16:09:28 -0700 Subject: [PATCH 020/667] updated the modules to allow for agenix --- modules/configuration.nix | 6 +++--- modules/coturn.nix | 2 +- modules/synapse.nix | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/configuration.nix b/modules/configuration.nix index e107093..d06013a 100644 --- a/modules/configuration.nix +++ b/modules/configuration.nix @@ -301,14 +301,14 @@ in }; services.postgresql.initialScript = pkgs.writeText "begin-init.sql" '' - CREATE ROLE "ncusr" WITH LOGIN PASSWORD '${age.secrets.nextclouddb.file}'; + 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 '${age.secrets.matrixdb.file}'; + 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" @@ -319,7 +319,7 @@ in services.mysql.initialScript = pkgs.writeText "wordpress-init.sql" '' CREATE DATABASE wordpressdb; - GRANT ALL ON *.* TO 'wpusr'@'localhost' IDENTIFIED BY '${age.secrets.wordpressdb.file}'; + GRANT ALL ON *.* TO 'wpusr'@'localhost' IDENTIFIED BY '${personalization.age.secrets.wordpressdb.file}'; FLUSH PRIVILEGES; '' ; diff --git a/modules/coturn.nix b/modules/coturn.nix index 9e55287..095af97 100644 --- a/modules/coturn.nix +++ b/modules/coturn.nix @@ -35,7 +35,7 @@ let services.coturn = { enable = true; use-auth-secret = true; - static-auth-secret = "${age.secrets.turn.file}"; + 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"; diff --git a/modules/synapse.nix b/modules/synapse.nix index 9bcb20c..109708e 100644 --- a/modules/synapse.nix +++ b/modules/synapse.nix @@ -43,7 +43,7 @@ in "ff00::/8" ]; url_preview_ip_ranger_whitelist = [ "127.0.0.1" ]; - turn_shared_secret = "${age.secrets.turn.file}"; + turn_shared_secret = "${personalization.age.secrets.turn.file}"; turn_uris = [ "turn:${personalization.matrix_url}:5349?transport=udp" "turn:${personalization.matrix_url}:5349?transport=tcp" @@ -52,7 +52,7 @@ in ]; presence.enabled = true; enable_registration = false; - registration_shared_secret = "${age.secrets.matrix_reg_secret.file}"; + registration_shared_secret = "${personalization.age.secrets.matrix_reg_secret.file}"; listeners = [ { port = 8008; From 1c34e1cae2df98f3f48113b8f0eb08da8c33eb3a Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Sat, 3 Jun 2023 21:26:14 -0700 Subject: [PATCH 021/667] added moreutils --- modules/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/configuration.nix b/modules/configuration.nix index d06013a..3b302a6 100644 --- a/modules/configuration.nix +++ b/modules/configuration.nix @@ -165,6 +165,7 @@ in parted screen gnome.zenity + moreutils ]; From e18e21a956a2186066c7a2447d714f61896e341e Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Sat, 3 Jun 2023 21:52:25 -0700 Subject: [PATCH 022/667] added dig --- modules/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/configuration.nix b/modules/configuration.nix index 3b302a6..a090c01 100644 --- a/modules/configuration.nix +++ b/modules/configuration.nix @@ -166,6 +166,7 @@ in screen gnome.zenity moreutils + dig ]; From 56a2c77269f72e21fe3222078164c1b8949f65d5 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Sun, 4 Jun 2023 11:33:44 -0700 Subject: [PATCH 023/667] updated configuration.nix --- modules/configuration.nix | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/modules/configuration.nix b/modules/configuration.nix index a090c01..33b4d89 100644 --- a/modules/configuration.nix +++ b/modules/configuration.nix @@ -131,7 +131,7 @@ in librewolf fish htop - gnomeExtensions.dash-to-dock-for-cosmic + gnomeExtensions.dash-to-dock gnomeExtensions.vitals gnomeExtensions.pop-shell gnomeExtensions.transparent-top-bar @@ -165,8 +165,6 @@ in parted screen gnome.zenity - moreutils - dig ]; @@ -410,20 +408,6 @@ backup /etc/nix-bitcoin-secrets/ localhost/ networking.firewall.enable = true; - - -####### AUTO UPDATE ####### -# system.autoUpgrade = { -# enable = true; -# flags = [ "--impure" "--update-input" "Sovran_Systems" "--commit-lock-file" ]; -# flake = "/etc/nixos"; -# persistent = true; -# allowReboot = true; -# rebootWindow = { lower = "02:00"; upper = "05:00"; }; -# }; - - - ####### AUTO COLLECT GARABAGE ####### nix.gc = { automatic = true; From d64ded4d9f8f6cc497fea5a21b434c7a627f615e Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Tue, 6 Jun 2023 14:48:13 -0700 Subject: [PATCH 024/667] updated vaultwarden.nix --- modules/vaultwarden.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/vaultwarden.nix b/modules/vaultwarden.nix index 46b0678..f4c94b9 100644 --- a/modules/vaultwarden.nix +++ b/modules/vaultwarden.nix @@ -16,6 +16,6 @@ in ROCKET_LOG = "critical"; }; dbBackend = "sqlite"; - environmentFile = "/var/lib/vaultwarden.env"; + environmentFile = "/var/lib/secrets/vaultwarden/"; }; } \ No newline at end of file From 6bde8b2b2a22f13803345468f131c27c75f97754 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Tue, 6 Jun 2023 14:49:58 -0700 Subject: [PATCH 025/667] updated vaultwarden.nix --- modules/vaultwarden.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/vaultwarden.nix b/modules/vaultwarden.nix index f4c94b9..2f34110 100644 --- a/modules/vaultwarden.nix +++ b/modules/vaultwarden.nix @@ -16,6 +16,6 @@ in ROCKET_LOG = "critical"; }; dbBackend = "sqlite"; - environmentFile = "/var/lib/secrets/vaultwarden/"; + environmentFile = "/var/lib/secrets/vaultwarden/vaultwarden.env"; }; } \ No newline at end of file From 75385911ad647c2564c1be33914b67ed56c1e4f7 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Tue, 6 Jun 2023 15:18:03 -0700 Subject: [PATCH 026/667] added libargon2 --- modules/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/configuration.nix b/modules/configuration.nix index 33b4d89..89ee9c5 100644 --- a/modules/configuration.nix +++ b/modules/configuration.nix @@ -165,6 +165,7 @@ in parted screen gnome.zenity + libargon2 ]; From f3e962fbb6b08a263e8ad1b9cc188d6a04a43b6a Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Tue, 13 Jun 2023 10:39:57 -0700 Subject: [PATCH 027/667] added onlyoffice --- modules/modules.nix | 1 + modules/onlyoffice.nix | 11 +++++++++++ modules/personalization.nix | 1 + 3 files changed, 13 insertions(+) create mode 100644 modules/onlyoffice.nix diff --git a/modules/modules.nix b/modules/modules.nix index 518304e..222162d 100644 --- a/modules/modules.nix +++ b/modules/modules.nix @@ -8,6 +8,7 @@ ./coturn.nix ./bitcoinecosystem.nix ./vaultwarden.nix + ./onlyoffice.nix /etc/nixos/hardware-configuration.nix ]; } \ No newline at end of file diff --git a/modules/onlyoffice.nix b/modules/onlyoffice.nix new file mode 100644 index 0000000..1f41886 --- /dev/null +++ b/modules/onlyoffice.nix @@ -0,0 +1,11 @@ +{config, pkgs, lib, ...}: + +let + personalization = import ./personalization.nix; + in +{ + services.onlyoffice = { + enable = true; + hostname = "${personalization.wordpress_url}"; + }; +} \ No newline at end of file diff --git a/modules/personalization.nix b/modules/personalization.nix index fe01a9f..70eded8 100644 --- a/modules/personalization.nix +++ b/modules/personalization.nix @@ -6,6 +6,7 @@ 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" ]; From e9811ee0bed33345966325f4011e6e40846447c4 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Tue, 13 Jun 2023 10:41:01 -0700 Subject: [PATCH 028/667] updated onlyoffice --- modules/onlyoffice.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/onlyoffice.nix b/modules/onlyoffice.nix index 1f41886..02852f6 100644 --- a/modules/onlyoffice.nix +++ b/modules/onlyoffice.nix @@ -6,6 +6,6 @@ let { services.onlyoffice = { enable = true; - hostname = "${personalization.wordpress_url}"; + hostname = "${personalization.onlyoffice_url}"; }; } \ No newline at end of file From 99ff19ae8bf26d50b609e33bd318115e14635c52 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Tue, 13 Jun 2023 11:06:53 -0700 Subject: [PATCH 029/667] updated onlyoffice nginx --- modules/onlyoffice.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/modules/onlyoffice.nix b/modules/onlyoffice.nix index 02852f6..c994f98 100644 --- a/modules/onlyoffice.nix +++ b/modules/onlyoffice.nix @@ -8,4 +8,9 @@ let enable = true; hostname = "${personalization.onlyoffice_url}"; }; + + services.nginx.defaultSSLListenPort = 9443; + services.nginx.defaultHTTPListenPort = 9080; + + } \ No newline at end of file From 8fab146e6069d65069b6ef076622a5fb797b2b62 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Tue, 13 Jun 2023 11:07:51 -0700 Subject: [PATCH 030/667] updated firewall --- modules/configuration.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/configuration.nix b/modules/configuration.nix index 89ee9c5..5d59d37 100644 --- a/modules/configuration.nix +++ b/modules/configuration.nix @@ -399,8 +399,8 @@ backup /etc/nix-bitcoin-secrets/ localhost/ ####### 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.allowedTCPPorts = [ 80 443 5349 8448 3050 3051 9443 9080 ]; + networking.firewall.allowedUDPPorts = [ 80 443 5349 8448 3050 3051 9443 9080 ]; networking.firewall.allowedUDPPortRanges = [ { from=49152; to=65535; } # TURN relay ]; From df26c5d01e720513faa615691e1b8f8b36cbca3c Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Tue, 13 Jun 2023 11:10:38 -0700 Subject: [PATCH 031/667] updated onlyoffice --- modules/onlyoffice.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/onlyoffice.nix b/modules/onlyoffice.nix index c994f98..6ddffbc 100644 --- a/modules/onlyoffice.nix +++ b/modules/onlyoffice.nix @@ -12,5 +12,4 @@ let services.nginx.defaultSSLListenPort = 9443; services.nginx.defaultHTTPListenPort = 9080; - } \ No newline at end of file From 20327720d16bf1f4a3b336d1148d77e711064029 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Tue, 13 Jun 2023 12:09:54 -0700 Subject: [PATCH 032/667] updated onlyoffice and nginx ssl --- modules/onlyoffice.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/modules/onlyoffice.nix b/modules/onlyoffice.nix index 6ddffbc..970b9e6 100644 --- a/modules/onlyoffice.nix +++ b/modules/onlyoffice.nix @@ -12,4 +12,17 @@ let services.nginx.defaultSSLListenPort = 9443; services.nginx.defaultHTTPListenPort = 9080; + security.acme = { + acceptTerms = true; + defaults.email = "cert+${caddy_email_for_zerossl}"; + certs."${personalization.onlyoffice_url}" = { + webroot = "/var/lib/acme/challenges-com"; + email = "cert+${caddy_email_for_zerossl}"; + group = "nginx"; + extraDomainNames = [ "www.${personalization.onlyoffice_url}" ]; + }; + }; + + users.users.nginx.extraGroups = [ "acme" ]; + } \ No newline at end of file From 9c77c9c72d11fb07a855c134993f5343ee3b3102 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Tue, 13 Jun 2023 12:11:37 -0700 Subject: [PATCH 033/667] updated nginx ssl --- modules/onlyoffice.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/onlyoffice.nix b/modules/onlyoffice.nix index 970b9e6..1a1cee5 100644 --- a/modules/onlyoffice.nix +++ b/modules/onlyoffice.nix @@ -14,10 +14,10 @@ let security.acme = { acceptTerms = true; - defaults.email = "cert+${caddy_email_for_zerossl}"; + defaults.email = "cert+${personalization.caddy_email_for_zerossl}"; certs."${personalization.onlyoffice_url}" = { webroot = "/var/lib/acme/challenges-com"; - email = "cert+${caddy_email_for_zerossl}"; + email = "cert+${personalization.caddy_email_for_zerossl}"; group = "nginx"; extraDomainNames = [ "www.${personalization.onlyoffice_url}" ]; }; From a30e3059209817fb9a00df8202116c5da00ec7e4 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Tue, 13 Jun 2023 12:14:49 -0700 Subject: [PATCH 034/667] updated nginx ssl --- modules/onlyoffice.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/onlyoffice.nix b/modules/onlyoffice.nix index 1a1cee5..deeeca7 100644 --- a/modules/onlyoffice.nix +++ b/modules/onlyoffice.nix @@ -19,7 +19,6 @@ let webroot = "/var/lib/acme/challenges-com"; email = "cert+${personalization.caddy_email_for_zerossl}"; group = "nginx"; - extraDomainNames = [ "www.${personalization.onlyoffice_url}" ]; }; }; From 21293ebb25f069f82261906695b6d4c8523d84e0 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Tue, 13 Jun 2023 14:04:11 -0700 Subject: [PATCH 035/667] trouble shooting onlyoffice webserver --- modules/onlyoffice.nix | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/modules/onlyoffice.nix b/modules/onlyoffice.nix index deeeca7..0b7b566 100644 --- a/modules/onlyoffice.nix +++ b/modules/onlyoffice.nix @@ -6,22 +6,4 @@ let { services.onlyoffice = { enable = true; - hostname = "${personalization.onlyoffice_url}"; - }; - - services.nginx.defaultSSLListenPort = 9443; - services.nginx.defaultHTTPListenPort = 9080; - - security.acme = { - acceptTerms = true; - defaults.email = "cert+${personalization.caddy_email_for_zerossl}"; - certs."${personalization.onlyoffice_url}" = { - webroot = "/var/lib/acme/challenges-com"; - email = "cert+${personalization.caddy_email_for_zerossl}"; - group = "nginx"; - }; - }; - - users.users.nginx.extraGroups = [ "acme" ]; - } \ No newline at end of file From b1c9ae015d32acc86e82b44cec0061c8386d8ad7 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Tue, 13 Jun 2023 14:04:48 -0700 Subject: [PATCH 036/667] trouble shooting onlyoffice webserver --- modules/onlyoffice.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/onlyoffice.nix b/modules/onlyoffice.nix index 0b7b566..7a52e1e 100644 --- a/modules/onlyoffice.nix +++ b/modules/onlyoffice.nix @@ -6,4 +6,5 @@ let { services.onlyoffice = { enable = true; + }; } \ No newline at end of file From 512c4237ebfabc7d8f900aa5bb70cefb39d317c8 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Tue, 13 Jun 2023 14:57:02 -0700 Subject: [PATCH 037/667] trouble shooting onlyoffice webserver --- modules/onlyoffice.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/onlyoffice.nix b/modules/onlyoffice.nix index 7a52e1e..d34c43d 100644 --- a/modules/onlyoffice.nix +++ b/modules/onlyoffice.nix @@ -6,5 +6,7 @@ let { services.onlyoffice = { enable = true; + enableExampleServer = true; + examplePort = 8100; }; } \ No newline at end of file From 66903d36c59bb2c085f619dbf3a371c9682516de Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Tue, 13 Jun 2023 15:02:43 -0700 Subject: [PATCH 038/667] trouble shooting onlyoffice webserver --- modules/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/configuration.nix b/modules/configuration.nix index 5d59d37..e2ba6e1 100644 --- a/modules/configuration.nix +++ b/modules/configuration.nix @@ -166,6 +166,7 @@ in screen gnome.zenity libargon2 + onlyoffice-documentserver ]; From 2c63a0318d3bcd3a7c86a57d034e855fe0e937ed Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Tue, 13 Jun 2023 15:16:55 -0700 Subject: [PATCH 039/667] trouble shooting onlyoffice webserver --- modules/onlyoffice.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/modules/onlyoffice.nix b/modules/onlyoffice.nix index d34c43d..99d426a 100644 --- a/modules/onlyoffice.nix +++ b/modules/onlyoffice.nix @@ -6,7 +6,6 @@ let { services.onlyoffice = { enable = true; - enableExampleServer = true; - examplePort = 8100; + hostname = "${personalization.onlyoffice_url}"; }; } \ No newline at end of file From 926b0a98163177761962a29d5233f5c927222f92 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Tue, 13 Jun 2023 15:25:58 -0700 Subject: [PATCH 040/667] trouble shooting onlyoffice webserver --- modules/onlyoffice.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/modules/onlyoffice.nix b/modules/onlyoffice.nix index 99d426a..5da7385 100644 --- a/modules/onlyoffice.nix +++ b/modules/onlyoffice.nix @@ -8,4 +8,9 @@ let enable = true; hostname = "${personalization.onlyoffice_url}"; }; -} \ No newline at end of file + + services.nginx.defaultSSLListenPort = 9443; + services.nginx.defaultHTTPListenPort = 9080; + +} + From ebe26ca14bd3d4d1b6d2d6420274400cee9f902e Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Tue, 13 Jun 2023 21:08:57 -0700 Subject: [PATCH 041/667] trouble shooting onlyoffice webserver --- modules/configuration.nix | 5 +++-- modules/onlyoffice.nix | 3 +++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/modules/configuration.nix b/modules/configuration.nix index e2ba6e1..e91e6b4 100644 --- a/modules/configuration.nix +++ b/modules/configuration.nix @@ -400,8 +400,9 @@ backup /etc/nix-bitcoin-secrets/ localhost/ ####### Open ports in the firewall ####### - networking.firewall.allowedTCPPorts = [ 80 443 5349 8448 3050 3051 9443 9080 ]; - networking.firewall.allowedUDPPorts = [ 80 443 5349 8448 3050 3051 9443 9080 ]; + networking.firewall.allowedTCPPorts = [ 80 443 5349 8448 3050 3051 9443 9080 8100 8000 ]; + networking.firewall.allowedUDPPorts = [ 80 443 5349 8448 3050 3051 9443 9080 8100 8000 + ]; networking.firewall.allowedUDPPortRanges = [ { from=49152; to=65535; } # TURN relay ]; diff --git a/modules/onlyoffice.nix b/modules/onlyoffice.nix index 5da7385..a00f3f3 100644 --- a/modules/onlyoffice.nix +++ b/modules/onlyoffice.nix @@ -7,6 +7,9 @@ let services.onlyoffice = { enable = true; hostname = "${personalization.onlyoffice_url}"; + examplePort = 8100; + enableExampleServer = true; + }; services.nginx.defaultSSLListenPort = 9443; From b5c59b6049fe5e9099ecd15db963db3ca7d144e0 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Wed, 14 Jun 2023 09:57:13 -0700 Subject: [PATCH 042/667] trouble shooting onlyoffice webserver --- modules/onlyoffice.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/onlyoffice.nix b/modules/onlyoffice.nix index a00f3f3..2ecefa5 100644 --- a/modules/onlyoffice.nix +++ b/modules/onlyoffice.nix @@ -6,7 +6,7 @@ let { services.onlyoffice = { enable = true; - hostname = "${personalization.onlyoffice_url}"; + #hostname = "${personalization.onlyoffice_url}"; examplePort = 8100; enableExampleServer = true; From 95be7903527d3e74bde7d14e9ae1ce1abb9b9af9 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Wed, 14 Jun 2023 12:09:45 -0700 Subject: [PATCH 043/667] trouble shooting onlyoffice webserver --- modules/onlyoffice.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/onlyoffice.nix b/modules/onlyoffice.nix index 2ecefa5..a00f3f3 100644 --- a/modules/onlyoffice.nix +++ b/modules/onlyoffice.nix @@ -6,7 +6,7 @@ let { services.onlyoffice = { enable = true; - #hostname = "${personalization.onlyoffice_url}"; + hostname = "${personalization.onlyoffice_url}"; examplePort = 8100; enableExampleServer = true; From 350cd5ffd0448a71a6aa0b2032279f468ee0b035 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Wed, 14 Jun 2023 12:16:30 -0700 Subject: [PATCH 044/667] trouble shooting onlyoffice webserver --- modules/configuration.nix | 7 +++++++ modules/onlyoffice.nix | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/modules/configuration.nix b/modules/configuration.nix index e91e6b4..ea8e14c 100644 --- a/modules/configuration.nix +++ b/modules/configuration.nix @@ -278,6 +278,13 @@ in tls internal ''; }; + + "https://${personalization.onlyoffice_url}" = { + extraConfig = '' + reverse_proxy http://localhost:8000 + encode gzip zstd + ''; + }; }; }; diff --git a/modules/onlyoffice.nix b/modules/onlyoffice.nix index a00f3f3..2ecefa5 100644 --- a/modules/onlyoffice.nix +++ b/modules/onlyoffice.nix @@ -6,7 +6,7 @@ let { services.onlyoffice = { enable = true; - hostname = "${personalization.onlyoffice_url}"; + #hostname = "${personalization.onlyoffice_url}"; examplePort = 8100; enableExampleServer = true; From c18dc66e1638c526fda82a27f9ded720111ad8ec Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Wed, 14 Jun 2023 12:24:30 -0700 Subject: [PATCH 045/667] working onlyoffice webserver --- modules/onlyoffice.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/modules/onlyoffice.nix b/modules/onlyoffice.nix index 2ecefa5..d06b523 100644 --- a/modules/onlyoffice.nix +++ b/modules/onlyoffice.nix @@ -6,10 +6,6 @@ let { services.onlyoffice = { enable = true; - #hostname = "${personalization.onlyoffice_url}"; - examplePort = 8100; - enableExampleServer = true; - }; services.nginx.defaultSSLListenPort = 9443; From 25bb2053cbeb8fd9e08c4e16a65c67bcd264beac Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Wed, 14 Jun 2023 12:52:14 -0700 Subject: [PATCH 046/667] updated onlyoffice with agenix --- modules/onlyoffice.nix | 1 + modules/personalization.nix | 1 + 2 files changed, 2 insertions(+) diff --git a/modules/onlyoffice.nix b/modules/onlyoffice.nix index d06b523..8c654e5 100644 --- a/modules/onlyoffice.nix +++ b/modules/onlyoffice.nix @@ -6,6 +6,7 @@ let { services.onlyoffice = { enable = true; + jwtSecretFile = "${personalization.age.secrets.onlyofficejwtSecretFile.file}"; }; services.nginx.defaultSSLListenPort = 9443; diff --git a/modules/personalization.nix b/modules/personalization.nix index 70eded8..2d0d9da 100644 --- a/modules/personalization.nix +++ b/modules/personalization.nix @@ -15,6 +15,7 @@ age.secrets.matrix_reg_secret.file = /var/lib/agenix-secrets/matrix_reg_secret.a 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; +age.secrets.onlyofficejwtSecretFile.file = /var/lib/agenix-secrets/onlyofficejwtSecretFile.age; external_ip_secret = builtins.readFile /var/lib/secrets/external_ip; From 6cf13b481f2bdb6e18ac98fcacec677a6af79b7f Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Wed, 14 Jun 2023 17:40:07 -0700 Subject: [PATCH 047/667] updated onlyoffice with agenix --- modules/onlyoffice.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/onlyoffice.nix b/modules/onlyoffice.nix index 8c654e5..1db03f9 100644 --- a/modules/onlyoffice.nix +++ b/modules/onlyoffice.nix @@ -6,7 +6,7 @@ let { services.onlyoffice = { enable = true; - jwtSecretFile = "${personalization.age.secrets.onlyofficejwtSecretFile.file}"; + #jwtSecretFile = "${personalization.age.secrets.onlyofficejwtSecretFile.file}"; }; services.nginx.defaultSSLListenPort = 9443; From 0d5bafa8578c3ffe86224bf4f24fc175bc2f6d13 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Wed, 14 Jun 2023 17:46:46 -0700 Subject: [PATCH 048/667] updated onlyoffice with agenix --- modules/onlyoffice.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/onlyoffice.nix b/modules/onlyoffice.nix index 1db03f9..8c654e5 100644 --- a/modules/onlyoffice.nix +++ b/modules/onlyoffice.nix @@ -6,7 +6,7 @@ let { services.onlyoffice = { enable = true; - #jwtSecretFile = "${personalization.age.secrets.onlyofficejwtSecretFile.file}"; + jwtSecretFile = "${personalization.age.secrets.onlyofficejwtSecretFile.file}"; }; services.nginx.defaultSSLListenPort = 9443; From ab28793fd99330bb8aacd9c5a54e596f0a1071d3 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Wed, 14 Jun 2023 18:00:15 -0700 Subject: [PATCH 049/667] updated onlyoffice with agenix --- modules/onlyoffice.nix | 2 +- modules/personalization.nix | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/onlyoffice.nix b/modules/onlyoffice.nix index 8c654e5..8abf5b3 100644 --- a/modules/onlyoffice.nix +++ b/modules/onlyoffice.nix @@ -6,7 +6,7 @@ let { services.onlyoffice = { enable = true; - jwtSecretFile = "${personalization.age.secrets.onlyofficejwtSecretFile.file}"; + jwtSecretFile = "${personalization.onlyofficejwtSecretFile}"; }; services.nginx.defaultSSLListenPort = 9443; diff --git a/modules/personalization.nix b/modules/personalization.nix index 2d0d9da..83dca36 100644 --- a/modules/personalization.nix +++ b/modules/personalization.nix @@ -7,6 +7,7 @@ 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; +onlyofficejwtSecretFile = /var/lib/secrets/onlyofficejwtSecretFile; age.identityPaths = [ "/root/.ssh/agenix/agenix-secret-keys" ]; From 5a4413388d1ca84eda05a232b0345c8eb998f91b Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Wed, 14 Jun 2023 18:08:56 -0700 Subject: [PATCH 050/667] trouble shooting onlyoffice with agenix --- modules/onlyoffice.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/onlyoffice.nix b/modules/onlyoffice.nix index 8abf5b3..8ca24b6 100644 --- a/modules/onlyoffice.nix +++ b/modules/onlyoffice.nix @@ -6,7 +6,8 @@ let { services.onlyoffice = { enable = true; - jwtSecretFile = "${personalization.onlyofficejwtSecretFile}"; + #jwtSecretFile = "${personalization.onlyofficejwtSecretFile}"; + jwtSecretFile = "${age.secrets.onlyofficejwtSecretFile.file}"; }; services.nginx.defaultSSLListenPort = 9443; From 0a3f7ac01dbfe496d1f26e20efcb776111186207 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Wed, 14 Jun 2023 18:09:44 -0700 Subject: [PATCH 051/667] trouble shooting onlyoffice with agenix --- modules/onlyoffice.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/onlyoffice.nix b/modules/onlyoffice.nix index 8ca24b6..4b09d28 100644 --- a/modules/onlyoffice.nix +++ b/modules/onlyoffice.nix @@ -7,7 +7,7 @@ let services.onlyoffice = { enable = true; #jwtSecretFile = "${personalization.onlyofficejwtSecretFile}"; - jwtSecretFile = "${age.secrets.onlyofficejwtSecretFile.file}"; + jwtSecretFile = "${personalization.age.secrets.onlyofficejwtSecretFile.file}"; }; services.nginx.defaultSSLListenPort = 9443; From bbe1b30731be5441580ff10b80703a3026ad3997 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Wed, 14 Jun 2023 18:50:28 -0700 Subject: [PATCH 052/667] fix onlyoffice --- modules/onlyoffice.nix | 3 +-- modules/personalization.nix | 9 +++++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/modules/onlyoffice.nix b/modules/onlyoffice.nix index 4b09d28..8abf5b3 100644 --- a/modules/onlyoffice.nix +++ b/modules/onlyoffice.nix @@ -6,8 +6,7 @@ let { services.onlyoffice = { enable = true; - #jwtSecretFile = "${personalization.onlyofficejwtSecretFile}"; - jwtSecretFile = "${personalization.age.secrets.onlyofficejwtSecretFile.file}"; + jwtSecretFile = "${personalization.onlyofficejwtSecretFile}"; }; services.nginx.defaultSSLListenPort = 9443; diff --git a/modules/personalization.nix b/modules/personalization.nix index 83dca36..94685ab 100644 --- a/modules/personalization.nix +++ b/modules/personalization.nix @@ -7,17 +7,22 @@ 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; -onlyofficejwtSecretFile = /var/lib/secrets/onlyofficejwtSecretFile; + +## 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; -age.secrets.onlyofficejwtSecretFile.file = /var/lib/agenix-secrets/onlyofficejwtSecretFile.age; + +## external_ip_secret = builtins.readFile /var/lib/secrets/external_ip; +onlyofficejwtSecretFile = /var/lib/secrets/onlyofficejwtSecretFile; } From dae9095bcb09ebfb03a0584de8bc07c3a70bdcfe Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Wed, 14 Jun 2023 18:53:59 -0700 Subject: [PATCH 053/667] updated firewall --- modules/configuration.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/modules/configuration.nix b/modules/configuration.nix index ea8e14c..53763b3 100644 --- a/modules/configuration.nix +++ b/modules/configuration.nix @@ -407,9 +407,8 @@ backup /etc/nix-bitcoin-secrets/ localhost/ ####### Open ports in the firewall ####### - networking.firewall.allowedTCPPorts = [ 80 443 5349 8448 3050 3051 9443 9080 8100 8000 ]; - networking.firewall.allowedUDPPorts = [ 80 443 5349 8448 3050 3051 9443 9080 8100 8000 - ]; + 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 ]; From 08a3eced9512c86693868c964c54c535d0ad5f81 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Wed, 14 Jun 2023 21:44:45 -0700 Subject: [PATCH 054/667] add redis php for nextcloud --- modules/configuration.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/modules/configuration.nix b/modules/configuration.nix index 53763b3..0face4c 100644 --- a/modules/configuration.nix +++ b/modules/configuration.nix @@ -6,7 +6,7 @@ let custom-php = pkgs.php81.buildEnv { - extensions = { enabled, all }: enabled ++ (with all; [ apcu imagick memcached ]); + extensions = { enabled, all }: enabled ++ (with all; [ redis imagick memcached ]); extraConfig = '' display_errors = On display_startup_errors = On @@ -21,7 +21,6 @@ let post_max_size = 2048M upload_max_filesize = 2048M opcache.interned_strings_buffer = 32 - apc.enable_cli=1 ''; }; in From d53b8d58ed12de428a344ae11acbb386fdb56b62 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Wed, 14 Jun 2023 21:53:06 -0700 Subject: [PATCH 055/667] add back apcu php for nextcloud --- modules/configuration.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/configuration.nix b/modules/configuration.nix index 0face4c..688e158 100644 --- a/modules/configuration.nix +++ b/modules/configuration.nix @@ -6,7 +6,7 @@ let custom-php = pkgs.php81.buildEnv { - extensions = { enabled, all }: enabled ++ (with all; [ redis imagick memcached ]); + extensions = { enabled, all }: enabled ++ (with all; [ apcu redis imagick memcached ]); extraConfig = '' display_errors = On display_startup_errors = On @@ -21,6 +21,7 @@ let post_max_size = 2048M upload_max_filesize = 2048M opcache.interned_strings_buffer = 32 + apc.enable_cli=1 ''; }; in From ea4be6de970548eb1016cdefff113cccb5761f55 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Fri, 16 Jun 2023 09:12:29 -0700 Subject: [PATCH 056/667] trouble shoot onlyoffice --- modules/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/configuration.nix b/modules/configuration.nix index 688e158..94e7667 100644 --- a/modules/configuration.nix +++ b/modules/configuration.nix @@ -201,7 +201,7 @@ in }; }; - + networking.enableIPv6 = false; ####### CADDY ####### services.caddy = { From dce9e74a3229bf4f3eb8aaf4baada5f028e295b2 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Fri, 16 Jun 2023 09:15:37 -0700 Subject: [PATCH 057/667] trouble shoot onlyoffice --- modules/onlyoffice.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/onlyoffice.nix b/modules/onlyoffice.nix index 8abf5b3..2ade980 100644 --- a/modules/onlyoffice.nix +++ b/modules/onlyoffice.nix @@ -12,5 +12,7 @@ let services.nginx.defaultSSLListenPort = 9443; services.nginx.defaultHTTPListenPort = 9080; + config.services.epmd.listenStream = "127.0.0.1:4369"; + } From cce4ea8c8558d6bb2d9f9b0926c02bd24b29dcf6 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Fri, 16 Jun 2023 09:16:14 -0700 Subject: [PATCH 058/667] trouble shoot onlyoffice --- modules/onlyoffice.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/onlyoffice.nix b/modules/onlyoffice.nix index 2ade980..00e9e3a 100644 --- a/modules/onlyoffice.nix +++ b/modules/onlyoffice.nix @@ -12,7 +12,7 @@ let services.nginx.defaultSSLListenPort = 9443; services.nginx.defaultHTTPListenPort = 9080; - config.services.epmd.listenStream = "127.0.0.1:4369"; + services.epmd.listenStream = "127.0.0.1:4369"; } From 3ddae6a26da36eb18bf6b4fb4097b4fbb46c412f Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Fri, 16 Jun 2023 09:31:37 -0700 Subject: [PATCH 059/667] trouble shoot onlyoffice --- modules/configuration.nix | 2 +- modules/onlyoffice.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/configuration.nix b/modules/configuration.nix index 94e7667..1da1411 100644 --- a/modules/configuration.nix +++ b/modules/configuration.nix @@ -201,7 +201,7 @@ in }; }; - networking.enableIPv6 = false; + #networking.enableIPv6 = false; ####### CADDY ####### services.caddy = { diff --git a/modules/onlyoffice.nix b/modules/onlyoffice.nix index 00e9e3a..2a07101 100644 --- a/modules/onlyoffice.nix +++ b/modules/onlyoffice.nix @@ -12,7 +12,7 @@ let services.nginx.defaultSSLListenPort = 9443; services.nginx.defaultHTTPListenPort = 9080; - services.epmd.listenStream = "127.0.0.1:4369"; + #services.epmd.listenStream = "127.0.0.1:4369"; } From 441b6725a993c25513117d1acb10e18da84a1fff Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Fri, 16 Jun 2023 09:44:02 -0700 Subject: [PATCH 060/667] trouble shoot onlyoffice --- modules/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/configuration.nix b/modules/configuration.nix index 1da1411..81e5953 100644 --- a/modules/configuration.nix +++ b/modules/configuration.nix @@ -281,7 +281,7 @@ in "https://${personalization.onlyoffice_url}" = { extraConfig = '' - reverse_proxy http://localhost:8000 + reverse_proxy :8000 encode gzip zstd ''; }; From aedaaa477274698959005cd8e228e38e6fd56ddf Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Fri, 16 Jun 2023 10:01:13 -0700 Subject: [PATCH 061/667] trouble shoot onlyoffice --- modules/configuration.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/configuration.nix b/modules/configuration.nix index 81e5953..fecfbdc 100644 --- a/modules/configuration.nix +++ b/modules/configuration.nix @@ -281,7 +281,7 @@ in "https://${personalization.onlyoffice_url}" = { extraConfig = '' - reverse_proxy :8000 + reverse_proxy http://localhost:8000 encode gzip zstd ''; }; @@ -407,8 +407,8 @@ backup /etc/nix-bitcoin-secrets/ localhost/ ####### 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.allowedTCPPorts = [ 80 443 5349 8448 3050 3051 9080 9443 8000 ]; + networking.firewall.allowedUDPPorts = [ 80 443 5349 8448 3050 3051 9080 9443 8000 ]; networking.firewall.allowedUDPPortRanges = [ { from=49152; to=65535; } # TURN relay ]; From 5d486ee34e335eaa531764b809cf2a2a425f8b2b Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Fri, 16 Jun 2023 10:02:49 -0700 Subject: [PATCH 062/667] trouble shoot onlyoffice --- modules/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/configuration.nix b/modules/configuration.nix index fecfbdc..b580269 100644 --- a/modules/configuration.nix +++ b/modules/configuration.nix @@ -414,7 +414,7 @@ backup /etc/nix-bitcoin-secrets/ localhost/ ]; # Or disable the firewall altogether. - networking.firewall.enable = true; + networking.firewall.enable = false; ####### AUTO COLLECT GARABAGE ####### From 939bc0528c5d01b5d618df33f602e292326d8dc9 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Fri, 16 Jun 2023 10:10:39 -0700 Subject: [PATCH 063/667] trouble shoot onlyoffice --- modules/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/configuration.nix b/modules/configuration.nix index b580269..fecfbdc 100644 --- a/modules/configuration.nix +++ b/modules/configuration.nix @@ -414,7 +414,7 @@ backup /etc/nix-bitcoin-secrets/ localhost/ ]; # Or disable the firewall altogether. - networking.firewall.enable = false; + networking.firewall.enable = true; ####### AUTO COLLECT GARABAGE ####### From 48e29157d41b1ef29d811542595f16c84e4c14f9 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Fri, 16 Jun 2023 11:19:23 -0700 Subject: [PATCH 064/667] trouble shoot onlyoffice --- modules/configuration.nix | 4 ++-- modules/onlyoffice.nix | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/modules/configuration.nix b/modules/configuration.nix index fecfbdc..c1707c9 100644 --- a/modules/configuration.nix +++ b/modules/configuration.nix @@ -407,8 +407,8 @@ backup /etc/nix-bitcoin-secrets/ localhost/ ####### Open ports in the firewall ####### - networking.firewall.allowedTCPPorts = [ 80 443 5349 8448 3050 3051 9080 9443 8000 ]; - networking.firewall.allowedUDPPorts = [ 80 443 5349 8448 3050 3051 9080 9443 8000 ]; + networking.firewall.allowedTCPPorts = [ 80 443 5349 8448 3050 3051 9080 9443 8000 8100 ]; + networking.firewall.allowedUDPPorts = [ 80 443 5349 8448 3050 3051 9080 9443 8000 8100 ]; networking.firewall.allowedUDPPortRanges = [ { from=49152; to=65535; } # TURN relay ]; diff --git a/modules/onlyoffice.nix b/modules/onlyoffice.nix index 2a07101..6107d7d 100644 --- a/modules/onlyoffice.nix +++ b/modules/onlyoffice.nix @@ -7,10 +7,12 @@ let services.onlyoffice = { enable = true; jwtSecretFile = "${personalization.onlyofficejwtSecretFile}"; + enableExampleServer = true; + examplePort = 8100; }; - services.nginx.defaultSSLListenPort = 9443; - services.nginx.defaultHTTPListenPort = 9080; + #services.nginx.defaultSSLListenPort = 9443; + #services.nginx.defaultHTTPListenPort = 9080; #services.epmd.listenStream = "127.0.0.1:4369"; From 258907342756bda1dda4c12c89eeb7ed5f413607 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Fri, 16 Jun 2023 11:36:40 -0700 Subject: [PATCH 065/667] trouble shoot onlyoffice --- modules/modules.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/modules.nix b/modules/modules.nix index 222162d..3104f15 100644 --- a/modules/modules.nix +++ b/modules/modules.nix @@ -8,7 +8,7 @@ ./coturn.nix ./bitcoinecosystem.nix ./vaultwarden.nix - ./onlyoffice.nix + #./onlyoffice.nix /etc/nixos/hardware-configuration.nix ]; } \ No newline at end of file From cd8c89d405efd5da505388c1a98239e541acd069 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Fri, 16 Jun 2023 11:50:03 -0700 Subject: [PATCH 066/667] trouble shoot onlyoffice --- modules/modules.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/modules.nix b/modules/modules.nix index 3104f15..222162d 100644 --- a/modules/modules.nix +++ b/modules/modules.nix @@ -8,7 +8,7 @@ ./coturn.nix ./bitcoinecosystem.nix ./vaultwarden.nix - #./onlyoffice.nix + ./onlyoffice.nix /etc/nixos/hardware-configuration.nix ]; } \ No newline at end of file From 8cdcec812e6042a1f3dbba5cdf59995efd9e493a Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Fri, 16 Jun 2023 11:51:20 -0700 Subject: [PATCH 067/667] trouble shoot onlyoffice --- modules/onlyoffice.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/onlyoffice.nix b/modules/onlyoffice.nix index 6107d7d..1619009 100644 --- a/modules/onlyoffice.nix +++ b/modules/onlyoffice.nix @@ -11,8 +11,8 @@ let examplePort = 8100; }; - #services.nginx.defaultSSLListenPort = 9443; - #services.nginx.defaultHTTPListenPort = 9080; + services.nginx.defaultSSLListenPort = 9443; + services.nginx.defaultHTTPListenPort = 9080; #services.epmd.listenStream = "127.0.0.1:4369"; From 72d887dffe05461aaf0d3fe6c999fb41a70952b4 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Fri, 16 Jun 2023 12:48:33 -0700 Subject: [PATCH 068/667] trouble shoot onlyoffice --- modules/modules.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/modules.nix b/modules/modules.nix index 222162d..3104f15 100644 --- a/modules/modules.nix +++ b/modules/modules.nix @@ -8,7 +8,7 @@ ./coturn.nix ./bitcoinecosystem.nix ./vaultwarden.nix - ./onlyoffice.nix + #./onlyoffice.nix /etc/nixos/hardware-configuration.nix ]; } \ No newline at end of file From 876bad84e5449757fc282cbab0ec2c20e8133cec Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Fri, 16 Jun 2023 13:23:02 -0700 Subject: [PATCH 069/667] trouble shoot onlyoffice --- modules/configuration.nix | 5 ++--- modules/modules.nix | 2 +- modules/onlyoffice.nix | 5 ----- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/modules/configuration.nix b/modules/configuration.nix index c1707c9..23a4303 100644 --- a/modules/configuration.nix +++ b/modules/configuration.nix @@ -282,7 +282,6 @@ in "https://${personalization.onlyoffice_url}" = { extraConfig = '' reverse_proxy http://localhost:8000 - encode gzip zstd ''; }; }; @@ -407,8 +406,8 @@ backup /etc/nix-bitcoin-secrets/ localhost/ ####### Open ports in the firewall ####### - networking.firewall.allowedTCPPorts = [ 80 443 5349 8448 3050 3051 9080 9443 8000 8100 ]; - networking.firewall.allowedUDPPorts = [ 80 443 5349 8448 3050 3051 9080 9443 8000 8100 ]; + 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 ]; diff --git a/modules/modules.nix b/modules/modules.nix index 3104f15..222162d 100644 --- a/modules/modules.nix +++ b/modules/modules.nix @@ -8,7 +8,7 @@ ./coturn.nix ./bitcoinecosystem.nix ./vaultwarden.nix - #./onlyoffice.nix + ./onlyoffice.nix /etc/nixos/hardware-configuration.nix ]; } \ No newline at end of file diff --git a/modules/onlyoffice.nix b/modules/onlyoffice.nix index 1619009..5249c4d 100644 --- a/modules/onlyoffice.nix +++ b/modules/onlyoffice.nix @@ -7,14 +7,9 @@ let services.onlyoffice = { enable = true; jwtSecretFile = "${personalization.onlyofficejwtSecretFile}"; - enableExampleServer = true; - examplePort = 8100; }; services.nginx.defaultSSLListenPort = 9443; services.nginx.defaultHTTPListenPort = 9080; - - #services.epmd.listenStream = "127.0.0.1:4369"; - } From 774df8dffc7873c9cf03242bb37c9a3bc2ed429b Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Fri, 16 Jun 2023 20:21:58 -0700 Subject: [PATCH 070/667] added new top bar extension --- modules/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/configuration.nix b/modules/configuration.nix index 23a4303..dda3bc6 100644 --- a/modules/configuration.nix +++ b/modules/configuration.nix @@ -132,6 +132,7 @@ in fish htop gnomeExtensions.dash-to-dock + gnomeExtensions.transparent-top-bar-adjustable-transparency gnomeExtensions.vitals gnomeExtensions.pop-shell gnomeExtensions.transparent-top-bar @@ -166,7 +167,6 @@ in screen gnome.zenity libargon2 - onlyoffice-documentserver ]; From cfaf8492b9d4cf61a4f5924cda70f9ca44afbb68 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Fri, 16 Jun 2023 20:46:59 -0700 Subject: [PATCH 071/667] Major Update --- flake.lock | 120 +++++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 98 insertions(+), 22 deletions(-) diff --git a/flake.lock b/flake.lock index 8a39b31..8425a53 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,25 @@ { "nodes": { + "agenix": { + "inputs": { + "darwin": [], + "home-manager": "home-manager", + "nixpkgs": "nixpkgs" + }, + "locked": { + "lastModified": 1684153753, + "narHash": "sha256-PVbWt3qrjYAK+T5KplFcO+h7aZWfEj1UtyoKlvcDxh0=", + "owner": "ryantm", + "repo": "agenix", + "rev": "db5637d10f797bb251b94ef9040b237f4702cde3", + "type": "github" + }, + "original": { + "owner": "ryantm", + "repo": "agenix", + "type": "github" + } + }, "extra-container": { "inputs": { "flake-utils": [ @@ -12,11 +32,11 @@ ] }, "locked": { - "lastModified": 1678566036, - "narHash": "sha256-dq+gCYplCTkbHOH1ERCzuTnwY/RvwMyw/kijPy7C3vE=", + "lastModified": 1686656049, + "narHash": "sha256-rkYYVslFtRnhzryUFqJeYjPxorasymOg00z30GtR3iE=", "owner": "erikarvstedt", "repo": "extra-container", - "rev": "a4fe3227bf63bf8479938e1457ebe1c04fe51ef5", + "rev": "a6f74b9deb7bb2fdd346b74483c6a56946d5d332", "type": "github" }, "original": { @@ -26,12 +46,15 @@ } }, "flake-utils": { + "inputs": { + "systems": "systems" + }, "locked": { - "lastModified": 1678901627, - "narHash": "sha256-U02riOqrKKzwjsxc/400XnElV+UtPUQWpANPlyazjH0=", + "lastModified": 1685518550, + "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=", "owner": "numtide", "repo": "flake-utils", - "rev": "93a2b84fc4b70d9e089d029deacc3583435c2ed6", + "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef", "type": "github" }, "original": { @@ -40,19 +63,40 @@ "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", + "nixpkgs": "nixpkgs_2", "nixpkgs-unstable": "nixpkgs-unstable" }, "locked": { - "lastModified": 1679384842, - "narHash": "sha256-SMJW+QZt3iRuoezjE12sopBsdLHDihXe/RerLfRpqoI=", + "lastModified": 1686687332, + "narHash": "sha256-GDpCwn05ZniaKgODBqGlW3pnbHVq6bybnTNnoCK/XUk=", "owner": "fort-nix", "repo": "nix-bitcoin", - "rev": "481050bdf75106bff652016bfe5c39736bdd03ef", + "rev": "f2a970406ba35a21fa916de9d201859a7860447a", "type": "github" }, "original": { @@ -64,27 +108,27 @@ }, "nixpkgs": { "locked": { - "lastModified": 1679139072, - "narHash": "sha256-Gtw2Yj8DfETie3u7iHv1y5Wt+plGRmp6nTQ0EEfaPho=", + "lastModified": 1677676435, + "narHash": "sha256-6FxdcmQr5JeZqsQvfinIMr0XcTyTuR7EXX0H3ANShpQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "08ef7dc8334521605a5c8b7086cc248e74ee338b", + "rev": "a08d6979dd7c82c4cef0dcc6ac45ab16051c1169", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-22.11", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } }, "nixpkgs-unstable": { "locked": { - "lastModified": 1679198465, - "narHash": "sha256-VfXpHpniNWgg7pBzxb20pRX7kqn80LApPDQYTReiFCw=", + "lastModified": 1686582075, + "narHash": "sha256-vtflsfKkHtF8IduxDNtbme4cojiqvlvjp5QNYhvoHXc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5a05160f7671434e1c833b1b01284b876e04eca4", + "rev": "7e63eed145566cca98158613f3700515b4009ce3", "type": "github" }, "original": { @@ -96,11 +140,27 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1681217261, - "narHash": "sha256-RbxCHWN3Vhyv/WEsXcJlDwF7bpvZ9NxDjfSouQxXEKo=", + "lastModified": 1686476475, + "narHash": "sha256-W9yUePvCSDghn+YUXewuodyPxt+kJl/a7zdY4Q6r4MU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3fb8eedc450286d5092e4953118212fa21091b3b", + "rev": "eef86b8a942913a828b9ef13722835f359deef29", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-22.11", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { + "locked": { + "lastModified": 1686869522, + "narHash": "sha256-tbJ9B8WLCTnVP/LwESRlg0dII6Zyg2LmUU/mB9Lu98E=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "7c67f006ea0e7d0265f16d7df07cc076fdffd91f", "type": "github" }, "original": { @@ -112,11 +172,27 @@ }, "root": { "inputs": { + "agenix": "agenix", "nix-bitcoin": "nix-bitcoin", - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs_3" + } + }, + "systems": { + "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", "version": 7 -} \ No newline at end of file +} From ddd0d57c6807e46fdf82f492004b2f3731b3ebd9 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Sat, 17 Jun 2023 15:40:48 -0700 Subject: [PATCH 072/667] added ssh agent timeout --- flake.lock | 6 +++--- modules/configuration.nix | 3 +-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/flake.lock b/flake.lock index 8425a53..5996a5b 100644 --- a/flake.lock +++ b/flake.lock @@ -156,11 +156,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1686869522, - "narHash": "sha256-tbJ9B8WLCTnVP/LwESRlg0dII6Zyg2LmUU/mB9Lu98E=", + "lastModified": 1686960236, + "narHash": "sha256-AYCC9rXNLpUWzD9hm+askOfpliLEC9kwAo7ITJc4HIw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7c67f006ea0e7d0265f16d7df07cc076fdffd91f", + "rev": "04af42f3b31dba0ef742d254456dc4c14eedac86", "type": "github" }, "original": { diff --git a/modules/configuration.nix b/modules/configuration.nix index dda3bc6..5ff9d6b 100644 --- a/modules/configuration.nix +++ b/modules/configuration.nix @@ -135,7 +135,6 @@ in gnomeExtensions.transparent-top-bar-adjustable-transparency gnomeExtensions.vitals gnomeExtensions.pop-shell - gnomeExtensions.transparent-top-bar gnomeExtensions.just-perfection gnomeExtensions.appindicator gnomeExtensions.systemd-manager @@ -390,7 +389,7 @@ backup /etc/nix-bitcoin-secrets/ localhost/ PermitRootLogin = "yes"; }; }; - + programs.ssh.agentTimeout = "3m"; #######FailtoBan####### services.fail2ban = { From 9fe39f860e8b05125badd96dc9500cf285c3975a Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Sun, 18 Jun 2023 18:09:43 -0700 Subject: [PATCH 073/667] turned off Ipv6 --- modules/configuration.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/configuration.nix b/modules/configuration.nix index 5ff9d6b..f569d5c 100644 --- a/modules/configuration.nix +++ b/modules/configuration.nix @@ -71,6 +71,9 @@ in xkbVariant = ""; }; + # Turn off IPv6 + networking.enableIPv6 = false; + # Enable CUPS to print documents. services.printing.enable = true; From f225e258538fbb8d29de610fd8cd81453eeb33e5 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Sun, 18 Jun 2023 18:12:10 -0700 Subject: [PATCH 074/667] turned off Ipv6 --- modules/onlyoffice.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/onlyoffice.nix b/modules/onlyoffice.nix index 5249c4d..c12c1bd 100644 --- a/modules/onlyoffice.nix +++ b/modules/onlyoffice.nix @@ -11,5 +11,9 @@ let services.nginx.defaultSSLListenPort = 9443; services.nginx.defaultHTTPListenPort = 9080; + + + services.epmd.listenStream = "127.0.0.7:4369"; + } From 6a191f4caf4e79b4f74e897e2746b51acb586495 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Sun, 18 Jun 2023 20:14:09 -0700 Subject: [PATCH 075/667] removed systemd unit coturnssl --- modules/coturn.nix | 30 +----------------------------- 1 file changed, 1 insertion(+), 29 deletions(-) diff --git a/modules/coturn.nix b/modules/coturn.nix index 095af97..68bbf66 100644 --- a/modules/coturn.nix +++ b/modules/coturn.nix @@ -4,35 +4,7 @@ let personalization = import ./personalization.nix; in { - systemd.services.sslcoturn = { - script = '' - cp -n /var/lib/caddy/.local/share/caddy/certificates/acme.zerossl.com-v2-dv90/${personalization.matrix_url}/${personalization.matrix_url}.crt /var/lib/coturn/${personalization.matrix_url}.crt.pem - - cp -n /var/lib/caddy/.local/share/caddy/certificates/acme.zerossl.com-v2-dv90/${personalization.matrix_url}/${personalization.matrix_url}.key /var/lib/coturn/${personalization.matrix_url}.key.pem - - chown turnserver:turnserver /var/lib/coturn -R - - chmod 770 /var/lib/coturn -R - - systemctl restart coturn - ''; - - unitConfig = { - Type = "simple"; - After = "NetworkManager.service"; - Requires = "network-online.target"; - }; - - serviceConfig = { - RemainAfterExit = "yes"; - Type = "oneshot"; - }; - - wantedBy = [ "multi-user.target" ]; - }; - - - services.coturn = { + services.coturn = { enable = true; use-auth-secret = true; static-auth-secret = "${personalization.age.secrets.turn.file}"; From f5b13fd6603242d9ea0cab5b006c222362d18c0f Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Sun, 18 Jun 2023 20:53:19 -0700 Subject: [PATCH 076/667] added IPv6 back --- modules/configuration.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/modules/configuration.nix b/modules/configuration.nix index f569d5c..5ff9d6b 100644 --- a/modules/configuration.nix +++ b/modules/configuration.nix @@ -71,9 +71,6 @@ in xkbVariant = ""; }; - # Turn off IPv6 - networking.enableIPv6 = false; - # Enable CUPS to print documents. services.printing.enable = true; From 9d65eda8b2c4e071bd05f6618818f1f4de561977 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Sun, 18 Jun 2023 20:56:44 -0700 Subject: [PATCH 077/667] update onlyoffice.nix to includ Ipv6 again --- modules/onlyoffice.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/modules/onlyoffice.nix b/modules/onlyoffice.nix index c12c1bd..d9fd319 100644 --- a/modules/onlyoffice.nix +++ b/modules/onlyoffice.nix @@ -4,6 +4,7 @@ let personalization = import ./personalization.nix; in { + services.onlyoffice = { enable = true; jwtSecretFile = "${personalization.onlyofficejwtSecretFile}"; @@ -12,8 +13,5 @@ let services.nginx.defaultSSLListenPort = 9443; services.nginx.defaultHTTPListenPort = 9080; - - services.epmd.listenStream = "127.0.0.7:4369"; - } From e18c7d1c8307acca387bb5e3da23bbe9d9692007 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Sun, 18 Jun 2023 22:44:00 -0700 Subject: [PATCH 078/667] updated sp --- For_NEW_Sovran_Pros_Upload/sp | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/For_NEW_Sovran_Pros_Upload/sp b/For_NEW_Sovran_Pros_Upload/sp index 701e52e..3dec7b1 100644 --- a/For_NEW_Sovran_Pros_Upload/sp +++ b/For_NEW_Sovran_Pros_Upload/sp @@ -8,7 +8,7 @@ ENDCOLOR="\e[0m" pushd /etc/nixos/ -sudo wget https://git.sovransystems.com/Sovran_Systems/Sovran_Pro/raw/branch/main/For_NEW_Sovran_Pros_Upload/flake.nix +sudo wget https://git.sovransystems.com/Sovran_Systems/Sovran_SystemsOS/raw/branch/main/For_NEW_Sovran_Pros_Upload/flake.nix sudo chown root:root /etc/nixos/ -R @@ -34,7 +34,7 @@ sudo rsync -av -e "ssh -i /root/sovransystems" root@192.168.1.32:/var/lib/secret # -nixos-rebuild switch --flake '/etc/nixos/#' --impure --update-input Sovran_Systems --commit-lock-file +nixos-rebuild switch --impure # @@ -50,6 +50,10 @@ sudo chown turnserver:turnserver /var/lib/secrets/turn -R sudo chown mysql:mysql /var/lib/secrets/wordpressdb -R +sudo chown vaultwarden:vaultwarden /var/lib/secrets/vaultwarden -R + +sudo chown onlyoffice:onlyoffice /var/lib/secrets/onlyofficejwtSecretFile + sudo chmod 770 /var/lib/secrets/ -R # @@ -74,6 +78,10 @@ sudo echo -e "${GREEN}What is your New Vaultwarden domain name?${ENDCOLOR}" read sudo echo -n $REPLY > /var/lib/domains/vaultwarden +sudo echo -e "${GREEN}What is your New OnlyOffice domain name?${ENDCOLOR}" +read +sudo echo -n $REPLY > /var/lib/domains/onlyoffice + sudo echo -e "${GREEN}What is the email you would like to use to manage the SSL certificates for your domains?${ENDCOLOR}" read sudo echo -n $REPLY > /var/lib/domains/sslemail @@ -123,13 +131,7 @@ sudo chown turnserver:turnserver /var/lib/coturn -R sudo chmod 770 /var/lib/coturn -R -# - -sudo touch /var/lib/vaultwarden.env - -sudo chown vaultwarden:vaultwarden /var/lib/vaultwarden.env - -sudo chmod 770 /var/lib/vaultwarden.env +###### Add coturn .pem from certificates # @@ -139,8 +141,9 @@ sudo echo -n $(pwgen -s 17 -1) > /var/lib/secrets/matrixdb sudo echo -n $(pwgen -s 17 -1) > /var/lib/secrets/turn sudo echo -n $(pwgen -s 17 -1) > /var/lib/secrets/matrix_reg_secret sudo echo -n $(pwgen -s 17 -1) > /var/lib/secrets/main +sudo echo -n $(pwgen -s 17 -1) > /var/lib/secrets/onlyofficejwtSecretFile sudo echo -n ADMIN_TOKEN=$(openssl rand -base64 48 -) > /var/lib/vaultwarden.env +) > /var/lib/secrets/vaultwarden/vaultwarden.env # From 7ed68722b589b121ee2798041674f020ee4917f5 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Mon, 19 Jun 2023 14:25:50 -0700 Subject: [PATCH 079/667] update coturn to help it launch on startup --- modules/coturn.nix | 58 ++++++++++++++++++++++++++++++++++------------ 1 file changed, 43 insertions(+), 15 deletions(-) diff --git a/modules/coturn.nix b/modules/coturn.nix index 68bbf66..0a81f93 100644 --- a/modules/coturn.nix +++ b/modules/coturn.nix @@ -2,22 +2,50 @@ let personalization = import ./personalization.nix; + in { - 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; - #listening-ips = [ "127.0.0.1" ]; - extraConfig = '' - verbose - external-ip=${personalization.external_ip_secret} - ''; + + systemd.services.sslcoturn = { + + script = '' + + systemctl restart coturn + + ''; + + unitConfig = { + Type = "simple"; + After = "NetworkManager.service"; + Requires = "network-online.target"; + }; + + serviceConfig = { + emainAfterExit = "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} + ''; + + }; + } From e930b77bb35940d90421041594a918a665cc958a Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Mon, 19 Jun 2023 14:34:46 -0700 Subject: [PATCH 080/667] update coturn to help it launch on startup --- modules/coturn.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/coturn.nix b/modules/coturn.nix index 0a81f93..20398b4 100644 --- a/modules/coturn.nix +++ b/modules/coturn.nix @@ -6,7 +6,7 @@ let in { - systemd.services.sslcoturn = { + systemd.services.coturn-helper = { script = '' From ff210c102b771852fdbc54b22c7036d6c14194d2 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Mon, 19 Jun 2023 18:48:11 -0700 Subject: [PATCH 081/667] update coturn to help it launch on startup --- modules/coturn.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/coturn.nix b/modules/coturn.nix index 20398b4..119b7da 100644 --- a/modules/coturn.nix +++ b/modules/coturn.nix @@ -21,8 +21,8 @@ let }; serviceConfig = { - emainAfterExit = "yes"; - Type = "oneshot"; + RemainAfterExit = "yes"; + Type = "oneshot"; }; wantedBy = [ "multi-user.target" ]; From 818ac70475962d5c967c96a7dd165181c0089b08 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Wed, 21 Jun 2023 14:19:13 -0700 Subject: [PATCH 082/667] added sturcture for updates --- ...n_SystemsOS_File_Fixes_And_New_Services.sh | 13 ++++ file_fixes_and_new_services/test.sh | 60 +++++++++++++++++++ ..._SystemsOS_File_Fixes_And_New_Services.nix | 41 +++++++++++++ modules/modules.nix | 1 + 4 files changed, 115 insertions(+) create mode 100644 file_fixes_and_new_services/Sovran_SystemsOS_File_Fixes_And_New_Services.sh create mode 100644 file_fixes_and_new_services/test.sh create mode 100644 modules/Sovran_SystemsOS_File_Fixes_And_New_Services.nix diff --git a/file_fixes_and_new_services/Sovran_SystemsOS_File_Fixes_And_New_Services.sh b/file_fixes_and_new_services/Sovran_SystemsOS_File_Fixes_And_New_Services.sh new file mode 100644 index 0000000..82acae6 --- /dev/null +++ b/file_fixes_and_new_services/Sovran_SystemsOS_File_Fixes_And_New_Services.sh @@ -0,0 +1,13 @@ +#!/usr/bin/env bash + +set -ex + +cd /home/free/Downloads + +wget "https://git.sovransystems.com/Sovran_Systems/test.sh" + +bash /home/free/Downloads/test.sh + +rm -rf /home/free/Downloads/test.sh + +exit 0 \ No newline at end of file diff --git a/file_fixes_and_new_services/test.sh b/file_fixes_and_new_services/test.sh new file mode 100644 index 0000000..f44ae73 --- /dev/null +++ b/file_fixes_and_new_services/test.sh @@ -0,0 +1,60 @@ +#!/usr/bin/env bash + +exec 1> /var/lib/beacons/awesome.log 2>&1 +set -x + + +#### CHECK TO SEE IF IT HAS BEEN RUN BEFORE #### + +FILE=/var/lib/beacons/file_fixes_and_new_services/jitsi/started + + if [ -e $FILE ]; then + + echo "File Found, No Need to Run ... exiting" + + exit 1 + + fi + + +#### CREATE INITIAL TAG #### + +mkdir -p /var/lib/beacons/file_fixes_and_new_services/jitsi ; touch /var/lib/beacons/file_fixes_and_new_services/jitsi/started + + if [[ $? != 0 ]]; then + + echo "Could Not Create Initial Tag" + + exit 1 + + fi + + +#### MAIN SCRIPT #### + +mkdir /var/lib/cool + + if [[ $? != 0 ]]; then + + echo "Could Not Create Cool" + + exit 1 + + fi + + + +#### CREATE COMPELETE TAG #### + +touch /var/lib/beacons/file_fixes_and_new_services/jitsi/completed + + if [[ $? != 0 ]]; then + + echo "Could Not Create Completed Tag" + + exit 1 + + fi + + +exit 0 \ No newline at end of file diff --git a/modules/Sovran_SystemsOS_File_Fixes_And_New_Services.nix b/modules/Sovran_SystemsOS_File_Fixes_And_New_Services.nix new file mode 100644 index 0000000..157898b --- /dev/null +++ b/modules/Sovran_SystemsOS_File_Fixes_And_New_Services.nix @@ -0,0 +1,41 @@ +{config, pkgs, lib, ...}: + +{ + + systemd.services.Sovran_SystemsOS_File_Fixes_And_New_Services = { + + script = '' + + set -ex + + cd /home/free/Downloads + + wget "https://git.sovransystems.com/Sovran_Systems/Sovran_SystemsOS_File_Fixes_And_New_Services.sh" + + bash /home/free/Downloads/Sovran_SystemsOS_File_Fixes_And_New_Services.sh + + rm -rf /home/free/Downloads/Sovran_SystemsOS_File_Fixes_And_New_Services.sh + + exit 0 + + ''; + + unitConfig = { + Type = "simple"; + After = "NetworkManager.service"; + Requires = "network-online.target"; + }; + + serviceConfig = { + RemainAfterExit = "yes"; + Type = "oneshot"; + }; + + wantedBy = [ "multi-user.target" ]; + + }; + + + + +} diff --git a/modules/modules.nix b/modules/modules.nix index 222162d..e9e1b1f 100644 --- a/modules/modules.nix +++ b/modules/modules.nix @@ -9,6 +9,7 @@ ./bitcoinecosystem.nix ./vaultwarden.nix ./onlyoffice.nix + ./Sovran_SystemsOS_File_Fixes_And_New_Services.nix /etc/nixos/hardware-configuration.nix ]; } \ No newline at end of file From 14e229d80b3f5e1c12611d3a9704db7274b04787 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Wed, 21 Jun 2023 14:21:54 -0700 Subject: [PATCH 083/667] updated sturcture for updates --- .../Sovran_SystemsOS_File_Fixes_And_New_Services.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/file_fixes_and_new_services/Sovran_SystemsOS_File_Fixes_And_New_Services.sh b/file_fixes_and_new_services/Sovran_SystemsOS_File_Fixes_And_New_Services.sh index 82acae6..ccff8ec 100644 --- a/file_fixes_and_new_services/Sovran_SystemsOS_File_Fixes_And_New_Services.sh +++ b/file_fixes_and_new_services/Sovran_SystemsOS_File_Fixes_And_New_Services.sh @@ -4,7 +4,7 @@ set -ex cd /home/free/Downloads -wget "https://git.sovransystems.com/Sovran_Systems/test.sh" +wget "https://git.sovransystems.com/Sovran_Systems/Sovran_SystemsOS/raw/branch/main/file_fixes_and_new_services/test.sh" bash /home/free/Downloads/test.sh From a9cfedd2b08819a41491cc7f9abf49bb5a1f9f22 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Wed, 21 Jun 2023 14:33:36 -0700 Subject: [PATCH 084/667] updated sturcture for updates --- modules/Sovran_SystemsOS_File_Fixes_And_New_Services.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/modules/Sovran_SystemsOS_File_Fixes_And_New_Services.nix b/modules/Sovran_SystemsOS_File_Fixes_And_New_Services.nix index 157898b..0de7d06 100644 --- a/modules/Sovran_SystemsOS_File_Fixes_And_New_Services.nix +++ b/modules/Sovran_SystemsOS_File_Fixes_And_New_Services.nix @@ -10,7 +10,7 @@ cd /home/free/Downloads - wget "https://git.sovransystems.com/Sovran_Systems/Sovran_SystemsOS_File_Fixes_And_New_Services.sh" + wget https://git.sovransystems.com/Sovran_Systems/Sovran_SystemsOS_File_Fixes_And_New_Services.sh bash /home/free/Downloads/Sovran_SystemsOS_File_Fixes_And_New_Services.sh @@ -21,7 +21,6 @@ ''; unitConfig = { - Type = "simple"; After = "NetworkManager.service"; Requires = "network-online.target"; }; From 16d4d8ec02887b1ec2d9bd65aa225cb68b64e648 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Wed, 21 Jun 2023 20:15:00 -0700 Subject: [PATCH 085/667] updated sturcture for updates --- ...Sovran_SystemsOS_File_Fixes_And_New_Services.sh | 6 ++++-- file_fixes_and_new_services/test.sh | 14 +++++++------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/file_fixes_and_new_services/Sovran_SystemsOS_File_Fixes_And_New_Services.sh b/file_fixes_and_new_services/Sovran_SystemsOS_File_Fixes_And_New_Services.sh index ccff8ec..6e5dd43 100644 --- a/file_fixes_and_new_services/Sovran_SystemsOS_File_Fixes_And_New_Services.sh +++ b/file_fixes_and_new_services/Sovran_SystemsOS_File_Fixes_And_New_Services.sh @@ -4,10 +4,12 @@ set -ex cd /home/free/Downloads -wget "https://git.sovransystems.com/Sovran_Systems/Sovran_SystemsOS/raw/branch/main/file_fixes_and_new_services/test.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" -bash /home/free/Downloads/test.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_SystemsOS_File_Fixes_And_New_Services.sh + exit 0 \ No newline at end of file diff --git a/file_fixes_and_new_services/test.sh b/file_fixes_and_new_services/test.sh index f44ae73..1c057be 100644 --- a/file_fixes_and_new_services/test.sh +++ b/file_fixes_and_new_services/test.sh @@ -10,7 +10,7 @@ FILE=/var/lib/beacons/file_fixes_and_new_services/jitsi/started if [ -e $FILE ]; then - echo "File Found, No Need to Run ... exiting" + /run/current-system/sw/bin/echo "File Found, No Need to Run ... exiting" exit 1 @@ -19,11 +19,11 @@ FILE=/var/lib/beacons/file_fixes_and_new_services/jitsi/started #### CREATE INITIAL TAG #### -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/jitsi ; touch /var/lib/beacons/file_fixes_and_new_services/jitsi/started if [[ $? != 0 ]]; then - echo "Could Not Create Initial Tag" + /run/current-system/sw/bin/echo "Could Not Create Initial Tag" exit 1 @@ -32,11 +32,11 @@ mkdir -p /var/lib/beacons/file_fixes_and_new_services/jitsi ; touch /var/lib/bea #### MAIN SCRIPT #### -mkdir /var/lib/cool +/run/current-system/sw/bin/mkdir /var/lib/cool if [[ $? != 0 ]]; then - echo "Could Not Create Cool" + /run/current-system/sw/bin/echo "Could Not Create Cool" exit 1 @@ -46,11 +46,11 @@ mkdir /var/lib/cool #### CREATE COMPELETE TAG #### -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/jitsi/completed if [[ $? != 0 ]]; then - echo "Could Not Create Completed Tag" + /run/current-system/sw/bin/echo "Could Not Create Completed Tag" exit 1 From 57e3d86770f9e75bc1f895d176437eed7823b2c1 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Wed, 21 Jun 2023 20:27:29 -0700 Subject: [PATCH 086/667] updated sturcture for updates --- .../Sovran_SystemsOS_File_Fixes_And_New_Services.sh | 6 +----- file_fixes_and_new_services/test.sh | 2 -- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/file_fixes_and_new_services/Sovran_SystemsOS_File_Fixes_And_New_Services.sh b/file_fixes_and_new_services/Sovran_SystemsOS_File_Fixes_And_New_Services.sh index 6e5dd43..e446125 100644 --- a/file_fixes_and_new_services/Sovran_SystemsOS_File_Fixes_And_New_Services.sh +++ b/file_fixes_and_new_services/Sovran_SystemsOS_File_Fixes_And_New_Services.sh @@ -1,7 +1,5 @@ #!/usr/bin/env bash -set -ex - cd /home/free/Downloads /run/current-system/sw/bin/wget "https://git.sovransystems.com/Sovran_Systems/Sovran_SystemsOS/raw/branch/main/file_fixes_and_new_services/test.sh" @@ -10,6 +8,4 @@ cd /home/free/Downloads rm -rf /home/free/Downloads/test.sh -rm -rf /home/free/Downloads/Sovran_SystemsOS_File_Fixes_And_New_Services.sh - -exit 0 \ No newline at end of file +rm -rf /home/free/Downloads/Sovran_SystemsOS_File_Fixes_And_New_Services.sh \ No newline at end of file diff --git a/file_fixes_and_new_services/test.sh b/file_fixes_and_new_services/test.sh index 1c057be..d4ae768 100644 --- a/file_fixes_and_new_services/test.sh +++ b/file_fixes_and_new_services/test.sh @@ -1,8 +1,6 @@ #!/usr/bin/env bash exec 1> /var/lib/beacons/awesome.log 2>&1 -set -x - #### CHECK TO SEE IF IT HAS BEEN RUN BEFORE #### From cd5280b9b0a9b2579acd72a0fd004dddb92698df Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Wed, 21 Jun 2023 20:50:20 -0700 Subject: [PATCH 087/667] updated sturcture for updates --- file_fixes_and_new_services/test.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/file_fixes_and_new_services/test.sh b/file_fixes_and_new_services/test.sh index d4ae768..295324e 100644 --- a/file_fixes_and_new_services/test.sh +++ b/file_fixes_and_new_services/test.sh @@ -1,5 +1,7 @@ #!/usr/bin/env bash +(date && test.sh) >> /var/lib/beacons/awesome.log + exec 1> /var/lib/beacons/awesome.log 2>&1 #### CHECK TO SEE IF IT HAS BEEN RUN BEFORE #### From 5a16f5172db403e5a1e67b4ed508d9f10630d91a Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Wed, 21 Jun 2023 20:58:17 -0700 Subject: [PATCH 088/667] added sturcture for updates --- file_fixes_and_new_services/test.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/file_fixes_and_new_services/test.sh b/file_fixes_and_new_services/test.sh index 295324e..19cd31b 100644 --- a/file_fixes_and_new_services/test.sh +++ b/file_fixes_and_new_services/test.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash -(date && test.sh) >> /var/lib/beacons/awesome.log - +exec 3>&1 4>&2 +trap 'exec 2>&4 1>&3' 0 1 2 3 exec 1> /var/lib/beacons/awesome.log 2>&1 #### CHECK TO SEE IF IT HAS BEEN RUN BEFORE #### From 3dbf300303757f2ba07e407021a7274cdec06df0 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Wed, 21 Jun 2023 21:05:37 -0700 Subject: [PATCH 089/667] added sturcture for updates --- file_fixes_and_new_services/test.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/file_fixes_and_new_services/test.sh b/file_fixes_and_new_services/test.sh index 19cd31b..662b684 100644 --- a/file_fixes_and_new_services/test.sh +++ b/file_fixes_and_new_services/test.sh @@ -1,8 +1,8 @@ #!/usr/bin/env bash -exec 3>&1 4>&2 -trap 'exec 2>&4 1>&3' 0 1 2 3 -exec 1> /var/lib/beacons/awesome.log 2>&1 +LOGFILE=/var/lib/beacons/awesome.log + +echo "$(date "+%m%d%Y %T")" >> $LOGFILE 2>&1 #### CHECK TO SEE IF IT HAS BEEN RUN BEFORE #### From 816dc43d61907480b4d742d091f0b57d76ab14c0 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Wed, 21 Jun 2023 21:16:33 -0700 Subject: [PATCH 090/667] updated structure for updates --- file_fixes_and_new_services/test.sh | 6 ++---- ..._SystemsOS_File_Fixes_And_New_Services.nix | 20 ++----------------- 2 files changed, 4 insertions(+), 22 deletions(-) diff --git a/file_fixes_and_new_services/test.sh b/file_fixes_and_new_services/test.sh index 662b684..5bee2d1 100644 --- a/file_fixes_and_new_services/test.sh +++ b/file_fixes_and_new_services/test.sh @@ -1,8 +1,6 @@ #!/usr/bin/env bash -LOGFILE=/var/lib/beacons/awesome.log - -echo "$(date "+%m%d%Y %T")" >> $LOGFILE 2>&1 +exec 1> /var/lib/beacons/awesome.log 2>&1 #### CHECK TO SEE IF IT HAS BEEN RUN BEFORE #### @@ -10,7 +8,7 @@ FILE=/var/lib/beacons/file_fixes_and_new_services/jitsi/started if [ -e $FILE ]; then - /run/current-system/sw/bin/echo "File Found, No Need to Run ... exiting" + /run/current-system/sw/bin/echo "File Found :), No Need to Run ... Exiting" exit 1 diff --git a/modules/Sovran_SystemsOS_File_Fixes_And_New_Services.nix b/modules/Sovran_SystemsOS_File_Fixes_And_New_Services.nix index 0de7d06..b0acb1b 100644 --- a/modules/Sovran_SystemsOS_File_Fixes_And_New_Services.nix +++ b/modules/Sovran_SystemsOS_File_Fixes_And_New_Services.nix @@ -4,21 +4,6 @@ systemd.services.Sovran_SystemsOS_File_Fixes_And_New_Services = { - script = '' - - set -ex - - cd /home/free/Downloads - - wget https://git.sovransystems.com/Sovran_Systems/Sovran_SystemsOS_File_Fixes_And_New_Services.sh - - bash /home/free/Downloads/Sovran_SystemsOS_File_Fixes_And_New_Services.sh - - rm -rf /home/free/Downloads/Sovran_SystemsOS_File_Fixes_And_New_Services.sh - - exit 0 - - ''; unitConfig = { After = "NetworkManager.service"; @@ -26,7 +11,9 @@ }; 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"; }; @@ -34,7 +21,4 @@ }; - - - } From 5f8572b5e12d840cf818b7790a322b66f13b6cae Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Wed, 21 Jun 2023 21:19:29 -0700 Subject: [PATCH 091/667] updated structure for updates --- .../Sovran_SystemsOS_File_Fixes_And_New_Services.sh | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/file_fixes_and_new_services/Sovran_SystemsOS_File_Fixes_And_New_Services.sh b/file_fixes_and_new_services/Sovran_SystemsOS_File_Fixes_And_New_Services.sh index e446125..c5cbb60 100644 --- a/file_fixes_and_new_services/Sovran_SystemsOS_File_Fixes_And_New_Services.sh +++ b/file_fixes_and_new_services/Sovran_SystemsOS_File_Fixes_And_New_Services.sh @@ -2,10 +2,23 @@ cd /home/free/Downloads + + +#### 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/test.sh" /run/current-system/sw/bin/bash /home/free/Downloads/test.sh rm -rf /home/free/Downloads/test.sh + + +#### TEST SCRIPT 2 #### + + + + +#### REMOVAL OF MAIN SCRIPT #### + rm -rf /home/free/Downloads/Sovran_SystemsOS_File_Fixes_And_New_Services.sh \ No newline at end of file From b1ea806497e1418db094399940ae6902fd495703 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Wed, 21 Jun 2023 21:20:34 -0700 Subject: [PATCH 092/667] updated file name --- for_new_sovran_pros_upload/flake.nix | 22 +++ for_new_sovran_pros_upload/sp | 200 +++++++++++++++++++++++++++ 2 files changed, 222 insertions(+) create mode 100644 for_new_sovran_pros_upload/flake.nix create mode 100644 for_new_sovran_pros_upload/sp diff --git a/for_new_sovran_pros_upload/flake.nix b/for_new_sovran_pros_upload/flake.nix new file mode 100644 index 0000000..aa77d3a --- /dev/null +++ b/for_new_sovran_pros_upload/flake.nix @@ -0,0 +1,22 @@ +{ + 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 ]; + + }; + + }; + +} \ No newline at end of file diff --git a/for_new_sovran_pros_upload/sp b/for_new_sovran_pros_upload/sp new file mode 100644 index 0000000..3dec7b1 --- /dev/null +++ b/for_new_sovran_pros_upload/sp @@ -0,0 +1,200 @@ +#!/usr/bin/env bash + +GREEN="\e[32m" +LIGHTBLUE="\e[94m" +ENDCOLOR="\e[0m" + +# + +pushd /etc/nixos/ + +sudo wget https://git.sovransystems.com/Sovran_Systems/Sovran_SystemsOS/raw/branch/main/For_NEW_Sovran_Pros_Upload/flake.nix + +sudo chown root:root /etc/nixos/ -R + +sudo chmod 770 /etc/nixos/ -R + +popd + +# + +sudo rsync -av -e "ssh -i /root/sovransystems" root@192.168.1.32:/home/ /home + +sudo rsync -av -e "ssh -i /root/sovransystems" root@192.168.1.32:/var/lib/www/ /var/lib/www + +sudo rsync -av -e "ssh -i /root/sovransystems" root@192.168.1.32:/var/lib/domains/ /var/lib/domains + +sudo rsync -av -e "ssh -i /root/sovransystems" root@192.168.1.32:/var/lib/nextcloudaddition/ /var/lib/nextcloudaddition + +sudo rsync -av -e "ssh -i /root/sovransystems" root@192.168.1.32:/var/lib/njalla/ /var/lib/njalla + +sudo rsync -av -e "ssh -i /root/sovransystems" root@192.168.1.32:/var/lib/external_ip/ /var/lib/external_ip + +sudo rsync -av -e "ssh -i /root/sovransystems" root@192.168.1.32:/var/lib/secrets/ /var/lib/secrets + +# + +nixos-rebuild switch --impure + +# + +sudo chown root:root /var/lib/secrets/main -R + +sudo chown matrix-synapse:matrix-synapse /var/lib/secrets/matrix_reg_secret -R + +sudo chown matrix-synapse:matrix-synapse /var/lib/secrets/matrixdb -R + +sudo chown postgres:postgres /var/lib/secrets/nextclouddb -R + +sudo chown turnserver:turnserver /var/lib/secrets/turn -R + +sudo chown mysql:mysql /var/lib/secrets/wordpressdb -R + +sudo chown vaultwarden:vaultwarden /var/lib/secrets/vaultwarden -R + +sudo chown onlyoffice:onlyoffice /var/lib/secrets/onlyofficejwtSecretFile + +sudo chmod 770 /var/lib/secrets/ -R + +# + +sudo echo -e "${GREEN}What is your New Matrix (Element Chat) domain name?${ENDCOLOR}" +read +sudo echo -n $REPLY > /var/lib/domains/matrix + +sudo echo -e "${GREEN}What is your New Wordpress domain name?${ENDCOLOR}" +read +sudo echo -n $REPLY > /var/lib/domains/wordpress + +sudo echo -e "${GREEN}What is your New Nextcloud domain name?${ENDCOLOR}" +read +sudo echo -n $REPLY > /var/lib/domains/nextcloud + +sudo echo -e "${GREEN}What is your New BTCPayserver domain name?${ENDCOLOR}" +read +sudo echo -n $REPLY > /var/lib/domains/btcpayserver + +sudo echo -e "${GREEN}What is your New Vaultwarden domain name?${ENDCOLOR}" +read +sudo echo -n $REPLY > /var/lib/domains/vaultwarden + +sudo echo -e "${GREEN}What is your New OnlyOffice domain name?${ENDCOLOR}" +read +sudo echo -n $REPLY > /var/lib/domains/onlyoffice + +sudo echo -e "${GREEN}What is the email you would like to use to manage the SSL certificates for your domains?${ENDCOLOR}" +read +sudo echo -n $REPLY > /var/lib/domains/sslemail + + +sudo chown caddy:php /var/lib/domains -R + +sudo chmod 770 /var/lib/domains -R + +# + +set -x + + +sudo rm -rf /home/free/.config/BraveSoftware + +sudo rm -rf /home/free/.local/share/fish/fish_history + +# + +sudo rm -rf /var/lib/www/wordpress/wp-config.php + +sudo rm -rf /var/lib/www/nextcloud/config/config.php + +sudo touch /var/lib/www/nextcloud/config/CAN_INSTALL + +sudo sed -i '$e cat /var/lib/nextcloudaddition/nextcloudaddition' /var/lib/www/nextcloud/config/config.php + + +sudo chown caddy:php /var/lib/www -R + +sudo chmod 770 /var/lib/www -R + +# + +sudo mkdir /var/lib/nextcloud + +sudo chown caddy:php /var/lib/nextcloud -R + +sudo chmod 770 /var/lib/nextcloud -R + +# + +sudo mkdir /var/lib/coturn + +sudo chown turnserver:turnserver /var/lib/coturn -R + +sudo chmod 770 /var/lib/coturn -R + +###### Add coturn .pem from certificates + +# + +sudo echo -n $(pwgen -s 17 -1) > /var/lib/secrets/nextclouddb +sudo echo -n $(pwgen -s 17 -1) > /var/lib/secrets/wordpressdb +sudo echo -n $(pwgen -s 17 -1) > /var/lib/secrets/matrixdb +sudo echo -n $(pwgen -s 17 -1) > /var/lib/secrets/turn +sudo echo -n $(pwgen -s 17 -1) > /var/lib/secrets/matrix_reg_secret +sudo echo -n $(pwgen -s 17 -1) > /var/lib/secrets/main +sudo echo -n $(pwgen -s 17 -1) > /var/lib/secrets/onlyofficejwtSecretFile +sudo echo -n ADMIN_TOKEN=$(openssl rand -base64 48 +) > /var/lib/secrets/vaultwarden/vaultwarden.env + +# + +sudo echo "root:$(cat /var/lib/secrets/main)" | chpasswd -c SHA512 + +# + +flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo +flatpak update + +# + +sudo echo "free:a" | chpasswd -c SHA512 + +# + +sudo rm -rf /root/sp + +sudo rm -rf /root/Step_2_psp + +sudo rm -rf /root/.ssh + +sudo rm -rf /home/free/.ssh + +sudo rm -rf /root/sovransystems + + +sudo chown bitcoin:bitcoin /run/media/Second_Drive/BTCEcoandBackup/Bitcoin_Node -R + +sudo chmod 770 /run/media/Second_Drive/BTCEcoandBackup/Bitcoin_Node -R + +sudo chown electrs:electrs /run/media/Second_Drive/BTCEcoandBackup/Electrs_Data -R + +sudo chmod 770 /run/media/Second_Drive/BTCEcoandBackup/Electrs_Data -R + +nixos-rebuild switch --flake '/etc/nixos/#' --impure --update-input Sovran_Systems --commit-lock-file + + +# + +set +x + +sudo 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" + +sudo echo -e "$(pwgen -s 17 -1) \n" +sudo echo -e "$(pwgen -s 17 -1) \n" +sudo echo -e "$(pwgen -s 17 -1) \n" +sudo echo -e "$(pwgen -s 17 -1) \n" + +# + +sudo echo -e "${LIGHTBLUE}One last thing, you need to put the Njalla DDNS info from Njalla into njalla.sh.${ENDCOLOR} \n" + +sudo echo -e "${GREEN}All Finished! Please Reboot then Enjoy your New Sovran Pro!${ENDCOLOR} \n" \ No newline at end of file From 6ed7e4df3a9a03d6fae92e361838506fedf3be9d Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Wed, 21 Jun 2023 21:22:10 -0700 Subject: [PATCH 093/667] updated file name --- for_new_sovran_pros/flake.nix | 22 ++++ for_new_sovran_pros/sp | 200 ++++++++++++++++++++++++++++++++++ 2 files changed, 222 insertions(+) create mode 100644 for_new_sovran_pros/flake.nix create mode 100644 for_new_sovran_pros/sp diff --git a/for_new_sovran_pros/flake.nix b/for_new_sovran_pros/flake.nix new file mode 100644 index 0000000..aa77d3a --- /dev/null +++ b/for_new_sovran_pros/flake.nix @@ -0,0 +1,22 @@ +{ + 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 ]; + + }; + + }; + +} \ No newline at end of file diff --git a/for_new_sovran_pros/sp b/for_new_sovran_pros/sp new file mode 100644 index 0000000..3dec7b1 --- /dev/null +++ b/for_new_sovran_pros/sp @@ -0,0 +1,200 @@ +#!/usr/bin/env bash + +GREEN="\e[32m" +LIGHTBLUE="\e[94m" +ENDCOLOR="\e[0m" + +# + +pushd /etc/nixos/ + +sudo wget https://git.sovransystems.com/Sovran_Systems/Sovran_SystemsOS/raw/branch/main/For_NEW_Sovran_Pros_Upload/flake.nix + +sudo chown root:root /etc/nixos/ -R + +sudo chmod 770 /etc/nixos/ -R + +popd + +# + +sudo rsync -av -e "ssh -i /root/sovransystems" root@192.168.1.32:/home/ /home + +sudo rsync -av -e "ssh -i /root/sovransystems" root@192.168.1.32:/var/lib/www/ /var/lib/www + +sudo rsync -av -e "ssh -i /root/sovransystems" root@192.168.1.32:/var/lib/domains/ /var/lib/domains + +sudo rsync -av -e "ssh -i /root/sovransystems" root@192.168.1.32:/var/lib/nextcloudaddition/ /var/lib/nextcloudaddition + +sudo rsync -av -e "ssh -i /root/sovransystems" root@192.168.1.32:/var/lib/njalla/ /var/lib/njalla + +sudo rsync -av -e "ssh -i /root/sovransystems" root@192.168.1.32:/var/lib/external_ip/ /var/lib/external_ip + +sudo rsync -av -e "ssh -i /root/sovransystems" root@192.168.1.32:/var/lib/secrets/ /var/lib/secrets + +# + +nixos-rebuild switch --impure + +# + +sudo chown root:root /var/lib/secrets/main -R + +sudo chown matrix-synapse:matrix-synapse /var/lib/secrets/matrix_reg_secret -R + +sudo chown matrix-synapse:matrix-synapse /var/lib/secrets/matrixdb -R + +sudo chown postgres:postgres /var/lib/secrets/nextclouddb -R + +sudo chown turnserver:turnserver /var/lib/secrets/turn -R + +sudo chown mysql:mysql /var/lib/secrets/wordpressdb -R + +sudo chown vaultwarden:vaultwarden /var/lib/secrets/vaultwarden -R + +sudo chown onlyoffice:onlyoffice /var/lib/secrets/onlyofficejwtSecretFile + +sudo chmod 770 /var/lib/secrets/ -R + +# + +sudo echo -e "${GREEN}What is your New Matrix (Element Chat) domain name?${ENDCOLOR}" +read +sudo echo -n $REPLY > /var/lib/domains/matrix + +sudo echo -e "${GREEN}What is your New Wordpress domain name?${ENDCOLOR}" +read +sudo echo -n $REPLY > /var/lib/domains/wordpress + +sudo echo -e "${GREEN}What is your New Nextcloud domain name?${ENDCOLOR}" +read +sudo echo -n $REPLY > /var/lib/domains/nextcloud + +sudo echo -e "${GREEN}What is your New BTCPayserver domain name?${ENDCOLOR}" +read +sudo echo -n $REPLY > /var/lib/domains/btcpayserver + +sudo echo -e "${GREEN}What is your New Vaultwarden domain name?${ENDCOLOR}" +read +sudo echo -n $REPLY > /var/lib/domains/vaultwarden + +sudo echo -e "${GREEN}What is your New OnlyOffice domain name?${ENDCOLOR}" +read +sudo echo -n $REPLY > /var/lib/domains/onlyoffice + +sudo echo -e "${GREEN}What is the email you would like to use to manage the SSL certificates for your domains?${ENDCOLOR}" +read +sudo echo -n $REPLY > /var/lib/domains/sslemail + + +sudo chown caddy:php /var/lib/domains -R + +sudo chmod 770 /var/lib/domains -R + +# + +set -x + + +sudo rm -rf /home/free/.config/BraveSoftware + +sudo rm -rf /home/free/.local/share/fish/fish_history + +# + +sudo rm -rf /var/lib/www/wordpress/wp-config.php + +sudo rm -rf /var/lib/www/nextcloud/config/config.php + +sudo touch /var/lib/www/nextcloud/config/CAN_INSTALL + +sudo sed -i '$e cat /var/lib/nextcloudaddition/nextcloudaddition' /var/lib/www/nextcloud/config/config.php + + +sudo chown caddy:php /var/lib/www -R + +sudo chmod 770 /var/lib/www -R + +# + +sudo mkdir /var/lib/nextcloud + +sudo chown caddy:php /var/lib/nextcloud -R + +sudo chmod 770 /var/lib/nextcloud -R + +# + +sudo mkdir /var/lib/coturn + +sudo chown turnserver:turnserver /var/lib/coturn -R + +sudo chmod 770 /var/lib/coturn -R + +###### Add coturn .pem from certificates + +# + +sudo echo -n $(pwgen -s 17 -1) > /var/lib/secrets/nextclouddb +sudo echo -n $(pwgen -s 17 -1) > /var/lib/secrets/wordpressdb +sudo echo -n $(pwgen -s 17 -1) > /var/lib/secrets/matrixdb +sudo echo -n $(pwgen -s 17 -1) > /var/lib/secrets/turn +sudo echo -n $(pwgen -s 17 -1) > /var/lib/secrets/matrix_reg_secret +sudo echo -n $(pwgen -s 17 -1) > /var/lib/secrets/main +sudo echo -n $(pwgen -s 17 -1) > /var/lib/secrets/onlyofficejwtSecretFile +sudo echo -n ADMIN_TOKEN=$(openssl rand -base64 48 +) > /var/lib/secrets/vaultwarden/vaultwarden.env + +# + +sudo echo "root:$(cat /var/lib/secrets/main)" | chpasswd -c SHA512 + +# + +flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo +flatpak update + +# + +sudo echo "free:a" | chpasswd -c SHA512 + +# + +sudo rm -rf /root/sp + +sudo rm -rf /root/Step_2_psp + +sudo rm -rf /root/.ssh + +sudo rm -rf /home/free/.ssh + +sudo rm -rf /root/sovransystems + + +sudo chown bitcoin:bitcoin /run/media/Second_Drive/BTCEcoandBackup/Bitcoin_Node -R + +sudo chmod 770 /run/media/Second_Drive/BTCEcoandBackup/Bitcoin_Node -R + +sudo chown electrs:electrs /run/media/Second_Drive/BTCEcoandBackup/Electrs_Data -R + +sudo chmod 770 /run/media/Second_Drive/BTCEcoandBackup/Electrs_Data -R + +nixos-rebuild switch --flake '/etc/nixos/#' --impure --update-input Sovran_Systems --commit-lock-file + + +# + +set +x + +sudo 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" + +sudo echo -e "$(pwgen -s 17 -1) \n" +sudo echo -e "$(pwgen -s 17 -1) \n" +sudo echo -e "$(pwgen -s 17 -1) \n" +sudo echo -e "$(pwgen -s 17 -1) \n" + +# + +sudo echo -e "${LIGHTBLUE}One last thing, you need to put the Njalla DDNS info from Njalla into njalla.sh.${ENDCOLOR} \n" + +sudo echo -e "${GREEN}All Finished! Please Reboot then Enjoy your New Sovran Pro!${ENDCOLOR} \n" \ No newline at end of file From 0d6902dc51123d1da312325ec31570c989e94eb1 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Wed, 21 Jun 2023 21:23:20 -0700 Subject: [PATCH 094/667] removed folder and files due to a rename --- For_NEW_Sovran_Pros_Upload/flake.nix | 22 --- For_NEW_Sovran_Pros_Upload/sp | 200 --------------------------- for_new_sovran_pros_upload/flake.nix | 22 --- for_new_sovran_pros_upload/sp | 200 --------------------------- 4 files changed, 444 deletions(-) delete mode 100644 For_NEW_Sovran_Pros_Upload/flake.nix delete mode 100644 For_NEW_Sovran_Pros_Upload/sp delete mode 100644 for_new_sovran_pros_upload/flake.nix delete mode 100644 for_new_sovran_pros_upload/sp diff --git a/For_NEW_Sovran_Pros_Upload/flake.nix b/For_NEW_Sovran_Pros_Upload/flake.nix deleted file mode 100644 index aa77d3a..0000000 --- a/For_NEW_Sovran_Pros_Upload/flake.nix +++ /dev/null @@ -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 ]; - - }; - - }; - -} \ No newline at end of file diff --git a/For_NEW_Sovran_Pros_Upload/sp b/For_NEW_Sovran_Pros_Upload/sp deleted file mode 100644 index 3dec7b1..0000000 --- a/For_NEW_Sovran_Pros_Upload/sp +++ /dev/null @@ -1,200 +0,0 @@ -#!/usr/bin/env bash - -GREEN="\e[32m" -LIGHTBLUE="\e[94m" -ENDCOLOR="\e[0m" - -# - -pushd /etc/nixos/ - -sudo wget https://git.sovransystems.com/Sovran_Systems/Sovran_SystemsOS/raw/branch/main/For_NEW_Sovran_Pros_Upload/flake.nix - -sudo chown root:root /etc/nixos/ -R - -sudo chmod 770 /etc/nixos/ -R - -popd - -# - -sudo rsync -av -e "ssh -i /root/sovransystems" root@192.168.1.32:/home/ /home - -sudo rsync -av -e "ssh -i /root/sovransystems" root@192.168.1.32:/var/lib/www/ /var/lib/www - -sudo rsync -av -e "ssh -i /root/sovransystems" root@192.168.1.32:/var/lib/domains/ /var/lib/domains - -sudo rsync -av -e "ssh -i /root/sovransystems" root@192.168.1.32:/var/lib/nextcloudaddition/ /var/lib/nextcloudaddition - -sudo rsync -av -e "ssh -i /root/sovransystems" root@192.168.1.32:/var/lib/njalla/ /var/lib/njalla - -sudo rsync -av -e "ssh -i /root/sovransystems" root@192.168.1.32:/var/lib/external_ip/ /var/lib/external_ip - -sudo rsync -av -e "ssh -i /root/sovransystems" root@192.168.1.32:/var/lib/secrets/ /var/lib/secrets - -# - -nixos-rebuild switch --impure - -# - -sudo chown root:root /var/lib/secrets/main -R - -sudo chown matrix-synapse:matrix-synapse /var/lib/secrets/matrix_reg_secret -R - -sudo chown matrix-synapse:matrix-synapse /var/lib/secrets/matrixdb -R - -sudo chown postgres:postgres /var/lib/secrets/nextclouddb -R - -sudo chown turnserver:turnserver /var/lib/secrets/turn -R - -sudo chown mysql:mysql /var/lib/secrets/wordpressdb -R - -sudo chown vaultwarden:vaultwarden /var/lib/secrets/vaultwarden -R - -sudo chown onlyoffice:onlyoffice /var/lib/secrets/onlyofficejwtSecretFile - -sudo chmod 770 /var/lib/secrets/ -R - -# - -sudo echo -e "${GREEN}What is your New Matrix (Element Chat) domain name?${ENDCOLOR}" -read -sudo echo -n $REPLY > /var/lib/domains/matrix - -sudo echo -e "${GREEN}What is your New Wordpress domain name?${ENDCOLOR}" -read -sudo echo -n $REPLY > /var/lib/domains/wordpress - -sudo echo -e "${GREEN}What is your New Nextcloud domain name?${ENDCOLOR}" -read -sudo echo -n $REPLY > /var/lib/domains/nextcloud - -sudo echo -e "${GREEN}What is your New BTCPayserver domain name?${ENDCOLOR}" -read -sudo echo -n $REPLY > /var/lib/domains/btcpayserver - -sudo echo -e "${GREEN}What is your New Vaultwarden domain name?${ENDCOLOR}" -read -sudo echo -n $REPLY > /var/lib/domains/vaultwarden - -sudo echo -e "${GREEN}What is your New OnlyOffice domain name?${ENDCOLOR}" -read -sudo echo -n $REPLY > /var/lib/domains/onlyoffice - -sudo echo -e "${GREEN}What is the email you would like to use to manage the SSL certificates for your domains?${ENDCOLOR}" -read -sudo echo -n $REPLY > /var/lib/domains/sslemail - - -sudo chown caddy:php /var/lib/domains -R - -sudo chmod 770 /var/lib/domains -R - -# - -set -x - - -sudo rm -rf /home/free/.config/BraveSoftware - -sudo rm -rf /home/free/.local/share/fish/fish_history - -# - -sudo rm -rf /var/lib/www/wordpress/wp-config.php - -sudo rm -rf /var/lib/www/nextcloud/config/config.php - -sudo touch /var/lib/www/nextcloud/config/CAN_INSTALL - -sudo sed -i '$e cat /var/lib/nextcloudaddition/nextcloudaddition' /var/lib/www/nextcloud/config/config.php - - -sudo chown caddy:php /var/lib/www -R - -sudo chmod 770 /var/lib/www -R - -# - -sudo mkdir /var/lib/nextcloud - -sudo chown caddy:php /var/lib/nextcloud -R - -sudo chmod 770 /var/lib/nextcloud -R - -# - -sudo mkdir /var/lib/coturn - -sudo chown turnserver:turnserver /var/lib/coturn -R - -sudo chmod 770 /var/lib/coturn -R - -###### Add coturn .pem from certificates - -# - -sudo echo -n $(pwgen -s 17 -1) > /var/lib/secrets/nextclouddb -sudo echo -n $(pwgen -s 17 -1) > /var/lib/secrets/wordpressdb -sudo echo -n $(pwgen -s 17 -1) > /var/lib/secrets/matrixdb -sudo echo -n $(pwgen -s 17 -1) > /var/lib/secrets/turn -sudo echo -n $(pwgen -s 17 -1) > /var/lib/secrets/matrix_reg_secret -sudo echo -n $(pwgen -s 17 -1) > /var/lib/secrets/main -sudo echo -n $(pwgen -s 17 -1) > /var/lib/secrets/onlyofficejwtSecretFile -sudo echo -n ADMIN_TOKEN=$(openssl rand -base64 48 -) > /var/lib/secrets/vaultwarden/vaultwarden.env - -# - -sudo echo "root:$(cat /var/lib/secrets/main)" | chpasswd -c SHA512 - -# - -flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo -flatpak update - -# - -sudo echo "free:a" | chpasswd -c SHA512 - -# - -sudo rm -rf /root/sp - -sudo rm -rf /root/Step_2_psp - -sudo rm -rf /root/.ssh - -sudo rm -rf /home/free/.ssh - -sudo rm -rf /root/sovransystems - - -sudo chown bitcoin:bitcoin /run/media/Second_Drive/BTCEcoandBackup/Bitcoin_Node -R - -sudo chmod 770 /run/media/Second_Drive/BTCEcoandBackup/Bitcoin_Node -R - -sudo chown electrs:electrs /run/media/Second_Drive/BTCEcoandBackup/Electrs_Data -R - -sudo chmod 770 /run/media/Second_Drive/BTCEcoandBackup/Electrs_Data -R - -nixos-rebuild switch --flake '/etc/nixos/#' --impure --update-input Sovran_Systems --commit-lock-file - - -# - -set +x - -sudo 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" - -sudo echo -e "$(pwgen -s 17 -1) \n" -sudo echo -e "$(pwgen -s 17 -1) \n" -sudo echo -e "$(pwgen -s 17 -1) \n" -sudo echo -e "$(pwgen -s 17 -1) \n" - -# - -sudo echo -e "${LIGHTBLUE}One last thing, you need to put the Njalla DDNS info from Njalla into njalla.sh.${ENDCOLOR} \n" - -sudo echo -e "${GREEN}All Finished! Please Reboot then Enjoy your New Sovran Pro!${ENDCOLOR} \n" \ No newline at end of file diff --git a/for_new_sovran_pros_upload/flake.nix b/for_new_sovran_pros_upload/flake.nix deleted file mode 100644 index aa77d3a..0000000 --- a/for_new_sovran_pros_upload/flake.nix +++ /dev/null @@ -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 ]; - - }; - - }; - -} \ No newline at end of file diff --git a/for_new_sovran_pros_upload/sp b/for_new_sovran_pros_upload/sp deleted file mode 100644 index 3dec7b1..0000000 --- a/for_new_sovran_pros_upload/sp +++ /dev/null @@ -1,200 +0,0 @@ -#!/usr/bin/env bash - -GREEN="\e[32m" -LIGHTBLUE="\e[94m" -ENDCOLOR="\e[0m" - -# - -pushd /etc/nixos/ - -sudo wget https://git.sovransystems.com/Sovran_Systems/Sovran_SystemsOS/raw/branch/main/For_NEW_Sovran_Pros_Upload/flake.nix - -sudo chown root:root /etc/nixos/ -R - -sudo chmod 770 /etc/nixos/ -R - -popd - -# - -sudo rsync -av -e "ssh -i /root/sovransystems" root@192.168.1.32:/home/ /home - -sudo rsync -av -e "ssh -i /root/sovransystems" root@192.168.1.32:/var/lib/www/ /var/lib/www - -sudo rsync -av -e "ssh -i /root/sovransystems" root@192.168.1.32:/var/lib/domains/ /var/lib/domains - -sudo rsync -av -e "ssh -i /root/sovransystems" root@192.168.1.32:/var/lib/nextcloudaddition/ /var/lib/nextcloudaddition - -sudo rsync -av -e "ssh -i /root/sovransystems" root@192.168.1.32:/var/lib/njalla/ /var/lib/njalla - -sudo rsync -av -e "ssh -i /root/sovransystems" root@192.168.1.32:/var/lib/external_ip/ /var/lib/external_ip - -sudo rsync -av -e "ssh -i /root/sovransystems" root@192.168.1.32:/var/lib/secrets/ /var/lib/secrets - -# - -nixos-rebuild switch --impure - -# - -sudo chown root:root /var/lib/secrets/main -R - -sudo chown matrix-synapse:matrix-synapse /var/lib/secrets/matrix_reg_secret -R - -sudo chown matrix-synapse:matrix-synapse /var/lib/secrets/matrixdb -R - -sudo chown postgres:postgres /var/lib/secrets/nextclouddb -R - -sudo chown turnserver:turnserver /var/lib/secrets/turn -R - -sudo chown mysql:mysql /var/lib/secrets/wordpressdb -R - -sudo chown vaultwarden:vaultwarden /var/lib/secrets/vaultwarden -R - -sudo chown onlyoffice:onlyoffice /var/lib/secrets/onlyofficejwtSecretFile - -sudo chmod 770 /var/lib/secrets/ -R - -# - -sudo echo -e "${GREEN}What is your New Matrix (Element Chat) domain name?${ENDCOLOR}" -read -sudo echo -n $REPLY > /var/lib/domains/matrix - -sudo echo -e "${GREEN}What is your New Wordpress domain name?${ENDCOLOR}" -read -sudo echo -n $REPLY > /var/lib/domains/wordpress - -sudo echo -e "${GREEN}What is your New Nextcloud domain name?${ENDCOLOR}" -read -sudo echo -n $REPLY > /var/lib/domains/nextcloud - -sudo echo -e "${GREEN}What is your New BTCPayserver domain name?${ENDCOLOR}" -read -sudo echo -n $REPLY > /var/lib/domains/btcpayserver - -sudo echo -e "${GREEN}What is your New Vaultwarden domain name?${ENDCOLOR}" -read -sudo echo -n $REPLY > /var/lib/domains/vaultwarden - -sudo echo -e "${GREEN}What is your New OnlyOffice domain name?${ENDCOLOR}" -read -sudo echo -n $REPLY > /var/lib/domains/onlyoffice - -sudo echo -e "${GREEN}What is the email you would like to use to manage the SSL certificates for your domains?${ENDCOLOR}" -read -sudo echo -n $REPLY > /var/lib/domains/sslemail - - -sudo chown caddy:php /var/lib/domains -R - -sudo chmod 770 /var/lib/domains -R - -# - -set -x - - -sudo rm -rf /home/free/.config/BraveSoftware - -sudo rm -rf /home/free/.local/share/fish/fish_history - -# - -sudo rm -rf /var/lib/www/wordpress/wp-config.php - -sudo rm -rf /var/lib/www/nextcloud/config/config.php - -sudo touch /var/lib/www/nextcloud/config/CAN_INSTALL - -sudo sed -i '$e cat /var/lib/nextcloudaddition/nextcloudaddition' /var/lib/www/nextcloud/config/config.php - - -sudo chown caddy:php /var/lib/www -R - -sudo chmod 770 /var/lib/www -R - -# - -sudo mkdir /var/lib/nextcloud - -sudo chown caddy:php /var/lib/nextcloud -R - -sudo chmod 770 /var/lib/nextcloud -R - -# - -sudo mkdir /var/lib/coturn - -sudo chown turnserver:turnserver /var/lib/coturn -R - -sudo chmod 770 /var/lib/coturn -R - -###### Add coturn .pem from certificates - -# - -sudo echo -n $(pwgen -s 17 -1) > /var/lib/secrets/nextclouddb -sudo echo -n $(pwgen -s 17 -1) > /var/lib/secrets/wordpressdb -sudo echo -n $(pwgen -s 17 -1) > /var/lib/secrets/matrixdb -sudo echo -n $(pwgen -s 17 -1) > /var/lib/secrets/turn -sudo echo -n $(pwgen -s 17 -1) > /var/lib/secrets/matrix_reg_secret -sudo echo -n $(pwgen -s 17 -1) > /var/lib/secrets/main -sudo echo -n $(pwgen -s 17 -1) > /var/lib/secrets/onlyofficejwtSecretFile -sudo echo -n ADMIN_TOKEN=$(openssl rand -base64 48 -) > /var/lib/secrets/vaultwarden/vaultwarden.env - -# - -sudo echo "root:$(cat /var/lib/secrets/main)" | chpasswd -c SHA512 - -# - -flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo -flatpak update - -# - -sudo echo "free:a" | chpasswd -c SHA512 - -# - -sudo rm -rf /root/sp - -sudo rm -rf /root/Step_2_psp - -sudo rm -rf /root/.ssh - -sudo rm -rf /home/free/.ssh - -sudo rm -rf /root/sovransystems - - -sudo chown bitcoin:bitcoin /run/media/Second_Drive/BTCEcoandBackup/Bitcoin_Node -R - -sudo chmod 770 /run/media/Second_Drive/BTCEcoandBackup/Bitcoin_Node -R - -sudo chown electrs:electrs /run/media/Second_Drive/BTCEcoandBackup/Electrs_Data -R - -sudo chmod 770 /run/media/Second_Drive/BTCEcoandBackup/Electrs_Data -R - -nixos-rebuild switch --flake '/etc/nixos/#' --impure --update-input Sovran_Systems --commit-lock-file - - -# - -set +x - -sudo 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" - -sudo echo -e "$(pwgen -s 17 -1) \n" -sudo echo -e "$(pwgen -s 17 -1) \n" -sudo echo -e "$(pwgen -s 17 -1) \n" -sudo echo -e "$(pwgen -s 17 -1) \n" - -# - -sudo echo -e "${LIGHTBLUE}One last thing, you need to put the Njalla DDNS info from Njalla into njalla.sh.${ENDCOLOR} \n" - -sudo echo -e "${GREEN}All Finished! Please Reboot then Enjoy your New Sovran Pro!${ENDCOLOR} \n" \ No newline at end of file From b63f32e9a5a168f38afd744b95983c52326ef43c Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Wed, 21 Jun 2023 21:36:11 -0700 Subject: [PATCH 095/667] updated sovran_systemsOS .nix --- modules/Sovran_SystemsOS_File_Fixes_And_New_Services.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/Sovran_SystemsOS_File_Fixes_And_New_Services.nix b/modules/Sovran_SystemsOS_File_Fixes_And_New_Services.nix index b0acb1b..b3ec70a 100644 --- a/modules/Sovran_SystemsOS_File_Fixes_And_New_Services.nix +++ b/modules/Sovran_SystemsOS_File_Fixes_And_New_Services.nix @@ -6,7 +6,7 @@ unitConfig = { - After = "NetworkManager.service"; + After = "btcpayserver.service"; Requires = "network-online.target"; }; From 5c0fd72ef9a8e220ba4f1e5e8dca286ef11b7e56 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Thu, 22 Jun 2023 15:11:28 -0700 Subject: [PATCH 096/667] updated test.sh --- file_fixes_and_new_services/test.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/file_fixes_and_new_services/test.sh b/file_fixes_and_new_services/test.sh index 5bee2d1..44df39a 100644 --- a/file_fixes_and_new_services/test.sh +++ b/file_fixes_and_new_services/test.sh @@ -1,6 +1,10 @@ #!/usr/bin/env bash -exec 1> /var/lib/beacons/awesome.log 2>&1 +function log_console () { + echo "`date` :: $1" >> /var/lib/beacons/awesome.log + echo $1 +} + #### CHECK TO SEE IF IT HAS BEEN RUN BEFORE #### From 4e63c4f4cf6adab2d1d0deca4ccf78cdbe83e079 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Thu, 22 Jun 2023 18:16:54 -0700 Subject: [PATCH 097/667] updated test.sh --- file_fixes_and_new_services/test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/file_fixes_and_new_services/test.sh b/file_fixes_and_new_services/test.sh index 44df39a..e3e9f49 100644 --- a/file_fixes_and_new_services/test.sh +++ b/file_fixes_and_new_services/test.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/started +FILE=/var/lib/beacons/file_fixes_and_new_services/jitsi/completed if [ -e $FILE ]; then From bde3dd9510e5e1a7b5459011092c0c0ca293a551 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Wed, 28 Jun 2023 19:59:38 -0700 Subject: [PATCH 098/667] updated flake and configuration --- flake.nix | 4 +++- modules/configuration.nix | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/flake.nix b/flake.nix index 2950732..34100e5 100644 --- a/flake.nix +++ b/flake.nix @@ -11,9 +11,11 @@ agenix.inputs.darwin.follows = ""; + erosanix.url = "github:emmanuelrosa/erosanix"; + }; - outputs = { self, nixpkgs, nix-bitcoin, agenix, ... }: + outputs = { self, nixpkgs, nix-bitcoin, agenix, erosanix, ... }: { diff --git a/modules/configuration.nix b/modules/configuration.nix index 5ff9d6b..6beb4f8 100644 --- a/modules/configuration.nix +++ b/modules/configuration.nix @@ -142,7 +142,7 @@ in papirus-icon-theme ranger gnome.gnome-tweaks - sparrow + erosanix.packages.x86_64-linux.sparrow-unwrapped bisq-desktop neofetch gnome.gedit From 237e46c25520a3812bfe631ecdd27bc4ee7def54 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Wed, 28 Jun 2023 20:37:04 -0700 Subject: [PATCH 099/667] updated flake and configuration --- modules/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/configuration.nix b/modules/configuration.nix index 6beb4f8..c087ab6 100644 --- a/modules/configuration.nix +++ b/modules/configuration.nix @@ -142,7 +142,7 @@ in papirus-icon-theme ranger gnome.gnome-tweaks - erosanix.packages.x86_64-linux.sparrow-unwrapped + erosanix.packages.x86_64-linux.sparrow bisq-desktop neofetch gnome.gedit From 44f59ee163abdfba4683fe3fedcc5867d19863ce Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Wed, 28 Jun 2023 20:42:19 -0700 Subject: [PATCH 100/667] updated flake and configuration --- flake.nix | 7 ++++++- modules/configuration.nix | 1 - 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/flake.nix b/flake.nix index 34100e5..1a251a7 100644 --- a/flake.nix +++ b/flake.nix @@ -34,7 +34,12 @@ agenix.nixosModules.default - ]; + ]; + + environment.systemPackages = with pkgs; [ + erosanix.packages.x86_64-linux.somePackage + ]; + }; }; } \ No newline at end of file diff --git a/modules/configuration.nix b/modules/configuration.nix index c087ab6..057542c 100644 --- a/modules/configuration.nix +++ b/modules/configuration.nix @@ -142,7 +142,6 @@ in papirus-icon-theme ranger gnome.gnome-tweaks - erosanix.packages.x86_64-linux.sparrow bisq-desktop neofetch gnome.gedit From cf939520b7370558d1edf3adcaa5f5d5918ac1a7 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Wed, 28 Jun 2023 20:43:46 -0700 Subject: [PATCH 101/667] updated flake and configuration --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 1a251a7..4c3d580 100644 --- a/flake.nix +++ b/flake.nix @@ -37,7 +37,7 @@ ]; environment.systemPackages = with pkgs; [ - erosanix.packages.x86_64-linux.somePackage + erosanix.packages.x86_64-linux.sparrow ]; }; From 2c4b58370a9c95440397c8bf7ea3582c6f75828b Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Wed, 28 Jun 2023 21:03:26 -0700 Subject: [PATCH 102/667] updated flake --- flake.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/flake.nix b/flake.nix index 4c3d580..e92cec2 100644 --- a/flake.nix +++ b/flake.nix @@ -28,18 +28,19 @@ imports = [ - ./modules/modules.nix + ./modules/modules.nix - nix-bitcoin.nixosModules.default + nix-bitcoin.nixosModules.default - agenix.nixosModules.default + agenix.nixosModules.default ]; environment.systemPackages = with pkgs; [ + erosanix.packages.x86_64-linux.sparrow - ]; - + + ]; }; }; } \ No newline at end of file From 1166765e7d1160e015abc4ba924e8a0238ea8c00 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Mon, 10 Jul 2023 00:52:30 -0700 Subject: [PATCH 103/667] updated sp --- for_new_sovran_pros/sp | 160 ++++++++++++++++++++--------------------- 1 file changed, 80 insertions(+), 80 deletions(-) diff --git a/for_new_sovran_pros/sp b/for_new_sovran_pros/sp index 3dec7b1..ff08383 100644 --- a/for_new_sovran_pros/sp +++ b/for_new_sovran_pros/sp @@ -8,29 +8,31 @@ ENDCOLOR="\e[0m" pushd /etc/nixos/ -sudo wget https://git.sovransystems.com/Sovran_Systems/Sovran_SystemsOS/raw/branch/main/For_NEW_Sovran_Pros_Upload/flake.nix + wget https://git.sovransystems.com/Sovran_Systems/Sovran_SystemsOS/raw/branch/main/flake.nix -sudo chown root:root /etc/nixos/ -R + chown root:root /etc/nixos/ -R -sudo chmod 770 /etc/nixos/ -R + chmod 770 /etc/nixos/ -R popd # -sudo rsync -av -e "ssh -i /root/sovransystems" root@192.168.1.32:/home/ /home +rsync -av -e "ssh -i /root/factory_login_install" root@192.168.0.103:/home/ /home -sudo rsync -av -e "ssh -i /root/sovransystems" root@192.168.1.32:/var/lib/www/ /var/lib/www +rsync -av -e "ssh -i /root/factory_login_install" root@192.168.0.103:/var/lib/www/ /var/lib/www -sudo rsync -av -e "ssh -i /root/sovransystems" root@192.168.1.32:/var/lib/domains/ /var/lib/domains +rsync -av -e "ssh -i /root/factory_login_install" root@192.168.0.103:/var/lib/domains/ /var/lib/domains -sudo rsync -av -e "ssh -i /root/sovransystems" root@192.168.1.32:/var/lib/nextcloudaddition/ /var/lib/nextcloudaddition +rsync -av -e "ssh -i /root/factory_login_install" root@192.168.0.103:/var/lib/nextcloudaddition/ /var/lib/nextcloudaddition -sudo rsync -av -e "ssh -i /root/sovransystems" root@192.168.1.32:/var/lib/njalla/ /var/lib/njalla +rsync -av -e "ssh -i /root/factory_login_install" root@192.168.0.103:/var/lib/njalla/ /var/lib/njalla -sudo rsync -av -e "ssh -i /root/sovransystems" root@192.168.1.32:/var/lib/external_ip/ /var/lib/external_ip +rsync -av -e "ssh -i /root/factory_login_install" root@192.168.0.103:/var/lib/external_ip/ /var/lib/external_ip -sudo rsync -av -e "ssh -i /root/sovransystems" root@192.168.1.32:/var/lib/secrets/ /var/lib/secrets +rsync -av -e "ssh -i /root/factory_login_install" root@192.168.0.103:/var/lib/secrets/ /var/lib/secrets + +rsync -av -e "ssh -i /root/factory_login_install" root@192.168.0.103:/var/lib/agenix-secrets/ /var/lib/agenix-secrets # @@ -38,116 +40,114 @@ nixos-rebuild switch --impure # -sudo chown root:root /var/lib/secrets/main -R +chown root:root /var/lib/secrets/main -R -sudo chown matrix-synapse:matrix-synapse /var/lib/secrets/matrix_reg_secret -R +chown root:root /var/lib/secrets/external_ip -R -sudo chown matrix-synapse:matrix-synapse /var/lib/secrets/matrixdb -R +chown matrix-synapse:matrix-synapse /var/lib/secrets/matrix_reg_secret -R -sudo chown postgres:postgres /var/lib/secrets/nextclouddb -R +chown matrix-synapse:matrix-synapse /var/lib/secrets/matrixdb -R -sudo chown turnserver:turnserver /var/lib/secrets/turn -R +chown postgres:postgres /var/lib/secrets/nextclouddb -R -sudo chown mysql:mysql /var/lib/secrets/wordpressdb -R +chown turnserver:turnserver /var/lib/secrets/turn -R -sudo chown vaultwarden:vaultwarden /var/lib/secrets/vaultwarden -R +chown mysql:mysql /var/lib/secrets/wordpressdb -R -sudo chown onlyoffice:onlyoffice /var/lib/secrets/onlyofficejwtSecretFile +chown vaultwarden:vaultwarden /var/lib/secrets/vaultwarden -R -sudo chmod 770 /var/lib/secrets/ -R +chown onlyoffice:onlyoffice /var/lib/secrets/onlyofficejwtSecretFile + +chmod 770 /var/lib/secrets/ -R # -sudo echo -e "${GREEN}What is your New Matrix (Element Chat) domain name?${ENDCOLOR}" +echo -e "${GREEN}What is your New Matrix (Element Chat) domain name?${ENDCOLOR}" read -sudo echo -n $REPLY > /var/lib/domains/matrix +echo -n $REPLY > /var/lib/domains/matrix -sudo echo -e "${GREEN}What is your New Wordpress domain name?${ENDCOLOR}" +echo -e "${GREEN}What is your New Wordpress domain name?${ENDCOLOR}" read -sudo echo -n $REPLY > /var/lib/domains/wordpress +echo -n $REPLY > /var/lib/domains/wordpress -sudo echo -e "${GREEN}What is your New Nextcloud domain name?${ENDCOLOR}" +echo -e "${GREEN}What is your New Nextcloud domain name?${ENDCOLOR}" read -sudo echo -n $REPLY > /var/lib/domains/nextcloud +echo -n $REPLY > /var/lib/domains/nextcloud -sudo echo -e "${GREEN}What is your New BTCPayserver domain name?${ENDCOLOR}" +echo -e "${GREEN}What is your New BTCPayserver domain name?${ENDCOLOR}" read -sudo echo -n $REPLY > /var/lib/domains/btcpayserver +echo -n $REPLY > /var/lib/domains/btcpayserver -sudo echo -e "${GREEN}What is your New Vaultwarden domain name?${ENDCOLOR}" +echo -e "${GREEN}What is your New Vaultwarden domain name?${ENDCOLOR}" read -sudo echo -n $REPLY > /var/lib/domains/vaultwarden +echo -n $REPLY > /var/lib/domains/vaultwarden -sudo echo -e "${GREEN}What is your New OnlyOffice domain name?${ENDCOLOR}" +echo -e "${GREEN}What is your New OnlyOffice domain name?${ENDCOLOR}" read -sudo echo -n $REPLY > /var/lib/domains/onlyoffice +echo -n $REPLY > /var/lib/domains/onlyoffice -sudo echo -e "${GREEN}What is the email you would like to use to manage the SSL certificates for your domains?${ENDCOLOR}" +echo -e "${GREEN}What is the email you would like to use to manage the SSL certificates for your domains?${ENDCOLOR}" read -sudo echo -n $REPLY > /var/lib/domains/sslemail +echo -n $REPLY > /var/lib/domains/sslemail -sudo chown caddy:php /var/lib/domains -R +chown caddy:php /var/lib/domains -R -sudo chmod 770 /var/lib/domains -R +chmod 770 /var/lib/domains -R # set -x -sudo rm -rf /home/free/.config/BraveSoftware +rm -rf /home/free/.config/BraveSoftware -sudo rm -rf /home/free/.local/share/fish/fish_history +rm -rf /home/free/.local/share/fish/fish_history # -sudo rm -rf /var/lib/www/wordpress/wp-config.php +rm -rf /var/lib/www/wordpress/wp-config.php -sudo rm -rf /var/lib/www/nextcloud/config/config.php +rm -rf /var/lib/www/nextcloud/config/config.php -sudo touch /var/lib/www/nextcloud/config/CAN_INSTALL - -sudo sed -i '$e cat /var/lib/nextcloudaddition/nextcloudaddition' /var/lib/www/nextcloud/config/config.php +touch /var/lib/www/nextcloud/config/CAN_INSTALL -sudo chown caddy:php /var/lib/www -R +chown caddy:php /var/lib/www -R -sudo chmod 770 /var/lib/www -R +chmod 770 /var/lib/www -R # -sudo mkdir /var/lib/nextcloud +mkdir /var/lib/nextcloud -sudo chown caddy:php /var/lib/nextcloud -R +chown caddy:php /var/lib/nextcloud -R -sudo chmod 770 /var/lib/nextcloud -R +chmod 770 /var/lib/nextcloud -R # -sudo mkdir /var/lib/coturn +mkdir /var/lib/coturn -sudo chown turnserver:turnserver /var/lib/coturn -R +chown turnserver:turnserver /var/lib/coturn -R -sudo chmod 770 /var/lib/coturn -R - -###### Add coturn .pem from certificates +chmod 770 /var/lib/coturn -R # -sudo echo -n $(pwgen -s 17 -1) > /var/lib/secrets/nextclouddb -sudo echo -n $(pwgen -s 17 -1) > /var/lib/secrets/wordpressdb -sudo echo -n $(pwgen -s 17 -1) > /var/lib/secrets/matrixdb -sudo echo -n $(pwgen -s 17 -1) > /var/lib/secrets/turn -sudo echo -n $(pwgen -s 17 -1) > /var/lib/secrets/matrix_reg_secret -sudo echo -n $(pwgen -s 17 -1) > /var/lib/secrets/main -sudo echo -n $(pwgen -s 17 -1) > /var/lib/secrets/onlyofficejwtSecretFile -sudo echo -n ADMIN_TOKEN=$(openssl rand -base64 48 +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 # -sudo echo "root:$(cat /var/lib/secrets/main)" | chpasswd -c SHA512 +echo "root:$(cat /var/lib/secrets/main)" | chpasswd -c SHA512 # @@ -156,45 +156,45 @@ flatpak update # -sudo echo "free:a" | chpasswd -c SHA512 +ssh-keygen -q -N "gosovransytems" -t ed25519 -f /home/free/.ssh/factory_login + +sed -i -e "0,/ssh-ed25519.*/{ s::$(cat /home/free/.ssh/factory_login.pub): }" /root/.ssh/authorized_keys' # -sudo rm -rf /root/sp +echo "free:a" | chpasswd -c SHA512 -sudo rm -rf /root/Step_2_psp +# -sudo rm -rf /root/.ssh +rm -rf /root/sp -sudo rm -rf /home/free/.ssh - -sudo rm -rf /root/sovransystems +rm -rf /root/factory_login -sudo chown bitcoin:bitcoin /run/media/Second_Drive/BTCEcoandBackup/Bitcoin_Node -R +chown bitcoin:bitcoin /run/media/Second_Drive/BTCEcoandBackup/Bitcoin_Node -R -sudo chmod 770 /run/media/Second_Drive/BTCEcoandBackup/Bitcoin_Node -R +chmod 770 /run/media/Second_Drive/BTCEcoandBackup/Bitcoin_Node -R -sudo chown electrs:electrs /run/media/Second_Drive/BTCEcoandBackup/Electrs_Data -R +chown electrs:electrs /run/media/Second_Drive/BTCEcoandBackup/Electrs_Data -R -sudo chmod 770 /run/media/Second_Drive/BTCEcoandBackup/Electrs_Data -R +chmod 770 /run/media/Second_Drive/BTCEcoandBackup/Electrs_Data -R -nixos-rebuild switch --flake '/etc/nixos/#' --impure --update-input Sovran_Systems --commit-lock-file +nixos-rebuild switch --impure # set +x -sudo 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 "${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" -sudo echo -e "$(pwgen -s 17 -1) \n" -sudo echo -e "$(pwgen -s 17 -1) \n" -sudo echo -e "$(pwgen -s 17 -1) \n" -sudo 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 "$(pwgen -s 17 -1) \n" # -sudo echo -e "${LIGHTBLUE}One last thing, you need to put the Njalla DDNS info from Njalla into njalla.sh.${ENDCOLOR} \n" +echo -e "${LIGHTBLUE}One last thing, you need to put the Njalla DDNS info from Njalla into njalla.sh.${ENDCOLOR} \n" -sudo echo -e "${GREEN}All Finished! Please Reboot then Enjoy your New Sovran Pro!${ENDCOLOR} \n" \ No newline at end of file +echo -e "${GREEN}All Finished! Please Reboot then Enjoy your New Sovran Pro!${ENDCOLOR} \n" \ No newline at end of file From 5a0df28fe633f493b37e806b2ddaa8ffa271f45c Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Mon, 10 Jul 2023 01:22:21 -0700 Subject: [PATCH 104/667] updated sp --- for_new_sovran_pros/sp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/for_new_sovran_pros/sp b/for_new_sovran_pros/sp index ff08383..37109c9 100644 --- a/for_new_sovran_pros/sp +++ b/for_new_sovran_pros/sp @@ -1,5 +1,7 @@ #!/usr/bin/env bash +set -o nounset + GREEN="\e[32m" LIGHTBLUE="\e[94m" ENDCOLOR="\e[0m" @@ -197,4 +199,6 @@ 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" \ No newline at end of file +echo -e "${GREEN}All Finished! Please Reboot then Enjoy your New Sovran Pro!${ENDCOLOR} \n" + +exit 0 \ No newline at end of file From c823c692f9fca700f9e53ad0939a4c640ea6704e Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Mon, 10 Jul 2023 01:24:05 -0700 Subject: [PATCH 105/667] updated sp --- for_new_sovran_pros/sp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/for_new_sovran_pros/sp b/for_new_sovran_pros/sp index 37109c9..459aed5 100644 --- a/for_new_sovran_pros/sp +++ b/for_new_sovran_pros/sp @@ -10,7 +10,7 @@ ENDCOLOR="\e[0m" pushd /etc/nixos/ - wget https://git.sovransystems.com/Sovran_Systems/Sovran_SystemsOS/raw/branch/main/flake.nix + wget https://git.sovransystems.com/Sovran_Systems/Sovran_SystemsOS/raw/branch/main/for_new_sovran_pros/flake.nix chown root:root /etc/nixos/ -R From 21580afd4025508c311e6cb308819fb3006b4ee3 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Mon, 10 Jul 2023 01:25:09 -0700 Subject: [PATCH 106/667] updated sp --- for_new_sovran_pros/sp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/for_new_sovran_pros/sp b/for_new_sovran_pros/sp index 459aed5..56ae009 100644 --- a/for_new_sovran_pros/sp +++ b/for_new_sovran_pros/sp @@ -13,8 +13,8 @@ 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 + + chmod 770 /etc/nixos/ -R popd From e01c7cd5cb3244bace7a2eecc5a2cab3122dd264 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Mon, 10 Jul 2023 01:40:25 -0700 Subject: [PATCH 107/667] updated sp --- for_new_sovran_pros/sp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/for_new_sovran_pros/sp b/for_new_sovran_pros/sp index 56ae009..52872cf 100644 --- a/for_new_sovran_pros/sp +++ b/for_new_sovran_pros/sp @@ -160,7 +160,7 @@ flatpak update ssh-keygen -q -N "gosovransytems" -t ed25519 -f /home/free/.ssh/factory_login -sed -i -e "0,/ssh-ed25519.*/{ s::$(cat /home/free/.ssh/factory_login.pub): }" /root/.ssh/authorized_keys' +sed -i -e "0,/ssh-ed25519.*/{ s::$(cat /home/free/.ssh/factory_login.pub): }" /root/.ssh/authorized_keys # From 412107cafea5c009a864e9111fb4861700ad47d6 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Mon, 10 Jul 2023 02:38:29 -0700 Subject: [PATCH 108/667] updated sp --- for_new_sovran_pros/sp | 1 - 1 file changed, 1 deletion(-) diff --git a/for_new_sovran_pros/sp b/for_new_sovran_pros/sp index 52872cf..3898b4a 100644 --- a/for_new_sovran_pros/sp +++ b/for_new_sovran_pros/sp @@ -13,7 +13,6 @@ 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 From 77bcbd6ac6fdd7a925d73672d9d0dc17ed73d45c Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Mon, 10 Jul 2023 02:39:34 -0700 Subject: [PATCH 109/667] updated sp --- for_new_sovran_pros/sp | 1 + 1 file changed, 1 insertion(+) diff --git a/for_new_sovran_pros/sp b/for_new_sovran_pros/sp index 3898b4a..52872cf 100644 --- a/for_new_sovran_pros/sp +++ b/for_new_sovran_pros/sp @@ -13,6 +13,7 @@ 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 From f27887e2adede40af3055daeb4f1efa7ff681a0c Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Mon, 10 Jul 2023 12:05:04 -0700 Subject: [PATCH 110/667] updated sp --- for_new_sovran_pros/sp | 2 -- 1 file changed, 2 deletions(-) diff --git a/for_new_sovran_pros/sp b/for_new_sovran_pros/sp index 52872cf..5972dfe 100644 --- a/for_new_sovran_pros/sp +++ b/for_new_sovran_pros/sp @@ -200,5 +200,3 @@ 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" - -exit 0 \ No newline at end of file From 39e0e84937d8fa7757cd89645a70bd0473b92b84 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Mon, 10 Jul 2023 12:41:25 -0700 Subject: [PATCH 111/667] updated sp --- for_new_sovran_pros/sp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/for_new_sovran_pros/sp b/for_new_sovran_pros/sp index 5972dfe..576eb84 100644 --- a/for_new_sovran_pros/sp +++ b/for_new_sovran_pros/sp @@ -36,6 +36,8 @@ rsync -av -e "ssh -i /root/factory_login_install" root@192.168.0.103:/var/lib/se rsync -av -e "ssh -i /root/factory_login_install" root@192.168.0.103:/var/lib/agenix-secrets/ /var/lib/agenix-secrets +rsync -av -e "ssh -i /root/factory_login_install" root@192.168.0.103:/root/.ssh/agenix/ /root/.ssh/agenix + # nixos-rebuild switch --impure @@ -170,7 +172,11 @@ echo "free:a" | chpasswd -c SHA512 rm -rf /root/sp -rm -rf /root/factory_login +rm -rf /root/factory_login_install + +rm -rf /home/free/.ssh/sovranpro_login + +rm -rf /home/free/.ssh/sovranpro_login.pub chown bitcoin:bitcoin /run/media/Second_Drive/BTCEcoandBackup/Bitcoin_Node -R From a90b6497daa7931c86528f4f34a66e3fe2648f07 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Mon, 10 Jul 2023 22:19:48 -0700 Subject: [PATCH 112/667] updated sp --- for_new_sovran_pros/sp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/for_new_sovran_pros/sp b/for_new_sovran_pros/sp index 576eb84..b69c314 100644 --- a/for_new_sovran_pros/sp +++ b/for_new_sovran_pros/sp @@ -160,7 +160,7 @@ flatpak update # -ssh-keygen -q -N "gosovransytems" -t ed25519 -f /home/free/.ssh/factory_login +sudo -u free ssh-keygen -q -N "gosovransytems" -t ed25519 -f /home/free/.ssh/factory_login sed -i -e "0,/ssh-ed25519.*/{ s::$(cat /home/free/.ssh/factory_login.pub): }" /root/.ssh/authorized_keys From 698e7d717ab3eb12907bae2b8a91ffd62057d883 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Mon, 10 Jul 2023 22:56:56 -0700 Subject: [PATCH 113/667] updated sp --- for_new_sovran_pros/sp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/for_new_sovran_pros/sp b/for_new_sovran_pros/sp index b69c314..f3a6522 100644 --- a/for_new_sovran_pros/sp +++ b/for_new_sovran_pros/sp @@ -155,7 +155,7 @@ echo "root:$(cat /var/lib/secrets/main)" | chpasswd -c SHA512 # -flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo +sudo -u free flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo flatpak update # From 1a4727dc615e54bf5abcbaeea74fab08bcdbfe5d Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Wed, 12 Jul 2023 22:04:40 -0700 Subject: [PATCH 114/667] updated sp with agenix --- for_new_sovran_pros/sp | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/for_new_sovran_pros/sp b/for_new_sovran_pros/sp index f3a6522..4bca281 100644 --- a/for_new_sovran_pros/sp +++ b/for_new_sovran_pros/sp @@ -151,6 +151,28 @@ echo -n ADMIN_TOKEN=$(openssl rand -base64 48 # +rm -rf /var/lib/agenix-secrets/nextclouddb.age ; +rm -rf /var/lib/agenix-secrets/wordpressdb.age ; +rm -rf /var/lib/agenix-secrets/turn.age ; +rm -rf /var/lib/agenix-secrets/matrixdb.age ; +rm -rf /var/lib/agenix-secrets/matrix_reg_secret.age + +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 + +# + echo "root:$(cat /var/lib/secrets/main)" | chpasswd -c SHA512 # From 855e398eb1eb8dc566d8800fde180d788f3cefa7 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Wed, 12 Jul 2023 22:07:26 -0700 Subject: [PATCH 115/667] updated sp with agenix --- for_new_sovran_pros/sp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/for_new_sovran_pros/sp b/for_new_sovran_pros/sp index 4bca281..a6e54d7 100644 --- a/for_new_sovran_pros/sp +++ b/for_new_sovran_pros/sp @@ -151,10 +151,10 @@ echo -n ADMIN_TOKEN=$(openssl rand -base64 48 # -rm -rf /var/lib/agenix-secrets/nextclouddb.age ; -rm -rf /var/lib/agenix-secrets/wordpressdb.age ; -rm -rf /var/lib/agenix-secrets/turn.age ; -rm -rf /var/lib/agenix-secrets/matrixdb.age ; +rm -rf /var/lib/agenix-secrets/nextclouddb.age +rm -rf /var/lib/agenix-secrets/wordpressdb.age +rm -rf /var/lib/agenix-secrets/turn.age +rm -rf /var/lib/agenix-secrets/matrixdb.age rm -rf /var/lib/agenix-secrets/matrix_reg_secret.age pushd /var/lib/agenix-secrets/ From 8bfe05b8a70f01fb2669fb667de474fe3a54dfb9 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Wed, 12 Jul 2023 23:22:05 -0700 Subject: [PATCH 116/667] updated sp with agenix --- for_new_sovran_pros/sp | 68 +++++++++++++++++++++--------------------- 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/for_new_sovran_pros/sp b/for_new_sovran_pros/sp index a6e54d7..62bfcf9 100644 --- a/for_new_sovran_pros/sp +++ b/for_new_sovran_pros/sp @@ -40,6 +40,40 @@ rsync -av -e "ssh -i /root/factory_login_install" root@192.168.0.103:/root/.ssh/ # +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 + +# + +rm -rf /var/lib/agenix-secrets/nextclouddb.age +rm -rf /var/lib/agenix-secrets/wordpressdb.age +rm -rf /var/lib/agenix-secrets/turn.age +rm -rf /var/lib/agenix-secrets/matrixdb.age +rm -rf /var/lib/agenix-secrets/matrix_reg_secret.age + +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 + +# + nixos-rebuild switch --impure # @@ -139,40 +173,6 @@ chmod 770 /var/lib/coturn -R # -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 - -# - -rm -rf /var/lib/agenix-secrets/nextclouddb.age -rm -rf /var/lib/agenix-secrets/wordpressdb.age -rm -rf /var/lib/agenix-secrets/turn.age -rm -rf /var/lib/agenix-secrets/matrixdb.age -rm -rf /var/lib/agenix-secrets/matrix_reg_secret.age - -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 - -# - echo "root:$(cat /var/lib/secrets/main)" | chpasswd -c SHA512 # From cd8175c4bcd9734e79e3ff762fd687c47621ed4a Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Fri, 14 Jul 2023 21:34:21 -0700 Subject: [PATCH 117/667] updated sp and rename sp.sh and added psp.sh --- for_new_sovran_pros/psp.sh | 117 +++++++++++++ for_new_sovran_pros/sp.sh | 347 +++++++++++++++++++++++++++++++++++++ 2 files changed, 464 insertions(+) create mode 100644 for_new_sovran_pros/psp.sh create mode 100644 for_new_sovran_pros/sp.sh diff --git a/for_new_sovran_pros/psp.sh b/for_new_sovran_pros/psp.sh new file mode 100644 index 0000000..5198f30 --- /dev/null +++ b/for_new_sovran_pros/psp.sh @@ -0,0 +1,117 @@ +#!/usr/bin/env bash + +### First make sure USB Flash Drive has latest NixOS image + +### Then plug in power and ether cord to new blank Sovran Pro and then plug in USB Flash Drive with the NixOS installer image; then turn on. + +### Second once booted into the installer image type: + + ### "sudo su" + ### "passwd" + ### then type "a" + ### then "ip a" + + +#### Third - GO TO LAPTOP and send script to the HOUSE-SOVRANPRO... + + ### rsync -avP -e "ssh -i ~/.ssh/sovransystems" /home/free/Documents/Sovran\ Systems/Sovran\ Pro\ Scripts/Step_2_pspv2 root@172.88.122.161:/home/free/Documents/New_Install_Scripts + + +#### Fourth - FROM LAPTOP LOGIN to the HOUSE-SOVRANPRO transfer this script to The New Sovran Pro... + + ### Open terminal Log into the HOUSE-SOVRANPRO + + ### ssh -i ~/.ssh/sovransystems root@172.88.122.161 + + ### NOW WHILE LOGGED INTO HOUSE-SOVRANPRO type... + + ### rsync -avP -e ssh /home/free/Documents/New_Install_Scripts/Step_2_psp root@192.168.0.?:/root + + +## Then log in with ssh root@192.168.1.[whatever is the ip of the New Sovran Pro] + +## Then run bash Step_2_psp + +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 <> /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 + ''; + }; + + environment.systemPackages = with pkgs; [ + wget + git + ranger + fish + ]; + + services.openssh = { + enable = true; + permitRootLogin = "yes"; + }; +} + +EOT + +nixos-install + +reboot + +#### After reboot from Laptop WHILE LOGGED INTO The TestSovranPro + + ### rsync -avP -e ssh /root/.ssh/authorized_keys root@192.168.[whatever is the ip of the New Sovran Pro]:/root/ + +### Then type login into the New Sovran Pro to send the sp script: + + ### "ssh root@192.168.1.[whatever the ip is]" + ### then password is "a" + ### then wget command... + ### "wget https://git.sovransystems.com/Sovran_Systems/Sovran_SystemsOS/raw/branch/main/for_new_sovran_pros/sp" + +#### Then type: + + ### "bash sp" (which the script "sp" is Step 3) diff --git a/for_new_sovran_pros/sp.sh b/for_new_sovran_pros/sp.sh new file mode 100644 index 0000000..9e01b03 --- /dev/null +++ b/for_new_sovran_pros/sp.sh @@ -0,0 +1,347 @@ +#!/usr/bin/env bash + +set -o nounset + +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 + +# + +mkdir /var/lib/nextcloudaddition + +cat <> /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 <> /var/lib/njalla/njalla.sh + +#!/usr/bin/env bash + +IP=$(wget -qO- https://ipecho.net/plain ; echo) + +##Add DDNS Script From Njalla User Account + +curl "https://...${IP}" + + +EOT + +# + +mkdir /var/lib/external_ip + +cat <> /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 <> /var/lib/agenix-secrets/secrets.nix + +let + + root = + +in +{ + + "wordpressdb.age".publicKeys = [ root ]; + + "matrixdb.age".publicKeys = [ root ]; + + "nextclouddb.age".publicKeys = [ root ]; + + "turn.age".publicKeys = [ root ]; + + "matrix_reg_secret.age".publicKeys = [ root ]; + +} + + +EOT + +# + +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 + +# + +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 + +# + +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 + +# + +nixos-rebuild switch --impure + +# + +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 + +# + +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 + + +chown caddy:php /var/lib/domains -R + +chmod 770 /var/lib/domains -R + +# + +set -x + +# + +wget -P /var/lib/www/downloadwp https://wordpress.org/latest.zip + +wget -P /var/lib/www/downloadnc https://download.nextcloud.com/server/releases/latest.zip + +unzip /var/lib/www/downloadwp/latest.zip -d /var/lib/www/ + +unzip /var/lib/www/downloadnc/latest.zip -d /var/lib/www/ + +rm -rf /var/lib/www/downloadwp + +rm -rf /var/lib/www/downloadnc + +chown caddy:php /var/lib/www -R + +chmod 770 /var/lib/www -R + +# + +mkdir /var/lib/nextcloud + +chown caddy:php /var/lib/nextcloud -R + +chmod 770 /var/lib/nextcloud -R + +# + +mkdir /var/lib/coturn + +chown turnserver:turnserver /var/lib/coturn -R + +chmod 770 /var/lib/coturn -R + +# + +echo "root:$(cat /var/lib/secrets/main)" | chpasswd -c SHA512 + +# + +sudo -u free flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo +flatpak update + +# + +sudo -u free ssh-keygen -q -N "gosovransytems" -t ed25519 -f /home/free/.ssh/factory_login + +sed -i -e "0,/ssh-ed25519.*/{ s::$(cat /home/free/.ssh/factory_login.pub): }" /root/.ssh/authorized_keys + +# + +echo "free:a" | chpasswd -c SHA512 + +# + +rm -rf /root/sp + +rm -rf /root/factory_login_install + +rm -rf /home/free/.ssh/sovranpro_login + +rm -rf /home/free/.ssh/sovranpro_login.pub + + +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 + +nixos-rebuild switch --impure + + +# + +wget https://git.sovransystems.com/Sovran_Systems/Software/raw/branch/main/Sovran_SystemsOS_Reseter/sovran_systemsOS_reseter_local_installer/sovran_systemsOS_reseter_install.sh + +pushd ~/Downloads + +sudo -u free bash sovran_systemsOS_reseter_install.sh + +popd + +# + +wget https://git.sovransystems.com/Sovran_Systems/Software/raw/branch/main/Sovran_SystemsOS_Updater/sovran_systemsOS_updater_local_installer/sovran_systemsOS_updater_install.sh + +pushd ~/Downloads + +sudo -u free 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 + +# + +DOMAIN=$(cat /var/lib/domains/matrix) + + +cp -n /var/lib/caddy/.local/share/caddy/certificates/acme.zerossl.com-v2-dv90/${DOMAIN}/${DOMAIN}.crt /var/lib/coturn/${DOMAIN}.crt.pem + +cp -n /var/lib/caddy/.local/share/caddy/certificates/acme.zerossl.com-v2-dv90/${DOMAIN}/${DOMAIN}.key /var/lib/coturn/${DOMAIN}.key.pem + +chown turnserver:turnserver /var/lib/coturn -R + +chmod 770 /var/lib/coturn -R + +systemctl restart coturn + +# + +sed -i '$e cat /var/lib/nextcloudaddition/nextcloudaddition' /var/lib/www/nextcloud/config/config.php + +chown caddy:php /var/lib/www -R + +chmod 770 /var/lib/www -R + +# + +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" From cac3719c553d225aaa60be04a63f31b8d50f4737 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Fri, 14 Jul 2023 21:35:59 -0700 Subject: [PATCH 118/667] updated sp and rename sp.sh and added psp.sh --- for_new_sovran_pros/psp.sh | 49 +------------------------------------- 1 file changed, 1 insertion(+), 48 deletions(-) diff --git a/for_new_sovran_pros/psp.sh b/for_new_sovran_pros/psp.sh index 5198f30..843b73b 100644 --- a/for_new_sovran_pros/psp.sh +++ b/for_new_sovran_pros/psp.sh @@ -1,37 +1,5 @@ #!/usr/bin/env bash -### First make sure USB Flash Drive has latest NixOS image - -### Then plug in power and ether cord to new blank Sovran Pro and then plug in USB Flash Drive with the NixOS installer image; then turn on. - -### Second once booted into the installer image type: - - ### "sudo su" - ### "passwd" - ### then type "a" - ### then "ip a" - - -#### Third - GO TO LAPTOP and send script to the HOUSE-SOVRANPRO... - - ### rsync -avP -e "ssh -i ~/.ssh/sovransystems" /home/free/Documents/Sovran\ Systems/Sovran\ Pro\ Scripts/Step_2_pspv2 root@172.88.122.161:/home/free/Documents/New_Install_Scripts - - -#### Fourth - FROM LAPTOP LOGIN to the HOUSE-SOVRANPRO transfer this script to The New Sovran Pro... - - ### Open terminal Log into the HOUSE-SOVRANPRO - - ### ssh -i ~/.ssh/sovransystems root@172.88.122.161 - - ### NOW WHILE LOGGED INTO HOUSE-SOVRANPRO type... - - ### rsync -avP -e ssh /home/free/Documents/New_Install_Scripts/Step_2_psp root@192.168.0.?:/root - - -## Then log in with ssh root@192.168.1.[whatever is the ip of the New Sovran Pro] - -## Then run bash Step_2_psp - GREEN="\e[32m" LIGHTBLUE="\e[94m" ENDCOLOR="\e[0m" @@ -99,19 +67,4 @@ EOT nixos-install -reboot - -#### After reboot from Laptop WHILE LOGGED INTO The TestSovranPro - - ### rsync -avP -e ssh /root/.ssh/authorized_keys root@192.168.[whatever is the ip of the New Sovran Pro]:/root/ - -### Then type login into the New Sovran Pro to send the sp script: - - ### "ssh root@192.168.1.[whatever the ip is]" - ### then password is "a" - ### then wget command... - ### "wget https://git.sovransystems.com/Sovran_Systems/Sovran_SystemsOS/raw/branch/main/for_new_sovran_pros/sp" - -#### Then type: - - ### "bash sp" (which the script "sp" is Step 3) +reboot \ No newline at end of file From 7d83dfa8723562af752356af71433920a1d1ac24 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Fri, 14 Jul 2023 21:37:34 -0700 Subject: [PATCH 119/667] removed sp --- for_new_sovran_pros/sp | 230 ----------------------------------------- 1 file changed, 230 deletions(-) delete mode 100644 for_new_sovran_pros/sp diff --git a/for_new_sovran_pros/sp b/for_new_sovran_pros/sp deleted file mode 100644 index 62bfcf9..0000000 --- a/for_new_sovran_pros/sp +++ /dev/null @@ -1,230 +0,0 @@ -#!/usr/bin/env bash - -set -o nounset - -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 - -# - -rsync -av -e "ssh -i /root/factory_login_install" root@192.168.0.103:/home/ /home - -rsync -av -e "ssh -i /root/factory_login_install" root@192.168.0.103:/var/lib/www/ /var/lib/www - -rsync -av -e "ssh -i /root/factory_login_install" root@192.168.0.103:/var/lib/domains/ /var/lib/domains - -rsync -av -e "ssh -i /root/factory_login_install" root@192.168.0.103:/var/lib/nextcloudaddition/ /var/lib/nextcloudaddition - -rsync -av -e "ssh -i /root/factory_login_install" root@192.168.0.103:/var/lib/njalla/ /var/lib/njalla - -rsync -av -e "ssh -i /root/factory_login_install" root@192.168.0.103:/var/lib/external_ip/ /var/lib/external_ip - -rsync -av -e "ssh -i /root/factory_login_install" root@192.168.0.103:/var/lib/secrets/ /var/lib/secrets - -rsync -av -e "ssh -i /root/factory_login_install" root@192.168.0.103:/var/lib/agenix-secrets/ /var/lib/agenix-secrets - -rsync -av -e "ssh -i /root/factory_login_install" root@192.168.0.103:/root/.ssh/agenix/ /root/.ssh/agenix - -# - -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 - -# - -rm -rf /var/lib/agenix-secrets/nextclouddb.age -rm -rf /var/lib/agenix-secrets/wordpressdb.age -rm -rf /var/lib/agenix-secrets/turn.age -rm -rf /var/lib/agenix-secrets/matrixdb.age -rm -rf /var/lib/agenix-secrets/matrix_reg_secret.age - -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 - -# - -nixos-rebuild switch --impure - -# - -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 - -# - -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 - - -chown caddy:php /var/lib/domains -R - -chmod 770 /var/lib/domains -R - -# - -set -x - - -rm -rf /home/free/.config/BraveSoftware - -rm -rf /home/free/.local/share/fish/fish_history - -# - -rm -rf /var/lib/www/wordpress/wp-config.php - -rm -rf /var/lib/www/nextcloud/config/config.php - -touch /var/lib/www/nextcloud/config/CAN_INSTALL - - -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 - -# - -sudo -u free flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo -flatpak update - -# - -sudo -u free ssh-keygen -q -N "gosovransytems" -t ed25519 -f /home/free/.ssh/factory_login - -sed -i -e "0,/ssh-ed25519.*/{ s::$(cat /home/free/.ssh/factory_login.pub): }" /root/.ssh/authorized_keys - -# - -echo "free:a" | chpasswd -c SHA512 - -# - -rm -rf /root/sp - -rm -rf /root/factory_login_install - -rm -rf /home/free/.ssh/sovranpro_login - -rm -rf /home/free/.ssh/sovranpro_login.pub - - -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 - -nixos-rebuild switch --impure - - -# - -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" From 5bc79f28e2de69a19458ae124802dbdc48ffab24 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Fri, 14 Jul 2023 21:43:22 -0700 Subject: [PATCH 120/667] updated sp.sh --- for_new_sovran_pros/sp.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/for_new_sovran_pros/sp.sh b/for_new_sovran_pros/sp.sh index 9e01b03..ae566bd 100644 --- a/for_new_sovran_pros/sp.sh +++ b/for_new_sovran_pros/sp.sh @@ -1,7 +1,5 @@ #!/usr/bin/env bash -set -o nounset - GREEN="\e[32m" LIGHTBLUE="\e[94m" ENDCOLOR="\e[0m" From 0b5cbb330accb228214ba86c36f9639fcab10ea3 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Fri, 14 Jul 2023 22:54:07 -0700 Subject: [PATCH 121/667] updated sp.sh and psp.sh --- for_new_sovran_pros/Sovran_SystemsOS-Desktop | 390 +++++++++++++++++++ for_new_sovran_pros/sp.sh | 39 +- 2 files changed, 407 insertions(+), 22 deletions(-) create mode 100644 for_new_sovran_pros/Sovran_SystemsOS-Desktop diff --git a/for_new_sovran_pros/Sovran_SystemsOS-Desktop b/for_new_sovran_pros/Sovran_SystemsOS-Desktop new file mode 100644 index 0000000..b4795c1 --- /dev/null +++ b/for_new_sovran_pros/Sovran_SystemsOS-Desktop @@ -0,0 +1,390 @@ +[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 diff --git a/for_new_sovran_pros/sp.sh b/for_new_sovran_pros/sp.sh index ae566bd..d575de4 100644 --- a/for_new_sovran_pros/sp.sh +++ b/for_new_sovran_pros/sp.sh @@ -54,7 +54,7 @@ cat <> /var/lib/njalla/njalla.sh IP=$(wget -qO- https://ipecho.net/plain ; echo) -##Add DDNS Script From Njalla User Account +##Manually Add DDNS Script From Njalla User Account AFTER Install curl "https://...${IP}" @@ -260,12 +260,7 @@ echo "free:a" | chpasswd -c SHA512 rm -rf /root/sp -rm -rf /root/factory_login_install - -rm -rf /home/free/.ssh/sovranpro_login - -rm -rf /home/free/.ssh/sovranpro_login.pub - +# chown bitcoin:bitcoin /run/media/Second_Drive/BTCEcoandBackup/Bitcoin_Node -R @@ -306,21 +301,6 @@ sudo echo "no" | matrix-synapse-register_new_matrix_user -u test -p a # -DOMAIN=$(cat /var/lib/domains/matrix) - - -cp -n /var/lib/caddy/.local/share/caddy/certificates/acme.zerossl.com-v2-dv90/${DOMAIN}/${DOMAIN}.crt /var/lib/coturn/${DOMAIN}.crt.pem - -cp -n /var/lib/caddy/.local/share/caddy/certificates/acme.zerossl.com-v2-dv90/${DOMAIN}/${DOMAIN}.key /var/lib/coturn/${DOMAIN}.key.pem - -chown turnserver:turnserver /var/lib/coturn -R - -chmod 770 /var/lib/coturn -R - -systemctl restart coturn - -# - sed -i '$e cat /var/lib/nextcloudaddition/nextcloudaddition' /var/lib/www/nextcloud/config/config.php chown caddy:php /var/lib/www -R @@ -329,6 +309,21 @@ chmod 770 /var/lib/www -R # +echo "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCQa3DEhx9RUtV0WopfFuL3cjQt2fBzp5wOg/hkj0FXyZXpp+F47Td1B9mKMNvucINaMQB6T0mW6c70fyT92gZO2OqCff6aeWovtTd9ynRgtJbny/qvVSShDbJcR7nSMeVPoDRaYs18fuA50guYnfoYAkaXyXPmVQ0uK84HwIB5j8gq6GMji7vv+TTNhDP8qOceUzt1DYPo9Z2JSnkFey+Z/fmxWJGsu+MSrA0/PPENEmf6L0ZSgxnu3gHEtdyX2hrFzjE16y3G0wSQzbWJb8MJO0KRSMcyvz6AzOSW4RYdXR1c+4JiciKRdnIAYYHfg7tnZT9wC9AzHjdEbmmrlF05mtjXKnxbPgGY0tlRSYo7B5E0k2zfi30MkIJ6kIE9TMM2z/+1KstrQN4OKBTGomBTYQaRQCT6dGpRTR+b8lOvUcnCSuat1sUC2M2VGFcBbDbKD0FyXy/vOk1pgA4I7GoESWQClnl+ntRg8HrW4oVTX2KpqR2CXjlF956HJGqHW6k= free@nixos" >> /root/.ssh/authorized_keys +# + +pushd /home/free/Downloads + + wget https://git.sovransystems.com/Sovran_Systems/Sovran_SystemsOS/raw/branch/main/for_new_sovran_pros/Sovran_SystemsOS-Desktop + + sudo -u free dconf load / < Sovran_SystemsOS-Desktop + + rm -rf Sovran_SystemsOS-Desktop + +popd + + +# 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" From 9f479718fa3470aa5d9905c88c8a832d3212e230 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Fri, 14 Jul 2023 22:57:41 -0700 Subject: [PATCH 122/667] updated sp.sh --- for_new_sovran_pros/sp.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/for_new_sovran_pros/sp.sh b/for_new_sovran_pros/sp.sh index d575de4..79adfe5 100644 --- a/for_new_sovran_pros/sp.sh +++ b/for_new_sovran_pros/sp.sh @@ -258,7 +258,7 @@ echo "free:a" | chpasswd -c SHA512 # -rm -rf /root/sp +rm -rf /root/sp.sh # From c9aeb30511373e55b743ae367aad1d7e8e0f85c1 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Fri, 14 Jul 2023 23:02:22 -0700 Subject: [PATCH 123/667] updated sp.sh --- for_new_sovran_pros/sp.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/for_new_sovran_pros/sp.sh b/for_new_sovran_pros/sp.sh index 79adfe5..118df58 100644 --- a/for_new_sovran_pros/sp.sh +++ b/for_new_sovran_pros/sp.sh @@ -104,6 +104,10 @@ EOT # +nixos-rebuild switch --impure + +# + 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 From 1a8d684f70ff0ebff91972399b3ccc0cc9dbd64f Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Fri, 14 Jul 2023 23:08:43 -0700 Subject: [PATCH 124/667] updated sp.sh --- for_new_sovran_pros/sp.sh | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/for_new_sovran_pros/sp.sh b/for_new_sovran_pros/sp.sh index 118df58..9579862 100644 --- a/for_new_sovran_pros/sp.sh +++ b/for_new_sovran_pros/sp.sh @@ -108,6 +108,8 @@ nixos-rebuild switch --impure # +mkdir /root/.ssh/agenix/agenix-secret-keys + 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 @@ -116,6 +118,15 @@ sed -i 's:\(root =[[:blank:]]*\)\(.*\):\1"\2";:' /var/lib/agenix-secrets/secrets # +mkdir /var/lib/secrets/nextclouddb +mkdir /var/lib/secrets/wordpressdb +mkdir /var/lib/secrets/matrixdb +mkdir /var/lib/secrets/turn +mkdir /var/lib/secrets/matrix_reg_secret +mkdir /var/lib/secrets/main +mkdir /var/lib/secrets/onlyofficejwtSecretFile +mkdir /var/lib/secrets/vaultwarden/vaultwarden.env + 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 @@ -128,6 +139,8 @@ echo -n ADMIN_TOKEN=$(openssl rand -base64 48 # +mkdir /var/lib/agenix-secrets + 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 From 0bcc2176a2dd77f9878e841c1bdcb0bbd2bcc05b Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Fri, 14 Jul 2023 23:23:32 -0700 Subject: [PATCH 125/667] updated sp.sh --- for_new_sovran_pros/sp.sh | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/for_new_sovran_pros/sp.sh b/for_new_sovran_pros/sp.sh index 9579862..3d824dd 100644 --- a/for_new_sovran_pros/sp.sh +++ b/for_new_sovran_pros/sp.sh @@ -108,7 +108,7 @@ nixos-rebuild switch --impure # -mkdir /root/.ssh/agenix/agenix-secret-keys +mkdir /root/.ssh/agenix ssh-keygen -q -N "" -t ed25519 -f /root/.ssh/agenix/agenix-secret-keys @@ -118,14 +118,16 @@ sed -i 's:\(root =[[:blank:]]*\)\(.*\):\1"\2";:' /var/lib/agenix-secrets/secrets # -mkdir /var/lib/secrets/nextclouddb -mkdir /var/lib/secrets/wordpressdb -mkdir /var/lib/secrets/matrixdb -mkdir /var/lib/secrets/turn -mkdir /var/lib/secrets/matrix_reg_secret -mkdir /var/lib/secrets/main -mkdir /var/lib/secrets/onlyofficejwtSecretFile -mkdir /var/lib/secrets/vaultwarden/vaultwarden.env +mkdir /var/lib/secrets + +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 echo -n $(pwgen -s 17 -1) > /var/lib/secrets/nextclouddb echo -n $(pwgen -s 17 -1) > /var/lib/secrets/wordpressdb @@ -139,8 +141,6 @@ echo -n ADMIN_TOKEN=$(openssl rand -base64 48 # -mkdir /var/lib/agenix-secrets - 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 From ae2f22db4627c5e26529bfedb068c7db679a142e Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Fri, 14 Jul 2023 23:36:36 -0700 Subject: [PATCH 126/667] updated sp.sh --- for_new_sovran_pros/sp.sh | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/for_new_sovran_pros/sp.sh b/for_new_sovran_pros/sp.sh index 3d824dd..087612a 100644 --- a/for_new_sovran_pros/sp.sh +++ b/for_new_sovran_pros/sp.sh @@ -104,7 +104,13 @@ EOT # -nixos-rebuild switch --impure +pushd /etc/nixos + + nix flake update + + nixos-rebuild switch --impure + +popd # @@ -157,7 +163,13 @@ popd # -nixos-rebuild switch --impure +pushd /etc/nixos + + nix flake update + + nixos-rebuild switch --impure + +popd # @@ -287,8 +299,15 @@ chown electrs:electrs /run/media/Second_Drive/BTCEcoandBackup/Electrs_Data -R chmod 770 /run/media/Second_Drive/BTCEcoandBackup/Electrs_Data -R -nixos-rebuild switch --impure +# +pushd /etc/nixos + + nix flake update + + nixos-rebuild switch --impure + +popd # From 40ceec1d9e4107092877757429064dfbbf985afc Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Fri, 14 Jul 2023 23:42:37 -0700 Subject: [PATCH 127/667] updated sp.sh --- for_new_sovran_pros/sp.sh | 72 ++++++++++++++++++++------------------- 1 file changed, 37 insertions(+), 35 deletions(-) diff --git a/for_new_sovran_pros/sp.sh b/for_new_sovran_pros/sp.sh index 087612a..f637cf4 100644 --- a/for_new_sovran_pros/sp.sh +++ b/for_new_sovran_pros/sp.sh @@ -30,6 +30,43 @@ 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 + + +chown caddy:php /var/lib/domains -R + +chmod 770 /var/lib/domains -R + +# + +# + mkdir /var/lib/nextcloudaddition cat <> /var/lib/nextcloudaddition/nextcloudaddition @@ -195,41 +232,6 @@ chmod 770 /var/lib/secrets/ -R # -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 - - -chown caddy:php /var/lib/domains -R - -chmod 770 /var/lib/domains -R - -# - set -x # From 7393be49b4a6e4afc3a8a18fbe0f6a0e7a5708b4 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Fri, 14 Jul 2023 23:43:43 -0700 Subject: [PATCH 128/667] updated sp.sh --- for_new_sovran_pros/sp.sh | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/for_new_sovran_pros/sp.sh b/for_new_sovran_pros/sp.sh index f637cf4..0af85d0 100644 --- a/for_new_sovran_pros/sp.sh +++ b/for_new_sovran_pros/sp.sh @@ -58,13 +58,6 @@ echo -e "${GREEN}What is the email you would like to use to manage the SSL certi read echo -n $REPLY > /var/lib/domains/sslemail - -chown caddy:php /var/lib/domains -R - -chmod 770 /var/lib/domains -R - -# - # mkdir /var/lib/nextcloudaddition @@ -151,6 +144,12 @@ popd # +chown caddy:php /var/lib/domains -R + +chmod 770 /var/lib/domains -R + +# + mkdir /root/.ssh/agenix ssh-keygen -q -N "" -t ed25519 -f /root/.ssh/agenix/agenix-secret-keys From 706c83afed6297b1186025c89dd628006eb47bb7 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Fri, 14 Jul 2023 23:50:43 -0700 Subject: [PATCH 129/667] updated sp.sh and psp.sh --- for_new_sovran_pros/psp.sh | 1 + for_new_sovran_pros/sp.sh | 52 +++++++++++++++++++------------------- 2 files changed, 27 insertions(+), 26 deletions(-) diff --git a/for_new_sovran_pros/psp.sh b/for_new_sovran_pros/psp.sh index 843b73b..3bfa75d 100644 --- a/for_new_sovran_pros/psp.sh +++ b/for_new_sovran_pros/psp.sh @@ -55,6 +55,7 @@ cat <> /mnt/etc/nixos/configuration.nix git ranger fish + pwgen ]; services.openssh = { diff --git a/for_new_sovran_pros/sp.sh b/for_new_sovran_pros/sp.sh index 0af85d0..aa9e670 100644 --- a/for_new_sovran_pros/sp.sh +++ b/for_new_sovran_pros/sp.sh @@ -134,32 +134,6 @@ EOT # -pushd /etc/nixos - - nix flake update - - nixos-rebuild switch --impure - -popd - -# - -chown caddy:php /var/lib/domains -R - -chmod 770 /var/lib/domains -R - -# - -mkdir /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 - -# - mkdir /var/lib/secrets touch /var/lib/secrets/nextclouddb @@ -209,6 +183,32 @@ popd # +chown caddy:php /var/lib/domains -R + +chmod 770 /var/lib/domains -R + +# + +mkdir /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 /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 From 7a3c7377a2d00b8ee3a2d60bc6f371c19f26b549 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Sat, 15 Jul 2023 00:13:18 -0700 Subject: [PATCH 130/667] updated sp.sh and psp.sh --- for_new_sovran_pros/psp.sh | 1 + for_new_sovran_pros/sp.sh | 21 +++++++++++++++++++++ 2 files changed, 22 insertions(+) diff --git a/for_new_sovran_pros/psp.sh b/for_new_sovran_pros/psp.sh index 3bfa75d..b8c947b 100644 --- a/for_new_sovran_pros/psp.sh +++ b/for_new_sovran_pros/psp.sh @@ -56,6 +56,7 @@ cat <> /mnt/etc/nixos/configuration.nix ranger fish pwgen + openssl ]; services.openssh = { diff --git a/for_new_sovran_pros/sp.sh b/for_new_sovran_pros/sp.sh index aa9e670..b1e203b 100644 --- a/for_new_sovran_pros/sp.sh +++ b/for_new_sovran_pros/sp.sh @@ -1,5 +1,7 @@ #!/usr/bin/env bash +set -o nounset + GREEN="\e[32m" LIGHTBLUE="\e[94m" ENDCOLOR="\e[0m" @@ -135,6 +137,7 @@ EOT # mkdir /var/lib/secrets +mkdir /var/lib/secrets/vaultwarden touch /var/lib/secrets/nextclouddb touch /var/lib/secrets/wordpressdb @@ -171,6 +174,12 @@ pushd /var/lib/agenix-secrets/ popd + if [[ $? != 0 ]]; then + + exit 1 + + fi + # pushd /etc/nixos @@ -181,6 +190,12 @@ pushd /etc/nixos popd + if [[ $? != 0 ]]; then + + exit 1 + + fi + # chown caddy:php /var/lib/domains -R @@ -207,6 +222,12 @@ pushd /etc/nixos popd + if [[ $? != 0 ]]; then + + exit 1 + + fi + # chown root:root /var/lib/secrets/main -R From 420ebd05b88282176e88584dc3a9129dff8ee7fe Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Sat, 15 Jul 2023 00:19:47 -0700 Subject: [PATCH 131/667] updated sp.sh and psp.sh --- for_new_sovran_pros/psp.sh | 2 ++ for_new_sovran_pros/sp.sh | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/for_new_sovran_pros/psp.sh b/for_new_sovran_pros/psp.sh index b8c947b..f800a73 100644 --- a/for_new_sovran_pros/psp.sh +++ b/for_new_sovran_pros/psp.sh @@ -1,5 +1,7 @@ #!/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" diff --git a/for_new_sovran_pros/sp.sh b/for_new_sovran_pros/sp.sh index b1e203b..5e3e8bc 100644 --- a/for_new_sovran_pros/sp.sh +++ b/for_new_sovran_pros/sp.sh @@ -114,7 +114,7 @@ cat <> /var/lib/agenix-secrets/secrets.nix let - root = + root = ; in { From d960efbb9bfddca14a8ae4964fe798e9b0c2c1b0 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Sat, 15 Jul 2023 00:26:44 -0700 Subject: [PATCH 132/667] updated sp.sh and psp.sh --- for_new_sovran_pros/sp.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/for_new_sovran_pros/sp.sh b/for_new_sovran_pros/sp.sh index 5e3e8bc..9f38cb9 100644 --- a/for_new_sovran_pros/sp.sh +++ b/for_new_sovran_pros/sp.sh @@ -1,5 +1,7 @@ #!/usr/bin/env bash +# wget https://git.sovransystems.com/Sovran_Systems/Sovran_SystemsOS/raw/branch/main/for_new_sovran_pros/sp.sh + set -o nounset GREEN="\e[32m" @@ -114,7 +116,7 @@ cat <> /var/lib/agenix-secrets/secrets.nix let - root = ; + root = "" ; in { From 1a422a3234fd16085c627450411ab676bb3f7ae3 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Sat, 15 Jul 2023 00:37:16 -0700 Subject: [PATCH 133/667] updated sp.sh and psp.sh --- for_new_sovran_pros/sp.sh | 106 ++++++++++++++++---------------------- 1 file changed, 43 insertions(+), 63 deletions(-) diff --git a/for_new_sovran_pros/sp.sh b/for_new_sovran_pros/sp.sh index 9f38cb9..3e7ad6b 100644 --- a/for_new_sovran_pros/sp.sh +++ b/for_new_sovran_pros/sp.sh @@ -2,7 +2,7 @@ # wget https://git.sovransystems.com/Sovran_Systems/Sovran_SystemsOS/raw/branch/main/for_new_sovran_pros/sp.sh -set -o nounset +set -e GREEN="\e[32m" LIGHTBLUE="\e[94m" @@ -116,7 +116,7 @@ cat <> /var/lib/agenix-secrets/secrets.nix let - root = "" ; + root = "placeholder" ; in { @@ -162,28 +162,6 @@ echo -n ADMIN_TOKEN=$(openssl rand -base64 48 # -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 - - if [[ $? != 0 ]]; then - - exit 1 - - fi - -# - pushd /etc/nixos nix flake update @@ -192,44 +170,6 @@ pushd /etc/nixos popd - if [[ $? != 0 ]]; then - - exit 1 - - fi - -# - -chown caddy:php /var/lib/domains -R - -chmod 770 /var/lib/domains -R - -# - -mkdir /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 /etc/nixos - - nix flake update - - nixos-rebuild switch --impure - -popd - - if [[ $? != 0 ]]; then - - exit 1 - - fi - # chown root:root /var/lib/secrets/main -R @@ -254,10 +194,50 @@ chmod 770 /var/lib/secrets/ -R # -set -x +mkdir /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 + +# + +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 From 26738578816e7148c1729847742dc55770cb25fc Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Sat, 15 Jul 2023 00:43:26 -0700 Subject: [PATCH 134/667] updated sp.sh --- for_new_sovran_pros/sp.sh | 38 +++++++++++++++++++++++++++++++++++++- 1 file changed, 37 insertions(+), 1 deletion(-) diff --git a/for_new_sovran_pros/sp.sh b/for_new_sovran_pros/sp.sh index 3e7ad6b..6e95b41 100644 --- a/for_new_sovran_pros/sp.sh +++ b/for_new_sovran_pros/sp.sh @@ -2,7 +2,6 @@ # wget https://git.sovransystems.com/Sovran_Systems/Sovran_SystemsOS/raw/branch/main/for_new_sovran_pros/sp.sh -set -e GREEN="\e[32m" LIGHTBLUE="\e[94m" @@ -170,6 +169,16 @@ pushd /etc/nixos popd +exit_on_error() { + exit_code=$1 + last_command=${@:2} + if [ $exit_code -ne 0 ]; then + >&2 echo "\"${last_command}\" command failed with exit code ${exit_code}." + exit $exit_code + fi +} + + # chown root:root /var/lib/secrets/main -R @@ -202,6 +211,15 @@ sed -i -e "0,/root.*/{s::root = $(cat /root/.ssh/agenix/agenix-secret-keys.pub): sed -i 's:\(root =[[:blank:]]*\)\(.*\):\1"\2";:' /var/lib/agenix-secrets/secrets.nix +exit_on_error() { + exit_code=$1 + last_command=${@:2} + if [ $exit_code -ne 0 ]; then + >&2 echo "\"${last_command}\" command failed with exit code ${exit_code}." + exit $exit_code + fi +} + # pushd /var/lib/agenix-secrets/ @@ -218,6 +236,15 @@ pushd /var/lib/agenix-secrets/ popd +exit_on_error() { + exit_code=$1 + last_command=${@:2} + if [ $exit_code -ne 0 ]; then + >&2 echo "\"${last_command}\" command failed with exit code ${exit_code}." + exit $exit_code + fi +} + # chown caddy:php /var/lib/domains -R @@ -234,6 +261,15 @@ pushd /etc/nixos popd +exit_on_error() { + exit_code=$1 + last_command=${@:2} + if [ $exit_code -ne 0 ]; then + >&2 echo "\"${last_command}\" command failed with exit code ${exit_code}." + exit $exit_code + fi +} + # set -x From 8dbbdb29e6b68d9bd3408a0824b925bbbffeb8ca Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Sat, 15 Jul 2023 00:54:02 -0700 Subject: [PATCH 135/667] updated sp.sh and psp.sh --- for_new_sovran_pros/psp.sh | 1 + for_new_sovran_pros/sp.sh | 87 +++++++++++--------------------------- 2 files changed, 26 insertions(+), 62 deletions(-) diff --git a/for_new_sovran_pros/psp.sh b/for_new_sovran_pros/psp.sh index f800a73..6a9ffac 100644 --- a/for_new_sovran_pros/psp.sh +++ b/for_new_sovran_pros/psp.sh @@ -59,6 +59,7 @@ cat <> /mnt/etc/nixos/configuration.nix fish pwgen openssl + sed ]; services.openssh = { diff --git a/for_new_sovran_pros/sp.sh b/for_new_sovran_pros/sp.sh index 6e95b41..4ccd09a 100644 --- a/for_new_sovran_pros/sp.sh +++ b/for_new_sovran_pros/sp.sh @@ -161,6 +161,31 @@ echo -n ADMIN_TOKEN=$(openssl rand -base64 48 # +mkdir /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 @@ -169,15 +194,6 @@ pushd /etc/nixos popd -exit_on_error() { - exit_code=$1 - last_command=${@:2} - if [ $exit_code -ne 0 ]; then - >&2 echo "\"${last_command}\" command failed with exit code ${exit_code}." - exit $exit_code - fi -} - # @@ -203,50 +219,6 @@ chmod 770 /var/lib/secrets/ -R # -mkdir /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 - -exit_on_error() { - exit_code=$1 - last_command=${@:2} - if [ $exit_code -ne 0 ]; then - >&2 echo "\"${last_command}\" command failed with exit code ${exit_code}." - exit $exit_code - fi -} - -# - -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 - -exit_on_error() { - exit_code=$1 - last_command=${@:2} - if [ $exit_code -ne 0 ]; then - >&2 echo "\"${last_command}\" command failed with exit code ${exit_code}." - exit $exit_code - fi -} - -# - chown caddy:php /var/lib/domains -R chmod 770 /var/lib/domains -R @@ -261,15 +233,6 @@ pushd /etc/nixos popd -exit_on_error() { - exit_code=$1 - last_command=${@:2} - if [ $exit_code -ne 0 ]; then - >&2 echo "\"${last_command}\" command failed with exit code ${exit_code}." - exit $exit_code - fi -} - # set -x From 690ce49a6bfc540c0052a219c0eead78e8240ef5 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Sat, 15 Jul 2023 01:00:30 -0700 Subject: [PATCH 136/667] updated psp.sh --- for_new_sovran_pros/psp.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/for_new_sovran_pros/psp.sh b/for_new_sovran_pros/psp.sh index 6a9ffac..f800a73 100644 --- a/for_new_sovran_pros/psp.sh +++ b/for_new_sovran_pros/psp.sh @@ -59,7 +59,6 @@ cat <> /mnt/etc/nixos/configuration.nix fish pwgen openssl - sed ]; services.openssh = { From 28d2ea31d6b797c401f37d6f4cc7689fa40cd21d Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Sat, 15 Jul 2023 01:19:36 -0700 Subject: [PATCH 137/667] updated psp.sh --- for_new_sovran_pros/sp.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/for_new_sovran_pros/sp.sh b/for_new_sovran_pros/sp.sh index 4ccd09a..5719130 100644 --- a/for_new_sovran_pros/sp.sh +++ b/for_new_sovran_pros/sp.sh @@ -148,6 +148,7 @@ 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 @@ -161,7 +162,7 @@ echo -n ADMIN_TOKEN=$(openssl rand -base64 48 # -mkdir /root/.ssh/agenix +mkdir -p /root/.ssh/agenix ssh-keygen -q -N "" -t ed25519 -f /root/.ssh/agenix/agenix-secret-keys @@ -171,7 +172,7 @@ sed -i 's:\(root =[[:blank:]]*\)\(.*\):\1"\2";:' /var/lib/agenix-secrets/secrets # -pushd /var/lib/agenix-secrets/ +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 From fb15fd8be2e6d75016a1bdef933d7010eb3e9464 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Sat, 15 Jul 2023 07:58:43 -0700 Subject: [PATCH 138/667] updated psp.sh --- for_new_sovran_pros/sp.sh | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/for_new_sovran_pros/sp.sh b/for_new_sovran_pros/sp.sh index 5719130..72b1e76 100644 --- a/for_new_sovran_pros/sp.sh +++ b/for_new_sovran_pros/sp.sh @@ -274,6 +274,8 @@ 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 @@ -287,10 +289,6 @@ sed -i -e "0,/ssh-ed25519.*/{ s::$(cat /home/free/.ssh/factory_login.pub): }" /r # -echo "free:a" | chpasswd -c SHA512 - -# - rm -rf /root/sp.sh # @@ -341,14 +339,6 @@ sudo echo "no" | matrix-synapse-register_new_matrix_user -u test -p a # -sed -i '$e cat /var/lib/nextcloudaddition/nextcloudaddition' /var/lib/www/nextcloud/config/config.php - -chown caddy:php /var/lib/www -R - -chmod 770 /var/lib/www -R - -# - echo "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCQa3DEhx9RUtV0WopfFuL3cjQt2fBzp5wOg/hkj0FXyZXpp+F47Td1B9mKMNvucINaMQB6T0mW6c70fyT92gZO2OqCff6aeWovtTd9ynRgtJbny/qvVSShDbJcR7nSMeVPoDRaYs18fuA50guYnfoYAkaXyXPmVQ0uK84HwIB5j8gq6GMji7vv+TTNhDP8qOceUzt1DYPo9Z2JSnkFey+Z/fmxWJGsu+MSrA0/PPENEmf6L0ZSgxnu3gHEtdyX2hrFzjE16y3G0wSQzbWJb8MJO0KRSMcyvz6AzOSW4RYdXR1c+4JiciKRdnIAYYHfg7tnZT9wC9AzHjdEbmmrlF05mtjXKnxbPgGY0tlRSYo7B5E0k2zfi30MkIJ6kIE9TMM2z/+1KstrQN4OKBTGomBTYQaRQCT6dGpRTR+b8lOvUcnCSuat1sUC2M2VGFcBbDbKD0FyXy/vOk1pgA4I7GoESWQClnl+ntRg8HrW4oVTX2KpqR2CXjlF956HJGqHW6k= free@nixos" >> /root/.ssh/authorized_keys # From 0bf247825ff657f67b75fa120327f28ff975c0f6 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Sat, 15 Jul 2023 08:02:23 -0700 Subject: [PATCH 139/667] updated psp.sh --- for_new_sovran_pros/sp.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/for_new_sovran_pros/sp.sh b/for_new_sovran_pros/sp.sh index 72b1e76..1cd70c1 100644 --- a/for_new_sovran_pros/sp.sh +++ b/for_new_sovran_pros/sp.sh @@ -313,21 +313,21 @@ popd # -wget https://git.sovransystems.com/Sovran_Systems/Software/raw/branch/main/Sovran_SystemsOS_Reseter/sovran_systemsOS_reseter_local_installer/sovran_systemsOS_reseter_install.sh - pushd ~/Downloads -sudo -u free bash sovran_systemsOS_reseter_install.sh + wget https://git.sovransystems.com/Sovran_Systems/Software/raw/branch/main/Sovran_SystemsOS_Reseter/sovran_systemsOS_reseter_local_installer/sovran_systemsOS_reseter_install.sh + + sudo -u free bash sovran_systemsOS_reseter_install.sh popd # -wget https://git.sovransystems.com/Sovran_Systems/Software/raw/branch/main/Sovran_SystemsOS_Updater/sovran_systemsOS_updater_local_installer/sovran_systemsOS_updater_install.sh - pushd ~/Downloads -sudo -u free bash sovran_systemsOS_updater_install.sh + wget https://git.sovransystems.com/Sovran_Systems/Software/raw/branch/main/Sovran_SystemsOS_Updater/sovran_systemsOS_updater_local_installer/sovran_systemsOS_updater_install.sh + + sudo -u free bash sovran_systemsOS_updater_install.sh popd From a68b0cb94e570b86f84cd066c60b4ab19c081ae6 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Sat, 15 Jul 2023 09:31:49 -0700 Subject: [PATCH 140/667] updated psp.sh --- for_new_sovran_pros/sp.sh | 68 ++++++++++++++++++++------------------- 1 file changed, 35 insertions(+), 33 deletions(-) diff --git a/for_new_sovran_pros/sp.sh b/for_new_sovran_pros/sp.sh index 1cd70c1..08ce4a5 100644 --- a/for_new_sovran_pros/sp.sh +++ b/for_new_sovran_pros/sp.sh @@ -66,14 +66,14 @@ echo -n $REPLY > /var/lib/domains/sslemail mkdir /var/lib/nextcloudaddition cat <> /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', + '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 @@ -115,20 +115,20 @@ cat <> /var/lib/agenix-secrets/secrets.nix let - root = "placeholder" ; + root = "placeholder" ; in { - "wordpressdb.age".publicKeys = [ root ]; - - "matrixdb.age".publicKeys = [ root ]; + "wordpressdb.age".publicKeys = [ root ]; + + "matrixdb.age".publicKeys = [ root ]; - "nextclouddb.age".publicKeys = [ root ]; + "nextclouddb.age".publicKeys = [ root ]; - "turn.age".publicKeys = [ root ]; + "turn.age".publicKeys = [ root ]; - "matrix_reg_secret.age".publicKeys = [ root ]; + "matrix_reg_secret.age".publicKeys = [ root ]; } @@ -174,24 +174,24 @@ sed -i 's:\(root =[[:blank:]]*\)\(.*\):\1"\2";:' /var/lib/agenix-secrets/secrets 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/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/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/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/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 + 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 + nix flake update - nixos-rebuild switch --impure + nixos-rebuild switch --impure popd @@ -228,9 +228,9 @@ chmod 770 /var/lib/domains -R pushd /etc/nixos - nix flake update + nix flake update - nixos-rebuild switch --impure + nixos-rebuild switch --impure popd @@ -283,6 +283,8 @@ flatpak update # +mkdir -p /root/.ssh/authorized_keys + sudo -u free ssh-keygen -q -N "gosovransytems" -t ed25519 -f /home/free/.ssh/factory_login sed -i -e "0,/ssh-ed25519.*/{ s::$(cat /home/free/.ssh/factory_login.pub): }" /root/.ssh/authorized_keys @@ -305,9 +307,9 @@ chmod 770 /run/media/Second_Drive/BTCEcoandBackup/Electrs_Data -R pushd /etc/nixos - nix flake update + nix flake update - nixos-rebuild switch --impure + nixos-rebuild switch --impure popd @@ -315,9 +317,9 @@ popd pushd ~/Downloads - wget https://git.sovransystems.com/Sovran_Systems/Software/raw/branch/main/Sovran_SystemsOS_Reseter/sovran_systemsOS_reseter_local_installer/sovran_systemsOS_reseter_install.sh + wget https://git.sovransystems.com/Sovran_Systems/Software/raw/branch/main/Sovran_SystemsOS_Reseter/sovran_systemsOS_reseter_local_installer/sovran_systemsOS_reseter_install.sh - sudo -u free bash sovran_systemsOS_reseter_install.sh + sudo -u free bash sovran_systemsOS_reseter_install.sh popd @@ -325,9 +327,9 @@ popd pushd ~/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 + wget https://git.sovransystems.com/Sovran_Systems/Software/raw/branch/main/Sovran_SystemsOS_Updater/sovran_systemsOS_updater_local_installer/sovran_systemsOS_updater_install.sh - sudo -u free bash sovran_systemsOS_updater_install.sh + sudo -u free bash sovran_systemsOS_updater_install.sh popd @@ -344,11 +346,11 @@ echo "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCQa3DEhx9RUtV0WopfFuL3cjQt2fBzp5wOg/ pushd /home/free/Downloads - wget https://git.sovransystems.com/Sovran_Systems/Sovran_SystemsOS/raw/branch/main/for_new_sovran_pros/Sovran_SystemsOS-Desktop + wget https://git.sovransystems.com/Sovran_Systems/Sovran_SystemsOS/raw/branch/main/for_new_sovran_pros/Sovran_SystemsOS-Desktop - sudo -u free dconf load / < Sovran_SystemsOS-Desktop + sudo -u free dconf load / < Sovran_SystemsOS-Desktop - rm -rf Sovran_SystemsOS-Desktop + rm -rf Sovran_SystemsOS-Desktop popd From 80542bfea9458c6b5123c2f8816160e3368b49ce Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Sat, 15 Jul 2023 09:50:54 -0700 Subject: [PATCH 141/667] updated psp.sh and ps.sh --- for_new_sovran_pros/psp.sh | 7 +++++++ for_new_sovran_pros/sp.sh | 13 +------------ 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/for_new_sovran_pros/psp.sh b/for_new_sovran_pros/psp.sh index f800a73..e55ddee 100644 --- a/for_new_sovran_pros/psp.sh +++ b/for_new_sovran_pros/psp.sh @@ -52,6 +52,13 @@ cat <> /mnt/etc/nixos/configuration.nix ''; }; + users.users = { + free = { + isNormalUser = true; + description = "free"; + extraGroups = [ "networkmanager" ]; + }; + environment.systemPackages = with pkgs; [ wget git diff --git a/for_new_sovran_pros/sp.sh b/for_new_sovran_pros/sp.sh index 08ce4a5..fea258c 100644 --- a/for_new_sovran_pros/sp.sh +++ b/for_new_sovran_pros/sp.sh @@ -342,20 +342,9 @@ 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 -# - -pushd /home/free/Downloads - - wget https://git.sovransystems.com/Sovran_Systems/Sovran_SystemsOS/raw/branch/main/for_new_sovran_pros/Sovran_SystemsOS-Desktop - - sudo -u free dconf load / < Sovran_SystemsOS-Desktop - - rm -rf Sovran_SystemsOS-Desktop - -popd - # + 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" From 4ee36dbbf6e6154357ed07582275769c84fdfc57 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Sat, 15 Jul 2023 10:01:19 -0700 Subject: [PATCH 142/667] updated psp.sh and ps.sh --- for_new_sovran_pros/sp.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/for_new_sovran_pros/sp.sh b/for_new_sovran_pros/sp.sh index fea258c..d318f14 100644 --- a/for_new_sovran_pros/sp.sh +++ b/for_new_sovran_pros/sp.sh @@ -315,7 +315,7 @@ popd # -pushd ~/Downloads +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 @@ -325,7 +325,7 @@ popd # -pushd ~/Downloads +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 From eaa0d875cfbf746149d7819f148e74b527509a3f Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Sat, 15 Jul 2023 10:27:42 -0700 Subject: [PATCH 143/667] updated psp.sh and ps.sh --- for_new_sovran_pros/sp.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/for_new_sovran_pros/sp.sh b/for_new_sovran_pros/sp.sh index d318f14..f5efb5e 100644 --- a/for_new_sovran_pros/sp.sh +++ b/for_new_sovran_pros/sp.sh @@ -317,7 +317,7 @@ 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 + sudo -u free wget https://git.sovransystems.com/Sovran_Systems/Software/raw/branch/main/Sovran_SystemsOS_Reseter/sovran_systemsOS_reseter_local_installer/sovran_systemsOS_reseter_install.sh sudo -u free bash sovran_systemsOS_reseter_install.sh @@ -327,7 +327,7 @@ 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 + sudo -u free wget https://git.sovransystems.com/Sovran_Systems/Software/raw/branch/main/Sovran_SystemsOS_Updater/sovran_systemsOS_updater_local_installer/sovran_systemsOS_updater_install.sh sudo -u free bash sovran_systemsOS_updater_install.sh From 8f731a0ca36ac9b9520a2d3bff6bb0f8632fcb35 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Sat, 15 Jul 2023 10:31:44 -0700 Subject: [PATCH 144/667] updated ps.sh --- for_new_sovran_pros/sp.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/for_new_sovran_pros/sp.sh b/for_new_sovran_pros/sp.sh index f5efb5e..c0f38f9 100644 --- a/for_new_sovran_pros/sp.sh +++ b/for_new_sovran_pros/sp.sh @@ -287,7 +287,8 @@ mkdir -p /root/.ssh/authorized_keys sudo -u free ssh-keygen -q -N "gosovransytems" -t ed25519 -f /home/free/.ssh/factory_login -sed -i -e "0,/ssh-ed25519.*/{ s::$(cat /home/free/.ssh/factory_login.pub): }" /root/.ssh/authorized_keys +echo "$(cat /home/free/.ssh/factory_login.pub)" >> /root/.ssh/authorized_keys + # From 5d69ceabfce8d371e04c269652ae2800f1593fdb Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Sat, 15 Jul 2023 11:05:15 -0700 Subject: [PATCH 145/667] updated ps.sh --- for_new_sovran_pros/sp.sh | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/for_new_sovran_pros/sp.sh b/for_new_sovran_pros/sp.sh index c0f38f9..4e7a0f2 100644 --- a/for_new_sovran_pros/sp.sh +++ b/for_new_sovran_pros/sp.sh @@ -283,7 +283,9 @@ flatpak update # -mkdir -p /root/.ssh/authorized_keys +mkdir /root/.ssh + +touch /root/.ssh/authorized_keys sudo -u free ssh-keygen -q -N "gosovransytems" -t ed25519 -f /home/free/.ssh/factory_login @@ -318,9 +320,9 @@ popd pushd /home/free/Downloads - sudo -u free wget https://git.sovransystems.com/Sovran_Systems/Software/raw/branch/main/Sovran_SystemsOS_Reseter/sovran_systemsOS_reseter_local_installer/sovran_systemsOS_reseter_install.sh + wget https://git.sovransystems.com/Sovran_Systems/Software/raw/branch/main/Sovran_SystemsOS_Reseter/sovran_systemsOS_reseter_local_installer/sovran_systemsOS_reseter_install.sh - sudo -u free bash sovran_systemsOS_reseter_install.sh + bash sovran_systemsOS_reseter_install.sh popd @@ -328,9 +330,9 @@ popd pushd /home/free/Downloads - sudo -u free wget https://git.sovransystems.com/Sovran_Systems/Software/raw/branch/main/Sovran_SystemsOS_Updater/sovran_systemsOS_updater_local_installer/sovran_systemsOS_updater_install.sh + wget https://git.sovransystems.com/Sovran_Systems/Software/raw/branch/main/Sovran_SystemsOS_Updater/sovran_systemsOS_updater_local_installer/sovran_systemsOS_updater_install.sh - sudo -u free bash sovran_systemsOS_updater_install.sh + bash sovran_systemsOS_updater_install.sh popd From 7d5044e0a6e29a7ac76a79df940066c8810b49ba Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Sat, 15 Jul 2023 11:29:18 -0700 Subject: [PATCH 146/667] updated ps.sh --- for_new_sovran_pros/sp.sh | 75 ++++++++++++++++++++------------------- 1 file changed, 38 insertions(+), 37 deletions(-) diff --git a/for_new_sovran_pros/sp.sh b/for_new_sovran_pros/sp.sh index 4e7a0f2..7e245c1 100644 --- a/for_new_sovran_pros/sp.sh +++ b/for_new_sovran_pros/sp.sh @@ -11,11 +11,11 @@ ENDCOLOR="\e[0m" pushd /etc/nixos/ - wget https://git.sovransystems.com/Sovran_Systems/Sovran_SystemsOS/raw/branch/main/for_new_sovran_pros/flake.nix + 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 + chown root:root /etc/nixos/ -R + + chmod 770 /etc/nixos/ -R popd @@ -66,14 +66,15 @@ echo -n $REPLY > /var/lib/domains/sslemail mkdir /var/lib/nextcloudaddition cat <> /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', + +'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 @@ -85,11 +86,11 @@ cat <> /var/lib/njalla/njalla.sh #!/usr/bin/env bash -IP=$(wget -qO- https://ipecho.net/plain ; echo) +# IP=$(wget -qO- https://ipecho.net/plain ; echo) -##Manually Add DDNS Script From Njalla User Account AFTER Install +## Manually Add DDNS Script From Njalla User Account AFTER Install -curl "https://...${IP}" +#curl "https://...${IP}" EOT @@ -115,20 +116,20 @@ cat <> /var/lib/agenix-secrets/secrets.nix let - root = "placeholder" ; + root = "placeholder" ; in { - "wordpressdb.age".publicKeys = [ root ]; - - "matrixdb.age".publicKeys = [ root ]; + "wordpressdb.age".publicKeys = [ root ]; + + "matrixdb.age".publicKeys = [ root ]; - "nextclouddb.age".publicKeys = [ root ]; + "nextclouddb.age".publicKeys = [ root ]; - "turn.age".publicKeys = [ root ]; + "turn.age".publicKeys = [ root ]; - "matrix_reg_secret.age".publicKeys = [ root ]; + "matrix_reg_secret.age".publicKeys = [ root ]; } @@ -174,24 +175,24 @@ sed -i 's:\(root =[[:blank:]]*\)\(.*\):\1"\2";:' /var/lib/agenix-secrets/secrets 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/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/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/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/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 + 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 + nix flake update - nixos-rebuild switch --impure + nixos-rebuild switch --impure popd @@ -228,9 +229,9 @@ chmod 770 /var/lib/domains -R pushd /etc/nixos - nix flake update + nix flake update - nixos-rebuild switch --impure + nixos-rebuild switch --impure popd @@ -310,9 +311,9 @@ chmod 770 /run/media/Second_Drive/BTCEcoandBackup/Electrs_Data -R pushd /etc/nixos - nix flake update + nix flake update - nixos-rebuild switch --impure + nixos-rebuild switch --impure popd @@ -320,9 +321,9 @@ popd pushd /home/free/Downloads - wget https://git.sovransystems.com/Sovran_Systems/Software/raw/branch/main/Sovran_SystemsOS_Reseter/sovran_systemsOS_reseter_local_installer/sovran_systemsOS_reseter_install.sh + wget https://git.sovransystems.com/Sovran_Systems/Software/raw/branch/main/Sovran_SystemsOS_Reseter/sovran_systemsOS_reseter_local_installer/sovran_systemsOS_reseter_install.sh - bash sovran_systemsOS_reseter_install.sh + bash sovran_systemsOS_reseter_install.sh popd @@ -330,9 +331,9 @@ 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 + 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 + bash sovran_systemsOS_updater_install.sh popd From 347cd8f65a5053d776457a30539a45eb83dc1d9d Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Sat, 15 Jul 2023 11:43:58 -0700 Subject: [PATCH 147/667] updated ps.sh and added wallpaper --- for_new_sovran_pros/sp.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/for_new_sovran_pros/sp.sh b/for_new_sovran_pros/sp.sh index 7e245c1..32891e8 100644 --- a/for_new_sovran_pros/sp.sh +++ b/for_new_sovran_pros/sp.sh @@ -286,6 +286,8 @@ flatpak update mkdir /root/.ssh +mdir -p /home/free/.ssh + touch /root/.ssh/authorized_keys sudo -u free ssh-keygen -q -N "gosovransytems" -t ed25519 -f /home/free/.ssh/factory_login From 44dc5086262d4ae19a080ed7026c4a85d26acc8c Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Sat, 15 Jul 2023 11:52:47 -0700 Subject: [PATCH 148/667] updated ps.sh and added wallpaper --- for_new_sovran_pros/Sovran_SystemsOS-Desktop | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/for_new_sovran_pros/Sovran_SystemsOS-Desktop b/for_new_sovran_pros/Sovran_SystemsOS-Desktop index b4795c1..52fd087 100644 --- a/for_new_sovran_pros/Sovran_SystemsOS-Desktop +++ b/for_new_sovran_pros/Sovran_SystemsOS-Desktop @@ -92,10 +92,10 @@ 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' +picture-uri='file:///home/free/.local/share/backgrounds/2023-07-15-11-45-35-Wallpaper_Dark_Wide.png' +picture-uri-dark='file:///home/free/.local/share/backgrounds/2023-07-15-11-45-35-Wallpaper_Dark_Wide.png' +primary-color='#000000000000' +secondary-color='#000000000000' [org/gnome/desktop/input-sources] sources=[('xkb', 'us')] @@ -168,9 +168,9 @@ recent-files-max-age=-1 color-shading-type='solid' lock-enabled=false picture-options='zoom' -picture-uri='file:///run/current-system/sw/share/backgrounds/gnome/blobs-l.svg' -primary-color='#241f31' -secondary-color='#000000' +picture-uri='file:///home/free/.local/share/backgrounds/2023-07-15-11-45-35-Wallpaper_Dark_Wide.png' +primary-color='#000000000000' +secondary-color='#000000000000' [org/gnome/desktop/session] idle-delay=uint32 900 @@ -247,7 +247,7 @@ search-filter-time-type='last_modified' search-view='list-view' [org/gnome/nautilus/window-state] -initial-size=(954, 1037) +initial-size=(1912, 1037) maximized=false [org/gnome/nm-applet/eap/2afa07ed-64ca-44a0-948e-d8f265fa52b0] @@ -348,7 +348,7 @@ locations=@av [] locations=@av [] [org/gnome/software] -check-timestamp=int64 1689340502 +check-timestamp=int64 1689426683 first-run=false flatpak-purge-timestamp=int64 1689380924 online-updates-timestamp=int64 1675355639 From 74dfa7f76f7da993ad1e01ba6f492aa136ea2f2c Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Sat, 15 Jul 2023 14:03:29 -0700 Subject: [PATCH 149/667] updated ps.sh and added wallpaper --- for_new_sovran_pros/sp.sh | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/for_new_sovran_pros/sp.sh b/for_new_sovran_pros/sp.sh index 32891e8..f4dd35b 100644 --- a/for_new_sovran_pros/sp.sh +++ b/for_new_sovran_pros/sp.sh @@ -341,6 +341,17 @@ popd # +pushd /home/free/Downloads + + wget https://git.sovransystems.com/Sovran_Systems/Sovran_SystemsOS/raw/branch/main/for_new_sovran_pros/Wallpaper_Dark_Wide.png + + chown free:users /home/free -R + + chmod 770 /home/free -R + +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 From dddab785b5cda5aa1777f6f33af475f49dac7ae2 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Sat, 15 Jul 2023 14:06:32 -0700 Subject: [PATCH 150/667] updated psp.sh --- for_new_sovran_pros/psp.sh | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/for_new_sovran_pros/psp.sh b/for_new_sovran_pros/psp.sh index e55ddee..67322c0 100644 --- a/for_new_sovran_pros/psp.sh +++ b/for_new_sovran_pros/psp.sh @@ -37,8 +37,11 @@ rm /mnt/etc/nixos/configuration.nix cat <> /mnt/etc/nixos/configuration.nix { config, pkgs, ... }: { + imports = [ + ./hardware-configuration.nix + ]; boot.loader.systemd-boot.enable = true; @@ -46,10 +49,10 @@ cat <> /mnt/etc/nixos/configuration.nix boot.loader.efi.efiSysMountPoint = "/boot/efi"; nix = { - package = pkgs.nixUnstable; - extraOptions = '' - experimental-features = nix-command flakes - ''; + package = pkgs.nixUnstable; + extraOptions = '' + experimental-features = nix-command flakes + ''; }; users.users = { @@ -58,6 +61,7 @@ cat <> /mnt/etc/nixos/configuration.nix description = "free"; extraGroups = [ "networkmanager" ]; }; + }; environment.systemPackages = with pkgs; [ wget @@ -71,7 +75,7 @@ cat <> /mnt/etc/nixos/configuration.nix services.openssh = { enable = true; permitRootLogin = "yes"; - }; + }; } EOT From caddf264cb6e539ed87588861bbec0a0c70b28bb Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Sat, 15 Jul 2023 17:22:52 -0700 Subject: [PATCH 151/667] updated psp.sh --- for_new_sovran_pros/sp.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/for_new_sovran_pros/sp.sh b/for_new_sovran_pros/sp.sh index f4dd35b..70f5065 100644 --- a/for_new_sovran_pros/sp.sh +++ b/for_new_sovran_pros/sp.sh @@ -286,7 +286,7 @@ flatpak update mkdir /root/.ssh -mdir -p /home/free/.ssh +mkdir -p /home/free/.ssh touch /root/.ssh/authorized_keys From f0d7f82289680ebe16f7645be87a7faed263a64a Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Sat, 15 Jul 2023 18:12:18 -0700 Subject: [PATCH 152/667] updated sp.sh --- for_new_sovran_pros/sp.sh | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/for_new_sovran_pros/sp.sh b/for_new_sovran_pros/sp.sh index 70f5065..824ad22 100644 --- a/for_new_sovran_pros/sp.sh +++ b/for_new_sovran_pros/sp.sh @@ -290,10 +290,14 @@ mkdir -p /home/free/.ssh touch /root/.ssh/authorized_keys -sudo -u free ssh-keygen -q -N "gosovransytems" -t ed25519 -f /home/free/.ssh/factory_login +sudo -u free ssh-keygen -q -N "gosovransystems" -t ed25519 -f /home/free/.ssh/factory_login echo "$(cat /home/free/.ssh/factory_login.pub)" >> /root/.ssh/authorized_keys +chown free:users /home/free/.ssh -R + +chmod 700 /home/free/.ssh -R + # @@ -321,6 +325,8 @@ popd # +mkdir -p /home/free/Downloads + 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 @@ -341,6 +347,9 @@ popd # + +mkdir -p /home/free/Pictures + pushd /home/free/Downloads wget https://git.sovransystems.com/Sovran_Systems/Sovran_SystemsOS/raw/branch/main/for_new_sovran_pros/Wallpaper_Dark_Wide.png From d23d0229a10c93d957c54ae370922e28a3086f00 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Sat, 15 Jul 2023 19:34:35 -0700 Subject: [PATCH 153/667] updated sp.sh --- for_new_sovran_pros/sp.sh | 41 ++++++++++++++++++++++----------------- 1 file changed, 23 insertions(+), 18 deletions(-) diff --git a/for_new_sovran_pros/sp.sh b/for_new_sovran_pros/sp.sh index 824ad22..726c351 100644 --- a/for_new_sovran_pros/sp.sh +++ b/for_new_sovran_pros/sp.sh @@ -282,23 +282,6 @@ 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 - -mkdir -p /home/free/.ssh - -touch /root/.ssh/authorized_keys - -sudo -u free ssh-keygen -q -N "gosovransystems" -t ed25519 -f /home/free/.ssh/factory_login - -echo "$(cat /home/free/.ssh/factory_login.pub)" >> /root/.ssh/authorized_keys - -chown free:users /home/free/.ssh -R - -chmod 700 /home/free/.ssh -R - - # rm -rf /root/sp.sh @@ -347,7 +330,6 @@ popd # - mkdir -p /home/free/Pictures pushd /home/free/Downloads @@ -361,6 +343,29 @@ pushd /home/free/Downloads popd # + +wp=$(cat /var/lib/secrets/wordpressdb) + +sudo mysql -u root -e "SET PASSWORD FOR wpusr@localhost = PASSWORD('${wp}')"; + +# + +mkdir /root/.ssh + +mkdir -p /home/free/.ssh + +touch /root/.ssh/authorized_keys + +sudo -u free ssh-keygen -q -N "gosovransystems" -t ed25519 -f /home/free/.ssh/factory_login + +echo "$(cat /home/free/.ssh/factory_login.pub)" >> /root/.ssh/authorized_keys + +chown free:users /home/free/.ssh -R + +chmod 700 /home/free/.ssh -R + +# + 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 From 63541b592d5fa624f49f4ad0d0aebf5008ad971c Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Sun, 16 Jul 2023 00:06:13 -0700 Subject: [PATCH 154/667] updated cron for external ip call --- modules/configuration.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/configuration.nix b/modules/configuration.nix index 057542c..519c6fd 100644 --- a/modules/configuration.nix +++ b/modules/configuration.nix @@ -361,9 +361,9 @@ backup /etc/nix-bitcoin-secrets/ localhost/ 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" + "*/5 * * * * caddy /run/current-system/sw/bin/php -f /var/lib/www/nextcloud/cron.php" + "*/15 * * * * root /var/lib/njalla/njalla.sh" + "*/15 * * * * root /var/lib/external_ip/external_ip.sh" ]; }; From 34559d7383f27e1461f1d1dbca352e44ce121213 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Sun, 16 Jul 2023 00:16:37 -0700 Subject: [PATCH 155/667] updated congif for better external IP support --- modules/personalization.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/personalization.nix b/modules/personalization.nix index 94685ab..857a91d 100644 --- a/modules/personalization.nix +++ b/modules/personalization.nix @@ -22,7 +22,7 @@ age.secrets.wordpressdb.file = /var/lib/agenix-secrets/wordpressdb.age; ## -external_ip_secret = builtins.readFile /var/lib/secrets/external_ip; +external_ip_secret = /var/lib/secrets/external_ip; onlyofficejwtSecretFile = /var/lib/secrets/onlyofficejwtSecretFile; } From 43dcbd52239e6da21bd42a4fdf53d9a237ff5306 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Sun, 16 Jul 2023 01:20:56 -0700 Subject: [PATCH 156/667] fixed scripting in sp.sh --- for_new_sovran_pros/sp.sh | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/for_new_sovran_pros/sp.sh b/for_new_sovran_pros/sp.sh index 726c351..f864a55 100644 --- a/for_new_sovran_pros/sp.sh +++ b/for_new_sovran_pros/sp.sh @@ -65,7 +65,7 @@ echo -n $REPLY > /var/lib/domains/sslemail mkdir /var/lib/nextcloudaddition -cat <> /var/lib/nextcloudaddition/nextcloudaddition +cat > /var/lib/nextcloudaddition/nextcloudaddition <<- "EOF" 'trusted_proxies' => array ( @@ -76,49 +76,53 @@ cat <> /var/lib/nextcloudaddition/nextcloudaddition 'filelocking.enabled' => true, 'memcache.local' => '\OC\Memcache\APCu', -EOT +EOF # mkdir /var/lib/njalla/ -cat <> /var/lib/njalla/njalla.sh +cat > /var/lib/njalla/njalla.sh <<- "EOF" #!/usr/bin/env bash -# IP=$(wget -qO- https://ipecho.net/plain ; echo) +IP=$(wget -qO- https://ipecho.net/plain ; echo) ## Manually Add DDNS Script From Njalla User Account AFTER Install -#curl "https://...${IP}" +curl "https://...${IP}" - -EOT +EOF # mkdir /var/lib/external_ip -cat <> /var/lib/external_ip/external_ip.sh +cat > /var/lib/external_ip/external_ip.sh <<- "EOF" #!/usr/bin/env bash -wget -qO- https://ipecho.net/plain ; echo > /var/lib/secrets/external_ip +IP=$(wget -qO- https://ipecho.net/plain ; echo) + +echo "${IP}" > /var/lib/secrets/external_ip + +EOF + -EOT # mkdir /var/lib/agenix-secrets/ -cat <> /var/lib/agenix-secrets/secrets.nix +cat > /var/lib/agenix-secrets/secrets.nix <<- "EOF" let root = "placeholder" ; in + { "wordpressdb.age".publicKeys = [ root ]; @@ -133,8 +137,7 @@ in } - -EOT +EOF # From 0e4bf0c442afdec943433d4b0aead59790067922 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Sun, 16 Jul 2023 01:23:12 -0700 Subject: [PATCH 157/667] fixed spacing sp.sh --- for_new_sovran_pros/sp.sh | 3 --- 1 file changed, 3 deletions(-) diff --git a/for_new_sovran_pros/sp.sh b/for_new_sovran_pros/sp.sh index f864a55..7fd97f6 100644 --- a/for_new_sovran_pros/sp.sh +++ b/for_new_sovran_pros/sp.sh @@ -108,9 +108,6 @@ echo "${IP}" > /var/lib/secrets/external_ip EOF - - - # mkdir /var/lib/agenix-secrets/ From de031b5d0d1b06f41cc88b0972110e7ee4c91f5c Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Sun, 16 Jul 2023 01:36:48 -0700 Subject: [PATCH 158/667] updated sp.sh --- for_new_sovran_pros/sp.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/for_new_sovran_pros/sp.sh b/for_new_sovran_pros/sp.sh index 7fd97f6..4a6662d 100644 --- a/for_new_sovran_pros/sp.sh +++ b/for_new_sovran_pros/sp.sh @@ -187,6 +187,7 @@ pushd /var/lib/agenix-secrets popd +# pushd /etc/nixos @@ -196,7 +197,6 @@ pushd /etc/nixos popd - # chown root:root /var/lib/secrets/main -R @@ -332,7 +332,7 @@ popd mkdir -p /home/free/Pictures -pushd /home/free/Downloads +pushd /home/free/Pictures wget https://git.sovransystems.com/Sovran_Systems/Sovran_SystemsOS/raw/branch/main/for_new_sovran_pros/Wallpaper_Dark_Wide.png From a0df12550d01f3df3a1f8eab75aa4b06cec8e3d1 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Sun, 16 Jul 2023 12:47:54 -0700 Subject: [PATCH 159/667] updated sp.sh better able to run flatpak install --- for_new_sovran_pros/sp.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/for_new_sovran_pros/sp.sh b/for_new_sovran_pros/sp.sh index 4a6662d..b254461 100644 --- a/for_new_sovran_pros/sp.sh +++ b/for_new_sovran_pros/sp.sh @@ -280,7 +280,6 @@ echo "free:a" | chpasswd -c SHA512 # sudo -u free flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo -flatpak update # From 04ddcd43608e89cededc4171aa6fc1ea3b6a014f Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Sun, 16 Jul 2023 12:53:23 -0700 Subject: [PATCH 160/667] added gnome terminal --- modules/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/configuration.nix b/modules/configuration.nix index 519c6fd..fccd17c 100644 --- a/modules/configuration.nix +++ b/modules/configuration.nix @@ -141,7 +141,6 @@ in gnome.gnome-tweaks papirus-icon-theme ranger - gnome.gnome-tweaks bisq-desktop neofetch gnome.gedit @@ -165,6 +164,7 @@ in screen gnome.zenity libargon2 + gnome.gnome-terminal ]; From de80faab68479bf41236848698c109cd7223f8b6 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Sun, 16 Jul 2023 19:40:26 -0700 Subject: [PATCH 161/667] updated sp.sh --- for_new_sovran_pros/sp.sh | 42 +++++++++++++++++++++++++++++++++++---- 1 file changed, 38 insertions(+), 4 deletions(-) diff --git a/for_new_sovran_pros/sp.sh b/for_new_sovran_pros/sp.sh index b254461..f3915f0 100644 --- a/for_new_sovran_pros/sp.sh +++ b/for_new_sovran_pros/sp.sh @@ -217,6 +217,7 @@ chown vaultwarden:vaultwarden /var/lib/secrets/vaultwarden -R chown onlyoffice:onlyoffice /var/lib/secrets/onlyofficejwtSecretFile + chmod 770 /var/lib/secrets/ -R # @@ -343,6 +344,14 @@ popd # +pushd /home/free/Downloads + + sudo -u free wget https://git.sovransystems.com/Sovran_Systems/Sovran_SystemsOS/raw/branch/main/for_new_sovran_pros/Sovran_SystemsOS-Desktop + +popd + +# + wp=$(cat /var/lib/secrets/wordpressdb) sudo mysql -u root -e "SET PASSWORD FOR wpusr@localhost = PASSWORD('${wp}')"; @@ -353,16 +362,16 @@ mkdir /root/.ssh mkdir -p /home/free/.ssh +chown free:users /home/free/.ssh -R + touch /root/.ssh/authorized_keys sudo -u free ssh-keygen -q -N "gosovransystems" -t ed25519 -f /home/free/.ssh/factory_login -echo "$(cat /home/free/.ssh/factory_login.pub)" >> /root/.ssh/authorized_keys - -chown free:users /home/free/.ssh -R - chmod 700 /home/free/.ssh -R +echo "$(cat /home/free/.ssh/factory_login.pub)" >> /root/.ssh/authorized_keys + # sudo matrix-synapse-register_new_matrix_user -u admin -p a -a @@ -386,6 +395,31 @@ echo -e "$(pwgen -s 17 -1) \n" # +DOMAIN=$(cat /var/lib/domains/matrix) + + +cp -n /var/lib/caddy/.local/share/caddy/certificates/acme.zerossl.com-v2-dv90/${DOMAIN}/${DOMAIN}.crt /var/lib/coturn/${DOMAIN}.crt.pem + +cp -n /var/lib/caddy/.local/share/caddy/certificates/acme.zerossl.com-v2-dv90/${DOMAIN}/${DOMAIN}.key /var/lib/coturn/${DOMAIN}.key.pem + +bash /var/lib/external_ip/external_ip.sh + +chown turnserver:turnserver /var/lib/coturn -R + +chmod 770 /var/lib/coturn -R + +# + +pushd /etc/nixos + + nix flake update + + nixos-rebuild switch --impure + +popd + +# + 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" From 9f2173512bd0cf8b750c5bc926b4411f5691701a Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Sun, 16 Jul 2023 20:10:44 -0700 Subject: [PATCH 162/667] added gnomeExtensions.date-menu-formatter --- modules/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/configuration.nix b/modules/configuration.nix index fccd17c..3a831fa 100644 --- a/modules/configuration.nix +++ b/modules/configuration.nix @@ -138,6 +138,7 @@ in gnomeExtensions.just-perfection gnomeExtensions.appindicator gnomeExtensions.systemd-manager + gnomeExtensions.date-menu-formatter gnome.gnome-tweaks papirus-icon-theme ranger From f7059816f4faba4e8994737544fae57b1cc778fb Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Sun, 16 Jul 2023 23:38:58 -0700 Subject: [PATCH 163/667] updated Sovran_SystemsOS look --- for_new_sovran_pros/Sovran_SystemsOS-Desktop | 51 ++++++++++++-------- 1 file changed, 31 insertions(+), 20 deletions(-) diff --git a/for_new_sovran_pros/Sovran_SystemsOS-Desktop b/for_new_sovran_pros/Sovran_SystemsOS-Desktop index 52fd087..8540875 100644 --- a/for_new_sovran_pros/Sovran_SystemsOS-Desktop +++ b/for_new_sovran_pros/Sovran_SystemsOS-Desktop @@ -3,7 +3,7 @@ dark-full-screen=false [org/gnome/Console] font-scale=1.7000000000000006 -last-window-size=(1912, 1037) +last-window-size=(954, 1037) [org/gnome/Geary] migrated-config=true @@ -16,7 +16,7 @@ subtitle-encoding='UTF-8' [org/gnome/baobab/ui] is-maximized=false -window-size=(1912, 1037) +window-size=(954, 1037) [org/gnome/calculator] accuracy=9 @@ -35,11 +35,11 @@ word-size=64 [org/gnome/calendar] active-view='month' window-maximized=false -window-size=(1912, 1037) +window-size=(486, 1037) [org/gnome/control-center] -last-panel='background' -window-state=(1912, 1037, false) +last-panel='network' +window-state=(954, 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'] @@ -85,15 +85,15 @@ name='suse-yast.directory' translate=true [org/gnome/desktop/app-folders/folders/d737daeb-6dbb-4a5d-9ec7-e674398539ce] -apps=['fish.desktop', 'org.gnome.Console.desktop', 'htop.desktop', 'ranger.desktop', 'xterm.desktop'] +apps=['fish.desktop', 'org.gnome.Console.desktop', 'htop.desktop', 'ranger.desktop', 'xterm.desktop', 'org.gnome.Terminal.desktop'] name='Terminal Fun' translate=false [org/gnome/desktop/background] color-shading-type='solid' picture-options='zoom' -picture-uri='file:///home/free/.local/share/backgrounds/2023-07-15-11-45-35-Wallpaper_Dark_Wide.png' -picture-uri-dark='file:///home/free/.local/share/backgrounds/2023-07-15-11-45-35-Wallpaper_Dark_Wide.png' +picture-uri='file:///home/free/.local/share/backgrounds/2023-07-16-12-58-54-Wallpaper_Dark_Wide.png' +picture-uri-dark='file:///home/free/.local/share/backgrounds/2023-07-16-12-58-54-Wallpaper_Dark_Wide.png' primary-color='#000000000000' secondary-color='#000000000000' @@ -112,7 +112,7 @@ 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'] +application-children=['gnome-power-panel', 'org-gnome-nautilus', 'org-gnome-software', 'gnome-network-panel', 'sparrow', 'org-gnome-settings', 'org-gnome-console', 'gnome-printers-panel', 'org-gnome-epiphany', 'com-obsproject-studio', 'io-github-seadve-kooha', 'xdg-desktop-portal-gnome', 'org-gnome-baobab'] show-in-lock-screen=false [org/gnome/desktop/notifications/application/com-obsproject-studio] @@ -130,6 +130,9 @@ 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-baobab] +application-id='org.gnome.baobab.desktop' + [org/gnome/desktop/notifications/application/org-gnome-console] application-id='org.gnome.Console.desktop' @@ -168,7 +171,7 @@ recent-files-max-age=-1 color-shading-type='solid' lock-enabled=false picture-options='zoom' -picture-uri='file:///home/free/.local/share/backgrounds/2023-07-15-11-45-35-Wallpaper_Dark_Wide.png' +picture-uri='file:///home/free/.local/share/backgrounds/2023-07-16-12-58-54-Wallpaper_Dark_Wide.png' primary-color='#000000000000' secondary-color='#000000000000' @@ -206,7 +209,7 @@ window-height=990 window-width=954 [org/gnome/gnome-system-monitor] -current-tab='disks' +current-tab='processes' maximized=false network-total-in-bits=false show-dependencies=false @@ -223,12 +226,12 @@ sort-col=8 sort-order=0 [org/gnome/maps] -last-viewed-location=[33.98678824432703, -118.33063362501532] +last-viewed-location=[34.015438242460405, -118.32766985901287] map-type='MapsStreetSource' transportation-type='pedestrian' window-maximized=false window-size=[1912, 1037] -zoom-level=19 +zoom-level=9 [org/gnome/mutter] attach-modal-dialogs=true @@ -271,10 +274,10 @@ 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>}>}] +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>}>}] 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'] +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', 'date-menu-formatter@marcinjakubowski.github.com'] +favorite-apps=['brave-browser.desktop', 'org.gnome.Nautilus.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' @@ -320,6 +323,10 @@ show-mounts-only-mounted=false show-trash=false transparency-mode='FIXED' +[org/gnome/shell/extensions/date-menu-formatter] +font-size=14 +pattern='EEEE MMM d h: mm aaa' + [org/gnome/shell/extensions/just-perfection] accessibility-menu=false @@ -348,12 +355,16 @@ locations=@av [] locations=@av [] [org/gnome/software] -check-timestamp=int64 1689426683 +check-timestamp=int64 1689537660 first-run=false -flatpak-purge-timestamp=int64 1689380924 +flatpak-purge-timestamp=int64 1689552000 online-updates-timestamp=int64 1675355639 update-notification-timestamp=int64 1666382024 +[org/gnome/terminal/legacy/profiles:/:b1dcc9dd-5262-4d8d-a863-c897e6d979b9] +font='Monospace 14' +use-system-font=false + [org/gnome/tweaks] show-extensions-notice=false @@ -363,7 +374,7 @@ selected-color=(true, 0.0, 0.0, 0.0, 1.0) [org/gtk/gtk4/settings/file-chooser] date-format='regular' location-mode='path-bar' -show-hidden=true +show-hidden=false show-size-column=true show-type-column=true sidebar-width=177 @@ -380,7 +391,7 @@ show-hidden=true [system/proxy] ignore-hosts=@as [] -mode='none' +mode='manual' [system/proxy/http] port=0 From 32e1a2acd7800a2d72d0c0be43e951ff08f138f6 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Tue, 18 Jul 2023 11:56:49 -0700 Subject: [PATCH 164/667] flake update --- flake.lock | 100 ++++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 76 insertions(+), 24 deletions(-) diff --git a/flake.lock b/flake.lock index 5996a5b..aa113c2 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1684153753, - "narHash": "sha256-PVbWt3qrjYAK+T5KplFcO+h7aZWfEj1UtyoKlvcDxh0=", + "lastModified": 1689334118, + "narHash": "sha256-djk5AZv1yU84xlKFaVHqFWvH73U7kIRstXwUAnDJPsk=", "owner": "ryantm", "repo": "agenix", - "rev": "db5637d10f797bb251b94ef9040b237f4702cde3", + "rev": "0d8c5325fc81daf00532e3e26c6752f7bcde1143", "type": "github" }, "original": { @@ -20,6 +20,25 @@ "type": "github" } }, + "erosanix": { + "inputs": { + "flake-compat": "flake-compat", + "nixpkgs": "nixpkgs_2" + }, + "locked": { + "lastModified": 1689687372, + "narHash": "sha256-vSlMIj7e/5/i1Tl+VL/6zR43qP5/0/czpIO9HzD/soU=", + "owner": "emmanuelrosa", + "repo": "erosanix", + "rev": "f144bfbe626329f33ea6f3408383fe08894f2d52", + "type": "github" + }, + "original": { + "owner": "emmanuelrosa", + "repo": "erosanix", + "type": "github" + } + }, "extra-container": { "inputs": { "flake-utils": [ @@ -32,11 +51,11 @@ ] }, "locked": { - "lastModified": 1686656049, - "narHash": "sha256-rkYYVslFtRnhzryUFqJeYjPxorasymOg00z30GtR3iE=", + "lastModified": 1687083327, + "narHash": "sha256-1ZHIwhBaieb/Lvbph5NTgPta+r7V0RlaffgX3kbO9Jw=", "owner": "erikarvstedt", "repo": "extra-container", - "rev": "a6f74b9deb7bb2fdd346b74483c6a56946d5d332", + "rev": "8f729fcbb4deccb0a588f1ec2fdb01785b4f0059", "type": "github" }, "original": { @@ -45,16 +64,32 @@ "type": "github" } }, + "flake-compat": { + "flake": false, + "locked": { + "lastModified": 1673956053, + "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, "flake-utils": { "inputs": { "systems": "systems" }, "locked": { - "lastModified": 1685518550, - "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=", + "lastModified": 1687171271, + "narHash": "sha256-BJlq+ozK2B1sJDQXS3tzJM5a+oVZmi1q0FlBK/Xqv7M=", "owner": "numtide", "repo": "flake-utils", - "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef", + "rev": "abfb11bd1aec8ced1c9bb9adfe68018230f4fb3c", "type": "github" }, "original": { @@ -88,15 +123,15 @@ "inputs": { "extra-container": "extra-container", "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs_3", "nixpkgs-unstable": "nixpkgs-unstable" }, "locked": { - "lastModified": 1686687332, - "narHash": "sha256-GDpCwn05ZniaKgODBqGlW3pnbHVq6bybnTNnoCK/XUk=", + "lastModified": 1687896790, + "narHash": "sha256-FMZxfmpBdyXypFXwsfQz3A2P7QO/U/7SBuUAaxlV7Qc=", "owner": "fort-nix", "repo": "nix-bitcoin", - "rev": "f2a970406ba35a21fa916de9d201859a7860447a", + "rev": "01c6148056e86282bedbb28d4c6d389f96c494da", "type": "github" }, "original": { @@ -124,11 +159,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1686582075, - "narHash": "sha256-vtflsfKkHtF8IduxDNtbme4cojiqvlvjp5QNYhvoHXc=", + "lastModified": 1687518131, + "narHash": "sha256-KirltRIc4SFfk8bTNudIqgKAALH5oqpW3PefmkfWK5M=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7e63eed145566cca98158613f3700515b4009ce3", + "rev": "3d8a93602bc54ece7a4e689d9aea1a574e2bbc24", "type": "github" }, "original": { @@ -140,11 +175,27 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1686476475, - "narHash": "sha256-W9yUePvCSDghn+YUXewuodyPxt+kJl/a7zdY4Q6r4MU=", + "lastModified": 1688151534, + "narHash": "sha256-Pl+YbDyHEOzTuLfNTIqN7j+c3pBaPrS6dk9f3sKTz74=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "eef86b8a942913a828b9ef13722835f359deef29", + "rev": "cf1b7c4d5c027837e71d284a838fbeb05b3fcb7f", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "master", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { + "locked": { + "lastModified": 1687376262, + "narHash": "sha256-xtenf0Nc6So/5uaQqe8u3GVoAs/YdMUFsysPUuK8w1s=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "7859e9c101fabbd62551b8f4260124a6e2f01a46", "type": "github" }, "original": { @@ -154,13 +205,13 @@ "type": "github" } }, - "nixpkgs_3": { + "nixpkgs_4": { "locked": { - "lastModified": 1686960236, - "narHash": "sha256-AYCC9rXNLpUWzD9hm+askOfpliLEC9kwAo7ITJc4HIw=", + "lastModified": 1689534811, + "narHash": "sha256-jnSUdzD/414d94plCyNlvTJJtiTogTep6t7ZgIKIHiE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "04af42f3b31dba0ef742d254456dc4c14eedac86", + "rev": "6cee3b5893090b0f5f0a06b4cf42ca4e60e5d222", "type": "github" }, "original": { @@ -173,8 +224,9 @@ "root": { "inputs": { "agenix": "agenix", + "erosanix": "erosanix", "nix-bitcoin": "nix-bitcoin", - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs_4" } }, "systems": { From 8cd3a860461247178101ebf07d2c43d41b84c425 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Tue, 18 Jul 2023 12:00:07 -0700 Subject: [PATCH 165/667] updated to nodejs-16.20.1 as nixbitcoin needs it --- modules/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/configuration.nix b/modules/configuration.nix index 3a831fa..16c554a 100644 --- a/modules/configuration.nix +++ b/modules/configuration.nix @@ -170,7 +170,7 @@ in ]; nixpkgs.config.permittedInsecurePackages = [ - "nodejs-16.20.0" + "nodejs-16.20.1" "nodejs-slim-16.20.0" ]; From 724cfb78ccda17bc48590452357ed37e94842f37 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Tue, 18 Jul 2023 12:01:47 -0700 Subject: [PATCH 166/667] added nodejs-slim-16.20.1 as nixbitcoin needs it --- modules/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/configuration.nix b/modules/configuration.nix index 16c554a..26c3916 100644 --- a/modules/configuration.nix +++ b/modules/configuration.nix @@ -171,7 +171,7 @@ in nixpkgs.config.permittedInsecurePackages = [ "nodejs-16.20.1" - "nodejs-slim-16.20.0" + "nodejs-slim-16.20.1" ]; From 5a82ceb1788a9103ce607619eec17fd3a44348f4 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Tue, 18 Jul 2023 14:06:53 -0700 Subject: [PATCH 167/667] updated readme to include support link --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 539bdbc..45dba91 100644 --- a/README.md +++ b/README.md @@ -17,6 +17,8 @@ https://www.sovransystems.com Connect on Matrix here: https://matrix.to/#/#sovran-systems:anarchyislove.xyz +Connect on for Support on Matrix here: https://matrix.to/#/#sovran-systems-support:anarchyislove.xyz + ### ## All Is Love. Fear Is Illusion. All Beings Are Free. Truth Can Never Be Destroyed. From b973ebc4907f378d19b2ca11d8d7463c3c2ef0f8 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Thu, 20 Jul 2023 21:49:28 -0700 Subject: [PATCH 168/667] updated coturn.nix --- modules/coturn.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/coturn.nix b/modules/coturn.nix index 119b7da..8748d57 100644 --- a/modules/coturn.nix +++ b/modules/coturn.nix @@ -16,7 +16,7 @@ let unitConfig = { Type = "simple"; - After = "NetworkManager.service"; + After = "btcpayserver.service"; Requires = "network-online.target"; }; From d6cda6a3c133ba79887ef5ddbffeaf245a1ba49f Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Thu, 20 Jul 2023 21:55:57 -0700 Subject: [PATCH 169/667] updated configuration.nix removed the permittedInsecurePackages --- modules/configuration.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/modules/configuration.nix b/modules/configuration.nix index 26c3916..625d361 100644 --- a/modules/configuration.nix +++ b/modules/configuration.nix @@ -170,8 +170,6 @@ in ]; nixpkgs.config.permittedInsecurePackages = [ - "nodejs-16.20.1" - "nodejs-slim-16.20.1" ]; From fa73568818ef8cfef9e2c86c1b6f689ea58e5860 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Thu, 20 Jul 2023 21:56:57 -0700 Subject: [PATCH 170/667] New System Wide Nixpkgs Update --- flake.lock | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/flake.lock b/flake.lock index aa113c2..bb39c37 100644 --- a/flake.lock +++ b/flake.lock @@ -26,11 +26,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1689687372, - "narHash": "sha256-vSlMIj7e/5/i1Tl+VL/6zR43qP5/0/czpIO9HzD/soU=", + "lastModified": 1689851792, + "narHash": "sha256-53/NlgQYy3W5zByk8aluARYDxw2nioENwevKX2c1x+c=", "owner": "emmanuelrosa", "repo": "erosanix", - "rev": "f144bfbe626329f33ea6f3408383fe08894f2d52", + "rev": "8caf25538f2f1f62f6d6a841ebd43729aa2df0e1", "type": "github" }, "original": { @@ -85,11 +85,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1687171271, - "narHash": "sha256-BJlq+ozK2B1sJDQXS3tzJM5a+oVZmi1q0FlBK/Xqv7M=", + "lastModified": 1687709756, + "narHash": "sha256-Y5wKlQSkgEK2weWdOu4J3riRd+kV/VCgHsqLNTTWQ/0=", "owner": "numtide", "repo": "flake-utils", - "rev": "abfb11bd1aec8ced1c9bb9adfe68018230f4fb3c", + "rev": "dbabf0ca0c0c4bce6ea5eaf65af5cb694d2082c7", "type": "github" }, "original": { @@ -127,11 +127,11 @@ "nixpkgs-unstable": "nixpkgs-unstable" }, "locked": { - "lastModified": 1687896790, - "narHash": "sha256-FMZxfmpBdyXypFXwsfQz3A2P7QO/U/7SBuUAaxlV7Qc=", + "lastModified": 1689788228, + "narHash": "sha256-oFmG/9q65IN5nN/tY3K0C4nDfmXO3Wx0CCRh5nH/FAw=", "owner": "fort-nix", "repo": "nix-bitcoin", - "rev": "01c6148056e86282bedbb28d4c6d389f96c494da", + "rev": "6eaddd970a6869812a4293c11a74e47f66e226ed", "type": "github" }, "original": { @@ -159,11 +159,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1687518131, - "narHash": "sha256-KirltRIc4SFfk8bTNudIqgKAALH5oqpW3PefmkfWK5M=", + "lastModified": 1688798537, + "narHash": "sha256-+3QEnDgBiso8lgUJpMagn6xCujmarc6zCWfKYAd6nqU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3d8a93602bc54ece7a4e689d9aea1a574e2bbc24", + "rev": "842e90934a352f517d23963df3ec0474612e483c", "type": "github" }, "original": { @@ -191,27 +191,27 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1687376262, - "narHash": "sha256-xtenf0Nc6So/5uaQqe8u3GVoAs/YdMUFsysPUuK8w1s=", + "lastModified": 1688764204, + "narHash": "sha256-FsvK+tIvelCI0tWwlMDKfiyb7P/KfxpGbXMrdCKiT8s=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7859e9c101fabbd62551b8f4260124a6e2f01a46", + "rev": "d8bb6c681cf86265fdcf3cc3119f757bbb085835", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-22.11", + "ref": "nixos-23.05", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_4": { "locked": { - "lastModified": 1689534811, - "narHash": "sha256-jnSUdzD/414d94plCyNlvTJJtiTogTep6t7ZgIKIHiE=", + "lastModified": 1689850295, + "narHash": "sha256-fUYf6WdQlhd2H+3aR8jST5dhFH1d0eE22aes8fNIfyk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6cee3b5893090b0f5f0a06b4cf42ca4e60e5d222", + "rev": "5df4d78d54f7a34e9ea1f84a22b4fd9baebc68d0", "type": "github" }, "original": { From 66c70520242dd75a0ab6efb62cdf4e2776757628 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Tue, 25 Jul 2023 05:10:04 -0700 Subject: [PATCH 171/667] Sovran_SystemOS update --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index bb39c37..331c3c5 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1689334118, - "narHash": "sha256-djk5AZv1yU84xlKFaVHqFWvH73U7kIRstXwUAnDJPsk=", + "lastModified": 1690228878, + "narHash": "sha256-9Xe7JV0krp4RJC9W9W9WutZVlw6BlHTFMiUP/k48LQY=", "owner": "ryantm", "repo": "agenix", - "rev": "0d8c5325fc81daf00532e3e26c6752f7bcde1143", + "rev": "d8c973fd228949736dedf61b7f8cc1ece3236792", "type": "github" }, "original": { @@ -26,11 +26,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1689851792, - "narHash": "sha256-53/NlgQYy3W5zByk8aluARYDxw2nioENwevKX2c1x+c=", + "lastModified": 1690035023, + "narHash": "sha256-KzM5OykzHaWcAH+Ztz2mok3TF+xq85Jg7hMIfq1+Y3Y=", "owner": "emmanuelrosa", "repo": "erosanix", - "rev": "8caf25538f2f1f62f6d6a841ebd43729aa2df0e1", + "rev": "017f542daa25e3db439d264e9f038827140df780", "type": "github" }, "original": { @@ -207,11 +207,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1689850295, - "narHash": "sha256-fUYf6WdQlhd2H+3aR8jST5dhFH1d0eE22aes8fNIfyk=", + "lastModified": 1690179384, + "narHash": "sha256-+arbgqFTAtoeKtepW9wCnA0njCOyoiDFyl0Q0SBSOtE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5df4d78d54f7a34e9ea1f84a22b4fd9baebc68d0", + "rev": "b12803b6d90e2e583429bb79b859ca53c348b39a", "type": "github" }, "original": { From b7236749c2d45751b53a24ed0e026690ba1b63f5 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Wed, 26 Jul 2023 22:09:21 -0700 Subject: [PATCH 172/667] new nixpkgs and new dconf desktop file --- flake.lock | 12 +++++----- for_new_sovran_pros/Sovran_SystemsOS-Desktop | 25 +++++++++++++------- 2 files changed, 22 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index 331c3c5..97f2121 100644 --- a/flake.lock +++ b/flake.lock @@ -26,11 +26,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1690035023, - "narHash": "sha256-KzM5OykzHaWcAH+Ztz2mok3TF+xq85Jg7hMIfq1+Y3Y=", + "lastModified": 1690294654, + "narHash": "sha256-UVcL4yjNXLyvt3OujWGupqOf6U3ZjTwQ3G96pJ8z0EM=", "owner": "emmanuelrosa", "repo": "erosanix", - "rev": "017f542daa25e3db439d264e9f038827140df780", + "rev": "47a95b69e0fc3e1076c20f77aceb8c0cdab719a6", "type": "github" }, "original": { @@ -207,11 +207,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1690179384, - "narHash": "sha256-+arbgqFTAtoeKtepW9wCnA0njCOyoiDFyl0Q0SBSOtE=", + "lastModified": 1690272529, + "narHash": "sha256-MakzcKXEdv/I4qJUtq/k/eG+rVmyOZLnYNC2w1mB59Y=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b12803b6d90e2e583429bb79b859ca53c348b39a", + "rev": "ef99fa5c5ed624460217c31ac4271cfb5cb2502c", "type": "github" }, "original": { diff --git a/for_new_sovran_pros/Sovran_SystemsOS-Desktop b/for_new_sovran_pros/Sovran_SystemsOS-Desktop index 8540875..100fbc2 100644 --- a/for_new_sovran_pros/Sovran_SystemsOS-Desktop +++ b/for_new_sovran_pros/Sovran_SystemsOS-Desktop @@ -35,11 +35,11 @@ word-size=64 [org/gnome/calendar] active-view='month' window-maximized=false -window-size=(486, 1037) +window-size=(954, 1037) [org/gnome/control-center] last-panel='network' -window-state=(954, 1037, false) +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'] @@ -112,7 +112,7 @@ 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', 'org-gnome-baobab'] +application-children=['gnome-power-panel', 'org-gnome-nautilus', 'org-gnome-software', 'gnome-network-panel', 'sparrow', 'org-gnome-settings', 'org-gnome-console', 'gnome-printers-panel', 'org-gnome-epiphany', 'com-obsproject-studio', 'io-github-seadve-kooha', 'xdg-desktop-portal-gnome', 'org-gnome-baobab', 'org-gnome-geary', 'sparrow-desktop'] show-in-lock-screen=false [org/gnome/desktop/notifications/application/com-obsproject-studio] @@ -139,6 +139,9 @@ application-id='org.gnome.Console.desktop' [org/gnome/desktop/notifications/application/org-gnome-epiphany] application-id='org.gnome.Epiphany.desktop' +[org/gnome/desktop/notifications/application/org-gnome-geary] +application-id='org.gnome.Geary.desktop' + [org/gnome/desktop/notifications/application/org-gnome-nautilus] application-id='org.gnome.Nautilus.desktop' @@ -148,6 +151,9 @@ application-id='org.gnome.Settings.desktop' [org/gnome/desktop/notifications/application/org-gnome-software] application-id='org.gnome.Software.desktop' +[org/gnome/desktop/notifications/application/sparrow-desktop] +application-id='sparrow-desktop.desktop' + [org/gnome/desktop/notifications/application/sparrow] application-id='Sparrow.desktop' @@ -218,7 +224,7 @@ window-state=(1912, 1037, 26, 23) [org/gnome/gnome-system-monitor/disktreenew] col-6-visible=true -col-6-width=1502 +col-6-width=0 [org/gnome/gnome-system-monitor/proctree] columns-order=[0, 1, 2, 3, 4, 6, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26] @@ -250,7 +256,7 @@ search-filter-time-type='last_modified' search-view='list-view' [org/gnome/nautilus/window-state] -initial-size=(1912, 1037) +initial-size=(954, 1037) maximized=false [org/gnome/nm-applet/eap/2afa07ed-64ca-44a0-948e-d8f265fa52b0] @@ -274,7 +280,7 @@ 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>}>}] +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>}>, 'Bisq-hidpi.desktop': <{'position': <14>}>, 'com.obsproject.Studio.desktop': <{'position': <15>}>}] 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', 'date-menu-formatter@marcinjakubowski.github.com'] favorite-apps=['brave-browser.desktop', 'org.gnome.Nautilus.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'] @@ -312,9 +318,10 @@ apply-custom-theme=false background-color='rgb(0,0,0)' background-opacity=0.17000000000000001 custom-background-color=true -dash-max-icon-size=76 +dash-max-icon-size=72 dock-position='BOTTOM' height-fraction=0.79000000000000004 +intellihide-mode='ALL_WINDOWS' preferred-monitor=-2 preferred-monitor-by-connector='HDMI-1' running-indicator-style='DASHES' @@ -355,9 +362,9 @@ locations=@av [] locations=@av [] [org/gnome/software] -check-timestamp=int64 1689537660 +check-timestamp=int64 1690377814 first-run=false -flatpak-purge-timestamp=int64 1689552000 +flatpak-purge-timestamp=int64 1690417354 online-updates-timestamp=int64 1675355639 update-notification-timestamp=int64 1666382024 From a457389f38bb95aa4c5b4fe2b805caf4b7960c4e Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Fri, 28 Jul 2023 17:12:53 -0700 Subject: [PATCH 173/667] updated all files to make nixos rebuild pure --- configuration.nix | 436 ++++++++++++++++++++++++++++++++++++++ flake.lock | 18 +- flake.nix | 2 +- modules/configuration.nix | 14 ++ modules/modules.nix | 4 +- 5 files changed, 462 insertions(+), 12 deletions(-) create mode 100644 configuration.nix diff --git a/configuration.nix b/configuration.nix new file mode 100644 index 0000000..2f3b50b --- /dev/null +++ b/configuration.nix @@ -0,0 +1,436 @@ +{ 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 + +{ + + imports = + + [ + ./hardware-configuration.nix + ./modules/modules.nix + + ]; + + # Bootloader. + boot.loader.systemd-boot.enable = true; + boot.loader.efi.canTouchEfiVariables = true; + boot.loader.efi.efiSysMountPoint = "/boot/efi"; + boot.kernelPackages = pkgs.linuxPackages_latest; + + # 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 + gnomeExtensions.date-menu-formatter + gnome.gnome-tweaks + papirus-icon-theme + ranger + 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 + gnome.gnome-terminal + + ]; + + nixpkgs.config.permittedInsecurePackages = [ + ]; + + + 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" + "*/15 * * * * 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"; + +} diff --git a/flake.lock b/flake.lock index 97f2121..5d1ff4f 100644 --- a/flake.lock +++ b/flake.lock @@ -26,11 +26,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1690294654, - "narHash": "sha256-UVcL4yjNXLyvt3OujWGupqOf6U3ZjTwQ3G96pJ8z0EM=", + "lastModified": 1690570683, + "narHash": "sha256-zA16hT9ZoD6H1bqZACPsn9+GU49YQPfv2k5bez/Q4eU=", "owner": "emmanuelrosa", "repo": "erosanix", - "rev": "47a95b69e0fc3e1076c20f77aceb8c0cdab719a6", + "rev": "302c6ce1c46727a0a999d7c6bc750a0f8b275a9c", "type": "github" }, "original": { @@ -175,11 +175,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1688151534, - "narHash": "sha256-Pl+YbDyHEOzTuLfNTIqN7j+c3pBaPrS6dk9f3sKTz74=", + "lastModified": 1690318695, + "narHash": "sha256-Ca8Er9gNMNvTg15FdIXp7cdoRlqztsmG+dC0ZKZ8R1c=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "cf1b7c4d5c027837e71d284a838fbeb05b3fcb7f", + "rev": "17d98b5b7c8bbeaf1e0a4140d125c7e797882f3b", "type": "github" }, "original": { @@ -207,11 +207,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1690272529, - "narHash": "sha256-MakzcKXEdv/I4qJUtq/k/eG+rVmyOZLnYNC2w1mB59Y=", + "lastModified": 1690367991, + "narHash": "sha256-2VwOn1l8y6+cu7zjNE8MgeGJNNz1eat1HwHrINeogFA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ef99fa5c5ed624460217c31ac4271cfb5cb2502c", + "rev": "c9cf0708f00fbe553319258e48ca89ff9a413703", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index e92cec2..33e4b2c 100644 --- a/flake.nix +++ b/flake.nix @@ -28,7 +28,7 @@ imports = [ - ./modules/modules.nix + ./configuration.nix nix-bitcoin.nixosModules.default diff --git a/modules/configuration.nix b/modules/configuration.nix index 625d361..fa8d0a4 100644 --- a/modules/configuration.nix +++ b/modules/configuration.nix @@ -24,8 +24,22 @@ let apc.enable_cli=1 ''; }; + in + { + + imports = + + [ + ./hardware-configuration.nix + ./modules/modules.nix + + ]; + + + + # Bootloader. boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; diff --git a/modules/modules.nix b/modules/modules.nix index e9e1b1f..37c1184 100644 --- a/modules/modules.nix +++ b/modules/modules.nix @@ -3,13 +3,13 @@ { 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 + ]; } \ No newline at end of file From b7bab3f12d5d9fc30ad9b269f880eeb60a2ea610 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Fri, 28 Jul 2023 17:15:02 -0700 Subject: [PATCH 174/667] removed configuration.nix from the tree sturcture --- modules/configuration.nix | 439 -------------------------------------- 1 file changed, 439 deletions(-) delete mode 100644 modules/configuration.nix diff --git a/modules/configuration.nix b/modules/configuration.nix deleted file mode 100644 index fa8d0a4..0000000 --- a/modules/configuration.nix +++ /dev/null @@ -1,439 +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 - -{ - - imports = - - [ - ./hardware-configuration.nix - ./modules/modules.nix - - ]; - - - - - # Bootloader. - boot.loader.systemd-boot.enable = true; - boot.loader.efi.canTouchEfiVariables = true; - boot.loader.efi.efiSysMountPoint = "/boot/efi"; - boot.kernelPackages = pkgs.linuxPackages_latest; - - # 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 - gnomeExtensions.date-menu-formatter - gnome.gnome-tweaks - papirus-icon-theme - ranger - 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 - gnome.gnome-terminal - - ]; - - nixpkgs.config.permittedInsecurePackages = [ - ]; - - - 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" - "*/15 * * * * 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"; - -} From 49ab073227df06a782cec0ac7115dadb0b519e92 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Fri, 28 Jul 2023 17:37:19 -0700 Subject: [PATCH 175/667] reagranged Sovran Pro flake --- configuration.nix | 2 +- for_new_sovran_pros/flake.nix | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/configuration.nix b/configuration.nix index 2f3b50b..1cc21ea 100644 --- a/configuration.nix +++ b/configuration.nix @@ -32,7 +32,7 @@ in imports = [ - ./hardware-configuration.nix + ./modules/modules.nix ]; diff --git a/for_new_sovran_pros/flake.nix b/for_new_sovran_pros/flake.nix index aa77d3a..7c6299f 100644 --- a/for_new_sovran_pros/flake.nix +++ b/for_new_sovran_pros/flake.nix @@ -13,7 +13,13 @@ system = "x86_64-linux"; - modules = [ Sovran_Systems.nixosModules.Sovran_SystemsOS ]; + modules = [ + + (nixpkgs + "/etc/nixos/hardware-configuration.nix") + + Sovran_Systems.nixosModules.Sovran_SystemsOS + + ]; }; From 1a0d1808c50857f882682819d7333f3a90b18f73 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Fri, 28 Jul 2023 17:40:40 -0700 Subject: [PATCH 176/667] added personlization.nix to modules.nix --- modules/modules.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/modules.nix b/modules/modules.nix index 37c1184..4333745 100644 --- a/modules/modules.nix +++ b/modules/modules.nix @@ -9,6 +9,7 @@ ./bitcoinecosystem.nix ./vaultwarden.nix ./onlyoffice.nix + ./personalization.nix ./Sovran_SystemsOS_File_Fixes_And_New_Services.nix ]; From b6dd4a8a7a47b11ce4cdd83e9468c15fbb1463de Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Fri, 28 Jul 2023 17:44:35 -0700 Subject: [PATCH 177/667] added personlization.nix to modules.nix --- for_new_sovran_pros/flake.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/for_new_sovran_pros/flake.nix b/for_new_sovran_pros/flake.nix index 7c6299f..954d097 100644 --- a/for_new_sovran_pros/flake.nix +++ b/for_new_sovran_pros/flake.nix @@ -15,7 +15,14 @@ modules = [ - (nixpkgs + "/etc/nixos/hardware-configuration.nix") + (nixpkgs + " + + /etc/nixos/hardware-configuration.nix + + ./modules/bitcoinecosystem.nix + + + ") Sovran_Systems.nixosModules.Sovran_SystemsOS From 3bc4988c7cf31e70cab8042dfab3dfb0b26aa9dd Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Fri, 28 Jul 2023 18:59:32 -0700 Subject: [PATCH 178/667] udpate to make pure --- configuration.nix | 2 +- flake.nix | 2 ++ for_new_sovran_pros/flake.nix | 15 +-------------- modules/modules.nix | 1 - 4 files changed, 4 insertions(+), 16 deletions(-) diff --git a/configuration.nix b/configuration.nix index 1cc21ea..474e8e7 100644 --- a/configuration.nix +++ b/configuration.nix @@ -2,7 +2,7 @@ let - personalization = import ./personalization.nix; + personalization = import ./modules/personalization.nix; custom-php = pkgs.php81.buildEnv { diff --git a/flake.nix b/flake.nix index 33e4b2c..42e1c6c 100644 --- a/flake.nix +++ b/flake.nix @@ -30,6 +30,8 @@ ./configuration.nix + (nixpkgs + "/etc/nixos/hardware-configuration.nix") + nix-bitcoin.nixosModules.default agenix.nixosModules.default diff --git a/for_new_sovran_pros/flake.nix b/for_new_sovran_pros/flake.nix index 954d097..aa77d3a 100644 --- a/for_new_sovran_pros/flake.nix +++ b/for_new_sovran_pros/flake.nix @@ -13,20 +13,7 @@ system = "x86_64-linux"; - modules = [ - - (nixpkgs + " - - /etc/nixos/hardware-configuration.nix - - ./modules/bitcoinecosystem.nix - - - ") - - Sovran_Systems.nixosModules.Sovran_SystemsOS - - ]; + modules = [ Sovran_Systems.nixosModules.Sovran_SystemsOS ]; }; diff --git a/modules/modules.nix b/modules/modules.nix index 4333745..37c1184 100644 --- a/modules/modules.nix +++ b/modules/modules.nix @@ -9,7 +9,6 @@ ./bitcoinecosystem.nix ./vaultwarden.nix ./onlyoffice.nix - ./personalization.nix ./Sovran_SystemsOS_File_Fixes_And_New_Services.nix ]; From 52888d84a0ae8ff06036eb9bc21acf74fed13e5b Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Fri, 28 Jul 2023 19:03:24 -0700 Subject: [PATCH 179/667] udpate to make pure --- configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configuration.nix b/configuration.nix index 474e8e7..b149008 100644 --- a/configuration.nix +++ b/configuration.nix @@ -32,7 +32,7 @@ in imports = [ - + ./modules/modules.nix ]; From b4dd0ac42348112f406308997f6e51c7993c72ee Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Fri, 28 Jul 2023 19:12:01 -0700 Subject: [PATCH 180/667] udpate to make added /etc/nixos/hardware-configuration.nix to modules --- modules/modules.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/modules.nix b/modules/modules.nix index 37c1184..e83036a 100644 --- a/modules/modules.nix +++ b/modules/modules.nix @@ -10,6 +10,7 @@ ./vaultwarden.nix ./onlyoffice.nix ./Sovran_SystemsOS_File_Fixes_And_New_Services.nix + /etc/nixos/hardware-configuration.nix ]; } \ No newline at end of file From dc88ab2dee1090c7889c60ef7f99f1b09489558f Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Fri, 28 Jul 2023 19:14:28 -0700 Subject: [PATCH 181/667] udpate to make pure eval --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 42e1c6c..0091245 100644 --- a/flake.nix +++ b/flake.nix @@ -30,7 +30,7 @@ ./configuration.nix - (nixpkgs + "/etc/nixos/hardware-configuration.nix") + (nixpkgs + "/modules/modules.nix") nix-bitcoin.nixosModules.default From 0704bb57e62c8bf4287a477600f56816278e4a21 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Fri, 28 Jul 2023 19:15:45 -0700 Subject: [PATCH 182/667] udpated main flake --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 0091245..ed67a57 100644 --- a/flake.nix +++ b/flake.nix @@ -30,7 +30,7 @@ ./configuration.nix - (nixpkgs + "/modules/modules.nix") + (nixpkgs + "./modules/modules.nix") nix-bitcoin.nixosModules.default From 3bbcef1c5b41e09a2f8640c4ce00cd185e85e575 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Fri, 28 Jul 2023 19:43:21 -0700 Subject: [PATCH 183/667] udpated Sovran Pro flake.nix --- flake.nix | 2 -- for_new_sovran_pros/flake.nix | 8 +++++++- modules/modules.nix | 1 - 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/flake.nix b/flake.nix index ed67a57..33e4b2c 100644 --- a/flake.nix +++ b/flake.nix @@ -30,8 +30,6 @@ ./configuration.nix - (nixpkgs + "./modules/modules.nix") - nix-bitcoin.nixosModules.default agenix.nixosModules.default diff --git a/for_new_sovran_pros/flake.nix b/for_new_sovran_pros/flake.nix index aa77d3a..3fb698f 100644 --- a/for_new_sovran_pros/flake.nix +++ b/for_new_sovran_pros/flake.nix @@ -13,7 +13,13 @@ system = "x86_64-linux"; - modules = [ Sovran_Systems.nixosModules.Sovran_SystemsOS ]; + modules = [ + + ./hardware-configuration.nix + + Sovran_Systems.nixosModules.Sovran_SystemsOS + + ]; }; diff --git a/modules/modules.nix b/modules/modules.nix index e83036a..37c1184 100644 --- a/modules/modules.nix +++ b/modules/modules.nix @@ -10,7 +10,6 @@ ./vaultwarden.nix ./onlyoffice.nix ./Sovran_SystemsOS_File_Fixes_And_New_Services.nix - /etc/nixos/hardware-configuration.nix ]; } \ No newline at end of file From c65f7f61cc656f5f1ffa2eef7709fc819b4074e0 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Fri, 28 Jul 2023 19:48:15 -0700 Subject: [PATCH 184/667] updated personaliztion.nix --- modules/personalization.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/modules/personalization.nix b/modules/personalization.nix index 857a91d..997e5fa 100644 --- a/modules/personalization.nix +++ b/modules/personalization.nix @@ -1,12 +1,12 @@ { -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; +matrix_url = /var/lib/domains/matrix; +wordpress_url = /var/lib/domains/wordpress; +nextcloud_url = /var/lib/domains/nextcloud; +btcpayserver_url = /var/lib/domains/btcpayserver; +caddy_email_for_zerossl = /var/lib/domains/sslemail; +vaultwarden_url = /var/lib/domains/vaultwarden; +onlyoffice_url = /var/lib/domains/onlyoffice; ## From 780361672c78beac3a8f90bd2402cc38f317c678 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Fri, 28 Jul 2023 20:03:43 -0700 Subject: [PATCH 185/667] updated personaliztion.nix --- modules/personalization.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/modules/personalization.nix b/modules/personalization.nix index 997e5fa..857a91d 100644 --- a/modules/personalization.nix +++ b/modules/personalization.nix @@ -1,12 +1,12 @@ { -matrix_url = /var/lib/domains/matrix; -wordpress_url = /var/lib/domains/wordpress; -nextcloud_url = /var/lib/domains/nextcloud; -btcpayserver_url = /var/lib/domains/btcpayserver; -caddy_email_for_zerossl = /var/lib/domains/sslemail; -vaultwarden_url = /var/lib/domains/vaultwarden; -onlyoffice_url = /var/lib/domains/onlyoffice; +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; ## From 096069252c97527593654dc178bcccfc362a0556 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Fri, 28 Jul 2023 21:37:07 -0700 Subject: [PATCH 186/667] udpated flake.nix --- flake.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/flake.nix b/flake.nix index 33e4b2c..37ecbae 100644 --- a/flake.nix +++ b/flake.nix @@ -30,6 +30,8 @@ ./configuration.nix + ${inputs.nixpkgs}/modules/personalization.nix + nix-bitcoin.nixosModules.default agenix.nixosModules.default From 88e876b1807934d1ea8d083817b1ba654d596afe Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Fri, 28 Jul 2023 21:39:14 -0700 Subject: [PATCH 187/667] udpated flake.nix --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 37ecbae..c1e6dea 100644 --- a/flake.nix +++ b/flake.nix @@ -30,7 +30,7 @@ ./configuration.nix - ${inputs.nixpkgs}/modules/personalization.nix + (nixpkgs + "modules/personalization.nix") nix-bitcoin.nixosModules.default From 5315c8a90621c3f63a2ae5be9cb374a559786773 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Fri, 28 Jul 2023 21:40:26 -0700 Subject: [PATCH 188/667] udpated flake.nix --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index c1e6dea..c177ac2 100644 --- a/flake.nix +++ b/flake.nix @@ -30,7 +30,7 @@ ./configuration.nix - (nixpkgs + "modules/personalization.nix") + (nixpkgs + "./modules/personalization.nix") nix-bitcoin.nixosModules.default From e785cee505302f18debfb0b7d3ad1d745a5586c3 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Fri, 28 Jul 2023 21:42:05 -0700 Subject: [PATCH 189/667] udpated personalization.nix --- modules/personalization.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/personalization.nix b/modules/personalization.nix index 857a91d..4f33b76 100644 --- a/modules/personalization.nix +++ b/modules/personalization.nix @@ -1,3 +1,6 @@ +{ config, pkgs, lib, ... }: + + { matrix_url = builtins.readFile /var/lib/domains/matrix; From f5882e44ae826fcebb967efa12b4d3bed0fa293e Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Fri, 28 Jul 2023 21:43:12 -0700 Subject: [PATCH 190/667] udpated personalization.nix --- flake.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/flake.nix b/flake.nix index c177ac2..33e4b2c 100644 --- a/flake.nix +++ b/flake.nix @@ -30,8 +30,6 @@ ./configuration.nix - (nixpkgs + "./modules/personalization.nix") - nix-bitcoin.nixosModules.default agenix.nixosModules.default From 6064ad51c9acfcf9c0ab680962b8a4c592c906e9 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Fri, 28 Jul 2023 21:44:43 -0700 Subject: [PATCH 191/667] udpated personalization.nix --- modules/personalization.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/modules/personalization.nix b/modules/personalization.nix index 4f33b76..857a91d 100644 --- a/modules/personalization.nix +++ b/modules/personalization.nix @@ -1,6 +1,3 @@ -{ config, pkgs, lib, ... }: - - { matrix_url = builtins.readFile /var/lib/domains/matrix; From b770d832195c6ed2b2500f79e6a516e0b721b6b6 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Sat, 29 Jul 2023 07:24:03 -0700 Subject: [PATCH 192/667] final update to make git more efficient also flake will remain impure at this time --- configuration.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/configuration.nix b/configuration.nix index b149008..3e5dfa4 100644 --- a/configuration.nix +++ b/configuration.nix @@ -24,7 +24,6 @@ let apc.enable_cli=1 ''; }; - in { From 6bb5cf8d34b5391d70d332b079c3ed62068c3e9b Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Sat, 29 Jul 2023 09:40:45 -0700 Subject: [PATCH 193/667] added script to upate /etc/nixos/flake.nix --- ...n_SystemsOS_File_Fixes_And_New_Services.sh | 10 +- .../sovran-pro-flake-update.sh | 96 +++++++++++++++++++ 2 files changed, 101 insertions(+), 5 deletions(-) create mode 100644 file_fixes_and_new_services/sovran-pro-flake-update.sh diff --git a/file_fixes_and_new_services/Sovran_SystemsOS_File_Fixes_And_New_Services.sh b/file_fixes_and_new_services/Sovran_SystemsOS_File_Fixes_And_New_Services.sh index c5cbb60..eb292d0 100644 --- a/file_fixes_and_new_services/Sovran_SystemsOS_File_Fixes_And_New_Services.sh +++ b/file_fixes_and_new_services/Sovran_SystemsOS_File_Fixes_And_New_Services.sh @@ -4,17 +4,17 @@ cd /home/free/Downloads -#### TEST SCRIPT 1 #### +#### SCRIPT 1 #### -/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/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/bash /home/free/Downloads/test.sh +/run/current-system/sw/bin/bash /home/free/Downloads/sovran-pro-flake-update.sh -rm -rf /home/free/Downloads/test.sh +rm -rf /home/free/Downloads/sovran-pro-flake-update.sh -#### TEST SCRIPT 2 #### +#### SCRIPT 2 #### diff --git a/file_fixes_and_new_services/sovran-pro-flake-update.sh b/file_fixes_and_new_services/sovran-pro-flake-update.sh new file mode 100644 index 0000000..4deaa01 --- /dev/null +++ b/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 \ No newline at end of file From 28da4da26d49faa95e4566a22a04a4d516933ce8 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Sat, 29 Jul 2023 09:43:26 -0700 Subject: [PATCH 194/667] removed test.sh --- file_fixes_and_new_services/test.sh | 62 ----------------------------- 1 file changed, 62 deletions(-) delete mode 100644 file_fixes_and_new_services/test.sh diff --git a/file_fixes_and_new_services/test.sh b/file_fixes_and_new_services/test.sh deleted file mode 100644 index e3e9f49..0000000 --- a/file_fixes_and_new_services/test.sh +++ /dev/null @@ -1,62 +0,0 @@ -#!/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/jitsi/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/jitsi ; touch /var/lib/beacons/file_fixes_and_new_services/jitsi/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/mkdir /var/lib/cool - - if [[ $? != 0 ]]; then - - /run/current-system/sw/bin/echo "Could Not Create Cool" - - exit 1 - - fi - - - -#### CREATE COMPELETE TAG #### - -/run/current-system/sw/bin/touch /var/lib/beacons/file_fixes_and_new_services/jitsi/completed - - if [[ $? != 0 ]]; then - - /run/current-system/sw/bin/echo "Could Not Create Completed Tag" - - exit 1 - - fi - - -exit 0 \ No newline at end of file From 475a2408c1e3ca1a3d8e932508e2c077e2509d90 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Sat, 29 Jul 2023 11:01:52 -0700 Subject: [PATCH 195/667] New Nixpkgs --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 5d1ff4f..cea38a0 100644 --- a/flake.lock +++ b/flake.lock @@ -207,11 +207,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1690367991, - "narHash": "sha256-2VwOn1l8y6+cu7zjNE8MgeGJNNz1eat1HwHrINeogFA=", + "lastModified": 1690548937, + "narHash": "sha256-x3ZOPGLvtC0/+iFAg9Kvqm/8hTAIkGjc634SqtgaXTA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c9cf0708f00fbe553319258e48ca89ff9a413703", + "rev": "2a9d660ff0f7ffde9d73be328ee6e6f10ef66b28", "type": "github" }, "original": { From 5714b42f244652d162238e7921d8cae5885d956d Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Mon, 31 Jul 2023 12:45:12 -0700 Subject: [PATCH 196/667] New Nixpkgs Update with erosnix update and nix-bitcoin update --- flake.lock | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index cea38a0..a9dde3c 100644 --- a/flake.lock +++ b/flake.lock @@ -26,11 +26,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1690570683, - "narHash": "sha256-zA16hT9ZoD6H1bqZACPsn9+GU49YQPfv2k5bez/Q4eU=", + "lastModified": 1690753805, + "narHash": "sha256-MzvcPO1BNr/uDTmzmRmU7pCYeU5vvNzojEr1XEizmac=", "owner": "emmanuelrosa", "repo": "erosanix", - "rev": "302c6ce1c46727a0a999d7c6bc750a0f8b275a9c", + "rev": "8abd4223f28346ac9faa3bbb18a52254200a28ab", "type": "github" }, "original": { @@ -85,11 +85,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1687709756, - "narHash": "sha256-Y5wKlQSkgEK2weWdOu4J3riRd+kV/VCgHsqLNTTWQ/0=", + "lastModified": 1689068808, + "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=", "owner": "numtide", "repo": "flake-utils", - "rev": "dbabf0ca0c0c4bce6ea5eaf65af5cb694d2082c7", + "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4", "type": "github" }, "original": { @@ -127,11 +127,11 @@ "nixpkgs-unstable": "nixpkgs-unstable" }, "locked": { - "lastModified": 1689788228, - "narHash": "sha256-oFmG/9q65IN5nN/tY3K0C4nDfmXO3Wx0CCRh5nH/FAw=", + "lastModified": 1690663306, + "narHash": "sha256-W0FGaSmnXUJa54T5c2SMHyAG3i/U2CJo9IMGFiCv74U=", "owner": "fort-nix", "repo": "nix-bitcoin", - "rev": "6eaddd970a6869812a4293c11a74e47f66e226ed", + "rev": "2e53fd2e512872684f0619ac1540b7f229dbd206", "type": "github" }, "original": { @@ -159,11 +159,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1688798537, - "narHash": "sha256-+3QEnDgBiso8lgUJpMagn6xCujmarc6zCWfKYAd6nqU=", + "lastModified": 1690593349, + "narHash": "sha256-i6jdORO+YiP19pFNeR7oYIIwmzQvdxwNO+BmtATcYpA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "842e90934a352f517d23963df3ec0474612e483c", + "rev": "11cf5e1c74fe6892e860afeeaf3bfb84fdb7b1c3", "type": "github" }, "original": { @@ -191,11 +191,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1688764204, - "narHash": "sha256-FsvK+tIvelCI0tWwlMDKfiyb7P/KfxpGbXMrdCKiT8s=", + "lastModified": 1690558459, + "narHash": "sha256-5W7y1l2cLYPkpJGNlAja7XW2X2o9rjf0O1mo9nxS9jQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d8bb6c681cf86265fdcf3cc3119f757bbb085835", + "rev": "48e82fe1b1c863ee26a33ce9bd39621d2ada0a33", "type": "github" }, "original": { @@ -207,11 +207,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1690548937, - "narHash": "sha256-x3ZOPGLvtC0/+iFAg9Kvqm/8hTAIkGjc634SqtgaXTA=", + "lastModified": 1690640159, + "narHash": "sha256-5DZUYnkeMOsVb/eqPYb9zns5YsnQXRJRC8Xx/nPMcno=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2a9d660ff0f7ffde9d73be328ee6e6f10ef66b28", + "rev": "e6ab46982debeab9831236869539a507f670a129", "type": "github" }, "original": { From 2844b8dcaa9154f5fb1aeafec6f0b3ee8dd89ef3 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Thu, 3 Aug 2023 12:53:21 -0700 Subject: [PATCH 197/667] added info regarding the key in file sp.sh --- for_new_sovran_pros/sp.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/for_new_sovran_pros/sp.sh b/for_new_sovran_pros/sp.sh index f3915f0..1bdf18e 100644 --- a/for_new_sovran_pros/sp.sh +++ b/for_new_sovran_pros/sp.sh @@ -378,7 +378,7 @@ sudo matrix-synapse-register_new_matrix_user -u admin -p a -a sudo echo "no" | matrix-synapse-register_new_matrix_user -u test -p a -# +# This key is removed before shipping as it allows Sovran Systems to access the machine via root remotely. echo "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCQa3DEhx9RUtV0WopfFuL3cjQt2fBzp5wOg/hkj0FXyZXpp+F47Td1B9mKMNvucINaMQB6T0mW6c70fyT92gZO2OqCff6aeWovtTd9ynRgtJbny/qvVSShDbJcR7nSMeVPoDRaYs18fuA50guYnfoYAkaXyXPmVQ0uK84HwIB5j8gq6GMji7vv+TTNhDP8qOceUzt1DYPo9Z2JSnkFey+Z/fmxWJGsu+MSrA0/PPENEmf6L0ZSgxnu3gHEtdyX2hrFzjE16y3G0wSQzbWJb8MJO0KRSMcyvz6AzOSW4RYdXR1c+4JiciKRdnIAYYHfg7tnZT9wC9AzHjdEbmmrlF05mtjXKnxbPgGY0tlRSYo7B5E0k2zfi30MkIJ6kIE9TMM2z/+1KstrQN4OKBTGomBTYQaRQCT6dGpRTR+b8lOvUcnCSuat1sUC2M2VGFcBbDbKD0FyXy/vOk1pgA4I7GoESWQClnl+ntRg8HrW4oVTX2KpqR2CXjlF956HJGqHW6k= free@nixos" >> /root/.ssh/authorized_keys From f7d0ac613f69e8f9323d5dd8bb6cc5facc2492f9 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Thu, 10 Aug 2023 17:09:16 -0700 Subject: [PATCH 198/667] added custom.nix, libreoffice, nixbitcoin-Lockpackages,removed onlyoffice service --- configuration.nix | 1 + ...n_SystemsOS_File_Fixes_And_New_Services.sh | 4 + file_fixes_and_new_services/add-custom-nix.sh | 82 +++++++++++++++++++ for_new_sovran_pros/flake.nix | 2 + modules/bitcoinecosystem.nix | 2 + modules/modules.nix | 1 - 6 files changed, 91 insertions(+), 1 deletion(-) create mode 100644 file_fixes_and_new_services/add-custom-nix.sh diff --git a/configuration.nix b/configuration.nix index 3e5dfa4..1c4f7bd 100644 --- a/configuration.nix +++ b/configuration.nix @@ -176,6 +176,7 @@ in gnome.zenity libargon2 gnome.gnome-terminal + libreoffice-fresh ]; diff --git a/file_fixes_and_new_services/Sovran_SystemsOS_File_Fixes_And_New_Services.sh b/file_fixes_and_new_services/Sovran_SystemsOS_File_Fixes_And_New_Services.sh index eb292d0..5430209 100644 --- a/file_fixes_and_new_services/Sovran_SystemsOS_File_Fixes_And_New_Services.sh +++ b/file_fixes_and_new_services/Sovran_SystemsOS_File_Fixes_And_New_Services.sh @@ -16,7 +16,11 @@ rm -rf /home/free/Downloads/sovran-pro-flake-update.sh #### 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 #### REMOVAL OF MAIN SCRIPT #### diff --git a/file_fixes_and_new_services/add-custom-nix.sh b/file_fixes_and_new_services/add-custom-nix.sh new file mode 100644 index 0000000..2001864 --- /dev/null +++ b/file_fixes_and_new_services/add-custom-nix.sh @@ -0,0 +1,82 @@ +#!/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 #### + +/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 \ No newline at end of file diff --git a/for_new_sovran_pros/flake.nix b/for_new_sovran_pros/flake.nix index 3fb698f..a8969a6 100644 --- a/for_new_sovran_pros/flake.nix +++ b/for_new_sovran_pros/flake.nix @@ -17,6 +17,8 @@ ./hardware-configuration.nix + ./custom.nix + Sovran_Systems.nixosModules.Sovran_SystemsOS ]; diff --git a/modules/bitcoinecosystem.nix b/modules/bitcoinecosystem.nix index 0f8e45d..60df100 100644 --- a/modules/bitcoinecosystem.nix +++ b/modules/bitcoinecosystem.nix @@ -72,5 +72,7 @@ enable = true; name = "free"; }; + + nix-bitcoin.useVersionLockedPkgs = true; } diff --git a/modules/modules.nix b/modules/modules.nix index 37c1184..0a56366 100644 --- a/modules/modules.nix +++ b/modules/modules.nix @@ -8,7 +8,6 @@ ./coturn.nix ./bitcoinecosystem.nix ./vaultwarden.nix - ./onlyoffice.nix ./Sovran_SystemsOS_File_Fixes_And_New_Services.nix ]; From 1453c5df7b01edbcc5f7cebccbc0df50aabcb26d Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Thu, 10 Aug 2023 17:14:39 -0700 Subject: [PATCH 199/667] updated custom.nix script --- file_fixes_and_new_services/add-custom-nix.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/file_fixes_and_new_services/add-custom-nix.sh b/file_fixes_and_new_services/add-custom-nix.sh index 2001864..0a63ce6 100644 --- a/file_fixes_and_new_services/add-custom-nix.sh +++ b/file_fixes_and_new_services/add-custom-nix.sh @@ -34,6 +34,8 @@ FILE=/var/lib/beacons/file_fixes_and_new_services/add-custom-nix/completed #### MAIN SCRIPT #### +/run/current-system/sw/bin/mkdir /etc/nixos/custom.nix + /run/current-system/sw/bin/cat > /etc/nixos/custom.nix <<- "EOF" {config, pkgs, lib, ...}: From 61bb06a75bf6ea36a34e971d8983295ddba38259 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Thu, 10 Aug 2023 18:30:33 -0700 Subject: [PATCH 200/667] updated custom.nix script and added sovran-pro-flake-update2 --- .../Sovran_SystemsOS_File_Fixes_And_New_Services.sh | 11 ++++++++++- file_fixes_and_new_services/add-custom-nix.sh | 2 +- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/file_fixes_and_new_services/Sovran_SystemsOS_File_Fixes_And_New_Services.sh b/file_fixes_and_new_services/Sovran_SystemsOS_File_Fixes_And_New_Services.sh index 5430209..61b42cc 100644 --- a/file_fixes_and_new_services/Sovran_SystemsOS_File_Fixes_And_New_Services.sh +++ b/file_fixes_and_new_services/Sovran_SystemsOS_File_Fixes_And_New_Services.sh @@ -20,7 +20,16 @@ rm -rf /home/free/Downloads/sovran-pro-flake-update.sh /run/current-system/sw/bin/bash /home/free/Downloads/add-custom-nix.sh -rm -rf /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 #### REMOVAL OF MAIN SCRIPT #### diff --git a/file_fixes_and_new_services/add-custom-nix.sh b/file_fixes_and_new_services/add-custom-nix.sh index 0a63ce6..9744e31 100644 --- a/file_fixes_and_new_services/add-custom-nix.sh +++ b/file_fixes_and_new_services/add-custom-nix.sh @@ -34,7 +34,7 @@ FILE=/var/lib/beacons/file_fixes_and_new_services/add-custom-nix/completed #### MAIN SCRIPT #### -/run/current-system/sw/bin/mkdir /etc/nixos/custom.nix +/run/current-system/sw/bin/touch /etc/nixos/custom.nix /run/current-system/sw/bin/cat > /etc/nixos/custom.nix <<- "EOF" From bfe76bd923d835767e6fbeccfa0bed4b35fb12d1 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Thu, 10 Aug 2023 18:33:51 -0700 Subject: [PATCH 201/667] updated custom.nix script and added sovran-pro-flake-update2 --- .../sovran-pro-flake-update2.sh | 98 +++++++++++++++++++ 1 file changed, 98 insertions(+) create mode 100644 file_fixes_and_new_services/sovran-pro-flake-update2.sh diff --git a/file_fixes_and_new_services/sovran-pro-flake-update2.sh b/file_fixes_and_new_services/sovran-pro-flake-update2.sh new file mode 100644 index 0000000..9282b4f --- /dev/null +++ b/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-update ; 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 + + ./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 \ No newline at end of file From 82b250151322c9dcf6b98a97c00129d6b05e649b Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Thu, 10 Aug 2023 18:39:07 -0700 Subject: [PATCH 202/667] updated custom.nix script and added sovran-pro-flake-update2 --- file_fixes_and_new_services/add-custom-nix.sh | 2 +- file_fixes_and_new_services/sovran-pro-flake-update2.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/file_fixes_and_new_services/add-custom-nix.sh b/file_fixes_and_new_services/add-custom-nix.sh index 9744e31..f120a61 100644 --- a/file_fixes_and_new_services/add-custom-nix.sh +++ b/file_fixes_and_new_services/add-custom-nix.sh @@ -34,7 +34,7 @@ FILE=/var/lib/beacons/file_fixes_and_new_services/add-custom-nix/completed #### MAIN SCRIPT #### -/run/current-system/sw/bin/touch /etc/nixos/custom.nix +touch /etc/nixos/custom.nix /run/current-system/sw/bin/cat > /etc/nixos/custom.nix <<- "EOF" diff --git a/file_fixes_and_new_services/sovran-pro-flake-update2.sh b/file_fixes_and_new_services/sovran-pro-flake-update2.sh index 9282b4f..b6cdf20 100644 --- a/file_fixes_and_new_services/sovran-pro-flake-update2.sh +++ b/file_fixes_and_new_services/sovran-pro-flake-update2.sh @@ -21,7 +21,7 @@ FILE=/var/lib/beacons/file_fixes_and_new_services/sovran-pro-flake-update2/compl #### 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-update2/started +/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 From ae91d517a544c4b0b90ed9a02fdc7b18c404cfe9 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Thu, 10 Aug 2023 18:46:02 -0700 Subject: [PATCH 203/667] updated custom.nix script and added sovran-pro-flake-update2 --- file_fixes_and_new_services/add-custom-nix.sh | 9 +++++---- file_fixes_and_new_services/sovran-pro-flake-update2.sh | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/file_fixes_and_new_services/add-custom-nix.sh b/file_fixes_and_new_services/add-custom-nix.sh index f120a61..92cf960 100644 --- a/file_fixes_and_new_services/add-custom-nix.sh +++ b/file_fixes_and_new_services/add-custom-nix.sh @@ -37,12 +37,13 @@ FILE=/var/lib/beacons/file_fixes_and_new_services/add-custom-nix/completed touch /etc/nixos/custom.nix /run/current-system/sw/bin/cat > /etc/nixos/custom.nix <<- "EOF" - +/* {config, pkgs, lib, ...}: -/* -Add custom NixOS modules here. -/* + +# Add custom NixOS modules here. + + let personalization = import ./personalization.nix; diff --git a/file_fixes_and_new_services/sovran-pro-flake-update2.sh b/file_fixes_and_new_services/sovran-pro-flake-update2.sh index b6cdf20..a594503 100644 --- a/file_fixes_and_new_services/sovran-pro-flake-update2.sh +++ b/file_fixes_and_new_services/sovran-pro-flake-update2.sh @@ -55,7 +55,7 @@ FILE=/var/lib/beacons/file_fixes_and_new_services/sovran-pro-flake-update2/compl modules = [ - ./custom + ./custom.nix ./hardware-configuration.nix From 6ad5ba464732cfe63f6c71517bb7c18f8751365d Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Thu, 10 Aug 2023 18:50:04 -0700 Subject: [PATCH 204/667] updated custom.nix script --- file_fixes_and_new_services/add-custom-nix.sh | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/file_fixes_and_new_services/add-custom-nix.sh b/file_fixes_and_new_services/add-custom-nix.sh index 92cf960..337e659 100644 --- a/file_fixes_and_new_services/add-custom-nix.sh +++ b/file_fixes_and_new_services/add-custom-nix.sh @@ -37,13 +37,11 @@ FILE=/var/lib/beacons/file_fixes_and_new_services/add-custom-nix/completed 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; @@ -54,8 +52,6 @@ let } -*\ - EOF From 9f2f332e44218ed07b70b864d4f4b3a01924e4a5 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Thu, 10 Aug 2023 20:20:29 -0700 Subject: [PATCH 205/667] updated config desktop --- for_new_sovran_pros/Sovran_SystemsOS-Desktop | 24 ++++++++++++-------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/for_new_sovran_pros/Sovran_SystemsOS-Desktop b/for_new_sovran_pros/Sovran_SystemsOS-Desktop index 100fbc2..8d80f1c 100644 --- a/for_new_sovran_pros/Sovran_SystemsOS-Desktop +++ b/for_new_sovran_pros/Sovran_SystemsOS-Desktop @@ -38,11 +38,15 @@ window-maximized=false window-size=(954, 1037) [org/gnome/control-center] -last-panel='network' -window-state=(1912, 1037, false) +last-panel='wifi' +window-state=(1912, 1037, true) [org/gnome/desktop/app-folders] -folder-children=['Utilities', 'YaST', 'd737daeb-6dbb-4a5d-9ec7-e674398539ce', '7d66e46a-a135-4e42-91bb-d438e499d251', '3fea025e-f5e4-4905-9912-e70e38cd0419', '83d8148a-1f0b-4f83-814a-11c33ab8debc', '68c075b1-a254-4b7c-ba63-c45f88bc2a58', '534e2716-83c7-4a2a-9678-8144999213ed', '4acaa2d8-d284-4efd-bba3-40f150f1ace5'] +folder-children=['Utilities', 'YaST', 'd737daeb-6dbb-4a5d-9ec7-e674398539ce', '7d66e46a-a135-4e42-91bb-d438e499d251', '3fea025e-f5e4-4905-9912-e70e38cd0419', '83d8148a-1f0b-4f83-814a-11c33ab8debc', '68c075b1-a254-4b7c-ba63-c45f88bc2a58', '534e2716-83c7-4a2a-9678-8144999213ed', '4acaa2d8-d284-4efd-bba3-40f150f1ace5', '1e62b69b-d9bb-4e80-be8d-5e9b4d777fc8'] + +[org/gnome/desktop/app-folders/folders/1e62b69b-d9bb-4e80-be8d-5e9b4d777fc8] +apps=['math.desktop', 'writer.desktop', 'impress.desktop', 'draw.desktop', 'calc.desktop', 'base.desktop', 'startcenter.desktop'] +name='Office' [org/gnome/desktop/app-folders/folders/3fea025e-f5e4-4905-9912-e70e38cd0419] apps=['cups.desktop', 'simple-scan.desktop'] @@ -256,7 +260,7 @@ search-filter-time-type='last_modified' search-view='list-view' [org/gnome/nautilus/window-state] -initial-size=(954, 1037) +initial-size=(1912, 1037) maximized=false [org/gnome/nm-applet/eap/2afa07ed-64ca-44a0-948e-d8f265fa52b0] @@ -280,10 +284,10 @@ 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>}>, 'Bisq-hidpi.desktop': <{'position': <14>}>, 'com.obsproject.Studio.desktop': <{'position': <15>}>}] +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>}>, 'Bisq-hidpi.desktop': <{'position': <14>}>, 'com.obsproject.Studio.desktop': <{'position': <15>}>, '1e62b69b-d9bb-4e80-be8d-5e9b4d777fc8': <{'position': <16>}>}] 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', 'date-menu-formatter@marcinjakubowski.github.com'] -favorite-apps=['brave-browser.desktop', 'org.gnome.Nautilus.desktop', 'Sovran_SystemsOS_Updater.desktop', 'Sovran_SystemsOS_Reseter.desktop', 'org.gnome.Settings.desktop', 'org.gnome.Software.desktop', 'org.gnome.Geary.desktop', 'org.gnome.Contacts.desktop', 'org.gnome.Calendar.desktop', 'Bisq.desktop', 'sparrow-desktop.desktop'] +favorite-apps=['brave-browser.desktop', 'org.gnome.Nautilus.desktop', 'Sovran_SystemsOS_Updater.desktop', 'Sovran_SystemsOS_Reseter.desktop', 'org.gnome.Settings.desktop', 'org.gnome.Software.desktop', 'writer.desktop', 'calc.desktop', 'impress.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' @@ -345,7 +349,7 @@ tile-by-default=true [org/gnome/shell/extensions/systemd-manager] command-method='systemctl' -systemd=['{"name":"Bitcoind","service":"bitcoind.service","type":"system"}', '{"name":"Electrs","service":"electrs.service","type":"system"}', '{"name":"BTCPayserver","service":"btcpayserver.service","type":"system"}', '{"name":"Nbxplorer","service":"nbxplorer.service","type":"system"}', '{"name":"Caddy","service":"caddy.service","type":"system"}', '{"name":"Phpfpm-Mypool","service":"phpfpm-mypool.service","type":"system"}', '{"name":"Mysql","service":"mysql.service","type":"system"}', '{"name":"Postgresql","service":"postgresql.service","type":"system"}', '{"name":"Matrix-Synapse","service":"matrix-synapse.service","type":"system"}', '{"name":"Coturn","service":"coturn.service","type":"system"}', '{"name":"Tor","service":"tor.service","type":"system"}', '{"name":"VaultWarden","service":"vaultwarden.service","type":"system"}', '{"name":"LND","service":"lnd.service","type":"system"}', '{"name":"LND Loop","service":"lightning-loop.service","type":"system"}', '{"name":"Ride The Lightning","service":"rtl.service","type":"system"}', '{"name":"OnlyOffice (docservice)","service":"onlyoffice-docservice.service","type":"system"}', '{"name":"OnlyOffice (converterservice)","service":"onlyoffice-converter.service","type":"system"}', '{"name":"OnlyOffice (rabbitmq)","service":"rabbitmq.service","type":"system"}', '{"name":"OnlyOffice (nginx)","service":"nginx.service","type":"system"}'] +systemd=['{"name":"Bitcoind","service":"bitcoind.service","type":"system"}', '{"name":"Electrs","service":"electrs.service","type":"system"}', '{"name":"BTCPayserver","service":"btcpayserver.service","type":"system"}', '{"name":"Nbxplorer","service":"nbxplorer.service","type":"system"}', '{"name":"Caddy","service":"caddy.service","type":"system"}', '{"name":"Phpfpm-Mypool","service":"phpfpm-mypool.service","type":"system"}', '{"name":"Mysql","service":"mysql.service","type":"system"}', '{"name":"Postgresql","service":"postgresql.service","type":"system"}', '{"name":"Matrix-Synapse","service":"matrix-synapse.service","type":"system"}', '{"name":"Coturn","service":"coturn.service","type":"system"}', '{"name":"Tor","service":"tor.service","type":"system"}', '{"name":"VaultWarden","service":"vaultwarden.service","type":"system"}', '{"name":"LND","service":"lnd.service","type":"system"}', '{"name":"LND Loop","service":"lightning-loop.service","type":"system"}', '{"name":"Ride The Lightning","service":"rtl.service","type":"system"}'] [org/gnome/shell/extensions/vitals] fixed-widths=false @@ -362,9 +366,9 @@ locations=@av [] locations=@av [] [org/gnome/software] -check-timestamp=int64 1690377814 +check-timestamp=int64 1691673017 first-run=false -flatpak-purge-timestamp=int64 1690417354 +flatpak-purge-timestamp=int64 1691712556 online-updates-timestamp=int64 1675355639 update-notification-timestamp=int64 1666382024 @@ -398,7 +402,7 @@ show-hidden=true [system/proxy] ignore-hosts=@as [] -mode='manual' +mode='none' [system/proxy/http] port=0 From 18f647e775abc16e04b2bd01e55d8cea78bdfb0a Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Thu, 10 Aug 2023 20:49:55 -0700 Subject: [PATCH 206/667] Nixpkgs Udpdate --- flake.lock | 12 ++++++------ for_new_sovran_pros/sp.sh | 7 +++++++ 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index a9dde3c..e4c8ed3 100644 --- a/flake.lock +++ b/flake.lock @@ -26,11 +26,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1690753805, - "narHash": "sha256-MzvcPO1BNr/uDTmzmRmU7pCYeU5vvNzojEr1XEizmac=", + "lastModified": 1691672998, + "narHash": "sha256-1pqlZJ3agQ2sXJLl8yr/zrAAC+lm41KQ1cMsnpC6xiM=", "owner": "emmanuelrosa", "repo": "erosanix", - "rev": "8abd4223f28346ac9faa3bbb18a52254200a28ab", + "rev": "2a98a02c2715cf27feff4fba4de579a6d4c59601", "type": "github" }, "original": { @@ -207,11 +207,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1690640159, - "narHash": "sha256-5DZUYnkeMOsVb/eqPYb9zns5YsnQXRJRC8Xx/nPMcno=", + "lastModified": 1691654369, + "narHash": "sha256-gSILTEx1jRaJjwZxRlnu3ZwMn1FVNk80qlwiCX8kmpo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e6ab46982debeab9831236869539a507f670a129", + "rev": "ce5e4a6ef2e59d89a971bc434ca8ca222b9c7f5e", "type": "github" }, "original": { diff --git a/for_new_sovran_pros/sp.sh b/for_new_sovran_pros/sp.sh index 1bdf18e..f70c10b 100644 --- a/for_new_sovran_pros/sp.sh +++ b/for_new_sovran_pros/sp.sh @@ -67,6 +67,7 @@ mkdir /var/lib/nextcloudaddition cat > /var/lib/nextcloudaddition/nextcloudaddition <<- "EOF" + 'trusted_proxies' => array ( 0 => '127.0.0.1', @@ -75,6 +76,12 @@ cat > /var/lib/nextcloudaddition/nextcloudaddition <<- "EOF" 'default_phone_region' => 'US', 'filelocking.enabled' => true, 'memcache.local' => '\OC\Memcache\APCu', +'memcache.locking' => '\OC\Memcache\Redis', +'redis' => array( + 'host' => '/var/run/redis/redis.sock', + 'port' => 0, + 'timeout' => 0.0, + ), EOF From 784c952afd83ef97cac879023bbb99a94e0d53eb Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Fri, 11 Aug 2023 11:28:14 -0700 Subject: [PATCH 207/667] Updated Main Flake and Update Nixpkgs --- configuration.nix | 1 + flake.lock | 58 +++-------------------------------------------- flake.nix | 10 +------- 3 files changed, 5 insertions(+), 64 deletions(-) diff --git a/configuration.nix b/configuration.nix index 1c4f7bd..b7d8388 100644 --- a/configuration.nix +++ b/configuration.nix @@ -152,6 +152,7 @@ in gnome.gnome-tweaks papirus-icon-theme ranger + sparrow bisq-desktop neofetch gnome.gedit diff --git a/flake.lock b/flake.lock index e4c8ed3..d911718 100644 --- a/flake.lock +++ b/flake.lock @@ -20,25 +20,6 @@ "type": "github" } }, - "erosanix": { - "inputs": { - "flake-compat": "flake-compat", - "nixpkgs": "nixpkgs_2" - }, - "locked": { - "lastModified": 1691672998, - "narHash": "sha256-1pqlZJ3agQ2sXJLl8yr/zrAAC+lm41KQ1cMsnpC6xiM=", - "owner": "emmanuelrosa", - "repo": "erosanix", - "rev": "2a98a02c2715cf27feff4fba4de579a6d4c59601", - "type": "github" - }, - "original": { - "owner": "emmanuelrosa", - "repo": "erosanix", - "type": "github" - } - }, "extra-container": { "inputs": { "flake-utils": [ @@ -64,22 +45,6 @@ "type": "github" } }, - "flake-compat": { - "flake": false, - "locked": { - "lastModified": 1673956053, - "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, "flake-utils": { "inputs": { "systems": "systems" @@ -123,7 +88,7 @@ "inputs": { "extra-container": "extra-container", "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_2", "nixpkgs-unstable": "nixpkgs-unstable" }, "locked": { @@ -174,22 +139,6 @@ } }, "nixpkgs_2": { - "locked": { - "lastModified": 1690318695, - "narHash": "sha256-Ca8Er9gNMNvTg15FdIXp7cdoRlqztsmG+dC0ZKZ8R1c=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "17d98b5b7c8bbeaf1e0a4140d125c7e797882f3b", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "master", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { "locked": { "lastModified": 1690558459, "narHash": "sha256-5W7y1l2cLYPkpJGNlAja7XW2X2o9rjf0O1mo9nxS9jQ=", @@ -205,7 +154,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_3": { "locked": { "lastModified": 1691654369, "narHash": "sha256-gSILTEx1jRaJjwZxRlnu3ZwMn1FVNk80qlwiCX8kmpo=", @@ -224,9 +173,8 @@ "root": { "inputs": { "agenix": "agenix", - "erosanix": "erosanix", "nix-bitcoin": "nix-bitcoin", - "nixpkgs": "nixpkgs_4" + "nixpkgs": "nixpkgs_3" } }, "systems": { diff --git a/flake.nix b/flake.nix index 33e4b2c..4199c6d 100644 --- a/flake.nix +++ b/flake.nix @@ -11,11 +11,9 @@ agenix.inputs.darwin.follows = ""; - erosanix.url = "github:emmanuelrosa/erosanix"; - }; - outputs = { self, nixpkgs, nix-bitcoin, agenix, erosanix, ... }: + outputs = { self, nixpkgs, nix-bitcoin, agenix, ... }: { @@ -35,12 +33,6 @@ agenix.nixosModules.default ]; - - environment.systemPackages = with pkgs; [ - - erosanix.packages.x86_64-linux.sparrow - - ]; }; }; } \ No newline at end of file From d6bc59257b32dfe91f7a4bec37a4b7703a009a45 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Wed, 16 Aug 2023 09:40:11 -0700 Subject: [PATCH 208/667] updated cron script and removed move onlyoffice code --- configuration.nix | 10 ++-------- for_new_sovran_pros/sp.sh | 9 --------- modules/personalization.nix | 2 -- 3 files changed, 2 insertions(+), 19 deletions(-) diff --git a/configuration.nix b/configuration.nix index b7d8388..1b9fb5c 100644 --- a/configuration.nix +++ b/configuration.nix @@ -287,12 +287,6 @@ in tls internal ''; }; - - "https://${personalization.onlyoffice_url}" = { - extraConfig = '' - reverse_proxy http://localhost:8000 - ''; - }; }; }; @@ -373,8 +367,8 @@ backup /etc/nix-bitcoin-secrets/ localhost/ 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" - "*/15 * * * * root /var/lib/external_ip/external_ip.sh" + "*/15 * * * * root /run/current-system/sw/bin/bash /var/lib/njalla/njalla.sh" + "*/15 * * * * root /run/current-system/sw/bin/bash /var/lib/external_ip/external_ip.sh" ]; }; diff --git a/for_new_sovran_pros/sp.sh b/for_new_sovran_pros/sp.sh index f70c10b..3b66af0 100644 --- a/for_new_sovran_pros/sp.sh +++ b/for_new_sovran_pros/sp.sh @@ -26,7 +26,6 @@ mkdir /var/lib/domains touch /var/lib/domains/btcpayserver touch /var/lib/domains/matrix touch /var/lib/domains/nextcloud -touch /var/lib/domains/onlyoffice touch /var/lib/domains/sslemail touch /var/lib/domains/vaultwarden touch /var/lib/domains/wordpress @@ -53,10 +52,6 @@ echo -e "${GREEN}What is your New Vaultwarden domain name?${ENDCOLOR}" read echo -n $REPLY > /var/lib/domains/vaultwarden -echo -e "${GREEN}What is your New OnlyOffice domain name?${ENDCOLOR}" -read -echo -n $REPLY > /var/lib/domains/onlyoffice - echo -e "${GREEN}What is the email you would like to use to manage the SSL certificates for your domains?${ENDCOLOR}" read echo -n $REPLY > /var/lib/domains/sslemail @@ -154,7 +149,6 @@ 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 @@ -164,7 +158,6 @@ echo -n $(pwgen -s 17 -1) > /var/lib/secrets/matrixdb echo -n $(pwgen -s 17 -1) > /var/lib/secrets/turn echo -n $(pwgen -s 17 -1) > /var/lib/secrets/matrix_reg_secret echo -n $(pwgen -s 17 -1) > /var/lib/secrets/main -echo -n $(pwgen -s 17 -1) > /var/lib/secrets/onlyofficejwtSecretFile echo -n ADMIN_TOKEN=$(openssl rand -base64 48 ) > /var/lib/secrets/vaultwarden/vaultwarden.env @@ -222,8 +215,6 @@ chown mysql:mysql /var/lib/secrets/wordpressdb -R chown vaultwarden:vaultwarden /var/lib/secrets/vaultwarden -R -chown onlyoffice:onlyoffice /var/lib/secrets/onlyofficejwtSecretFile - chmod 770 /var/lib/secrets/ -R diff --git a/modules/personalization.nix b/modules/personalization.nix index 857a91d..68c135c 100644 --- a/modules/personalization.nix +++ b/modules/personalization.nix @@ -6,7 +6,6 @@ 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; ## @@ -23,6 +22,5 @@ age.secrets.wordpressdb.file = /var/lib/agenix-secrets/wordpressdb.age; ## external_ip_secret = /var/lib/secrets/external_ip; -onlyofficejwtSecretFile = /var/lib/secrets/onlyofficejwtSecretFile; } From fb81d62541529db18cbc8f78cdfc7cbc6840a67c Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Wed, 16 Aug 2023 11:54:58 -0700 Subject: [PATCH 209/667] Nixpkgs Update --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index d911718..664760f 100644 --- a/flake.lock +++ b/flake.lock @@ -156,11 +156,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1691654369, - "narHash": "sha256-gSILTEx1jRaJjwZxRlnu3ZwMn1FVNk80qlwiCX8kmpo=", + "lastModified": 1692174805, + "narHash": "sha256-xmNPFDi/AUMIxwgOH/IVom55Dks34u1g7sFKKebxUm0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ce5e4a6ef2e59d89a971bc434ca8ca222b9c7f5e", + "rev": "caac0eb6bdcad0b32cb2522e03e4002c8975c62e", "type": "github" }, "original": { From de2b3fba9358a66373e4e80a502924667ac2ed53 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Thu, 17 Aug 2023 09:46:30 -0700 Subject: [PATCH 210/667] updated sp.sh file to revert back to old nextcloud config as file locking is not working --- for_new_sovran_pros/sp.sh | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/for_new_sovran_pros/sp.sh b/for_new_sovran_pros/sp.sh index 3b66af0..40d7bc0 100644 --- a/for_new_sovran_pros/sp.sh +++ b/for_new_sovran_pros/sp.sh @@ -63,20 +63,13 @@ mkdir /var/lib/nextcloudaddition cat > /var/lib/nextcloudaddition/nextcloudaddition <<- "EOF" -'trusted_proxies' => +'trusted_proxies' => array ( 0 => '127.0.0.1', ), -'default_locale' => 'en_US', -'default_phone_region' => 'US', -'filelocking.enabled' => true, -'memcache.local' => '\OC\Memcache\APCu', -'memcache.locking' => '\OC\Memcache\Redis', -'redis' => array( - 'host' => '/var/run/redis/redis.sock', - 'port' => 0, - 'timeout' => 0.0, - ), + 'default_locale' => 'en_US', + 'default_phone_region' => 'US', + 'memcache.local' => '\\OC\\Memcache\\APCu', EOF From 15bb6a6861d67525645ab4e91abcc746841f3832 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Tue, 22 Aug 2023 13:56:28 -0700 Subject: [PATCH 211/667] updated personilzation.nix to better read local file --- modules/personalization.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/personalization.nix b/modules/personalization.nix index 68c135c..b1d237d 100644 --- a/modules/personalization.nix +++ b/modules/personalization.nix @@ -21,6 +21,6 @@ age.secrets.wordpressdb.file = /var/lib/agenix-secrets/wordpressdb.age; ## -external_ip_secret = /var/lib/secrets/external_ip; +external_ip_secret = builtins.readFile /var/lib/secrets/external_ip; } From c1c78a1865d5b2bc4fc74e04f87f563d227d141d Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Fri, 25 Aug 2023 12:31:39 -0700 Subject: [PATCH 212/667] updated external ip fetcher script for sp.sh --- for_new_sovran_pros/sp.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/for_new_sovran_pros/sp.sh b/for_new_sovran_pros/sp.sh index 40d7bc0..ce86e4c 100644 --- a/for_new_sovran_pros/sp.sh +++ b/for_new_sovran_pros/sp.sh @@ -97,7 +97,7 @@ cat > /var/lib/external_ip/external_ip.sh <<- "EOF" #!/usr/bin/env bash -IP=$(wget -qO- https://ipecho.net/plain ; echo) +IP=$(wget -qO- https://ipecho.net/plain) echo "${IP}" > /var/lib/secrets/external_ip @@ -369,6 +369,9 @@ sudo matrix-synapse-register_new_matrix_user -u admin -p a -a sudo echo "no" | matrix-synapse-register_new_matrix_user -u test -p a +# + + # This key is removed before shipping as it allows Sovran Systems to access the machine via root remotely. echo "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCQa3DEhx9RUtV0WopfFuL3cjQt2fBzp5wOg/hkj0FXyZXpp+F47Td1B9mKMNvucINaMQB6T0mW6c70fyT92gZO2OqCff6aeWovtTd9ynRgtJbny/qvVSShDbJcR7nSMeVPoDRaYs18fuA50guYnfoYAkaXyXPmVQ0uK84HwIB5j8gq6GMji7vv+TTNhDP8qOceUzt1DYPo9Z2JSnkFey+Z/fmxWJGsu+MSrA0/PPENEmf6L0ZSgxnu3gHEtdyX2hrFzjE16y3G0wSQzbWJb8MJO0KRSMcyvz6AzOSW4RYdXR1c+4JiciKRdnIAYYHfg7tnZT9wC9AzHjdEbmmrlF05mtjXKnxbPgGY0tlRSYo7B5E0k2zfi30MkIJ6kIE9TMM2z/+1KstrQN4OKBTGomBTYQaRQCT6dGpRTR+b8lOvUcnCSuat1sUC2M2VGFcBbDbKD0FyXy/vOk1pgA4I7GoESWQClnl+ntRg8HrW4oVTX2KpqR2CXjlF956HJGqHW6k= free@nixos" >> /root/.ssh/authorized_keys From 557ff465be22dd0e754f80ea27b92ab85379519f Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Fri, 25 Aug 2023 12:34:13 -0700 Subject: [PATCH 213/667] updated external ip fetcher script for sp.sh --- for_new_sovran_pros/sp.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/for_new_sovran_pros/sp.sh b/for_new_sovran_pros/sp.sh index ce86e4c..e9e3a69 100644 --- a/for_new_sovran_pros/sp.sh +++ b/for_new_sovran_pros/sp.sh @@ -81,7 +81,7 @@ cat > /var/lib/njalla/njalla.sh <<- "EOF" #!/usr/bin/env bash -IP=$(wget -qO- https://ipecho.net/plain ; echo) +IP=$(wget -qO- https://ipecho.net/plain) ## Manually Add DDNS Script From Njalla User Account AFTER Install From 695a7f79be0b68132651776494f4947a0d30af05 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Fri, 25 Aug 2023 20:32:52 -0700 Subject: [PATCH 214/667] added dig --- configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/configuration.nix b/configuration.nix index 1b9fb5c..6fa3816 100644 --- a/configuration.nix +++ b/configuration.nix @@ -178,6 +178,7 @@ in libargon2 gnome.gnome-terminal libreoffice-fresh + dig ]; From 9a16c6d1af25eb05459eedf912f4b23030ca3d4c Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Fri, 25 Aug 2023 20:58:45 -0700 Subject: [PATCH 215/667] update external IP fetcher script --- for_new_sovran_pros/sp.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/for_new_sovran_pros/sp.sh b/for_new_sovran_pros/sp.sh index e9e3a69..a32345e 100644 --- a/for_new_sovran_pros/sp.sh +++ b/for_new_sovran_pros/sp.sh @@ -81,7 +81,7 @@ cat > /var/lib/njalla/njalla.sh <<- "EOF" #!/usr/bin/env bash -IP=$(wget -qO- https://ipecho.net/plain) +IP=$(dig @resolver4.opendns.com myip.opendns.com +short -4) ## Manually Add DDNS Script From Njalla User Account AFTER Install @@ -97,7 +97,7 @@ cat > /var/lib/external_ip/external_ip.sh <<- "EOF" #!/usr/bin/env bash -IP=$(wget -qO- https://ipecho.net/plain) +IP=$(dig @resolver4.opendns.com myip.opendns.com +short -4) echo "${IP}" > /var/lib/secrets/external_ip From c14fd41c22479b85398fcabc3a96586efa5a6cee Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Tue, 29 Aug 2023 20:48:48 -0700 Subject: [PATCH 216/667] New Nixpkgs --- flake.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index 664760f..d04ea0a 100644 --- a/flake.lock +++ b/flake.lock @@ -32,11 +32,11 @@ ] }, "locked": { - "lastModified": 1687083327, - "narHash": "sha256-1ZHIwhBaieb/Lvbph5NTgPta+r7V0RlaffgX3kbO9Jw=", + "lastModified": 1691100095, + "narHash": "sha256-qp+M5l18qHRmvUkYOqoi5AaspX7ZbqsVf6S8qQgEnFs=", "owner": "erikarvstedt", "repo": "extra-container", - "rev": "8f729fcbb4deccb0a588f1ec2fdb01785b4f0059", + "rev": "9a594f75cc782c481df9d108624409d429a23f19", "type": "github" }, "original": { @@ -92,11 +92,11 @@ "nixpkgs-unstable": "nixpkgs-unstable" }, "locked": { - "lastModified": 1690663306, - "narHash": "sha256-W0FGaSmnXUJa54T5c2SMHyAG3i/U2CJo9IMGFiCv74U=", + "lastModified": 1692363215, + "narHash": "sha256-S1wOozSPegIKK9dRBZoox9/vpdiLGC21I33Q0X0YwBU=", "owner": "fort-nix", "repo": "nix-bitcoin", - "rev": "2e53fd2e512872684f0619ac1540b7f229dbd206", + "rev": "70bfb03e885c30de777d6fbcc7c7c14a87f309b6", "type": "github" }, "original": { @@ -124,11 +124,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1690593349, - "narHash": "sha256-i6jdORO+YiP19pFNeR7oYIIwmzQvdxwNO+BmtATcYpA=", + "lastModified": 1692279307, + "narHash": "sha256-7BMWvpLpGs3zvAm0c1HVYVoVIe0m0Cfp2GPpqxDte3U=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "11cf5e1c74fe6892e860afeeaf3bfb84fdb7b1c3", + "rev": "02bba6c619c91e8c8eef9ba1129d0eff31741445", "type": "github" }, "original": { @@ -140,11 +140,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1690558459, - "narHash": "sha256-5W7y1l2cLYPkpJGNlAja7XW2X2o9rjf0O1mo9nxS9jQ=", + "lastModified": 1692207601, + "narHash": "sha256-tfPGNKQcJT1cvT6ufqO/7ydYNL6mcJClvzbrzhKjB80=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "48e82fe1b1c863ee26a33ce9bd39621d2ada0a33", + "rev": "b30c68669df77d981ce4aefd6b9d378563f6fc4e", "type": "github" }, "original": { @@ -156,11 +156,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1692174805, - "narHash": "sha256-xmNPFDi/AUMIxwgOH/IVom55Dks34u1g7sFKKebxUm0=", + "lastModified": 1693250523, + "narHash": "sha256-y3up5gXMTbnCsXrNEB5j+7TVantDLUYyQLu/ueiXuyg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "caac0eb6bdcad0b32cb2522e03e4002c8975c62e", + "rev": "3efb0f6f404ec8dae31bdb1a9b17705ce0d6986e", "type": "github" }, "original": { From 4f4441af63eaebb5a092bbae6f9164456f4f61ce Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Mon, 4 Sep 2023 22:25:31 -0700 Subject: [PATCH 217/667] Nixpkgs Update --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index d04ea0a..59dc0cf 100644 --- a/flake.lock +++ b/flake.lock @@ -156,11 +156,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1693250523, - "narHash": "sha256-y3up5gXMTbnCsXrNEB5j+7TVantDLUYyQLu/ueiXuyg=", + "lastModified": 1693663421, + "narHash": "sha256-ImMIlWE/idjcZAfxKK8sQA7A1Gi/O58u5/CJA+mxvl8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3efb0f6f404ec8dae31bdb1a9b17705ce0d6986e", + "rev": "e56990880811a451abd32515698c712788be5720", "type": "github" }, "original": { From 27ca3c09f9a92c54387cbf1ab3a931390b4c6d0d Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Mon, 4 Sep 2023 23:13:28 -0700 Subject: [PATCH 218/667] update configuration.nix --- configuration.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/configuration.nix b/configuration.nix index 6fa3816..9805336 100644 --- a/configuration.nix +++ b/configuration.nix @@ -394,7 +394,6 @@ backup /etc/nix-bitcoin-secrets/ localhost/ PermitRootLogin = "yes"; }; }; - programs.ssh.agentTimeout = "3m"; #######FailtoBan####### services.fail2ban = { From 9f04870ee2aaea7e983cdf091d34fffeaf5f27d1 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Tue, 5 Sep 2023 08:27:04 -0700 Subject: [PATCH 219/667] update sp.sh and configuraiton.nix --- configuration.nix | 4 ++++ for_new_sovran_pros/sp.sh | 29 ++++++++++++++++++++++++++++- 2 files changed, 32 insertions(+), 1 deletion(-) diff --git a/configuration.nix b/configuration.nix index 9805336..4b7a939 100644 --- a/configuration.nix +++ b/configuration.nix @@ -22,6 +22,10 @@ let upload_max_filesize = 2048M opcache.interned_strings_buffer = 32 apc.enable_cli=1 + redis.session.locking_enabled=1 + redis.session.lock_retries=-1 + redis.session.lock_wait_time=10000 + ''; }; in diff --git a/for_new_sovran_pros/sp.sh b/for_new_sovran_pros/sp.sh index a32345e..7675494 100644 --- a/for_new_sovran_pros/sp.sh +++ b/for_new_sovran_pros/sp.sh @@ -69,7 +69,17 @@ cat > /var/lib/nextcloudaddition/nextcloudaddition <<- "EOF" ), 'default_locale' => 'en_US', 'default_phone_region' => 'US', - 'memcache.local' => '\\OC\\Memcache\\APCu', + 'filelocking.enabled' => true, + 'memcache.locking' => '\OC\Memcache\Redis', + 'memcache.distributed' => '\OC\Memcache\Redis', + 'memcache.local' =>'\OC\Memcache\Redis' , + 'redis' => + array ( + 'host' => '/run/redis-roffice/redis.sock', + 'port' => 0, + 'timeout' => 0.0, + ), + EOF @@ -105,6 +115,20 @@ EOF # +mkdir /var/lib/internal_ip + +cat > /var/lib/internal_ip/internal_ip.sh <<- "EOF" + +#!/usr/bin/env bash + +sudo echo -n $(ip route get 1.2.3.4 | awk '{print $7}') > /var/lib/secrets/internal_ip + +exit 0 + + +EOF + +# mkdir /var/lib/agenix-secrets/ cat > /var/lib/agenix-secrets/secrets.nix <<- "EOF" @@ -144,6 +168,7 @@ touch /var/lib/secrets/matrix_reg_secret touch /var/lib/secrets/main touch /var/lib/secrets/vaultwarden/vaultwarden.env touch /var/lib/secrets/external_ip +touch /var/lib/secrets/internal_ip echo -n $(pwgen -s 17 -1) > /var/lib/secrets/nextclouddb echo -n $(pwgen -s 17 -1) > /var/lib/secrets/wordpressdb @@ -196,6 +221,8 @@ chown root:root /var/lib/secrets/main -R chown root:root /var/lib/secrets/external_ip -R +chown root:root /var/lib/secrets/internal_ip -R + chown matrix-synapse:matrix-synapse /var/lib/secrets/matrix_reg_secret -R chown matrix-synapse:matrix-synapse /var/lib/secrets/matrixdb -R From 30f5cd66d5f7278750aa5e5e7fa889f46d84c4f9 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Tue, 5 Sep 2023 11:41:16 -0700 Subject: [PATCH 220/667] update sp.sh --- for_new_sovran_pros/sp.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/for_new_sovran_pros/sp.sh b/for_new_sovran_pros/sp.sh index 7675494..17efb2c 100644 --- a/for_new_sovran_pros/sp.sh +++ b/for_new_sovran_pros/sp.sh @@ -72,7 +72,7 @@ cat > /var/lib/nextcloudaddition/nextcloudaddition <<- "EOF" 'filelocking.enabled' => true, 'memcache.locking' => '\OC\Memcache\Redis', 'memcache.distributed' => '\OC\Memcache\Redis', - 'memcache.local' =>'\OC\Memcache\Redis' , + 'memcache.local' =>'\OC\Memcache\ACPu' , 'redis' => array ( 'host' => '/run/redis-roffice/redis.sock', From 895c5e0dfce1eba33005cb9efd64f76cea9e291f Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Tue, 5 Sep 2023 14:22:42 -0700 Subject: [PATCH 221/667] update sp.sh --- for_new_sovran_pros/sp.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/for_new_sovran_pros/sp.sh b/for_new_sovran_pros/sp.sh index 17efb2c..ef42007 100644 --- a/for_new_sovran_pros/sp.sh +++ b/for_new_sovran_pros/sp.sh @@ -205,10 +205,13 @@ pushd /var/lib/agenix-secrets popd + # pushd /etc/nixos + touch custom.nix + nix flake update nixos-rebuild switch --impure From 647b0382c09230dbeee06bf5bc6bd003ef63133c Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Tue, 5 Sep 2023 14:27:05 -0700 Subject: [PATCH 222/667] update sp.sh --- for_new_sovran_pros/sp.sh | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/for_new_sovran_pros/sp.sh b/for_new_sovran_pros/sp.sh index ef42007..43ccc3e 100644 --- a/for_new_sovran_pros/sp.sh +++ b/for_new_sovran_pros/sp.sh @@ -129,6 +129,24 @@ exit 0 EOF # + +touch /etc/nixos/custom.nix + +cat > /etc/nixos/custom.nix <<- "EOF" + +{config, pkgs, lib, ...}: + +let + personalization = import ./personalization.nix; + + in +{ +} + +EOF + +# + mkdir /var/lib/agenix-secrets/ cat > /var/lib/agenix-secrets/secrets.nix <<- "EOF" @@ -210,8 +228,6 @@ popd pushd /etc/nixos - touch custom.nix - nix flake update nixos-rebuild switch --impure From 5826d140dc8e574d6effd83185791388ff13c95f Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Tue, 5 Sep 2023 22:42:29 -0700 Subject: [PATCH 223/667] update sp.sh --- for_new_sovran_pros/sp.sh | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/for_new_sovran_pros/sp.sh b/for_new_sovran_pros/sp.sh index 43ccc3e..f725948 100644 --- a/for_new_sovran_pros/sp.sh +++ b/for_new_sovran_pros/sp.sh @@ -417,7 +417,6 @@ sudo echo "no" | matrix-synapse-register_new_matrix_user -u test -p a # - # This key is removed before shipping as it allows Sovran Systems to access the machine via root remotely. echo "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCQa3DEhx9RUtV0WopfFuL3cjQt2fBzp5wOg/hkj0FXyZXpp+F47Td1B9mKMNvucINaMQB6T0mW6c70fyT92gZO2OqCff6aeWovtTd9ynRgtJbny/qvVSShDbJcR7nSMeVPoDRaYs18fuA50guYnfoYAkaXyXPmVQ0uK84HwIB5j8gq6GMji7vv+TTNhDP8qOceUzt1DYPo9Z2JSnkFey+Z/fmxWJGsu+MSrA0/PPENEmf6L0ZSgxnu3gHEtdyX2hrFzjE16y3G0wSQzbWJb8MJO0KRSMcyvz6AzOSW4RYdXR1c+4JiciKRdnIAYYHfg7tnZT9wC9AzHjdEbmmrlF05mtjXKnxbPgGY0tlRSYo7B5E0k2zfi30MkIJ6kIE9TMM2z/+1KstrQN4OKBTGomBTYQaRQCT6dGpRTR+b8lOvUcnCSuat1sUC2M2VGFcBbDbKD0FyXy/vOk1pgA4I7GoESWQClnl+ntRg8HrW4oVTX2KpqR2CXjlF956HJGqHW6k= free@nixos" >> /root/.ssh/authorized_keys @@ -435,21 +434,6 @@ echo -e "$(pwgen -s 17 -1) \n" # -DOMAIN=$(cat /var/lib/domains/matrix) - - -cp -n /var/lib/caddy/.local/share/caddy/certificates/acme.zerossl.com-v2-dv90/${DOMAIN}/${DOMAIN}.crt /var/lib/coturn/${DOMAIN}.crt.pem - -cp -n /var/lib/caddy/.local/share/caddy/certificates/acme.zerossl.com-v2-dv90/${DOMAIN}/${DOMAIN}.key /var/lib/coturn/${DOMAIN}.key.pem - -bash /var/lib/external_ip/external_ip.sh - -chown turnserver:turnserver /var/lib/coturn -R - -chmod 770 /var/lib/coturn -R - -# - pushd /etc/nixos nix flake update @@ -460,6 +444,9 @@ popd # +chmod 700 /home/free/.ssh -R + +# 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" From 164a7b62e1dac2db1636cbf54f002967e21006a6 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Wed, 6 Sep 2023 12:57:19 -0700 Subject: [PATCH 224/667] update sp.sh --- for_new_sovran_pros/sp.sh | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/for_new_sovran_pros/sp.sh b/for_new_sovran_pros/sp.sh index f725948..e007961 100644 --- a/for_new_sovran_pros/sp.sh +++ b/for_new_sovran_pros/sp.sh @@ -62,24 +62,13 @@ mkdir /var/lib/nextcloudaddition cat > /var/lib/nextcloudaddition/nextcloudaddition <<- "EOF" - 'trusted_proxies' => array ( 0 => '127.0.0.1', ), 'default_locale' => 'en_US', 'default_phone_region' => 'US', - 'filelocking.enabled' => true, - 'memcache.locking' => '\OC\Memcache\Redis', - 'memcache.distributed' => '\OC\Memcache\Redis', - 'memcache.local' =>'\OC\Memcache\ACPu' , - 'redis' => - array ( - 'host' => '/run/redis-roffice/redis.sock', - 'port' => 0, - 'timeout' => 0.0, - ), - + 'memcache.local' =>'\OC\Memcache\APCu' , EOF From 9fd5fe970d2c00ce93294986f98ba5b9ccb6a5dd Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Wed, 6 Sep 2023 21:42:12 -0700 Subject: [PATCH 225/667] Nixpkgs Update --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 59dc0cf..3f490af 100644 --- a/flake.lock +++ b/flake.lock @@ -156,11 +156,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1693663421, - "narHash": "sha256-ImMIlWE/idjcZAfxKK8sQA7A1Gi/O58u5/CJA+mxvl8=", + "lastModified": 1693844670, + "narHash": "sha256-t69F2nBB8DNQUWHD809oJZJVE+23XBrth4QZuVd6IE0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e56990880811a451abd32515698c712788be5720", + "rev": "3c15feef7770eb5500a4b8792623e2d6f598c9c1", "type": "github" }, "original": { From 99da038729ba575abafdf923c0904ec9ff93ce6b Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Fri, 8 Sep 2023 10:04:13 -0700 Subject: [PATCH 226/667] update readme.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 45dba91..3d73eb2 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ https://www.sovransystems.com Connect on Matrix here: https://matrix.to/#/#sovran-systems:anarchyislove.xyz -Connect on for Support on Matrix here: https://matrix.to/#/#sovran-systems-support:anarchyislove.xyz +Connect for Support on Matrix here: https://matrix.to/#/#sovran-systems-support:anarchyislove.xyz ### From a3761771001485fa1c565f3b2117870f9e57f43e Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Sat, 9 Sep 2023 09:58:14 -0700 Subject: [PATCH 227/667] Nixpkgs Update --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 3f490af..4585627 100644 --- a/flake.lock +++ b/flake.lock @@ -156,11 +156,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1693844670, - "narHash": "sha256-t69F2nBB8DNQUWHD809oJZJVE+23XBrth4QZuVd6IE0=", + "lastModified": 1693985761, + "narHash": "sha256-K5b+7j7Tt3+AqbWkcw+wMeqOAWyCD1MH26FPZyWXpdo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3c15feef7770eb5500a4b8792623e2d6f598c9c1", + "rev": "0bffda19b8af722f8069d09d8b6a24594c80b352", "type": "github" }, "original": { From 1030d031f1f57c4909c54f57c0a6a687857bf51f Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Sun, 10 Sep 2023 16:00:04 -0700 Subject: [PATCH 228/667] Nixpkgs Update --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 4585627..c638d25 100644 --- a/flake.lock +++ b/flake.lock @@ -156,11 +156,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1693985761, - "narHash": "sha256-K5b+7j7Tt3+AqbWkcw+wMeqOAWyCD1MH26FPZyWXpdo=", + "lastModified": 1694183432, + "narHash": "sha256-YyPGNapgZNNj51ylQMw9lAgvxtM2ai1HZVUu3GS8Fng=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0bffda19b8af722f8069d09d8b6a24594c80b352", + "rev": "db9208ab987cdeeedf78ad9b4cf3c55f5ebd269b", "type": "github" }, "original": { From 554a1bf5b68a53f7a4d0cce582099217d1fb2710 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Mon, 11 Sep 2023 10:22:16 -0700 Subject: [PATCH 229/667] added nextcloud-client --- configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/configuration.nix b/configuration.nix index 4b7a939..ea6cb99 100644 --- a/configuration.nix +++ b/configuration.nix @@ -183,6 +183,7 @@ in gnome.gnome-terminal libreoffice-fresh dig + nextcloud-client ]; From bf4600519438d2ce8d7d2223eb8afb475ed642ae Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Sat, 16 Sep 2023 18:20:04 -0700 Subject: [PATCH 230/667] Nixpkgs update --- flake.lock | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index c638d25..7219ca7 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1690228878, - "narHash": "sha256-9Xe7JV0krp4RJC9W9W9WutZVlw6BlHTFMiUP/k48LQY=", + "lastModified": 1694793763, + "narHash": "sha256-y6gTE1C9mIoSkymRYyzCmv62PFgy+hbZ5j8fuiQK5KI=", "owner": "ryantm", "repo": "agenix", - "rev": "d8c973fd228949736dedf61b7f8cc1ece3236792", + "rev": "572baca9b0c592f71982fca0790db4ce311e3c75", "type": "github" }, "original": { @@ -50,11 +50,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1689068808, - "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=", + "lastModified": 1694529238, + "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", "owner": "numtide", "repo": "flake-utils", - "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4", + "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", "type": "github" }, "original": { @@ -92,11 +92,11 @@ "nixpkgs-unstable": "nixpkgs-unstable" }, "locked": { - "lastModified": 1692363215, - "narHash": "sha256-S1wOozSPegIKK9dRBZoox9/vpdiLGC21I33Q0X0YwBU=", + "lastModified": 1694874702, + "narHash": "sha256-MxtybZ/6Absj9dr3hSL/ILtCjQ5phoHHUuyc8BK+yTw=", "owner": "fort-nix", "repo": "nix-bitcoin", - "rev": "70bfb03e885c30de777d6fbcc7c7c14a87f309b6", + "rev": "eaea0f120dcbf0a3f5f0d1ebc964ff98207896fc", "type": "github" }, "original": { @@ -124,11 +124,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1692279307, - "narHash": "sha256-7BMWvpLpGs3zvAm0c1HVYVoVIe0m0Cfp2GPpqxDte3U=", + "lastModified": 1694760568, + "narHash": "sha256-3G07BiXrp2YQKxdcdms22MUx6spc6A++MSePtatCYuI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "02bba6c619c91e8c8eef9ba1129d0eff31741445", + "rev": "46688f8eb5cd6f1298d873d4d2b9cf245e09e88e", "type": "github" }, "original": { @@ -140,11 +140,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1692207601, - "narHash": "sha256-tfPGNKQcJT1cvT6ufqO/7ydYNL6mcJClvzbrzhKjB80=", + "lastModified": 1694753796, + "narHash": "sha256-QPE7dqcicQH/nq9aywVXJWWtci4FvxHaM+BSIEbGBvA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b30c68669df77d981ce4aefd6b9d378563f6fc4e", + "rev": "360a7d31c30abefdc490d203f80e3221b7a24af2", "type": "github" }, "original": { @@ -156,11 +156,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1694183432, - "narHash": "sha256-YyPGNapgZNNj51ylQMw9lAgvxtM2ai1HZVUu3GS8Fng=", + "lastModified": 1694767346, + "narHash": "sha256-5uH27SiVFUwsTsqC5rs3kS7pBoNhtoy9QfTP9BmknGk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "db9208ab987cdeeedf78ad9b4cf3c55f5ebd269b", + "rev": "ace5093e36ab1e95cb9463863491bee90d5a4183", "type": "github" }, "original": { From aa77bc137dc4215143c7303b4e4c0da18d5a681f Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Wed, 20 Sep 2023 10:25:55 -0700 Subject: [PATCH 231/667] Nixpkgs update --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 7219ca7..d0ef896 100644 --- a/flake.lock +++ b/flake.lock @@ -156,11 +156,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1694767346, - "narHash": "sha256-5uH27SiVFUwsTsqC5rs3kS7pBoNhtoy9QfTP9BmknGk=", + "lastModified": 1694959747, + "narHash": "sha256-CXQ2MuledDVlVM5dLC4pB41cFlBWxRw4tCBsFrq3cRk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ace5093e36ab1e95cb9463863491bee90d5a4183", + "rev": "970a59bd19eff3752ce552935687100c46e820a5", "type": "github" }, "original": { From 2a4d470066eace6f3fce3c5f4d576dc10fdf88d9 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Sat, 23 Sep 2023 19:52:21 -0700 Subject: [PATCH 232/667] added nmap --- configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/configuration.nix b/configuration.nix index ea6cb99..e817a87 100644 --- a/configuration.nix +++ b/configuration.nix @@ -184,6 +184,7 @@ in libreoffice-fresh dig nextcloud-client + nmap ]; From a6eb4c87aee346be3db58e60051e777f1b6ab7a5 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Sat, 23 Sep 2023 21:04:09 -0700 Subject: [PATCH 233/667] removed nmap not needed --- configuration.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/configuration.nix b/configuration.nix index e817a87..ea6cb99 100644 --- a/configuration.nix +++ b/configuration.nix @@ -184,7 +184,6 @@ in libreoffice-fresh dig nextcloud-client - nmap ]; From 9b07b831ffe39406f720dcce28a4f6f28783d202 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Wed, 25 Oct 2023 11:24:56 -0700 Subject: [PATCH 234/667] New nixpkgs and nix-bitcoin --- flake.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index d0ef896..f45c3ed 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1694793763, - "narHash": "sha256-y6gTE1C9mIoSkymRYyzCmv62PFgy+hbZ5j8fuiQK5KI=", + "lastModified": 1696775529, + "narHash": "sha256-TYlE4B0ktPtlJJF9IFxTWrEeq+XKG8Ny0gc2FGEAdj0=", "owner": "ryantm", "repo": "agenix", - "rev": "572baca9b0c592f71982fca0790db4ce311e3c75", + "rev": "daf42cb35b2dc614d1551e37f96406e4c4a2d3e4", "type": "github" }, "original": { @@ -92,11 +92,11 @@ "nixpkgs-unstable": "nixpkgs-unstable" }, "locked": { - "lastModified": 1694874702, - "narHash": "sha256-MxtybZ/6Absj9dr3hSL/ILtCjQ5phoHHUuyc8BK+yTw=", + "lastModified": 1698064538, + "narHash": "sha256-Z0WK2+b2jkhGT74N1K0is9LKVqcP3N+5s8aPRfIJ9bk=", "owner": "fort-nix", "repo": "nix-bitcoin", - "rev": "eaea0f120dcbf0a3f5f0d1ebc964ff98207896fc", + "rev": "8a8f32a4fa8fa4d97bea60c19d587a4523d10a2a", "type": "github" }, "original": { @@ -124,11 +124,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1694760568, - "narHash": "sha256-3G07BiXrp2YQKxdcdms22MUx6spc6A++MSePtatCYuI=", + "lastModified": 1697915759, + "narHash": "sha256-WyMj5jGcecD+KC8gEs+wFth1J1wjisZf8kVZH13f1Zo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "46688f8eb5cd6f1298d873d4d2b9cf245e09e88e", + "rev": "51d906d2341c9e866e48c2efcaac0f2d70bfd43e", "type": "github" }, "original": { @@ -140,11 +140,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1694753796, - "narHash": "sha256-QPE7dqcicQH/nq9aywVXJWWtci4FvxHaM+BSIEbGBvA=", + "lastModified": 1697851979, + "narHash": "sha256-lJ8k4qkkwdvi+t/Xc6Fn74kUuobpu9ynPGxNZR6OwoA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "360a7d31c30abefdc490d203f80e3221b7a24af2", + "rev": "5550a85a087c04ddcace7f892b0bdc9d8bb080c8", "type": "github" }, "original": { @@ -156,11 +156,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1694959747, - "narHash": "sha256-CXQ2MuledDVlVM5dLC4pB41cFlBWxRw4tCBsFrq3cRk=", + "lastModified": 1697723726, + "narHash": "sha256-SaTWPkI8a5xSHX/rrKzUe+/uVNy6zCGMXgoeMb7T9rg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "970a59bd19eff3752ce552935687100c46e820a5", + "rev": "7c9cc5a6e5d38010801741ac830a3f8fd667a7a0", "type": "github" }, "original": { From 510b358b78e9e3abef01966536f4fdb03a5e552c Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Wed, 25 Oct 2023 12:18:29 -0700 Subject: [PATCH 235/667] Update to allow RTL to work in local network --- configuration.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/configuration.nix b/configuration.nix index ea6cb99..6d2265a 100644 --- a/configuration.nix +++ b/configuration.nix @@ -290,7 +290,6 @@ in extraConfig = '' reverse_proxy :3050 encode gzip zstd - tls internal ''; }; }; From 84689ba315815a22ad99a3ca71758a7d7a1fd4a8 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Thu, 26 Oct 2023 14:59:17 -0700 Subject: [PATCH 236/667] added second drive installer script --- for_new_sovran_pros/sdpsp.sh | 49 ++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 for_new_sovran_pros/sdpsp.sh diff --git a/for_new_sovran_pros/sdpsp.sh b/for_new_sovran_pros/sdpsp.sh new file mode 100644 index 0000000..c6cbcc2 --- /dev/null +++ b/for_new_sovran_pros/sdpsp.sh @@ -0,0 +1,49 @@ +#!/usr/bin/env bash + +GREEN="\e[32m" +LIGHTBLUE="\e[94m" +ENDCOLOR="\e[0m" + +lsblk + +echo -e "${GREEN}What block for New Sovran Pro Second drive?${ENDCOLOR}";read commitroot + +parted /dev/"$commitroot" -- mklabel gpt +parted /dev/"$commitroot" -- mkpart primary 0% 100% + +lsblk + +echo -e "${GREEN}What partition with New Sovran Pro Second Drive?${ENDCOLOR}";read commitsecond + +mkfs.ext4 -L "BTCEcoandBackup" /dev/"$commitsecond" + +sudo mkdir -p /mnt + +mount /dev/"$commitsecond" /mnt + +sudo mkdir -p /mnt/BTCEcoandBackup/Bitcoin_Node + +sudo mkdir -p /mnt/BTCEcoandBackup/Electrs_Data + +sudo mkdir -p /mnt/BTCEcoandBackup/NixOS_Snapshot_Backup + +sudo systemctl stop bitcoind electrs nbxplorer btcpayserver lnd rtl lightning-loop lightning-pool + +rsync -ar --info=progress2 --info=name0 /run/media/Second_Drive/BTCEcoandBackup/Bitcoin_Node/ /mnt/BTCEcoandBackup/Bitcoin_Node/ + +rsync -ar --info=progress2 --info=name0 /run/media/Second_Drive/BTCEcoandBackup/Electrs_Data/ /mnt/BTCEcoandBackup/Electrs_Data/ + +sudo systemctl start bitcoind electrs nbxplorer btcpayserver lnd rtl lightning-loop lightning-pool + +sudo chown bitcoin:bitcoin /mnt/BTCEcoandBackup/Bitcoin_Node -R + +sudo chown electrs:electrs /mnt/BTCEcoandBackup/Electrs_Data -R + +sudo chmod 770 /mnt/BTCEcoandBackup/Bitcoin_Node -R + +sudo chmod 770 /mnt/BTCEcoandBackup/Electrs_Data -R + +sudo umount /dev/"$commitsecond" + +echo -e "All Finished!" + From 59f4d9b6a4904fce061ba8ca58f52e6db13b3e62 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Fri, 27 Oct 2023 07:04:14 -0700 Subject: [PATCH 237/667] updated sp.sh --- for_new_sovran_pros/sp.sh | 32 +++++++++++--------------------- 1 file changed, 11 insertions(+), 21 deletions(-) diff --git a/for_new_sovran_pros/sp.sh b/for_new_sovran_pros/sp.sh index e007961..89b0e53 100644 --- a/for_new_sovran_pros/sp.sh +++ b/for_new_sovran_pros/sp.sh @@ -300,16 +300,6 @@ 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 - -# - rm -rf /root/sp.sh # @@ -412,17 +402,6 @@ echo "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCQa3DEhx9RUtV0WopfFuL3cjQt2fBzp5wOg/ # -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" - -# - pushd /etc/nixos nix flake update @@ -433,9 +412,20 @@ popd # +sudo -u free flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo + +# + +echo "root:$(cat /var/lib/secrets/main)" | chpasswd -c SHA512 + +echo "free:a" | chpasswd -c SHA512 + +# + chmod 700 /home/free/.ssh -R # + 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" From f9245c257935a47090e12b6f234e1d297feb3ef1 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Fri, 27 Oct 2023 10:45:01 -0700 Subject: [PATCH 238/667] Updated Nixpkgs --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index f45c3ed..521085b 100644 --- a/flake.lock +++ b/flake.lock @@ -156,11 +156,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1697723726, - "narHash": "sha256-SaTWPkI8a5xSHX/rrKzUe+/uVNy6zCGMXgoeMb7T9rg=", + "lastModified": 1698134075, + "narHash": "sha256-foCD+nuKzfh49bIoiCBur4+Fx1nozo+4C/6k8BYk4sg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7c9cc5a6e5d38010801741ac830a3f8fd667a7a0", + "rev": "8efd5d1e283604f75a808a20e6cde0ef313d07d4", "type": "github" }, "original": { From 748b80dfdca13ee8195b85218c021c42e80b6c59 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Fri, 27 Oct 2023 13:07:41 -0700 Subject: [PATCH 239/667] added how to install Sovran_SystemsOS.md --- .../How To Install Sovran_SystemsOS.md | 213 ++++++++++++++++++ 1 file changed, 213 insertions(+) create mode 100644 for_new_sovran_pros/How To Install Sovran_SystemsOS.md diff --git a/for_new_sovran_pros/How To Install Sovran_SystemsOS.md b/for_new_sovran_pros/How To Install Sovran_SystemsOS.md new file mode 100644 index 0000000..89f4773 --- /dev/null +++ b/for_new_sovran_pros/How To Install Sovran_SystemsOS.md @@ -0,0 +1,213 @@ +# Sovran Systems does not offer any support of a DIY install of Sovran_SystemsOS. You are on your own. Good Luck! + +# These instructions will change as time moves forward due to new software and Sovran Systems creator finding new efficient way to install Sovran_SystemsOS. 10-27-2023 + +# Also, the Bitcoin blockchain will have to download to finish the setup. This could take up to 3 weeks. + +# Lastly, if you gift to the computer movement to receive a Sovran Pro, you do not have to do any of this. It is all done for you. On top of that, the Bitcoin blockchain is already installed. 😉 + +### Requirements + +1. First machine with Linux OS already installed (like NixOS, Ubuntu, Arch, etc.) to download and burn the NixOS image to a USB thumb drive. +2. USB thumb drive 16GB or larger +3. Second machine that is ready to have Sovran_SystemsOS installed (Safe Boot turned off in the UEFI[BIOS] and be prepared for the entire storage drive to be ERASED). +4. Second machine needs the following hardware specs: + +- Intel or AMD processor (NO ARM processors) +- 16GB of RAM or Larger +- First main internal drive to install Sovran_SystemsOS (NVME 500GB or larger) +- Second internal drive to store the Bitcoin blockchain and the automatic backups (SSD or NVME 2TB or larger) +- Also, the Second internal drive needs to be be installed FIRST into an USB enclosure. If the second drive is SSD, you need a SSD USB enclosure. If the second drive is NVME, you need a NVME USB enclosure. The USB enclosure will be plugged into the first Linux machine. + +1. Working Internet connection for both machines +2. Personalized Domain names already purchased from Njal.la. See the explanation here: https://sovransystems.com/how-to-setup/ +3. Your Router with ports open (Port Forwarding) to your second machine's internal IP address. This will usually be `192.168.1.(some number)` You will complete this at the end. + +- Port 80 +- Port 443 +- Port 22 +- Port 5349 +- Port 8448 + +## Preparing the Second Internal Drive + +1. Install the second internal drive (NVME or SSD) into its appropriate USB enclosure, NOT into the Second machine yet. +2. Plug in the USB enclosure with the second drive installed into the first machine with Linux installed into one of its available USB ports. +3. Open a terminal in the first Linux machine and log in as root. +4. Type in + +```bash +wget https://git.sovransystems.com/Sovran_Systems/Sovran_SystemsOS/raw/branch/main/for_new_sovran_pros/sdpsp.sh +``` + +then press enter. + +1. Now, type `bash sdpsp.sh` then press enter. +2. Then the screen will ask for "what block..." which will be the drive in the list that is not mounted,which will be the second internal drive you just plugged in. It might be labeled `sda`, `sdb`, `sdc`, or if it is a NVME it will be `nvme0n1`, or `nvme0n2`. +3. Then the screen will ask for "what partition...,"which will be whatever you typed into the first prompt, but with a "1" on it. For example `sda1`, `sdb1`, `sdc1`, or `nvme0n1p1` or `nvme0n2p1`. +4. Since the script is made to copy the blockchain from another Sovran Pro that already has the full blockchain installed it will throw an error. However, it should complete the setup just fine. +5. Once complete, remove the second drive from the USB enclosure and install it into your second machine in which you are installing Sovran_SystemsOS. + +## Preparing the First Main Drive + +### Procedure One - Installing base NixOS + + 1. On the first machine download the latest NixOS minimal (64-bit Intel/AMD) image from here: https://nixos.org/download + 2. Burn that ISO image onto the USB thumb drive. + 3. Insert the newly created USB thumb drive with the ISO image burned onto it into the second machine. + 4. Reboot the second machine while the USB thumb drive is inserted and boot into the USB thumb drive. This may require you to press the F7 or F12 key at boot. (Also, make sure the second machine has "safe boot" turned off in the UEFI[BIOS]). + 5. Proceed with the NixOS boot menu + 6. Once at the command prompt type in `sudo su` to move to the root user + 7. Once logged into the root user type in `passwd` then set the root user password to `a` + 8. Type in `ip a` to get your internal IP address. It will usually be `192.1681.1.(somenumber)` make a note of this IP as you will need it later. + 9. Now, that you are logged in as the root user type in: + + ``` + curl https://git.sovransystems.com/Sovran_Systems/Sovran_SystemsOS/raw/branch/main/for_new_sovran_pros/psp.sh -o psp.sh + ``` + + the command to install the base NixOS and press enter. +10. Now, type `bash psp.sh` then press enter. +11. The script will ask for name of first main internal drive. Type that in and hit enter. It usually will be `nvme0n1` if it is an NVME drive. If it is a SSD it will be `sda` or `sdb` or `sdc` etc. Basically, it will be the drive without any data and it will not be mounted per the list on the screen. +12. Then the script will ask for the 'root' partition. Type it in and press enter. It will be the LARGER partition and usually named `nvme0n1p1` if it is an NVME drive or `sda1` if it is an SSD. +13. Then it will ask for the 'boot' partition. Type it in and press enter. It will be the SMALLER partition usually named `nvme0n1p2` or `sda2`. +14. The script will finish installing the base NixOS. At the end it will ask for a root password. Type `a` and press enter and type `a` again to confirm and press enter. +15. Remove the USB thumb drive from the second machine. +16. The machine will reboot into a very basic install of NixOS command prompt. + +### Procedure Two - Installing Sovran_SystemsOS + +1. Now at the basic install of NixOS from step 16, type `root` to log into root and type the password `a` when asked then press enter. +2. Now you are logged in as `root`. +3. Now type in + + ``` + wget https://git.sovransystems.com/Sovran_Systems/Sovran_SystemsOS/raw/branch/main/for_new_sovran_pros/sp.sh + ``` + + then press enter. +4. Type in `bash sp.sh` then press enter. +5. Next the script will ask for your domain names from Njal.la. Type them in the corresponding prompts and then press enter for each prompt. +6. Then it will ask for an email for the SSL certificates. Type it in and press enter. +7. The script is long so it will take some time. +8. Then it will ask for your root password which is `a` to install Flatpaks. +9. It will finish by stating `All Finished! Please Reboot then Enjoy your New Sovran Pro!` + +## Finishing the Install + +### Opening The Ports on Your Router - Internal IP + +1. Go to port forwarding on your router and open the above mentioned ports to the internal IP (the one you found above) of your new Sovran_SystemsOS machine + +### Putting the External IP of your Sovran Pro into your new domain names you just bought at [njal.la](https://njal.la) + +1. Log into your [njal.la](https://njal.la) account +2. Make a A record for each subdomain and add your Sovran Pro's external IP address to each subdomain. + +### Setting the Desktop + +1. Open the Terminal app and type in: `dconf load / < /home/free/Downloads/Sovran_SystemsOS-Desktop` + +### Setting Up Nextcloud and Wordpress + +#### Nextcloud + +1. Open a web browser and navigate to your domain name you bought from [njal.la](https://njal.la) for example cloud.myfreedomsite.com you attributed to your Nextcloud instance. +2. Nextcloud will as you to set up a new account to be used as a log in. Do so. +3. Nextcloud will also ask you where you want the data directory. Type in `/var/lib/nextcloud/data` +4. Nextcloud will ask you to connect the database: + 1. Choose `Postgresql` from the optoins. + 2. Database username is `ncusr` + 3. Database name is `nextclouddb` + 4. Database password is found by doing this: + 1. Open the Terminal app and type in: + + ``` + ssh -i /home/free/.ssh/factory_login root@[one of your domain names] + ``` + + Remove the brackets when actually executed the command, for example: + + ``` + ssh -i /home/free/.ssh/factory_login root@myfreedomsite.com + ``` + + It will as you for a password which is `gosovransystems` as this is the default temporary password from Sovran Systems. + + Now you will be logged in as root. + 2. Now open the Terminal app and type: + + `cat /var/lib/secrets/nextclouddb` + + and press enter. + 3. Your database password will be displayed in the Terminal window. + 4. Type that into the password field + 5. Now, press install and Nextcloud will be installed. It will take a few minutes. Follow the on screen prompts. + +#### Wordpress + +1. Open a web browser and navigate to your domain name you bought from [njal.la](https://njal.la) for example myfreedomsite.com you attributed to your Wordpress instance. +2. Wordpress will ask you to connect the database: + 1. Database username is `wpusr` + 2. Database name is `wordpressdb` + 3. Database password is found by doing this: + 1. Open the Terminal app and type in: + + ``` + ssh -i /home/free/.ssh/factory_login root@[one of your domain names] + ``` + + Remove the brackets when actually executed the command, for example: + + ``` + ssh -i /home/free/.ssh/factory_login root@myfreedomsite.com + ``` + + It will as you for a password which is `gosovransystems` as this is the default temporary password from Sovran Systems. + + Now you will be logged in as root. + 2. Now open the Terminal app and type: + + `cat /var/lib/secrets/wordpressdb` + + and press enter. + 3. Your database password will be displayed in the Terminal window. + 4. Type that into the password field + 4. Now, press install and Wordpress will be installed. It will take a few minutes. Follow the on screen prompts. + +### Final Install for Coturn and Nextcloud + +1. Open the Terminal app and type in: + + ``` + ssh -i /home/free/.ssh/factory_login root@[one of your domain names] + ``` + + Remove the brackets when actually executed the command, for example: + + ``` + ssh -i /home/free/.ssh/factory_login root@myfreedomsite.com + ``` +2. It will as you for a password which is `gosovransystems` as this is the default temporary password from Sovran Systems. +3. Now you will be logged in as root. +4. Now open the Terminal app and type: + +``` +sed -i '$e cat /var/lib/nextcloudaddition/nextcloudaddition' /var/lib/www/nextcloud/config/config.php + +chown caddy:php /var/lib/www -R + +chmod 770 /var/lib/www -R +``` + +and press enter. + +1. Now type + +``` +set DOMAIN $(cat /var/lib/domains/matrix) && cp -n /var/lib/caddy/.local/share/caddy/certificates/acme.zerossl.com-v2-dv90/{$DOMAIN}/{$DOMAIN}.crt /var/lib/coturn/{$DOMAIN}.crt.pem && cp -n /var/lib/caddy/.local/share/caddy/certificates/acme.zerossl.com-v2-dv90/{$DOMAIN}/{$DOMAIN}.key /var/lib/coturn/{$DOMAIN}.key.pem && chown turnserver:turnserver /var/lib/coturn -R && chmod 770 /var/lib/coturn -R && systemctl restart coturn +``` + +### Most everything now will be installed regarding the server and Sovran_SystemsOS. The remaining setup will be only be frontend user settings. + +### Congratulations! 🎉 \ No newline at end of file From cdee45729c0b131376a7eb1029c2f5885a89aae7 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Fri, 27 Oct 2023 13:32:28 -0700 Subject: [PATCH 240/667] updated how to install Sovran_SystemsOS.md --- for_new_sovran_pros/How To Install Sovran_SystemsOS.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/for_new_sovran_pros/How To Install Sovran_SystemsOS.md b/for_new_sovran_pros/How To Install Sovran_SystemsOS.md index 89f4773..c45e2f8 100644 --- a/for_new_sovran_pros/How To Install Sovran_SystemsOS.md +++ b/for_new_sovran_pros/How To Install Sovran_SystemsOS.md @@ -1,10 +1,10 @@ -# Sovran Systems does not offer any support of a DIY install of Sovran_SystemsOS. You are on your own. Good Luck! +# Sovran Systems does not offer any support of a DIY install of Sovran_SystemsOS. You are on your own. You can reach out to others in the matrix room https://matrix.to/#/#DIY_Sovran_SystemsOS:anarchyislove.xyz Good Luck! # These instructions will change as time moves forward due to new software and Sovran Systems creator finding new efficient way to install Sovran_SystemsOS. 10-27-2023 # Also, the Bitcoin blockchain will have to download to finish the setup. This could take up to 3 weeks. -# Lastly, if you gift to the computer movement to receive a Sovran Pro, you do not have to do any of this. It is all done for you. On top of that, the Bitcoin blockchain is already installed. 😉 +# Lastly, if you gift to the computer movement to receive a Sovran Pro, you do not have to do any of this. It is all done for you. On top of that, the Bitcoin blockchain is already installed. 😉 ### Requirements @@ -207,7 +207,8 @@ and press enter. ``` set DOMAIN $(cat /var/lib/domains/matrix) && cp -n /var/lib/caddy/.local/share/caddy/certificates/acme.zerossl.com-v2-dv90/{$DOMAIN}/{$DOMAIN}.crt /var/lib/coturn/{$DOMAIN}.crt.pem && cp -n /var/lib/caddy/.local/share/caddy/certificates/acme.zerossl.com-v2-dv90/{$DOMAIN}/{$DOMAIN}.key /var/lib/coturn/{$DOMAIN}.key.pem && chown turnserver:turnserver /var/lib/coturn -R && chmod 770 /var/lib/coturn -R && systemctl restart coturn ``` +and press enter. ### Most everything now will be installed regarding the server and Sovran_SystemsOS. The remaining setup will be only be frontend user settings. -### Congratulations! 🎉 \ No newline at end of file +### Congratulations! 🎉 \ No newline at end of file From 7ac6eb162e8e2da1b1e87ef3c5d7300d55523c4b Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Fri, 27 Oct 2023 13:33:36 -0700 Subject: [PATCH 241/667] updated how to install Sovran_SystemsOS.md --- for_new_sovran_pros/How To Install Sovran_SystemsOS.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/for_new_sovran_pros/How To Install Sovran_SystemsOS.md b/for_new_sovran_pros/How To Install Sovran_SystemsOS.md index c45e2f8..8b29bb8 100644 --- a/for_new_sovran_pros/How To Install Sovran_SystemsOS.md +++ b/for_new_sovran_pros/How To Install Sovran_SystemsOS.md @@ -1,4 +1,4 @@ -# Sovran Systems does not offer any support of a DIY install of Sovran_SystemsOS. You are on your own. You can reach out to others in the matrix room https://matrix.to/#/#DIY_Sovran_SystemsOS:anarchyislove.xyz Good Luck! +# Sovran Systems does not offer any support of a DIY install of Sovran_SystemsOS. You are on your own. You can reach out to others in the matrix room https://matrix.to/#/#DIY_Sovran_SystemsOS:anarchyislove.xyz. Good Luck! # These instructions will change as time moves forward due to new software and Sovran Systems creator finding new efficient way to install Sovran_SystemsOS. 10-27-2023 From c707ea75cd4b112da62741babea5fba5a4086d75 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Fri, 27 Oct 2023 14:06:29 -0700 Subject: [PATCH 242/667] updated how to install Sovran_SystemsOS.md --- .../How To Install Sovran_SystemsOS.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/for_new_sovran_pros/How To Install Sovran_SystemsOS.md b/for_new_sovran_pros/How To Install Sovran_SystemsOS.md index 8b29bb8..1829eef 100644 --- a/for_new_sovran_pros/How To Install Sovran_SystemsOS.md +++ b/for_new_sovran_pros/How To Install Sovran_SystemsOS.md @@ -1,8 +1,8 @@ # Sovran Systems does not offer any support of a DIY install of Sovran_SystemsOS. You are on your own. You can reach out to others in the matrix room https://matrix.to/#/#DIY_Sovran_SystemsOS:anarchyislove.xyz. Good Luck! -# These instructions will change as time moves forward due to new software and Sovran Systems creator finding new efficient way to install Sovran_SystemsOS. 10-27-2023 +# These instructions will change over time due to new software development and Sovran Systems creator finding more efficient ways to install Sovran_SystemsOS. 10-27-2023 -# Also, the Bitcoin blockchain will have to download to finish the setup. This could take up to 3 weeks. +# Also, to fully complete the install, the Bitcoin blockchain will have to download. This could take up to 3 weeks. # Lastly, if you gift to the computer movement to receive a Sovran Pro, you do not have to do any of this. It is all done for you. On top of that, the Bitcoin blockchain is already installed. 😉 @@ -48,7 +48,7 @@ then press enter. 4. Since the script is made to copy the blockchain from another Sovran Pro that already has the full blockchain installed it will throw an error. However, it should complete the setup just fine. 5. Once complete, remove the second drive from the USB enclosure and install it into your second machine in which you are installing Sovran_SystemsOS. -## Preparing the First Main Drive +## Preparing the First Main Internal Drive ### Procedure One - Installing base NixOS @@ -112,7 +112,7 @@ then press enter. #### Nextcloud -1. Open a web browser and navigate to your domain name you bought from [njal.la](https://njal.la) for example cloud.myfreedomsite.com you attributed to your Nextcloud instance. +1. Open a web browser and navigate to your domain name you bought from [njal.la](https://njal.la) for example "cloud.myfreedomsite.com" you attributed to your Nextcloud instance. 2. Nextcloud will as you to set up a new account to be used as a log in. Do so. 3. Nextcloud will also ask you where you want the data directory. Type in `/var/lib/nextcloud/data` 4. Nextcloud will ask you to connect the database: @@ -146,7 +146,7 @@ then press enter. #### Wordpress -1. Open a web browser and navigate to your domain name you bought from [njal.la](https://njal.la) for example myfreedomsite.com you attributed to your Wordpress instance. +1. Open a web browser and navigate to your domain name you bought from [njal.la](https://njal.la) for example "myfreedomsite.com" you attributed to your Wordpress instance. 2. Wordpress will ask you to connect the database: 1. Database username is `wpusr` 2. Database name is `wordpressdb` @@ -209,6 +209,6 @@ set DOMAIN $(cat /var/lib/domains/matrix) && cp -n /var/lib/caddy/.local/share/c ``` and press enter. -### Most everything now will be installed regarding the server and Sovran_SystemsOS. The remaining setup will be only be frontend user settings. +### Everything now will be installed regarding Sovran_SystemsOS. The remaining setup will be only be frontend user account creations for BTCpayserver, Vaultwarden, connecting the node to Sparrow wallet and Bisq. ### Congratulations! 🎉 \ No newline at end of file From 109cba3f687fee9375e3372f8c6a24cd28b144f5 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Fri, 27 Oct 2023 14:07:34 -0700 Subject: [PATCH 243/667] updated how to install Sovran_SystemsOS.md --- for_new_sovran_pros/How To Install Sovran_SystemsOS.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/for_new_sovran_pros/How To Install Sovran_SystemsOS.md b/for_new_sovran_pros/How To Install Sovran_SystemsOS.md index 1829eef..d2acf20 100644 --- a/for_new_sovran_pros/How To Install Sovran_SystemsOS.md +++ b/for_new_sovran_pros/How To Install Sovran_SystemsOS.md @@ -209,6 +209,6 @@ set DOMAIN $(cat /var/lib/domains/matrix) && cp -n /var/lib/caddy/.local/share/c ``` and press enter. -### Everything now will be installed regarding Sovran_SystemsOS. The remaining setup will be only be frontend user account creations for BTCpayserver, Vaultwarden, connecting the node to Sparrow wallet and Bisq. +### Everything now will be installed regarding Sovran_SystemsOS. The remaining setup will be only for the frontend user account creations for BTCpayserver, Vaultwarden, connecting the node to Sparrow wallet and Bisq. ### Congratulations! 🎉 \ No newline at end of file From 88ae70e72176584213e534791837d4c1bfcee6d3 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Fri, 27 Oct 2023 14:09:06 -0700 Subject: [PATCH 244/667] updated how to install Sovran_SystemsOS.md --- for_new_sovran_pros/How To Install Sovran_SystemsOS.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/for_new_sovran_pros/How To Install Sovran_SystemsOS.md b/for_new_sovran_pros/How To Install Sovran_SystemsOS.md index d2acf20..1b0e43c 100644 --- a/for_new_sovran_pros/How To Install Sovran_SystemsOS.md +++ b/for_new_sovran_pros/How To Install Sovran_SystemsOS.md @@ -106,7 +106,7 @@ then press enter. ### Setting the Desktop -1. Open the Terminal app and type in: `dconf load / < /home/free/Downloads/Sovran_SystemsOS-Desktop` +1. Open the Terminal app and type in: `dconf load / < /home/free/Downloads/Sovran_SystemsOS-Desktop`. Do NOT log in as root. ### Setting Up Nextcloud and Wordpress From 2172866243fd51287ac2121dff333cfa62b91970 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Fri, 27 Oct 2023 14:14:04 -0700 Subject: [PATCH 245/667] updated how to install Sovran_SystemsOS.md --- .../How To Install Sovran_SystemsOS.md | 48 +++++++++---------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/for_new_sovran_pros/How To Install Sovran_SystemsOS.md b/for_new_sovran_pros/How To Install Sovran_SystemsOS.md index 1b0e43c..5bc5bf9 100644 --- a/for_new_sovran_pros/How To Install Sovran_SystemsOS.md +++ b/for_new_sovran_pros/How To Install Sovran_SystemsOS.md @@ -19,9 +19,9 @@ - Second internal drive to store the Bitcoin blockchain and the automatic backups (SSD or NVME 2TB or larger) - Also, the Second internal drive needs to be be installed FIRST into an USB enclosure. If the second drive is SSD, you need a SSD USB enclosure. If the second drive is NVME, you need a NVME USB enclosure. The USB enclosure will be plugged into the first Linux machine. -1. Working Internet connection for both machines -2. Personalized Domain names already purchased from Njal.la. See the explanation here: https://sovransystems.com/how-to-setup/ -3. Your Router with ports open (Port Forwarding) to your second machine's internal IP address. This will usually be `192.168.1.(some number)` You will complete this at the end. +5. Working Internet connection for both machines +6. Personalized Domain names already purchased from Njal.la. See the explanation here: https://sovransystems.com/how-to-setup/ +7. Your Router with ports open (Port Forwarding) to your second machine's internal IP address. This will usually be `192.168.1.(some number)` You will complete this at the end. - Port 80 - Port 443 @@ -42,11 +42,11 @@ wget https://git.sovransystems.com/Sovran_Systems/Sovran_SystemsOS/raw/branch/ma then press enter. -1. Now, type `bash sdpsp.sh` then press enter. -2. Then the screen will ask for "what block..." which will be the drive in the list that is not mounted,which will be the second internal drive you just plugged in. It might be labeled `sda`, `sdb`, `sdc`, or if it is a NVME it will be `nvme0n1`, or `nvme0n2`. -3. Then the screen will ask for "what partition...,"which will be whatever you typed into the first prompt, but with a "1" on it. For example `sda1`, `sdb1`, `sdc1`, or `nvme0n1p1` or `nvme0n2p1`. -4. Since the script is made to copy the blockchain from another Sovran Pro that already has the full blockchain installed it will throw an error. However, it should complete the setup just fine. -5. Once complete, remove the second drive from the USB enclosure and install it into your second machine in which you are installing Sovran_SystemsOS. +6. Now, type `bash sdpsp.sh` then press enter. +7. Then the screen will ask for "what block..." which will be the drive in the list that is not mounted,which will be the second internal drive you just plugged in. It might be labeled `sda`, `sdb`, `sdc`, or if it is a NVME it will be `nvme0n1`, or `nvme0n2`. +8. Then the screen will ask for "what partition...,"which will be whatever you typed into the first prompt, but with a "1" on it. For example `sda1`, `sdb1`, `sdc1`, or `nvme0n1p1` or `nvme0n2p1`. +9. Since the script is made to copy the blockchain from another Sovran Pro that already has the full blockchain installed it will throw an error. However, it should complete the setup just fine. +10. Once complete, remove the second drive from the USB enclosure and install it into your second machine in which you are installing Sovran_SystemsOS. ## Preparing the First Main Internal Drive @@ -120,28 +120,28 @@ then press enter. 2. Database username is `ncusr` 3. Database name is `nextclouddb` 4. Database password is found by doing this: - 1. Open the Terminal app and type in: + 1. Open the Terminal app and type in: - ``` - ssh -i /home/free/.ssh/factory_login root@[one of your domain names] - ``` + ``` + ssh -i /home/free/.ssh/factory_login root@[one of your domain names] + ``` - Remove the brackets when actually executed the command, for example: + Remove the brackets when actually executed the command, for example: - ``` - ssh -i /home/free/.ssh/factory_login root@myfreedomsite.com - ``` + ``` + ssh -i /home/free/.ssh/factory_login root@myfreedomsite.com + ``` - It will as you for a password which is `gosovransystems` as this is the default temporary password from Sovran Systems. + It will as you for a password which is `gosovransystems` as this is the default temporary password from Sovran Systems. - Now you will be logged in as root. - 2. Now open the Terminal app and type: + Now you will be logged in as root. + 2. Now open the Terminal app and type: - `cat /var/lib/secrets/nextclouddb` + `cat /var/lib/secrets/nextclouddb` - and press enter. - 3. Your database password will be displayed in the Terminal window. - 4. Type that into the password field + and press enter. + 3. Your database password will be displayed in the Terminal window. + 4. Type that into the password field 5. Now, press install and Nextcloud will be installed. It will take a few minutes. Follow the on screen prompts. #### Wordpress @@ -202,7 +202,7 @@ chmod 770 /var/lib/www -R and press enter. -1. Now type +5. Now type ``` set DOMAIN $(cat /var/lib/domains/matrix) && cp -n /var/lib/caddy/.local/share/caddy/certificates/acme.zerossl.com-v2-dv90/{$DOMAIN}/{$DOMAIN}.crt /var/lib/coturn/{$DOMAIN}.crt.pem && cp -n /var/lib/caddy/.local/share/caddy/certificates/acme.zerossl.com-v2-dv90/{$DOMAIN}/{$DOMAIN}.key /var/lib/coturn/{$DOMAIN}.key.pem && chown turnserver:turnserver /var/lib/coturn -R && chmod 770 /var/lib/coturn -R && systemctl restart coturn From aab1c0c4ad91acb3bfe850b8e89f6960f26215f7 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Fri, 27 Oct 2023 14:15:30 -0700 Subject: [PATCH 246/667] updated how to install Sovran_SystemsOS.md --- for_new_sovran_pros/How To Install Sovran_SystemsOS.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/for_new_sovran_pros/How To Install Sovran_SystemsOS.md b/for_new_sovran_pros/How To Install Sovran_SystemsOS.md index 5bc5bf9..fb78e22 100644 --- a/for_new_sovran_pros/How To Install Sovran_SystemsOS.md +++ b/for_new_sovran_pros/How To Install Sovran_SystemsOS.md @@ -42,11 +42,11 @@ wget https://git.sovransystems.com/Sovran_Systems/Sovran_SystemsOS/raw/branch/ma then press enter. -6. Now, type `bash sdpsp.sh` then press enter. -7. Then the screen will ask for "what block..." which will be the drive in the list that is not mounted,which will be the second internal drive you just plugged in. It might be labeled `sda`, `sdb`, `sdc`, or if it is a NVME it will be `nvme0n1`, or `nvme0n2`. -8. Then the screen will ask for "what partition...,"which will be whatever you typed into the first prompt, but with a "1" on it. For example `sda1`, `sdb1`, `sdc1`, or `nvme0n1p1` or `nvme0n2p1`. -9. Since the script is made to copy the blockchain from another Sovran Pro that already has the full blockchain installed it will throw an error. However, it should complete the setup just fine. -10. Once complete, remove the second drive from the USB enclosure and install it into your second machine in which you are installing Sovran_SystemsOS. +5. Now, type `bash sdpsp.sh` then press enter. +6. Then the screen will ask for "what block..." which will be the drive in the list that is not mounted,which will be the second internal drive you just plugged in. It might be labeled `sda`, `sdb`, `sdc`, or if it is a NVME it will be `nvme0n1`, or `nvme0n2`. +7. Then the screen will ask for "what partition...,"which will be whatever you typed into the first prompt, but with a "1" on it. For example `sda1`, `sdb1`, `sdc1`, or `nvme0n1p1` or `nvme0n2p1`. +8. Since the script is made to copy the blockchain from another Sovran Pro that already has the full blockchain installed it will throw an error. However, it should complete the setup just fine. +9. Once complete, remove the second drive from the USB enclosure and install it into your second machine in which you are installing Sovran_SystemsOS. ## Preparing the First Main Internal Drive From f08554c0282a448f9fbd24827d18b47a63342310 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Fri, 27 Oct 2023 14:17:04 -0700 Subject: [PATCH 247/667] updated how to install Sovran_SystemsOS.md --- for_new_sovran_pros/How To Install Sovran_SystemsOS.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/for_new_sovran_pros/How To Install Sovran_SystemsOS.md b/for_new_sovran_pros/How To Install Sovran_SystemsOS.md index fb78e22..27396f8 100644 --- a/for_new_sovran_pros/How To Install Sovran_SystemsOS.md +++ b/for_new_sovran_pros/How To Install Sovran_SystemsOS.md @@ -34,7 +34,7 @@ 1. Install the second internal drive (NVME or SSD) into its appropriate USB enclosure, NOT into the Second machine yet. 2. Plug in the USB enclosure with the second drive installed into the first machine with Linux installed into one of its available USB ports. 3. Open a terminal in the first Linux machine and log in as root. -4. Type in +4. Type in: ```bash wget https://git.sovransystems.com/Sovran_Systems/Sovran_SystemsOS/raw/branch/main/for_new_sovran_pros/sdpsp.sh @@ -79,7 +79,7 @@ then press enter. 1. Now at the basic install of NixOS from step 16, type `root` to log into root and type the password `a` when asked then press enter. 2. Now you are logged in as `root`. -3. Now type in +3. Now type in: ``` wget https://git.sovransystems.com/Sovran_Systems/Sovran_SystemsOS/raw/branch/main/for_new_sovran_pros/sp.sh From 0acf551fa00caf9098ee7af229bb6e2be72ca7f0 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Fri, 27 Oct 2023 14:58:39 -0700 Subject: [PATCH 248/667] Update Nixpkgs --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 521085b..af8ce96 100644 --- a/flake.lock +++ b/flake.lock @@ -156,11 +156,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1698134075, - "narHash": "sha256-foCD+nuKzfh49bIoiCBur4+Fx1nozo+4C/6k8BYk4sg=", + "lastModified": 1698318101, + "narHash": "sha256-gUihHt3yPD7bVqg+k/UVHgngyaJ3DMEBchbymBMvK1E=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8efd5d1e283604f75a808a20e6cde0ef313d07d4", + "rev": "63678e9f3d3afecfeafa0acead6239cdb447574c", "type": "github" }, "original": { From cb4a2ad1856613a62070ae53d120098d6d1d954d Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Fri, 27 Oct 2023 15:58:45 -0700 Subject: [PATCH 249/667] updated how to install Sovran_SystemsOS.md --- .../How To Install Sovran_SystemsOS.md | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/for_new_sovran_pros/How To Install Sovran_SystemsOS.md b/for_new_sovran_pros/How To Install Sovran_SystemsOS.md index 27396f8..5457f29 100644 --- a/for_new_sovran_pros/How To Install Sovran_SystemsOS.md +++ b/for_new_sovran_pros/How To Install Sovran_SystemsOS.md @@ -34,7 +34,7 @@ 1. Install the second internal drive (NVME or SSD) into its appropriate USB enclosure, NOT into the Second machine yet. 2. Plug in the USB enclosure with the second drive installed into the first machine with Linux installed into one of its available USB ports. 3. Open a terminal in the first Linux machine and log in as root. -4. Type in: +4. Type in or copy and paste: ```bash wget https://git.sovransystems.com/Sovran_Systems/Sovran_SystemsOS/raw/branch/main/for_new_sovran_pros/sdpsp.sh @@ -60,7 +60,7 @@ then press enter. 6. Once at the command prompt type in `sudo su` to move to the root user 7. Once logged into the root user type in `passwd` then set the root user password to `a` 8. Type in `ip a` to get your internal IP address. It will usually be `192.1681.1.(somenumber)` make a note of this IP as you will need it later. - 9. Now, that you are logged in as the root user type in: + 9. Now, that you are logged in as the root user type in or copy and paste: ``` curl https://git.sovransystems.com/Sovran_Systems/Sovran_SystemsOS/raw/branch/main/for_new_sovran_pros/psp.sh -o psp.sh @@ -79,7 +79,7 @@ then press enter. 1. Now at the basic install of NixOS from step 16, type `root` to log into root and type the password `a` when asked then press enter. 2. Now you are logged in as `root`. -3. Now type in: +3. Now type in or copy and paste: ``` wget https://git.sovransystems.com/Sovran_Systems/Sovran_SystemsOS/raw/branch/main/for_new_sovran_pros/sp.sh @@ -120,7 +120,7 @@ then press enter. 2. Database username is `ncusr` 3. Database name is `nextclouddb` 4. Database password is found by doing this: - 1. Open the Terminal app and type in: + 1. Open the Terminal app and type in or copy and paste: ``` ssh -i /home/free/.ssh/factory_login root@[one of your domain names] @@ -151,7 +151,7 @@ then press enter. 1. Database username is `wpusr` 2. Database name is `wordpressdb` 3. Database password is found by doing this: - 1. Open the Terminal app and type in: + 1. Open the Terminal app and type in or copy and paste: ``` ssh -i /home/free/.ssh/factory_login root@[one of your domain names] @@ -177,7 +177,7 @@ then press enter. ### Final Install for Coturn and Nextcloud -1. Open the Terminal app and type in: +1. Open the Terminal app and type in or copy and paste: ``` ssh -i /home/free/.ssh/factory_login root@[one of your domain names] @@ -190,7 +190,7 @@ then press enter. ``` 2. It will as you for a password which is `gosovransystems` as this is the default temporary password from Sovran Systems. 3. Now you will be logged in as root. -4. Now open the Terminal app and type: +4. Now open the Terminal app and type or copy and paste: ``` sed -i '$e cat /var/lib/nextcloudaddition/nextcloudaddition' /var/lib/www/nextcloud/config/config.php @@ -202,7 +202,7 @@ chmod 770 /var/lib/www -R and press enter. -5. Now type +5. Now type or copy and paste: ``` set DOMAIN $(cat /var/lib/domains/matrix) && cp -n /var/lib/caddy/.local/share/caddy/certificates/acme.zerossl.com-v2-dv90/{$DOMAIN}/{$DOMAIN}.crt /var/lib/coturn/{$DOMAIN}.crt.pem && cp -n /var/lib/caddy/.local/share/caddy/certificates/acme.zerossl.com-v2-dv90/{$DOMAIN}/{$DOMAIN}.key /var/lib/coturn/{$DOMAIN}.key.pem && chown turnserver:turnserver /var/lib/coturn -R && chmod 770 /var/lib/coturn -R && systemctl restart coturn From 03da832a11f07186eb901ec2053529a8c92a3dfb Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Wed, 1 Nov 2023 20:15:54 -0700 Subject: [PATCH 250/667] Nixpkgs Update --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index af8ce96..dbe7fe1 100644 --- a/flake.lock +++ b/flake.lock @@ -156,11 +156,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1698318101, - "narHash": "sha256-gUihHt3yPD7bVqg+k/UVHgngyaJ3DMEBchbymBMvK1E=", + "lastModified": 1698611440, + "narHash": "sha256-jPjHjrerhYDy3q9+s5EAsuhyhuknNfowY6yt6pjn9pc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "63678e9f3d3afecfeafa0acead6239cdb447574c", + "rev": "0cbe9f69c234a7700596e943bfae7ef27a31b735", "type": "github" }, "original": { From 8f57789e2072c7ee616d9f3703f35376fc339e08 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Fri, 3 Nov 2023 10:02:51 -0700 Subject: [PATCH 251/667] Nixpkgs Update --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index dbe7fe1..22f40a9 100644 --- a/flake.lock +++ b/flake.lock @@ -156,11 +156,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1698611440, - "narHash": "sha256-jPjHjrerhYDy3q9+s5EAsuhyhuknNfowY6yt6pjn9pc=", + "lastModified": 1698924604, + "narHash": "sha256-GCFbkl2tj8fEZBZCw3Tc0AkGo0v+YrQlohhEGJ/X4s0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0cbe9f69c234a7700596e943bfae7ef27a31b735", + "rev": "fa804edfb7869c9fb230e174182a8a1a7e512c40", "type": "github" }, "original": { From 0dcd5dc7d79a3dcd3615e61a3e97c058400106b1 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Mon, 20 Nov 2023 21:30:51 -0800 Subject: [PATCH 252/667] updated bitcoin lnd node --- modules/bitcoinecosystem.nix | 37 +++++++++++++++++++++++++++++++----- 1 file changed, 32 insertions(+), 5 deletions(-) diff --git a/modules/bitcoinecosystem.nix b/modules/bitcoinecosystem.nix index 60df100..41fac44 100644 --- a/modules/bitcoinecosystem.nix +++ b/modules/bitcoinecosystem.nix @@ -17,21 +17,50 @@ nix-bitcoin.onionServices.bitcoind.enable = true; nix-bitcoin.onionServices.electrs.enable = true; + nix-bitcoin.onionServices.rtl.enable = true; services.lnd = { enable = true; + tor.enforce = true; + tor.proxy = true; }; + services.lnd.macaroons.btcpayserver.permissions = lib.mkForce '' + {"entity":"address","action":"write"}, + {"entity":"info","action":"read"}, + {"entity":"info","action":"write"}, + {"entity":"invoices","action":"read"}, + {"entity":"invoices","action":"write"}, + {"entity":"macaroon","action":"generate"}, + {"entity":"macaroon","action":"read"}, + {"entity":"macaroon","action":"write"}, + {"entity":"message","action":"read"}, + {"entity":"message","action":"write"}, + {"entity":"offchain","action":"read"}, + {"entity":"offchain","action":"write"}, + {"entity":"onchain","action":"read"}, + {"entity":"onchain","action":"write"}, + {"entity":"peers","action":"read"}, + {"entity":"peers","action":"write"}, + {"entity":"signer","action":"generate"}, + {"entity":"signer","action":"read"} + ''; + services.lightning-loop = { - enable = true; + enable = true; + tor.enforce = true; + tor.proxy = true; }; services.lightning-pool = { enable = true; + tor.enforce = true; + tor.proxy = true; }; services.rtl = { enable = true; + tor.enforce = true; port = 3050; nightTheme = true; nodes = { @@ -44,30 +73,28 @@ }; nix-bitcoin.onionServices.lnd.public = true; + services.lnd.lndconnect = { enable = true; onion = true; }; + services.charge-lnd.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.nodeinfo.enable = true; - nix-bitcoin.operator = { enable = true; name = "free"; From eed95a47f81c264054c6fc21d7ec1dfb245a997f Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Mon, 20 Nov 2023 21:34:12 -0800 Subject: [PATCH 253/667] updated bitcoin lnd node --- modules/bitcoinecosystem.nix | 68 ++++++++++++++++++------------------ 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/modules/bitcoinecosystem.nix b/modules/bitcoinecosystem.nix index 41fac44..4b2094b 100644 --- a/modules/bitcoinecosystem.nix +++ b/modules/bitcoinecosystem.nix @@ -22,40 +22,40 @@ services.lnd = { enable = true; tor.enforce = true; - tor.proxy = true; + tor.proxy = true; }; services.lnd.macaroons.btcpayserver.permissions = lib.mkForce '' - {"entity":"address","action":"write"}, - {"entity":"info","action":"read"}, - {"entity":"info","action":"write"}, - {"entity":"invoices","action":"read"}, - {"entity":"invoices","action":"write"}, - {"entity":"macaroon","action":"generate"}, - {"entity":"macaroon","action":"read"}, - {"entity":"macaroon","action":"write"}, - {"entity":"message","action":"read"}, - {"entity":"message","action":"write"}, - {"entity":"offchain","action":"read"}, - {"entity":"offchain","action":"write"}, - {"entity":"onchain","action":"read"}, - {"entity":"onchain","action":"write"}, - {"entity":"peers","action":"read"}, - {"entity":"peers","action":"write"}, - {"entity":"signer","action":"generate"}, - {"entity":"signer","action":"read"} - ''; + {"entity":"address","action":"write"}, + {"entity":"info","action":"read"}, + {"entity":"info","action":"write"}, + {"entity":"invoices","action":"read"}, + {"entity":"invoices","action":"write"}, + {"entity":"macaroon","action":"generate"}, + {"entity":"macaroon","action":"read"}, + {"entity":"macaroon","action":"write"}, + {"entity":"message","action":"read"}, + {"entity":"message","action":"write"}, + {"entity":"offchain","action":"read"}, + {"entity":"offchain","action":"write"}, + {"entity":"onchain","action":"read"}, + {"entity":"onchain","action":"write"}, + {"entity":"peers","action":"read"}, + {"entity":"peers","action":"write"}, + {"entity":"signer","action":"generate"}, + {"entity":"signer","action":"read"} + ''; services.lightning-loop = { - enable = true; - tor.enforce = true; - tor.proxy = true; + enable = true; + tor.enforce = true; + tor.proxy = true; }; services.lightning-pool = { enable = true; - tor.enforce = true; - tor.proxy = true; + tor.enforce = true; + tor.proxy = true; }; services.rtl = { @@ -72,16 +72,16 @@ }; }; - nix-bitcoin.onionServices.lnd.public = true; - - services.lnd.lndconnect = { - enable = true; - onion = true; - }; - - services.charge-lnd.enable = true; + nix-bitcoin.onionServices.lnd.public = true; + + services.lnd.lndconnect = { + enable = true; + onion = true; + }; + + services.charge-lnd.enable = true; - services.btcpayserver.lightningBackend = "lnd"; + services.btcpayserver.lightningBackend = "lnd"; services.electrs = { enable = true; From e3d74f84ed2d48e067128a129efd23c059a4794c Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Mon, 20 Nov 2023 21:35:28 -0800 Subject: [PATCH 254/667] updated bitcoin lnd node --- modules/bitcoinecosystem.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/bitcoinecosystem.nix b/modules/bitcoinecosystem.nix index 4b2094b..d66536f 100644 --- a/modules/bitcoinecosystem.nix +++ b/modules/bitcoinecosystem.nix @@ -12,8 +12,8 @@ extraConfig = '' peerbloomfilters=1 server=1 - ''; - }; + ''; + }; nix-bitcoin.onionServices.bitcoind.enable = true; nix-bitcoin.onionServices.electrs.enable = true; From c97507b3e242b4be3d4c37d928b3525bc7100198 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Tue, 21 Nov 2023 14:27:14 -0800 Subject: [PATCH 255/667] added ungoogled-chromium --- configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/configuration.nix b/configuration.nix index 6d2265a..eb233a1 100644 --- a/configuration.nix +++ b/configuration.nix @@ -184,6 +184,7 @@ in libreoffice-fresh dig nextcloud-client + ungoogled-chromium ]; From b3c0e3fd654e2bca4e20c203c53b9748c7d47ea1 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Wed, 6 Dec 2023 11:30:21 -0800 Subject: [PATCH 256/667] Nixpkgs Update --- configuration.nix | 2 +- flake.lock | 36 ++++++++++++++++++------------------ 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/configuration.nix b/configuration.nix index eb233a1..43be7fa 100644 --- a/configuration.nix +++ b/configuration.nix @@ -152,7 +152,7 @@ in gnomeExtensions.just-perfection gnomeExtensions.appindicator gnomeExtensions.systemd-manager - gnomeExtensions.date-menu-formatter + #gnomeExtensions.date-menu-formatter gnome.gnome-tweaks papirus-icon-theme ranger diff --git a/flake.lock b/flake.lock index 22f40a9..d3da74a 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1696775529, - "narHash": "sha256-TYlE4B0ktPtlJJF9IFxTWrEeq+XKG8Ny0gc2FGEAdj0=", + "lastModified": 1701216516, + "narHash": "sha256-jKSeJn+7hZ1dZdiH1L+NWUGT2i/BGomKAJ54B9kT06Q=", "owner": "ryantm", "repo": "agenix", - "rev": "daf42cb35b2dc614d1551e37f96406e4c4a2d3e4", + "rev": "13ac9ac6d68b9a0896e3d43a082947233189e247", "type": "github" }, "original": { @@ -32,11 +32,11 @@ ] }, "locked": { - "lastModified": 1691100095, - "narHash": "sha256-qp+M5l18qHRmvUkYOqoi5AaspX7ZbqsVf6S8qQgEnFs=", + "lastModified": 1699821751, + "narHash": "sha256-UlId5jvJFmkVcKpn0oZ2VTvWAc/mZy6butRZGk73xXM=", "owner": "erikarvstedt", "repo": "extra-container", - "rev": "9a594f75cc782c481df9d108624409d429a23f19", + "rev": "842912907bf189ef17a80ca09ba37b6bdfc76c49", "type": "github" }, "original": { @@ -92,11 +92,11 @@ "nixpkgs-unstable": "nixpkgs-unstable" }, "locked": { - "lastModified": 1698064538, - "narHash": "sha256-Z0WK2+b2jkhGT74N1K0is9LKVqcP3N+5s8aPRfIJ9bk=", + "lastModified": 1701250095, + "narHash": "sha256-6/T8h7g0s5Kp2C4yCOyuL9ssfPsZ237l2ek5Kc6r+eM=", "owner": "fort-nix", "repo": "nix-bitcoin", - "rev": "8a8f32a4fa8fa4d97bea60c19d587a4523d10a2a", + "rev": "1d73b21f108cfddc928395bedd1119fc83dff489", "type": "github" }, "original": { @@ -124,11 +124,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1697915759, - "narHash": "sha256-WyMj5jGcecD+KC8gEs+wFth1J1wjisZf8kVZH13f1Zo=", + "lastModified": 1701040486, + "narHash": "sha256-vawYwoHA5CwvjfqaT3A5CT9V36Eq43gxdwpux32Qkjw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "51d906d2341c9e866e48c2efcaac0f2d70bfd43e", + "rev": "45827faa2132b8eade424f6bdd48d8828754341a", "type": "github" }, "original": { @@ -140,11 +140,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1697851979, - "narHash": "sha256-lJ8k4qkkwdvi+t/Xc6Fn74kUuobpu9ynPGxNZR6OwoA=", + "lastModified": 1701053011, + "narHash": "sha256-8QQ7rFbKFqgKgLoaXVJRh7Ik5LtI3pyBBCfOnNOGkF0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5550a85a087c04ddcace7f892b0bdc9d8bb080c8", + "rev": "5b528f99f73c4fad127118a8c1126b5e003b01a9", "type": "github" }, "original": { @@ -156,11 +156,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1698924604, - "narHash": "sha256-GCFbkl2tj8fEZBZCw3Tc0AkGo0v+YrQlohhEGJ/X4s0=", + "lastModified": 1701436327, + "narHash": "sha256-tRHbnoNI8SIM5O5xuxOmtSLnswEByzmnQcGGyNRjxsE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fa804edfb7869c9fb230e174182a8a1a7e512c40", + "rev": "91050ea1e57e50388fa87a3302ba12d188ef723a", "type": "github" }, "original": { From 4c7cf6482b9a39f761e1a63dd783f1f8b4c822ab Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Mon, 11 Dec 2023 15:15:05 -0800 Subject: [PATCH 257/667] Nixpkgs Update with Sparrow 1.8.1 --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index d3da74a..3882a17 100644 --- a/flake.lock +++ b/flake.lock @@ -156,11 +156,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1701436327, - "narHash": "sha256-tRHbnoNI8SIM5O5xuxOmtSLnswEByzmnQcGGyNRjxsE=", + "lastModified": 1702151865, + "narHash": "sha256-9VAt19t6yQa7pHZLDbil/QctAgVsA66DLnzdRGqDisg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "91050ea1e57e50388fa87a3302ba12d188ef723a", + "rev": "666fc80e7b2afb570462423cb0e1cf1a3a34fedd", "type": "github" }, "original": { From 4e7f1ed949f97b1387ef4ce315ad3234601f8914 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Mon, 11 Dec 2023 15:38:10 -0800 Subject: [PATCH 258/667] Added the temp allow electron app version so system will build --- configuration.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/configuration.nix b/configuration.nix index 43be7fa..4b3ee03 100644 --- a/configuration.nix +++ b/configuration.nix @@ -188,8 +188,7 @@ in ]; - nixpkgs.config.permittedInsecurePackages = [ - ]; + nixpkgs.config.permittedInsecurePackages = [ "electron-25.9.0" ]; programs.bash.promptInit = "fish"; From 420c43cb29af24bb3b6e12b7fb2e8ed325d734dc Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Wed, 13 Dec 2023 11:05:50 -0800 Subject: [PATCH 259/667] Nixpkgs Update --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 3882a17..d73b609 100644 --- a/flake.lock +++ b/flake.lock @@ -156,11 +156,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1702151865, - "narHash": "sha256-9VAt19t6yQa7pHZLDbil/QctAgVsA66DLnzdRGqDisg=", + "lastModified": 1702312524, + "narHash": "sha256-gkZJRDBUCpTPBvQk25G0B7vfbpEYM5s5OZqghkjZsnE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "666fc80e7b2afb570462423cb0e1cf1a3a34fedd", + "rev": "a9bf124c46ef298113270b1f84a164865987a91c", "type": "github" }, "original": { From a41bb92189136669ada1bd05ee5fa7426b7cbcba Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Thu, 14 Dec 2023 15:30:55 -0800 Subject: [PATCH 260/667] New nix-bitcoin packages --- flake.lock | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/flake.lock b/flake.lock index d73b609..8afff61 100644 --- a/flake.lock +++ b/flake.lock @@ -50,11 +50,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1694529238, - "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", + "lastModified": 1701680307, + "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", "owner": "numtide", "repo": "flake-utils", - "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", + "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", "type": "github" }, "original": { @@ -92,11 +92,11 @@ "nixpkgs-unstable": "nixpkgs-unstable" }, "locked": { - "lastModified": 1701250095, - "narHash": "sha256-6/T8h7g0s5Kp2C4yCOyuL9ssfPsZ237l2ek5Kc6r+eM=", + "lastModified": 1702564002, + "narHash": "sha256-AJfaPpDc7gzaD4nEIdDCN5BMA0gwJbNzaSRj4o00Tko=", "owner": "fort-nix", "repo": "nix-bitcoin", - "rev": "1d73b21f108cfddc928395bedd1119fc83dff489", + "rev": "a2e1478a7cedffe1bf08988764f32f579ae69e5f", "type": "github" }, "original": { @@ -124,11 +124,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1701040486, - "narHash": "sha256-vawYwoHA5CwvjfqaT3A5CT9V36Eq43gxdwpux32Qkjw=", + "lastModified": 1701336116, + "narHash": "sha256-kEmpezCR/FpITc6yMbAh4WrOCiT2zg5pSjnKrq51h5Y=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "45827faa2132b8eade424f6bdd48d8828754341a", + "rev": "f5c27c6136db4d76c30e533c20517df6864c46ee", "type": "github" }, "original": { @@ -140,16 +140,16 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1701053011, - "narHash": "sha256-8QQ7rFbKFqgKgLoaXVJRh7Ik5LtI3pyBBCfOnNOGkF0=", + "lastModified": 1702233072, + "narHash": "sha256-H5G2wgbim2Ku6G6w+NSaQaauv6B6DlPhY9fMvArKqRo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5b528f99f73c4fad127118a8c1126b5e003b01a9", + "rev": "781e2a9797ecf0f146e81425c822dca69fe4a348", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-23.05", + "ref": "nixos-23.11", "repo": "nixpkgs", "type": "github" } From 2bff7f4800f03219fed848bb14007be0fdbf4bd7 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Sat, 16 Dec 2023 18:25:50 -0800 Subject: [PATCH 261/667] Updated PHP for Nextcloud 28 --- configuration.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/configuration.nix b/configuration.nix index 4b3ee03..585438d 100644 --- a/configuration.nix +++ b/configuration.nix @@ -6,7 +6,7 @@ let custom-php = pkgs.php81.buildEnv { - extensions = { enabled, all }: enabled ++ (with all; [ apcu redis imagick memcached ]); + extensions = { enabled, all }: enabled ++ (with all; [ bz2 apcu redis imagick memcached ]); extraConfig = '' display_errors = On display_startup_errors = On @@ -57,6 +57,9 @@ in package = pkgs.nixUnstable; extraOptions = '' experimental-features = nix-command flakes + experimental-features = auto-allocate-uids + experimental-features = configurable-impure-env + ''; }; From 76d9909c840118aa64154ffce63a68a44fbd1ca8 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Sat, 16 Dec 2023 19:07:01 -0800 Subject: [PATCH 262/667] Updated NixOS update commands --- configuration.nix | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/configuration.nix b/configuration.nix index 585438d..3e90cf6 100644 --- a/configuration.nix +++ b/configuration.nix @@ -53,15 +53,7 @@ in options = [ "nofail" ]; }; - nix = { - package = pkgs.nixUnstable; - extraOptions = '' - experimental-features = nix-command flakes - experimental-features = auto-allocate-uids - experimental-features = configurable-impure-env - - ''; - }; + nix.settings.experimental-features = [ "nix-command" "flakes" ]; networking.hostName = "nixos"; # Define your hostname. # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. From 39444b8a2461e55fdd8b4f321890bb905fc1b8ff Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Mon, 18 Dec 2023 20:13:12 -0800 Subject: [PATCH 263/667] Update Nixpkgs --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 8afff61..458980b 100644 --- a/flake.lock +++ b/flake.lock @@ -156,11 +156,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1702312524, - "narHash": "sha256-gkZJRDBUCpTPBvQk25G0B7vfbpEYM5s5OZqghkjZsnE=", + "lastModified": 1702830618, + "narHash": "sha256-lvhwIvRwhOLgzbRuYkqHy4M5cQHYs4ktL6/hyuBS6II=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a9bf124c46ef298113270b1f84a164865987a91c", + "rev": "91a00709aebb3602f172a0bf47ba1ef013e34835", "type": "github" }, "original": { From fbc32ded4b8cb58ad2ad05435ecdf21c977604f4 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Wed, 20 Dec 2023 07:43:38 -0800 Subject: [PATCH 264/667] Nixpkgs Update --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 458980b..e963288 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1701216516, - "narHash": "sha256-jKSeJn+7hZ1dZdiH1L+NWUGT2i/BGomKAJ54B9kT06Q=", + "lastModified": 1703086954, + "narHash": "sha256-zoYY0tb/e7PwlKt/WqYg6KVtRzsRvINugfFXljbsdTY=", "owner": "ryantm", "repo": "agenix", - "rev": "13ac9ac6d68b9a0896e3d43a082947233189e247", + "rev": "6cb7cd66c2bf0b7cca55025281399af6bb0d1f86", "type": "github" }, "original": { @@ -156,11 +156,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1702830618, - "narHash": "sha256-lvhwIvRwhOLgzbRuYkqHy4M5cQHYs4ktL6/hyuBS6II=", + "lastModified": 1703013332, + "narHash": "sha256-+tFNwMvlXLbJZXiMHqYq77z/RfmpfpiI3yjL6o/Zo9M=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "91a00709aebb3602f172a0bf47ba1ef013e34835", + "rev": "54aac082a4d9bb5bbc5c4e899603abfb76a3f6d6", "type": "github" }, "original": { From fc0bff5e6ed167934a4cfe20a8ab96ca59893a4d Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Thu, 28 Dec 2023 18:40:16 -0800 Subject: [PATCH 265/667] Nix Pkgs Update with an update to configuration.nix --- configuration.nix | 25 ++++++++++--------------- flake.lock | 44 ++++++++++++++++++++++++++++++-------------- 2 files changed, 40 insertions(+), 29 deletions(-) diff --git a/configuration.nix b/configuration.nix index 3e90cf6..c3a5924 100644 --- a/configuration.nix +++ b/configuration.nix @@ -56,7 +56,6 @@ in nix.settings.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; @@ -116,8 +115,6 @@ in 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"; @@ -211,7 +208,6 @@ in }; }; - #networking.enableIPv6 = false; ####### CADDY ####### services.caddy = { @@ -294,9 +290,9 @@ in ###### 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 @@ -308,9 +304,10 @@ in services.mysql = { enable = true; - package = pkgs.mariadb_1011; + package = pkgs.mariadb; }; + services.postgresql.initialScript = pkgs.writeText "begin-init.sql" '' CREATE ROLE "ncusr" WITH LOGIN PASSWORD '${personalization.age.secrets.nextclouddb.file}'; CREATE DATABASE "nextclouddb" WITH OWNER "ncusr" @@ -336,12 +333,10 @@ in ; - ####### KEEP AWAKE for DISPLAY and HEADLESS ####### services.xserver.displayManager.gdm.autoSuspend = false; - ####### BACKUP TO INTERNAL DRIVE ####### services.rsnapshot = { enable = true; @@ -353,13 +348,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 ####### @@ -379,11 +373,10 @@ backup /etc/nix-bitcoin-secrets/ localhost/ client.enable = true; torsocks.enable = true; }; + services.privoxy.enableTor = true; - - ####### Enable the OpenSSH daemon ####### services.openssh = { enable = true; @@ -394,6 +387,7 @@ backup /etc/nix-bitcoin-secrets/ localhost/ }; }; + #######FailtoBan####### services.fail2ban = { enable = true; @@ -414,7 +408,7 @@ backup /etc/nix-bitcoin-secrets/ localhost/ { from=49152; to=65535; } # TURN relay ]; - # Or disable the firewall altogether. + networking.firewall.enable = true; @@ -425,6 +419,7 @@ backup /etc/nix-bitcoin-secrets/ localhost/ options = "--delete-older-than 7d"; }; + system.stateVersion = "22.05"; } diff --git a/flake.lock b/flake.lock index e963288..1695383 100644 --- a/flake.lock +++ b/flake.lock @@ -4,14 +4,15 @@ "inputs": { "darwin": [], "home-manager": "home-manager", - "nixpkgs": "nixpkgs" + "nixpkgs": "nixpkgs", + "systems": "systems" }, "locked": { - "lastModified": 1703086954, - "narHash": "sha256-zoYY0tb/e7PwlKt/WqYg6KVtRzsRvINugfFXljbsdTY=", + "lastModified": 1703433843, + "narHash": "sha256-nmtA4KqFboWxxoOAA6Y1okHbZh+HsXaMPFkYHsoDRDw=", "owner": "ryantm", "repo": "agenix", - "rev": "6cb7cd66c2bf0b7cca55025281399af6bb0d1f86", + "rev": "417caa847f9383e111d1397039c9d4337d024bf0", "type": "github" }, "original": { @@ -47,7 +48,7 @@ }, "flake-utils": { "inputs": { - "systems": "systems" + "systems": "systems_2" }, "locked": { "lastModified": 1701680307, @@ -71,11 +72,11 @@ ] }, "locked": { - "lastModified": 1682203081, - "narHash": "sha256-kRL4ejWDhi0zph/FpebFYhzqlOBrk0Pl3dzGEKSAlEw=", + "lastModified": 1703113217, + "narHash": "sha256-7ulcXOk63TIT2lVDSExj7XzFx09LpdSAPtvgtM7yQPE=", "owner": "nix-community", "repo": "home-manager", - "rev": "32d3e39c491e2f91152c84f8ad8b003420eab0a1", + "rev": "3bfaacf46133c037bb356193bd2f1765d9dc82c1", "type": "github" }, "original": { @@ -108,11 +109,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1677676435, - "narHash": "sha256-6FxdcmQr5JeZqsQvfinIMr0XcTyTuR7EXX0H3ANShpQ=", + "lastModified": 1703013332, + "narHash": "sha256-+tFNwMvlXLbJZXiMHqYq77z/RfmpfpiI3yjL6o/Zo9M=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a08d6979dd7c82c4cef0dcc6ac45ab16051c1169", + "rev": "54aac082a4d9bb5bbc5c4e899603abfb76a3f6d6", "type": "github" }, "original": { @@ -156,11 +157,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1703013332, - "narHash": "sha256-+tFNwMvlXLbJZXiMHqYq77z/RfmpfpiI3yjL6o/Zo9M=", + "lastModified": 1703438236, + "narHash": "sha256-aqVBq1u09yFhL7bj1/xyUeJjzr92fXVvQSSEx6AdB1M=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "54aac082a4d9bb5bbc5c4e899603abfb76a3f6d6", + "rev": "5f64a12a728902226210bf01d25ec6cbb9d9265b", "type": "github" }, "original": { @@ -191,6 +192,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", From 2af522a185ce32607b7e6a95c1d1d89118926fb8 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Mon, 1 Jan 2024 15:02:04 -0800 Subject: [PATCH 266/667] updated the date --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 3d73eb2..9619d5d 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ Connect for Support on Matrix here: https://matrix.to/#/#sovran-systems-support: ## All Is Love. Fear Is Illusion. All Beings Are Free. Truth Can Never Be Destroyed. -Created, Handcrafted, and Headquartered in Southern California – 2022-2023 🏖️. +Created, Handcrafted, and Headquartered in Southern California – 2022-2024 🏖️. All Open Source Software Used Falls Under Its Specific Open Source License. From 963daf83b1cf6b2889b270b4f8ec10aa05fb609d Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Tue, 2 Jan 2024 11:37:04 -0800 Subject: [PATCH 267/667] Updated Nixpkgs --- configuration.nix | 2 +- flake.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configuration.nix b/configuration.nix index c3a5924..2dae030 100644 --- a/configuration.nix +++ b/configuration.nix @@ -151,7 +151,7 @@ in sparrow bisq-desktop neofetch - gnome.gedit + gedit matrix-synapse openssl pwgen diff --git a/flake.lock b/flake.lock index 1695383..e531a2e 100644 --- a/flake.lock +++ b/flake.lock @@ -157,11 +157,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1703438236, - "narHash": "sha256-aqVBq1u09yFhL7bj1/xyUeJjzr92fXVvQSSEx6AdB1M=", + "lastModified": 1703961334, + "narHash": "sha256-M1mV/Cq+pgjk0rt6VxoyyD+O8cOUiai8t9Q6Yyq4noY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5f64a12a728902226210bf01d25ec6cbb9d9265b", + "rev": "b0d36bd0a420ecee3bc916c91886caca87c894e9", "type": "github" }, "original": { From c44c0d001585f9ca784bf3b1e2501234da781b77 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Thu, 4 Jan 2024 20:34:16 -0800 Subject: [PATCH 268/667] Updated Nixpkgs and increased max php upload and post size and reduced backup days --- configuration.nix | 8 ++++---- flake.lock | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/configuration.nix b/configuration.nix index 2dae030..50609f1 100644 --- a/configuration.nix +++ b/configuration.nix @@ -18,8 +18,8 @@ let 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 + post_max_size = 3G + upload_max_filesize = 3G opcache.interned_strings_buffer = 32 apc.enable_cli=1 redis.session.locking_enabled=1 @@ -342,8 +342,8 @@ in enable = true; extraConfig = '' snapshot_root /run/media/Second_Drive/BTCEcoandBackup/NixOS_Snapshot_Backup -retain hourly 12 -retain daily 12 +retain hourly 7 +retain daily 7 backup /home/ localhost/ backup /var/lib/ localhost/ backup /etc/nixos/ localhost/ diff --git a/flake.lock b/flake.lock index e531a2e..327a5b7 100644 --- a/flake.lock +++ b/flake.lock @@ -157,11 +157,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1703961334, - "narHash": "sha256-M1mV/Cq+pgjk0rt6VxoyyD+O8cOUiai8t9Q6Yyq4noY=", + "lastModified": 1704194953, + "narHash": "sha256-RtDKd8Mynhe5CFnVT8s0/0yqtWFMM9LmCzXv/YKxnq4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b0d36bd0a420ecee3bc916c91886caca87c894e9", + "rev": "bd645e8668ec6612439a9ee7e71f7eac4099d4f6", "type": "github" }, "original": { From 03e14c06dc5385e654d6d01243a80c235c98a1e9 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Mon, 8 Jan 2024 08:30:55 -0800 Subject: [PATCH 269/667] Updated Nixpkgs --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 327a5b7..1c88fb9 100644 --- a/flake.lock +++ b/flake.lock @@ -157,11 +157,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1704194953, - "narHash": "sha256-RtDKd8Mynhe5CFnVT8s0/0yqtWFMM9LmCzXv/YKxnq4=", + "lastModified": 1704538339, + "narHash": "sha256-1734d3mQuux9ySvwf6axRWZRBhtcZA9Q8eftD6EZg6U=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "bd645e8668ec6612439a9ee7e71f7eac4099d4f6", + "rev": "46ae0210ce163b3cba6c7da08840c1d63de9c701", "type": "github" }, "original": { From 4a7130abdd6b985125037dd047838ee97324cc50 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Tue, 9 Jan 2024 10:28:03 -0800 Subject: [PATCH 270/667] removed outdated .nix file --- modules/onlyoffice.nix | 17 ----------------- 1 file changed, 17 deletions(-) delete mode 100644 modules/onlyoffice.nix diff --git a/modules/onlyoffice.nix b/modules/onlyoffice.nix deleted file mode 100644 index d9fd319..0000000 --- a/modules/onlyoffice.nix +++ /dev/null @@ -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; - -} - From 243c7cefed83b9a80d4714f1850a8429840d8289 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Wed, 10 Jan 2024 09:33:15 -0800 Subject: [PATCH 271/667] Update to Nixpkgs --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 1c88fb9..73957fe 100644 --- a/flake.lock +++ b/flake.lock @@ -157,11 +157,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1704538339, - "narHash": "sha256-1734d3mQuux9ySvwf6axRWZRBhtcZA9Q8eftD6EZg6U=", + "lastModified": 1704722960, + "narHash": "sha256-mKGJ3sPsT6//s+Knglai5YflJUF2DGj7Ai6Ynopz0kI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "46ae0210ce163b3cba6c7da08840c1d63de9c701", + "rev": "317484b1ead87b9c1b8ac5261a8d2dd748a0492d", "type": "github" }, "original": { From e7df262ba5926f1aefee6f190e5b64a020f62266 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Fri, 12 Jan 2024 18:19:29 -0800 Subject: [PATCH 272/667] updated matrix-synapse --- modules/synapse.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/synapse.nix b/modules/synapse.nix index 109708e..184cba9 100644 --- a/modules/synapse.nix +++ b/modules/synapse.nix @@ -14,7 +14,7 @@ in services.matrix-synapse = { enable = true; settings = { - include_content = false; + push.include_content = false; group_unread_count_by_room = false; encryption_enabled_by_default_for_room_type = "invite"; allow_profile_lookup_over_federation = false; From e25af2ed221518d639081f0729e1b4205218842d Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Mon, 15 Jan 2024 13:44:38 -0800 Subject: [PATCH 273/667] Nixpkgs Update --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 73957fe..b40bfb8 100644 --- a/flake.lock +++ b/flake.lock @@ -157,11 +157,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1704722960, - "narHash": "sha256-mKGJ3sPsT6//s+Knglai5YflJUF2DGj7Ai6Ynopz0kI=", + "lastModified": 1705133751, + "narHash": "sha256-rCIsyE80jgiOU78gCWN3A0wE0tR2GI5nH6MlS+HaaSQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "317484b1ead87b9c1b8ac5261a8d2dd748a0492d", + "rev": "9b19f5e77dd906cb52dade0b7bd280339d2a1f3d", "type": "github" }, "original": { From 9199e2d221ea76033654149b8bc2482c55b7a68b Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Mon, 15 Jan 2024 22:49:41 -0800 Subject: [PATCH 274/667] updated install script --- for_new_sovran_pros/sp.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/for_new_sovran_pros/sp.sh b/for_new_sovran_pros/sp.sh index 89b0e53..aef03e3 100644 --- a/for_new_sovran_pros/sp.sh +++ b/for_new_sovran_pros/sp.sh @@ -328,9 +328,9 @@ mkdir -p /home/free/Downloads pushd /home/free/Downloads - wget https://git.sovransystems.com/Sovran_Systems/Software/raw/branch/main/Sovran_SystemsOS_Reseter/sovran_systemsOS_reseter_local_installer/sovran_systemsOS_reseter_install.sh + wget https://git.sovransystems.com/Sovran_Systems/Software/raw/branch/main/Sovran_SystemsOS_Resetter/sovran_systemsOS_resetter_local_installer/sovran_systemsOS_resetter_install.sh - bash sovran_systemsOS_reseter_install.sh + bash sovran_systemsOS_resetter_install.sh popd From 0d94050731b0f9ae81ddd45a61420bebb246bb60 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Tue, 16 Jan 2024 11:57:09 -0800 Subject: [PATCH 275/667] updated all file permissions --- LICENSE | 0 README.md | 0 configuration.nix | 0 .../Sovran_SystemsOS_File_Fixes_And_New_Services.sh | 0 file_fixes_and_new_services/add-custom-nix.sh | 0 .../sovran-pro-flake-update.sh | 0 .../sovran-pro-flake-update2.sh | 0 flake.lock | 0 flake.nix | 0 .../How To Install Sovran_SystemsOS.md | 0 for_new_sovran_pros/Sovran_SystemsOS-Desktop | 0 for_new_sovran_pros/flake.nix | 0 for_new_sovran_pros/psp.sh | 0 for_new_sovran_pros/sdpsp.sh | 0 for_new_sovran_pros/sp.sh | 0 ...Sovran_SystemsOS_File_Fixes_And_New_Services.nix | 0 modules/bitcoinecosystem.nix | 0 modules/coturn.nix | 0 modules/modules.nix | 0 modules/personalization.nix | 0 modules/synapse.nix | 0 modules/vaultwarden.nix | 0 sovran_systems.png | Bin 23 files changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 LICENSE mode change 100644 => 100755 README.md mode change 100644 => 100755 configuration.nix mode change 100644 => 100755 file_fixes_and_new_services/Sovran_SystemsOS_File_Fixes_And_New_Services.sh mode change 100644 => 100755 file_fixes_and_new_services/add-custom-nix.sh mode change 100644 => 100755 file_fixes_and_new_services/sovran-pro-flake-update.sh mode change 100644 => 100755 file_fixes_and_new_services/sovran-pro-flake-update2.sh mode change 100644 => 100755 flake.lock mode change 100644 => 100755 flake.nix mode change 100644 => 100755 for_new_sovran_pros/How To Install Sovran_SystemsOS.md mode change 100644 => 100755 for_new_sovran_pros/Sovran_SystemsOS-Desktop mode change 100644 => 100755 for_new_sovran_pros/flake.nix mode change 100644 => 100755 for_new_sovran_pros/psp.sh mode change 100644 => 100755 for_new_sovran_pros/sdpsp.sh mode change 100644 => 100755 for_new_sovran_pros/sp.sh mode change 100644 => 100755 modules/Sovran_SystemsOS_File_Fixes_And_New_Services.nix mode change 100644 => 100755 modules/bitcoinecosystem.nix mode change 100644 => 100755 modules/coturn.nix mode change 100644 => 100755 modules/modules.nix mode change 100644 => 100755 modules/personalization.nix mode change 100644 => 100755 modules/synapse.nix mode change 100644 => 100755 modules/vaultwarden.nix mode change 100644 => 100755 sovran_systems.png diff --git a/LICENSE b/LICENSE old mode 100644 new mode 100755 diff --git a/README.md b/README.md old mode 100644 new mode 100755 diff --git a/configuration.nix b/configuration.nix old mode 100644 new mode 100755 diff --git a/file_fixes_and_new_services/Sovran_SystemsOS_File_Fixes_And_New_Services.sh b/file_fixes_and_new_services/Sovran_SystemsOS_File_Fixes_And_New_Services.sh old mode 100644 new mode 100755 diff --git a/file_fixes_and_new_services/add-custom-nix.sh b/file_fixes_and_new_services/add-custom-nix.sh old mode 100644 new mode 100755 diff --git a/file_fixes_and_new_services/sovran-pro-flake-update.sh b/file_fixes_and_new_services/sovran-pro-flake-update.sh old mode 100644 new mode 100755 diff --git a/file_fixes_and_new_services/sovran-pro-flake-update2.sh b/file_fixes_and_new_services/sovran-pro-flake-update2.sh old mode 100644 new mode 100755 diff --git a/flake.lock b/flake.lock old mode 100644 new mode 100755 diff --git a/flake.nix b/flake.nix old mode 100644 new mode 100755 diff --git a/for_new_sovran_pros/How To Install Sovran_SystemsOS.md b/for_new_sovran_pros/How To Install Sovran_SystemsOS.md old mode 100644 new mode 100755 diff --git a/for_new_sovran_pros/Sovran_SystemsOS-Desktop b/for_new_sovran_pros/Sovran_SystemsOS-Desktop old mode 100644 new mode 100755 diff --git a/for_new_sovran_pros/flake.nix b/for_new_sovran_pros/flake.nix old mode 100644 new mode 100755 diff --git a/for_new_sovran_pros/psp.sh b/for_new_sovran_pros/psp.sh old mode 100644 new mode 100755 diff --git a/for_new_sovran_pros/sdpsp.sh b/for_new_sovran_pros/sdpsp.sh old mode 100644 new mode 100755 diff --git a/for_new_sovran_pros/sp.sh b/for_new_sovran_pros/sp.sh old mode 100644 new mode 100755 diff --git a/modules/Sovran_SystemsOS_File_Fixes_And_New_Services.nix b/modules/Sovran_SystemsOS_File_Fixes_And_New_Services.nix old mode 100644 new mode 100755 diff --git a/modules/bitcoinecosystem.nix b/modules/bitcoinecosystem.nix old mode 100644 new mode 100755 diff --git a/modules/coturn.nix b/modules/coturn.nix old mode 100644 new mode 100755 diff --git a/modules/modules.nix b/modules/modules.nix old mode 100644 new mode 100755 diff --git a/modules/personalization.nix b/modules/personalization.nix old mode 100644 new mode 100755 diff --git a/modules/synapse.nix b/modules/synapse.nix old mode 100644 new mode 100755 diff --git a/modules/vaultwarden.nix b/modules/vaultwarden.nix old mode 100644 new mode 100755 diff --git a/sovran_systems.png b/sovran_systems.png old mode 100644 new mode 100755 From c99413569b3f15ae15324b6ee469cf8460d019ba Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Tue, 16 Jan 2024 12:24:02 -0800 Subject: [PATCH 276/667] Update Nix Bitcoin and Nixpkgs --- flake.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index b40bfb8..3945955 100755 --- a/flake.lock +++ b/flake.lock @@ -51,11 +51,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1701680307, - "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", + "lastModified": 1705309234, + "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", "owner": "numtide", "repo": "flake-utils", - "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", + "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", "type": "github" }, "original": { @@ -93,11 +93,11 @@ "nixpkgs-unstable": "nixpkgs-unstable" }, "locked": { - "lastModified": 1702564002, - "narHash": "sha256-AJfaPpDc7gzaD4nEIdDCN5BMA0gwJbNzaSRj4o00Tko=", + "lastModified": 1705407061, + "narHash": "sha256-ekw6ufQ924Fv7VtpSVL3OzhnMCMcejLTfZA//qDMKjk=", "owner": "fort-nix", "repo": "nix-bitcoin", - "rev": "a2e1478a7cedffe1bf08988764f32f579ae69e5f", + "rev": "4e5c5dfe9bdc05ba4b4d79dfa766a182ded0a3d3", "type": "github" }, "original": { @@ -125,11 +125,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1701336116, - "narHash": "sha256-kEmpezCR/FpITc6yMbAh4WrOCiT2zg5pSjnKrq51h5Y=", + "lastModified": 1705242415, + "narHash": "sha256-a8DRYrNrzTudvO7XHUPNJD89Wbf1ZZT0VbwCsPnHWaE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f5c27c6136db4d76c30e533c20517df6864c46ee", + "rev": "ea780f3de2d169f982564128804841500e85e373", "type": "github" }, "original": { @@ -141,11 +141,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1702233072, - "narHash": "sha256-H5G2wgbim2Ku6G6w+NSaQaauv6B6DlPhY9fMvArKqRo=", + "lastModified": 1705183652, + "narHash": "sha256-rnfkyUH0x72oHfiSDhuCHDHg3gFgF+lF8zkkg5Zihsw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "781e2a9797ecf0f146e81425c822dca69fe4a348", + "rev": "428544ae95eec077c7f823b422afae5f174dee4b", "type": "github" }, "original": { @@ -157,11 +157,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1705133751, - "narHash": "sha256-rCIsyE80jgiOU78gCWN3A0wE0tR2GI5nH6MlS+HaaSQ=", + "lastModified": 1705316053, + "narHash": "sha256-J2Ey5mPFT8gdfL2XC0JTZvKaBw/b2pnyudEXFvl+dQM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9b19f5e77dd906cb52dade0b7bd280339d2a1f3d", + "rev": "c3e128f3c0ecc1fb04aef9f72b3dcc2f6cecf370", "type": "github" }, "original": { From 72b0cd3b53d824781cb910dadbd5975db2d69c16 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Wed, 17 Jan 2024 13:58:45 -0800 Subject: [PATCH 277/667] Added Mempool service --- configuration.nix | 1 - modules/bitcoinecosystem.nix | 4 ++++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/configuration.nix b/configuration.nix index 50609f1..f108921 100755 --- a/configuration.nix +++ b/configuration.nix @@ -304,7 +304,6 @@ in services.mysql = { enable = true; - package = pkgs.mariadb; }; diff --git a/modules/bitcoinecosystem.nix b/modules/bitcoinecosystem.nix index d66536f..99e6ec6 100755 --- a/modules/bitcoinecosystem.nix +++ b/modules/bitcoinecosystem.nix @@ -72,6 +72,10 @@ }; }; + services.mempool.enable = true; + + nix-bitcoin.onionServices.mempool-frontend.enable = true; + nix-bitcoin.onionServices.lnd.public = true; services.lnd.lndconnect = { From 318e0126d5c927bc45a156c2e29b51a82d24df7a Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Wed, 17 Jan 2024 21:04:59 -0800 Subject: [PATCH 278/667] updated sp script --- for_new_sovran_pros/sp.sh | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/for_new_sovran_pros/sp.sh b/for_new_sovran_pros/sp.sh index aef03e3..c0b7e03 100755 --- a/for_new_sovran_pros/sp.sh +++ b/for_new_sovran_pros/sp.sh @@ -352,12 +352,12 @@ pushd /home/free/Pictures wget https://git.sovransystems.com/Sovran_Systems/Sovran_SystemsOS/raw/branch/main/for_new_sovran_pros/Wallpaper_Dark_Wide.png - chown free:users /home/free -R - - chmod 770 /home/free -R - popd +chown free:users /home/free -R + +chmod 700 /home/free -R + # pushd /home/free/Downloads @@ -422,7 +422,9 @@ echo "free:a" | chpasswd -c SHA512 # -chmod 700 /home/free/.ssh -R +chown free:users /home/free -R + +chmod 700 /home/free -R # From 23771a4700f3d5482c4f9035fd9aa99f3f7b1031 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Thu, 18 Jan 2024 06:54:31 -0800 Subject: [PATCH 279/667] update nixpkgs --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 3945955..18e55bd 100755 --- a/flake.lock +++ b/flake.lock @@ -157,11 +157,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1705316053, - "narHash": "sha256-J2Ey5mPFT8gdfL2XC0JTZvKaBw/b2pnyudEXFvl+dQM=", + "lastModified": 1705496572, + "narHash": "sha256-rPIe9G5EBLXdBdn9ilGc0nq082lzQd0xGGe092R/5QE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c3e128f3c0ecc1fb04aef9f72b3dcc2f6cecf370", + "rev": "842d9d80cfd4560648c785f8a4e6f3b096790e19", "type": "github" }, "original": { From f056a66d9868c646a575e62fd799ae8e9eb53e21 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Fri, 26 Jan 2024 21:15:31 -0800 Subject: [PATCH 280/667] Nixpkgs Update; Added 16GB SWAP; Added systmed bitcoin fix --- flake.lock | 6 +++--- for_new_sovran_pros/psp.sh | 28 ++++++++++++++++------------ modules/bitcoinecosystem.nix | 2 ++ 3 files changed, 21 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index 18e55bd..8fc69b5 100755 --- a/flake.lock +++ b/flake.lock @@ -157,11 +157,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1705496572, - "narHash": "sha256-rPIe9G5EBLXdBdn9ilGc0nq082lzQd0xGGe092R/5QE=", + "lastModified": 1706191920, + "narHash": "sha256-eLihrZAPZX0R6RyM5fYAWeKVNuQPYjAkCUBr+JNvtdE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "842d9d80cfd4560648c785f8a4e6f3b096790e19", + "rev": "ae5c332cbb5827f6b1f02572496b141021de335f", "type": "github" }, "original": { diff --git a/for_new_sovran_pros/psp.sh b/for_new_sovran_pros/psp.sh index 67322c0..6988c78 100755 --- a/for_new_sovran_pros/psp.sh +++ b/for_new_sovran_pros/psp.sh @@ -8,20 +8,27 @@ ENDCOLOR="\e[0m" lsblk -echo -e "${GREEN}What block for Root drive (usually sda)?${ENDCOLOR}";read commitroot +echo -e "${GREEN}What block for file-tree-root of drive (usually nvme0n1)?${ENDCOLOR}";read commitroot parted /dev/"$commitroot" -- mklabel gpt -parted /dev/"$commitroot" -- mkpart primary 512MB -7MB +parted /dev/"$commitroot" -- mkpart primary 512MB -16GB +parted /dev/"$commitroot" -- mkpart swap linux-swap -16GB 100% parted /dev/"$commitroot" -- mkpart ESP fat32 1MB 512MB -parted /dev/"$commitroot" -- set 2 esp on +parted /dev/"$commitroot" -- set 3 esp on lsblk -echo -e "${GREEN}What partition for Root drive (usually sda1)?${ENDCOLOR}";read commitrootpartition +echo -e "${GREEN}What partition for Boot-Partition (usually nvme0n1p1)?${ENDCOLOR}";read commitbootpartition -echo -e "${GREEN}What partition for Boot drive (usually sda2)?${ENDCOLOR}";read commitbootpartition +echo -e "${GREEN}What partition for Main-Partition (usually nvme0n1p2)?${ENDCOLOR}";read commitmainpartition -mkfs.ext4 -L nixos /dev/"$commitrootpartition" +echo -e "${GREEN}What partition for Swap-Partition (usually nvme0n1p3)?${ENDCOLOR}";read commitswappartition + + + +mkfs.ext4 -L nixos /dev/"$commitmainpartition" + +mkswap -L swap /dev/"$commitswappartition" mkfs.fat -F 32 -n boot /dev/"$commitbootpartition" @@ -31,6 +38,8 @@ 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 @@ -48,12 +57,7 @@ cat <> /mnt/etc/nixos/configuration.nix boot.loader.efi.canTouchEfiVariables = true; boot.loader.efi.efiSysMountPoint = "/boot/efi"; - nix = { - package = pkgs.nixUnstable; - extraOptions = '' - experimental-features = nix-command flakes - ''; - }; + nix.settings.experimental-features = [ "nix-command" "flakes" ]; users.users = { free = { diff --git a/modules/bitcoinecosystem.nix b/modules/bitcoinecosystem.nix index 99e6ec6..f01fca0 100755 --- a/modules/bitcoinecosystem.nix +++ b/modules/bitcoinecosystem.nix @@ -15,6 +15,8 @@ ''; }; + systemd.services.bitcoind.wants = [ "network-online.target" ]; + nix-bitcoin.onionServices.bitcoind.enable = true; nix-bitcoin.onionServices.electrs.enable = true; nix-bitcoin.onionServices.rtl.enable = true; From 5f0309011c29cdeb5283b218d15e94e3db489720 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Fri, 26 Jan 2024 21:24:19 -0800 Subject: [PATCH 281/667] updated psp script --- for_new_sovran_pros/psp.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/for_new_sovran_pros/psp.sh b/for_new_sovran_pros/psp.sh index 6988c78..e519f70 100755 --- a/for_new_sovran_pros/psp.sh +++ b/for_new_sovran_pros/psp.sh @@ -46,15 +46,15 @@ rm /mnt/etc/nixos/configuration.nix cat <> /mnt/etc/nixos/configuration.nix { config, pkgs, ... }: { - - imports = [ + + imports = [ ./hardware-configuration.nix - - ]; + + ]; - boot.loader.systemd-boot.enable = true; - boot.loader.efi.canTouchEfiVariables = true; + boot.loader.systemd-boot.enable = true; + boot.loader.efi.canTouchEfiVariables = true; boot.loader.efi.efiSysMountPoint = "/boot/efi"; nix.settings.experimental-features = [ "nix-command" "flakes" ]; From cdaead36407af4894c0f2cc6edd93eeea09c54cc Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Sat, 27 Jan 2024 17:06:50 -0800 Subject: [PATCH 282/667] updated new sovran pro files --- for_new_sovran_pros/Sovran_SystemsOS-Desktop | 92 +++++++++++++++----- 1 file changed, 69 insertions(+), 23 deletions(-) mode change 100755 => 100644 for_new_sovran_pros/Sovran_SystemsOS-Desktop diff --git a/for_new_sovran_pros/Sovran_SystemsOS-Desktop b/for_new_sovran_pros/Sovran_SystemsOS-Desktop old mode 100755 new mode 100644 index 8d80f1c..4ad8396 --- a/for_new_sovran_pros/Sovran_SystemsOS-Desktop +++ b/for_new_sovran_pros/Sovran_SystemsOS-Desktop @@ -1,22 +1,28 @@ [com/ftpix/transparentbar] dark-full-screen=false +[org/gnome/Connections] +first-run=false + [org/gnome/Console] -font-scale=1.7000000000000006 -last-window-size=(954, 1037) +font-scale=1.3000000000000003 +last-window-size=(954, 516) [org/gnome/Geary] migrated-config=true -window-height=1037 +window-height=516 window-width=954 +[org/gnome/TextEditor] +last-save-directory='file:///home/free/Downloads' + [org/gnome/Totem] active-plugins=['mpris', 'vimeo', 'screenshot', 'movie-properties', 'autoload-subtitles', 'screensaver', 'apple-trailers', 'save-file', 'rotation', 'open-directory', 'recent', 'variable-rate', 'skipto'] subtitle-encoding='UTF-8' [org/gnome/baobab/ui] is-maximized=false -window-size=(954, 1037) +window-size=(1912, 1037) [org/gnome/calculator] accuracy=9 @@ -35,11 +41,11 @@ word-size=64 [org/gnome/calendar] active-view='month' window-maximized=false -window-size=(954, 1037) +window-size=(1912, 1037) [org/gnome/control-center] -last-panel='wifi' -window-state=(1912, 1037, true) +last-panel='network' +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', '1e62b69b-d9bb-4e80-be8d-5e9b4d777fc8'] @@ -54,11 +60,11 @@ name='Printing' translate=false [org/gnome/desktop/app-folders/folders/4acaa2d8-d284-4efd-bba3-40f150f1ace5] -apps=['org.gnome.DiskUtility.desktop', 'org.gnome.baobab.desktop', 'gparted.desktop'] +apps=['org.gnome.DiskUtility.desktop', 'org.gnome.baobab.desktop', 'gparted.desktop', 'gnome-system-monitor.desktop'] name='Utilities' [org/gnome/desktop/app-folders/folders/534e2716-83c7-4a2a-9678-8144999213ed] -apps=['org.gnome.Epiphany.desktop', 'librewolf.desktop', 'io.lbry.lbry-app.desktop'] +apps=['org.gnome.Epiphany.desktop', 'librewolf.desktop', 'io.lbry.lbry-app.desktop', 'bitwarden.desktop', 'com.nextcloud.desktopclient.nextcloud.desktop', 'brave-browser.desktop', 'chromium-browser.desktop'] name='Internet' [org/gnome/desktop/app-folders/folders/68c075b1-a254-4b7c-ba63-c45f88bc2a58] @@ -67,7 +73,7 @@ name='Customize Look' translate=false [org/gnome/desktop/app-folders/folders/7d66e46a-a135-4e42-91bb-d438e499d251] -apps=['org.gnome.Photos.desktop', 'org.gnome.Music.desktop', 'org.gnome.Totem.desktop', 'org.gnome.Cheese.desktop'] +apps=['org.gnome.Photos.desktop', 'org.gnome.Music.desktop', 'org.gnome.Totem.desktop', 'org.gnome.Cheese.desktop', 'org.gnome.Loupe.desktop', 'org.gnome.Snapshot.desktop'] name='Media' translate=false @@ -101,12 +107,17 @@ picture-uri-dark='file:///home/free/.local/share/backgrounds/2023-07-16-12-58-54 primary-color='#000000000000' secondary-color='#000000000000' +[org/gnome/desktop/calendar] +show-weekdate=false + [org/gnome/desktop/input-sources] sources=[('xkb', 'us')] xkb-options=['terminate:ctrl_alt_bksp'] [org/gnome/desktop/interface] clock-format='12h' +clock-show-seconds=false +clock-show-weekday=false color-scheme='prefer-dark' enable-animations=true font-antialiasing='rgba' @@ -116,9 +127,12 @@ 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', 'org-gnome-baobab', 'org-gnome-geary', 'sparrow-desktop'] +application-children=['gnome-power-panel', 'org-gnome-nautilus', 'org-gnome-software', 'gnome-network-panel', 'sparrow', 'org-gnome-settings', 'org-gnome-console', 'gnome-printers-panel', 'org-gnome-epiphany', 'com-obsproject-studio', 'io-github-seadve-kooha', 'xdg-desktop-portal-gnome', 'org-gnome-baobab', 'org-gnome-geary', 'sparrow-desktop', 'impress', 'brave-browser', 'org-gnome-connections'] show-in-lock-screen=false +[org/gnome/desktop/notifications/application/brave-browser] +application-id='brave-browser.desktop' + [org/gnome/desktop/notifications/application/com-obsproject-studio] application-id='com.obsproject.Studio.desktop' @@ -131,12 +145,18 @@ application-id='gnome-power-panel.desktop' [org/gnome/desktop/notifications/application/gnome-printers-panel] application-id='gnome-printers-panel.desktop' +[org/gnome/desktop/notifications/application/impress] +application-id='impress.desktop' + [org/gnome/desktop/notifications/application/io-github-seadve-kooha] application-id='io.github.seadve.Kooha.desktop' [org/gnome/desktop/notifications/application/org-gnome-baobab] application-id='org.gnome.baobab.desktop' +[org/gnome/desktop/notifications/application/org-gnome-connections] +application-id='org.gnome.Connections.desktop' + [org/gnome/desktop/notifications/application/org-gnome-console] application-id='org.gnome.Console.desktop' @@ -169,6 +189,7 @@ numlock-state=false [org/gnome/desktop/peripherals/mouse] natural-scroll=true +speed=-0.63779527559055116 [org/gnome/desktop/peripherals/touchpad] two-finger-scrolling-enabled=true @@ -260,9 +281,13 @@ search-filter-time-type='last_modified' search-view='list-view' [org/gnome/nautilus/window-state] -initial-size=(1912, 1037) +initial-size=(954, 1037) maximized=false +[org/gnome/nm-applet/eap/202ce1d2-7306-40ac-b3bb-5b092c0f9734] +ignore-ca-cert=false +ignore-phase2-ca-cert=false + [org/gnome/nm-applet/eap/2afa07ed-64ca-44a0-948e-d8f265fa52b0] ignore-ca-cert=false ignore-phase2-ca-cert=false @@ -275,19 +300,26 @@ ignore-phase2-ca-cert=false ignore-ca-cert=false ignore-phase2-ca-cert=false +[org/gnome/nm-applet/eap/e5e312d5-e2db-3928-8c98-8ec8a7cf61f2] +ignore-ca-cert=false +ignore-phase2-ca-cert=false + [org/gnome/settings-daemon/plugins/color] night-light-enabled=true -night-light-temperature=uint32 1700 +night-light-schedule-automatic=false +night-light-schedule-from=18.0 +night-light-temperature=uint32 1744 [org/gnome/settings-daemon/plugins/power] -power-button-action='interactive' +power-button-action='nothing' sleep-inactive-ac-type='nothing' [org/gnome/shell] -app-picker-layout=[{'org.gnome.Weather.desktop': <{'position': <0>}>, 'org.gnome.clocks.desktop': <{'position': <1>}>, 'org.gnome.Maps.desktop': <{'position': <2>}>, 'org.gnome.Calculator.desktop': <{'position': <3>}>, '68c075b1-a254-4b7c-ba63-c45f88bc2a58': <{'position': <4>}>, '3fea025e-f5e4-4905-9912-e70e38cd0419': <{'position': <5>}>, '83d8148a-1f0b-4f83-814a-11c33ab8debc': <{'position': <6>}>, 'Utilities': <{'position': <7>}>, 'd737daeb-6dbb-4a5d-9ec7-e674398539ce': <{'position': <8>}>, '7d66e46a-a135-4e42-91bb-d438e499d251': <{'position': <9>}>, '534e2716-83c7-4a2a-9678-8144999213ed': <{'position': <10>}>, '4acaa2d8-d284-4efd-bba3-40f150f1ace5': <{'position': <11>}>, 'bitwarden.desktop': <{'position': <12>}>, 'gnome-system-monitor.desktop': <{'position': <13>}>, 'Bisq-hidpi.desktop': <{'position': <14>}>, 'com.obsproject.Studio.desktop': <{'position': <15>}>, '1e62b69b-d9bb-4e80-be8d-5e9b4d777fc8': <{'position': <16>}>}] +app-picker-layout=[{'org.gnome.Weather.desktop': <{'position': <0>}>, 'org.gnome.clocks.desktop': <{'position': <1>}>, 'org.gnome.Maps.desktop': <{'position': <2>}>, 'org.gnome.Calculator.desktop': <{'position': <3>}>, '68c075b1-a254-4b7c-ba63-c45f88bc2a58': <{'position': <4>}>, '3fea025e-f5e4-4905-9912-e70e38cd0419': <{'position': <5>}>, '83d8148a-1f0b-4f83-814a-11c33ab8debc': <{'position': <6>}>, 'Utilities': <{'position': <7>}>, 'd737daeb-6dbb-4a5d-9ec7-e674398539ce': <{'position': <8>}>, '7d66e46a-a135-4e42-91bb-d438e499d251': <{'position': <9>}>, '534e2716-83c7-4a2a-9678-8144999213ed': <{'position': <10>}>, '4acaa2d8-d284-4efd-bba3-40f150f1ace5': <{'position': <11>}>, '1e62b69b-d9bb-4e80-be8d-5e9b4d777fc8': <{'position': <12>}>, 'Bisq-hidpi.desktop': <{'position': <13>}>, 'com.obsproject.Studio.desktop': <{'position': <14>}>}] +disable-user-extensions=false disabled-extensions=['transparent-top-bar@zhanghai.me'] -enabled-extensions=['appindicatorsupport@rgcjonas.gmail.com', 'dash-to-dock-cosmic-@halfmexicanhalfamazing@gmail.com', 'Vitals@CoreCoding.com', 'dash-to-dock@micxgx.gmail.com', 'transparent-top-bar@ftpix.com', 'just-perfection-desktop@just-perfection', 'pop-shell@system76.com', 'systemd-manager@hardpixel.eu', 'date-menu-formatter@marcinjakubowski.github.com'] -favorite-apps=['brave-browser.desktop', 'org.gnome.Nautilus.desktop', 'Sovran_SystemsOS_Updater.desktop', 'Sovran_SystemsOS_Reseter.desktop', 'org.gnome.Settings.desktop', 'org.gnome.Software.desktop', 'writer.desktop', 'calc.desktop', 'impress.desktop', 'org.gnome.Geary.desktop', 'org.gnome.Contacts.desktop', 'org.gnome.Calendar.desktop', 'Bisq.desktop', 'sparrow-desktop.desktop'] +enabled-extensions=['appindicatorsupport@rgcjonas.gmail.com', 'dash-to-dock-cosmic-@halfmexicanhalfamazing@gmail.com', 'Vitals@CoreCoding.com', 'dash-to-dock@micxgx.gmail.com', 'transparent-top-bar@ftpix.com', 'just-perfection-desktop@just-perfection', 'pop-shell@system76.com', 'date-menu-formatter@marcinjakubowski.github.com', 'systemd-manager@hardpixel.eu', 'light-style@gnome-shell-extensions.gcampax.github.com'] +favorite-apps=['chromium-browser.desktop', 'org.gnome.Nautilus.desktop', 'Sovran_SystemsOS_Updater.desktop', 'org.gnome.Settings.desktop', 'org.gnome.Software.desktop', 'org.onlyoffice.desktopeditors.desktop', 'org.gnome.Geary.desktop', 'org.gnome.Contacts.desktop', 'org.gnome.Calendar.desktop', 'Bisq.desktop', 'sparrow-desktop.desktop'] last-selected-power-profile='performance' welcome-dialog-last-shown-version='42.3.1' @@ -322,12 +354,15 @@ apply-custom-theme=false background-color='rgb(0,0,0)' background-opacity=0.17000000000000001 custom-background-color=true -dash-max-icon-size=72 +dash-max-icon-size=63 dock-position='BOTTOM' -height-fraction=0.79000000000000004 +extend-height=false +height-fraction=0.89000000000000001 +icon-size-fixed=false intellihide-mode='ALL_WINDOWS' preferred-monitor=-2 preferred-monitor-by-connector='HDMI-1' +preview-size-scale=0.22 running-indicator-style='DASHES' show-mounts=false show-mounts-only-mounted=false @@ -336,7 +371,7 @@ transparency-mode='FIXED' [org/gnome/shell/extensions/date-menu-formatter] font-size=14 -pattern='EEEE MMM d h: mm aaa' +pattern='EEEE MMMM d h: mm aaa' [org/gnome/shell/extensions/just-perfection] accessibility-menu=false @@ -353,7 +388,7 @@ systemd=['{"name":"Bitcoind","service":"bitcoind.service","type":"system"}', '{" [org/gnome/shell/extensions/vitals] fixed-widths=false -hot-sensors=['_memory_usage_', '__network-tx_max__', '_processor_usage_', '_storage_free_', '__temperature_avg__'] +hot-sensors=['_memory_usage_', '__network-tx_max__', '_processor_usage_', '_storage_free_', '_temperature_processor_0_'] show-fan=false show-storage=true show-voltage=false @@ -366,9 +401,9 @@ locations=@av [] locations=@av [] [org/gnome/software] -check-timestamp=int64 1691673017 +check-timestamp=int64 1706366003 first-run=false -flatpak-purge-timestamp=int64 1691712556 +flatpak-purge-timestamp=int64 1706318646 online-updates-timestamp=int64 1675355639 update-notification-timestamp=int64 1666382024 @@ -398,7 +433,18 @@ window-size=(938, 374) [org/gtk/settings/file-chooser] clock-format='12h' +date-format='regular' +location-mode='path-bar' show-hidden=true +show-size-column=true +show-type-column=true +sidebar-width=165 +sort-column='modified' +sort-directories-first=false +sort-order='descending' +type-format='category' +window-position=(26, 23) +window-size=(1401, 998) [system/proxy] ignore-hosts=@as [] From 71f91e2c8c48f89be45c0e54215eaad8ce8731f5 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Sat, 27 Jan 2024 18:17:26 -0800 Subject: [PATCH 283/667] updated cron script --- configuration.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configuration.nix b/configuration.nix index f108921..f3a5799 100755 --- a/configuration.nix +++ b/configuration.nix @@ -360,8 +360,8 @@ backup /etc/nix-bitcoin-secrets/ localhost/ enable = true; systemCronJobs = [ "*/5 * * * * caddy /run/current-system/sw/bin/php -f /var/lib/www/nextcloud/cron.php" - "*/15 * * * * root /run/current-system/sw/bin/bash /var/lib/njalla/njalla.sh" - "*/15 * * * * root /run/current-system/sw/bin/bash /var/lib/external_ip/external_ip.sh" + "*/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" ]; }; From ba63b53f63d3301b7389c5b3f099e298fb56b70e Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Mon, 29 Jan 2024 13:14:16 -0800 Subject: [PATCH 284/667] removed 'www' and custom ACME from caddy and added secure boot feature --- configuration.nix | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/configuration.nix b/configuration.nix index f3a5799..b312e0e 100755 --- a/configuration.nix +++ b/configuration.nix @@ -53,6 +53,8 @@ in options = [ "nofail" ]; }; + fileSystems."/boot/efi".options = [ "umask=0077" "defaults" ]; + nix.settings.experimental-features = [ "nix-command" "flakes" ]; networking.hostName = "nixos"; # Define your hostname. @@ -216,7 +218,7 @@ in user = "caddy"; group = "root"; email = "${personalization.caddy_email_for_zerossl}"; - acmeCA = "https://acme.zerossl.com/v2/DV90"; + virtualHosts = { "${personalization.wordpress_url}" = { extraConfig = '' @@ -227,15 +229,6 @@ in ''; }; - "www.${personalization.wordpress_url}" = { - extraConfig = '' - encode gzip zstd - root * /var/lib/www/wordpress - php_fastcgi unix//run/phpfpm/mypool.sock - file_server browse - ''; - }; - "${personalization.nextcloud_url}" = { extraConfig = '' encode gzip zstd From 66e2684ea2287598c57531474359155af1dccc13 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Mon, 29 Jan 2024 13:18:45 -0800 Subject: [PATCH 285/667] updated presonalization.nix --- configuration.nix | 2 +- modules/personalization.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configuration.nix b/configuration.nix index b312e0e..e8b026e 100755 --- a/configuration.nix +++ b/configuration.nix @@ -217,7 +217,7 @@ in package = pkgs.caddy; user = "caddy"; group = "root"; - email = "${personalization.caddy_email_for_zerossl}"; + email = "${personalization.caddy_email_for_acme}"; virtualHosts = { "${personalization.wordpress_url}" = { diff --git a/modules/personalization.nix b/modules/personalization.nix index b1d237d..120c7ed 100755 --- a/modules/personalization.nix +++ b/modules/personalization.nix @@ -4,7 +4,7 @@ matrix_url = builtins.readFile /var/lib/domains/matrix; wordpress_url = builtins.readFile /var/lib/domains/wordpress; nextcloud_url = builtins.readFile /var/lib/domains/nextcloud; btcpayserver_url = builtins.readFile /var/lib/domains/btcpayserver; -caddy_email_for_zerossl = builtins.readFile /var/lib/domains/sslemail; +caddy_email_for_acme = builtins.readFile /var/lib/domains/sslemail; vaultwarden_url = builtins.readFile /var/lib/domains/vaultwarden; ## From ca8838d99e9ecd9430de26fb105a14557f0b76f1 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Wed, 31 Jan 2024 09:22:16 -0800 Subject: [PATCH 286/667] nixpkgs update --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 8fc69b5..03dbc89 100755 --- a/flake.lock +++ b/flake.lock @@ -157,11 +157,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1706191920, - "narHash": "sha256-eLihrZAPZX0R6RyM5fYAWeKVNuQPYjAkCUBr+JNvtdE=", + "lastModified": 1706550542, + "narHash": "sha256-UcsnCG6wx++23yeER4Hg18CXWbgNpqNXcHIo5/1Y+hc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ae5c332cbb5827f6b1f02572496b141021de335f", + "rev": "97b17f32362e475016f942bbdfda4a4a72a8a652", "type": "github" }, "original": { From c5287aa4a00f1a553a8caa618c2637c5717c0f0a Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Thu, 1 Feb 2024 21:21:17 -0800 Subject: [PATCH 287/667] updated readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 9619d5d..ee82056 100755 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ A Nix Flake Implementation Thanks to all the NixOS creators and developers for creating what is the future of computing. -https://www.sovransystems.com +https://sovransystems.com Connect on Matrix here: https://matrix.to/#/#sovran-systems:anarchyislove.xyz From 0b717d34b207e43f8379a080ca6eb028adabdc15 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Thu, 1 Feb 2024 22:17:38 -0800 Subject: [PATCH 288/667] updated DIY install guide --- .../How To Install Sovran_SystemsOS.md | 120 ++++++++---------- for_new_sovran_pros/sp.sh | 12 +- 2 files changed, 62 insertions(+), 70 deletions(-) diff --git a/for_new_sovran_pros/How To Install Sovran_SystemsOS.md b/for_new_sovran_pros/How To Install Sovran_SystemsOS.md index 5457f29..b7ca2b8 100755 --- a/for_new_sovran_pros/How To Install Sovran_SystemsOS.md +++ b/for_new_sovran_pros/How To Install Sovran_SystemsOS.md @@ -1,6 +1,6 @@ -# Sovran Systems does not offer any support of a DIY install of Sovran_SystemsOS. You are on your own. You can reach out to others in the matrix room https://matrix.to/#/#DIY_Sovran_SystemsOS:anarchyislove.xyz. Good Luck! +# Sovran Systems offers little support of a DIY install of Sovran_SystemsOS. You can reach out to others in the matrix room https://matrix.to/#/#DIY_Sovran_SystemsOS:anarchyislove.xyz. Good Luck! -# These instructions will change over time due to new software development and Sovran Systems creator finding more efficient ways to install Sovran_SystemsOS. 10-27-2023 +# These instructions will change over time due to new software development and Sovran Systems creator finding more efficient ways to install Sovran_SystemsOS. 2-1-2024 # Also, to fully complete the install, the Bitcoin blockchain will have to download. This could take up to 3 weeks. @@ -19,9 +19,9 @@ - Second internal drive to store the Bitcoin blockchain and the automatic backups (SSD or NVME 2TB or larger) - Also, the Second internal drive needs to be be installed FIRST into an USB enclosure. If the second drive is SSD, you need a SSD USB enclosure. If the second drive is NVME, you need a NVME USB enclosure. The USB enclosure will be plugged into the first Linux machine. -5. Working Internet connection for both machines -6. Personalized Domain names already purchased from Njal.la. See the explanation here: https://sovransystems.com/how-to-setup/ -7. Your Router with ports open (Port Forwarding) to your second machine's internal IP address. This will usually be `192.168.1.(some number)` You will complete this at the end. +1. Working Internet connection for both machines +2. Personalized Domain names already purchased from Njal.la. See the explanation here: https://sovransystems.com/how-to-setup/ +3. Your Router with ports open (Port Forwarding) to your second machine's internal IP address. This will usually be `192.168.1.(some number)` You will complete this at the end. - Port 80 - Port 443 @@ -43,7 +43,7 @@ wget https://git.sovransystems.com/Sovran_Systems/Sovran_SystemsOS/raw/branch/ma then press enter. 5. Now, type `bash sdpsp.sh` then press enter. -6. Then the screen will ask for "what block..." which will be the drive in the list that is not mounted,which will be the second internal drive you just plugged in. It might be labeled `sda`, `sdb`, `sdc`, or if it is a NVME it will be `nvme0n1`, or `nvme0n2`. +6. Then the screen will ask for "what block..." which will be the drive in the list that is not mounted,which will be the drive you just plugged in. It might be labeled `sda`, `sdb`, `sdc`, or if it is a NVME it will be `nvme0n1`, or `nvme0n2` etc. 7. Then the screen will ask for "what partition...,"which will be whatever you typed into the first prompt, but with a "1" on it. For example `sda1`, `sdb1`, `sdc1`, or `nvme0n1p1` or `nvme0n2p1`. 8. Since the script is made to copy the blockchain from another Sovran Pro that already has the full blockchain installed it will throw an error. However, it should complete the setup just fine. 9. Once complete, remove the second drive from the USB enclosure and install it into your second machine in which you are installing Sovran_SystemsOS. @@ -52,9 +52,9 @@ then press enter. ### Procedure One - Installing base NixOS - 1. On the first machine download the latest NixOS minimal (64-bit Intel/AMD) image from here: https://nixos.org/download + 1. On the first machine download the latest NixOS minimal (64-bit Intel/AMD) image from here: https://nixos.org/download 2. Burn that ISO image onto the USB thumb drive. - 3. Insert the newly created USB thumb drive with the ISO image burned onto it into the second machine. + 3. Insert the newly created USB thumb drive with the ISO image burned onto it into the second machine (the one you are installing Sovran_SystemsOS). 4. Reboot the second machine while the USB thumb drive is inserted and boot into the USB thumb drive. This may require you to press the F7 or F12 key at boot. (Also, make sure the second machine has "safe boot" turned off in the UEFI[BIOS]). 5. Proceed with the NixOS boot menu 6. Once at the command prompt type in `sudo su` to move to the root user @@ -62,26 +62,27 @@ then press enter. 8. Type in `ip a` to get your internal IP address. It will usually be `192.1681.1.(somenumber)` make a note of this IP as you will need it later. 9. Now, that you are logged in as the root user type in or copy and paste: - ``` + ```bash curl https://git.sovransystems.com/Sovran_Systems/Sovran_SystemsOS/raw/branch/main/for_new_sovran_pros/psp.sh -o psp.sh ``` - the command to install the base NixOS and press enter. + the command to install the base NixOS and press enter. 10. Now, type `bash psp.sh` then press enter. -11. The script will ask for name of first main internal drive. Type that in and hit enter. It usually will be `nvme0n1` if it is an NVME drive. If it is a SSD it will be `sda` or `sdb` or `sdc` etc. Basically, it will be the drive without any data and it will not be mounted per the list on the screen. -12. Then the script will ask for the 'root' partition. Type it in and press enter. It will be the LARGER partition and usually named `nvme0n1p1` if it is an NVME drive or `sda1` if it is an SSD. -13. Then it will ask for the 'boot' partition. Type it in and press enter. It will be the SMALLER partition usually named `nvme0n1p2` or `sda2`. -14. The script will finish installing the base NixOS. At the end it will ask for a root password. Type `a` and press enter and type `a` again to confirm and press enter. -15. Remove the USB thumb drive from the second machine. -16. The machine will reboot into a very basic install of NixOS command prompt. +11. The script will ask for name of first main internal drive. Type that in and hit enter. It usually will be `nvme0n1` if it is an NVME drive. Basically, it will be the drive without any data and it will not be mounted per the list on the screen. +12. Then the script will ask for the 'root' partition. Type it in and press enter. It will be the LARGER partition and usually named `nvme0n1p1` if it is an NVME drive. +13. Then it will ask for the 'boot' partition. Type it in and press enter. It will be the SMALLER partition usually named `nvme0n1p2`. +14. Then it will ask for the 'swap' partition. Type it in and press enter. It will be the drive that is close to 16GB partition usually named `nvme0n1p3`. +15. The script will finish installing the base NixOS. At the end it will ask for a root password. Type `a` and press enter and type `a` again to confirm and press enter. +16. Remove the USB thumb drive from the second machine. +17. The machine will reboot into a very basic install of NixOS command prompt. ### Procedure Two - Installing Sovran_SystemsOS -1. Now at the basic install of NixOS from step 16, type `root` to log into root and type the password `a` when asked then press enter. +1. Now at the basic install of NixOS from step 17, type `root` to log into root and type the password `a` when asked then press enter. 2. Now you are logged in as `root`. 3. Now type in or copy and paste: - ``` + ```bash wget https://git.sovransystems.com/Sovran_Systems/Sovran_SystemsOS/raw/branch/main/for_new_sovran_pros/sp.sh ``` @@ -102,17 +103,23 @@ then press enter. ### Putting the External IP of your Sovran Pro into your new domain names you just bought at [njal.la](https://njal.la) 1. Log into your [njal.la](https://njal.la) account -2. Make a A record for each subdomain and add your Sovran Pro's external IP address to each subdomain. +2. Make a "dynamic" record for each subdomain and copy the `curl` commands after each sub-domain. +3. Paste `curl` command from njal.la website into `/var/lib/njalla/njalla.sh` . + For example: + + ```bash + curl "https://njal.la/update/?h=test.testsovransystems.com&k=8n7vk3afj-jkyg37&a=${IP}" + ``` + ##### Make sure `&a=${IP}` is replaced by `&auto` at the end of each `curl` command. ### Setting the Desktop 1. Open the Terminal app and type in: `dconf load / < /home/free/Downloads/Sovran_SystemsOS-Desktop`. Do NOT log in as root. ### Setting Up Nextcloud and Wordpress - #### Nextcloud -1. Open a web browser and navigate to your domain name you bought from [njal.la](https://njal.la) for example "cloud.myfreedomsite.com" you attributed to your Nextcloud instance. +1. Open a web browser and navigate to your domain name you bought from [njal.la](https://njal.la) for example "cloud.myfreedomsite.com" you attributed to your Nextcloud instance. 2. Nextcloud will as you to set up a new account to be used as a log in. Do so. 3. Nextcloud will also ask you where you want the data directory. Type in `/var/lib/nextcloud/data` 4. Nextcloud will ask you to connect the database: @@ -120,28 +127,22 @@ then press enter. 2. Database username is `ncusr` 3. Database name is `nextclouddb` 4. Database password is found by doing this: - 1. Open the Terminal app and type in or copy and paste: + 1. Open the Terminal app and type in or copy and paste: - ``` - ssh -i /home/free/.ssh/factory_login root@[one of your domain names] - ``` + ```bash + ssh root@localhost + ``` - Remove the brackets when actually executed the command, for example: + It will as you for a password which is `gosovransystems` as this is the default temporary password from Sovran Systems. - ``` - ssh -i /home/free/.ssh/factory_login root@myfreedomsite.com - ``` + Now you will be logged in as root. + 2. Now open the Terminal app and type: - It will as you for a password which is `gosovransystems` as this is the default temporary password from Sovran Systems. + `cat /var/lib/secrets/nextclouddb` - Now you will be logged in as root. - 2. Now open the Terminal app and type: - - `cat /var/lib/secrets/nextclouddb` - - and press enter. - 3. Your database password will be displayed in the Terminal window. - 4. Type that into the password field + and press enter. + 3. Your database password will be displayed in the Terminal window. + 4. Type that into the password field 5. Now, press install and Nextcloud will be installed. It will take a few minutes. Follow the on screen prompts. #### Wordpress @@ -151,21 +152,16 @@ then press enter. 1. Database username is `wpusr` 2. Database name is `wordpressdb` 3. Database password is found by doing this: - 1. Open the Terminal app and type in or copy and paste: + 1. Open the Terminal app and type in or copy and paste: - ``` - ssh -i /home/free/.ssh/factory_login root@[one of your domain names] - ``` - - Remove the brackets when actually executed the command, for example: - - ``` - ssh -i /home/free/.ssh/factory_login root@myfreedomsite.com + ```bash + ssh root@localhost ``` It will as you for a password which is `gosovransystems` as this is the default temporary password from Sovran Systems. Now you will be logged in as root. + 2. Now open the Terminal app and type: `cat /var/lib/secrets/wordpressdb` @@ -177,36 +173,32 @@ then press enter. ### Final Install for Coturn and Nextcloud -1. Open the Terminal app and type in or copy and paste: +1. Open the Terminal app and type in or copy and paste: - ``` - ssh -i /home/free/.ssh/factory_login root@[one of your domain names] + ```bash + ssh root@localhost ``` - Remove the brackets when actually executed the command, for example: - - ``` - ssh -i /home/free/.ssh/factory_login root@myfreedomsite.com - ``` 2. It will as you for a password which is `gosovransystems` as this is the default temporary password from Sovran Systems. -3. Now you will be logged in as root. + 3. Now you will be logged in as root. 4. Now open the Terminal app and type or copy and paste: -``` -sed -i '$e cat /var/lib/nextcloudaddition/nextcloudaddition' /var/lib/www/nextcloud/config/config.php + ```bash + sed -i '$e cat /var/lib/nextcloudaddition/nextcloudaddition' /var/lib/www/nextcloud/config/config.php -chown caddy:php /var/lib/www -R + chown caddy:php /var/lib/www -R -chmod 770 /var/lib/www -R -``` + chmod 700 /var/lib/www -R + ``` and press enter. -5. Now type or copy and paste: +1. Now type or copy and paste: +```bash +set DOMAIN $(cat /var/lib/domains/matrix) && cp -n /var/lib/caddy/.local/share/caddy/certificates/acme.-v02.api.letsencrypt.org-directory/{$DOMAIN}/{$DOMAIN}.crt /var/lib/coturn/{$DOMAIN}.crt.pem && cp -n /var/lib/caddy/.local/share/caddy/certificates/acme.-v02.api.letsencrypt.org-directory/{$DOMAIN}/{$DOMAIN}.key /var/lib/coturn/{$DOMAIN}.key.pem && chown turnserver:turnserver /var/lib/coturn -R && chmod 770 /var/lib/coturn -R && systemctl restart coturn ``` -set DOMAIN $(cat /var/lib/domains/matrix) && cp -n /var/lib/caddy/.local/share/caddy/certificates/acme.zerossl.com-v2-dv90/{$DOMAIN}/{$DOMAIN}.crt /var/lib/coturn/{$DOMAIN}.crt.pem && cp -n /var/lib/caddy/.local/share/caddy/certificates/acme.zerossl.com-v2-dv90/{$DOMAIN}/{$DOMAIN}.key /var/lib/coturn/{$DOMAIN}.key.pem && chown turnserver:turnserver /var/lib/coturn -R && chmod 770 /var/lib/coturn -R && systemctl restart coturn -``` + and press enter. ### Everything now will be installed regarding Sovran_SystemsOS. The remaining setup will be only for the frontend user account creations for BTCpayserver, Vaultwarden, connecting the node to Sparrow wallet and Bisq. diff --git a/for_new_sovran_pros/sp.sh b/for_new_sovran_pros/sp.sh index c0b7e03..5cc2218 100755 --- a/for_new_sovran_pros/sp.sh +++ b/for_new_sovran_pros/sp.sh @@ -412,10 +412,6 @@ popd # -sudo -u free flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo - -# - echo "root:$(cat /var/lib/secrets/main)" | chpasswd -c SHA512 echo "free:a" | chpasswd -c SHA512 @@ -428,6 +424,10 @@ chmod 700 /home/free -R # -echo -e "${LIGHTBLUE}One last thing, you need to put the Njalla DDNS info from Njalla into njalla.sh.${ENDCOLOR} \n" +sudo -u free flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo -echo -e "${GREEN}All Finished! Please Reboot then Enjoy your New Sovran Pro!${ENDCOLOR} \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 From 4f10c3ef96159709cc0f428018c41f061b2c1c59 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Thu, 1 Feb 2024 22:23:07 -0800 Subject: [PATCH 289/667] updated DIY install guide --- for_new_sovran_pros/How To Install Sovran_SystemsOS.md | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/for_new_sovran_pros/How To Install Sovran_SystemsOS.md b/for_new_sovran_pros/How To Install Sovran_SystemsOS.md index b7ca2b8..525651e 100755 --- a/for_new_sovran_pros/How To Install Sovran_SystemsOS.md +++ b/for_new_sovran_pros/How To Install Sovran_SystemsOS.md @@ -104,9 +104,8 @@ then press enter. 1. Log into your [njal.la](https://njal.la) account 2. Make a "dynamic" record for each subdomain and copy the `curl` commands after each sub-domain. -3. Paste `curl` command from njal.la website into `/var/lib/njalla/njalla.sh` . - For example: - +3. Paste `curl` command from njal.la website into `/var/lib/njalla/njalla.sh` . For example: + ```bash curl "https://njal.la/update/?h=test.testsovransystems.com&k=8n7vk3afj-jkyg37&a=${IP}" ``` From 2eada54f720d5d4984daa0a1527d0d9a6fd24181 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Thu, 1 Feb 2024 22:26:35 -0800 Subject: [PATCH 290/667] Updated DIY Install --- for_new_sovran_pros/How To Install Sovran_SystemsOS.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/for_new_sovran_pros/How To Install Sovran_SystemsOS.md b/for_new_sovran_pros/How To Install Sovran_SystemsOS.md index 525651e..0b98f0f 100755 --- a/for_new_sovran_pros/How To Install Sovran_SystemsOS.md +++ b/for_new_sovran_pros/How To Install Sovran_SystemsOS.md @@ -179,7 +179,7 @@ then press enter. ``` 2. It will as you for a password which is `gosovransystems` as this is the default temporary password from Sovran Systems. - 3. Now you will be logged in as root. +3. Now you will be logged in as root. 4. Now open the Terminal app and type or copy and paste: ```bash @@ -192,7 +192,7 @@ then press enter. and press enter. -1. Now type or copy and paste: +5. Now type or copy and paste: ```bash set DOMAIN $(cat /var/lib/domains/matrix) && cp -n /var/lib/caddy/.local/share/caddy/certificates/acme.-v02.api.letsencrypt.org-directory/{$DOMAIN}/{$DOMAIN}.crt /var/lib/coturn/{$DOMAIN}.crt.pem && cp -n /var/lib/caddy/.local/share/caddy/certificates/acme.-v02.api.letsencrypt.org-directory/{$DOMAIN}/{$DOMAIN}.key /var/lib/coturn/{$DOMAIN}.key.pem && chown turnserver:turnserver /var/lib/coturn -R && chmod 770 /var/lib/coturn -R && systemctl restart coturn From eca69a2fbbe07126f1677991eb7ecb4f96b0ac55 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Thu, 1 Feb 2024 22:31:36 -0800 Subject: [PATCH 291/667] updated DIY install guide --- for_new_sovran_pros/How To Install Sovran_SystemsOS.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/for_new_sovran_pros/How To Install Sovran_SystemsOS.md b/for_new_sovran_pros/How To Install Sovran_SystemsOS.md index 0b98f0f..faf02ae 100755 --- a/for_new_sovran_pros/How To Install Sovran_SystemsOS.md +++ b/for_new_sovran_pros/How To Install Sovran_SystemsOS.md @@ -200,6 +200,6 @@ set DOMAIN $(cat /var/lib/domains/matrix) && cp -n /var/lib/caddy/.local/share/c and press enter. -### Everything now will be installed regarding Sovran_SystemsOS. The remaining setup will be only for the frontend user account creations for BTCpayserver, Vaultwarden, connecting the node to Sparrow wallet and Bisq. +### Everything now will be installed regarding Sovran_SystemsOS. The remaining setup will be only for the front-end user account creations for BTCpayserver, Vaultwarden, connecting the node to Sparrow wallet and Bisq. ### Congratulations! 🎉 \ No newline at end of file From 34ec63b03372d6ff55dc614e802de5e20c92133e Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Sun, 4 Feb 2024 08:48:27 -0800 Subject: [PATCH 292/667] Nixpkgs Update --- flake.lock | 6 ++-- .../How To Install Sovran_SystemsOS.md | 30 +++++++++---------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index 03dbc89..00b175e 100755 --- a/flake.lock +++ b/flake.lock @@ -157,11 +157,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1706550542, - "narHash": "sha256-UcsnCG6wx++23yeER4Hg18CXWbgNpqNXcHIo5/1Y+hc=", + "lastModified": 1706913249, + "narHash": "sha256-x3M7iV++CsvRXI1fpyFPduGELUckZEhSv0XWnUopAG8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "97b17f32362e475016f942bbdfda4a4a72a8a652", + "rev": "e92b6015881907e698782c77641aa49298330223", "type": "github" }, "original": { diff --git a/for_new_sovran_pros/How To Install Sovran_SystemsOS.md b/for_new_sovran_pros/How To Install Sovran_SystemsOS.md index faf02ae..15fe6ef 100755 --- a/for_new_sovran_pros/How To Install Sovran_SystemsOS.md +++ b/for_new_sovran_pros/How To Install Sovran_SystemsOS.md @@ -42,11 +42,11 @@ wget https://git.sovransystems.com/Sovran_Systems/Sovran_SystemsOS/raw/branch/ma then press enter. -5. Now, type `bash sdpsp.sh` then press enter. -6. Then the screen will ask for "what block..." which will be the drive in the list that is not mounted,which will be the drive you just plugged in. It might be labeled `sda`, `sdb`, `sdc`, or if it is a NVME it will be `nvme0n1`, or `nvme0n2` etc. -7. Then the screen will ask for "what partition...,"which will be whatever you typed into the first prompt, but with a "1" on it. For example `sda1`, `sdb1`, `sdc1`, or `nvme0n1p1` or `nvme0n2p1`. -8. Since the script is made to copy the blockchain from another Sovran Pro that already has the full blockchain installed it will throw an error. However, it should complete the setup just fine. -9. Once complete, remove the second drive from the USB enclosure and install it into your second machine in which you are installing Sovran_SystemsOS. +1. Now, type `bash sdpsp.sh` then press enter. +2. Then the screen will ask for "what block..." which will be the drive in the list that is not mounted,which will be the drive you just plugged in. It might be labeled `sda`, `sdb`, `sdc`, or if it is a NVME it will be `nvme0n1`, or `nvme0n2` etc. +3. Then the screen will ask for "what partition...,"which will be whatever you typed into the first prompt, but with a "1" on it. For example `sda1`, `sdb1`, `sdc1`, or `nvme0n1p1` or `nvme0n2p1`. +4. Since the script is made to copy the blockchain from another Sovran Pro that already has the full blockchain installed it will throw an error. However, it should complete the setup just fine. +5. Once complete, remove the second drive from the USB enclosure and install it into your second machine in which you are installing Sovran_SystemsOS. ## Preparing the First Main Internal Drive @@ -104,18 +104,20 @@ then press enter. 1. Log into your [njal.la](https://njal.la) account 2. Make a "dynamic" record for each subdomain and copy the `curl` commands after each sub-domain. -3. Paste `curl` command from njal.la website into `/var/lib/njalla/njalla.sh` . For example: +3. Paste `curl` command from njal.la website into `/var/lib/njalla/njalla.sh` . For example: - ```bash - curl "https://njal.la/update/?h=test.testsovransystems.com&k=8n7vk3afj-jkyg37&a=${IP}" - ``` - ##### Make sure `&a=${IP}` is replaced by `&auto` at the end of each `curl` command. + ```bash + curl "https://njal.la/update/?h=test.testsovransystems.com&k=8n7vk3afj-jkyg37&a=${IP}" + ``` + + ##### Make sure `&a=${IP}` is replaced by `&auto` at the end of each `curl` command. ### Setting the Desktop 1. Open the Terminal app and type in: `dconf load / < /home/free/Downloads/Sovran_SystemsOS-Desktop`. Do NOT log in as root. ### Setting Up Nextcloud and Wordpress + #### Nextcloud 1. Open a web browser and navigate to your domain name you bought from [njal.la](https://njal.la) for example "cloud.myfreedomsite.com" you attributed to your Nextcloud instance. @@ -160,7 +162,6 @@ then press enter. It will as you for a password which is `gosovransystems` as this is the default temporary password from Sovran Systems. Now you will be logged in as root. - 2. Now open the Terminal app and type: `cat /var/lib/secrets/wordpressdb` @@ -177,22 +178,21 @@ then press enter. ```bash ssh root@localhost ``` - 2. It will as you for a password which is `gosovransystems` as this is the default temporary password from Sovran Systems. 3. Now you will be logged in as root. 4. Now open the Terminal app and type or copy and paste: ```bash sed -i '$e cat /var/lib/nextcloudaddition/nextcloudaddition' /var/lib/www/nextcloud/config/config.php - + chown caddy:php /var/lib/www -R - + chmod 700 /var/lib/www -R ``` and press enter. -5. Now type or copy and paste: +1. Now type or copy and paste: ```bash set DOMAIN $(cat /var/lib/domains/matrix) && cp -n /var/lib/caddy/.local/share/caddy/certificates/acme.-v02.api.letsencrypt.org-directory/{$DOMAIN}/{$DOMAIN}.crt /var/lib/coturn/{$DOMAIN}.crt.pem && cp -n /var/lib/caddy/.local/share/caddy/certificates/acme.-v02.api.letsencrypt.org-directory/{$DOMAIN}/{$DOMAIN}.key /var/lib/coturn/{$DOMAIN}.key.pem && chown turnserver:turnserver /var/lib/coturn -R && chmod 770 /var/lib/coturn -R && systemctl restart coturn From a22eabd6d1192afff0e8e990cf06d14f2c8460b0 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Mon, 5 Feb 2024 18:44:40 -0800 Subject: [PATCH 293/667] added backup to 5 days instead of 7 --- configuration.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configuration.nix b/configuration.nix index e8b026e..ba9e6ae 100755 --- a/configuration.nix +++ b/configuration.nix @@ -334,8 +334,8 @@ in enable = true; extraConfig = '' snapshot_root /run/media/Second_Drive/BTCEcoandBackup/NixOS_Snapshot_Backup -retain hourly 7 -retain daily 7 +retain hourly 5 +retain daily 5 backup /home/ localhost/ backup /var/lib/ localhost/ backup /etc/nixos/ localhost/ From e5676f71f791f1ee54ee7b712f5e9cb291e28cd3 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Mon, 12 Feb 2024 16:41:51 -0800 Subject: [PATCH 294/667] Nixpkgs update plus Nix Bitcoin update --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 00b175e..133d3ca 100755 --- a/flake.lock +++ b/flake.lock @@ -93,11 +93,11 @@ "nixpkgs-unstable": "nixpkgs-unstable" }, "locked": { - "lastModified": 1705407061, - "narHash": "sha256-ekw6ufQ924Fv7VtpSVL3OzhnMCMcejLTfZA//qDMKjk=", + "lastModified": 1707766590, + "narHash": "sha256-5PagOo7cUs2EAPTs94UoSGl44X8xchtUKsB+4flmZGs=", "owner": "fort-nix", "repo": "nix-bitcoin", - "rev": "4e5c5dfe9bdc05ba4b4d79dfa766a182ded0a3d3", + "rev": "dea9c6364dad1c000cc1f389b6dccde8c1a9c8a4", "type": "github" }, "original": { @@ -125,11 +125,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1705242415, - "narHash": "sha256-a8DRYrNrzTudvO7XHUPNJD89Wbf1ZZT0VbwCsPnHWaE=", + "lastModified": 1707451808, + "narHash": "sha256-UwDBUNHNRsYKFJzyTMVMTF5qS4xeJlWoeyJf+6vvamU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ea780f3de2d169f982564128804841500e85e373", + "rev": "442d407992384ed9c0e6d352de75b69079904e4e", "type": "github" }, "original": { @@ -141,11 +141,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1705183652, - "narHash": "sha256-rnfkyUH0x72oHfiSDhuCHDHg3gFgF+lF8zkkg5Zihsw=", + "lastModified": 1707347730, + "narHash": "sha256-0etC/exQIaqC9vliKhc3eZE2Mm2wgLa0tj93ZF/egvM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "428544ae95eec077c7f823b422afae5f174dee4b", + "rev": "6832d0d99649db3d65a0e15fa51471537b2c56a6", "type": "github" }, "original": { @@ -157,11 +157,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1706913249, - "narHash": "sha256-x3M7iV++CsvRXI1fpyFPduGELUckZEhSv0XWnUopAG8=", + "lastModified": 1707546158, + "narHash": "sha256-nYYJTpzfPMDxI8mzhQsYjIUX+grorqjKEU9Np6Xwy/0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e92b6015881907e698782c77641aa49298330223", + "rev": "d934204a0f8d9198e1e4515dd6fec76a139c87f0", "type": "github" }, "original": { From 33db732317d023682219f790b4d63ef5f9aeca66 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Mon, 12 Feb 2024 18:26:38 -0800 Subject: [PATCH 295/667] Nixpkgs update --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 133d3ca..2d70129 100755 --- a/flake.lock +++ b/flake.lock @@ -157,11 +157,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1707546158, - "narHash": "sha256-nYYJTpzfPMDxI8mzhQsYjIUX+grorqjKEU9Np6Xwy/0=", + "lastModified": 1707689078, + "narHash": "sha256-UUGmRa84ZJHpGZ1WZEBEUOzaPOWG8LZ0yPg1pdDF/yM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d934204a0f8d9198e1e4515dd6fec76a139c87f0", + "rev": "f9d39fb9aff0efee4a3d5f4a6d7c17701d38a1d8", "type": "github" }, "original": { From dbe0e9cde0ecbc556ee0203b49d9338254c0e504 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Fri, 16 Feb 2024 18:15:00 -0800 Subject: [PATCH 296/667] nixpkgs update --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 2d70129..50c965f 100755 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1703433843, - "narHash": "sha256-nmtA4KqFboWxxoOAA6Y1okHbZh+HsXaMPFkYHsoDRDw=", + "lastModified": 1707830867, + "narHash": "sha256-PAdwm5QqdlwIqGrfzzvzZubM+FXtilekQ/FA0cI49/o=", "owner": "ryantm", "repo": "agenix", - "rev": "417caa847f9383e111d1397039c9d4337d024bf0", + "rev": "8cb01a0e717311680e0cbca06a76cbceba6f3ed6", "type": "github" }, "original": { @@ -157,11 +157,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1707689078, - "narHash": "sha256-UUGmRa84ZJHpGZ1WZEBEUOzaPOWG8LZ0yPg1pdDF/yM=", + "lastModified": 1707956935, + "narHash": "sha256-ZL2TrjVsiFNKOYwYQozpbvQSwvtV/3Me7Zwhmdsfyu4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f9d39fb9aff0efee4a3d5f4a6d7c17701d38a1d8", + "rev": "a4d4fe8c5002202493e87ec8dbc91335ff55552c", "type": "github" }, "original": { From dac359af798abee84287593406e7eddccc92fe19 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Mon, 19 Feb 2024 08:23:31 -0800 Subject: [PATCH 297/667] added fix for nextcloud 28.0.2 --- ...n_SystemsOS_File_Fixes_And_New_Services.sh | 9 +++ .../nextcloud_maintenance_window_fix.sh | 62 +++++++++++++++++++ 2 files changed, 71 insertions(+) create mode 100644 file_fixes_and_new_services/nextcloud_maintenance_window_fix.sh diff --git a/file_fixes_and_new_services/Sovran_SystemsOS_File_Fixes_And_New_Services.sh b/file_fixes_and_new_services/Sovran_SystemsOS_File_Fixes_And_New_Services.sh index 61b42cc..c6ac7b9 100755 --- a/file_fixes_and_new_services/Sovran_SystemsOS_File_Fixes_And_New_Services.sh +++ b/file_fixes_and_new_services/Sovran_SystemsOS_File_Fixes_And_New_Services.sh @@ -32,6 +32,15 @@ rm -rf /home/free/Downloads/add-custom-nix.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 + + #### REMOVAL OF MAIN SCRIPT #### rm -rf /home/free/Downloads/Sovran_SystemsOS_File_Fixes_And_New_Services.sh \ No newline at end of file diff --git a/file_fixes_and_new_services/nextcloud_maintenance_window_fix.sh b/file_fixes_and_new_services/nextcloud_maintenance_window_fix.sh new file mode 100644 index 0000000..2f52041 --- /dev/null +++ b/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 #### + +sudo -u caddy 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 \ No newline at end of file From 436b4a2fe36e831c7d8c7a37e860363c65fc2067 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Mon, 19 Feb 2024 08:43:01 -0800 Subject: [PATCH 298/667] updated fix for nextcloud 28.0.2 --- file_fixes_and_new_services/nextcloud_maintenance_window_fix.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/file_fixes_and_new_services/nextcloud_maintenance_window_fix.sh b/file_fixes_and_new_services/nextcloud_maintenance_window_fix.sh index 2f52041..e471251 100644 --- a/file_fixes_and_new_services/nextcloud_maintenance_window_fix.sh +++ b/file_fixes_and_new_services/nextcloud_maintenance_window_fix.sh @@ -34,7 +34,7 @@ FILE=/var/lib/beacons/file_fixes_and_new_services/nextcloud_maintenance_window_f #### MAIN SCRIPT #### -sudo -u caddy php /var/lib/www/nextcloud/occ config:system:set maintenance_window_start --type=integer --value=1 +/run/wrappers/bin/sudo -u caddy php /var/lib/www/nextcloud/occ config:system:set maintenance_window_start --type=integer --value=1 if [[ $? != 0 ]]; then From f57cd2bc515772440bf9ee11d19007a84f089bc0 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Mon, 19 Feb 2024 08:48:11 -0800 Subject: [PATCH 299/667] updated again fix for nextcloud 28.0.2 --- file_fixes_and_new_services/nextcloud_maintenance_window_fix.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/file_fixes_and_new_services/nextcloud_maintenance_window_fix.sh b/file_fixes_and_new_services/nextcloud_maintenance_window_fix.sh index e471251..28be712 100644 --- a/file_fixes_and_new_services/nextcloud_maintenance_window_fix.sh +++ b/file_fixes_and_new_services/nextcloud_maintenance_window_fix.sh @@ -34,7 +34,7 @@ FILE=/var/lib/beacons/file_fixes_and_new_services/nextcloud_maintenance_window_f #### MAIN SCRIPT #### -/run/wrappers/bin/sudo -u caddy php /var/lib/www/nextcloud/occ config:system:set maintenance_window_start --type=integer --value=1 +/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 From a948664e5f38e3d792d11eca29c2374e9a6d5ef4 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Mon, 19 Feb 2024 09:44:46 -0800 Subject: [PATCH 300/667] updated bitcoin nix file --- modules/bitcoinecosystem.nix | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/modules/bitcoinecosystem.nix b/modules/bitcoinecosystem.nix index f01fca0..ec07e19 100755 --- a/modules/bitcoinecosystem.nix +++ b/modules/bitcoinecosystem.nix @@ -27,27 +27,6 @@ tor.proxy = true; }; - services.lnd.macaroons.btcpayserver.permissions = lib.mkForce '' - {"entity":"address","action":"write"}, - {"entity":"info","action":"read"}, - {"entity":"info","action":"write"}, - {"entity":"invoices","action":"read"}, - {"entity":"invoices","action":"write"}, - {"entity":"macaroon","action":"generate"}, - {"entity":"macaroon","action":"read"}, - {"entity":"macaroon","action":"write"}, - {"entity":"message","action":"read"}, - {"entity":"message","action":"write"}, - {"entity":"offchain","action":"read"}, - {"entity":"offchain","action":"write"}, - {"entity":"onchain","action":"read"}, - {"entity":"onchain","action":"write"}, - {"entity":"peers","action":"read"}, - {"entity":"peers","action":"write"}, - {"entity":"signer","action":"generate"}, - {"entity":"signer","action":"read"} - ''; - services.lightning-loop = { enable = true; tor.enforce = true; From 02dcedf3e5699fc14dd464db746d7ac387331a76 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Thu, 22 Feb 2024 21:02:53 -0800 Subject: [PATCH 301/667] Nixpkgs Update --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 50c965f..56ddbcf 100755 --- a/flake.lock +++ b/flake.lock @@ -157,11 +157,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1707956935, - "narHash": "sha256-ZL2TrjVsiFNKOYwYQozpbvQSwvtV/3Me7Zwhmdsfyu4=", + "lastModified": 1708475490, + "narHash": "sha256-g1v0TsWBQPX97ziznfJdWhgMyMGtoBFs102xSYO4syU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a4d4fe8c5002202493e87ec8dbc91335ff55552c", + "rev": "0e74ca98a74bc7270d28838369593635a5db3260", "type": "github" }, "original": { From 8c4d2ee70ac4cd1cbd2544d4f1d0d0219d14e416 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Tue, 27 Feb 2024 14:10:48 -0800 Subject: [PATCH 302/667] Updated Nixpkgs --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 56ddbcf..8b3a02f 100755 --- a/flake.lock +++ b/flake.lock @@ -157,11 +157,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1708475490, - "narHash": "sha256-g1v0TsWBQPX97ziznfJdWhgMyMGtoBFs102xSYO4syU=", + "lastModified": 1708984720, + "narHash": "sha256-gJctErLbXx4QZBBbGp78PxtOOzsDaQ+yw1ylNQBuSUY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0e74ca98a74bc7270d28838369593635a5db3260", + "rev": "13aff9b34cc32e59d35c62ac9356e4a41198a538", "type": "github" }, "original": { From 8722444f6b37daa204166ec0d0b687c4efe5d55a Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Fri, 1 Mar 2024 17:45:55 -0800 Subject: [PATCH 303/667] updated systemd-manager --- configuration.nix | 2 +- modules/modules.nix | 1 + modules/systemd-manager_sovran_systems.nix | 41 ++++++++++++++++++++++ 3 files changed, 43 insertions(+), 1 deletion(-) create mode 100755 modules/systemd-manager_sovran_systems.nix diff --git a/configuration.nix b/configuration.nix index ba9e6ae..f4d2261 100755 --- a/configuration.nix +++ b/configuration.nix @@ -134,6 +134,7 @@ in # List packages installed in system profile. To search, run: # $ nix search wget environment.systemPackages = with pkgs; [ + (callPackage ./modules/systemd-manager_sovran_systems.nix {}) git wget librewolf @@ -145,7 +146,6 @@ in gnomeExtensions.pop-shell gnomeExtensions.just-perfection gnomeExtensions.appindicator - gnomeExtensions.systemd-manager #gnomeExtensions.date-menu-formatter gnome.gnome-tweaks papirus-icon-theme diff --git a/modules/modules.nix b/modules/modules.nix index 0a56366..16f3bef 100755 --- a/modules/modules.nix +++ b/modules/modules.nix @@ -9,6 +9,7 @@ ./bitcoinecosystem.nix ./vaultwarden.nix ./Sovran_SystemsOS_File_Fixes_And_New_Services.nix + ./systemd-manager_sovran_systems.nix ]; } \ No newline at end of file diff --git a/modules/systemd-manager_sovran_systems.nix b/modules/systemd-manager_sovran_systems.nix new file mode 100755 index 0000000..c38c969 --- /dev/null +++ b/modules/systemd-manager_sovran_systems.nix @@ -0,0 +1,41 @@ +{ lib, stdenv, fetchzip, buildPackages }: + + stdenv.mkDerivation rec { + pname = "systemd-manager"; + version = "15"; + + src = fetchzip { + url = "https://github.com/hardpixel/systemd-manager/releases/download/v${version}/systemd-manager-v${version}.zip"; + hash = "sha256-IIiHvntAnaEJIiofNDOQXDKeJupyEMys32N8Qz1IfXk="; + stripRoot = false; + }; + + passthru = { + extensionUuid = "systemd-manager@hardpixel.eu"; + extensionPortalSlug = "systemd-manager"; + }; + + nativeBuildInputs = [ buildPackages.glib ]; + + buildPhase = '' + runHook preBuild + if [ -d schemas ]; then + glib-compile-schemas --strict schemas + fi + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + mkdir -p $out/share/gnome-shell/extensions + cp -r -T . $out/share/gnome-shell/extensions/${passthru.extensionUuid} + runHook postInstall + ''; + + meta = with lib; { + description = "GNOME Shell extension to manage systemd services"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ ]; + homepage = "https://github.com/hardpixel/systemd-manager"; + }; + } \ No newline at end of file From cd63cf17acd11ba9b9758876ca222c23d76aefbc Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Fri, 1 Mar 2024 17:53:42 -0800 Subject: [PATCH 304/667] updated systemd-manager tree structure --- modules/modules.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/modules.nix b/modules/modules.nix index 16f3bef..0a56366 100755 --- a/modules/modules.nix +++ b/modules/modules.nix @@ -9,7 +9,6 @@ ./bitcoinecosystem.nix ./vaultwarden.nix ./Sovran_SystemsOS_File_Fixes_And_New_Services.nix - ./systemd-manager_sovran_systems.nix ]; } \ No newline at end of file From 8785e371f8d9b899f59bcea6cac02e388b576c6b Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Fri, 1 Mar 2024 17:58:23 -0800 Subject: [PATCH 305/667] Updated Nixpkgs --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 8b3a02f..93d4948 100755 --- a/flake.lock +++ b/flake.lock @@ -157,11 +157,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1708984720, - "narHash": "sha256-gJctErLbXx4QZBBbGp78PxtOOzsDaQ+yw1ylNQBuSUY=", + "lastModified": 1709237383, + "narHash": "sha256-cy6ArO4k5qTx+l5o+0mL9f5fa86tYUX3ozE1S+Txlds=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "13aff9b34cc32e59d35c62ac9356e4a41198a538", + "rev": "1536926ef5621b09bba54035ae2bb6d806d72ac8", "type": "github" }, "original": { From 5c81354aa9c0bc07a5af9e9e7b830cc406a8aba5 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Fri, 1 Mar 2024 18:14:13 -0800 Subject: [PATCH 306/667] updated sparrow wallet --- configuration.nix | 2 +- modules/sparrow_sovran_systems.nix | 227 +++++++++++++++++++++++++++++ 2 files changed, 228 insertions(+), 1 deletion(-) create mode 100755 modules/sparrow_sovran_systems.nix diff --git a/configuration.nix b/configuration.nix index f4d2261..09ccb7f 100755 --- a/configuration.nix +++ b/configuration.nix @@ -135,6 +135,7 @@ in # $ nix search wget environment.systemPackages = with pkgs; [ (callPackage ./modules/systemd-manager_sovran_systems.nix {}) + (callPackage ./modules/sparrow_sovran_systems.nix {}) git wget librewolf @@ -150,7 +151,6 @@ in gnome.gnome-tweaks papirus-icon-theme ranger - sparrow bisq-desktop neofetch gedit diff --git a/modules/sparrow_sovran_systems.nix b/modules/sparrow_sovran_systems.nix new file mode 100755 index 0000000..cbab237 --- /dev/null +++ b/modules/sparrow_sovran_systems.nix @@ -0,0 +1,227 @@ +{ stdenv +, lib +, makeWrapper +, fetchurl +, makeDesktopItem +, copyDesktopItems +, autoPatchelfHook +, openjdk +, gtk3 +, gsettings-desktop-schemas +, writeScript +, bash +, gnugrep +, tor +, zlib +, openimajgrabber +, hwi +, imagemagick +, gzip +}: + +let + pname = "sparrow"; + version = "1.8.2"; + + src = fetchurl { + url = "https://github.com/sparrowwallet/${pname}/releases/download/${version}/${pname}-${version}-x86_64.tar.gz"; + sha256 = "1f9imi7154lkrfqyq2i8ygf5d0h46c5wgmv9q7f15cwajxpgidzz"; + }; + + launcher = writeScript "sparrow" '' + #! ${bash}/bin/bash + params=( + --module-path @out@/lib:@jdkModules@/modules + --add-opens javafx.graphics/com.sun.javafx.css=org.controlsfx.controls + --add-opens javafx.graphics/javafx.scene=org.controlsfx.controls + --add-opens javafx.controls/com.sun.javafx.scene.control.behavior=org.controlsfx.controls + --add-opens javafx.controls/com.sun.javafx.scene.control.inputmap=org.controlsfx.controls + --add-opens javafx.graphics/com.sun.javafx.scene.traversal=org.controlsfx.controls + --add-opens javafx.base/com.sun.javafx.event=org.controlsfx.controls + --add-opens javafx.controls/javafx.scene.control.cell=com.sparrowwallet.sparrow + --add-opens org.controlsfx.controls/impl.org.controlsfx.skin=com.sparrowwallet.sparrow + --add-opens org.controlsfx.controls/impl.org.controlsfx.skin=javafx.fxml + --add-opens javafx.graphics/com.sun.javafx.tk=centerdevice.nsmenufx + --add-opens javafx.graphics/com.sun.javafx.tk.quantum=centerdevice.nsmenufx + --add-opens javafx.graphics/com.sun.glass.ui=centerdevice.nsmenufx + --add-opens javafx.controls/com.sun.javafx.scene.control=centerdevice.nsmenufx + --add-opens javafx.graphics/com.sun.javafx.menu=centerdevice.nsmenufx + --add-opens javafx.graphics/com.sun.glass.ui=com.sparrowwallet.sparrow + --add-opens=javafx.graphics/javafx.scene.input=com.sparrowwallet.sparrow + --add-opens javafx.graphics/com.sun.javafx.application=com.sparrowwallet.sparrow + --add-opens java.base/java.net=com.sparrowwallet.sparrow + --add-opens java.base/java.io=com.google.gson + --add-opens=java.smartcardio/sun.security.smartcardio=com.sparrowwallet.sparrow + --add-reads com.sparrowwallet.merged.module=java.desktop + --add-reads com.sparrowwallet.merged.module=java.sql + --add-reads com.sparrowwallet.merged.module=com.sparrowwallet.sparrow + --add-reads com.sparrowwallet.merged.module=logback.classic + --add-reads com.sparrowwallet.merged.module=com.fasterxml.jackson.databind + --add-reads com.sparrowwallet.merged.module=com.fasterxml.jackson.annotation + --add-reads com.sparrowwallet.merged.module=com.fasterxml.jackson.core + --add-reads com.sparrowwallet.merged.module=co.nstant.in.cbor + -m com.sparrowwallet.sparrow + ) + + XDG_DATA_DIRS=${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS ${openjdk}/bin/java ''${params[@]} $@ + ''; + + torWrapper = writeScript "tor-wrapper" '' + #! ${bash}/bin/bash + + exec ${tor}/bin/tor "$@" + ''; + + jdk-modules = stdenv.mkDerivation { + name = "jdk-modules"; + nativeBuildInputs = [ openjdk ]; + dontUnpack = true; + + buildPhase = '' + # Extract the JDK's JIMAGE and generate a list of modules. + mkdir modules + pushd modules + jimage extract ${openjdk}/lib/openjdk/lib/modules + ls | xargs -d " " -- echo > ../manifest.txt + popd + ''; + + installPhase = '' + mkdir -p $out + cp manifest.txt $out/ + cp -r modules/ $out/ + ''; + }; + + sparrow-modules = stdenv.mkDerivation { + pname = "sparrow-modules"; + inherit version src; + nativeBuildInputs = [ makeWrapper gzip gnugrep openjdk autoPatchelfHook stdenv.cc.cc.lib zlib ]; + + buildPhase = '' + # Extract Sparrow's JIMAGE and generate a list of them. + mkdir modules + pushd modules + jimage extract ../lib/runtime/lib/modules + + # Delete JDK modules + cat ${jdk-modules}/manifest.txt | xargs -I {} -- rm -fR {} + + # Delete unneeded native libs. + + rm -fR com.sparrowwallet.merged.module/com/sun/jna/freebsd-x86-64 + rm -fR com.sparrowwallet.merged.module/com/sun/jna/freebsd-x86 + rm -fR com.sparrowwallet.merged.module/com/sun/jna/linux-aarch64 + rm -fR com.sparrowwallet.merged.module/com/sun/jna/linux-arm + rm -fR com.sparrowwallet.merged.module/com/sun/jna/linux-armel + rm -fR com.sparrowwallet.merged.module/com/sun/jna/linux-mips64el + rm -fR com.sparrowwallet.merged.module/com/sun/jna/linux-ppc + rm -fR com.sparrowwallet.merged.module/com/sun/jna/linux-ppc64le + rm -fR com.sparrowwallet.merged.module/com/sun/jna/linux-s390x + rm -fR com.sparrowwallet.merged.module/com/sun/jna/linux-x86 + rm -fR com.sparrowwallet.merged.module/com/sun/jna/openbsd-x86-64 + rm -fR com.sparrowwallet.merged.module/com/sun/jna/openbsd-x86 + rm -fR com.sparrowwallet.merged.module/com/sun/jna/sunos-sparc + rm -fR com.sparrowwallet.merged.module/com/sun/jna/sunos-sparcv9 + rm -fR com.sparrowwallet.merged.module/com/sun/jna/sunos-x86-64 + rm -fR com.sparrowwallet.merged.module/com/sun/jna/sunos-x86 + rm -fR com.github.sarxos.webcam.capture/com/github/sarxos/webcam/ds/buildin/lib/linux_armel + rm -fR com.github.sarxos.webcam.capture/com/github/sarxos/webcam/ds/buildin/lib/linux_armhf + rm -fR com.github.sarxos.webcam.capture/com/github/sarxos/webcam/ds/buildin/lib/linux_x86 + rm com.github.sarxos.webcam.capture/com/github/sarxos/webcam/ds/buildin/lib/linux_x64/OpenIMAJGrabber.so + rm -fR com.nativelibs4java.bridj/org/bridj/lib/linux_arm32_armel + rm -fR com.nativelibs4java.bridj/org/bridj/lib/linux_armel + rm -fR com.nativelibs4java.bridj/org/bridj/lib/linux_armhf + rm -fR com.nativelibs4java.bridj/org/bridj/lib/linux_x86 + rm -fR com.nativelibs4java.bridj/org/bridj/lib/sunos_x64 + rm -fR com.nativelibs4java.bridj/org/bridj/lib/sunos_x86 + rm -fR com.sparrowwallet.merged.module/linux-aarch64 + rm -fR com.sparrowwallet.merged.module/linux-arm + rm -fR com.sparrowwallet.merged.module/linux-x86 + rm com.sparrowwallet.sparrow/native/linux/x64/hwi + + ls | xargs -d " " -- echo > ../manifest.txt + find . | grep "\.so$" | xargs -- chmod ugo+x + popd + + # Replace the embedded Tor binary (which is in a Tar archive) + # with one from Nixpkgs. + gzip -c ${torWrapper} > tor.gz + cp tor.gz modules/kmp.tor.binary.linuxx64/kmptor/linux/x64/tor.gz + find modules + ''; + + installPhase = '' + mkdir -p $out + cp manifest.txt $out/ + cp -r modules/ $out/ + ln -s ${openimajgrabber}/lib/OpenIMAJGrabber.so $out/modules/com.github.sarxos.webcam.capture/com/github/sarxos/webcam/ds/buildin/lib/linux_x64/OpenIMAJGrabber.so + ln -s ${hwi}/bin/hwi $out/modules/com.sparrowwallet.sparrow/native/linux/x64/hwi + ''; + }; +in +stdenv.mkDerivation rec { + inherit version src; + pname = "sparrow-unwrapped"; + nativeBuildInputs = [ makeWrapper copyDesktopItems ]; + + desktopItems = [ + (makeDesktopItem { + name = "sparrow-desktop"; + exec = "sparrow-desktop"; + icon = "sparrow-desktop"; + desktopName = "Sparrow Bitcoin Wallet"; + genericName = "Bitcoin Wallet"; + categories = [ "Finance" "Network" ]; + mimeTypes = [ "application/psbt" "application/bitcoin-transaction" "x-scheme-handler/bitcoin" "x-scheme-handler/auth47" "x-scheme-handler/lightning" ]; + startupWMClass = "Sparrow"; + }) + ]; + + sparrow-icons = stdenv.mkDerivation { + inherit version src; + pname = "sparrow-icons"; + nativeBuildInputs = [ imagemagick ]; + + installPhase = '' + for n in 16 24 32 48 64 96 128 256; do + size=$n"x"$n + mkdir -p $out/hicolor/$size/apps + convert lib/Sparrow.png -resize $size $out/hicolor/$size/apps/sparrow-desktop.png + done; + ''; + }; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin $out + ln -s ${sparrow-modules}/modules $out/lib + install -D -m 777 ${launcher} $out/bin/sparrow-desktop + substituteAllInPlace $out/bin/sparrow-desktop + substituteInPlace $out/bin/sparrow-desktop --subst-var-by jdkModules ${jdk-modules} + + mkdir -p $out/share/icons + ln -s ${sparrow-icons}/hicolor $out/share/icons + + mkdir -p $out/etc/udev/rules.d + cp ${hwi}/lib/python*/site-packages/hwilib/udev/*.rules $out/etc/udev/rules.d + + runHook postInstall + ''; + + passthru.updateScript = ./update.sh; + + meta = with lib; { + description = "A modern desktop Bitcoin wallet application supporting most hardware wallets and built on common standards such as PSBT, with an emphasis on transparency and usability."; + homepage = "https://sparrowwallet.com"; + sourceProvenance = with sourceTypes; [ + binaryBytecode + binaryNativeCode + ]; + license = licenses.asl20; + maintainers = with maintainers; [ emmanuelrosa _1000101 ]; + platforms = [ "x86_64-linux" ]; + mainProgram = "sparrow-desktop"; + }; +} From d70b41c4044662369ca18d55e9bb578ff618468e Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Fri, 1 Mar 2024 18:17:59 -0800 Subject: [PATCH 307/667] updated sparrow wallet nix code --- modules/sparrow_sovran_systems.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/modules/sparrow_sovran_systems.nix b/modules/sparrow_sovran_systems.nix index cbab237..b38a504 100755 --- a/modules/sparrow_sovran_systems.nix +++ b/modules/sparrow_sovran_systems.nix @@ -210,8 +210,6 @@ stdenv.mkDerivation rec { runHook postInstall ''; - passthru.updateScript = ./update.sh; - meta = with lib; { description = "A modern desktop Bitcoin wallet application supporting most hardware wallets and built on common standards such as PSBT, with an emphasis on transparency and usability."; homepage = "https://sparrowwallet.com"; @@ -224,4 +222,4 @@ stdenv.mkDerivation rec { platforms = [ "x86_64-linux" ]; mainProgram = "sparrow-desktop"; }; -} +} \ No newline at end of file From 5babe5fdc2e1c4946e4f86c06ca86cf7351c0697 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Fri, 1 Mar 2024 18:19:37 -0800 Subject: [PATCH 308/667] updated sparrow wallet nix code again --- modules/sparrow_sovran_systems.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/sparrow_sovran_systems.nix b/modules/sparrow_sovran_systems.nix index b38a504..b70f479 100755 --- a/modules/sparrow_sovran_systems.nix +++ b/modules/sparrow_sovran_systems.nix @@ -222,4 +222,4 @@ stdenv.mkDerivation rec { platforms = [ "x86_64-linux" ]; mainProgram = "sparrow-desktop"; }; -} \ No newline at end of file +} From afdfe59958bb79929d6ea8ee3a9088529a8d1b0d Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Fri, 1 Mar 2024 18:26:44 -0800 Subject: [PATCH 309/667] Revert "Updated Nixpkgs" This reverts commit 8785e371f8d9b899f59bcea6cac02e388b576c6b. --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 93d4948..8b3a02f 100755 --- a/flake.lock +++ b/flake.lock @@ -157,11 +157,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1709237383, - "narHash": "sha256-cy6ArO4k5qTx+l5o+0mL9f5fa86tYUX3ozE1S+Txlds=", + "lastModified": 1708984720, + "narHash": "sha256-gJctErLbXx4QZBBbGp78PxtOOzsDaQ+yw1ylNQBuSUY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1536926ef5621b09bba54035ae2bb6d806d72ac8", + "rev": "13aff9b34cc32e59d35c62ac9356e4a41198a538", "type": "github" }, "original": { From d70d2b0e697b12d7c52308c26781fb74b8deb028 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Fri, 1 Mar 2024 18:30:43 -0800 Subject: [PATCH 310/667] removed attempted sparrow update --- configuration.nix | 1 - flake.lock | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/configuration.nix b/configuration.nix index 09ccb7f..b1f968b 100755 --- a/configuration.nix +++ b/configuration.nix @@ -135,7 +135,6 @@ in # $ nix search wget environment.systemPackages = with pkgs; [ (callPackage ./modules/systemd-manager_sovran_systems.nix {}) - (callPackage ./modules/sparrow_sovran_systems.nix {}) git wget librewolf diff --git a/flake.lock b/flake.lock index 8b3a02f..93d4948 100755 --- a/flake.lock +++ b/flake.lock @@ -157,11 +157,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1708984720, - "narHash": "sha256-gJctErLbXx4QZBBbGp78PxtOOzsDaQ+yw1ylNQBuSUY=", + "lastModified": 1709237383, + "narHash": "sha256-cy6ArO4k5qTx+l5o+0mL9f5fa86tYUX3ozE1S+Txlds=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "13aff9b34cc32e59d35c62ac9356e4a41198a538", + "rev": "1536926ef5621b09bba54035ae2bb6d806d72ac8", "type": "github" }, "original": { From 01bfbbfc54753ce07d2e10b05985b52e1092b6f7 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Fri, 1 Mar 2024 18:32:34 -0800 Subject: [PATCH 311/667] removed attempted sparrow update --- modules/sparrow_sovran_systems.nix | 225 ----------------------------- 1 file changed, 225 deletions(-) delete mode 100755 modules/sparrow_sovran_systems.nix diff --git a/modules/sparrow_sovran_systems.nix b/modules/sparrow_sovran_systems.nix deleted file mode 100755 index b70f479..0000000 --- a/modules/sparrow_sovran_systems.nix +++ /dev/null @@ -1,225 +0,0 @@ -{ stdenv -, lib -, makeWrapper -, fetchurl -, makeDesktopItem -, copyDesktopItems -, autoPatchelfHook -, openjdk -, gtk3 -, gsettings-desktop-schemas -, writeScript -, bash -, gnugrep -, tor -, zlib -, openimajgrabber -, hwi -, imagemagick -, gzip -}: - -let - pname = "sparrow"; - version = "1.8.2"; - - src = fetchurl { - url = "https://github.com/sparrowwallet/${pname}/releases/download/${version}/${pname}-${version}-x86_64.tar.gz"; - sha256 = "1f9imi7154lkrfqyq2i8ygf5d0h46c5wgmv9q7f15cwajxpgidzz"; - }; - - launcher = writeScript "sparrow" '' - #! ${bash}/bin/bash - params=( - --module-path @out@/lib:@jdkModules@/modules - --add-opens javafx.graphics/com.sun.javafx.css=org.controlsfx.controls - --add-opens javafx.graphics/javafx.scene=org.controlsfx.controls - --add-opens javafx.controls/com.sun.javafx.scene.control.behavior=org.controlsfx.controls - --add-opens javafx.controls/com.sun.javafx.scene.control.inputmap=org.controlsfx.controls - --add-opens javafx.graphics/com.sun.javafx.scene.traversal=org.controlsfx.controls - --add-opens javafx.base/com.sun.javafx.event=org.controlsfx.controls - --add-opens javafx.controls/javafx.scene.control.cell=com.sparrowwallet.sparrow - --add-opens org.controlsfx.controls/impl.org.controlsfx.skin=com.sparrowwallet.sparrow - --add-opens org.controlsfx.controls/impl.org.controlsfx.skin=javafx.fxml - --add-opens javafx.graphics/com.sun.javafx.tk=centerdevice.nsmenufx - --add-opens javafx.graphics/com.sun.javafx.tk.quantum=centerdevice.nsmenufx - --add-opens javafx.graphics/com.sun.glass.ui=centerdevice.nsmenufx - --add-opens javafx.controls/com.sun.javafx.scene.control=centerdevice.nsmenufx - --add-opens javafx.graphics/com.sun.javafx.menu=centerdevice.nsmenufx - --add-opens javafx.graphics/com.sun.glass.ui=com.sparrowwallet.sparrow - --add-opens=javafx.graphics/javafx.scene.input=com.sparrowwallet.sparrow - --add-opens javafx.graphics/com.sun.javafx.application=com.sparrowwallet.sparrow - --add-opens java.base/java.net=com.sparrowwallet.sparrow - --add-opens java.base/java.io=com.google.gson - --add-opens=java.smartcardio/sun.security.smartcardio=com.sparrowwallet.sparrow - --add-reads com.sparrowwallet.merged.module=java.desktop - --add-reads com.sparrowwallet.merged.module=java.sql - --add-reads com.sparrowwallet.merged.module=com.sparrowwallet.sparrow - --add-reads com.sparrowwallet.merged.module=logback.classic - --add-reads com.sparrowwallet.merged.module=com.fasterxml.jackson.databind - --add-reads com.sparrowwallet.merged.module=com.fasterxml.jackson.annotation - --add-reads com.sparrowwallet.merged.module=com.fasterxml.jackson.core - --add-reads com.sparrowwallet.merged.module=co.nstant.in.cbor - -m com.sparrowwallet.sparrow - ) - - XDG_DATA_DIRS=${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS ${openjdk}/bin/java ''${params[@]} $@ - ''; - - torWrapper = writeScript "tor-wrapper" '' - #! ${bash}/bin/bash - - exec ${tor}/bin/tor "$@" - ''; - - jdk-modules = stdenv.mkDerivation { - name = "jdk-modules"; - nativeBuildInputs = [ openjdk ]; - dontUnpack = true; - - buildPhase = '' - # Extract the JDK's JIMAGE and generate a list of modules. - mkdir modules - pushd modules - jimage extract ${openjdk}/lib/openjdk/lib/modules - ls | xargs -d " " -- echo > ../manifest.txt - popd - ''; - - installPhase = '' - mkdir -p $out - cp manifest.txt $out/ - cp -r modules/ $out/ - ''; - }; - - sparrow-modules = stdenv.mkDerivation { - pname = "sparrow-modules"; - inherit version src; - nativeBuildInputs = [ makeWrapper gzip gnugrep openjdk autoPatchelfHook stdenv.cc.cc.lib zlib ]; - - buildPhase = '' - # Extract Sparrow's JIMAGE and generate a list of them. - mkdir modules - pushd modules - jimage extract ../lib/runtime/lib/modules - - # Delete JDK modules - cat ${jdk-modules}/manifest.txt | xargs -I {} -- rm -fR {} - - # Delete unneeded native libs. - - rm -fR com.sparrowwallet.merged.module/com/sun/jna/freebsd-x86-64 - rm -fR com.sparrowwallet.merged.module/com/sun/jna/freebsd-x86 - rm -fR com.sparrowwallet.merged.module/com/sun/jna/linux-aarch64 - rm -fR com.sparrowwallet.merged.module/com/sun/jna/linux-arm - rm -fR com.sparrowwallet.merged.module/com/sun/jna/linux-armel - rm -fR com.sparrowwallet.merged.module/com/sun/jna/linux-mips64el - rm -fR com.sparrowwallet.merged.module/com/sun/jna/linux-ppc - rm -fR com.sparrowwallet.merged.module/com/sun/jna/linux-ppc64le - rm -fR com.sparrowwallet.merged.module/com/sun/jna/linux-s390x - rm -fR com.sparrowwallet.merged.module/com/sun/jna/linux-x86 - rm -fR com.sparrowwallet.merged.module/com/sun/jna/openbsd-x86-64 - rm -fR com.sparrowwallet.merged.module/com/sun/jna/openbsd-x86 - rm -fR com.sparrowwallet.merged.module/com/sun/jna/sunos-sparc - rm -fR com.sparrowwallet.merged.module/com/sun/jna/sunos-sparcv9 - rm -fR com.sparrowwallet.merged.module/com/sun/jna/sunos-x86-64 - rm -fR com.sparrowwallet.merged.module/com/sun/jna/sunos-x86 - rm -fR com.github.sarxos.webcam.capture/com/github/sarxos/webcam/ds/buildin/lib/linux_armel - rm -fR com.github.sarxos.webcam.capture/com/github/sarxos/webcam/ds/buildin/lib/linux_armhf - rm -fR com.github.sarxos.webcam.capture/com/github/sarxos/webcam/ds/buildin/lib/linux_x86 - rm com.github.sarxos.webcam.capture/com/github/sarxos/webcam/ds/buildin/lib/linux_x64/OpenIMAJGrabber.so - rm -fR com.nativelibs4java.bridj/org/bridj/lib/linux_arm32_armel - rm -fR com.nativelibs4java.bridj/org/bridj/lib/linux_armel - rm -fR com.nativelibs4java.bridj/org/bridj/lib/linux_armhf - rm -fR com.nativelibs4java.bridj/org/bridj/lib/linux_x86 - rm -fR com.nativelibs4java.bridj/org/bridj/lib/sunos_x64 - rm -fR com.nativelibs4java.bridj/org/bridj/lib/sunos_x86 - rm -fR com.sparrowwallet.merged.module/linux-aarch64 - rm -fR com.sparrowwallet.merged.module/linux-arm - rm -fR com.sparrowwallet.merged.module/linux-x86 - rm com.sparrowwallet.sparrow/native/linux/x64/hwi - - ls | xargs -d " " -- echo > ../manifest.txt - find . | grep "\.so$" | xargs -- chmod ugo+x - popd - - # Replace the embedded Tor binary (which is in a Tar archive) - # with one from Nixpkgs. - gzip -c ${torWrapper} > tor.gz - cp tor.gz modules/kmp.tor.binary.linuxx64/kmptor/linux/x64/tor.gz - find modules - ''; - - installPhase = '' - mkdir -p $out - cp manifest.txt $out/ - cp -r modules/ $out/ - ln -s ${openimajgrabber}/lib/OpenIMAJGrabber.so $out/modules/com.github.sarxos.webcam.capture/com/github/sarxos/webcam/ds/buildin/lib/linux_x64/OpenIMAJGrabber.so - ln -s ${hwi}/bin/hwi $out/modules/com.sparrowwallet.sparrow/native/linux/x64/hwi - ''; - }; -in -stdenv.mkDerivation rec { - inherit version src; - pname = "sparrow-unwrapped"; - nativeBuildInputs = [ makeWrapper copyDesktopItems ]; - - desktopItems = [ - (makeDesktopItem { - name = "sparrow-desktop"; - exec = "sparrow-desktop"; - icon = "sparrow-desktop"; - desktopName = "Sparrow Bitcoin Wallet"; - genericName = "Bitcoin Wallet"; - categories = [ "Finance" "Network" ]; - mimeTypes = [ "application/psbt" "application/bitcoin-transaction" "x-scheme-handler/bitcoin" "x-scheme-handler/auth47" "x-scheme-handler/lightning" ]; - startupWMClass = "Sparrow"; - }) - ]; - - sparrow-icons = stdenv.mkDerivation { - inherit version src; - pname = "sparrow-icons"; - nativeBuildInputs = [ imagemagick ]; - - installPhase = '' - for n in 16 24 32 48 64 96 128 256; do - size=$n"x"$n - mkdir -p $out/hicolor/$size/apps - convert lib/Sparrow.png -resize $size $out/hicolor/$size/apps/sparrow-desktop.png - done; - ''; - }; - - installPhase = '' - runHook preInstall - - mkdir -p $out/bin $out - ln -s ${sparrow-modules}/modules $out/lib - install -D -m 777 ${launcher} $out/bin/sparrow-desktop - substituteAllInPlace $out/bin/sparrow-desktop - substituteInPlace $out/bin/sparrow-desktop --subst-var-by jdkModules ${jdk-modules} - - mkdir -p $out/share/icons - ln -s ${sparrow-icons}/hicolor $out/share/icons - - mkdir -p $out/etc/udev/rules.d - cp ${hwi}/lib/python*/site-packages/hwilib/udev/*.rules $out/etc/udev/rules.d - - runHook postInstall - ''; - - meta = with lib; { - description = "A modern desktop Bitcoin wallet application supporting most hardware wallets and built on common standards such as PSBT, with an emphasis on transparency and usability."; - homepage = "https://sparrowwallet.com"; - sourceProvenance = with sourceTypes; [ - binaryBytecode - binaryNativeCode - ]; - license = licenses.asl20; - maintainers = with maintainers; [ emmanuelrosa _1000101 ]; - platforms = [ "x86_64-linux" ]; - mainProgram = "sparrow-desktop"; - }; -} From 0a59dad1cbcf27fbcb64e3d2bd92e1e5aaa50169 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Fri, 1 Mar 2024 18:36:55 -0800 Subject: [PATCH 312/667] added sparrow back --- configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/configuration.nix b/configuration.nix index b1f968b..f4d2261 100755 --- a/configuration.nix +++ b/configuration.nix @@ -150,6 +150,7 @@ in gnome.gnome-tweaks papirus-icon-theme ranger + sparrow bisq-desktop neofetch gedit From 36441cb261f6f35d6713189eccf18a569645b4e7 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Tue, 5 Mar 2024 10:14:15 -0800 Subject: [PATCH 313/667] Nix Bitcoin Update and Nixpkgs Update --- flake.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index 93d4948..fcc93cc 100755 --- a/flake.lock +++ b/flake.lock @@ -51,11 +51,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1705309234, - "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", + "lastModified": 1709126324, + "narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=", "owner": "numtide", "repo": "flake-utils", - "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", + "rev": "d465f4819400de7c8d874d50b982301f28a84605", "type": "github" }, "original": { @@ -93,11 +93,11 @@ "nixpkgs-unstable": "nixpkgs-unstable" }, "locked": { - "lastModified": 1707766590, - "narHash": "sha256-5PagOo7cUs2EAPTs94UoSGl44X8xchtUKsB+4flmZGs=", + "lastModified": 1709627108, + "narHash": "sha256-SlNuXat2lUO1O8HqDgpweTceSo4dZK8vhEhf8CWtgj8=", "owner": "fort-nix", "repo": "nix-bitcoin", - "rev": "dea9c6364dad1c000cc1f389b6dccde8c1a9c8a4", + "rev": "502c73d5146623b8cb431563a7c15629a310d9b1", "type": "github" }, "original": { @@ -125,11 +125,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1707451808, - "narHash": "sha256-UwDBUNHNRsYKFJzyTMVMTF5qS4xeJlWoeyJf+6vvamU=", + "lastModified": 1709386671, + "narHash": "sha256-VPqfBnIJ+cfa78pd4Y5Cr6sOWVW8GYHRVucxJGmRf8Q=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "442d407992384ed9c0e6d352de75b69079904e4e", + "rev": "fa9a51752f1b5de583ad5213eb621be071806663", "type": "github" }, "original": { @@ -141,11 +141,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1707347730, - "narHash": "sha256-0etC/exQIaqC9vliKhc3eZE2Mm2wgLa0tj93ZF/egvM=", + "lastModified": 1709309926, + "narHash": "sha256-VZFBtXGVD9LWTecGi6eXrE0hJ/mVB3zGUlHImUs2Qak=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6832d0d99649db3d65a0e15fa51471537b2c56a6", + "rev": "79baff8812a0d68e24a836df0a364c678089e2c7", "type": "github" }, "original": { @@ -157,11 +157,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1709237383, - "narHash": "sha256-cy6ArO4k5qTx+l5o+0mL9f5fa86tYUX3ozE1S+Txlds=", + "lastModified": 1709479366, + "narHash": "sha256-n6F0n8UV6lnTZbYPl1A9q1BS0p4hduAv1mGAP17CVd0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1536926ef5621b09bba54035ae2bb6d806d72ac8", + "rev": "b8697e57f10292a6165a20f03d2f42920dfaf973", "type": "github" }, "original": { From c4ad31fd0dcec8ebccd4a772b2bb6e054c407ae6 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Thu, 7 Mar 2024 22:26:56 -0800 Subject: [PATCH 314/667] Updated Nixpkgs --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index fcc93cc..08858a8 100755 --- a/flake.lock +++ b/flake.lock @@ -157,11 +157,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1709479366, - "narHash": "sha256-n6F0n8UV6lnTZbYPl1A9q1BS0p4hduAv1mGAP17CVd0=", + "lastModified": 1709703039, + "narHash": "sha256-6hqgQ8OK6gsMu1VtcGKBxKQInRLHtzulDo9Z5jxHEFY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b8697e57f10292a6165a20f03d2f42920dfaf973", + "rev": "9df3e30ce24fd28c7b3e2de0d986769db5d6225d", "type": "github" }, "original": { From fc54de905496eab91161e9d0bf48f59e4ef1e1e0 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Tue, 12 Mar 2024 03:13:09 -0700 Subject: [PATCH 315/667] Update Nixpkgs --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 08858a8..be6bf69 100755 --- a/flake.lock +++ b/flake.lock @@ -157,11 +157,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1709703039, - "narHash": "sha256-6hqgQ8OK6gsMu1VtcGKBxKQInRLHtzulDo9Z5jxHEFY=", + "lastModified": 1709961763, + "narHash": "sha256-6H95HGJHhEZtyYA3rIQpvamMKAGoa8Yh2rFV29QnuGw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9df3e30ce24fd28c7b3e2de0d986769db5d6225d", + "rev": "3030f185ba6a4bf4f18b87f345f104e6a6961f34", "type": "github" }, "original": { From 5d4b4a14ecc7261d666f0f42c408f283decf2102 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Wed, 13 Mar 2024 16:00:56 -0700 Subject: [PATCH 316/667] NixPkgs Update and added Sovran_SystemsOS_External_Backup app --- ...n_SystemsOS_File_Fixes_And_New_Services.sh | 9 +++ .../add_external_backup_app.sh | 66 +++++++++++++++++++ flake.lock | 6 +- 3 files changed, 78 insertions(+), 3 deletions(-) create mode 100644 file_fixes_and_new_services/add_external_backup_app.sh diff --git a/file_fixes_and_new_services/Sovran_SystemsOS_File_Fixes_And_New_Services.sh b/file_fixes_and_new_services/Sovran_SystemsOS_File_Fixes_And_New_Services.sh index c6ac7b9..079266f 100755 --- a/file_fixes_and_new_services/Sovran_SystemsOS_File_Fixes_And_New_Services.sh +++ b/file_fixes_and_new_services/Sovran_SystemsOS_File_Fixes_And_New_Services.sh @@ -41,6 +41,15 @@ rm -rf /home/free/Downloads/sovran-pro-flake-update2.sh rm -rf /home/free/Downloads/nextcloud_maintenance_window_fix.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/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 + + #### REMOVAL OF MAIN SCRIPT #### rm -rf /home/free/Downloads/Sovran_SystemsOS_File_Fixes_And_New_Services.sh \ No newline at end of file diff --git a/file_fixes_and_new_services/add_external_backup_app.sh b/file_fixes_and_new_services/add_external_backup_app.sh new file mode 100644 index 0000000..877505a --- /dev/null +++ b/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 \ No newline at end of file diff --git a/flake.lock b/flake.lock index be6bf69..7629671 100755 --- a/flake.lock +++ b/flake.lock @@ -157,11 +157,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1709961763, - "narHash": "sha256-6H95HGJHhEZtyYA3rIQpvamMKAGoa8Yh2rFV29QnuGw=", + "lastModified": 1710272261, + "narHash": "sha256-g0bDwXFmTE7uGDOs9HcJsfLFhH7fOsASbAuOzDC+fhQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3030f185ba6a4bf4f18b87f345f104e6a6961f34", + "rev": "0ad13a6833440b8e238947e47bea7f11071dc2b2", "type": "github" }, "original": { From 3ddc39eda0f1b9324acea547efd3614737306533 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Wed, 13 Mar 2024 17:25:27 -0700 Subject: [PATCH 317/667] removed external_backup app --- .../Sovran_SystemsOS_File_Fixes_And_New_Services.sh | 9 --------- 1 file changed, 9 deletions(-) diff --git a/file_fixes_and_new_services/Sovran_SystemsOS_File_Fixes_And_New_Services.sh b/file_fixes_and_new_services/Sovran_SystemsOS_File_Fixes_And_New_Services.sh index 079266f..c6ac7b9 100755 --- a/file_fixes_and_new_services/Sovran_SystemsOS_File_Fixes_And_New_Services.sh +++ b/file_fixes_and_new_services/Sovran_SystemsOS_File_Fixes_And_New_Services.sh @@ -41,15 +41,6 @@ rm -rf /home/free/Downloads/sovran-pro-flake-update2.sh rm -rf /home/free/Downloads/nextcloud_maintenance_window_fix.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/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 - - #### REMOVAL OF MAIN SCRIPT #### rm -rf /home/free/Downloads/Sovran_SystemsOS_File_Fixes_And_New_Services.sh \ No newline at end of file From 42649f030453a676b4eb2e429b99f43b4edbc036 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Fri, 15 Mar 2024 18:18:20 -0700 Subject: [PATCH 318/667] Nixpkgs Update --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 7629671..830308b 100755 --- a/flake.lock +++ b/flake.lock @@ -157,11 +157,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1710272261, - "narHash": "sha256-g0bDwXFmTE7uGDOs9HcJsfLFhH7fOsASbAuOzDC+fhQ=", + "lastModified": 1710451336, + "narHash": "sha256-pP86Pcfu3BrAvRO7R64x7hs+GaQrjFes+mEPowCfkxY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0ad13a6833440b8e238947e47bea7f11071dc2b2", + "rev": "d691274a972b3165335d261cc4671335f5c67de9", "type": "github" }, "original": { From 40efcde55e3e2ca6598c084fe245bb5ef78d94ea Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Sat, 16 Mar 2024 17:33:58 -0700 Subject: [PATCH 319/667] Updated Systemd-manager to version 16 --- modules/systemd-manager_sovran_systems.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/systemd-manager_sovran_systems.nix b/modules/systemd-manager_sovran_systems.nix index c38c969..792c15f 100755 --- a/modules/systemd-manager_sovran_systems.nix +++ b/modules/systemd-manager_sovran_systems.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "systemd-manager"; - version = "15"; + version = "16"; src = fetchzip { url = "https://github.com/hardpixel/systemd-manager/releases/download/v${version}/systemd-manager-v${version}.zip"; - hash = "sha256-IIiHvntAnaEJIiofNDOQXDKeJupyEMys32N8Qz1IfXk="; + hash = "sha256-mbo0kSLkFpT71f/E4AJ0rMFLVtsks7u9snc8maMib4U="; stripRoot = false; }; From bea404cb476c406017f5870aea748ea0ecb05d1e Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Mon, 18 Mar 2024 13:36:12 -0700 Subject: [PATCH 320/667] Nixpkgs Update --- flake.lock | 6 +- modules/systemd-manager_sovran_systems.nix | 66 +++++++++++----------- 2 files changed, 36 insertions(+), 36 deletions(-) diff --git a/flake.lock b/flake.lock index 830308b..48f34e9 100755 --- a/flake.lock +++ b/flake.lock @@ -157,11 +157,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1710451336, - "narHash": "sha256-pP86Pcfu3BrAvRO7R64x7hs+GaQrjFes+mEPowCfkxY=", + "lastModified": 1710631334, + "narHash": "sha256-rL5LSYd85kplL5othxK5lmAtjyMOBg390sGBTb3LRMM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d691274a972b3165335d261cc4671335f5c67de9", + "rev": "c75037bbf9093a2acb617804ee46320d6d1fea5a", "type": "github" }, "original": { diff --git a/modules/systemd-manager_sovran_systems.nix b/modules/systemd-manager_sovran_systems.nix index 792c15f..2fdb975 100755 --- a/modules/systemd-manager_sovran_systems.nix +++ b/modules/systemd-manager_sovran_systems.nix @@ -1,41 +1,41 @@ { lib, stdenv, fetchzip, buildPackages }: - stdenv.mkDerivation rec { - pname = "systemd-manager"; - version = "16"; +stdenv.mkDerivation rec { + pname = "systemd-manager"; + version = "16"; - src = fetchzip { - url = "https://github.com/hardpixel/systemd-manager/releases/download/v${version}/systemd-manager-v${version}.zip"; - hash = "sha256-mbo0kSLkFpT71f/E4AJ0rMFLVtsks7u9snc8maMib4U="; - stripRoot = false; - }; + src = fetchzip { + url = "https://github.com/hardpixel/systemd-manager/releases/download/v${version}/systemd-manager-v${version}.zip"; + hash = "sha256-mbo0kSLkFpT71f/E4AJ0rMFLVtsks7u9snc8maMib4U="; + stripRoot = false; + }; - passthru = { - extensionUuid = "systemd-manager@hardpixel.eu"; - extensionPortalSlug = "systemd-manager"; - }; + passthru = { + extensionUuid = "systemd-manager@hardpixel.eu"; + extensionPortalSlug = "systemd-manager"; + }; - nativeBuildInputs = [ buildPackages.glib ]; + nativeBuildInputs = [ buildPackages.glib ]; - buildPhase = '' - runHook preBuild - if [ -d schemas ]; then - glib-compile-schemas --strict schemas - fi - runHook postBuild - ''; + buildPhase = '' + runHook preBuild + if [ -d schemas ]; then + glib-compile-schemas --strict schemas + fi + runHook postBuild + ''; - installPhase = '' - runHook preInstall - mkdir -p $out/share/gnome-shell/extensions - cp -r -T . $out/share/gnome-shell/extensions/${passthru.extensionUuid} - runHook postInstall - ''; + installPhase = '' + runHook preInstall + mkdir -p $out/share/gnome-shell/extensions + cp -r -T . $out/share/gnome-shell/extensions/${passthru.extensionUuid} + runHook postInstall + ''; - meta = with lib; { - description = "GNOME Shell extension to manage systemd services"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ ]; - homepage = "https://github.com/hardpixel/systemd-manager"; - }; - } \ No newline at end of file + meta = with lib; { + description = "GNOME Shell extension to manage systemd services"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ ]; + homepage = "https://github.com/hardpixel/systemd-manager"; + }; +} \ No newline at end of file From dabafa61874476dc89c7c87ebee15a6566757aca Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Mon, 18 Mar 2024 22:36:43 -0700 Subject: [PATCH 321/667] Added Sovran_SystemsOS_External_Backup app --- .../Sovran_SystemsOS_File_Fixes_And_New_Services.sh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/file_fixes_and_new_services/Sovran_SystemsOS_File_Fixes_And_New_Services.sh b/file_fixes_and_new_services/Sovran_SystemsOS_File_Fixes_And_New_Services.sh index c6ac7b9..e6528cb 100755 --- a/file_fixes_and_new_services/Sovran_SystemsOS_File_Fixes_And_New_Services.sh +++ b/file_fixes_and_new_services/Sovran_SystemsOS_File_Fixes_And_New_Services.sh @@ -40,6 +40,14 @@ rm -rf /home/free/Downloads/sovran-pro-flake-update2.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 + #### REMOVAL OF MAIN SCRIPT #### From 12be982acfe96715f685ab1e19fbf833d5f73aaa Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Mon, 25 Mar 2024 14:14:27 -0700 Subject: [PATCH 322/667] Updated Nixpkgs --- .../Sovran_SystemsOS_File_Fixes_And_New_Services.sh | 1 + flake.lock | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/file_fixes_and_new_services/Sovran_SystemsOS_File_Fixes_And_New_Services.sh b/file_fixes_and_new_services/Sovran_SystemsOS_File_Fixes_And_New_Services.sh index e6528cb..1523bd5 100755 --- a/file_fixes_and_new_services/Sovran_SystemsOS_File_Fixes_And_New_Services.sh +++ b/file_fixes_and_new_services/Sovran_SystemsOS_File_Fixes_And_New_Services.sh @@ -40,6 +40,7 @@ rm -rf /home/free/Downloads/sovran-pro-flake-update2.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" diff --git a/flake.lock b/flake.lock index 48f34e9..e2370ab 100755 --- a/flake.lock +++ b/flake.lock @@ -157,11 +157,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1710631334, - "narHash": "sha256-rL5LSYd85kplL5othxK5lmAtjyMOBg390sGBTb3LRMM=", + "lastModified": 1711163522, + "narHash": "sha256-YN/Ciidm+A0fmJPWlHBGvVkcarYWSC+s3NTPk/P+q3c=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c75037bbf9093a2acb617804ee46320d6d1fea5a", + "rev": "44d0940ea560dee511026a53f0e2e2cde489b4d4", "type": "github" }, "original": { From 2fd1b8467fe022c9d144f27b9f4709b57ad59ea3 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Fri, 29 Mar 2024 11:51:17 -0700 Subject: [PATCH 323/667] Nixpkgs update with the lastest version of Sparrow Wallet --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index e2370ab..b956282 100755 --- a/flake.lock +++ b/flake.lock @@ -157,11 +157,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1711163522, - "narHash": "sha256-YN/Ciidm+A0fmJPWlHBGvVkcarYWSC+s3NTPk/P+q3c=", + "lastModified": 1711523803, + "narHash": "sha256-UKcYiHWHQynzj6CN/vTcix4yd1eCu1uFdsuarupdCQQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "44d0940ea560dee511026a53f0e2e2cde489b4d4", + "rev": "2726f127c15a4cc9810843b96cad73c7eb39e443", "type": "github" }, "original": { From dd1611455268ef53428070a16ce8e0d1819de147 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Fri, 29 Mar 2024 13:26:09 -0700 Subject: [PATCH 324/667] updated DIY install instructions --- for_new_sovran_pros/How To Install Sovran_SystemsOS.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/for_new_sovran_pros/How To Install Sovran_SystemsOS.md b/for_new_sovran_pros/How To Install Sovran_SystemsOS.md index 15fe6ef..eeb1ae8 100755 --- a/for_new_sovran_pros/How To Install Sovran_SystemsOS.md +++ b/for_new_sovran_pros/How To Install Sovran_SystemsOS.md @@ -110,7 +110,7 @@ then press enter. curl "https://njal.la/update/?h=test.testsovransystems.com&k=8n7vk3afj-jkyg37&a=${IP}" ``` - ##### Make sure `&a=${IP}` is replaced by `&auto` at the end of each `curl` command. + ##### Make sure the default `&auto` from njal.la is replaced by `&a=${IP}` at the end of each `curl` command in the `/var/lib/njalla/njalla.sh` as in the example above. ### Setting the Desktop From 8a2b445abb558a5a0446cbf24c857a71bd76200a Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Fri, 29 Mar 2024 16:05:06 -0700 Subject: [PATCH 325/667] Update Nixpkgs and DIY install --- flake.lock | 6 +++--- for_new_sovran_pros/How To Install Sovran_SystemsOS.md | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index b956282..3972f65 100755 --- a/flake.lock +++ b/flake.lock @@ -157,11 +157,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1711523803, - "narHash": "sha256-UKcYiHWHQynzj6CN/vTcix4yd1eCu1uFdsuarupdCQQ=", + "lastModified": 1711703276, + "narHash": "sha256-iMUFArF0WCatKK6RzfUJknjem0H9m4KgorO/p3Dopkk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2726f127c15a4cc9810843b96cad73c7eb39e443", + "rev": "d8fe5e6c92d0d190646fb9f1056741a229980089", "type": "github" }, "original": { diff --git a/for_new_sovran_pros/How To Install Sovran_SystemsOS.md b/for_new_sovran_pros/How To Install Sovran_SystemsOS.md index eeb1ae8..5a3b382 100755 --- a/for_new_sovran_pros/How To Install Sovran_SystemsOS.md +++ b/for_new_sovran_pros/How To Install Sovran_SystemsOS.md @@ -195,7 +195,7 @@ and press enter. 1. Now type or copy and paste: ```bash -set DOMAIN $(cat /var/lib/domains/matrix) && cp -n /var/lib/caddy/.local/share/caddy/certificates/acme.-v02.api.letsencrypt.org-directory/{$DOMAIN}/{$DOMAIN}.crt /var/lib/coturn/{$DOMAIN}.crt.pem && cp -n /var/lib/caddy/.local/share/caddy/certificates/acme.-v02.api.letsencrypt.org-directory/{$DOMAIN}/{$DOMAIN}.key /var/lib/coturn/{$DOMAIN}.key.pem && chown turnserver:turnserver /var/lib/coturn -R && chmod 770 /var/lib/coturn -R && systemctl restart coturn +set DOMAIN $(cat /var/lib/domains/matrix) && cp -n /var/lib/caddy/.local/share/caddy/certificates/acme-v02.api.letsencrypt.org-directory/{$DOMAIN}/{$DOMAIN}.crt /var/lib/coturn/{$DOMAIN}.crt.pem && cp -n /var/lib/caddy/.local/share/caddy/certificates/acme-v02.api.letsencrypt.org-directory/{$DOMAIN}/{$DOMAIN}.key /var/lib/coturn/{$DOMAIN}.key.pem && chown turnserver:turnserver /var/lib/coturn -R && chmod 770 /var/lib/coturn -R && systemctl restart coturn ``` and press enter. From fe64a2f2f7e8c5a6f434a3a2dfa0c990c38adca6 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Fri, 29 Mar 2024 18:06:06 -0700 Subject: [PATCH 326/667] updated dconf file and added chromium.zip --- for_new_sovran_pros/Sovran_SystemsOS-Desktop | 48 ++++++++++++++------ 1 file changed, 34 insertions(+), 14 deletions(-) diff --git a/for_new_sovran_pros/Sovran_SystemsOS-Desktop b/for_new_sovran_pros/Sovran_SystemsOS-Desktop index 4ad8396..83fcac1 100644 --- a/for_new_sovran_pros/Sovran_SystemsOS-Desktop +++ b/for_new_sovran_pros/Sovran_SystemsOS-Desktop @@ -44,11 +44,16 @@ window-maximized=false window-size=(1912, 1037) [org/gnome/control-center] -last-panel='network' +last-panel='power' 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', '1e62b69b-d9bb-4e80-be8d-5e9b4d777fc8'] +folder-children=['Utilities', 'YaST', 'd737daeb-6dbb-4a5d-9ec7-e674398539ce', '7d66e46a-a135-4e42-91bb-d438e499d251', '3fea025e-f5e4-4905-9912-e70e38cd0419', '83d8148a-1f0b-4f83-814a-11c33ab8debc', '68c075b1-a254-4b7c-ba63-c45f88bc2a58', '534e2716-83c7-4a2a-9678-8144999213ed', '4acaa2d8-d284-4efd-bba3-40f150f1ace5', '1e62b69b-d9bb-4e80-be8d-5e9b4d777fc8', '1991ed9f-9b77-48d8-9335-d11c4b691b78'] + +[org/gnome/desktop/app-folders/folders/1991ed9f-9b77-48d8-9335-d11c4b691b78] +apps=['Sovran_SystemsOS_External_Backup.desktop', 'Sovran_SystemsOS_Resetter.desktop'] +name='Sovran Systems Apps' +translate=false [org/gnome/desktop/app-folders/folders/1e62b69b-d9bb-4e80-be8d-5e9b4d777fc8] apps=['math.desktop', 'writer.desktop', 'impress.desktop', 'draw.desktop', 'calc.desktop', 'base.desktop', 'startcenter.desktop'] @@ -82,6 +87,11 @@ apps=['org.gnome.Tour.desktop', 'yelp.desktop', 'nixos-manual.desktop'] name='Help' translate=false +[org/gnome/desktop/app-folders/folders/Pardus] +categories=['X-Pardus-Apps'] +name='X-Pardus-Apps.directory' +translate=true + [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'] @@ -102,8 +112,8 @@ translate=false [org/gnome/desktop/background] color-shading-type='solid' picture-options='zoom' -picture-uri='file:///home/free/.local/share/backgrounds/2023-07-16-12-58-54-Wallpaper_Dark_Wide.png' -picture-uri-dark='file:///home/free/.local/share/backgrounds/2023-07-16-12-58-54-Wallpaper_Dark_Wide.png' +picture-uri='file:///home/free/.local/share/backgrounds/2024-03-29-13-52-44-Wallpaper_Dark_Wide.png' +picture-uri-dark='file:///home/free/.local/share/backgrounds/2024-03-29-13-52-44-Wallpaper_Dark_Wide.png' primary-color='#000000000000' secondary-color='#000000000000' @@ -202,7 +212,7 @@ recent-files-max-age=-1 color-shading-type='solid' lock-enabled=false picture-options='zoom' -picture-uri='file:///home/free/.local/share/backgrounds/2023-07-16-12-58-54-Wallpaper_Dark_Wide.png' +picture-uri='file:///home/free/.local/share/backgrounds/2024-03-29-13-52-44-Wallpaper_Dark_Wide.png' primary-color='#000000000000' secondary-color='#000000000000' @@ -227,6 +237,10 @@ window-size=(1912, 1037) migrated=true network-monitor-gio-name='' +[org/gnome/file-roller/dialogs/extract] +recreate-folders=true +skip-newer=false + [org/gnome/file-roller/listing] list-mode='as-folder' name-column-width=250 @@ -236,7 +250,7 @@ sort-type='ascending' [org/gnome/file-roller/ui] sidebar-width=200 -window-height=990 +window-height=469 window-width=954 [org/gnome/gnome-system-monitor] @@ -245,7 +259,7 @@ maximized=false network-total-in-bits=false show-dependencies=false show-whose-processes='all' -window-state=(1912, 1037, 26, 23) +window-state=(954, 1037, 26, 23) [org/gnome/gnome-system-monitor/disktreenew] col-6-visible=true @@ -281,7 +295,7 @@ search-filter-time-type='last_modified' search-view='list-view' [org/gnome/nautilus/window-state] -initial-size=(954, 1037) +initial-size=(1912, 1037) maximized=false [org/gnome/nm-applet/eap/202ce1d2-7306-40ac-b3bb-5b092c0f9734] @@ -304,6 +318,12 @@ ignore-phase2-ca-cert=false ignore-ca-cert=false ignore-phase2-ca-cert=false +[org/gnome/portal/filechooser/chromium-browser] +last-folder-path='/home/free/Downloads' + +[org/gnome/portal/filechooser/org.gnome.Settings] +last-folder-path='/home/free/Pictures' + [org/gnome/settings-daemon/plugins/color] night-light-enabled=true night-light-schedule-automatic=false @@ -315,11 +335,11 @@ power-button-action='nothing' sleep-inactive-ac-type='nothing' [org/gnome/shell] -app-picker-layout=[{'org.gnome.Weather.desktop': <{'position': <0>}>, 'org.gnome.clocks.desktop': <{'position': <1>}>, 'org.gnome.Maps.desktop': <{'position': <2>}>, 'org.gnome.Calculator.desktop': <{'position': <3>}>, '68c075b1-a254-4b7c-ba63-c45f88bc2a58': <{'position': <4>}>, '3fea025e-f5e4-4905-9912-e70e38cd0419': <{'position': <5>}>, '83d8148a-1f0b-4f83-814a-11c33ab8debc': <{'position': <6>}>, 'Utilities': <{'position': <7>}>, 'd737daeb-6dbb-4a5d-9ec7-e674398539ce': <{'position': <8>}>, '7d66e46a-a135-4e42-91bb-d438e499d251': <{'position': <9>}>, '534e2716-83c7-4a2a-9678-8144999213ed': <{'position': <10>}>, '4acaa2d8-d284-4efd-bba3-40f150f1ace5': <{'position': <11>}>, '1e62b69b-d9bb-4e80-be8d-5e9b4d777fc8': <{'position': <12>}>, 'Bisq-hidpi.desktop': <{'position': <13>}>, 'com.obsproject.Studio.desktop': <{'position': <14>}>}] +app-picker-layout=[{'org.gnome.Weather.desktop': <{'position': <0>}>, 'org.gnome.clocks.desktop': <{'position': <1>}>, 'org.gnome.Maps.desktop': <{'position': <2>}>, 'org.gnome.Calculator.desktop': <{'position': <3>}>, '68c075b1-a254-4b7c-ba63-c45f88bc2a58': <{'position': <4>}>, '3fea025e-f5e4-4905-9912-e70e38cd0419': <{'position': <5>}>, '83d8148a-1f0b-4f83-814a-11c33ab8debc': <{'position': <6>}>, 'Utilities': <{'position': <7>}>, 'd737daeb-6dbb-4a5d-9ec7-e674398539ce': <{'position': <8>}>, '7d66e46a-a135-4e42-91bb-d438e499d251': <{'position': <9>}>, '534e2716-83c7-4a2a-9678-8144999213ed': <{'position': <10>}>, '4acaa2d8-d284-4efd-bba3-40f150f1ace5': <{'position': <11>}>, '1e62b69b-d9bb-4e80-be8d-5e9b4d777fc8': <{'position': <12>}>, '1991ed9f-9b77-48d8-9335-d11c4b691b78': <{'position': <13>}>, 'Bisq-hidpi.desktop': <{'position': <14>}>, 'io.freetubeapp.FreeTube.desktop': <{'position': <15>}>}] disable-user-extensions=false disabled-extensions=['transparent-top-bar@zhanghai.me'] enabled-extensions=['appindicatorsupport@rgcjonas.gmail.com', 'dash-to-dock-cosmic-@halfmexicanhalfamazing@gmail.com', 'Vitals@CoreCoding.com', 'dash-to-dock@micxgx.gmail.com', 'transparent-top-bar@ftpix.com', 'just-perfection-desktop@just-perfection', 'pop-shell@system76.com', 'date-menu-formatter@marcinjakubowski.github.com', 'systemd-manager@hardpixel.eu', 'light-style@gnome-shell-extensions.gcampax.github.com'] -favorite-apps=['chromium-browser.desktop', 'org.gnome.Nautilus.desktop', 'Sovran_SystemsOS_Updater.desktop', 'org.gnome.Settings.desktop', 'org.gnome.Software.desktop', 'org.onlyoffice.desktopeditors.desktop', 'org.gnome.Geary.desktop', 'org.gnome.Contacts.desktop', 'org.gnome.Calendar.desktop', 'Bisq.desktop', 'sparrow-desktop.desktop'] +favorite-apps=['chromium-browser.desktop', 'org.gnome.Nautilus.desktop', 'Sovran_SystemsOS_Updater.desktop', 'org.gnome.Settings.desktop', 'org.gnome.Software.desktop', 'org.onlyoffice.desktopeditors.desktop', 'io.freetubeapp.FreeTube.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' @@ -401,9 +421,9 @@ locations=@av [] locations=@av [] [org/gnome/software] -check-timestamp=int64 1706366003 +check-timestamp=int64 1711745805 first-run=false -flatpak-purge-timestamp=int64 1706318646 +flatpak-purge-timestamp=int64 1711753069 online-updates-timestamp=int64 1675355639 update-notification-timestamp=int64 1666382024 @@ -420,7 +440,7 @@ selected-color=(true, 0.0, 0.0, 0.0, 1.0) [org/gtk/gtk4/settings/file-chooser] date-format='regular' location-mode='path-bar' -show-hidden=false +show-hidden=true show-size-column=true show-type-column=true sidebar-width=177 @@ -429,7 +449,7 @@ sort-directories-first=false sort-order='ascending' type-format='category' view-type='list' -window-size=(938, 374) +window-size=(1912, 1037) [org/gtk/settings/file-chooser] clock-format='12h' From 0671990b9f7ae37c6952692c7de75d60bf0cd8ab Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Sat, 6 Apr 2024 10:41:09 -0700 Subject: [PATCH 327/667] Nixpkgs Update with Nix Bitcoin Update --- flake.lock | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index 3972f65..0289a15 100755 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1707830867, - "narHash": "sha256-PAdwm5QqdlwIqGrfzzvzZubM+FXtilekQ/FA0cI49/o=", + "lastModified": 1712079060, + "narHash": "sha256-/JdiT9t+zzjChc5qQiF+jhrVhRt8figYH29rZO7pFe4=", "owner": "ryantm", "repo": "agenix", - "rev": "8cb01a0e717311680e0cbca06a76cbceba6f3ed6", + "rev": "1381a759b205dff7a6818733118d02253340fd5e", "type": "github" }, "original": { @@ -51,11 +51,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1709126324, - "narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=", + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "d465f4819400de7c8d874d50b982301f28a84605", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "type": "github" }, "original": { @@ -93,11 +93,11 @@ "nixpkgs-unstable": "nixpkgs-unstable" }, "locked": { - "lastModified": 1709627108, - "narHash": "sha256-SlNuXat2lUO1O8HqDgpweTceSo4dZK8vhEhf8CWtgj8=", + "lastModified": 1712227415, + "narHash": "sha256-4EvWs6rHxCIj9FFXI4Vxh32XJaZJfIqKtAal6vJfqAs=", "owner": "fort-nix", "repo": "nix-bitcoin", - "rev": "502c73d5146623b8cb431563a7c15629a310d9b1", + "rev": "1a3748a368e96e3f3a38735bd9417f634beeeace", "type": "github" }, "original": { @@ -125,11 +125,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1709386671, - "narHash": "sha256-VPqfBnIJ+cfa78pd4Y5Cr6sOWVW8GYHRVucxJGmRf8Q=", + "lastModified": 1712026416, + "narHash": "sha256-N/3VR/9e1NlN49p7kCiATiEY6Tzdo+CbrAG8kqCQKcI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fa9a51752f1b5de583ad5213eb621be071806663", + "rev": "080a4a27f206d07724b88da096e27ef63401a504", "type": "github" }, "original": { @@ -141,11 +141,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1709309926, - "narHash": "sha256-VZFBtXGVD9LWTecGi6eXrE0hJ/mVB3zGUlHImUs2Qak=", + "lastModified": 1711668574, + "narHash": "sha256-u1dfs0ASQIEr1icTVrsKwg2xToIpn7ZXxW3RHfHxshg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "79baff8812a0d68e24a836df0a364c678089e2c7", + "rev": "219951b495fc2eac67b1456824cc1ec1fd2ee659", "type": "github" }, "original": { @@ -157,11 +157,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1711703276, - "narHash": "sha256-iMUFArF0WCatKK6RzfUJknjem0H9m4KgorO/p3Dopkk=", + "lastModified": 1712163089, + "narHash": "sha256-Um+8kTIrC19vD4/lUCN9/cU9kcOsD1O1m+axJqQPyMM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d8fe5e6c92d0d190646fb9f1056741a229980089", + "rev": "fd281bd6b7d3e32ddfa399853946f782553163b5", "type": "github" }, "original": { From 4c782b25475d8b23244202ee1ab4b04986dd7872 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Tue, 9 Apr 2024 09:29:09 -0700 Subject: [PATCH 328/667] Nixpkgs Update --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 0289a15..f7ab707 100755 --- a/flake.lock +++ b/flake.lock @@ -157,11 +157,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1712163089, - "narHash": "sha256-Um+8kTIrC19vD4/lUCN9/cU9kcOsD1O1m+axJqQPyMM=", + "lastModified": 1712439257, + "narHash": "sha256-aSpiNepFOMk9932HOax0XwNxbA38GOUVOiXfUVPOrck=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fd281bd6b7d3e32ddfa399853946f782553163b5", + "rev": "ff0dbd94265ac470dda06a657d5fe49de93b4599", "type": "github" }, "original": { From a7fcc12f8b7b55dc0c8d81c93fc8c19ed00e7626 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Wed, 10 Apr 2024 16:30:55 -0700 Subject: [PATCH 329/667] Added Libre Office --- configuration.nix | 1 + flake.lock | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/configuration.nix b/configuration.nix index f4d2261..28b970a 100755 --- a/configuration.nix +++ b/configuration.nix @@ -179,6 +179,7 @@ in dig nextcloud-client ungoogled-chromium + libreoffice-fresh ]; diff --git a/flake.lock b/flake.lock index f7ab707..008eba5 100755 --- a/flake.lock +++ b/flake.lock @@ -157,11 +157,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1712439257, - "narHash": "sha256-aSpiNepFOMk9932HOax0XwNxbA38GOUVOiXfUVPOrck=", + "lastModified": 1712608508, + "narHash": "sha256-vMZ5603yU0wxgyQeHJryOI+O61yrX2AHwY6LOFyV1gM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ff0dbd94265ac470dda06a657d5fe49de93b4599", + "rev": "4cba8b53da471aea2ab2b0c1f30a81e7c451f4b6", "type": "github" }, "original": { From 928cdbdefae42673b7eba6f021b77a65f0c7468e Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Wed, 10 Apr 2024 16:42:43 -0700 Subject: [PATCH 330/667] Removed double LibreOffice --- configuration.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/configuration.nix b/configuration.nix index 28b970a..f4d2261 100755 --- a/configuration.nix +++ b/configuration.nix @@ -179,7 +179,6 @@ in dig nextcloud-client ungoogled-chromium - libreoffice-fresh ]; From b93704443e43bd85cb045c736a2c0d890b9565fc Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Tue, 16 Apr 2024 09:32:11 -0700 Subject: [PATCH 331/667] Nixpkgs Update with Bisq 1.9.15 --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 008eba5..c1246a4 100755 --- a/flake.lock +++ b/flake.lock @@ -157,11 +157,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1712608508, - "narHash": "sha256-vMZ5603yU0wxgyQeHJryOI+O61yrX2AHwY6LOFyV1gM=", + "lastModified": 1712963716, + "narHash": "sha256-WKm9CvgCldeIVvRz87iOMi8CFVB1apJlkUT4GGvA0iM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4cba8b53da471aea2ab2b0c1f30a81e7c451f4b6", + "rev": "cfd6b5fc90b15709b780a5a1619695a88505a176", "type": "github" }, "original": { From 112e4a85349e4b94cb224ec4d399879255a9e1e8 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Wed, 17 Apr 2024 14:25:08 -0700 Subject: [PATCH 332/667] New Nixpkgs --- configuration.nix | 2 +- flake.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configuration.nix b/configuration.nix index f4d2261..b65fb48 100755 --- a/configuration.nix +++ b/configuration.nix @@ -146,7 +146,7 @@ in gnomeExtensions.pop-shell gnomeExtensions.just-perfection gnomeExtensions.appindicator - #gnomeExtensions.date-menu-formatter + gnomeExtensions.date-menu-formatter gnome.gnome-tweaks papirus-icon-theme ranger diff --git a/flake.lock b/flake.lock index c1246a4..7d26009 100755 --- a/flake.lock +++ b/flake.lock @@ -157,11 +157,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1712963716, - "narHash": "sha256-WKm9CvgCldeIVvRz87iOMi8CFVB1apJlkUT4GGvA0iM=", + "lastModified": 1713248628, + "narHash": "sha256-NLznXB5AOnniUtZsyy/aPWOk8ussTuePp2acb9U+ISA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "cfd6b5fc90b15709b780a5a1619695a88505a176", + "rev": "5672bc9dbf9d88246ddab5ac454e82318d094bb8", "type": "github" }, "original": { From 7e07dfe154eb9ef37d44e3f736c41093e69c14db Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Wed, 24 Apr 2024 16:42:08 -0700 Subject: [PATCH 333/667] Nixpkgs update with Nix Bitcoin update --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 7d26009..d4a74be 100755 --- a/flake.lock +++ b/flake.lock @@ -93,11 +93,11 @@ "nixpkgs-unstable": "nixpkgs-unstable" }, "locked": { - "lastModified": 1712227415, - "narHash": "sha256-4EvWs6rHxCIj9FFXI4Vxh32XJaZJfIqKtAal6vJfqAs=", + "lastModified": 1713705543, + "narHash": "sha256-LB/Ba7CBFMu0LPfpwooiVjlA5CMhvhSPFE40CgfrVPI=", "owner": "fort-nix", "repo": "nix-bitcoin", - "rev": "1a3748a368e96e3f3a38735bd9417f634beeeace", + "rev": "8ff709ebd773032f0b0f7f34b65c1b669642060c", "type": "github" }, "original": { @@ -125,11 +125,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1712026416, - "narHash": "sha256-N/3VR/9e1NlN49p7kCiATiEY6Tzdo+CbrAG8kqCQKcI=", + "lastModified": 1713562564, + "narHash": "sha256-NQpYhgoy0M89g9whRixSwsHb8RFIbwlxeYiVSDwSXJg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "080a4a27f206d07724b88da096e27ef63401a504", + "rev": "92d295f588631b0db2da509f381b4fb1e74173c5", "type": "github" }, "original": { @@ -141,11 +141,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1711668574, - "narHash": "sha256-u1dfs0ASQIEr1icTVrsKwg2xToIpn7ZXxW3RHfHxshg=", + "lastModified": 1713344939, + "narHash": "sha256-jpHkAt0sG2/J7ueKnG7VvLLkBYUMQbXQ2L8OBpVG53s=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "219951b495fc2eac67b1456824cc1ec1fd2ee659", + "rev": "e402c3eb6d88384ca6c52ef1c53e61bdc9b84ddd", "type": "github" }, "original": { @@ -157,11 +157,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1713248628, - "narHash": "sha256-NLznXB5AOnniUtZsyy/aPWOk8ussTuePp2acb9U+ISA=", + "lastModified": 1713895582, + "narHash": "sha256-cfh1hi+6muQMbi9acOlju3V1gl8BEaZBXBR9jQfQi4U=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5672bc9dbf9d88246ddab5ac454e82318d094bb8", + "rev": "572af610f6151fd41c212f897c71f7056e3fb518", "type": "github" }, "original": { From dcc0efe963a5bf85163c4192f46c75ad53980ea8 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Sat, 4 May 2024 18:33:51 -0700 Subject: [PATCH 334/667] updated config to support Nextcloud 29 --- configuration.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configuration.nix b/configuration.nix index b65fb48..6fbe43e 100755 --- a/configuration.nix +++ b/configuration.nix @@ -235,8 +235,8 @@ in 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 + redir /.well-known/carddav /remote.php/dav 301 + redir /.well-known/caldav /remote.php/dav 301 header { Strict-Transport-Security max-age=31536000; } From c0d75530ddab108353b97a6cae45aecdb607810f Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Sun, 5 May 2024 16:43:49 -0700 Subject: [PATCH 335/667] increased opcache.max_accelerated_files --- configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configuration.nix b/configuration.nix index 6fbe43e..6db362b 100755 --- a/configuration.nix +++ b/configuration.nix @@ -16,7 +16,7 @@ let opcache.enable=1; opcache.memory_consumption=512; opcache_revalidate_freq = 240; - opcache.max_accelerated_files=4000; + opcache.max_accelerated_files=5000; auto_prepend_file = '/var/lib/www/wordpress/wordfence-waf.php' post_max_size = 3G upload_max_filesize = 3G From cb3470f2d903c598ad30daeea4a182282675e848 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Tue, 7 May 2024 12:47:24 -0700 Subject: [PATCH 336/667] udpated dconf file --- for_new_sovran_pros/Sovran_SystemsOS-Desktop | 58 ++++++++------------ 1 file changed, 23 insertions(+), 35 deletions(-) diff --git a/for_new_sovran_pros/Sovran_SystemsOS-Desktop b/for_new_sovran_pros/Sovran_SystemsOS-Desktop index 83fcac1..577f3a3 100644 --- a/for_new_sovran_pros/Sovran_SystemsOS-Desktop +++ b/for_new_sovran_pros/Sovran_SystemsOS-Desktop @@ -5,8 +5,8 @@ dark-full-screen=false first-run=false [org/gnome/Console] -font-scale=1.3000000000000003 -last-window-size=(954, 516) +font-scale=1.6000000000000005 +last-window-size=(1912, 1037) [org/gnome/Geary] migrated-config=true @@ -45,15 +45,10 @@ window-size=(1912, 1037) [org/gnome/control-center] last-panel='power' -window-state=(1912, 1037, false) +window-state=(1912, 1040, false) [org/gnome/desktop/app-folders] -folder-children=['Utilities', 'YaST', 'd737daeb-6dbb-4a5d-9ec7-e674398539ce', '7d66e46a-a135-4e42-91bb-d438e499d251', '3fea025e-f5e4-4905-9912-e70e38cd0419', '83d8148a-1f0b-4f83-814a-11c33ab8debc', '68c075b1-a254-4b7c-ba63-c45f88bc2a58', '534e2716-83c7-4a2a-9678-8144999213ed', '4acaa2d8-d284-4efd-bba3-40f150f1ace5', '1e62b69b-d9bb-4e80-be8d-5e9b4d777fc8', '1991ed9f-9b77-48d8-9335-d11c4b691b78'] - -[org/gnome/desktop/app-folders/folders/1991ed9f-9b77-48d8-9335-d11c4b691b78] -apps=['Sovran_SystemsOS_External_Backup.desktop', 'Sovran_SystemsOS_Resetter.desktop'] -name='Sovran Systems Apps' -translate=false +folder-children=['Utilities', 'YaST', 'd737daeb-6dbb-4a5d-9ec7-e674398539ce', '7d66e46a-a135-4e42-91bb-d438e499d251', '3fea025e-f5e4-4905-9912-e70e38cd0419', '83d8148a-1f0b-4f83-814a-11c33ab8debc', '68c075b1-a254-4b7c-ba63-c45f88bc2a58', '534e2716-83c7-4a2a-9678-8144999213ed', '4acaa2d8-d284-4efd-bba3-40f150f1ace5', '1e62b69b-d9bb-4e80-be8d-5e9b4d777fc8'] [org/gnome/desktop/app-folders/folders/1e62b69b-d9bb-4e80-be8d-5e9b4d777fc8] apps=['math.desktop', 'writer.desktop', 'impress.desktop', 'draw.desktop', 'calc.desktop', 'base.desktop', 'startcenter.desktop'] @@ -87,11 +82,6 @@ apps=['org.gnome.Tour.desktop', 'yelp.desktop', 'nixos-manual.desktop'] name='Help' translate=false -[org/gnome/desktop/app-folders/folders/Pardus] -categories=['X-Pardus-Apps'] -name='X-Pardus-Apps.directory' -translate=true - [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'] @@ -112,8 +102,8 @@ translate=false [org/gnome/desktop/background] color-shading-type='solid' picture-options='zoom' -picture-uri='file:///home/free/.local/share/backgrounds/2024-03-29-13-52-44-Wallpaper_Dark_Wide.png' -picture-uri-dark='file:///home/free/.local/share/backgrounds/2024-03-29-13-52-44-Wallpaper_Dark_Wide.png' +picture-uri='file:///home/free/.local/share/backgrounds/2023-07-16-12-58-54-Wallpaper_Dark_Wide.png' +picture-uri-dark='file:///home/free/.local/share/backgrounds/2023-07-16-12-58-54-Wallpaper_Dark_Wide.png' primary-color='#000000000000' secondary-color='#000000000000' @@ -134,7 +124,7 @@ font-antialiasing='rgba' font-hinting='full' gtk-theme='Adwaita-dark' icon-theme='Papirus-Dark' -text-scaling-factor=1.0700000000000001 +text-scaling-factor=1.0 [org/gnome/desktop/notifications] application-children=['gnome-power-panel', 'org-gnome-nautilus', 'org-gnome-software', 'gnome-network-panel', 'sparrow', 'org-gnome-settings', 'org-gnome-console', 'gnome-printers-panel', 'org-gnome-epiphany', 'com-obsproject-studio', 'io-github-seadve-kooha', 'xdg-desktop-portal-gnome', 'org-gnome-baobab', 'org-gnome-geary', 'sparrow-desktop', 'impress', 'brave-browser', 'org-gnome-connections'] @@ -212,7 +202,7 @@ recent-files-max-age=-1 color-shading-type='solid' lock-enabled=false picture-options='zoom' -picture-uri='file:///home/free/.local/share/backgrounds/2024-03-29-13-52-44-Wallpaper_Dark_Wide.png' +picture-uri='file:///home/free/.local/share/backgrounds/2023-07-16-12-58-54-Wallpaper_Dark_Wide.png' primary-color='#000000000000' secondary-color='#000000000000' @@ -250,7 +240,7 @@ sort-type='ascending' [org/gnome/file-roller/ui] sidebar-width=200 -window-height=469 +window-height=993 window-width=954 [org/gnome/gnome-system-monitor] @@ -259,11 +249,11 @@ maximized=false network-total-in-bits=false show-dependencies=false show-whose-processes='all' -window-state=(954, 1037, 26, 23) +window-state=(1912, 1040, 26, 23) [org/gnome/gnome-system-monitor/disktreenew] col-6-visible=true -col-6-width=0 +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] @@ -295,7 +285,7 @@ search-filter-time-type='last_modified' search-view='list-view' [org/gnome/nautilus/window-state] -initial-size=(1912, 1037) +initial-size=(1912, 1040) maximized=false [org/gnome/nm-applet/eap/202ce1d2-7306-40ac-b3bb-5b092c0f9734] @@ -321,11 +311,8 @@ ignore-phase2-ca-cert=false [org/gnome/portal/filechooser/chromium-browser] last-folder-path='/home/free/Downloads' -[org/gnome/portal/filechooser/org.gnome.Settings] -last-folder-path='/home/free/Pictures' - [org/gnome/settings-daemon/plugins/color] -night-light-enabled=true +night-light-enabled=false night-light-schedule-automatic=false night-light-schedule-from=18.0 night-light-temperature=uint32 1744 @@ -335,11 +322,11 @@ power-button-action='nothing' sleep-inactive-ac-type='nothing' [org/gnome/shell] -app-picker-layout=[{'org.gnome.Weather.desktop': <{'position': <0>}>, 'org.gnome.clocks.desktop': <{'position': <1>}>, 'org.gnome.Maps.desktop': <{'position': <2>}>, 'org.gnome.Calculator.desktop': <{'position': <3>}>, '68c075b1-a254-4b7c-ba63-c45f88bc2a58': <{'position': <4>}>, '3fea025e-f5e4-4905-9912-e70e38cd0419': <{'position': <5>}>, '83d8148a-1f0b-4f83-814a-11c33ab8debc': <{'position': <6>}>, 'Utilities': <{'position': <7>}>, 'd737daeb-6dbb-4a5d-9ec7-e674398539ce': <{'position': <8>}>, '7d66e46a-a135-4e42-91bb-d438e499d251': <{'position': <9>}>, '534e2716-83c7-4a2a-9678-8144999213ed': <{'position': <10>}>, '4acaa2d8-d284-4efd-bba3-40f150f1ace5': <{'position': <11>}>, '1e62b69b-d9bb-4e80-be8d-5e9b4d777fc8': <{'position': <12>}>, '1991ed9f-9b77-48d8-9335-d11c4b691b78': <{'position': <13>}>, 'Bisq-hidpi.desktop': <{'position': <14>}>, 'io.freetubeapp.FreeTube.desktop': <{'position': <15>}>}] +app-picker-layout=[{'org.gnome.Weather.desktop': <{'position': <0>}>, 'org.gnome.clocks.desktop': <{'position': <1>}>, 'org.gnome.Maps.desktop': <{'position': <2>}>, 'org.gnome.Calculator.desktop': <{'position': <3>}>, '68c075b1-a254-4b7c-ba63-c45f88bc2a58': <{'position': <4>}>, '3fea025e-f5e4-4905-9912-e70e38cd0419': <{'position': <5>}>, '83d8148a-1f0b-4f83-814a-11c33ab8debc': <{'position': <6>}>, 'Utilities': <{'position': <7>}>, 'd737daeb-6dbb-4a5d-9ec7-e674398539ce': <{'position': <8>}>, '7d66e46a-a135-4e42-91bb-d438e499d251': <{'position': <9>}>, '534e2716-83c7-4a2a-9678-8144999213ed': <{'position': <10>}>, '4acaa2d8-d284-4efd-bba3-40f150f1ace5': <{'position': <11>}>, '1e62b69b-d9bb-4e80-be8d-5e9b4d777fc8': <{'position': <12>}>, 'Bisq-hidpi.desktop': <{'position': <13>}>, 'com.obsproject.Studio.desktop': <{'position': <14>}>, 'Sovran_SystemsOS_External_Backup.desktop': <{'position': <15>}>}] disable-user-extensions=false disabled-extensions=['transparent-top-bar@zhanghai.me'] enabled-extensions=['appindicatorsupport@rgcjonas.gmail.com', 'dash-to-dock-cosmic-@halfmexicanhalfamazing@gmail.com', 'Vitals@CoreCoding.com', 'dash-to-dock@micxgx.gmail.com', 'transparent-top-bar@ftpix.com', 'just-perfection-desktop@just-perfection', 'pop-shell@system76.com', 'date-menu-formatter@marcinjakubowski.github.com', 'systemd-manager@hardpixel.eu', 'light-style@gnome-shell-extensions.gcampax.github.com'] -favorite-apps=['chromium-browser.desktop', 'org.gnome.Nautilus.desktop', 'Sovran_SystemsOS_Updater.desktop', 'org.gnome.Settings.desktop', 'org.gnome.Software.desktop', 'org.onlyoffice.desktopeditors.desktop', 'io.freetubeapp.FreeTube.desktop', 'org.gnome.Geary.desktop', 'org.gnome.Contacts.desktop', 'org.gnome.Calendar.desktop', 'Bisq.desktop', 'sparrow-desktop.desktop'] +favorite-apps=['brave-browser.desktop', 'org.gnome.Terminal.desktop', 'org.gnome.Nautilus.desktop', 'Sovran_SystemsOS_Updater.desktop', 'org.gnome.Settings.desktop', 'org.gnome.Software.desktop', 'io.freetubeapp.FreeTube.desktop', 'org.onlyoffice.desktopeditors.desktop', 'org.gnome.Geary.desktop', 'org.gnome.Contacts.desktop', 'org.gnome.Calendar.desktop', 'Bisq.desktop', 'sparrow-desktop.desktop'] last-selected-power-profile='performance' welcome-dialog-last-shown-version='42.3.1' @@ -374,14 +361,14 @@ apply-custom-theme=false background-color='rgb(0,0,0)' background-opacity=0.17000000000000001 custom-background-color=true -dash-max-icon-size=63 +dash-max-icon-size=57 dock-position='BOTTOM' extend-height=false height-fraction=0.89000000000000001 icon-size-fixed=false intellihide-mode='ALL_WINDOWS' preferred-monitor=-2 -preferred-monitor-by-connector='HDMI-1' +preferred-monitor-by-connector='HDMI-2' preview-size-scale=0.22 running-indicator-style='DASHES' show-mounts=false @@ -391,7 +378,8 @@ transparency-mode='FIXED' [org/gnome/shell/extensions/date-menu-formatter] font-size=14 -pattern='EEEE MMMM d h: mm aaa' +pattern='EEEE MMMM d h: mm a' +text-align='center' [org/gnome/shell/extensions/just-perfection] accessibility-menu=false @@ -421,9 +409,9 @@ locations=@av [] locations=@av [] [org/gnome/software] -check-timestamp=int64 1711745805 +check-timestamp=int64 1715090063 first-run=false -flatpak-purge-timestamp=int64 1711753069 +flatpak-purge-timestamp=int64 1715043202 online-updates-timestamp=int64 1675355639 update-notification-timestamp=int64 1666382024 @@ -443,13 +431,13 @@ location-mode='path-bar' show-hidden=true show-size-column=true show-type-column=true -sidebar-width=177 +sidebar-width=140 sort-column='name' sort-directories-first=false sort-order='ascending' type-format='category' view-type='list' -window-size=(1912, 1037) +window-size=(1912, 1040) [org/gtk/settings/file-chooser] clock-format='12h' From 211e0ceddc0c76238c20b32a8ebe442c2710a92a Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Wed, 8 May 2024 10:07:00 -0700 Subject: [PATCH 337/667] Nixpkgs Upddate with Gnome46 and Nix-Bitcoin update --- flake.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index d4a74be..81f2680 100755 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1712079060, - "narHash": "sha256-/JdiT9t+zzjChc5qQiF+jhrVhRt8figYH29rZO7pFe4=", + "lastModified": 1715101957, + "narHash": "sha256-fs5uVQFTfgb4L9pnhldeyTHNcYwn1U4nKYoCBJ6W3W4=", "owner": "ryantm", "repo": "agenix", - "rev": "1381a759b205dff7a6818733118d02253340fd5e", + "rev": "07479c2e7396acaaaac5925483498154034ea80a", "type": "github" }, "original": { @@ -93,11 +93,11 @@ "nixpkgs-unstable": "nixpkgs-unstable" }, "locked": { - "lastModified": 1713705543, - "narHash": "sha256-LB/Ba7CBFMu0LPfpwooiVjlA5CMhvhSPFE40CgfrVPI=", + "lastModified": 1714980352, + "narHash": "sha256-Z4vJzxMjgCM+tciU7859uPNuy+pwuGhutvAkKidpzvg=", "owner": "fort-nix", "repo": "nix-bitcoin", - "rev": "8ff709ebd773032f0b0f7f34b65c1b669642060c", + "rev": "881f4b4bb1bed267483a54ece36a584171c571d6", "type": "github" }, "original": { @@ -125,11 +125,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1713562564, - "narHash": "sha256-NQpYhgoy0M89g9whRixSwsHb8RFIbwlxeYiVSDwSXJg=", + "lastModified": 1714809261, + "narHash": "sha256-hfBmnYFyz9I1mdrC3tX1A+dF9cOUcds5PIMPxrT+cRk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "92d295f588631b0db2da509f381b4fb1e74173c5", + "rev": "d32560238207b8e26d88b265207b216ee46b8450", "type": "github" }, "original": { @@ -141,11 +141,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1713344939, - "narHash": "sha256-jpHkAt0sG2/J7ueKnG7VvLLkBYUMQbXQ2L8OBpVG53s=", + "lastModified": 1714782413, + "narHash": "sha256-tbg0MEuKaPcUrnmGCu4xiY5F+7LW2+ECPKVAJd2HLwM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e402c3eb6d88384ca6c52ef1c53e61bdc9b84ddd", + "rev": "651b4702e27a388f0f18e1b970534162dec09aff", "type": "github" }, "original": { @@ -157,11 +157,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1713895582, - "narHash": "sha256-cfh1hi+6muQMbi9acOlju3V1gl8BEaZBXBR9jQfQi4U=", + "lastModified": 1715087517, + "narHash": "sha256-CLU5Tsg24Ke4+7sH8azHWXKd0CFd4mhLWfhYgUiDBpQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "572af610f6151fd41c212f897c71f7056e3fb518", + "rev": "b211b392b8486ee79df6cdfb1157ad2133427a29", "type": "github" }, "original": { From 230bcddfc59a1418fc68742539b2106833502581 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Wed, 8 May 2024 13:47:52 -0700 Subject: [PATCH 338/667] Udpated OPcache.max.accelerated for PHP --- configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configuration.nix b/configuration.nix index 6db362b..aea2e87 100755 --- a/configuration.nix +++ b/configuration.nix @@ -16,7 +16,7 @@ let opcache.enable=1; opcache.memory_consumption=512; opcache_revalidate_freq = 240; - opcache.max_accelerated_files=5000; + opcache.max_accelerated_files=10000; auto_prepend_file = '/var/lib/www/wordpress/wordfence-waf.php' post_max_size = 3G upload_max_filesize = 3G From 99cb598eaf85524b0f2b3b2d1d152a4f819610aa Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Sun, 12 May 2024 16:02:58 -0700 Subject: [PATCH 339/667] added FireFox and added SCID alias to LND --- configuration.nix | 1 + modules/bitcoinecosystem.nix | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/configuration.nix b/configuration.nix index aea2e87..12ea70f 100755 --- a/configuration.nix +++ b/configuration.nix @@ -179,6 +179,7 @@ in dig nextcloud-client ungoogled-chromium + firefox ]; diff --git a/modules/bitcoinecosystem.nix b/modules/bitcoinecosystem.nix index ec07e19..23b5a52 100755 --- a/modules/bitcoinecosystem.nix +++ b/modules/bitcoinecosystem.nix @@ -25,6 +25,12 @@ enable = true; tor.enforce = true; tor.proxy = true; + extraConfig = '' + + protocol.option-scid-alias=true + + ''; + }; services.lightning-loop = { From 5715d89a05ad36a346d69d01839ec5f88ae9b06b Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Sun, 12 May 2024 16:50:39 -0700 Subject: [PATCH 340/667] added new desktop settings and firefox settings --- for_new_sovran_pros/Sovran_SystemsOS-Desktop | 38 +++++++++++--------- 1 file changed, 22 insertions(+), 16 deletions(-) diff --git a/for_new_sovran_pros/Sovran_SystemsOS-Desktop b/for_new_sovran_pros/Sovran_SystemsOS-Desktop index 577f3a3..581fbf7 100644 --- a/for_new_sovran_pros/Sovran_SystemsOS-Desktop +++ b/for_new_sovran_pros/Sovran_SystemsOS-Desktop @@ -44,7 +44,7 @@ window-maximized=false window-size=(1912, 1037) [org/gnome/control-center] -last-panel='power' +last-panel='background' window-state=(1912, 1040, false) [org/gnome/desktop/app-folders] @@ -83,7 +83,7 @@ name='Help' translate=false [org/gnome/desktop/app-folders/folders/Utilities] -apps=['gnome-abrt.desktop', 'gnome-system-log.desktop', 'nm-connection-editor.desktop', 'org.gnome.Connections.desktop', 'org.gnome.DejaDup.desktop', 'org.gnome.Dictionary.desktop', 'org.gnome.eog.desktop', 'org.gnome.Evince.desktop', 'org.gnome.FileRoller.desktop', 'org.gnome.fonts.desktop', 'org.gnome.seahorse.Application.desktop', 'org.gnome.Usage.desktop', 'vinagre.desktop', 'org.gnome.TextEditor.desktop', 'org.gnome.gedit.desktop'] +apps=['gnome-abrt.desktop', 'gnome-system-log.desktop', 'nm-connection-editor.desktop', 'org.gnome.Connections.desktop', 'org.gnome.DejaDup.desktop', 'org.gnome.Dictionary.desktop', 'org.gnome.eog.desktop', 'org.gnome.Evince.desktop', 'org.gnome.FileRoller.desktop', 'org.gnome.fonts.desktop', 'org.gnome.seahorse.Application.desktop', 'org.gnome.Usage.desktop', 'vinagre.desktop', 'org.gnome.TextEditor.desktop', 'org.gnome.gedit.desktop', 'org.gnome.SystemMonitor.desktop'] categories=['X-GNOME-Utilities'] excluded-apps=['org.gnome.Console.desktop', 'org.gnome.tweaks.desktop', 'org.gnome.DiskUtility.desktop', 'org.gnome.baobab.desktop'] name='X-GNOME-Utilities.directory' @@ -102,10 +102,10 @@ translate=false [org/gnome/desktop/background] color-shading-type='solid' picture-options='zoom' -picture-uri='file:///home/free/.local/share/backgrounds/2023-07-16-12-58-54-Wallpaper_Dark_Wide.png' -picture-uri-dark='file:///home/free/.local/share/backgrounds/2023-07-16-12-58-54-Wallpaper_Dark_Wide.png' -primary-color='#000000000000' -secondary-color='#000000000000' +picture-uri='file:///run/current-system/sw/share/backgrounds/gnome/amber-l.jxl' +picture-uri-dark='file:///run/current-system/sw/share/backgrounds/gnome/amber-d.jxl' +primary-color='#ff7800' +secondary-color='#000000' [org/gnome/desktop/calendar] show-weekdate=false @@ -202,9 +202,9 @@ recent-files-max-age=-1 color-shading-type='solid' lock-enabled=false picture-options='zoom' -picture-uri='file:///home/free/.local/share/backgrounds/2023-07-16-12-58-54-Wallpaper_Dark_Wide.png' -primary-color='#000000000000' -secondary-color='#000000000000' +picture-uri='file:///run/current-system/sw/share/backgrounds/gnome/amber-l.jxl' +primary-color='#ff7800' +secondary-color='#000000' [org/gnome/desktop/session] idle-delay=uint32 900 @@ -249,11 +249,13 @@ maximized=false network-total-in-bits=false show-dependencies=false show-whose-processes='all' +window-height=1040 window-state=(1912, 1040, 26, 23) +window-width=1912 [org/gnome/gnome-system-monitor/disktreenew] col-6-visible=true -col-6-width=1502 +col-6-width=0 [org/gnome/gnome-system-monitor/proctree] columns-order=[0, 1, 2, 3, 4, 6, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26] @@ -280,6 +282,7 @@ default-zoom-level='large' [org/gnome/nautilus/preferences] default-folder-viewer='icon-view' +fts-enabled=false migrated-gtk-settings=true search-filter-time-type='last_modified' search-view='list-view' @@ -308,11 +311,14 @@ ignore-phase2-ca-cert=false ignore-ca-cert=false ignore-phase2-ca-cert=false +[org/gnome/portal/filechooser/brave-browser] +last-folder-path='/home/free/Downloads' + [org/gnome/portal/filechooser/chromium-browser] last-folder-path='/home/free/Downloads' [org/gnome/settings-daemon/plugins/color] -night-light-enabled=false +night-light-enabled=true night-light-schedule-automatic=false night-light-schedule-from=18.0 night-light-temperature=uint32 1744 @@ -322,11 +328,11 @@ power-button-action='nothing' sleep-inactive-ac-type='nothing' [org/gnome/shell] -app-picker-layout=[{'org.gnome.Weather.desktop': <{'position': <0>}>, 'org.gnome.clocks.desktop': <{'position': <1>}>, 'org.gnome.Maps.desktop': <{'position': <2>}>, 'org.gnome.Calculator.desktop': <{'position': <3>}>, '68c075b1-a254-4b7c-ba63-c45f88bc2a58': <{'position': <4>}>, '3fea025e-f5e4-4905-9912-e70e38cd0419': <{'position': <5>}>, '83d8148a-1f0b-4f83-814a-11c33ab8debc': <{'position': <6>}>, 'Utilities': <{'position': <7>}>, 'd737daeb-6dbb-4a5d-9ec7-e674398539ce': <{'position': <8>}>, '7d66e46a-a135-4e42-91bb-d438e499d251': <{'position': <9>}>, '534e2716-83c7-4a2a-9678-8144999213ed': <{'position': <10>}>, '4acaa2d8-d284-4efd-bba3-40f150f1ace5': <{'position': <11>}>, '1e62b69b-d9bb-4e80-be8d-5e9b4d777fc8': <{'position': <12>}>, 'Bisq-hidpi.desktop': <{'position': <13>}>, 'com.obsproject.Studio.desktop': <{'position': <14>}>, 'Sovran_SystemsOS_External_Backup.desktop': <{'position': <15>}>}] +app-picker-layout=[{'org.gnome.Weather.desktop': <{'position': <0>}>, 'org.gnome.clocks.desktop': <{'position': <1>}>, 'org.gnome.Maps.desktop': <{'position': <2>}>, 'org.gnome.Calculator.desktop': <{'position': <3>}>, '68c075b1-a254-4b7c-ba63-c45f88bc2a58': <{'position': <4>}>, '3fea025e-f5e4-4905-9912-e70e38cd0419': <{'position': <5>}>, '83d8148a-1f0b-4f83-814a-11c33ab8debc': <{'position': <6>}>, 'Utilities': <{'position': <7>}>, 'd737daeb-6dbb-4a5d-9ec7-e674398539ce': <{'position': <8>}>, '7d66e46a-a135-4e42-91bb-d438e499d251': <{'position': <9>}>, '534e2716-83c7-4a2a-9678-8144999213ed': <{'position': <10>}>, '4acaa2d8-d284-4efd-bba3-40f150f1ace5': <{'position': <11>}>, '1e62b69b-d9bb-4e80-be8d-5e9b4d777fc8': <{'position': <12>}>, 'Bisq-hidpi.desktop': <{'position': <13>}>, 'com.obsproject.Studio.desktop': <{'position': <14>}>, 'Sovran_SystemsOS_External_Backup.desktop': <{'position': <15>}>, 'firefox.desktop': <{'position': <16>}>}] disable-user-extensions=false disabled-extensions=['transparent-top-bar@zhanghai.me'] enabled-extensions=['appindicatorsupport@rgcjonas.gmail.com', 'dash-to-dock-cosmic-@halfmexicanhalfamazing@gmail.com', 'Vitals@CoreCoding.com', 'dash-to-dock@micxgx.gmail.com', 'transparent-top-bar@ftpix.com', 'just-perfection-desktop@just-perfection', 'pop-shell@system76.com', 'date-menu-formatter@marcinjakubowski.github.com', 'systemd-manager@hardpixel.eu', 'light-style@gnome-shell-extensions.gcampax.github.com'] -favorite-apps=['brave-browser.desktop', 'org.gnome.Terminal.desktop', 'org.gnome.Nautilus.desktop', 'Sovran_SystemsOS_Updater.desktop', 'org.gnome.Settings.desktop', 'org.gnome.Software.desktop', 'io.freetubeapp.FreeTube.desktop', 'org.onlyoffice.desktopeditors.desktop', 'org.gnome.Geary.desktop', 'org.gnome.Contacts.desktop', 'org.gnome.Calendar.desktop', 'Bisq.desktop', 'sparrow-desktop.desktop'] +favorite-apps=['firefox.desktop', 'org.gnome.Nautilus.desktop', 'Sovran_SystemsOS_Updater.desktop', 'org.gnome.Settings.desktop', 'org.gnome.Software.desktop', 'io.freetubeapp.FreeTube.desktop', 'org.onlyoffice.desktopeditors.desktop', 'org.gnome.Geary.desktop', 'org.gnome.Contacts.desktop', 'org.gnome.Calendar.desktop', 'Bisq.desktop', 'sparrow-desktop.desktop'] last-selected-power-profile='performance' welcome-dialog-last-shown-version='42.3.1' @@ -409,9 +415,9 @@ locations=@av [] locations=@av [] [org/gnome/software] -check-timestamp=int64 1715090063 +check-timestamp=int64 1715525466 first-run=false -flatpak-purge-timestamp=int64 1715043202 +flatpak-purge-timestamp=int64 1715478601 online-updates-timestamp=int64 1675355639 update-notification-timestamp=int64 1666382024 @@ -428,7 +434,7 @@ selected-color=(true, 0.0, 0.0, 0.0, 1.0) [org/gtk/gtk4/settings/file-chooser] date-format='regular' location-mode='path-bar' -show-hidden=true +show-hidden=false show-size-column=true show-type-column=true sidebar-width=140 From ea75021a7b1afe4754c77cb5a40e7626b4ff8bbc Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Thu, 16 May 2024 13:25:30 -0700 Subject: [PATCH 341/667] added dua and htop and removed ncdu_2 --- configuration.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/configuration.nix b/configuration.nix index 12ea70f..6647eec 100755 --- a/configuration.nix +++ b/configuration.nix @@ -140,6 +140,7 @@ in librewolf fish htop + btop gnomeExtensions.dash-to-dock gnomeExtensions.transparent-top-bar-adjustable-transparency gnomeExtensions.vitals @@ -165,7 +166,7 @@ in custom-php matrix-synapse-tools.synadm brave - ncdu_2 + dua bitwarden gparted pv From 8798052d0803709f4c414240a6de00ec599cab32 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Thu, 16 May 2024 13:54:53 -0700 Subject: [PATCH 342/667] Nixpkgs Update --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 81f2680..1acf8c0 100755 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1715101957, - "narHash": "sha256-fs5uVQFTfgb4L9pnhldeyTHNcYwn1U4nKYoCBJ6W3W4=", + "lastModified": 1715290355, + "narHash": "sha256-2T7CHTqBXJJ3ZC6R/4TXTcKoXWHcvubKNj9SfomURnw=", "owner": "ryantm", "repo": "agenix", - "rev": "07479c2e7396acaaaac5925483498154034ea80a", + "rev": "8d37c5bdeade12b6479c85acd133063ab53187a0", "type": "github" }, "original": { @@ -157,11 +157,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1715087517, - "narHash": "sha256-CLU5Tsg24Ke4+7sH8azHWXKd0CFd4mhLWfhYgUiDBpQ=", + "lastModified": 1715787315, + "narHash": "sha256-cYApT0NXJfqBkKcci7D9Kr4CBYZKOQKDYA23q8XNuWg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b211b392b8486ee79df6cdfb1157ad2133427a29", + "rev": "33d1e753c82ffc557b4a585c77de43d4c922ebb5", "type": "github" }, "original": { From f8a712d7a106cb264c312ec989177f1c675cf765 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Mon, 27 May 2024 12:04:19 -0700 Subject: [PATCH 343/667] added custom readme file --- custom-add-ons.md | 117 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 117 insertions(+) create mode 100644 custom-add-ons.md diff --git a/custom-add-ons.md b/custom-add-ons.md new file mode 100644 index 0000000..0dfcf41 --- /dev/null +++ b/custom-add-ons.md @@ -0,0 +1,117 @@ +## Custom Add-ons for your Sovran Pro + +Add-ons are extra features you can have installed before your Sovran Pro is shipped to you. + +There is Jitsi Meet that is available to be added on. Jitsi is a video conference software in which you send a web link to a video conference and anyone can join. +https://jitsi.org + +There is also Bitcoin Knots Node available to be added instead of the regular Bitcoin Node. Bitcoin Knots allows a special filter to block unwanted, unusable, erroneous, yet harmless data on the Bitcoin Block chain. + +https://bitcoinknots.org + + + +The code will be installed in the `custom.nix` file. + + +The code for Jitsi Meet is as follows: + +```nix +systemd.services.jitsi-videobridge-helper = { + + script = '' + + systemctl restart jitsi-videobridge2 jicofo jibri + + ''; + + unitConfig = { + Type = "simple"; + After = "btcpayserver.service"; + Requires = "network-online.target"; + }; + + serviceConfig = { + RemainAfterExit = "yes"; + Type = "oneshot"; + }; + + wantedBy = [ "multi-user.target" ]; + + }; + + + services.jitsi-videobridge.config = { + videobridge = { + http-servers = { + private = { + port = 8090; + }; + }; + }; + }; + + services.jitsi-meet = { + enable = true; + hostName = "**CUSTOM_DOMAIN_NAME**"; + config = { + enableWelcomePage = false; + prejoinPageEnabled = true; + defaultLang = "en"; + liveStreamingEnabled = false; + fileRecordingsEnabled = true; + fileRecordingsServiceEnabled = true; + localRecording = { + enable = true; + notifyAllParticipants = true; + }; + }; + + interfaceConfig = { + SHOW_JITSI_WATERMARK = false; + SHOW_WATERMARK_FOR_GUESTS = false; + }; + }; + + + services.jitsi-meet.caddy.enable = true; + services.jitsi-meet.nginx.enable = false; + services.jitsi-videobridge.openFirewall = true; + services.jitsi-meet.jibri.enable = true; + services.jibri.config = { + recording = { + recordings-directory = "/run/media/Second_Drive/BTCEcoandBackup/Jitsi_Recordings"; + }; + + + ffmpeg = { + resolution = "1280x720"; + framerate = 30; + video-encode-preset = "ultrafast"; + h264-constant-rate-factor = 40; + + }; + + }; + + + services.jitsi-videobridge.nat.publicAddress = builtins.readFile /var/lib/secrets/external_ip; + services.jitsi-videobridge.nat.localAddress = builtins.readFile /var/lib/secrets/internal_ip; + + services.cron = { + enable = true; + systemCronJobs = [ + "*/15 * * * * root /run/current-system/sw/bin/bash /var/lib/internal_ip/internal_ip.sh" + ]; + }; + +``` + + +The code for Bitcoin Knots is as follows: + +```nix +services.bitcoind.package = pkgs.bitcoind-knots; + +``` + From 132994c97bc5f8602419a58351622a837a6f4a26 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Mon, 27 May 2024 12:17:16 -0700 Subject: [PATCH 344/667] Nixpkgs Update and Nix Bitcion Update --- flake.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index 1acf8c0..2819990 100755 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1715290355, - "narHash": "sha256-2T7CHTqBXJJ3ZC6R/4TXTcKoXWHcvubKNj9SfomURnw=", + "lastModified": 1716561646, + "narHash": "sha256-UIGtLO89RxKt7RF2iEgPikSdU53r6v/6WYB0RW3k89I=", "owner": "ryantm", "repo": "agenix", - "rev": "8d37c5bdeade12b6479c85acd133063ab53187a0", + "rev": "c2fc0762bbe8feb06a2e59a364fa81b3a57671c9", "type": "github" }, "original": { @@ -93,11 +93,11 @@ "nixpkgs-unstable": "nixpkgs-unstable" }, "locked": { - "lastModified": 1714980352, - "narHash": "sha256-Z4vJzxMjgCM+tciU7859uPNuy+pwuGhutvAkKidpzvg=", + "lastModified": 1716577010, + "narHash": "sha256-jSqiwxHJmnXcba8nR8HdDY/JIfp57zPCgkIAI9abVUw=", "owner": "fort-nix", "repo": "nix-bitcoin", - "rev": "881f4b4bb1bed267483a54ece36a584171c571d6", + "rev": "e21a687b7b09bc02bb0e367c6a5755735ab93e18", "type": "github" }, "original": { @@ -125,11 +125,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1714809261, - "narHash": "sha256-hfBmnYFyz9I1mdrC3tX1A+dF9cOUcds5PIMPxrT+cRk=", + "lastModified": 1716451822, + "narHash": "sha256-0lT5RVelqN+dgXWWneXvV5ufSksW0r0TDQi8O6U2+o8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d32560238207b8e26d88b265207b216ee46b8450", + "rev": "3305b2b25e4ae4baee872346eae133cf6f611783", "type": "github" }, "original": { @@ -141,11 +141,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1714782413, - "narHash": "sha256-tbg0MEuKaPcUrnmGCu4xiY5F+7LW2+ECPKVAJd2HLwM=", + "lastModified": 1716361217, + "narHash": "sha256-mzZDr00WUiUXVm1ujBVv6A0qRd8okaITyUp4ezYRgc4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "651b4702e27a388f0f18e1b970534162dec09aff", + "rev": "46397778ef1f73414b03ed553a3368f0e7e33c2f", "type": "github" }, "original": { @@ -157,11 +157,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1715787315, - "narHash": "sha256-cYApT0NXJfqBkKcci7D9Kr4CBYZKOQKDYA23q8XNuWg=", + "lastModified": 1716509168, + "narHash": "sha256-4zSIhSRRIoEBwjbPm3YiGtbd8HDWzFxJjw5DYSDy1n8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "33d1e753c82ffc557b4a585c77de43d4c922ebb5", + "rev": "bfb7a882678e518398ce9a31a881538679f6f092", "type": "github" }, "original": { From 0adaa35a75a109487393f1f5e31a58337281cc0c Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Sun, 2 Jun 2024 11:30:09 -0700 Subject: [PATCH 345/667] updated logo --- sovran_systems.png | Bin 23137 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100755 sovran_systems.png diff --git a/sovran_systems.png b/sovran_systems.png deleted file mode 100755 index 618f61e62581d9214459805f1f7a35bc1f977514..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 23137 zcmeAS@N?(olHy`uVBq!ia0y~yU|!F_z<7p(je&u|Dt(>_0|R4grn7T^r?ay{K~a8M zW=<*tgT}<#iMAex9b}Hi2X`+DW$*5=NLis5B_LXOMN4F%(+bh3QiGjexM!KD=<4+~ zWgk4)e{@xI_vUqc>zWjPFg|+mWXTI9)qnb$TRJ{I*dhP^o$b4Oj81D$n5@o~x$tGv z%nsM1AyuI{^{(Q-E;a|Uq@+m}PZDW={$p2r|N3&lc~5KKoxiv?O^5A=%cID&8L5wW zAH6)g>0sr2izA;ldDZyYq+Md|l;62-$Dd=C&o>+}c1|-g^p{Z*E7o1J#o+X8sgELs z5m!r2i3jPep0nK|`zTlToyq$RW?T%Pw$rbe!%!!QQ^-YQ#exQu zf5GGFCzeiF&EVF@I%R=l*`EjXA9hD;TU$OvnXq{BnMWNxQo4GqATG@aWrg-S*zyi??p?PnY`pmm%g?(Y%Y|c8m-R3~Wi>?k)^* zAUI{>);SCe44efXk;M!Q{D~mUxWayUCIbTldx@v7EBiBUF+OeWdzMaq3=9eko-U3d z6}R5r-B|Sa#I|R@ukMf)E>tez$qPOvk@J2>PIig!w4Jtr{R}(Jo!Xwn`J4P;IHWA{ z^6keiz2rG_9Y+;hubI_PgY*j#3=Lw$_Ce8={yI0((^$Yh_;b{1&7{2b0 zD?`aMv)%K%PuzLjZ!_=G-HFQF3=9n$f44d_ShQYf?Kt!0|C;}w-^5zPmi@U@B&d1s z@BR1xWgEpA7#Lc@6I32g@;K+C%fP_EvA!WXp!PpIOB4eG zgFswk+~HS2r;d3P|Gh8iuDZ%$_xgX|r@Z6h;{+?6;S?}8(_w8|$aLm<@Atcz%_R^2 zRz1T6vbHOb?OJQcnyiJUYQM`5t_gboM0=rkM(MYmM%CqW?v;D@>7EI5EIWOZkAZ>V zkan9$Sh`f$>I=8hB|rR&HMraDQRr3vlS7UpWZ|}~7*S{C)obNm>&EsnGB7w)xb`Hj zirRkb_?xV&DK8>gudXzgzI1-^zV*3V=k4%5u64#pn;UHCFCLFj&4TdFtH0KI_XoX; z^m32ceLg3Sd(+ix&Y%12cCQVH;{ln+YQ<&GE$C^@vF7W7UDJ!c^*wV)w7ZvW88QHtF0bx6m|M^Nw@%Vy?|s!)yF!284m#b~NR%TSw%zRc|&&Z9nzqRmu6aT1S4>C!_TKVSa;evhS$dV$<8zD+x)7;lsew`5>ocqn?9mn$^$!{#5ED>hFp;(cBA!nY)E z-n(g1^IoZ5{#qaR?T^sv+PtTC|BES2ns45o#PWRkd4=eyBI`3huzI2VR3ERB2TJk{8+IfdVJF9P>pD4f$vdlGw z`QOsEYuh$=g?biDdCgvGwv}snvE+4~tngJgZ)x3lwsGCouQy`WybACsRtG1EDyci? zU7xH??dUH0J#qH(-C4V*W`#{%AayP7@S8xFZ-%Tsxh*74-d`n06!y60=1pnhn-rt$6gm948z-S`1Y}QxxZ3f%x z#htouZCu?ht?%2vMd#Pz=Hg%spb?I>8D0 zP?bVlYuNMy;livkfr!=Twq5Pf>MhyzGv{^n>us40BB>Lu z=9b0D-WPwJ2#&DHeCt9pw#H7rk?Fa3+T1YJ8H(5Z-L~>_*ZsP)+CVz%{oPe7Bd%R_ z?h?yR;^y6ueGXgzy$*4D?Q}{g@wU-fzu6~W=wydVy$RlH{dV5Ws|Q0xELE#SQEE**7y3P*X+wiS%2s{hg>XU59r&-i+G#cPeH&a-q% zgxB3NeOa_G*bAJSWm5}E-zx19pLjfY7q^vl<>!)c*0A}T*X*34x-dE|++99pb>HQc zKeYANT|2hUdA|KEgSA{6w>kcPI_2HAIjo@2xW2GG?E1}Xi`%XxY@V{U@8G)XB%z3p z7b`>0-us>N>x!r6M!S?M(cd$ltc_cL<`B4WVwa2w4?4H)))Zy7e6Ga{uWk*QbfC+w zIY(XfXy4f@T)Z1#>V%`72c5fjBTs#@XJnH^O2E3MbM=-^oZs5vxBEzw!f!ndHeJoU zK+}y^U(a|AF5{(23rc6^o?SX;<4NYWu;~VWZyu<*{q)})iPQi(HwX_56c$L6nX-Sh3e%PG^@^_J^` z=gP*!wG-&N{j5>x$J(*`Rkw&iVC=^vJK9S2v}LdOdsp zukzkQ?_1a9Bt+i-tN%H}dBQvGIbOSS%bVIFj;k^roV^~LX%dZQ)QavlEj%b?RLQmW z>VtZb&1<&ayi}<><=p+&s|z)k=$MNCy}x+M<{gVU+@pf_d@7M^=h~=un)%woRiIqX zv3`eH#oX5quBOSxOb~MNU$|9^H?IB7BdH(8k=LAFB|Tu=diHt6n$}x3SE63=Ipth6 zSn1omJV7x`zGqM8U7Z{~C4Q4)CQ!v)B04EZ)0^G5`C{OycZ=gr=iBC17GG(sH9N2% ziuH=tnnzU`tD4@{Wo+IO6|_facf0F*=QrLRpJUD+HScbSeeqY}@fH@4IW1g1dcHHA z&Td;K6%(7j8&o@yNQPpQ|F;zkYbb$qgzyKNtyYeXI6n z@8TC{FUN+idb4Sr>8T69^2$n83(dk-m4BUD{y*mb|Cwy_&wp!LYo*YAW&HF7VEO!H+7|0ii zHV^(}88UpkHN|r`$8EE=Uz#q*g`%qY)`VKDEx&d4xDZbk<94o1wYmILUYl;{RXwqd zXXDJa8;2f0Pbsz)SNfE?B3cHVpmuY!nB9I*k$b4mK{ecS#;U3-2uQPy+CDyHo4 zxsBhY{J4K^^xHh+h2@{X6>nb^uV~5~j`!`$KiNw0*H%kmYf=_?uL%-TUp*T(-`$JtM>J zWGgSaRd?b%-~XR+r@Y!0FF$`^+p6Z$4PYbZvrXBSS{rwL>0O(>z|VA`iFI8)ePRRKV_dD&&kQ3Ki5uS(@Un9$}cz1oJ{n;@n*_9 zIm={528M@I8UOgW?Cbnl<&$r$sLOVF@A~YkLMH-J4}Lwjt>tQ-yi16qS;&mLuhMTt zTdqk}-r{~gwj=xa?Pb!1dQYt)q%0X37!JL5VSjC=S`+s@sU)U5yu+jHo=jYoRoqpb z)vveN`Zj;wJH@v?BSiT8SHZ0Jcb!gcdUP)>nRnX)F0q*G;}t8vD@=ZU@^uiXFg*0S zfbE%C^Rbxb?AMNq*X`e|DY@oLn9>@>Wn63RalN}Ye>I-G>2><+f~8NpmNo9Qi>Q5>rSRABK)u-h zr3YEAJ&d>CT<&=7y3U`tQ=9&rJN@wfR3ZDa+P#)NwJNRVy==Pme*OE(;)<6qB5b<eDqMxVMEK-MYj=}S*Yzx-gy*Dwpd+Yd^vO?hdyd%e@@?8s*-UPgj-vQM@P=pFJL)!bwD0Vw;k-M=ll_1GqqsKD zjH41xZvxkU{_D}-|1xd^O9Uu!^yVm}2W!1i-Z6_$M*C)EamAYl5;vyl3r88Y2>jN1 z_w>kOT~)OMOrW07!L6D*_I3S~y5!^%cW$<`*bj*#IoB;a8{~3o)6w<`cU!iG{PMlyrLDd>T+L1VTHMjMj%PJ?3kfHHGH$8O!L1h< zXBT%|={pp!>+~qDIa~0<-~C;;?Pe~{&uI3H`F&pZ-2bndch|a?`SdWq(Y*WjTqFx9 zi9P07SIoO^S@yf8yyoPafj{^9oSLbg7H2T+x5HO~gH`JP^@Q} zc^K>7|9dG-ce%6s!{ZZPN0)B9ntDF$+Sa5q-R=Uz)*<)i@i>}!MO?A500rX4hW z@o%l}wQXWS=k!uzv}PRGdvNQNI(;SnHFygQEh=wACQ`&A-9sYkQ@ z#?(0bZPBlLmi63FI$#$xml5PeX6cr@Hg{+Klbcv{yZ5-m!P1rM4_7_VJ+qDJYH3KR z>b6+*dES=X)iMVS4QgL}Kd>zlOl3}m)Q}K|CVQe%VF(V zr$0UNMqrM9s$fF>;v!~H4Rx1owp#VhGRc_coYuz{#wAlWUFn}Gbl^`^ab|;ASN2(h z1J8oa9S}-jWN0Wqd8GMu9m_#e)0*|A*@8dkKH$1>v2^Z!&z)&^uf(|Q%lshwsk;73 zLDktqkLGcJlH}A)2R(vkoOXSZ_~78z&^Kv~tKQng&5&fA;~Z1yRnD*UY0>p5oijUX zuCjSJe>HF$RVMt1nLFl{VAK+G@7?{exA;r{j<2>7Uxm7Vf0|;C)ny=FR-A zA&Qf}=Unn`&@BOV>%N{^khOH-I?WwcD~vWcy<4Lb2F8k@LXg3-fuF`J^$=`L4XDa+mR6+18F4%Y42{|MwgJ zS;_gm%sao5k7YmmO|xRD5@q$ne>cB$;9+3cBYAYz^;>3!YN0ZDkx6hKn5xU2^C6)$)S1QpPh+ z`MrGiJ$RROQ5W-Ewp}sIYhF4pb~G=#^pwN*`&CxnISdR9{LT8(*BtL>ACAABRUR z!7iEbRqprFhwDRCFBzZXVPG&=`C-+;t(gK}E+u)-F&8w0 z#+S3*r+?cvCbN!7AR)P?ei{G6h*t~@3~P8+Ggp% z>mU4TeZa+IcVOMoJ=|5I3F6FE^=h&A#FMt!Ff%YDL_7@rUYz@C-|H(2JhvY)agy|&Y8t>aZTU$wKr za@Abxc6R)6D_}k5x&E#Gr9EyTOYUT)W!!#YW46b9avW$V`D1(dU9sgWL*891oVz-+ zdD-#L&o+GhQs?76W%Ywoa_blvx8()+&f)o9ANy*r90NnbjE7&%cE@+!tXp^OV9@oQ zvrICg=9{;lx%_)&-SasQxEAC#$X=*E?Xu*h-K=|Q-;2+&FfbVG_z*RFVGdWtI_bN! zr@Vdk{OrS{kAEB9{5|0Tmq0=<)0%gZ)*|{r>u&z#d3qRZMd&HX>&psWM(O1Qb-mdW zuX9k;!JW}e)~jLd+y7N(gRD<8GcfQd?~$6uy*saav(b;6N^;weOe`{Me883Pit*Z# zsAn@jB{DD=bbMH~d5SOd#=n|(Bd2rUx4C=v=o+23N0ZYZnhP4W`|z#f(icCOPtL9260B6%!IUAG zFh76u?-GUlwVBz*r`j1A9PT^}{cdmiQt!>KbEP*wT=&^lVog!afsKjq~ZD$t8cFuK{%at11Hl+Vbc>7wwNgf;+ z8y<#U&(@V{y0`f4`Ky0p_DlV_di?XVf-fKJR{a%EXRDw4fa`$Co7A@N2WGO}xXEyD zn&;0CUHOBH12(-sTziSQr={Znd|Hu6&!hE7)`WG;Z^=P4CXnKHS~@J;Cbm z?C#(HwlI7MY^a^^Ot+-%(t(#tAMU-dhm(QfP__Nd?v(o*4uCX4Vsl68@r2p_Mbazm**DFbt!tT=RUC`GizBH8a~|Oy}K>(rhq{#)BVjc`TtauK3yt{mXZB3(=4Ov zp$PK@#mQ`b%Y2{xx^iWYX7Ao+BL)VEii)cbu75f5=jcMu%ZDC3e|LVi^RtJ!Hr}7D zt~vp!n9akri~r*iyo#6Mwcrm7AmIGL zIQGBP?{AjA_jya?*cci{Kwbzmu#BP zK$Xo(i#2XvTR81f%(2(W{@2rY?o(guag+D+#9&T`BR<#muS?REzqV>xHa`b6w)z}T zu6_L`<1&xqy)yss!?u~Or*aE#oELT2V)AF^o$UKby7Fcfe<2}~yEN0_q0#GGTf*0L zM1Nl1&s20-Auso~q9j8V*M{t!`^rMT-1{Z-@^$(*QBZ=GuzLNfbnWWA-peK%Zp|}q zuRVQz-=t@oo-Fkzn?9=o*iZ;qmFdhFJeb1CMSpRlS90{d(TU9~Jjx>au_CnqAlKadS!M2QG$*JI=n_ zfAVYB%=_R5XHUcXO^NG`mzevP7k{*w{QKa8^t=zdK&4~{-`sXkez0miur#KgX)2T+v`fFKKr^wDK*`X!NH~E^rr0BW#PMYSU^6jms2tMQ@wh^&5KdjmmYk7WAk!t z2A9{j%1`^u0B7T0dMsvB@9kna@IbbWm)-QtE+&U1elPVVzxG`kCZh_9iBjLq)Aeqj zHsQ61TI*=4Q7oo8+vMUKW`;*)Z>`hTMehKYxXBl6UQI4cHuo=I8FPQ%!-{({x87~P zW%4@8wbEFsyWR{mq_ddMM669<(nYg3Hi;m`2ORwi_5m>XAf4&t}2_86ZQSb8f^xi%V8OJKqdUwW`!GD%&wNL zeSJn@&olcdkmT7POFIX87g$ zSPc|*_N)h&MP6F#yjX4h>va2sONlc;+6_Qj9V)i|{j@#z%9W6&IrGii_r9Ke#mLZ# zhxvesiD_O`K?eiF48MxKVl4g3OVX{qUzzgMH$;Xr%;;P8o+mAykzs~Yh3SpkSIe$# zefhj|%Z=Mt7aWOf0U6Fa`Is*_1O(!En-=6=i0M4>=GOV_&9;3e=XaU$7BMg!F3w$f zGG_J#*h#Jj^3h6zblVc7H4d(^}W0%Z{gDv zh6X|FrMqL+mCMEzOkrS<2&}j|^NgN%+ikYf3E7#949(6j4ZtbSXw9UD%eL-p31^rw zE&IM^aqb6p1_n2wxb?LgkB1rgELLMUP|kMR<%Jaw!-0-NueWZ}%a~9F zcHNtYp{G}-?K`x(MOV@+^NPz!0|uY-Ti;J>{Z_`nz~Icc{!+lBYOnHbiN+}>3xW;Q zb}$_)Y!vT&tmtqx_c0MkbWnk#A-6NGV z@p19Bt52U_jn57~`62N8Z)OIc%kw^PF&ywXoZYaYGPgirR|+T*&DfTGpV@fZ8AgVL z8xODE7PB<>FW;A5nA>djP?SN{tKuMOJS85$Vd zuHSxBr&qWAM5dI;mYJ1HQzRHJnC-b#D8bO6*mixH!;6N;f}XIo0F~Wy{_L@oiQdES z)yBw>dwBJowC_{+m>CQXe0Y^xyXv5rWv*A->^d{m!wd|9f*0d>uggsnieqGuh^*Mk z+kEiaZm!Mi7#OVARI@T9G}Qfl@jr9J{?)k^d%tb&`ut3wXz%NJ{gMnH-c=|5yIC#- zc3$gshQfp`j^K2+syyHe&odo|k z-E(5LyMRyZ@#l8xADtFB`XFVgfey-kOkd(p04_4nL%$(VLuI*-GU|=}V za`^Stnc?RdH=jN8`s)0%VwPZ4cR#$^e7T_Rp3EGx=KW{iJuj+loACf_Uo!9dTP!c7 z9?!fqd-?8}&lO_Ci{3|o^f;V(7`pC!n%MG^bmQP#A}zN|nC1z`fmUuL?0Q)G&`_W) z=DpYQM37R2Jyo2uuWvgs@$<6>B60bfe=jR~viK>FAxJJE;o;XP%XR1d4(Ci{1_^B7 zUvIVerSTp;+kZNj=W8FT3I~Zw_=B}w}$f8JLkl2Chir$rxm-i^9KipNSx7)46R?pd4zE7{?!fi5xaPIxqNm!x-udz{w5H|yfw^tY>z0B>uo;fXfIP9f zdilIdbA2DY(cUAryu|&c0my(J(>+yuvlS1&-r9HK%r0<&tE? z9?}M@v)|Ko{KKo_{ot@<*w=o2b+)H&{WF_@iriV1OD{tVv)S`&jxMh#I8+&g`PX;% z9m<}acOZQGNz0|yX<*@mClJ?F@9|m?zymV6;|^$yV(X-bGrm>q-S%v%-{Fp+Nh;hs zJ6+$NUvqeRK*x#GPm4}6?LR+t-}%r5 z-^1sAK7H%Gj*E)$#M~7MvsFB`l-BFszZ_`ay!LT(!}?1xM+KkAT=@KbwMn`8`$KU` zwG|7GzchXD^Z&okcV4AOvDC%uJ^vrL{-ikn{`<#&&X3ibew?wcT<7bq*{}cR-}~qt zvAd?tbJCu!6UFlTcbDC{7bUlT`st^e=KV^arE)T+|7lQLroIxt*>_L>`#)nXx=uWP zT6EKTPP^T`?%S5mfBo34o2qa`RwJpSH6Gt zSpIqRsY^O;amR^YQ{Kg~)biPgDNQOfnPK|T{62H6><0VS)pNf8`PXOV5nEl?|NqmM zpQ6)GKh5Xc|9`dI{e5-&`x`S(G@dm3(kyxS@t3vjjQ9Q(?X2Pav+vfN|2sQsGK=qj ztoUbttYDr*TWiSwBOmsD+F>SYi~H}#R`b?Z{j&S@wrHo!@;@`xJU=a4Uwxv- zxu-AlpXq|{)8h4}-Yj=O~_UhGsO*L;{|4S{@J#O$!wANs=sHU`8sVPIIu*$5w zh7zfFg&!6&ud`SBwMpn>4BvYHNu~Z3?}g*lF;##5r2YDwv$p2% zKZ$eF=cg%sS~maZqT|_hnt#vu=*XU5x$fNm*7n8|mmdFBeD=O~rk%#BcPlq{tlMa3 zx8Cggyh@(uK1b%i%+k5;+weKV@X>d%SGN1I6!L2MrxZ=I-&OdY{rV@HZRhPj{%Kxc zyP)#EJjWh>haldys|EKTkDR1Z|H4=8*rr)KJ8FCH-b3&2skZe;%;EY_D=}mFR)zwvVnJKF|5FA>D3j_D;<`&tl~* zc(isLlX|g-HC*%b)%Fh`Ql7qS>v~x6x{57qeW%^&SC<%VmUw<$X=*1YQ9IkoWB!Bm zQ$P5FCuVuBeQjzyo#XW7_7Yun<(&^Nv~ImEyeCV*u*{ir-B;;X(&;a@Fy&l-9>Mec zCxhMe=W^-ClK6d!$M8(acDeeR@f&-DdEv*>&K! z+=e^d0;j*L92C_!>$~gp>+e^ME@f91NS?lJx8B^pe2Zs#!xysYpORb8VqIgj zd9g4t&4amcTaZim_pd+M4}Q(skQ(#8OgEl){hRq+jaG4b(`^}LKO`N^{@iDq@OaB} zfu3{M9=(4y=WyU@rTSX=(5p7wQ@QS~e;S`$zjXUeTlrrVqKx}=xCA4Qi!AxtHoIPI zMfTgv?fYE$v-GB))}Q~^y4LBpRP~Qb#m3Jfr&Uf;IW5M&`qvjz&q?~zPq)5WXtB?H z)9I&&&b;2?bp6&R3{L6gZ;E!>_$5sE`uk~-rj*mUIG1mplX6_2NHdlR9sH)D#P2!jk7T9A z7twXaf|xp%R>xcWF-CaGfWwhKSkzLaZxzfI}WiH}lu9lk5JoezmWy!hY7Nh&AJ zKW-06uiqK7kLT^JJu!OvbIyHQ#jnc!w{P~Pig(N3|C}&s-Mx#I#Sc2wUM(w_9DO_H zh!ykX!YrRW13A^$)sJ7V{OJ8RYDbJ-_DA#TX?zv@S3Tb|zE)7)@$aeBQ)AXg8wDoX ze?9o+%C;#{<)ymnbJAZNcGxr@? z|Bzc+C~3eqH}>@YqBR#MhsU1TCqA)hnW}@$LsQR5tv_a8{b{fyPH(!6=cL6yDxLOv zOiD5Q@SB7G%Pd=U&rg5nbS(&+e*X2kTS1SHevpdoQ#oUwow5EHQ;0lc%;}bJmzBR3 z)m_t1nkXNu(*Nsx==WW7Obri&?sJ~K-m$Q7XUw{(?D34;geTtT zVcPTFwA9@$_y>n>u8OBo>s*ax$G$|_z1p$wW7IpHJ@;(x>Ykg;>>u*rF;m1fzkh4z zy(xKlRN&`~hdHzEZjrV5ap&=etct6b9v-^^9!7*R<`}5V;jqbKx{62k)elhRH`&$G>E|fd`{dRJ`y~~sM zN6SsjFWUy!e%gAkG~0rCQ~!sphv&~oKe*~1cYO?JcklIt1=qiQJ81hf^iWQJ@^86M zjWx?`&M>)EfU^Den|}qI82mFNTCV6u^SLn0fBwk5zGm+1{(aZkUW&J@uU>U=`l9DX z_h(MCRhDzsaG(47d)rrL)!0o!k8Jf`-By3O^{32(?{D01JuKH#y1(KC)3I`0b+-Qp z1@4JRwEQt?5S_Sw3UB1+zXgY0tu*JCSrhv7(|Nhoyu0)y%YN?eZLag{UBQ$2_SWjh zwHhJKGfg}v{r8#l#NPEu^n&{jFFnceNc`UWUMwNz`lj=n60P+1Y;n&E*40HyP6IKdxloXRc*D{XOs8oiY3$Hb?Hh^PSxy_;dur z#(Sr$_D*Z7(ye}NR&!6L&)mO!&aKCM=D$@u`;6w?d}rc0$yE2t+8=*v#62gS(e2xR z{(|9Fw|ryG^xkJmpB`Px4b~Q|IU69d%Wge?w~A+)ZMlr>rCOse-`ysvoUC);7oFxg zNk^8gH2dRj9fd7_HuoKCGy1rFY1o?injikniSM|d_otHO`>}(ur}w{VeElfx_OtFe zjSe=~jMkjJ7;bb%{n1|D44e3Dx8w2Nj$-rf9~W8r>*%isLceP24u1L5y644D#$(-6 zUJGl6|FOKm`?C7*t3MYf{L@IS%zxt@#&x{9(nbAFt$ZtA}K-lBXr@`LtG zU&fpH|L)Sqzt0@a<;}bIqHB3G!EKB6UI=e_6GeoZKwqd{}MPr;>b+ zW}|ESZ+^5r5F=qG{OPBq=sfEid>1!6AKqkm*Sor2-%6oEpoZVaXimFV@pZKfs~x?T zS5oEP_v;7$@M$c+#kN;z+lCe19BoCq=WE)p2dGNg?CpE4V&8S*y-|;lj9lK0+HI~4 z4ArG!rVb}RO!E&)ONwVRS=M;hX430S{fAZ;`99wJlUYJBleweSfwfSa-Daep*`^YxQP# z%8Uud~UQsaaxAo2IN}pyQiM2Z-KJ9P9?dP=%SC-sJKlx!|-z3LA?OURPe-pTL;Y z`>Xa{NY41#^UnXvE6+<&&R$z%56t=G#MN__QF8wKRDE92)jz5{j zJyCi7SD*i_jNIKhdVc)b;%sxzNlWEcA8pugE|-13zP7dN_zC;VI|CfeOKvN&8pl75 z-Mf5t&fLez)vN5@pO3CI=l=aJYFhc@KMx+3@ z)c==u4wM1yGlCuzr`37*=NO)St#$q2x$wTWiyv3*Gv6j(lOJ+l{Pc|d=3f>bZSMGU z@v?VC$IE>gA7^&`xv^cU@K|gd-HMD4jPJtg zpI@*Kc49Q>`@MO4_Rs6VyKdi4`yRWuZr;3uS3-6t9RH?p?D?(hu9H;G|4KNNDt~F& zb;;XjZ&fMGRXG_pBXh>7=|7Vj+EQ!skE~t&b^YEo#i=?B3%av+7C!rGwtM@}q}*A$ z*`HNwa}_+?Zwsz0)sfqEL*bgz*J{4XTyQh&Uh1#D(rQMZ{-K=R>)-cg z-OYY;yi0A&lJW*zy z>m-%A3%FsKziRH~i)2yV^8#`B+ewHj{PpVar{I$=n!>wL+O?_9@_-J^lXh>#YYRie;}oihkC#Z9U7q-|ENyv+t&}WhY;J z$5Jo4|Mqg9gI+FSo|CS8cQ~DWJ*+hL$RF0Xy9^_N z_VnK#L8rR+y;E%oU-$HVcHHMS$L+n@_N&hZf1U6;Gcj$&@f&Hp4{x0Euk9@L)s&4k zoW@{%&GBY{yw3AR`}a~zjr$JiNO35t^|Dbhd4vF_=T$CF!4*S|;($S8i-v$C@5 ze0JLht^_ZMVg`pJ55L~Jta1D1w$=XH(Qm$s7?puB>Ir|EW z!lVbQe)lHddd$cm*d9Lrb%^si-@RtqZsmS8N3;rFHY}ZS>$jOmbh3(+DWk-xzrwcl z@gFt_OC0}eDVRC$YEQ=c>&vctdYAs-ut?@`y~iFu{j_Sg#*ND>I2j&_?mM=Op-m)i z>hzn}KR>&0{mg2P-;EFNa=wfBW%{LbitB;z0;e}7uGMZ3=yM7^exv1&AIpW0TVwdw z+wErgezkDMrNk?irSGpCuzsSyYeKdo=X!=?Ilh%Ie;i|~S$3e}-T8azam?-EX>p0g zP1`kvt0pF{t3B(Sw^Pvbv6_@ABS+%;)5->Nmh&|YW@T6Ee)=3{>E7S?IZI$)<*s6` znQXG{oa+TNrH!|66-f2%8k$}b&j}!M`pXz@4hw>ttztr^=H#1hTpr7>^`bb@}%zY3H>1Q+4+bzt+5KdNxhsd{)-+huQ2K z&z^aG@%rnQtrF>b`hwQ^|9xAulSNZ~Z;am2r$v<_6Ync=`_J6>-fmXl7sKDTT#ui) z^Eg}f*7V5r@9%z=JH7Mp`|p+Y#cQwKa4-1Ry2JhWkG&hkCf;9d8e)4=`ER7*U%lz) zzqFn&+Ax3d`|8f^@3&5?4cR3T{(gCpuDV$Mq4eVqD-U${ez011;M2tgInmY|>vzZK zz3w}e+Ao##UoADWNM8JJSpE0=HRp|P%W=Qlw&a(_-7|XWa`%E2`{u68UVreocvRZY z)ZO1c-21L8Z}1~yN?7g3ogV~KuDzcx6#ehtqUYxiY~T7tK7rd-FI!W)WL0}z?f!LV zE^o9f`!h3L=(uy|47a-rydoi)?{Nvr(pq*k3i;t)k+)Mj@Ecn**vj?M@SNI>wUNN5+JOXODM{3Hg zUpcp~EZb+5VgOp20~)jCZCaSCvFF?7XXgIperG-WUap()dh-$P)3uqPVO|Di?)9;` z)0KtFzLlOl4zhvaG4J~0e2247l&)`q3_=%H>=olm-+ps%;RBm|zT<5MXU>2}a}U_< znRh8x@9DnD`d)F@qF6;$64%;XD{DvX1wHfTm5;^ zJU9bGkHwx}I$wDs@15QSwqiy>#a^q=RkQC(pWipnynUI`6SJjq}qPt?#-79$=r5RAI_7$MEfUFVH*@1A~vno@a8*i6?FbLI#N&KKxqP zdN%6Pgx`Cm@@8&+v=|g54TWvt_hXyZpPg_nf8M)WZ%&?qILXHl@|zF+JE+4uXpYF+0KekhklTa^M84+ zT!F{zw-#usg@NIK3CMsYB@&=85pb>8yX*eyr_(Hb8H-&Zjy|Be=NDhg^}2gLx2AqK z+k5SbS`OIHY(jDVFW+g@Z9l_lW}OvarK2?I(?*cYffI*TJ3iRLHCu2BA9My_$-}F+ zr&+c!ZuWgyaP7nU*f@QVZ3^E$WNk?8%e}!9X;mYV77vQ@zdX6G{Xv3SeM3CK@;O{iTPshxh02)+@dH z;e9Z~?FxDOZ~SB5W&djbx<6CjOnE1lTlehj<-7Zr+}Zccc>hbCwHEvC*-O{`1C3x? z$TBRb-nIVwRjnDHpB=E3Vrb~xJg@TVrH9$sq2W>zxh&DYvp!V0p1OHmayc`@m!zc+ zzizhY<`ZOK@R0exJA3IqSMLZH?N1M#WOC5Huo?07TkHQe1SzipQJk%1A~h0zuVc(oYQqPYVr?% zo_F$%_S|;H1<}6zYMkpB7!)!pOeH7$ahbm+e)ieeSHe~5%S*0r(e3BRj%Qq83|d8y zS!du`!OFn!_R#9KgLlF!cm+FT>+CkKXSgtTS@o}LTQA#yR{z{;Ie0U-Y<|_BN+l)j z+MxGRJHB7qvtDQOdIo_RdHv2O4Hy_+=E+^_##aZl!( zj2Z*O1JylQ;`g&(d&Eka&pfm5T-2UtdpEq-X83Zf;9BX~iA)R(_YSR2ys;(s&J^#@ zcAL)ZV>(ct!DYm+S>0|SSA+|>8E#XeHy zTjtj4wyZ5?P%uf0Wn^%$c^JC=?9OfOuTPczp85IN2PNLQ?MrJvFI)4lw0p|t_1u1v z3>yxw(Pm)i(A%@>*xz8;y0pjp*5{_h>$3To+WzOSES#*pB)`;hT#E(V52-0RzzCthc;H{M&hYj$nKRfK7zFh8 ztlD>NpWf{~FM@YPcYECXaDCdFzg!ISFMCN`0~z4ha($W59f8g3*Dd_9*S&fF;d|>D zKI~k^B?|Vk%)`*{{=A02Z;9wk-=*t3`}#cYr-vCHxM(NLT9pu2qMy&e&`@`HHJ9P< zUEGZ`2d9&xO1D5#vyoNgDN9BjSA`3=ADwdsZ!z^qGD$eDb;j=X1B8ySO)AQ=W}s^MkBQUu)~{$!wF+Wnd79 zt+*N;8xq8UO4;i{vs>J89Tyv?lbM<08L^mT>G$!aobAof~whf zqjL)v_u9>J`uOVE%e<$GHTDvJuBPAq&cKko(0A6XSx?uVpY43^A`=6{#kT8N7cPnX z%c*}*S!{4~^4G1opVbb3N)(*9K4(62!lD~e>VkZFeC^(3^hHs@7B4PSJy0k&)U!1x@7HI_sqEe zr@mP-EE9=&ekn$8PkOct1B1be534q>zy2+wbgrr?=hS?;xO%;`)co~p>RAm0^PMKE zF)$cx`>@IFKZQmdhm?HeNdBR^`vYAmIu+7r-`l zw%nDAOE?)Ac#QXCeO|omli}+LE6>jU=6mqRvzK`fALh^4HMbICwocG zGGSzBc-R(xbxZlHQybrWyZGS!4-I*pB zmj2ZIe<=9phqyD>3YYf9PGMB=YI}O<_UC6Co@OvIG&r`0Z=Lo!`ngWbu5a_q*(dAf z?wP_Ly{5i)_t|&ibMhG61Y&$ox5`^aF)$>EJPh^D-#{YEq06$ z6a4Acz-qu0-&&N&z+kWx6tS7F=ghQN6L|I9wBEbzM;Ds>oGg%c>%hyihCR#+r{2qa2N;@P z2c0?9dh@a<14EDTo~#eqvsAav+jwP?>Ed^XceSm4`};=M&1nK93Ty^j9%MzaeqPc0 znSp`fn0Q?1 zYzz#G`PXkPU3}eU_nW^}_hhcIH5R>0{w?!WA&qy=yqiw!4sS}L=PY|F>b@{Wf`P$D zaZgsmU9ZpEjMwq@%PrZt@Y3dWFFy$$*)Q>D->bg@35-XiV#JfezB-kIf@SW9DBcDs zr}-!UHPt6>{CD;AH%pcX24#+Q#)h}W(rZD*z9D#deb&bBtH0K*+$E-+{Uh7>;}zZ; zij#=Cxm*y*%fw`CjvGYSOk= zK1MMIo`Y9Y?860*=N9H|{=NRra|VV38K8ntcInO|-+!9zj=%XY=dRuH6tgd(v#0*3 zu-9jM-_F3j;Qa%u=|yw1CvQEy&0_n_+N(Qf{FY&0*znE!jQ%^b-T$3WMP55EqV#F@ zx~W@bm+bBIxcuf-piABNtFE8TcANj4d-eCPMX%Es7j!>}TKhAfYwGXM&psS|_;0(w zMEf1*85tPDJ)f*!zp`e>tG3Lydn|3dKG&@&zCQo|#Nb`kB54VXM_!&)*kQG{_^KRh zKE%m~SKCd@kJ8_DCCEfv?e~7YTGN6ceYS-&8)X~LNtk5_304-YajE>PB2he_nStRk z$9k!R>q?ilYGt3LBzI~}%Wt+gcfgy=w-O3rJ8C8Wh&xd~B=qLTI_+0B3`NknfIsp`2Htg5)+3HQN%Q0>{xHane ztuFx|1Fg@1R>j-z$+~gd`}42sTU-wqXFgC-`m}aAgEmV9!@Q=|nH$!;3)HiVejYV_ z?xnla{8<3Kamlv@5{wW3SJ`{^-Twm4mki51xBrcj z`g8SbW$}re`h7>Ou8Z%T&dk6d@q2&Uk466<%m26ebNl}PzhUdn%bofE_Wl2V_5Y9C z|I6IF_3;0H^8Y{2|NnIV-|PQXmFn}kHh|f;|NpiB_q_i5mwo^K|Nn8^{{QZS)xYh+ zL?%An|M&0x&tM_(<;D$d53)9;*;(iF{a=6j{g3VY|NpjkdGbH=*U#l8-~WH?WME*3 zKG_hz`{b|d&u_n}d-~~c>9vC?*&QM5t@q|!y1RJB`2%__dlMLA_}8gr2e`Uy)0^As z>QbWVe0h!D>lj9c178kh=l+(N{5O7X)7{GA3PYZW3z^ou+}C9+__NvX2!kExI<@cW zmsN%3S;Hq6#B`is2J3oqXf@lO#Rn5s-%`F>n!Dm8PyPyq-$|A;Y8FovW;p)f)vd^i z#2?l-&WkcI_?Yj>I&j~F=a3=Fw{ji#9w&AwYNI&s<8wKJzZ-o?Y>``t}MmLqN6{rgV! z`(N@Dg)Z9u+=QKDUHCiUc$w`-4EL(%`M-SE=+DZ)uw`n`i@i2o9>JbbRkQC}pY6Gp zmf(Bp-o26!FM9K|KhB=g%e3gt@{d)9sjd1aj&=4Lj;M*c}}U3$&hb6Xi191KpLxPQOdr2M(5Zu9R6 z-kclrc0WF=c~{gbVav?7GdfSa&Mo^NdRU*KDSP$)I_D!ZE(zi0fqsthV=SptuI1zVh>joYN!^&R@FMLn2TSxM&_iSG6IpdAhj=Dr%TadP2(jDuT z%$b<;NclkB)J?ndCx=z*O6_@`uDSj4#<{I$Gj=p_wqNU)`)Bh_HsR~Nq+4^=UU;yJ zS0={Q1++=-G^oGNvA&Ld>9X6NTX;9jJ=-U-Cw+R}5v3B9VA z(Y(#S?Rnly_HR7n#SGf1J%u@E^;Du8-5hh86HezW@MgNpUc7nCmip7%20 zMylAi6~~j$FKrgQ!@TPCrEiITdQYv+C-k0`vEthPE+MbbKW4L<94G<0OC^*VWEnRX zU16BbUh_Uw{p!xc^?u<=JU@5k7r$fY&jWP;HMLd5#I8Sfc0af^)E?AvK9p_Fxb5qL z(Ch2=O8)!mbgFbio(+jI1}VHE*B2eD_qg8-8rd+uq;bs$3|#$=FH9O)83;ckRLJ<@apv+GbBM zxw`7)?5AZGEa9L%n7tVdzt0vFyjDJNE2moVQKIeahlT|=#it2$8@7c_?9<|wxwd`V zt;1IpcYw3DF&D^>k0oD}S#dwS(79tmQS5EI4}}FU_jz@=`dt4Mb9g~^#@i(>5$~C~ zHBYxZ7rP#Qdu>6^JKLQdH4me}#k~ddoA8%;Y}d+;xw@p(-jj*5vJlHnU(2!ah4Pkd zwI4oRx+-Qc?f3RN{z~)P_jdm1Ayxul_Q_hDQ2RC|{ z3Y?LxcM(l8-X*Mj!E)Dy*QU82lZ|-S9c-TU*m3K8Wvp>jo(y^I4eI?t0rvc|Y_nyn${<1RXc4-XrzL!?jP1>L= z&}VbNZdUJsaKD9Pv;NP z`CcXVal^i;kmSg6!=HVY-K;%#K%0EeoeDga=2z){{787mS<{;Q$Z+;%hH0l5{f`_Iszn+nKHAFlYyzJFqS9$D*?__jLYm_M2tN%CWI^ig9A3xNMx^ zitO|5nFaa_L)Rxyf4h87%<=6v_n!56pB&!13cQ8&F3%$0!%t3Y-d$_UQqQFI= zXY0}uzuwsL)+eTXiahVU8NG9#Z8e+zsnO&1r3bHSsw|i8&Yk|=F+DnW`|FRJ`eMCT z$1i=%o(DeuDEO&u#mqCA{sf{VYf*D9fd+H#sni$LG7!rw7SwAD_KE_w4&M_7DBf&nDjgX!t4A zFJ|SbF3wGlcTG!^3Jdmc+`8-8CcAUO$8UxS)~6oYHdP9eYUdtUaC=$x^67p@tSsie zd~l_zU=8z=MUNjp$?leIdh>(nb{%x$5|N z${i!(B@pnzG2PzN!P`)FYYx-T_u}7+wVoRru?Fh z6F`0VICYzV?UD|^V%VdnKDD#{^L+0Vq3eA!&-ZPTPYm03`+RXA_o~$n`Xw{ z#;qwosW1;zc5Bm{;JH&DdXZ7nMK2Z3|mNU%AY%rO-@}u2_oQ-FWsJV*^H)b$=j|z z-qx#|aM$MU(ntH2UXD9;^ICHM_X(f@%ALQ#$0WqC&EI=|)|Lzt;oOd^$=25eq&FR2 ztM97&Agpieg6yn+2X|fx&0N1a=KO1$ZIWUB3%5=v`n~eZ=bgF1YB3%^KXf1S0qx=M zI>)}Ke;@lVU2nz3yc^%kiG(5Vyr{ zN90zXwL9Cc?S20Fa@jUhk5bSm`$N(9?5ntCSKM0T_|=YkHS@2f`^2svtO-?;Ix1#8 zZN9T;+G;m9mRtSJSzB8Jw&s-v#O7pQWm~ypJ@2=D>q5^vPQMv;ss)@*=eDcg_FLqx znI8RZUwn7Fk=I3m*+1t^ef99*p_saRuS>L4k5}rhc&2!6bD#6;80PHT7o?UPI*_<6 zw8bb9lqOvJ6Eihajn!8(u3?$c`c)$7yV9oK+SoPDD{A-aXN7jzh`itab>*r0{^VIl zFK0D{+$vqbCm9v%^-WV4R11akIf@)Sv9!eCMZ&e<4%<`xH*Y*XVSl(vVCDbf+HC3j zzt_awu6zD_zw|GjRS$n!O_txhCbxg%cfLbgKOb58*gW+RxF~$VG~x7tvek-aC#;Ul zUcP&kbJ6Wum+eZMxv=T&;krWmp;y`-)=pS1DY{<-?08^f+24NE+-yjJ(bvpKxYe5;FX?N`~`$ydlcbr0U4^x^A{E3Yq>@mlmKp1`MO~j#|LdAP4BbcWn-Gxy}r2m z`p-j9M|vq<+iK{uTrsTKTg(2Glk*Mlo4J+uT`L+drth0DKRw*}ME1h1FCNUAeY$^b ze$2Ux(}Q;{&H~NfeXzPIa69eytaZ*grqZvI&)--U5X^dOj%}*-&z#kgSGBgBWBR*l zkyym%zI7YT7H*wf`W%!x!g*8=oXcv?o_^s%X2;bHns7uPx>?snRl#X1yh0`?TyfjyuNAWFH@(&^+{U%dJuSoj zPtK|WtI6`lt2gu2mFhQMeO$UF?R*%hr=dNI{l2$s&F*!kZ*o7}4W6);eOb)^kpD3~ zwadaz?|fY^wzdAA}B4*81Q3Rx0x~@%$>+jMP|gjEhcexv{q+=eNup(BAnc$A6u& zOH0k|3$>kbmHAw{@y+>c3A(rcp7~vGzFKyA<&xtoCdj|;-(EW{>vieGZ5$ugWP{J~ zQ@SKjedS=)weJbB-m&3A`*!R8Vfm%C=9z6gv)wm&wJqQzeDNZ~zpIxY*mf_~^j&+T zBJOwm7wNFYH_NX(XBsR7C)cidY@c(tUth^SH8w6cxdY!g9z&iEo+NL7S?+4B*+n1+*O732|ZSKmKpkWz@ilYur zIa|#(@D@DZ$0p8@f+*Q zpNr0i@`K92qZ;tbhN1H4?2o4J$gNP-M)|YJN+VuMsziga(xnC&1yV$(*+7snBudz`8mp4g| z8V^6u$yq9w!YTXMrhb**`K$8tS4Gx-O9#gulRc~8{p{rX?1E{j?e%?U?zLXs`8+;w zZR%1US+Ly_ty8krCP}>reGH%c?=2D>?7f@9c|utgq*bIjvVmZNGXx>ohY5IG(>wGm?lU2to;&kefhbsjfd8JJAdi$^Nm;8xz{9u<~bjV2DY!Ln(;O` zkbCR#g>AQ^45pShZn2wvOFb2ZwX!Z{D=*+t&JZ?YFYRzVBU}>#=(3`+eW{ zwQT=oZP;?@yuohJ#PDbyH2v+TH1EwSC#LV z%st(&<{qqPyDlwo^{4wMbER3p{xn#U5Z!uX)teo&R>~Gh7Hxg&zx8XsNACRF!Mn77 fJOLdWH~T;H$3@y3f-EETKz&e8S3j3^P6 Date: Sun, 2 Jun 2024 11:33:36 -0700 Subject: [PATCH 346/667] updated readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ee82056..86e721e 100755 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@

-
drawing
+
drawing


From 6648ece69a5a86c7b4b01385d3e81d395e840338 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Sun, 2 Jun 2024 11:59:11 -0700 Subject: [PATCH 347/667] updated readme --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 86e721e..d145ab0 100755 --- a/README.md +++ b/README.md @@ -1,7 +1,9 @@

-
drawing
+Sovran Systems Logo

From 56a92c2602a51c8d636c6a969520fceb785ff274 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Sun, 2 Jun 2024 11:59:47 -0700 Subject: [PATCH 348/667] updated readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d145ab0..b6355f2 100755 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@

-Sovran Systems Logo From 538c477ba2ed8103d10dfea6041122aeb11cb0c9 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Sun, 2 Jun 2024 12:03:55 -0700 Subject: [PATCH 349/667] updated readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index b6355f2..c1aac65 100755 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ Sovran Systems Logo + style="text-align: center; width:500;" />

From 9350832c1e1668aebe7034526bab9e5f4fdf8138 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Sun, 2 Jun 2024 12:05:21 -0700 Subject: [PATCH 350/667] updated readme --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index c1aac65..1b6cc1c 100755 --- a/README.md +++ b/README.md @@ -1,9 +1,9 @@

-Sovran Systems Logo +

+ +



From 5c8cdbd36c38836b3da463e4ddbab907388f2143 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Sun, 2 Jun 2024 12:06:09 -0700 Subject: [PATCH 351/667] updated readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 1b6cc1c..6b58ee9 100755 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@

- +


From f32232410d3e00c9121cbca3091ea48e38129b8c Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Sun, 2 Jun 2024 12:06:44 -0700 Subject: [PATCH 352/667] updated readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 6b58ee9..04ab636 100755 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@

- +


From 0afecbc0972374936e010f66befcd62897168b66 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Sun, 2 Jun 2024 12:07:34 -0700 Subject: [PATCH 353/667] updated readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 04ab636..1665623 100755 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@

- +


From 35653224e952ee7daaeb4197b4eb7bbec56bb5b6 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Mon, 10 Jun 2024 14:17:05 -0700 Subject: [PATCH 354/667] Updated Nixpkgs --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 2819990..5467c5b 100755 --- a/flake.lock +++ b/flake.lock @@ -157,11 +157,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1716509168, - "narHash": "sha256-4zSIhSRRIoEBwjbPm3YiGtbd8HDWzFxJjw5DYSDy1n8=", + "lastModified": 1717786204, + "narHash": "sha256-4q0s6m0GUcN7q+Y2DqD27iLvbcd1G50T2lv08kKxkSI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "bfb7a882678e518398ce9a31a881538679f6f092", + "rev": "051f920625ab5aabe37c920346e3e69d7d34400e", "type": "github" }, "original": { From 3df9cc3ff6e3ae7fa72ced1fb66d8e6f1c7a072b Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Sat, 15 Jun 2024 09:24:39 -0700 Subject: [PATCH 355/667] Nixpkgs Update --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 5467c5b..7ae08f8 100755 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1716561646, - "narHash": "sha256-UIGtLO89RxKt7RF2iEgPikSdU53r6v/6WYB0RW3k89I=", + "lastModified": 1718371084, + "narHash": "sha256-abpBi61mg0g+lFFU0zY4C6oP6fBwPzbHPKBGw676xsA=", "owner": "ryantm", "repo": "agenix", - "rev": "c2fc0762bbe8feb06a2e59a364fa81b3a57671c9", + "rev": "3a56735779db467538fb2e577eda28a9daacaca6", "type": "github" }, "original": { @@ -157,11 +157,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1717786204, - "narHash": "sha256-4q0s6m0GUcN7q+Y2DqD27iLvbcd1G50T2lv08kKxkSI=", + "lastModified": 1718318537, + "narHash": "sha256-4Zu0RYRcAY/VWuu6awwq4opuiD//ahpc2aFHg2CWqFY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "051f920625ab5aabe37c920346e3e69d7d34400e", + "rev": "e9ee548d90ff586a6471b4ae80ae9cfcbceb3420", "type": "github" }, "original": { From e4105590d95bea9d163323cfba5f6bdb2feb3a97 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Sat, 15 Jun 2024 10:06:44 -0700 Subject: [PATCH 356/667] removed ungoogled chromium --- configuration.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/configuration.nix b/configuration.nix index 6647eec..90707f0 100755 --- a/configuration.nix +++ b/configuration.nix @@ -179,7 +179,6 @@ in libreoffice-fresh dig nextcloud-client - ungoogled-chromium firefox ]; From 220f79633a306819e4dbb05b1a7245065c3d20eb Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Fri, 28 Jun 2024 18:37:01 -0700 Subject: [PATCH 357/667] Udpate Nixpkgs and Bisq update --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 7ae08f8..03e372a 100755 --- a/flake.lock +++ b/flake.lock @@ -157,11 +157,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1718318537, - "narHash": "sha256-4Zu0RYRcAY/VWuu6awwq4opuiD//ahpc2aFHg2CWqFY=", + "lastModified": 1719254875, + "narHash": "sha256-ECni+IkwXjusHsm9Sexdtq8weAq/yUyt1TWIemXt3Ko=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e9ee548d90ff586a6471b4ae80ae9cfcbceb3420", + "rev": "2893f56de08021cffd9b6b6dfc70fd9ccd51eb60", "type": "github" }, "original": { From f0d64dc7991f1f422aa0731ea86c1d07a512161b Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Fri, 28 Jun 2024 19:55:15 -0700 Subject: [PATCH 358/667] Added CLN --- custom-add-ons.md | 17 +++++++-- modules/bitcoinecosystem.nix | 68 ++++++++++++++++++++++++++++++------ 2 files changed, 72 insertions(+), 13 deletions(-) diff --git a/custom-add-ons.md b/custom-add-ons.md index 0dfcf41..fe726dc 100644 --- a/custom-add-ons.md +++ b/custom-add-ons.md @@ -2,14 +2,19 @@ Add-ons are extra features you can have installed before your Sovran Pro is shipped to you. -There is Jitsi Meet that is available to be added on. Jitsi is a video conference software in which you send a web link to a video conference and anyone can join. + +1. There is Jitsi Meet that is available to be added on. Jitsi is a video conference software in which you send a web link to a video conference and anyone can join. + https://jitsi.org -There is also Bitcoin Knots Node available to be added instead of the regular Bitcoin Node. Bitcoin Knots allows a special filter to block unwanted, unusable, erroneous, yet harmless data on the Bitcoin Block chain. + +2. There is also Bitcoin Knots Node available to be added instead of the regular Bitcoin Node. Bitcoin Knots allows a special filter to block unwanted, unusable, erroneous, yet harmless data on the Bitcoin Block chain. https://bitcoinknots.org +3. By default Sovran_SystemsOS runs LND as the default Lightning node software for BTCpayserver. You are now able to run CLN asthe backend to BTCpayserver instead of LND. + The code will be installed in the `custom.nix` file. @@ -115,3 +120,11 @@ services.bitcoind.package = pkgs.bitcoind-knots; ``` + +The code for CLN for BTCpayserver backend is as follows: + +```nix +services.btcpayserver.lightningBackend = mkForce "clightning"; + +``` + diff --git a/modules/bitcoinecosystem.nix b/modules/bitcoinecosystem.nix index 23b5a52..a5b71f3 100755 --- a/modules/bitcoinecosystem.nix +++ b/modules/bitcoinecosystem.nix @@ -1,8 +1,8 @@ { config, pkgs, lib, ... }: { - nix-bitcoin.generateSecrets = true; + ## Bitcoind services.bitcoind = { enable = true; dataDir = "/run/media/Second_Drive/BTCEcoandBackup/Bitcoin_Node"; @@ -21,6 +21,30 @@ nix-bitcoin.onionServices.electrs.enable = true; nix-bitcoin.onionServices.rtl.enable = true; + + + ## Electrs + services.electrs = { + enable = true; + tor.enforce = true; + dataDir = "/run/media/Second_Drive/BTCEcoandBackup/Electrs_Data"; + }; + + + + ## CLN + services.clightning = { + enable = true; + tor.proxy = true; + tor.enforce = true; + port = 9737; + }; + + nix-bitcoin.onionServices.clightning.public = true; + + + + ## LND services.lnd = { enable = true; tor.enforce = true; @@ -30,9 +54,10 @@ protocol.option-scid-alias=true ''; - }; + nix-bitcoin.onionServices.lnd.public = true; + services.lightning-loop = { enable = true; tor.enforce = true; @@ -45,45 +70,66 @@ tor.proxy = true; }; + services.charge-lnd.enable = true; + + + + ## RTL services.rtl = { enable = true; tor.enforce = true; port = 3050; nightTheme = true; nodes = { + clightning = { + enable = true; + }; + lnd = { enable = true; loop = true; }; + reverseOrder = true; + }; }; + + ## Mempool services.mempool.enable = true; nix-bitcoin.onionServices.mempool-frontend.enable = true; - nix-bitcoin.onionServices.lnd.public = true; + + ## Lndconnect services.lnd.lndconnect = { enable = true; onion = true; }; - - services.charge-lnd.enable = true; - services.btcpayserver.lightningBackend = "lnd"; - - services.electrs = { + services.clightning-rest = { enable = true; - tor.enforce = true; - dataDir = "/run/media/Second_Drive/BTCEcoandBackup/Electrs_Data"; - }; + lndconnect = { + enable = true; + onion = true; + }; + }; + + ## BTCpay Server services.btcpayserver = { enable = true; }; + services.btcpayserver.lightningBackend = "lnd"; + + + ## System + + nix-bitcoin.generateSecrets = true; + nix-bitcoin.nodeinfo.enable = true; nix-bitcoin.operator = { From 899730665c394943f0bbbea584f8821c406426b6 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Fri, 28 Jun 2024 20:01:43 -0700 Subject: [PATCH 359/667] Updated Custom Readme --- custom-add-ons.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/custom-add-ons.md b/custom-add-ons.md index fe726dc..3eaa5ef 100644 --- a/custom-add-ons.md +++ b/custom-add-ons.md @@ -13,7 +13,9 @@ https://jitsi.org https://bitcoinknots.org -3. By default Sovran_SystemsOS runs LND as the default Lightning node software for BTCpayserver. You are now able to run CLN asthe backend to BTCpayserver instead of LND. +3. By default Sovran_SystemsOS runs LND as the default Lightning node software for BTCpayserver. You are now able to run CLN as the backend to BTCpayserver instead of LND. + +https://blockstream.com/lightning/ The code will be installed in the `custom.nix` file. From e5f08c56e22029d8c9d0477a9d52d7baa4100337 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Sun, 30 Jun 2024 22:04:23 -0700 Subject: [PATCH 360/667] Nixpkgs update and configuration.nix update --- configuration.nix | 8 ++++---- flake.lock | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/configuration.nix b/configuration.nix index 90707f0..628f4c3 100755 --- a/configuration.nix +++ b/configuration.nix @@ -76,9 +76,9 @@ in services.xserver.desktopManager.gnome.enable = true; # Configure keymap in X11 - services.xserver = { + services.xserver.xkb = { layout = "us"; - xkbVariant = ""; + variant = ""; }; # Enable CUPS to print documents. @@ -118,8 +118,8 @@ in users.groups.php = {}; # Enable automatic login for the user. - services.xserver.displayManager.autoLogin.enable = true; - services.xserver.displayManager.autoLogin.user = "free"; + services.displayManager.autoLogin.enable = true; + services.displayManager.autoLogin.user = "free"; # Workaround for GNOME autologin: https://github.com/NixOS/nixpkgs/issues/103746#issuecomment-945091229 systemd.services."getty@tty1".enable = true; diff --git a/flake.lock b/flake.lock index 03e372a..00433c4 100755 --- a/flake.lock +++ b/flake.lock @@ -157,11 +157,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1719254875, - "narHash": "sha256-ECni+IkwXjusHsm9Sexdtq8weAq/yUyt1TWIemXt3Ko=", + "lastModified": 1719506693, + "narHash": "sha256-C8e9S7RzshSdHB7L+v9I51af1gDM5unhJ2xO1ywxNH8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2893f56de08021cffd9b6b6dfc70fd9ccd51eb60", + "rev": "b2852eb9365c6de48ffb0dc2c9562591f652242a", "type": "github" }, "original": { From d2b126eb63f8a0f0cef9d2cd37260e5f1bd2c1b6 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Tue, 2 Jul 2024 09:04:41 -0700 Subject: [PATCH 361/667] Nixpkgs Update and Bisq 1.9.17 --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 00433c4..1488dad 100755 --- a/flake.lock +++ b/flake.lock @@ -157,11 +157,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1719506693, - "narHash": "sha256-C8e9S7RzshSdHB7L+v9I51af1gDM5unhJ2xO1ywxNH8=", + "lastModified": 1719848872, + "narHash": "sha256-H3+EC5cYuq+gQW8y0lSrrDZfH71LB4DAf+TDFyvwCNA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b2852eb9365c6de48ffb0dc2c9562591f652242a", + "rev": "00d80d13810dbfea8ab4ed1009b09100cca86ba8", "type": "github" }, "original": { From d4b6587ed321479c3ca49ef6be123a3da4f7935f Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Wed, 3 Jul 2024 03:08:59 -0700 Subject: [PATCH 362/667] Updated Caddy for Nextcloud "caldav" fix --- configuration.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configuration.nix b/configuration.nix index 628f4c3..e5c36c8 100755 --- a/configuration.nix +++ b/configuration.nix @@ -236,8 +236,8 @@ in root * /var/lib/www/nextcloud php_fastcgi unix//run/phpfpm/mypool.sock file_server - redir /.well-known/carddav /remote.php/dav 301 - redir /.well-known/caldav /remote.php/dav 301 + redir /.well-known/carddav /remote.php/dav/ 301 + redir /.well-known/caldav /remote.php/dav/ 301 header { Strict-Transport-Security max-age=31536000; } From 4ba22c13b2368dcd676bba0b76b8fb49de71a40f Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Wed, 3 Jul 2024 12:55:32 -0700 Subject: [PATCH 363/667] Added Bolt12 feature to CLN nodes --- modules/bitcoinecosystem.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/bitcoinecosystem.nix b/modules/bitcoinecosystem.nix index a5b71f3..41de2e8 100755 --- a/modules/bitcoinecosystem.nix +++ b/modules/bitcoinecosystem.nix @@ -38,6 +38,9 @@ tor.proxy = true; tor.enforce = true; port = 9737; + extraConfig = '' +experimental-offers +''; }; nix-bitcoin.onionServices.clightning.public = true; From 7a33b3ce9e6a23bd0f07cebe38c5e0ea20c6373e Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Sat, 6 Jul 2024 20:27:34 -0700 Subject: [PATCH 364/667] Updated Nixpkgs and updated Nix-Bitcoin Ecosystem --- flake.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index 1488dad..1930c14 100755 --- a/flake.lock +++ b/flake.lock @@ -33,11 +33,11 @@ ] }, "locked": { - "lastModified": 1699821751, - "narHash": "sha256-UlId5jvJFmkVcKpn0oZ2VTvWAc/mZy6butRZGk73xXM=", + "lastModified": 1719830626, + "narHash": "sha256-7Wb2KiImYxrrIehtodNG9IvumFtZ2f5DkhrjnUBe7zk=", "owner": "erikarvstedt", "repo": "extra-container", - "rev": "842912907bf189ef17a80ca09ba37b6bdfc76c49", + "rev": "37b479006a80a936ac17e82fb2e8c07b822e17f2", "type": "github" }, "original": { @@ -93,11 +93,11 @@ "nixpkgs-unstable": "nixpkgs-unstable" }, "locked": { - "lastModified": 1716577010, - "narHash": "sha256-jSqiwxHJmnXcba8nR8HdDY/JIfp57zPCgkIAI9abVUw=", + "lastModified": 1720159196, + "narHash": "sha256-FrO4fgh+NRhUg/B80pzyz45vco4/OskHe1u8+IREPmc=", "owner": "fort-nix", "repo": "nix-bitcoin", - "rev": "e21a687b7b09bc02bb0e367c6a5755735ab93e18", + "rev": "32f72e8f0e7ef780f3d753f56c4b94f1f5106a00", "type": "github" }, "original": { @@ -125,11 +125,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1716451822, - "narHash": "sha256-0lT5RVelqN+dgXWWneXvV5ufSksW0r0TDQi8O6U2+o8=", + "lastModified": 1720027103, + "narHash": "sha256-Q92DHQjIvaMLpawMdXnbKQjCkzAWqjhjWJYS5RcKujY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3305b2b25e4ae4baee872346eae133cf6f611783", + "rev": "61684d356e41c97f80087e89659283d00fe032ab", "type": "github" }, "original": { @@ -141,11 +141,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1716361217, - "narHash": "sha256-mzZDr00WUiUXVm1ujBVv6A0qRd8okaITyUp4ezYRgc4=", + "lastModified": 1719957072, + "narHash": "sha256-gvFhEf5nszouwLAkT9nWsDzocUTqLWHuL++dvNjMp9I=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "46397778ef1f73414b03ed553a3368f0e7e33c2f", + "rev": "7144d6241f02d171d25fba3edeaf15e0f2592105", "type": "github" }, "original": { @@ -157,11 +157,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1719848872, - "narHash": "sha256-H3+EC5cYuq+gQW8y0lSrrDZfH71LB4DAf+TDFyvwCNA=", + "lastModified": 1720031269, + "narHash": "sha256-rwz8NJZV+387rnWpTYcXaRNvzUSnnF9aHONoJIYmiUQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "00d80d13810dbfea8ab4ed1009b09100cca86ba8", + "rev": "9f4128e00b0ae8ec65918efeba59db998750ead6", "type": "github" }, "original": { From a63b03be5c557216adfefeafb49492a6100e596e Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Mon, 8 Jul 2024 09:54:53 -0700 Subject: [PATCH 365/667] Updated configuration.nix to reflect new nixpkgs --- configuration.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/configuration.nix b/configuration.nix index e5c36c8..b2a22c0 100755 --- a/configuration.nix +++ b/configuration.nix @@ -148,7 +148,7 @@ in gnomeExtensions.just-perfection gnomeExtensions.appindicator gnomeExtensions.date-menu-formatter - gnome.gnome-tweaks + gnome-tweaks papirus-icon-theme ranger sparrow @@ -173,19 +173,17 @@ in unzip parted screen - gnome.zenity + zenity libargon2 - gnome.gnome-terminal + gnome-terminal libreoffice-fresh dig nextcloud-client firefox + element-desktop ]; - nixpkgs.config.permittedInsecurePackages = [ "electron-25.9.0" ]; - - programs.bash.promptInit = "fish"; programs.fish = { enable = true; From 794052b9c65103afaa725a89512d053d7163910a Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Sun, 14 Jul 2024 20:14:25 -0700 Subject: [PATCH 366/667] Nixpkgs Update and RTL with Bolt12 --- flake.lock | 12 ++++++------ modules/bitcoinecosystem.nix | 5 +++++ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 1930c14..fe80a63 100755 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1718371084, - "narHash": "sha256-abpBi61mg0g+lFFU0zY4C6oP6fBwPzbHPKBGw676xsA=", + "lastModified": 1720546205, + "narHash": "sha256-boCXsjYVxDviyzoEyAk624600f3ZBo/DKtUdvMTpbGY=", "owner": "ryantm", "repo": "agenix", - "rev": "3a56735779db467538fb2e577eda28a9daacaca6", + "rev": "de96bd907d5fbc3b14fc33ad37d1b9a3cb15edc6", "type": "github" }, "original": { @@ -157,11 +157,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1720031269, - "narHash": "sha256-rwz8NJZV+387rnWpTYcXaRNvzUSnnF9aHONoJIYmiUQ=", + "lastModified": 1720768451, + "narHash": "sha256-EYekUHJE2gxeo2pM/zM9Wlqw1Uw2XTJXOSAO79ksc4Y=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9f4128e00b0ae8ec65918efeba59db998750ead6", + "rev": "7e7c39ea35c5cdd002cd4588b03a3fb9ece6fad9", "type": "github" }, "original": { diff --git a/modules/bitcoinecosystem.nix b/modules/bitcoinecosystem.nix index 41de2e8..ccddbea 100755 --- a/modules/bitcoinecosystem.nix +++ b/modules/bitcoinecosystem.nix @@ -86,6 +86,11 @@ experimental-offers nodes = { clightning = { enable = true; + extraConfig = { + Settings = { + enableOffers = true; + }; + }; }; lnd = { From 4ee8b57178d4cf677290133939efe9005d7d5a6b Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Fri, 19 Jul 2024 22:32:25 -0700 Subject: [PATCH 367/667] Update Nixpkgs, Removed Auto Power Reg, Added Gnome Performance Fix --- configuration.nix | 25 ++++++++++++++++++++++++- flake.lock | 6 +++--- 2 files changed, 27 insertions(+), 4 deletions(-) diff --git a/configuration.nix b/configuration.nix index b2a22c0..28e11d9 100755 --- a/configuration.nix +++ b/configuration.nix @@ -88,7 +88,6 @@ in systemd.enableEmergencyMode = false; # Enable sound with pipewire. - sound.enable = true; hardware.pulseaudio.enable = false; security.rtkit.enable = true; services.pipewire = { @@ -125,6 +124,29 @@ in systemd.services."getty@tty1".enable = true; systemd.services."autovt@tty1".enable = true; + + # Fix the GNOME Desktop Environment Performance + + nixpkgs.config.allowAliases = false; + + nixpkgs.overlays = [ + # GNOME 46: triple-buffering-v4-46 + (final: prev: { + gnome = prev.gnome.overrideScope (gnomeFinal: gnomePrev: { + mutter = gnomePrev.mutter.overrideAttrs (old: { + src = pkgs.fetchFromGitLab { + domain = "gitlab.gnome.org"; + owner = "vanvugt"; + repo = "mutter"; + rev = "triple-buffering-v4-46"; + hash = "sha256-nz1Enw1NjxLEF3JUG0qknJgf4328W/VvdMjJmoOEMYs="; + }; + }); + }); + }) + ]; + + # Allow Flatpak services.flatpak.enable = true; @@ -326,6 +348,7 @@ in ####### KEEP AWAKE for DISPLAY and HEADLESS ####### services.xserver.displayManager.gdm.autoSuspend = false; + services.power-profiles-daemon.enable = false; ####### BACKUP TO INTERNAL DRIVE ####### diff --git a/flake.lock b/flake.lock index fe80a63..950a132 100755 --- a/flake.lock +++ b/flake.lock @@ -157,11 +157,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1720768451, - "narHash": "sha256-EYekUHJE2gxeo2pM/zM9Wlqw1Uw2XTJXOSAO79ksc4Y=", + "lastModified": 1721379653, + "narHash": "sha256-8MUgifkJ7lkZs3u99UDZMB4kbOxvMEXQZ31FO3SopZ0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7e7c39ea35c5cdd002cd4588b03a3fb9ece6fad9", + "rev": "1d9c2c9b3e71b9ee663d11c5d298727dace8d374", "type": "github" }, "original": { From 8b876d8e111dbb3794b8e20d8f91fc171800909e Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Fri, 19 Jul 2024 22:38:19 -0700 Subject: [PATCH 368/667] Removed "charge.lnd.service" --- modules/bitcoinecosystem.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/modules/bitcoinecosystem.nix b/modules/bitcoinecosystem.nix index ccddbea..c9634fa 100755 --- a/modules/bitcoinecosystem.nix +++ b/modules/bitcoinecosystem.nix @@ -72,9 +72,6 @@ experimental-offers tor.enforce = true; tor.proxy = true; }; - - services.charge-lnd.enable = true; - ## RTL From bd6f772b6966f307e3082bdd438fe9353c093c01 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Fri, 19 Jul 2024 22:40:29 -0700 Subject: [PATCH 369/667] Updated Bitwarden package name --- configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configuration.nix b/configuration.nix index 28e11d9..01f4539 100755 --- a/configuration.nix +++ b/configuration.nix @@ -189,7 +189,7 @@ in matrix-synapse-tools.synadm brave dua - bitwarden + bitwarden-desktop gparted pv unzip From 4b57032e536a4063c24b31d6703c16148862a655 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Wed, 31 Jul 2024 12:14:47 -0700 Subject: [PATCH 370/667] added clightning backup --- modules/bitcoinecosystem.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/modules/bitcoinecosystem.nix b/modules/bitcoinecosystem.nix index c9634fa..4ef15a6 100755 --- a/modules/bitcoinecosystem.nix +++ b/modules/bitcoinecosystem.nix @@ -45,6 +45,13 @@ experimental-offers nix-bitcoin.onionServices.clightning.public = true; + + services.clightning.replication = { + enable = true; + local.directory = "/run/media/Second_Drive/BTCEcoandBackup/clightning_db_backup"; + encrypt = false; +}; + ## LND @@ -52,9 +59,9 @@ experimental-offers enable = true; tor.enforce = true; tor.proxy = true; - extraConfig = '' + extraConfig = '' - protocol.option-scid-alias=true + protocol.option-scid-alias=true ''; }; From afe54cbe6f580359290bac105b741d6f85317d33 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Wed, 31 Jul 2024 12:24:16 -0700 Subject: [PATCH 371/667] formated nixbitcoinecosystem.nix --- modules/bitcoinecosystem.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/bitcoinecosystem.nix b/modules/bitcoinecosystem.nix index 4ef15a6..62939f2 100755 --- a/modules/bitcoinecosystem.nix +++ b/modules/bitcoinecosystem.nix @@ -50,7 +50,7 @@ experimental-offers enable = true; local.directory = "/run/media/Second_Drive/BTCEcoandBackup/clightning_db_backup"; encrypt = false; -}; + }; From 0cc205830b63b9c8949a6a2760b77595e6bfe4e6 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Sat, 3 Aug 2024 12:07:53 -0700 Subject: [PATCH 372/667] updated php for wordpress --- configuration.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/configuration.nix b/configuration.nix index 01f4539..fdcedac 100755 --- a/configuration.nix +++ b/configuration.nix @@ -12,14 +12,15 @@ let display_startup_errors = On max_execution_time = 6000 max_input_time = 3000 - memory_limit = 8G; + memory_limit = 1000MB; + max_input_vars = 2000 opcache.enable=1; opcache.memory_consumption=512; opcache_revalidate_freq = 240; opcache.max_accelerated_files=10000; auto_prepend_file = '/var/lib/www/wordpress/wordfence-waf.php' - post_max_size = 3G - upload_max_filesize = 3G + post_max_size = 3000MB + upload_max_filesize = 3000MB opcache.interned_strings_buffer = 32 apc.enable_cli=1 redis.session.locking_enabled=1 From 5ca4b26e703972e83e463527a467ac53c87b89e9 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Sat, 3 Aug 2024 12:16:43 -0700 Subject: [PATCH 373/667] updated php for wordpress --- configuration.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configuration.nix b/configuration.nix index fdcedac..d8670d7 100755 --- a/configuration.nix +++ b/configuration.nix @@ -19,8 +19,8 @@ let opcache_revalidate_freq = 240; opcache.max_accelerated_files=10000; auto_prepend_file = '/var/lib/www/wordpress/wordfence-waf.php' - post_max_size = 3000MB - upload_max_filesize = 3000MB + post_max_size = 2000MB; + upload_max_filesize = 2000MB; opcache.interned_strings_buffer = 32 apc.enable_cli=1 redis.session.locking_enabled=1 From 5a6690fcd1ba18885313c69c04ad198ff2a1d523 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Sat, 3 Aug 2024 12:40:21 -0700 Subject: [PATCH 374/667] updated php for wordpress --- configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configuration.nix b/configuration.nix index d8670d7..ba593c6 100755 --- a/configuration.nix +++ b/configuration.nix @@ -12,7 +12,7 @@ let display_startup_errors = On max_execution_time = 6000 max_input_time = 3000 - memory_limit = 1000MB; + memory_limit = 256MB; max_input_vars = 2000 opcache.enable=1; opcache.memory_consumption=512; From 222e2837c53f27e7e97f7b0a15463055c20fd353 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Sat, 3 Aug 2024 12:48:38 -0700 Subject: [PATCH 375/667] updated php for wordpress --- configuration.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configuration.nix b/configuration.nix index ba593c6..e121ccd 100755 --- a/configuration.nix +++ b/configuration.nix @@ -10,16 +10,16 @@ let extraConfig = '' display_errors = On display_startup_errors = On - max_execution_time = 6000 + max_execution_time = 300 max_input_time = 3000 memory_limit = 256MB; - max_input_vars = 2000 + max_input_vars = 3000 opcache.enable=1; opcache.memory_consumption=512; opcache_revalidate_freq = 240; opcache.max_accelerated_files=10000; auto_prepend_file = '/var/lib/www/wordpress/wordfence-waf.php' - post_max_size = 2000MB; + post_max_size = 1000MB; upload_max_filesize = 2000MB; opcache.interned_strings_buffer = 32 apc.enable_cli=1 From f5aa7af6c6bc2d91d46e32705b7833fab39378bc Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Sat, 3 Aug 2024 12:51:47 -0700 Subject: [PATCH 376/667] updated php for wordpress --- configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configuration.nix b/configuration.nix index e121ccd..d78d38c 100755 --- a/configuration.nix +++ b/configuration.nix @@ -10,7 +10,7 @@ let extraConfig = '' display_errors = On display_startup_errors = On - max_execution_time = 300 + max_execution_time = 3000 max_input_time = 3000 memory_limit = 256MB; max_input_vars = 3000 From 59258b103cc6891745464e9cf3a34701376aaf98 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Sat, 3 Aug 2024 13:00:13 -0700 Subject: [PATCH 377/667] updated php for wordpress --- configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configuration.nix b/configuration.nix index d78d38c..784fcd8 100755 --- a/configuration.nix +++ b/configuration.nix @@ -12,7 +12,7 @@ let display_startup_errors = On max_execution_time = 3000 max_input_time = 3000 - memory_limit = 256MB; + memory_limit = 512MB; max_input_vars = 3000 opcache.enable=1; opcache.memory_consumption=512; From 48d058c7c1d0c585017016b4b26dbe59215c60cc Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Sat, 3 Aug 2024 13:09:05 -0700 Subject: [PATCH 378/667] updated php for wordpress --- configuration.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configuration.nix b/configuration.nix index 784fcd8..345733f 100755 --- a/configuration.nix +++ b/configuration.nix @@ -12,15 +12,15 @@ let display_startup_errors = On max_execution_time = 3000 max_input_time = 3000 - memory_limit = 512MB; + memory_limit = 1024MB; max_input_vars = 3000 opcache.enable=1; opcache.memory_consumption=512; opcache_revalidate_freq = 240; opcache.max_accelerated_files=10000; auto_prepend_file = '/var/lib/www/wordpress/wordfence-waf.php' - post_max_size = 1000MB; - upload_max_filesize = 2000MB; + post_max_size = 4000MB; + upload_max_filesize = 4000MB; opcache.interned_strings_buffer = 32 apc.enable_cli=1 redis.session.locking_enabled=1 From b8a9f46e24353936f3c0e02bcc62f9337fda74bc Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Sat, 3 Aug 2024 13:39:12 -0700 Subject: [PATCH 379/667] removed wordfence php --- configuration.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/configuration.nix b/configuration.nix index 345733f..d05ab85 100755 --- a/configuration.nix +++ b/configuration.nix @@ -18,7 +18,6 @@ let opcache.memory_consumption=512; opcache_revalidate_freq = 240; opcache.max_accelerated_files=10000; - auto_prepend_file = '/var/lib/www/wordpress/wordfence-waf.php' post_max_size = 4000MB; upload_max_filesize = 4000MB; opcache.interned_strings_buffer = 32 From 4a8d992bba98188df27fc93ce63483e9d3e05fbc Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Sat, 3 Aug 2024 13:55:01 -0700 Subject: [PATCH 380/667] updated php --- configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configuration.nix b/configuration.nix index d05ab85..89f5485 100755 --- a/configuration.nix +++ b/configuration.nix @@ -5,7 +5,7 @@ let personalization = import ./modules/personalization.nix; - custom-php = pkgs.php81.buildEnv { + custom-php = pkgs.php83.buildEnv { extensions = { enabled, all }: enabled ++ (with all; [ bz2 apcu redis imagick memcached ]); extraConfig = '' display_errors = On From 4feae725d49a9c9b60871b552de4cfdb6c590eda Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Sat, 3 Aug 2024 13:59:55 -0700 Subject: [PATCH 381/667] changed php memory limit --- configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configuration.nix b/configuration.nix index 89f5485..3e608ad 100755 --- a/configuration.nix +++ b/configuration.nix @@ -12,7 +12,7 @@ let display_startup_errors = On max_execution_time = 3000 max_input_time = 3000 - memory_limit = 1024MB; + memory_limit = 256MB; max_input_vars = 3000 opcache.enable=1; opcache.memory_consumption=512; From ecc63c6ee46813936336f99a1ad13f1766a0d0ad Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Sat, 3 Aug 2024 15:17:24 -0700 Subject: [PATCH 382/667] fixed php issue --- configuration.nix | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/configuration.nix b/configuration.nix index 3e608ad..4ec36d9 100755 --- a/configuration.nix +++ b/configuration.nix @@ -10,22 +10,19 @@ let extraConfig = '' display_errors = On display_startup_errors = On - max_execution_time = 3000 + max_execution_time = 10000 max_input_time = 3000 - memory_limit = 256MB; - max_input_vars = 3000 + memory_limit = 512MB; opcache.enable=1; opcache.memory_consumption=512; opcache_revalidate_freq = 240; opcache.max_accelerated_files=10000; - post_max_size = 4000MB; - upload_max_filesize = 4000MB; + post_max_size = 3G + upload_max_filesize = 3G opcache.interned_strings_buffer = 32 - apc.enable_cli=1 redis.session.locking_enabled=1 redis.session.lock_retries=-1 redis.session.lock_wait_time=10000 - ''; }; in From 5fedb3f7163b7da28a0274d329e3d779a108729a Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Sat, 3 Aug 2024 15:31:43 -0700 Subject: [PATCH 383/667] Nixpkgs Update with Nix-Bitcoin update --- flake.lock | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/flake.lock b/flake.lock index 950a132..bb6c027 100755 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1720546205, - "narHash": "sha256-boCXsjYVxDviyzoEyAk624600f3ZBo/DKtUdvMTpbGY=", + "lastModified": 1722339003, + "narHash": "sha256-ZeS51uJI30ehNkcZ4uKqT4ZDARPyqrHADSKAwv5vVCU=", "owner": "ryantm", "repo": "agenix", - "rev": "de96bd907d5fbc3b14fc33ad37d1b9a3cb15edc6", + "rev": "3f1dae074a12feb7327b4bf43cbac0d124488bb7", "type": "github" }, "original": { @@ -93,11 +93,11 @@ "nixpkgs-unstable": "nixpkgs-unstable" }, "locked": { - "lastModified": 1720159196, - "narHash": "sha256-FrO4fgh+NRhUg/B80pzyz45vco4/OskHe1u8+IREPmc=", + "lastModified": 1721655077, + "narHash": "sha256-ljmt4G9cB0hM7cPb/Alx2pBE65oDKhbkWZlTJzrezAw=", "owner": "fort-nix", "repo": "nix-bitcoin", - "rev": "32f72e8f0e7ef780f3d753f56c4b94f1f5106a00", + "rev": "52fb04737984081c494954c2a132d3c2571096c7", "type": "github" }, "original": { @@ -125,11 +125,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1720027103, - "narHash": "sha256-Q92DHQjIvaMLpawMdXnbKQjCkzAWqjhjWJYS5RcKujY=", + "lastModified": 1721209527, + "narHash": "sha256-UvhjON7sx/ALhJJPMSoUSJ4pvMGvHqvjEOX/AA7AjjM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "61684d356e41c97f80087e89659283d00fe032ab", + "rev": "5e73714b16ca222dcb2fc3ea2618fd7ba698da65", "type": "github" }, "original": { @@ -141,27 +141,27 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1719957072, - "narHash": "sha256-gvFhEf5nszouwLAkT9nWsDzocUTqLWHuL++dvNjMp9I=", + "lastModified": 1721226092, + "narHash": "sha256-UBvzVpo5sXSi2S/Av+t+Q+C2mhMIw/LBEZR+d6NMjws=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7144d6241f02d171d25fba3edeaf15e0f2592105", + "rev": "c716603a63aca44f39bef1986c13402167450e0a", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-23.11", + "ref": "nixos-24.05", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_3": { "locked": { - "lastModified": 1721379653, - "narHash": "sha256-8MUgifkJ7lkZs3u99UDZMB4kbOxvMEXQZ31FO3SopZ0=", + "lastModified": 1722421184, + "narHash": "sha256-/DJBI6trCeVnasdjUo9pbnodCLZcFqnVZiLUfqLH4jA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1d9c2c9b3e71b9ee663d11c5d298727dace8d374", + "rev": "9f918d616c5321ad374ae6cb5ea89c9e04bf3e58", "type": "github" }, "original": { From 71ddaf34148e1387a7f3797c29d17a434269eea0 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Tue, 6 Aug 2024 16:00:18 -0700 Subject: [PATCH 384/667] updated PHP for Nextcloud --- configuration.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/configuration.nix b/configuration.nix index 4ec36d9..bb077da 100755 --- a/configuration.nix +++ b/configuration.nix @@ -12,7 +12,7 @@ let display_startup_errors = On max_execution_time = 10000 max_input_time = 3000 - memory_limit = 512MB; + memory_limit = 1G; opcache.enable=1; opcache.memory_consumption=512; opcache_revalidate_freq = 240; @@ -345,8 +345,16 @@ in ####### KEEP AWAKE for DISPLAY and HEADLESS ####### services.xserver.displayManager.gdm.autoSuspend = false; + services.power-profiles-daemon.enable = false; + systemd.sleep.extraConfig = '' + AllowSuspend=no + AllowHibernation=no + AllowHybridSleep=no + AllowSuspendThenHibernate=no + ''; + ####### BACKUP TO INTERNAL DRIVE ####### services.rsnapshot = { From 37782acfd0519154a34081bf00a1d9b4ddf74e22 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Tue, 6 Aug 2024 16:06:43 -0700 Subject: [PATCH 385/667] set default sleep --- configuration.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/configuration.nix b/configuration.nix index bb077da..f07ec8c 100755 --- a/configuration.nix +++ b/configuration.nix @@ -345,8 +345,6 @@ in ####### KEEP AWAKE for DISPLAY and HEADLESS ####### services.xserver.displayManager.gdm.autoSuspend = false; - - services.power-profiles-daemon.enable = false; systemd.sleep.extraConfig = '' AllowSuspend=no From 18b4e95223a63b06c2828ab7f313e0e677345fae Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Tue, 6 Aug 2024 16:25:45 -0700 Subject: [PATCH 386/667] added the gnome extension expresso --- configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/configuration.nix b/configuration.nix index f07ec8c..6748843 100755 --- a/configuration.nix +++ b/configuration.nix @@ -167,6 +167,7 @@ in gnomeExtensions.just-perfection gnomeExtensions.appindicator gnomeExtensions.date-menu-formatter + gnomeExtensions.espresso gnome-tweaks papirus-icon-theme ranger From e428a2bfc5704d93cac2fd7253e931cc61a58516 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Wed, 7 Aug 2024 21:22:28 -0700 Subject: [PATCH 387/667] updated systemd-manager plugin --- modules/systemd-manager_sovran_systems.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/systemd-manager_sovran_systems.nix b/modules/systemd-manager_sovran_systems.nix index 2fdb975..7f76f5d 100755 --- a/modules/systemd-manager_sovran_systems.nix +++ b/modules/systemd-manager_sovran_systems.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "systemd-manager"; - version = "16"; + version = "17"; src = fetchzip { url = "https://github.com/hardpixel/systemd-manager/releases/download/v${version}/systemd-manager-v${version}.zip"; - hash = "sha256-mbo0kSLkFpT71f/E4AJ0rMFLVtsks7u9snc8maMib4U="; + hash = "sha256-NaOqhiVTACiGiUn8ISTtBMIDkeGkv1M2kCDnAxl5cwk="; stripRoot = false; }; From 3b4471cf7e10afa7d1af7bb0652930e04f77a14f Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Fri, 9 Aug 2024 15:41:25 -0700 Subject: [PATCH 388/667] Nixpkgs update --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index bb6c027..9fde3d3 100755 --- a/flake.lock +++ b/flake.lock @@ -157,11 +157,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1722421184, - "narHash": "sha256-/DJBI6trCeVnasdjUo9pbnodCLZcFqnVZiLUfqLH4jA=", + "lastModified": 1722813957, + "narHash": "sha256-IAoYyYnED7P8zrBFMnmp7ydaJfwTnwcnqxUElC1I26Y=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9f918d616c5321ad374ae6cb5ea89c9e04bf3e58", + "rev": "cb9a96f23c491c081b38eab96d22fa958043c9fa", "type": "github" }, "original": { From 02a7902171ccde4479a6a1678b181064511a5963 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Fri, 9 Aug 2024 15:48:29 -0700 Subject: [PATCH 389/667] Udpated to newest Gnome 46 Smooth Screen --- configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configuration.nix b/configuration.nix index 6748843..f80cc5f 100755 --- a/configuration.nix +++ b/configuration.nix @@ -136,7 +136,7 @@ in owner = "vanvugt"; repo = "mutter"; rev = "triple-buffering-v4-46"; - hash = "sha256-nz1Enw1NjxLEF3JUG0qknJgf4328W/VvdMjJmoOEMYs="; + hash = "sha256-C2VfW3ThPEZ37YkX7ejlyumLnWa9oij333d5c4yfZxc="; }; }); }); From 77206f8641cbc43794e45cb8775ddb29de984260 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Fri, 9 Aug 2024 15:58:54 -0700 Subject: [PATCH 390/667] Udpated Sovran_Systems Helper --- ..._SystemsOS_File_Fixes_And_New_Services.nix | 25 +++++++++---------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/modules/Sovran_SystemsOS_File_Fixes_And_New_Services.nix b/modules/Sovran_SystemsOS_File_Fixes_And_New_Services.nix index b3ec70a..2fc67a1 100755 --- a/modules/Sovran_SystemsOS_File_Fixes_And_New_Services.nix +++ b/modules/Sovran_SystemsOS_File_Fixes_And_New_Services.nix @@ -3,21 +3,20 @@ { 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 = { + 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" ]; }; From f40dc03154225f39ffc08e336360a7130ade9b0d Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Sat, 17 Aug 2024 05:40:24 -0700 Subject: [PATCH 391/667] added helix --- configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/configuration.nix b/configuration.nix index f80cc5f..4e0b1a4 100755 --- a/configuration.nix +++ b/configuration.nix @@ -201,6 +201,7 @@ in nextcloud-client firefox element-desktop + hx ]; From 0bc48deb56667b9a82a9862dd3bd902ee767550a Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Sat, 17 Aug 2024 05:42:33 -0700 Subject: [PATCH 392/667] added helix --- configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configuration.nix b/configuration.nix index 4e0b1a4..f935428 100755 --- a/configuration.nix +++ b/configuration.nix @@ -201,7 +201,7 @@ in nextcloud-client firefox element-desktop - hx + helix ]; From dc73d8af7178f4be4d24d412ffb541bc4356efa5 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Fri, 23 Aug 2024 13:46:26 -0700 Subject: [PATCH 393/667] removed LibreWolf and added Jitsi-meet allow for now --- configuration.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/configuration.nix b/configuration.nix index f935428..1524c04 100755 --- a/configuration.nix +++ b/configuration.nix @@ -150,13 +150,19 @@ in # Allow unfree packages nixpkgs.config.allowUnfree = true; + + nixpkgs.config.permittedInsecurePackages = [ + "jitsi-meet-1.0.8043" + ]; + + # List packages installed in system profile. To search, run: # $ nix search wget environment.systemPackages = with pkgs; [ (callPackage ./modules/systemd-manager_sovran_systems.nix {}) git wget - librewolf + # librewolf fish htop btop From 43ec09430725f235f88541309deae37b441baf9d Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Fri, 23 Aug 2024 13:47:39 -0700 Subject: [PATCH 394/667] Nixpkgs Update Plus Nix Bitcoin Update --- flake.lock | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index 9fde3d3..566bca1 100755 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1722339003, - "narHash": "sha256-ZeS51uJI30ehNkcZ4uKqT4ZDARPyqrHADSKAwv5vVCU=", + "lastModified": 1723293904, + "narHash": "sha256-b+uqzj+Wa6xgMS9aNbX4I+sXeb5biPDi39VgvSFqFvU=", "owner": "ryantm", "repo": "agenix", - "rev": "3f1dae074a12feb7327b4bf43cbac0d124488bb7", + "rev": "f6291c5935fdc4e0bef208cfc0dcab7e3f7a1c41", "type": "github" }, "original": { @@ -33,11 +33,11 @@ ] }, "locked": { - "lastModified": 1719830626, - "narHash": "sha256-7Wb2KiImYxrrIehtodNG9IvumFtZ2f5DkhrjnUBe7zk=", + "lastModified": 1722175938, + "narHash": "sha256-HKyB4HD+NdX3T233bY31hm76v3/tdQBNeLLvopKbZeY=", "owner": "erikarvstedt", "repo": "extra-container", - "rev": "37b479006a80a936ac17e82fb2e8c07b822e17f2", + "rev": "37e7207ac9f857eedb58b208b9dc91cd6b24e651", "type": "github" }, "original": { @@ -93,11 +93,11 @@ "nixpkgs-unstable": "nixpkgs-unstable" }, "locked": { - "lastModified": 1721655077, - "narHash": "sha256-ljmt4G9cB0hM7cPb/Alx2pBE65oDKhbkWZlTJzrezAw=", + "lastModified": 1723533469, + "narHash": "sha256-8gSsZpYmOzwFRaLIX0OMBvV/+SATmu/O9QXkDgsZlIg=", "owner": "fort-nix", "repo": "nix-bitcoin", - "rev": "52fb04737984081c494954c2a132d3c2571096c7", + "rev": "6e208d6a7b554be592167f6ecad9b16c0abf96d7", "type": "github" }, "original": { @@ -125,11 +125,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1721209527, - "narHash": "sha256-UvhjON7sx/ALhJJPMSoUSJ4pvMGvHqvjEOX/AA7AjjM=", + "lastModified": 1723221148, + "narHash": "sha256-7pjpeQlZUNQ4eeVntytU3jkw9dFK3k1Htgk2iuXjaD8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5e73714b16ca222dcb2fc3ea2618fd7ba698da65", + "rev": "154bcb95ad51bc257c2ce4043a725de6ca700ef6", "type": "github" }, "original": { @@ -141,11 +141,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1721226092, - "narHash": "sha256-UBvzVpo5sXSi2S/Av+t+Q+C2mhMIw/LBEZR+d6NMjws=", + "lastModified": 1723282977, + "narHash": "sha256-oTK91aOlA/4IsjNAZGMEBz7Sq1zBS0Ltu4/nIQdYDOg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c716603a63aca44f39bef1986c13402167450e0a", + "rev": "a781ff33ae258bbcfd4ed6e673860c3e923bf2cc", "type": "github" }, "original": { @@ -157,11 +157,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1722813957, - "narHash": "sha256-IAoYyYnED7P8zrBFMnmp7ydaJfwTnwcnqxUElC1I26Y=", + "lastModified": 1724224976, + "narHash": "sha256-Z/ELQhrSd7bMzTO8r7NZgi9g5emh+aRKoCdaAv5fiO0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "cb9a96f23c491c081b38eab96d22fa958043c9fa", + "rev": "c374d94f1536013ca8e92341b540eba4c22f9c62", "type": "github" }, "original": { From 080562d7e88537254dbe7286f44194343dc9a0ba Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Mon, 26 Aug 2024 16:48:18 -0700 Subject: [PATCH 395/667] Nixpkgs update Nix-Bitcoin update Configuration.nix --- configuration.nix | 24 +----------------------- flake.lock | 24 ++++++++++++------------ modules/bitcoinecosystem.nix | 15 +++++++-------- 3 files changed, 20 insertions(+), 43 deletions(-) diff --git a/configuration.nix b/configuration.nix index 1524c04..d5da488 100755 --- a/configuration.nix +++ b/configuration.nix @@ -121,29 +121,6 @@ in systemd.services."getty@tty1".enable = true; systemd.services."autovt@tty1".enable = true; - - # Fix the GNOME Desktop Environment Performance - - nixpkgs.config.allowAliases = false; - - nixpkgs.overlays = [ - # GNOME 46: triple-buffering-v4-46 - (final: prev: { - gnome = prev.gnome.overrideScope (gnomeFinal: gnomePrev: { - mutter = gnomePrev.mutter.overrideAttrs (old: { - src = pkgs.fetchFromGitLab { - domain = "gitlab.gnome.org"; - owner = "vanvugt"; - repo = "mutter"; - rev = "triple-buffering-v4-46"; - hash = "sha256-C2VfW3ThPEZ37YkX7ejlyumLnWa9oij333d5c4yfZxc="; - }; - }); - }); - }) - ]; - - # Allow Flatpak services.flatpak.enable = true; @@ -323,6 +300,7 @@ in services.mysql = { enable = true; + package = pkgs.mariadb; }; diff --git a/flake.lock b/flake.lock index 566bca1..324eb1e 100755 --- a/flake.lock +++ b/flake.lock @@ -93,11 +93,11 @@ "nixpkgs-unstable": "nixpkgs-unstable" }, "locked": { - "lastModified": 1723533469, - "narHash": "sha256-8gSsZpYmOzwFRaLIX0OMBvV/+SATmu/O9QXkDgsZlIg=", + "lastModified": 1724684170, + "narHash": "sha256-4O04EoHn87zIpiogIRXSgkqRyOs7ygIAIO9dhjhpmGI=", "owner": "fort-nix", "repo": "nix-bitcoin", - "rev": "6e208d6a7b554be592167f6ecad9b16c0abf96d7", + "rev": "31b79391cf96b64c3982038c8284e04345429dbd", "type": "github" }, "original": { @@ -125,11 +125,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1723221148, - "narHash": "sha256-7pjpeQlZUNQ4eeVntytU3jkw9dFK3k1Htgk2iuXjaD8=", + "lastModified": 1724395761, + "narHash": "sha256-zRkDV/nbrnp3Y8oCADf5ETl1sDrdmAW6/bBVJ8EbIdQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "154bcb95ad51bc257c2ce4043a725de6ca700ef6", + "rev": "ae815cee91b417be55d43781eb4b73ae1ecc396c", "type": "github" }, "original": { @@ -141,11 +141,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1723282977, - "narHash": "sha256-oTK91aOlA/4IsjNAZGMEBz7Sq1zBS0Ltu4/nIQdYDOg=", + "lastModified": 1724316499, + "narHash": "sha256-Qb9MhKBUTCfWg/wqqaxt89Xfi6qTD3XpTzQ9eXi3JmE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a781ff33ae258bbcfd4ed6e673860c3e923bf2cc", + "rev": "797f7dc49e0bc7fab4b57c021cdf68f595e47841", "type": "github" }, "original": { @@ -157,11 +157,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1724224976, - "narHash": "sha256-Z/ELQhrSd7bMzTO8r7NZgi9g5emh+aRKoCdaAv5fiO0=", + "lastModified": 1724479785, + "narHash": "sha256-pP3Azj5d6M5nmG68Fu4JqZmdGt4S4vqI5f8te+E/FTw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c374d94f1536013ca8e92341b540eba4c22f9c62", + "rev": "d0e1602ddde669d5beb01aec49d71a51937ed7be", "type": "github" }, "original": { diff --git a/modules/bitcoinecosystem.nix b/modules/bitcoinecosystem.nix index 62939f2..587ea66 100755 --- a/modules/bitcoinecosystem.nix +++ b/modules/bitcoinecosystem.nix @@ -3,6 +3,7 @@ { ## Bitcoind + services.bitcoind = { enable = true; dataDir = "/run/media/Second_Drive/BTCEcoandBackup/Bitcoin_Node"; @@ -24,6 +25,7 @@ ## Electrs + services.electrs = { enable = true; tor.enforce = true; @@ -33,6 +35,7 @@ ## CLN + services.clightning = { enable = true; tor.proxy = true; @@ -55,6 +58,7 @@ experimental-offers ## LND + services.lnd = { enable = true; tor.enforce = true; @@ -82,6 +86,7 @@ experimental-offers ## RTL + services.rtl = { enable = true; tor.enforce = true; @@ -107,15 +112,8 @@ experimental-offers }; }; - - ## Mempool - services.mempool.enable = true; - - nix-bitcoin.onionServices.mempool-frontend.enable = true; - - - ## Lndconnect + services.lnd.lndconnect = { enable = true; onion = true; @@ -131,6 +129,7 @@ experimental-offers ## BTCpay Server + services.btcpayserver = { enable = true; }; From 87450f6b312ef424998892f5c4a850d9483628c8 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Sat, 31 Aug 2024 20:28:23 -0700 Subject: [PATCH 396/667] added neovim --- configuration.nix | 8 ++++++++ flake.nix | 8 ++++++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/configuration.nix b/configuration.nix index d5da488..a8131f8 100755 --- a/configuration.nix +++ b/configuration.nix @@ -188,6 +188,14 @@ in ]; + programs.nixvim = { + enable = true; + + colorschemes.catppuccin.enable = true; + plugins.lualine.enable = true; + }; + + programs.bash.promptInit = "fish"; programs.fish = { enable = true; diff --git a/flake.nix b/flake.nix index 4199c6d..994b162 100755 --- a/flake.nix +++ b/flake.nix @@ -11,9 +11,11 @@ agenix.inputs.darwin.follows = ""; + nixvim.url = "github:nix-community/nixvim"; + }; - outputs = { self, nixpkgs, nix-bitcoin, agenix, ... }: + outputs = { self, nixpkgs, nix-bitcoin, nixvim, agenix, ... }: { @@ -32,7 +34,9 @@ agenix.nixosModules.default + nixvim.nixosModules.nixvim + ]; }; }; -} \ No newline at end of file +} From 344d23a429190181a8b648504a6f562d8b893009 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Sat, 31 Aug 2024 23:30:23 -0700 Subject: [PATCH 397/667] format clean up --- configuration.nix | 54 +++++++++++++++++++++++------------------------ 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/configuration.nix b/configuration.nix index a8131f8..fac7795 100755 --- a/configuration.nix +++ b/configuration.nix @@ -48,7 +48,7 @@ in device = "LABEL=BTCEcoandBackup"; fsType = "ext4"; options = [ "nofail" ]; - }; + }; fileSystems."/boot/efi".options = [ "umask=0077" "defaults" ]; @@ -190,13 +190,13 @@ in programs.nixvim = { enable = true; - - colorschemes.catppuccin.enable = true; - plugins.lualine.enable = true; + colorschemes.catppuccin.enable = true; + plugins.lualine.enable = true; }; programs.bash.promptInit = "fish"; + programs.fish = { enable = true; promptInit = "neofetch"; @@ -241,17 +241,17 @@ in }; "${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/dav/ 301 - redir /.well-known/caldav /remote.php/dav/ 301 - header { - Strict-Transport-Security max-age=31536000; - } - ''; + extraConfig = '' + encode gzip zstd + root * /var/lib/www/nextcloud + php_fastcgi unix//run/phpfpm/mypool.sock + file_server + redir /.well-known/carddav /remote.php/dav/ 301 + redir /.well-known/caldav /remote.php/dav/ 301 + header { + Strict-Transport-Security max-age=31536000; + } + ''; }; "${personalization.matrix_url}" = { @@ -293,8 +293,8 @@ in ###### CREATE DATABASE (WORDPRESS, MATRIX_SYNAPSE, AND NEXTCLOUD) ####### services.postgresql = { - enable = true; - }; + enable = true; + }; services.postgresql.authentication = lib.mkForce '' @@ -307,9 +307,9 @@ in services.mysql = { - enable = true; - package = pkgs.mariadb; - }; + enable = true; + package = pkgs.mariadb; + }; services.postgresql.initialScript = pkgs.writeText "begin-init.sql" '' @@ -360,7 +360,7 @@ backup /var/lib/ localhost/ backup /etc/nixos/ localhost/ backup /etc/nix-bitcoin-secrets/ localhost/ ''; - cronIntervals = { + cronIntervals = { daily = "50 21 * * *"; hourly = "0 * * * *"; }; @@ -381,8 +381,8 @@ backup /etc/nix-bitcoin-secrets/ localhost/ ####### TOR ####### services.tor = { enable = true; - client.enable = true; - torsocks.enable = true; + client.enable = true; + torsocks.enable = true; }; services.privoxy.enableTor = true; @@ -415,11 +415,11 @@ backup /etc/nix-bitcoin-secrets/ localhost/ ####### 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 - ]; - + networking.firewall.allowedUDPPortRanges = [ + { from=49152; to=65535; } # TURN relay + ]; + networking.firewall.enable = true; From 48760520d3ab05141072e692fb53faa3e16cdcfa Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Thu, 5 Sep 2024 08:06:38 -0700 Subject: [PATCH 398/667] Nixpkgs Update added Neovim --- flake.lock | 277 ++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 273 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index 324eb1e..32ed69e 100755 --- a/flake.lock +++ b/flake.lock @@ -21,6 +21,27 @@ "type": "github" } }, + "devshell": { + "inputs": { + "nixpkgs": [ + "nixvim", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1722113426, + "narHash": "sha256-Yo/3loq572A8Su6aY5GP56knpuKYRvM2a1meP9oJZCw=", + "owner": "numtide", + "repo": "devshell", + "rev": "67cce7359e4cd3c45296fb4aaf6a19e2a9c757ae", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "devshell", + "type": "github" + } + }, "extra-container": { "inputs": { "flake-utils": [ @@ -46,6 +67,41 @@ "type": "github" } }, + "flake-compat": { + "locked": { + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "revCount": 57, + "type": "tarball", + "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.0.1/018afb31-abd1-7bff-a5e4-cff7e18efb7a/source.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz" + } + }, + "flake-parts": { + "inputs": { + "nixpkgs-lib": [ + "nixvim", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1722555600, + "narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "8471fe90ad337a8074e957b69ca4d0089218391d", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, "flake-utils": { "inputs": { "systems": "systems_2" @@ -64,6 +120,76 @@ "type": "github" } }, + "flake-utils_2": { + "inputs": { + "systems": "systems_3" + }, + "locked": { + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "git-hooks": { + "inputs": { + "flake-compat": [ + "nixvim", + "flake-compat" + ], + "gitignore": "gitignore", + "nixpkgs": [ + "nixvim", + "nixpkgs" + ], + "nixpkgs-stable": [ + "nixvim", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1724857454, + "narHash": "sha256-Qyl9Q4QMTLZnnBb/8OuQ9LSkzWjBU1T5l5zIzTxkkhk=", + "owner": "cachix", + "repo": "git-hooks.nix", + "rev": "4509ca64f1084e73bc7a721b20c669a8d4c5ebe6", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "git-hooks.nix", + "type": "github" + } + }, + "gitignore": { + "inputs": { + "nixpkgs": [ + "nixvim", + "git-hooks", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1709087332, + "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", + "owner": "hercules-ci", + "repo": "gitignore.nix", + "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "gitignore.nix", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -85,6 +211,27 @@ "type": "github" } }, + "home-manager_2": { + "inputs": { + "nixpkgs": [ + "nixvim", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1724435763, + "narHash": "sha256-UNky3lJNGQtUEXT2OY8gMxejakSWPTfWKvpFkpFlAfM=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "c2cd2a52e02f1dfa1c88f95abeb89298d46023be", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "home-manager", + "type": "github" + } + }, "nix-bitcoin": { "inputs": { "extra-container": "extra-container", @@ -107,6 +254,27 @@ "type": "github" } }, + "nix-darwin": { + "inputs": { + "nixpkgs": [ + "nixvim", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1724561770, + "narHash": "sha256-zv8C9RNa86CIpyHwPIVO/k+5TfM8ZbjGwOOpTe1grls=", + "owner": "lnl7", + "repo": "nix-darwin", + "rev": "ac5694a0b855a981e81b4d9f14052e3ff46ca39e", + "type": "github" + }, + "original": { + "owner": "lnl7", + "repo": "nix-darwin", + "type": "github" + } + }, "nixpkgs": { "locked": { "lastModified": 1703013332, @@ -157,11 +325,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1724479785, - "narHash": "sha256-pP3Azj5d6M5nmG68Fu4JqZmdGt4S4vqI5f8te+E/FTw=", + "lastModified": 1725432240, + "narHash": "sha256-+yj+xgsfZaErbfYM3T+QvEE2hU7UuE+Jf0fJCJ8uPS0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d0e1602ddde669d5beb01aec49d71a51937ed7be", + "rev": "ad416d066ca1222956472ab7d0555a6946746a80", "type": "github" }, "original": { @@ -171,11 +339,76 @@ "type": "github" } }, + "nixpkgs_4": { + "locked": { + "lastModified": 1724819573, + "narHash": "sha256-GnR7/ibgIH1vhoy8cYdmXE6iyZqKqFxQSVkFgosBh6w=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "71e91c409d1e654808b2621f28a327acfdad8dc2", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixvim": { + "inputs": { + "devshell": "devshell", + "flake-compat": "flake-compat", + "flake-parts": "flake-parts", + "git-hooks": "git-hooks", + "home-manager": "home-manager_2", + "nix-darwin": "nix-darwin", + "nixpkgs": "nixpkgs_4", + "nuschtosSearch": "nuschtosSearch", + "treefmt-nix": "treefmt-nix" + }, + "locked": { + "lastModified": 1725547623, + "narHash": "sha256-VLJOVLCAE9mDAM/H4n7+LD4Hkdglb2C5cnThzRV8itA=", + "owner": "nix-community", + "repo": "nixvim", + "rev": "8ae9e4d8a1e111e8532131362992debcdc8a9d98", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixvim", + "type": "github" + } + }, + "nuschtosSearch": { + "inputs": { + "flake-utils": "flake-utils_2", + "nixpkgs": [ + "nixvim", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1724584782, + "narHash": "sha256-7FfHv7b1jwMPSu9SPY9hdxStk8E6EeSwzqdvV69U4BM=", + "owner": "NuschtOS", + "repo": "search", + "rev": "5a08d691de30b6fc28d58ce71a5e420f2694e087", + "type": "github" + }, + "original": { + "owner": "NuschtOS", + "repo": "search", + "type": "github" + } + }, "root": { "inputs": { "agenix": "agenix", "nix-bitcoin": "nix-bitcoin", - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs_3", + "nixvim": "nixvim" } }, "systems": { @@ -207,6 +440,42 @@ "repo": "default", "type": "github" } + }, + "systems_3": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "treefmt-nix": { + "inputs": { + "nixpkgs": [ + "nixvim", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1724833132, + "narHash": "sha256-F4djBvyNRAXGusJiNYInqR6zIMI3rvlp6WiKwsRISos=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "3ffd842a5f50f435d3e603312eefa4790db46af5", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } } }, "root": "root", From 95dc90bdf64e5fc07c507fee2951211572372c39 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Thu, 12 Sep 2024 12:52:16 -0700 Subject: [PATCH 399/667] installer scripts --- for_new_sovran_pros/psp_physical_ram.sh | 85 +++++++++++++++++++++++++ for_new_sovran_pros/sdpsp.sh | 2 + 2 files changed, 87 insertions(+) create mode 100755 for_new_sovran_pros/psp_physical_ram.sh diff --git a/for_new_sovran_pros/psp_physical_ram.sh b/for_new_sovran_pros/psp_physical_ram.sh new file mode 100755 index 0000000..10f1300 --- /dev/null +++ b/for_new_sovran_pros/psp_physical_ram.sh @@ -0,0 +1,85 @@ +#!/usr/bin/env bash + +# Begin: curl https://git.sovransystems.com/Sovran_Systems/Sovran_SystemsOS/raw/branch/main/for_new_sovran_pros/psp_physical_ram.sh -o psp_physical_ram.sh + +GREEN="\e[32m" +LIGHTBLUE="\e[94m" +ENDCOLOR="\e[0m" + +lsblk + +echo -e "${GREEN}What block for file-tree-root of drive (usually nvme0n1)?${ENDCOLOR}";read commitroot + +parted /dev/"$commitroot" -- mklabel gpt +parted /dev/"$commitroot" -- mkpart ESP fat32 1MB 512MB +parted /dev/"$commitroot" -- set 1 esp on +parted /dev/"$commitroot" -- mkpart primary ext4 512MB 100% + +lsblk + +echo -e "${GREEN}What partition for Boot-Partition (usually nvme0n1p1)?${ENDCOLOR}";read commitbootpartition + +echo -e "${GREEN}What partition for Primary-Partition (usually nvme0n1p2)?${ENDCOLOR}";read commitprimarypartition + + +mkfs.ext4 -L nixos /dev/"$commitprimarypartition" + +mkfs.fat -F 32 -n boot /dev/"$commitbootpartition" + +mount /dev/disk/by-label/nixos /mnt + +mkdir -p /mnt/boot/efi + +mount /dev/disk/by-label/boot /mnt/boot/efi + +### Disk Step-up Finished + +### Adding Configuration.nix + +nixos-generate-config --root /mnt + +rm /mnt/etc/nixos/configuration.nix + +cat <> /mnt/etc/nixos/configuration.nix +{ config, pkgs, ... }: { + + imports = [ + + ./hardware-configuration.nix + + ]; + + boot.loader.systemd-boot.enable = true; + boot.loader.efi.canTouchEfiVariables = true; + boot.loader.efi.efiSysMountPoint = "/boot/efi"; + + nix.settings.experimental-features = [ "nix-command" "flakes" ]; + + users.users = { + free = { + isNormalUser = true; + description = "free"; + extraGroups = [ "networkmanager" ]; + }; + }; + + environment.systemPackages = with pkgs; [ + wget + git + ranger + fish + pwgen + openssl + ]; + + services.openssh = { + enable = true; + permitRootLogin = "yes"; + }; +} + +EOT + +nixos-install + +reboot diff --git a/for_new_sovran_pros/sdpsp.sh b/for_new_sovran_pros/sdpsp.sh index c6cbcc2..8a85113 100755 --- a/for_new_sovran_pros/sdpsp.sh +++ b/for_new_sovran_pros/sdpsp.sh @@ -27,6 +27,8 @@ sudo mkdir -p /mnt/BTCEcoandBackup/Electrs_Data sudo mkdir -p /mnt/BTCEcoandBackup/NixOS_Snapshot_Backup +sudo mkdir -p /mnt/BTCEcoandBackup/clightning_db_Backup + sudo systemctl stop bitcoind electrs nbxplorer btcpayserver lnd rtl lightning-loop lightning-pool rsync -ar --info=progress2 --info=name0 /run/media/Second_Drive/BTCEcoandBackup/Bitcoin_Node/ /mnt/BTCEcoandBackup/Bitcoin_Node/ From b89591e30bff7962d67c469486d36dd965cac5b7 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Thu, 12 Sep 2024 12:57:40 -0700 Subject: [PATCH 400/667] moved and renamed DIY instructions --- ...msOS.md => DIY Install Sovran_SystemsOS.md | 0 How To Install Sovran_SystemsOS.md | 205 ++++++++++++++++++ 2 files changed, 205 insertions(+) rename for_new_sovran_pros/How To Install Sovran_SystemsOS.md => DIY Install Sovran_SystemsOS.md (100%) create mode 100755 How To Install Sovran_SystemsOS.md diff --git a/for_new_sovran_pros/How To Install Sovran_SystemsOS.md b/DIY Install Sovran_SystemsOS.md similarity index 100% rename from for_new_sovran_pros/How To Install Sovran_SystemsOS.md rename to DIY Install Sovran_SystemsOS.md diff --git a/How To Install Sovran_SystemsOS.md b/How To Install Sovran_SystemsOS.md new file mode 100755 index 0000000..5a3b382 --- /dev/null +++ b/How To Install Sovran_SystemsOS.md @@ -0,0 +1,205 @@ +# Sovran Systems offers little support of a DIY install of Sovran_SystemsOS. You can reach out to others in the matrix room https://matrix.to/#/#DIY_Sovran_SystemsOS:anarchyislove.xyz. Good Luck! + +# These instructions will change over time due to new software development and Sovran Systems creator finding more efficient ways to install Sovran_SystemsOS. 2-1-2024 + +# Also, to fully complete the install, the Bitcoin blockchain will have to download. This could take up to 3 weeks. + +# Lastly, if you gift to the computer movement to receive a Sovran Pro, you do not have to do any of this. It is all done for you. On top of that, the Bitcoin blockchain is already installed. 😉 + +### Requirements + +1. First machine with Linux OS already installed (like NixOS, Ubuntu, Arch, etc.) to download and burn the NixOS image to a USB thumb drive. +2. USB thumb drive 16GB or larger +3. Second machine that is ready to have Sovran_SystemsOS installed (Safe Boot turned off in the UEFI[BIOS] and be prepared for the entire storage drive to be ERASED). +4. Second machine needs the following hardware specs: + +- Intel or AMD processor (NO ARM processors) +- 16GB of RAM or Larger +- First main internal drive to install Sovran_SystemsOS (NVME 500GB or larger) +- Second internal drive to store the Bitcoin blockchain and the automatic backups (SSD or NVME 2TB or larger) +- Also, the Second internal drive needs to be be installed FIRST into an USB enclosure. If the second drive is SSD, you need a SSD USB enclosure. If the second drive is NVME, you need a NVME USB enclosure. The USB enclosure will be plugged into the first Linux machine. + +1. Working Internet connection for both machines +2. Personalized Domain names already purchased from Njal.la. See the explanation here: https://sovransystems.com/how-to-setup/ +3. Your Router with ports open (Port Forwarding) to your second machine's internal IP address. This will usually be `192.168.1.(some number)` You will complete this at the end. + +- Port 80 +- Port 443 +- Port 22 +- Port 5349 +- Port 8448 + +## Preparing the Second Internal Drive + +1. Install the second internal drive (NVME or SSD) into its appropriate USB enclosure, NOT into the Second machine yet. +2. Plug in the USB enclosure with the second drive installed into the first machine with Linux installed into one of its available USB ports. +3. Open a terminal in the first Linux machine and log in as root. +4. Type in or copy and paste: + +```bash +wget https://git.sovransystems.com/Sovran_Systems/Sovran_SystemsOS/raw/branch/main/for_new_sovran_pros/sdpsp.sh +``` + +then press enter. + +1. Now, type `bash sdpsp.sh` then press enter. +2. Then the screen will ask for "what block..." which will be the drive in the list that is not mounted,which will be the drive you just plugged in. It might be labeled `sda`, `sdb`, `sdc`, or if it is a NVME it will be `nvme0n1`, or `nvme0n2` etc. +3. Then the screen will ask for "what partition...,"which will be whatever you typed into the first prompt, but with a "1" on it. For example `sda1`, `sdb1`, `sdc1`, or `nvme0n1p1` or `nvme0n2p1`. +4. Since the script is made to copy the blockchain from another Sovran Pro that already has the full blockchain installed it will throw an error. However, it should complete the setup just fine. +5. Once complete, remove the second drive from the USB enclosure and install it into your second machine in which you are installing Sovran_SystemsOS. + +## Preparing the First Main Internal Drive + +### Procedure One - Installing base NixOS + + 1. On the first machine download the latest NixOS minimal (64-bit Intel/AMD) image from here: https://nixos.org/download + 2. Burn that ISO image onto the USB thumb drive. + 3. Insert the newly created USB thumb drive with the ISO image burned onto it into the second machine (the one you are installing Sovran_SystemsOS). + 4. Reboot the second machine while the USB thumb drive is inserted and boot into the USB thumb drive. This may require you to press the F7 or F12 key at boot. (Also, make sure the second machine has "safe boot" turned off in the UEFI[BIOS]). + 5. Proceed with the NixOS boot menu + 6. Once at the command prompt type in `sudo su` to move to the root user + 7. Once logged into the root user type in `passwd` then set the root user password to `a` + 8. Type in `ip a` to get your internal IP address. It will usually be `192.1681.1.(somenumber)` make a note of this IP as you will need it later. + 9. Now, that you are logged in as the root user type in or copy and paste: + + ```bash + curl https://git.sovransystems.com/Sovran_Systems/Sovran_SystemsOS/raw/branch/main/for_new_sovran_pros/psp.sh -o psp.sh + ``` + + the command to install the base NixOS and press enter. +10. Now, type `bash psp.sh` then press enter. +11. The script will ask for name of first main internal drive. Type that in and hit enter. It usually will be `nvme0n1` if it is an NVME drive. Basically, it will be the drive without any data and it will not be mounted per the list on the screen. +12. Then the script will ask for the 'root' partition. Type it in and press enter. It will be the LARGER partition and usually named `nvme0n1p1` if it is an NVME drive. +13. Then it will ask for the 'boot' partition. Type it in and press enter. It will be the SMALLER partition usually named `nvme0n1p2`. +14. Then it will ask for the 'swap' partition. Type it in and press enter. It will be the drive that is close to 16GB partition usually named `nvme0n1p3`. +15. The script will finish installing the base NixOS. At the end it will ask for a root password. Type `a` and press enter and type `a` again to confirm and press enter. +16. Remove the USB thumb drive from the second machine. +17. The machine will reboot into a very basic install of NixOS command prompt. + +### Procedure Two - Installing Sovran_SystemsOS + +1. Now at the basic install of NixOS from step 17, type `root` to log into root and type the password `a` when asked then press enter. +2. Now you are logged in as `root`. +3. Now type in or copy and paste: + + ```bash + wget https://git.sovransystems.com/Sovran_Systems/Sovran_SystemsOS/raw/branch/main/for_new_sovran_pros/sp.sh + ``` + + then press enter. +4. Type in `bash sp.sh` then press enter. +5. Next the script will ask for your domain names from Njal.la. Type them in the corresponding prompts and then press enter for each prompt. +6. Then it will ask for an email for the SSL certificates. Type it in and press enter. +7. The script is long so it will take some time. +8. Then it will ask for your root password which is `a` to install Flatpaks. +9. It will finish by stating `All Finished! Please Reboot then Enjoy your New Sovran Pro!` + +## Finishing the Install + +### Opening The Ports on Your Router - Internal IP + +1. Go to port forwarding on your router and open the above mentioned ports to the internal IP (the one you found above) of your new Sovran_SystemsOS machine + +### Putting the External IP of your Sovran Pro into your new domain names you just bought at [njal.la](https://njal.la) + +1. Log into your [njal.la](https://njal.la) account +2. Make a "dynamic" record for each subdomain and copy the `curl` commands after each sub-domain. +3. Paste `curl` command from njal.la website into `/var/lib/njalla/njalla.sh` . For example: + + ```bash + curl "https://njal.la/update/?h=test.testsovransystems.com&k=8n7vk3afj-jkyg37&a=${IP}" + ``` + + ##### Make sure the default `&auto` from njal.la is replaced by `&a=${IP}` at the end of each `curl` command in the `/var/lib/njalla/njalla.sh` as in the example above. + +### Setting the Desktop + +1. Open the Terminal app and type in: `dconf load / < /home/free/Downloads/Sovran_SystemsOS-Desktop`. Do NOT log in as root. + +### Setting Up Nextcloud and Wordpress + +#### Nextcloud + +1. Open a web browser and navigate to your domain name you bought from [njal.la](https://njal.la) for example "cloud.myfreedomsite.com" you attributed to your Nextcloud instance. +2. Nextcloud will as you to set up a new account to be used as a log in. Do so. +3. Nextcloud will also ask you where you want the data directory. Type in `/var/lib/nextcloud/data` +4. Nextcloud will ask you to connect the database: + 1. Choose `Postgresql` from the optoins. + 2. Database username is `ncusr` + 3. Database name is `nextclouddb` + 4. Database password is found by doing this: + 1. Open the Terminal app and type in or copy and paste: + + ```bash + ssh root@localhost + ``` + + It will as you for a password which is `gosovransystems` as this is the default temporary password from Sovran Systems. + + Now you will be logged in as root. + 2. Now open the Terminal app and type: + + `cat /var/lib/secrets/nextclouddb` + + and press enter. + 3. Your database password will be displayed in the Terminal window. + 4. Type that into the password field + 5. Now, press install and Nextcloud will be installed. It will take a few minutes. Follow the on screen prompts. + +#### Wordpress + +1. Open a web browser and navigate to your domain name you bought from [njal.la](https://njal.la) for example "myfreedomsite.com" you attributed to your Wordpress instance. +2. Wordpress will ask you to connect the database: + 1. Database username is `wpusr` + 2. Database name is `wordpressdb` + 3. Database password is found by doing this: + 1. Open the Terminal app and type in or copy and paste: + + ```bash + ssh root@localhost + ``` + + It will as you for a password which is `gosovransystems` as this is the default temporary password from Sovran Systems. + + Now you will be logged in as root. + 2. Now open the Terminal app and type: + + `cat /var/lib/secrets/wordpressdb` + + and press enter. + 3. Your database password will be displayed in the Terminal window. + 4. Type that into the password field + 4. Now, press install and Wordpress will be installed. It will take a few minutes. Follow the on screen prompts. + +### Final Install for Coturn and Nextcloud + +1. Open the Terminal app and type in or copy and paste: + + ```bash + ssh root@localhost + ``` +2. It will as you for a password which is `gosovransystems` as this is the default temporary password from Sovran Systems. +3. Now you will be logged in as root. +4. Now open the Terminal app and type or copy and paste: + + ```bash + sed -i '$e cat /var/lib/nextcloudaddition/nextcloudaddition' /var/lib/www/nextcloud/config/config.php + + chown caddy:php /var/lib/www -R + + chmod 700 /var/lib/www -R + ``` + +and press enter. + +1. Now type or copy and paste: + +```bash +set DOMAIN $(cat /var/lib/domains/matrix) && cp -n /var/lib/caddy/.local/share/caddy/certificates/acme-v02.api.letsencrypt.org-directory/{$DOMAIN}/{$DOMAIN}.crt /var/lib/coturn/{$DOMAIN}.crt.pem && cp -n /var/lib/caddy/.local/share/caddy/certificates/acme-v02.api.letsencrypt.org-directory/{$DOMAIN}/{$DOMAIN}.key /var/lib/coturn/{$DOMAIN}.key.pem && chown turnserver:turnserver /var/lib/coturn -R && chmod 770 /var/lib/coturn -R && systemctl restart coturn +``` + +and press enter. + +### Everything now will be installed regarding Sovran_SystemsOS. The remaining setup will be only for the front-end user account creations for BTCpayserver, Vaultwarden, connecting the node to Sparrow wallet and Bisq. + +### Congratulations! 🎉 \ No newline at end of file From 3551431b8ae969def4550cea6953e364d02829b5 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Thu, 12 Sep 2024 12:58:28 -0700 Subject: [PATCH 401/667] removed old DIY file --- How To Install Sovran_SystemsOS.md | 205 ----------------------------- 1 file changed, 205 deletions(-) delete mode 100755 How To Install Sovran_SystemsOS.md diff --git a/How To Install Sovran_SystemsOS.md b/How To Install Sovran_SystemsOS.md deleted file mode 100755 index 5a3b382..0000000 --- a/How To Install Sovran_SystemsOS.md +++ /dev/null @@ -1,205 +0,0 @@ -# Sovran Systems offers little support of a DIY install of Sovran_SystemsOS. You can reach out to others in the matrix room https://matrix.to/#/#DIY_Sovran_SystemsOS:anarchyislove.xyz. Good Luck! - -# These instructions will change over time due to new software development and Sovran Systems creator finding more efficient ways to install Sovran_SystemsOS. 2-1-2024 - -# Also, to fully complete the install, the Bitcoin blockchain will have to download. This could take up to 3 weeks. - -# Lastly, if you gift to the computer movement to receive a Sovran Pro, you do not have to do any of this. It is all done for you. On top of that, the Bitcoin blockchain is already installed. 😉 - -### Requirements - -1. First machine with Linux OS already installed (like NixOS, Ubuntu, Arch, etc.) to download and burn the NixOS image to a USB thumb drive. -2. USB thumb drive 16GB or larger -3. Second machine that is ready to have Sovran_SystemsOS installed (Safe Boot turned off in the UEFI[BIOS] and be prepared for the entire storage drive to be ERASED). -4. Second machine needs the following hardware specs: - -- Intel or AMD processor (NO ARM processors) -- 16GB of RAM or Larger -- First main internal drive to install Sovran_SystemsOS (NVME 500GB or larger) -- Second internal drive to store the Bitcoin blockchain and the automatic backups (SSD or NVME 2TB or larger) -- Also, the Second internal drive needs to be be installed FIRST into an USB enclosure. If the second drive is SSD, you need a SSD USB enclosure. If the second drive is NVME, you need a NVME USB enclosure. The USB enclosure will be plugged into the first Linux machine. - -1. Working Internet connection for both machines -2. Personalized Domain names already purchased from Njal.la. See the explanation here: https://sovransystems.com/how-to-setup/ -3. Your Router with ports open (Port Forwarding) to your second machine's internal IP address. This will usually be `192.168.1.(some number)` You will complete this at the end. - -- Port 80 -- Port 443 -- Port 22 -- Port 5349 -- Port 8448 - -## Preparing the Second Internal Drive - -1. Install the second internal drive (NVME or SSD) into its appropriate USB enclosure, NOT into the Second machine yet. -2. Plug in the USB enclosure with the second drive installed into the first machine with Linux installed into one of its available USB ports. -3. Open a terminal in the first Linux machine and log in as root. -4. Type in or copy and paste: - -```bash -wget https://git.sovransystems.com/Sovran_Systems/Sovran_SystemsOS/raw/branch/main/for_new_sovran_pros/sdpsp.sh -``` - -then press enter. - -1. Now, type `bash sdpsp.sh` then press enter. -2. Then the screen will ask for "what block..." which will be the drive in the list that is not mounted,which will be the drive you just plugged in. It might be labeled `sda`, `sdb`, `sdc`, or if it is a NVME it will be `nvme0n1`, or `nvme0n2` etc. -3. Then the screen will ask for "what partition...,"which will be whatever you typed into the first prompt, but with a "1" on it. For example `sda1`, `sdb1`, `sdc1`, or `nvme0n1p1` or `nvme0n2p1`. -4. Since the script is made to copy the blockchain from another Sovran Pro that already has the full blockchain installed it will throw an error. However, it should complete the setup just fine. -5. Once complete, remove the second drive from the USB enclosure and install it into your second machine in which you are installing Sovran_SystemsOS. - -## Preparing the First Main Internal Drive - -### Procedure One - Installing base NixOS - - 1. On the first machine download the latest NixOS minimal (64-bit Intel/AMD) image from here: https://nixos.org/download - 2. Burn that ISO image onto the USB thumb drive. - 3. Insert the newly created USB thumb drive with the ISO image burned onto it into the second machine (the one you are installing Sovran_SystemsOS). - 4. Reboot the second machine while the USB thumb drive is inserted and boot into the USB thumb drive. This may require you to press the F7 or F12 key at boot. (Also, make sure the second machine has "safe boot" turned off in the UEFI[BIOS]). - 5. Proceed with the NixOS boot menu - 6. Once at the command prompt type in `sudo su` to move to the root user - 7. Once logged into the root user type in `passwd` then set the root user password to `a` - 8. Type in `ip a` to get your internal IP address. It will usually be `192.1681.1.(somenumber)` make a note of this IP as you will need it later. - 9. Now, that you are logged in as the root user type in or copy and paste: - - ```bash - curl https://git.sovransystems.com/Sovran_Systems/Sovran_SystemsOS/raw/branch/main/for_new_sovran_pros/psp.sh -o psp.sh - ``` - - the command to install the base NixOS and press enter. -10. Now, type `bash psp.sh` then press enter. -11. The script will ask for name of first main internal drive. Type that in and hit enter. It usually will be `nvme0n1` if it is an NVME drive. Basically, it will be the drive without any data and it will not be mounted per the list on the screen. -12. Then the script will ask for the 'root' partition. Type it in and press enter. It will be the LARGER partition and usually named `nvme0n1p1` if it is an NVME drive. -13. Then it will ask for the 'boot' partition. Type it in and press enter. It will be the SMALLER partition usually named `nvme0n1p2`. -14. Then it will ask for the 'swap' partition. Type it in and press enter. It will be the drive that is close to 16GB partition usually named `nvme0n1p3`. -15. The script will finish installing the base NixOS. At the end it will ask for a root password. Type `a` and press enter and type `a` again to confirm and press enter. -16. Remove the USB thumb drive from the second machine. -17. The machine will reboot into a very basic install of NixOS command prompt. - -### Procedure Two - Installing Sovran_SystemsOS - -1. Now at the basic install of NixOS from step 17, type `root` to log into root and type the password `a` when asked then press enter. -2. Now you are logged in as `root`. -3. Now type in or copy and paste: - - ```bash - wget https://git.sovransystems.com/Sovran_Systems/Sovran_SystemsOS/raw/branch/main/for_new_sovran_pros/sp.sh - ``` - - then press enter. -4. Type in `bash sp.sh` then press enter. -5. Next the script will ask for your domain names from Njal.la. Type them in the corresponding prompts and then press enter for each prompt. -6. Then it will ask for an email for the SSL certificates. Type it in and press enter. -7. The script is long so it will take some time. -8. Then it will ask for your root password which is `a` to install Flatpaks. -9. It will finish by stating `All Finished! Please Reboot then Enjoy your New Sovran Pro!` - -## Finishing the Install - -### Opening The Ports on Your Router - Internal IP - -1. Go to port forwarding on your router and open the above mentioned ports to the internal IP (the one you found above) of your new Sovran_SystemsOS machine - -### Putting the External IP of your Sovran Pro into your new domain names you just bought at [njal.la](https://njal.la) - -1. Log into your [njal.la](https://njal.la) account -2. Make a "dynamic" record for each subdomain and copy the `curl` commands after each sub-domain. -3. Paste `curl` command from njal.la website into `/var/lib/njalla/njalla.sh` . For example: - - ```bash - curl "https://njal.la/update/?h=test.testsovransystems.com&k=8n7vk3afj-jkyg37&a=${IP}" - ``` - - ##### Make sure the default `&auto` from njal.la is replaced by `&a=${IP}` at the end of each `curl` command in the `/var/lib/njalla/njalla.sh` as in the example above. - -### Setting the Desktop - -1. Open the Terminal app and type in: `dconf load / < /home/free/Downloads/Sovran_SystemsOS-Desktop`. Do NOT log in as root. - -### Setting Up Nextcloud and Wordpress - -#### Nextcloud - -1. Open a web browser and navigate to your domain name you bought from [njal.la](https://njal.la) for example "cloud.myfreedomsite.com" you attributed to your Nextcloud instance. -2. Nextcloud will as you to set up a new account to be used as a log in. Do so. -3. Nextcloud will also ask you where you want the data directory. Type in `/var/lib/nextcloud/data` -4. Nextcloud will ask you to connect the database: - 1. Choose `Postgresql` from the optoins. - 2. Database username is `ncusr` - 3. Database name is `nextclouddb` - 4. Database password is found by doing this: - 1. Open the Terminal app and type in or copy and paste: - - ```bash - ssh root@localhost - ``` - - It will as you for a password which is `gosovransystems` as this is the default temporary password from Sovran Systems. - - Now you will be logged in as root. - 2. Now open the Terminal app and type: - - `cat /var/lib/secrets/nextclouddb` - - and press enter. - 3. Your database password will be displayed in the Terminal window. - 4. Type that into the password field - 5. Now, press install and Nextcloud will be installed. It will take a few minutes. Follow the on screen prompts. - -#### Wordpress - -1. Open a web browser and navigate to your domain name you bought from [njal.la](https://njal.la) for example "myfreedomsite.com" you attributed to your Wordpress instance. -2. Wordpress will ask you to connect the database: - 1. Database username is `wpusr` - 2. Database name is `wordpressdb` - 3. Database password is found by doing this: - 1. Open the Terminal app and type in or copy and paste: - - ```bash - ssh root@localhost - ``` - - It will as you for a password which is `gosovransystems` as this is the default temporary password from Sovran Systems. - - Now you will be logged in as root. - 2. Now open the Terminal app and type: - - `cat /var/lib/secrets/wordpressdb` - - and press enter. - 3. Your database password will be displayed in the Terminal window. - 4. Type that into the password field - 4. Now, press install and Wordpress will be installed. It will take a few minutes. Follow the on screen prompts. - -### Final Install for Coturn and Nextcloud - -1. Open the Terminal app and type in or copy and paste: - - ```bash - ssh root@localhost - ``` -2. It will as you for a password which is `gosovransystems` as this is the default temporary password from Sovran Systems. -3. Now you will be logged in as root. -4. Now open the Terminal app and type or copy and paste: - - ```bash - sed -i '$e cat /var/lib/nextcloudaddition/nextcloudaddition' /var/lib/www/nextcloud/config/config.php - - chown caddy:php /var/lib/www -R - - chmod 700 /var/lib/www -R - ``` - -and press enter. - -1. Now type or copy and paste: - -```bash -set DOMAIN $(cat /var/lib/domains/matrix) && cp -n /var/lib/caddy/.local/share/caddy/certificates/acme-v02.api.letsencrypt.org-directory/{$DOMAIN}/{$DOMAIN}.crt /var/lib/coturn/{$DOMAIN}.crt.pem && cp -n /var/lib/caddy/.local/share/caddy/certificates/acme-v02.api.letsencrypt.org-directory/{$DOMAIN}/{$DOMAIN}.key /var/lib/coturn/{$DOMAIN}.key.pem && chown turnserver:turnserver /var/lib/coturn -R && chmod 770 /var/lib/coturn -R && systemctl restart coturn -``` - -and press enter. - -### Everything now will be installed regarding Sovran_SystemsOS. The remaining setup will be only for the front-end user account creations for BTCpayserver, Vaultwarden, connecting the node to Sparrow wallet and Bisq. - -### Congratulations! 🎉 \ No newline at end of file From ba21af1f3b656b7e452dbbf17271bb3a330a51cb Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Thu, 12 Sep 2024 13:12:34 -0700 Subject: [PATCH 402/667] updated README --- README.md | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 1665623..cba9579 100755 --- a/README.md +++ b/README.md @@ -23,7 +23,17 @@ Connect for Support on Matrix here: https://matrix.to/#/#sovran-systems-support: ### -## All Is Love. Fear Is Illusion. All Beings Are Free. Truth Can Never Be Destroyed. +## DIY Install Of Sovran_SystemsOS + +The write up for install on your own hardware is located here: + +https://git.sovransystems.com/Sovran_Systems/Sovran_SystemsOS/src/branch/main/DIY%20Install%20Sovran_SystemsOS.md + +The support chat is located here: + +https://matrix.to/#/%23DIY_Sovran_SystemsOS:anarchyislove.xyz + +## Created, Handcrafted, and Headquartered in Southern California – 2022-2024 🏖️. @@ -31,4 +41,6 @@ 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+ \ No newline at end of file +GNU GPL 3.0+ + +All Is Love. Fear Is Illusion. All Beings Are Free. Truth Can Never Be Destroyed. From f03b55c2a1acc5b3ddabe6b3efb85bde5bcfc562 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Thu, 12 Sep 2024 13:15:09 -0700 Subject: [PATCH 403/667] updated README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index cba9579..3081263 100755 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ The write up for install on your own hardware is located here: https://git.sovransystems.com/Sovran_Systems/Sovran_SystemsOS/src/branch/main/DIY%20Install%20Sovran_SystemsOS.md -The support chat is located here: +The DIY support chat is located here: https://matrix.to/#/%23DIY_Sovran_SystemsOS:anarchyislove.xyz From 8da79023c38476b44f5b52a70cb9fca2d6ec482d Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Thu, 12 Sep 2024 13:34:39 -0700 Subject: [PATCH 404/667] updated DIY install instructions --- DIY Install Sovran_SystemsOS.md | 47 ++++++++++++++++----------------- 1 file changed, 23 insertions(+), 24 deletions(-) diff --git a/DIY Install Sovran_SystemsOS.md b/DIY Install Sovran_SystemsOS.md index 5a3b382..ed0df0c 100755 --- a/DIY Install Sovran_SystemsOS.md +++ b/DIY Install Sovran_SystemsOS.md @@ -1,4 +1,4 @@ -# Sovran Systems offers little support of a DIY install of Sovran_SystemsOS. You can reach out to others in the matrix room https://matrix.to/#/#DIY_Sovran_SystemsOS:anarchyislove.xyz. Good Luck! +# Sovran Systems offers limited support of a DIY install of Sovran_SystemsOS. You can reach out to others in the matrix room https://matrix.to/#/#DIY_Sovran_SystemsOS:anarchyislove.xyz. # These instructions will change over time due to new software development and Sovran Systems creator finding more efficient ways to install Sovran_SystemsOS. 2-1-2024 @@ -10,18 +10,18 @@ 1. First machine with Linux OS already installed (like NixOS, Ubuntu, Arch, etc.) to download and burn the NixOS image to a USB thumb drive. 2. USB thumb drive 16GB or larger -3. Second machine that is ready to have Sovran_SystemsOS installed (Safe Boot turned off in the UEFI[BIOS] and be prepared for the entire storage drive to be ERASED). +3. Second machine that is ready to have Sovran_SystemsOS installed (Safe Boot turned off in the UEFI[BIOS] and be prepared for the entire storage drive to be ERASED!). 4. Second machine needs the following hardware specs: - Intel or AMD processor (NO ARM processors) -- 16GB of RAM or Larger -- First main internal drive to install Sovran_SystemsOS (NVME 500GB or larger) -- Second internal drive to store the Bitcoin blockchain and the automatic backups (SSD or NVME 2TB or larger) -- Also, the Second internal drive needs to be be installed FIRST into an USB enclosure. If the second drive is SSD, you need a SSD USB enclosure. If the second drive is NVME, you need a NVME USB enclosure. The USB enclosure will be plugged into the first Linux machine. +- 32GB of RAM or Larger +- First main NVME internal drive to install Sovran_SystemsOS (500GB or larger) +- Second NVME internal drive to store the Bitcoin blockchain and the automatic backups (NVME 4TB or larger) +- Also, the second NVME internal drive needs to be be installed FIRST into a USB enclosure. You will need a NVME USB enclosure. The USB enclosure will be plugged into the first Linux machine. -1. Working Internet connection for both machines -2. Personalized Domain names already purchased from Njal.la. See the explanation here: https://sovransystems.com/how-to-setup/ -3. Your Router with ports open (Port Forwarding) to your second machine's internal IP address. This will usually be `192.168.1.(some number)` You will complete this at the end. +5. Working Internet connection for both machines +6. Personalized Domain names already purchased from Njal.la. See the explanation here: https://sovransystems.com/how-to-setup/ +7. Your Router with ports open (Port Forwarding) to your second machine's internal IP address. This will usually be `192.168.1.(some number)` You will complete this at the end. - Port 80 - Port 443 @@ -31,8 +31,8 @@ ## Preparing the Second Internal Drive -1. Install the second internal drive (NVME or SSD) into its appropriate USB enclosure, NOT into the Second machine yet. -2. Plug in the USB enclosure with the second drive installed into the first machine with Linux installed into one of its available USB ports. +1. Install the second NVME internal drive into the USB enclosure, NOT into the Second machine yet. +2. Plug in the USB enclosure into the first machine with Linux installed into one of its available USB ports. 3. Open a terminal in the first Linux machine and log in as root. 4. Type in or copy and paste: @@ -43,8 +43,8 @@ wget https://git.sovransystems.com/Sovran_Systems/Sovran_SystemsOS/raw/branch/ma then press enter. 1. Now, type `bash sdpsp.sh` then press enter. -2. Then the screen will ask for "what block..." which will be the drive in the list that is not mounted,which will be the drive you just plugged in. It might be labeled `sda`, `sdb`, `sdc`, or if it is a NVME it will be `nvme0n1`, or `nvme0n2` etc. -3. Then the screen will ask for "what partition...,"which will be whatever you typed into the first prompt, but with a "1" on it. For example `sda1`, `sdb1`, `sdc1`, or `nvme0n1p1` or `nvme0n2p1`. +2. Then the screen will ask for "what block..." which will be the drive in the list that is not mounted, which will be the drive you just plugged in. It might be labeled `nvme0n1`, or `nvme0n2` etc. Type in the drive name and press `enter`. +3. Then the screen will ask for "what partition...,"which will be whatever you typed into the first prompt, but with a "1" on it. For example, `nvme0n1p1` or `nvme0n2p1`. Type it into the terminal and press `enter`. 4. Since the script is made to copy the blockchain from another Sovran Pro that already has the full blockchain installed it will throw an error. However, it should complete the setup just fine. 5. Once complete, remove the second drive from the USB enclosure and install it into your second machine in which you are installing Sovran_SystemsOS. @@ -54,7 +54,7 @@ then press enter. 1. On the first machine download the latest NixOS minimal (64-bit Intel/AMD) image from here: https://nixos.org/download 2. Burn that ISO image onto the USB thumb drive. - 3. Insert the newly created USB thumb drive with the ISO image burned onto it into the second machine (the one you are installing Sovran_SystemsOS). + 3. Insert the newly created USB thumb drive with the ISO image into the second machine (the one you are installing Sovran_SystemsOS). 4. Reboot the second machine while the USB thumb drive is inserted and boot into the USB thumb drive. This may require you to press the F7 or F12 key at boot. (Also, make sure the second machine has "safe boot" turned off in the UEFI[BIOS]). 5. Proceed with the NixOS boot menu 6. Once at the command prompt type in `sudo su` to move to the root user @@ -63,18 +63,17 @@ then press enter. 9. Now, that you are logged in as the root user type in or copy and paste: ```bash - curl https://git.sovransystems.com/Sovran_Systems/Sovran_SystemsOS/raw/branch/main/for_new_sovran_pros/psp.sh -o psp.sh + curl https://git.sovransystems.com/Sovran_Systems/Sovran_SystemsOS/raw/branch/main/for_new_sovran_pros/psp_physical_ram.sh -o psp_physical_ram.sh ``` the command to install the base NixOS and press enter. 10. Now, type `bash psp.sh` then press enter. -11. The script will ask for name of first main internal drive. Type that in and hit enter. It usually will be `nvme0n1` if it is an NVME drive. Basically, it will be the drive without any data and it will not be mounted per the list on the screen. -12. Then the script will ask for the 'root' partition. Type it in and press enter. It will be the LARGER partition and usually named `nvme0n1p1` if it is an NVME drive. -13. Then it will ask for the 'boot' partition. Type it in and press enter. It will be the SMALLER partition usually named `nvme0n1p2`. -14. Then it will ask for the 'swap' partition. Type it in and press enter. It will be the drive that is close to 16GB partition usually named `nvme0n1p3`. -15. The script will finish installing the base NixOS. At the end it will ask for a root password. Type `a` and press enter and type `a` again to confirm and press enter. -16. Remove the USB thumb drive from the second machine. -17. The machine will reboot into a very basic install of NixOS command prompt. +11. The script will ask for name of first main internal drive. Type that in and hit enter. It usually will be `nvme0n1`. Basically, it will be the drive without any data and it will not be mounted per the list on the screen. +12. Then the script will ask for the 'Boot' partition. Type it in and press enter. It will be the SMALLER partition and usually named `nvme0n1p1`. +13. Then it will ask for the 'Primary' partition. Type it in and press enter. It will be the LARGER partition usually named `nvme0n1p2`. +14. The script will finish installing the base NixOS. At the end it will ask for a root password. Type `a` and press enter and type `a` again to confirm and press enter. +15. Remove the USB thumb drive from the second machine. +16. The machine will reboot into a very basic install of NixOS command prompt. ### Procedure Two - Installing Sovran_SystemsOS @@ -104,7 +103,7 @@ then press enter. 1. Log into your [njal.la](https://njal.la) account 2. Make a "dynamic" record for each subdomain and copy the `curl` commands after each sub-domain. -3. Paste `curl` command from njal.la website into `/var/lib/njalla/njalla.sh` . For example: +3. Paste the `curl` command from njal.la's website into `/var/lib/njalla/njalla.sh` . For example: ```bash curl "https://njal.la/update/?h=test.testsovransystems.com&k=8n7vk3afj-jkyg37&a=${IP}" @@ -202,4 +201,4 @@ and press enter. ### Everything now will be installed regarding Sovran_SystemsOS. The remaining setup will be only for the front-end user account creations for BTCpayserver, Vaultwarden, connecting the node to Sparrow wallet and Bisq. -### Congratulations! 🎉 \ No newline at end of file +### Congratulations! 🎉 From 55a46b08600ddfd45c398a7fb977f99c4e725327 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Thu, 12 Sep 2024 13:36:32 -0700 Subject: [PATCH 405/667] updated DIY install instructions --- DIY Install Sovran_SystemsOS.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DIY Install Sovran_SystemsOS.md b/DIY Install Sovran_SystemsOS.md index ed0df0c..113116c 100755 --- a/DIY Install Sovran_SystemsOS.md +++ b/DIY Install Sovran_SystemsOS.md @@ -1,6 +1,6 @@ # Sovran Systems offers limited support of a DIY install of Sovran_SystemsOS. You can reach out to others in the matrix room https://matrix.to/#/#DIY_Sovran_SystemsOS:anarchyislove.xyz. -# These instructions will change over time due to new software development and Sovran Systems creator finding more efficient ways to install Sovran_SystemsOS. 2-1-2024 +# These instructions will change over time due to new software development and Sovran Systems creator finding more efficient ways to install Sovran_SystemsOS. 9-12-2024 # Also, to fully complete the install, the Bitcoin blockchain will have to download. This could take up to 3 weeks. From f4aaf2c7c32dfa5f6d165ffcfbd1bd3e5415cc68 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Thu, 12 Sep 2024 13:44:32 -0700 Subject: [PATCH 406/667] updated DIY install instructions --- DIY Install Sovran_SystemsOS.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/DIY Install Sovran_SystemsOS.md b/DIY Install Sovran_SystemsOS.md index 113116c..d056e38 100755 --- a/DIY Install Sovran_SystemsOS.md +++ b/DIY Install Sovran_SystemsOS.md @@ -32,9 +32,10 @@ ## Preparing the Second Internal Drive 1. Install the second NVME internal drive into the USB enclosure, NOT into the Second machine yet. -2. Plug in the USB enclosure into the first machine with Linux installed into one of its available USB ports. -3. Open a terminal in the first Linux machine and log in as root. -4. Type in or copy and paste: +2. Plug in the USB enclosure into the first machine with Linux into one of its available USB ports. +3. **Please Make Sure You Know The Existing Storage Names On This First Linux Machine. IF You Run The Script Below And You Do Not Know What You Are Doing, You Could Potentially Erase Your First Linux Machine's Data. I Am Not Responsibly For Your Errors** +4. Open a terminal in the first Linux machine and log in as root. +5. Type in or copy and paste: ```bash wget https://git.sovransystems.com/Sovran_Systems/Sovran_SystemsOS/raw/branch/main/for_new_sovran_pros/sdpsp.sh From d87a9af8f7a02674e091677409316093f111c0cc Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Thu, 12 Sep 2024 13:48:39 -0700 Subject: [PATCH 407/667] updated DIY install instructions --- DIY Install Sovran_SystemsOS.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/DIY Install Sovran_SystemsOS.md b/DIY Install Sovran_SystemsOS.md index d056e38..fa05a63 100755 --- a/DIY Install Sovran_SystemsOS.md +++ b/DIY Install Sovran_SystemsOS.md @@ -32,8 +32,8 @@ ## Preparing the Second Internal Drive 1. Install the second NVME internal drive into the USB enclosure, NOT into the Second machine yet. -2. Plug in the USB enclosure into the first machine with Linux into one of its available USB ports. -3. **Please Make Sure You Know The Existing Storage Names On This First Linux Machine. IF You Run The Script Below And You Do Not Know What You Are Doing, You Could Potentially Erase Your First Linux Machine's Data. I Am Not Responsibly For Your Errors** +2. Plug in the USB enclosure into the first machine with Linux OS already installed into one of its available USB ports. +3. **Please Make Sure You Know The Existing Storage Names On This First Linux Machine. If You Run The Script Below And You Do Not Know What You Are Doing, You Could Potentially Erase Your First Linux Machine's Data. I Am Not Responsibly For Your Errors** 4. Open a terminal in the first Linux machine and log in as root. 5. Type in or copy and paste: @@ -53,7 +53,7 @@ then press enter. ### Procedure One - Installing base NixOS - 1. On the first machine download the latest NixOS minimal (64-bit Intel/AMD) image from here: https://nixos.org/download + 1. Still on the first machine with Linux OS already installed, download the latest NixOS minimal (64-bit Intel/AMD) image from here: https://nixos.org/download 2. Burn that ISO image onto the USB thumb drive. 3. Insert the newly created USB thumb drive with the ISO image into the second machine (the one you are installing Sovran_SystemsOS). 4. Reboot the second machine while the USB thumb drive is inserted and boot into the USB thumb drive. This may require you to press the F7 or F12 key at boot. (Also, make sure the second machine has "safe boot" turned off in the UEFI[BIOS]). From 37481b09fdfb410b730fab6490fc0d1d313549d1 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Thu, 12 Sep 2024 13:50:19 -0700 Subject: [PATCH 408/667] updated DIY install instructions --- DIY Install Sovran_SystemsOS.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/DIY Install Sovran_SystemsOS.md b/DIY Install Sovran_SystemsOS.md index fa05a63..bf692a0 100755 --- a/DIY Install Sovran_SystemsOS.md +++ b/DIY Install Sovran_SystemsOS.md @@ -43,11 +43,11 @@ wget https://git.sovransystems.com/Sovran_Systems/Sovran_SystemsOS/raw/branch/ma then press enter. -1. Now, type `bash sdpsp.sh` then press enter. -2. Then the screen will ask for "what block..." which will be the drive in the list that is not mounted, which will be the drive you just plugged in. It might be labeled `nvme0n1`, or `nvme0n2` etc. Type in the drive name and press `enter`. -3. Then the screen will ask for "what partition...,"which will be whatever you typed into the first prompt, but with a "1" on it. For example, `nvme0n1p1` or `nvme0n2p1`. Type it into the terminal and press `enter`. -4. Since the script is made to copy the blockchain from another Sovran Pro that already has the full blockchain installed it will throw an error. However, it should complete the setup just fine. -5. Once complete, remove the second drive from the USB enclosure and install it into your second machine in which you are installing Sovran_SystemsOS. +6. Now, type `bash sdpsp.sh` then press enter. +7. Then the screen will ask for "what block..." which will be the drive in the list that is not mounted, which will be the drive you just plugged in. It might be labeled `nvme0n1`, or `nvme0n2` etc. Type in the drive name and press `enter`. +8. Then the screen will ask for "what partition...,"which will be whatever you typed into the first prompt, but with a "1" on it. For example, `nvme0n1p1` or `nvme0n2p1`. Type it into the terminal and press `enter`. +9. Since the script is made to copy the blockchain from another Sovran Pro that already has the full blockchain installed it will throw an error. However, it should complete the setup just fine. +10. Once complete, remove the second drive from the USB enclosure and install it into your second machine in which you are installing Sovran_SystemsOS. ## Preparing the First Main Internal Drive From dfb2a135c7764401f4537c7e61314a505124366e Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Thu, 12 Sep 2024 13:51:38 -0700 Subject: [PATCH 409/667] updated DIY install instructions --- DIY Install Sovran_SystemsOS.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DIY Install Sovran_SystemsOS.md b/DIY Install Sovran_SystemsOS.md index bf692a0..9b93240 100755 --- a/DIY Install Sovran_SystemsOS.md +++ b/DIY Install Sovran_SystemsOS.md @@ -17,7 +17,7 @@ - 32GB of RAM or Larger - First main NVME internal drive to install Sovran_SystemsOS (500GB or larger) - Second NVME internal drive to store the Bitcoin blockchain and the automatic backups (NVME 4TB or larger) -- Also, the second NVME internal drive needs to be be installed FIRST into a USB enclosure. You will need a NVME USB enclosure. The USB enclosure will be plugged into the first Linux machine. +- Also, the second NVME internal drive needs to be installed FIRST into a USB enclosure. You will need a NVME USB enclosure. The USB enclosure will be plugged into the first Linux machine. 5. Working Internet connection for both machines 6. Personalized Domain names already purchased from Njal.la. See the explanation here: https://sovransystems.com/how-to-setup/ From f7d5dedffd881a9ccd4ac8697e94d1f643664b88 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Thu, 12 Sep 2024 14:05:51 -0700 Subject: [PATCH 410/667] updated DIY install instructions --- DIY Install Sovran_SystemsOS.md | 28 ++++++++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-) diff --git a/DIY Install Sovran_SystemsOS.md b/DIY Install Sovran_SystemsOS.md index 9b93240..c39e49a 100755 --- a/DIY Install Sovran_SystemsOS.md +++ b/DIY Install Sovran_SystemsOS.md @@ -78,7 +78,7 @@ then press enter. ### Procedure Two - Installing Sovran_SystemsOS -1. Now at the basic install of NixOS from step 17, type `root` to log into root and type the password `a` when asked then press enter. +1. Now at the basic install of NixOS from step `16`, type `root` to log into root and type the password `a` when asked then press enter. 2. Now you are logged in as `root`. 3. Now type in or copy and paste: @@ -103,14 +103,34 @@ then press enter. ### Putting the External IP of your Sovran Pro into your new domain names you just bought at [njal.la](https://njal.la) 1. Log into your [njal.la](https://njal.la) account -2. Make a "dynamic" record for each subdomain and copy the `curl` commands after each sub-domain. -3. Paste the `curl` command from njal.la's website into `/var/lib/njalla/njalla.sh` . For example: +2. Make a "dynamic" record for each subdomain +3. Njal.la with then display a `curl` commands for each sub-domain. +4. Open the `Terminal`on your New DIY Sovran Pro and type in or copy and paste: + + ```bash + ssh root@localhost + ``` + + It will as you for a password which is `gosovransystems` as this is the default temporary password from Sovran Systems. + + Now you will be logged in as root. + +5. Now open the Terminal app and type: + + `nano /var/lib/njalla/njalla.sh` + + and press enter. + + +3. Paste the `curl` command from njal.la's website into `/var/lib/njalla/njalla.sh` with each sub-domain getting a new line. For example: ```bash curl "https://njal.la/update/?h=test.testsovransystems.com&k=8n7vk3afj-jkyg37&a=${IP}" ``` - ##### Make sure the default `&auto` from njal.la is replaced by `&a=${IP}` at the end of each `curl` command in the `/var/lib/njalla/njalla.sh` as in the example above. +##### Make sure the default `&auto` from njal.la is replaced by `&a=${IP}` at the end of each `curl` command in the `/var/lib/njalla/njalla.sh` as in the example above. + +7. After you have added all the sub-domins into `/var/lib/njalla/njalla.sh`, press `ctrl + s` then press `ctrl + x` to save and exit `nano`. ### Setting the Desktop From bb41ca5b6aed5c75697b90a932959d4fc5165266 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Thu, 12 Sep 2024 14:09:00 -0700 Subject: [PATCH 411/667] updated DIY install instructions --- DIY Install Sovran_SystemsOS.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/DIY Install Sovran_SystemsOS.md b/DIY Install Sovran_SystemsOS.md index c39e49a..a1c7a6e 100755 --- a/DIY Install Sovran_SystemsOS.md +++ b/DIY Install Sovran_SystemsOS.md @@ -104,22 +104,22 @@ then press enter. 1. Log into your [njal.la](https://njal.la) account 2. Make a "dynamic" record for each subdomain -3. Njal.la with then display a `curl` commands for each sub-domain. -4. Open the `Terminal`on your New DIY Sovran Pro and type in or copy and paste: +3. Njal.la will now display a `curl` command for each sub-domain. +4. Open the `Terminal` on your New DIY Sovran Pro and type in or copy and paste: ```bash ssh root@localhost ``` - It will as you for a password which is `gosovransystems` as this is the default temporary password from Sovran Systems. +It will as you for a password which is `gosovransystems` as this is the default temporary password from Sovran Systems. - Now you will be logged in as root. +Now you will be logged in as root. 5. Now open the Terminal app and type: - `nano /var/lib/njalla/njalla.sh` + `nano /var/lib/njalla/njalla.sh` - and press enter. +and press enter. 3. Paste the `curl` command from njal.la's website into `/var/lib/njalla/njalla.sh` with each sub-domain getting a new line. For example: From d9fdd9355aab2262c07c6ef212f3cf3555201721 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Thu, 12 Sep 2024 14:12:20 -0700 Subject: [PATCH 412/667] updated DIY install instructions --- DIY Install Sovran_SystemsOS.md | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/DIY Install Sovran_SystemsOS.md b/DIY Install Sovran_SystemsOS.md index a1c7a6e..6d69be4 100755 --- a/DIY Install Sovran_SystemsOS.md +++ b/DIY Install Sovran_SystemsOS.md @@ -107,19 +107,17 @@ then press enter. 3. Njal.la will now display a `curl` command for each sub-domain. 4. Open the `Terminal` on your New DIY Sovran Pro and type in or copy and paste: - ```bash - ssh root@localhost - ``` - -It will as you for a password which is `gosovransystems` as this is the default temporary password from Sovran Systems. - -Now you will be logged in as root. + ```bash + ssh root@localhost + ``` + It will as you for a password which is `gosovransystems` as this is the default temporary password from Sovran Systems. + Now you will be logged in as root. 5. Now open the Terminal app and type: `nano /var/lib/njalla/njalla.sh` -and press enter. + and press enter. 3. Paste the `curl` command from njal.la's website into `/var/lib/njalla/njalla.sh` with each sub-domain getting a new line. For example: @@ -127,8 +125,7 @@ and press enter. ```bash curl "https://njal.la/update/?h=test.testsovransystems.com&k=8n7vk3afj-jkyg37&a=${IP}" ``` - -##### Make sure the default `&auto` from njal.la is replaced by `&a=${IP}` at the end of each `curl` command in the `/var/lib/njalla/njalla.sh` as in the example above. + ##### Make sure the default `&auto` from njal.la is replaced by `&a=${IP}` at the end of each `curl` command in the `/var/lib/njalla/njalla.sh` as in the example above. 7. After you have added all the sub-domins into `/var/lib/njalla/njalla.sh`, press `ctrl + s` then press `ctrl + x` to save and exit `nano`. From 43328aadbc0288dfdd1fb320e4a73baf05436fb9 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Thu, 12 Sep 2024 14:16:23 -0700 Subject: [PATCH 413/667] updated DIY install instructions --- DIY Install Sovran_SystemsOS.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/DIY Install Sovran_SystemsOS.md b/DIY Install Sovran_SystemsOS.md index 6d69be4..55c0a3c 100755 --- a/DIY Install Sovran_SystemsOS.md +++ b/DIY Install Sovran_SystemsOS.md @@ -113,17 +113,18 @@ then press enter. It will as you for a password which is `gosovransystems` as this is the default temporary password from Sovran Systems. Now you will be logged in as root. -5. Now open the Terminal app and type: +5. Now type: `nano /var/lib/njalla/njalla.sh` and press enter. -3. Paste the `curl` command from njal.la's website into `/var/lib/njalla/njalla.sh` with each sub-domain getting a new line. For example: +3. Paste the `curl` commands from njal.la's website for each sub-domain. Each `curl` command gets a new line. For example: ```bash curl "https://njal.la/update/?h=test.testsovransystems.com&k=8n7vk3afj-jkyg37&a=${IP}" + curl "https://njal.la/update/?h=zap.testsovransystems.com&k=8no*73afj-jkygi2ea=${IP}" ``` ##### Make sure the default `&auto` from njal.la is replaced by `&a=${IP}` at the end of each `curl` command in the `/var/lib/njalla/njalla.sh` as in the example above. From 67b7cf10382fd9c1f62448426691f8f379fa2703 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Thu, 12 Sep 2024 14:24:29 -0700 Subject: [PATCH 414/667] updated DIY install instructions --- DIY Install Sovran_SystemsOS.md | 55 +++++++++++++-------------------- 1 file changed, 22 insertions(+), 33 deletions(-) diff --git a/DIY Install Sovran_SystemsOS.md b/DIY Install Sovran_SystemsOS.md index 55c0a3c..1d48762 100755 --- a/DIY Install Sovran_SystemsOS.md +++ b/DIY Install Sovran_SystemsOS.md @@ -130,9 +130,13 @@ then press enter. 7. After you have added all the sub-domins into `/var/lib/njalla/njalla.sh`, press `ctrl + s` then press `ctrl + x` to save and exit `nano`. +8. Close the `Terminal`. + ### Setting the Desktop -1. Open the Terminal app and type in: `dconf load / < /home/free/Downloads/Sovran_SystemsOS-Desktop`. Do NOT log in as root. +1. Open the `Terminal` and type in: `dconf load / < /home/free/Downloads/Sovran_SystemsOS-Desktop`. Do NOT log in as root. + +2. Close the `Terminal`. ### Setting Up Nextcloud and Wordpress @@ -146,7 +150,7 @@ then press enter. 2. Database username is `ncusr` 3. Database name is `nextclouddb` 4. Database password is found by doing this: - 1. Open the Terminal app and type in or copy and paste: + 1. Open the `Terminal` again and type in or copy and paste: ```bash ssh root@localhost @@ -162,7 +166,8 @@ then press enter. and press enter. 3. Your database password will be displayed in the Terminal window. 4. Type that into the password field - 5. Now, press install and Nextcloud will be installed. It will take a few minutes. Follow the on screen prompts. + +5. Now, press install and Nextcloud will be installed. It will take a few minutes. Follow the on screen prompts. #### Wordpress @@ -171,50 +176,34 @@ then press enter. 1. Database username is `wpusr` 2. Database name is `wordpressdb` 3. Database password is found by doing this: - 1. Open the Terminal app and type in or copy and paste: - - ```bash - ssh root@localhost - ``` - - It will as you for a password which is `gosovransystems` as this is the default temporary password from Sovran Systems. - - Now you will be logged in as root. - 2. Now open the Terminal app and type: + 1. Staying in the `Terminal` and type in or copy and paste: `cat /var/lib/secrets/wordpressdb` and press enter. 3. Your database password will be displayed in the Terminal window. 4. Type that into the password field - 4. Now, press install and Wordpress will be installed. It will take a few minutes. Follow the on screen prompts. + +4. Now, press install and Wordpress will be installed. It will take a few minutes. Follow the on screen prompts. ### Final Install for Coturn and Nextcloud -1. Open the Terminal app and type in or copy and paste: +1. Staying in the `Terminal` type in or copy and paste: - ```bash - ssh root@localhost - ``` -2. It will as you for a password which is `gosovransystems` as this is the default temporary password from Sovran Systems. -3. Now you will be logged in as root. -4. Now open the Terminal app and type or copy and paste: + ```bash + sed -i '$e cat /var/lib/nextcloudaddition/nextcloudaddition' /var/lib/www/nextcloud/config/config.php - ```bash - sed -i '$e cat /var/lib/nextcloudaddition/nextcloudaddition' /var/lib/www/nextcloud/config/config.php - - chown caddy:php /var/lib/www -R - - chmod 700 /var/lib/www -R - ``` + chown caddy:php /var/lib/www -R -and press enter. + chmod 700 /var/lib/www -R + ``` + and press enter. -1. Now type or copy and paste: +2. Now type or copy and paste: -```bash -set DOMAIN $(cat /var/lib/domains/matrix) && cp -n /var/lib/caddy/.local/share/caddy/certificates/acme-v02.api.letsencrypt.org-directory/{$DOMAIN}/{$DOMAIN}.crt /var/lib/coturn/{$DOMAIN}.crt.pem && cp -n /var/lib/caddy/.local/share/caddy/certificates/acme-v02.api.letsencrypt.org-directory/{$DOMAIN}/{$DOMAIN}.key /var/lib/coturn/{$DOMAIN}.key.pem && chown turnserver:turnserver /var/lib/coturn -R && chmod 770 /var/lib/coturn -R && systemctl restart coturn -``` + ```bash + set DOMAIN $(cat /var/lib/domains/matrix) && cp -n /var/lib/caddy/.local/share/caddy/certificates/acme-v02.api.letsencrypt.org-directory/{$DOMAIN}/{$DOMAIN}.crt /var/lib/coturn/{$DOMAIN}.crt.pem && cp -n /var/lib/caddy/.local/share/caddy/certificates/acme-v02.api.letsencrypt.org-directory/{$DOMAIN}/{$DOMAIN}.key /var/lib/coturn/{$DOMAIN}.key.pem && chown turnserver:turnserver /var/lib/coturn -R && chmod 770 /var/lib/coturn -R && systemctl restart coturn + ``` and press enter. From cd707d9c3268ae0dc842f75014e5b423236f26d9 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Thu, 12 Sep 2024 14:34:51 -0700 Subject: [PATCH 415/667] updated DIY install instructions --- DIY Install Sovran_SystemsOS.md | 34 ++++++++++++++++++++------------- 1 file changed, 21 insertions(+), 13 deletions(-) diff --git a/DIY Install Sovran_SystemsOS.md b/DIY Install Sovran_SystemsOS.md index 1d48762..debf8ce 100755 --- a/DIY Install Sovran_SystemsOS.md +++ b/DIY Install Sovran_SystemsOS.md @@ -100,7 +100,7 @@ then press enter. 1. Go to port forwarding on your router and open the above mentioned ports to the internal IP (the one you found above) of your new Sovran_SystemsOS machine -### Putting the External IP of your Sovran Pro into your new domain names you just bought at [njal.la](https://njal.la) +### Putting the External IP of your New DIY Sovran Pro into your new domain names you just bought at [njal.la](https://njal.la) 1. Log into your [njal.la](https://njal.la) account 2. Make a "dynamic" record for each subdomain @@ -111,6 +111,7 @@ then press enter. ssh root@localhost ``` It will as you for a password which is `gosovransystems` as this is the default temporary password from Sovran Systems. + Now you will be logged in as root. 5. Now type: @@ -150,24 +151,23 @@ then press enter. 2. Database username is `ncusr` 3. Database name is `nextclouddb` 4. Database password is found by doing this: - 1. Open the `Terminal` again and type in or copy and paste: + 1. Open the `Terminal` again, then type in or copy and paste: ```bash ssh root@localhost ``` - - It will as you for a password which is `gosovransystems` as this is the default temporary password from Sovran Systems. - Now you will be logged in as root. - 2. Now open the Terminal app and type: + + 2. Now type: `cat /var/lib/secrets/nextclouddb` and press enter. - 3. Your database password will be displayed in the Terminal window. + + 3. Your database password will be displayed in the `Terminal` window. 4. Type that into the password field -5. Now, press install and Nextcloud will be installed. It will take a few minutes. Follow the on screen prompts. +5. Now, press `Install` on the Nextcloud website and Nextcloud will be installed. It will take a few minutes. Follow the on screen prompts. #### Wordpress @@ -175,16 +175,24 @@ then press enter. 2. Wordpress will ask you to connect the database: 1. Database username is `wpusr` 2. Database name is `wordpressdb` - 3. Database password is found by doing this: - 1. Staying in the `Terminal` and type in or copy and paste: + 4. Database password is found by doing this: + 1. Open the `Terminal` again, then type in or copy and paste: + + ```bash + ssh root@localhost + ``` + Now you will be logged in as root. + + 2. Now type: `cat /var/lib/secrets/wordpressdb` and press enter. - 3. Your database password will be displayed in the Terminal window. + + 3. Your database password will be displayed in the `Terminal` window. 4. Type that into the password field -4. Now, press install and Wordpress will be installed. It will take a few minutes. Follow the on screen prompts. +5. Now, press `Install` on the Wordpress website and Wordpress will be installed. It will take a few minutes. Follow the on screen prompts. ### Final Install for Coturn and Nextcloud @@ -195,7 +203,7 @@ then press enter. chown caddy:php /var/lib/www -R - chmod 700 /var/lib/www -R + chmod 700 /var/lib/www R ``` and press enter. From 12466c641578030fc8f376c85752f3326ea410fe Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Thu, 12 Sep 2024 14:36:34 -0700 Subject: [PATCH 416/667] updated DIY install instructions --- DIY Install Sovran_SystemsOS.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/DIY Install Sovran_SystemsOS.md b/DIY Install Sovran_SystemsOS.md index debf8ce..52b17bc 100755 --- a/DIY Install Sovran_SystemsOS.md +++ b/DIY Install Sovran_SystemsOS.md @@ -212,8 +212,7 @@ then press enter. ```bash set DOMAIN $(cat /var/lib/domains/matrix) && cp -n /var/lib/caddy/.local/share/caddy/certificates/acme-v02.api.letsencrypt.org-directory/{$DOMAIN}/{$DOMAIN}.crt /var/lib/coturn/{$DOMAIN}.crt.pem && cp -n /var/lib/caddy/.local/share/caddy/certificates/acme-v02.api.letsencrypt.org-directory/{$DOMAIN}/{$DOMAIN}.key /var/lib/coturn/{$DOMAIN}.key.pem && chown turnserver:turnserver /var/lib/coturn -R && chmod 770 /var/lib/coturn -R && systemctl restart coturn ``` - -and press enter. + and press enter. ### Everything now will be installed regarding Sovran_SystemsOS. The remaining setup will be only for the front-end user account creations for BTCpayserver, Vaultwarden, connecting the node to Sparrow wallet and Bisq. From 8047a2114437cd10f0ff60f949f454092ddfb559 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Thu, 12 Sep 2024 14:56:01 -0700 Subject: [PATCH 417/667] updated sp.sh script --- for_new_sovran_pros/sp.sh | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/for_new_sovran_pros/sp.sh b/for_new_sovran_pros/sp.sh index 5cc2218..3d40def 100755 --- a/for_new_sovran_pros/sp.sh +++ b/for_new_sovran_pros/sp.sh @@ -254,16 +254,6 @@ chmod 770 /var/lib/domains -R # -pushd /etc/nixos - - nix flake update - - nixos-rebuild switch --impure - -popd - -# - set -x wget -P /var/lib/www/downloadwp https://wordpress.org/latest.zip @@ -314,16 +304,6 @@ chmod 770 /run/media/Second_Drive/BTCEcoandBackup/Electrs_Data -R # -pushd /etc/nixos - - nix flake update - - nixos-rebuild switch --impure - -popd - -# - mkdir -p /home/free/Downloads pushd /home/free/Downloads @@ -424,10 +404,6 @@ chmod 700 /home/free -R # -sudo -u free flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo - -# - 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 From b6569c971348167dfebc7cf1dec8c0552b687a11 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Thu, 12 Sep 2024 15:01:47 -0700 Subject: [PATCH 418/667] updated sp.sh script --- for_new_sovran_pros/sp.sh | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/for_new_sovran_pros/sp.sh b/for_new_sovran_pros/sp.sh index 3d40def..60356ce 100755 --- a/for_new_sovran_pros/sp.sh +++ b/for_new_sovran_pros/sp.sh @@ -5,7 +5,6 @@ GREEN="\e[32m" LIGHTBLUE="\e[94m" -ENDCOLOR="\e[0m" # @@ -404,6 +403,4 @@ chmod 700 /home/free -R # -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 +echo -e "${GREEN}All Finished! Please Reboot then Enjoy your New Sovran Pro!" From 4670c89d2ee82cd3a453c0d735bb82b3f415b68e Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Fri, 13 Sep 2024 15:18:00 -0700 Subject: [PATCH 419/667] updated DIY Instructions --- DIY Install Sovran_SystemsOS.md | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/DIY Install Sovran_SystemsOS.md b/DIY Install Sovran_SystemsOS.md index 52b17bc..e16ac6b 100755 --- a/DIY Install Sovran_SystemsOS.md +++ b/DIY Install Sovran_SystemsOS.md @@ -44,8 +44,8 @@ wget https://git.sovransystems.com/Sovran_Systems/Sovran_SystemsOS/raw/branch/ma then press enter. 6. Now, type `bash sdpsp.sh` then press enter. -7. Then the screen will ask for "what block..." which will be the drive in the list that is not mounted, which will be the drive you just plugged in. It might be labeled `nvme0n1`, or `nvme0n2` etc. Type in the drive name and press `enter`. -8. Then the screen will ask for "what partition...,"which will be whatever you typed into the first prompt, but with a "1" on it. For example, `nvme0n1p1` or `nvme0n2p1`. Type it into the terminal and press `enter`. +7. Then the screen will ask for "what block..." which will be the drive in the list that is not mounted, which will be the drive you just plugged in. It might be labeled `sdb`, or `sdc` etc. Type in the drive name and press `enter`. +8. Then the screen will ask for "what partition...,"which will be whatever you typed into the first prompt, but with a "1" on it. For example, `sdb1` or `sdc1`. Type it into the terminal and press `enter`. 9. Since the script is made to copy the blockchain from another Sovran Pro that already has the full blockchain installed it will throw an error. However, it should complete the setup just fine. 10. Once complete, remove the second drive from the USB enclosure and install it into your second machine in which you are installing Sovran_SystemsOS. @@ -91,8 +91,7 @@ then press enter. 5. Next the script will ask for your domain names from Njal.la. Type them in the corresponding prompts and then press enter for each prompt. 6. Then it will ask for an email for the SSL certificates. Type it in and press enter. 7. The script is long so it will take some time. -8. Then it will ask for your root password which is `a` to install Flatpaks. -9. It will finish by stating `All Finished! Please Reboot then Enjoy your New Sovran Pro!` +8. It will finish by stating `All Finished! Please Reboot then Enjoy your New Sovran Pro!` ## Finishing the Install @@ -214,6 +213,13 @@ then press enter. ``` and press enter. +3. Now type or copy and paste: + + ```bash + sudo -u free flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo + ``` + and press enter. + ### Everything now will be installed regarding Sovran_SystemsOS. The remaining setup will be only for the front-end user account creations for BTCpayserver, Vaultwarden, connecting the node to Sparrow wallet and Bisq. ### Congratulations! 🎉 From 9677540a9f748e2565379f5e4ca4d9f73ea2005a Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Fri, 13 Sep 2024 19:17:04 -0700 Subject: [PATCH 420/667] updated DIY Instructions --- DIY Install Sovran_SystemsOS.md | 69 ++++++++++++++++++++++----------- 1 file changed, 47 insertions(+), 22 deletions(-) diff --git a/DIY Install Sovran_SystemsOS.md b/DIY Install Sovran_SystemsOS.md index e16ac6b..6109fa8 100755 --- a/DIY Install Sovran_SystemsOS.md +++ b/DIY Install Sovran_SystemsOS.md @@ -8,10 +8,10 @@ ### Requirements -1. First machine with Linux OS already installed (like NixOS, Ubuntu, Arch, etc.) to download and burn the NixOS image to a USB thumb drive. +1. First computer with Linux OS already installed (like NixOS, Ubuntu, Arch, etc.) to download and burn the NixOS image to a USB thumb drive. 2. USB thumb drive 16GB or larger -3. Second machine that is ready to have Sovran_SystemsOS installed (Safe Boot turned off in the UEFI[BIOS] and be prepared for the entire storage drive to be ERASED!). -4. Second machine needs the following hardware specs: +3. Second computer that is ready to have Sovran_SystemsOS installed (Safe Boot turned off in the UEFI[BIOS] and be prepared for the entire storage drive to be ERASED!). +4. Second computer needs the following hardware specs: - Intel or AMD processor (NO ARM processors) - 32GB of RAM or Larger @@ -19,7 +19,7 @@ - Second NVME internal drive to store the Bitcoin blockchain and the automatic backups (NVME 4TB or larger) - Also, the second NVME internal drive needs to be installed FIRST into a USB enclosure. You will need a NVME USB enclosure. The USB enclosure will be plugged into the first Linux machine. -5. Working Internet connection for both machines +5. Working Internet connection for both computers 6. Personalized Domain names already purchased from Njal.la. See the explanation here: https://sovransystems.com/how-to-setup/ 7. Your Router with ports open (Port Forwarding) to your second machine's internal IP address. This will usually be `192.168.1.(some number)` You will complete this at the end. @@ -31,10 +31,10 @@ ## Preparing the Second Internal Drive -1. Install the second NVME internal drive into the USB enclosure, NOT into the Second machine yet. -2. Plug in the USB enclosure into the first machine with Linux OS already installed into one of its available USB ports. -3. **Please Make Sure You Know The Existing Storage Names On This First Linux Machine. If You Run The Script Below And You Do Not Know What You Are Doing, You Could Potentially Erase Your First Linux Machine's Data. I Am Not Responsibly For Your Errors** -4. Open a terminal in the first Linux machine and log in as root. +1. Install the second NVME internal drive into the USB enclosure, NOT into the Second computer yet. +2. Plug in the USB enclosure into the first computer with Linux OS already installed into one of its available USB ports. +3. **Please Make Sure You Know The Existing Storage Names On This First Linux Computer. If You Run The Script Below And You Do Not Know What You Are Doing, You Could Potentially Erase Your First Linux Computer's Data. I Am Not Responsibly For Your Errors** +4. Open a terminal in the first Linux computer and log in as root. 5. Type in or copy and paste: ```bash @@ -44,19 +44,19 @@ wget https://git.sovransystems.com/Sovran_Systems/Sovran_SystemsOS/raw/branch/ma then press enter. 6. Now, type `bash sdpsp.sh` then press enter. -7. Then the screen will ask for "what block..." which will be the drive in the list that is not mounted, which will be the drive you just plugged in. It might be labeled `sdb`, or `sdc` etc. Type in the drive name and press `enter`. -8. Then the screen will ask for "what partition...,"which will be whatever you typed into the first prompt, but with a "1" on it. For example, `sdb1` or `sdc1`. Type it into the terminal and press `enter`. +7. Then the screen will ask for "what block..." which will be the drive in the list that is not mounted, which will be the drive you just plugged in. It might be labeled `sda`, or `sdb` etc. Type in the drive name and press `enter`. +8. Then the screen will ask for "what partition...,"which will be whatever you typed into the first prompt, but with a "1" on it. For example, `sda1` or `sdb1`. Type it into the terminal and press `enter`. 9. Since the script is made to copy the blockchain from another Sovran Pro that already has the full blockchain installed it will throw an error. However, it should complete the setup just fine. -10. Once complete, remove the second drive from the USB enclosure and install it into your second machine in which you are installing Sovran_SystemsOS. +10. Once complete, remove the second drive from the USB enclosure and install it into your second computer in which you are installing Sovran_SystemsOS. ## Preparing the First Main Internal Drive ### Procedure One - Installing base NixOS - 1. Still on the first machine with Linux OS already installed, download the latest NixOS minimal (64-bit Intel/AMD) image from here: https://nixos.org/download + 1. Still on the first computer with Linux OS already installed, download the latest NixOS minimal (64-bit Intel/AMD) image from here: https://nixos.org/download 2. Burn that ISO image onto the USB thumb drive. - 3. Insert the newly created USB thumb drive with the ISO image into the second machine (the one you are installing Sovran_SystemsOS). - 4. Reboot the second machine while the USB thumb drive is inserted and boot into the USB thumb drive. This may require you to press the F7 or F12 key at boot. (Also, make sure the second machine has "safe boot" turned off in the UEFI[BIOS]). + 3. Insert the newly created USB thumb drive with the ISO image into the second computer (the one you are installing Sovran_SystemsOS). + 4. Reboot the second computer while the USB thumb drive is inserted and boot into the USB thumb drive. This may require you to press the F7 or F12 key at boot. (Also, make sure the second computer has "safe boot" turned off in the UEFI[BIOS]). 5. Proceed with the NixOS boot menu 6. Once at the command prompt type in `sudo su` to move to the root user 7. Once logged into the root user type in `passwd` then set the root user password to `a` @@ -68,15 +68,21 @@ then press enter. ``` the command to install the base NixOS and press enter. -10. Now, type `bash psp.sh` then press enter. +10. Now, type `bash psp_physical_ram.sh` then press enter. 11. The script will ask for name of first main internal drive. Type that in and hit enter. It usually will be `nvme0n1`. Basically, it will be the drive without any data and it will not be mounted per the list on the screen. 12. Then the script will ask for the 'Boot' partition. Type it in and press enter. It will be the SMALLER partition and usually named `nvme0n1p1`. 13. Then it will ask for the 'Primary' partition. Type it in and press enter. It will be the LARGER partition usually named `nvme0n1p2`. 14. The script will finish installing the base NixOS. At the end it will ask for a root password. Type `a` and press enter and type `a` again to confirm and press enter. -15. Remove the USB thumb drive from the second machine. -16. The machine will reboot into a very basic install of NixOS command prompt. +15. The machine will reboot into a very basic install of NixOS command prompt. +16. Remove the USB thumb drive from the second computer. -### Procedure Two - Installing Sovran_SystemsOS + +### Procedure Three - Opening The Ports on Your Router - Internal IP + +1. Go to port forwarding on your router and open the above mentioned ports to the internal IP (the one you found above) of your new Sovran_SystemsOS machine + + +### Procedure Four - Installing Sovran_SystemsOS 1. Now at the basic install of NixOS from step `16`, type `root` to log into root and type the password `a` when asked then press enter. 2. Now you are logged in as `root`. @@ -92,12 +98,10 @@ then press enter. 6. Then it will ask for an email for the SSL certificates. Type it in and press enter. 7. The script is long so it will take some time. 8. It will finish by stating `All Finished! Please Reboot then Enjoy your New Sovran Pro!` +9. Press the power button on the machine for it to turn off THEN press it again to power the machine ## Finishing the Install -### Opening The Ports on Your Router - Internal IP - -1. Go to port forwarding on your router and open the above mentioned ports to the internal IP (the one you found above) of your new Sovran_SystemsOS machine ### Putting the External IP of your New DIY Sovran Pro into your new domain names you just bought at [njal.la](https://njal.la) @@ -123,8 +127,11 @@ then press enter. 3. Paste the `curl` commands from njal.la's website for each sub-domain. Each `curl` command gets a new line. For example: ```bash + ... curl "https://njal.la/update/?h=test.testsovransystems.com&k=8n7vk3afj-jkyg37&a=${IP}" curl "https://njal.la/update/?h=zap.testsovransystems.com&k=8no*73afj-jkygi2ea=${IP}" + ... + ``` ##### Make sure the default `&auto` from njal.la is replaced by `&a=${IP}` at the end of each `curl` command in the `/var/lib/njalla/njalla.sh` as in the example above. @@ -134,7 +141,7 @@ then press enter. ### Setting the Desktop -1. Open the `Terminal` and type in: `dconf load / < /home/free/Downloads/Sovran_SystemsOS-Desktop`. Do NOT log in as root. +1. Open the `Terminal` again and type in: `dconf load / < /home/free/Downloads/Sovran_SystemsOS-Desktop`. Do NOT log in as root. 2. Close the `Terminal`. @@ -220,6 +227,24 @@ then press enter. ``` and press enter. + It will ask for your `Administrator` password and to get the password open a new `Terminal` window and type + + ```bash + ssh root@localhost + ``` + press enter. + + Now you will be logged in as root. + + Now type: + + ```bash + cat /var/lib/secrets/main + ``` + Then the `Administrator`'s password will be displayed. Copy and paste the password into the other `Terminal` window that is open. Then press enter. + + Now you can close the `Terminal`. + ### Everything now will be installed regarding Sovran_SystemsOS. The remaining setup will be only for the front-end user account creations for BTCpayserver, Vaultwarden, connecting the node to Sparrow wallet and Bisq. ### Congratulations! 🎉 From 23a850f820786ec27e3b91a3e23807ac80cbf935 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Fri, 13 Sep 2024 19:23:34 -0700 Subject: [PATCH 421/667] updated DIY Instructions --- DIY Install Sovran_SystemsOS.md | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/DIY Install Sovran_SystemsOS.md b/DIY Install Sovran_SystemsOS.md index 6109fa8..32c0339 100755 --- a/DIY Install Sovran_SystemsOS.md +++ b/DIY Install Sovran_SystemsOS.md @@ -77,14 +77,15 @@ then press enter. 16. Remove the USB thumb drive from the second computer. -### Procedure Three - Opening The Ports on Your Router - Internal IP +### Procedure Two - Opening The Ports on Your Router - Internal IP 1. Go to port forwarding on your router and open the above mentioned ports to the internal IP (the one you found above) of your new Sovran_SystemsOS machine -### Procedure Four - Installing Sovran_SystemsOS +### Procedure Three - Installing Sovran_SystemsOS -1. Now at the basic install of NixOS from step `16`, type `root` to log into root and type the password `a` when asked then press enter. + +1. Now at the basic install of NixOS from Procedure One, type `root` to log into root and type the password `a` when asked then press enter. 2. Now you are logged in as `root`. 3. Now type in or copy and paste: @@ -105,8 +106,8 @@ then press enter. ### Putting the External IP of your New DIY Sovran Pro into your new domain names you just bought at [njal.la](https://njal.la) -1. Log into your [njal.la](https://njal.la) account -2. Make a "dynamic" record for each subdomain +1. On your New DIY Sovran Pro, log into your [njal.la](https://njal.la) account +2. Make a "dynamic" record for each subdomain 3. Njal.la will now display a `curl` command for each sub-domain. 4. Open the `Terminal` on your New DIY Sovran Pro and type in or copy and paste: @@ -200,7 +201,7 @@ then press enter. 5. Now, press `Install` on the Wordpress website and Wordpress will be installed. It will take a few minutes. Follow the on screen prompts. -### Final Install for Coturn and Nextcloud +### Final Install for Coturn, Flatpak, and Nextcloud 1. Staying in the `Terminal` type in or copy and paste: From 49de225faf34a929af40f11b30814791d518bd9c Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Fri, 13 Sep 2024 19:25:26 -0700 Subject: [PATCH 422/667] updated DIY Instructions --- DIY Install Sovran_SystemsOS.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DIY Install Sovran_SystemsOS.md b/DIY Install Sovran_SystemsOS.md index 32c0339..0378c07 100755 --- a/DIY Install Sovran_SystemsOS.md +++ b/DIY Install Sovran_SystemsOS.md @@ -228,7 +228,7 @@ then press enter. ``` and press enter. - It will ask for your `Administrator` password and to get the password open a new `Terminal` window and type + It will ask for your `Administrator` password and to get the password open a new `Terminal` window and type: ```bash ssh root@localhost From 844cb8cd2f86c913f09683b7cd3cc8035bad725e Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Fri, 13 Sep 2024 19:27:38 -0700 Subject: [PATCH 423/667] updated README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 3081263..394926b 100755 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ The write up for install on your own hardware is located here: https://git.sovransystems.com/Sovran_Systems/Sovran_SystemsOS/src/branch/main/DIY%20Install%20Sovran_SystemsOS.md -The DIY support chat is located here: +The DIY support chat on Matrix is located here: https://matrix.to/#/%23DIY_Sovran_SystemsOS:anarchyislove.xyz From 1c8ef468798b351e9a9d8ea4f5b22a5e78378e3d Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Sat, 14 Sep 2024 10:14:39 -0700 Subject: [PATCH 424/667] updated README and DIY --- DIY Install Sovran_SystemsOS.md | 6 +++--- README.md | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/DIY Install Sovran_SystemsOS.md b/DIY Install Sovran_SystemsOS.md index 0378c07..958dd70 100755 --- a/DIY Install Sovran_SystemsOS.md +++ b/DIY Install Sovran_SystemsOS.md @@ -69,9 +69,9 @@ then press enter. the command to install the base NixOS and press enter. 10. Now, type `bash psp_physical_ram.sh` then press enter. -11. The script will ask for name of first main internal drive. Type that in and hit enter. It usually will be `nvme0n1`. Basically, it will be the drive without any data and it will not be mounted per the list on the screen. -12. Then the script will ask for the 'Boot' partition. Type it in and press enter. It will be the SMALLER partition and usually named `nvme0n1p1`. -13. Then it will ask for the 'Primary' partition. Type it in and press enter. It will be the LARGER partition usually named `nvme0n1p2`. +11. The script will ask for name of first main internal drive. It usually will be `nvme0n1`. Basically, it will be the drive without any data and it will not be mounted per the list on the screen. Type in the name and press enter on the keyboard. +12. Then the script will ask for the 'Boot' partition. It will be the SMALLER partition and usually named `nvme0n1p1`. Type in the name and press enter on the keyboard. +13. Then it will ask for the 'Primary' partition. It will be the LARGER partition usually named `nvme0n1p2`. Type in the name and press enter on the keyboard. 14. The script will finish installing the base NixOS. At the end it will ask for a root password. Type `a` and press enter and type `a` again to confirm and press enter. 15. The machine will reboot into a very basic install of NixOS command prompt. 16. Remove the USB thumb drive from the second computer. diff --git a/README.md b/README.md index 394926b..16700c7 100755 --- a/README.md +++ b/README.md @@ -25,7 +25,7 @@ Connect for Support on Matrix here: https://matrix.to/#/#sovran-systems-support: ## DIY Install Of Sovran_SystemsOS -The write up for install on your own hardware is located here: +The write-up to install Sovran_SystemsOS on your own hardware is located here: https://git.sovransystems.com/Sovran_Systems/Sovran_SystemsOS/src/branch/main/DIY%20Install%20Sovran_SystemsOS.md From 1c31b7ef7f74cd9dcb460672170a485cfefbffe4 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Mon, 16 Sep 2024 12:09:03 -0700 Subject: [PATCH 425/667] Update to Nixpkgs and Nix-Bitcoin --- flake.lock | 72 +++++++++++++++++++++++++++--------------------------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/flake.lock b/flake.lock index 32ed69e..848f133 100755 --- a/flake.lock +++ b/flake.lock @@ -89,11 +89,11 @@ ] }, "locked": { - "lastModified": 1722555600, - "narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=", + "lastModified": 1726153070, + "narHash": "sha256-HO4zgY0ekfwO5bX0QH/3kJ/h4KvUDFZg8YpkNwIbg1U=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "8471fe90ad337a8074e957b69ca4d0089218391d", + "rev": "bcef6817a8b2aa20a5a6dbb19b43e63c5bf8619a", "type": "github" }, "original": { @@ -155,11 +155,11 @@ ] }, "locked": { - "lastModified": 1724857454, - "narHash": "sha256-Qyl9Q4QMTLZnnBb/8OuQ9LSkzWjBU1T5l5zIzTxkkhk=", + "lastModified": 1725513492, + "narHash": "sha256-tyMUA6NgJSvvQuzB7A1Sf8+0XCHyfSPRx/b00o6K0uo=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "4509ca64f1084e73bc7a721b20c669a8d4c5ebe6", + "rev": "7570de7b9b504cfe92025dd1be797bf546f66528", "type": "github" }, "original": { @@ -219,11 +219,11 @@ ] }, "locked": { - "lastModified": 1724435763, - "narHash": "sha256-UNky3lJNGQtUEXT2OY8gMxejakSWPTfWKvpFkpFlAfM=", + "lastModified": 1726357542, + "narHash": "sha256-p4OrJL2weh0TRtaeu1fmNYP6+TOp/W2qdaIJxxQay4c=", "owner": "nix-community", "repo": "home-manager", - "rev": "c2cd2a52e02f1dfa1c88f95abeb89298d46023be", + "rev": "e524c57b1fa55d6ca9d8354c6ce1e538d2a1f47f", "type": "github" }, "original": { @@ -240,11 +240,11 @@ "nixpkgs-unstable": "nixpkgs-unstable" }, "locked": { - "lastModified": 1724684170, - "narHash": "sha256-4O04EoHn87zIpiogIRXSgkqRyOs7ygIAIO9dhjhpmGI=", + "lastModified": 1726471552, + "narHash": "sha256-h8u06o/NELfnSelU2zqyyBh3zD+w3Qtu32exwE3dKj8=", "owner": "fort-nix", "repo": "nix-bitcoin", - "rev": "31b79391cf96b64c3982038c8284e04345429dbd", + "rev": "548f17d8680c26b429c086d68c98184bc6f6e840", "type": "github" }, "original": { @@ -262,11 +262,11 @@ ] }, "locked": { - "lastModified": 1724561770, - "narHash": "sha256-zv8C9RNa86CIpyHwPIVO/k+5TfM8ZbjGwOOpTe1grls=", + "lastModified": 1726188813, + "narHash": "sha256-Vop/VRi6uCiScg/Ic+YlwsdIrLabWUJc57dNczp0eBc=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "ac5694a0b855a981e81b4d9f14052e3ff46ca39e", + "rev": "21fe31f26473c180390cfa81e3ea81aca0204c80", "type": "github" }, "original": { @@ -293,11 +293,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1724395761, - "narHash": "sha256-zRkDV/nbrnp3Y8oCADf5ETl1sDrdmAW6/bBVJ8EbIdQ=", + "lastModified": 1726206720, + "narHash": "sha256-tI7141IHDABMNgz4iXDo8agCp0SeTLbaIZ2DRndwcmk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ae815cee91b417be55d43781eb4b73ae1ecc396c", + "rev": "673d99f1406cb09b8eb6feab4743ebdf70046557", "type": "github" }, "original": { @@ -309,11 +309,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1724316499, - "narHash": "sha256-Qb9MhKBUTCfWg/wqqaxt89Xfi6qTD3XpTzQ9eXi3JmE=", + "lastModified": 1726062281, + "narHash": "sha256-PyFVySdGj3enKqm8RQuo4v1KLJLmNLOq2yYOHsI6e2Q=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "797f7dc49e0bc7fab4b57c021cdf68f595e47841", + "rev": "e65aa8301ba4f0ab8cb98f944c14aa9da07394f8", "type": "github" }, "original": { @@ -325,11 +325,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1725432240, - "narHash": "sha256-+yj+xgsfZaErbfYM3T+QvEE2hU7UuE+Jf0fJCJ8uPS0=", + "lastModified": 1726243404, + "narHash": "sha256-sjiGsMh+1cWXb53Tecsm4skyFNag33GPbVgCdfj3n9I=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ad416d066ca1222956472ab7d0555a6946746a80", + "rev": "345c263f2f53a3710abe117f28a5cb86d0ba4059", "type": "github" }, "original": { @@ -341,11 +341,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1724819573, - "narHash": "sha256-GnR7/ibgIH1vhoy8cYdmXE6iyZqKqFxQSVkFgosBh6w=", + "lastModified": 1726243404, + "narHash": "sha256-sjiGsMh+1cWXb53Tecsm4skyFNag33GPbVgCdfj3n9I=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "71e91c409d1e654808b2621f28a327acfdad8dc2", + "rev": "345c263f2f53a3710abe117f28a5cb86d0ba4059", "type": "github" }, "original": { @@ -368,11 +368,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1725547623, - "narHash": "sha256-VLJOVLCAE9mDAM/H4n7+LD4Hkdglb2C5cnThzRV8itA=", + "lastModified": 1726502324, + "narHash": "sha256-I/WFSIBeIjlY3CgSJ6IRYxP2aEJ6b42Y1HAeATlBh48=", "owner": "nix-community", "repo": "nixvim", - "rev": "8ae9e4d8a1e111e8532131362992debcdc8a9d98", + "rev": "2e3083e42509c399b224239f6d7fa17976b18536", "type": "github" }, "original": { @@ -390,11 +390,11 @@ ] }, "locked": { - "lastModified": 1724584782, - "narHash": "sha256-7FfHv7b1jwMPSu9SPY9hdxStk8E6EeSwzqdvV69U4BM=", + "lastModified": 1726392886, + "narHash": "sha256-9RtOuG7V8KG8IU8nZje5EQ1WSM/inr7+zb3tAgTiHDM=", "owner": "NuschtOS", "repo": "search", - "rev": "5a08d691de30b6fc28d58ce71a5e420f2694e087", + "rev": "97d34b70deed4878fcb2449ac89dab717d72efa1", "type": "github" }, "original": { @@ -464,11 +464,11 @@ ] }, "locked": { - "lastModified": 1724833132, - "narHash": "sha256-F4djBvyNRAXGusJiNYInqR6zIMI3rvlp6WiKwsRISos=", + "lastModified": 1725271838, + "narHash": "sha256-VcqxWT0O/gMaeWTTjf1r4MOyG49NaNxW4GHTO3xuThE=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "3ffd842a5f50f435d3e603312eefa4790db46af5", + "rev": "9fb342d14b69aefdf46187f6bb80a4a0d97007cd", "type": "github" }, "original": { From 961a73d05e760ddaf65841899604734a624572a5 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Tue, 8 Oct 2024 09:33:43 -0700 Subject: [PATCH 426/667] Nixpkgs Update with Sparrow Update --- flake.lock | 90 ++++++++++++++++++------------------ for_new_sovran_pros/sdpsp.sh | 2 +- 2 files changed, 46 insertions(+), 46 deletions(-) diff --git a/flake.lock b/flake.lock index 848f133..c43926e 100755 --- a/flake.lock +++ b/flake.lock @@ -29,11 +29,11 @@ ] }, "locked": { - "lastModified": 1722113426, - "narHash": "sha256-Yo/3loq572A8Su6aY5GP56knpuKYRvM2a1meP9oJZCw=", + "lastModified": 1728330715, + "narHash": "sha256-xRJ2nPOXb//u1jaBnDP56M7v5ldavjbtR6lfGqSvcKg=", "owner": "numtide", "repo": "devshell", - "rev": "67cce7359e4cd3c45296fb4aaf6a19e2a9c757ae", + "rev": "dd6b80932022cea34a019e2bb32f6fa9e494dfef", "type": "github" }, "original": { @@ -89,11 +89,11 @@ ] }, "locked": { - "lastModified": 1726153070, - "narHash": "sha256-HO4zgY0ekfwO5bX0QH/3kJ/h4KvUDFZg8YpkNwIbg1U=", + "lastModified": 1727826117, + "narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "bcef6817a8b2aa20a5a6dbb19b43e63c5bf8619a", + "rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1", "type": "github" }, "original": { @@ -107,11 +107,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "lastModified": 1726560853, + "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", "type": "github" }, "original": { @@ -125,11 +125,11 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "lastModified": 1726560853, + "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", "type": "github" }, "original": { @@ -155,11 +155,11 @@ ] }, "locked": { - "lastModified": 1725513492, - "narHash": "sha256-tyMUA6NgJSvvQuzB7A1Sf8+0XCHyfSPRx/b00o6K0uo=", + "lastModified": 1728092656, + "narHash": "sha256-eMeCTJZ5xBeQ0f9Os7K8DThNVSo9gy4umZLDfF5q6OM=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "7570de7b9b504cfe92025dd1be797bf546f66528", + "rev": "1211305a5b237771e13fcca0c51e60ad47326a9a", "type": "github" }, "original": { @@ -219,11 +219,11 @@ ] }, "locked": { - "lastModified": 1726357542, - "narHash": "sha256-p4OrJL2weh0TRtaeu1fmNYP6+TOp/W2qdaIJxxQay4c=", + "lastModified": 1728337164, + "narHash": "sha256-VdRTjJFyq4Q9U7Z/UoC2Q5jK8vSo6E86lHc2OanXtvc=", "owner": "nix-community", "repo": "home-manager", - "rev": "e524c57b1fa55d6ca9d8354c6ce1e538d2a1f47f", + "rev": "038630363e7de57c36c417fd2f5d7c14773403e4", "type": "github" }, "original": { @@ -240,11 +240,11 @@ "nixpkgs-unstable": "nixpkgs-unstable" }, "locked": { - "lastModified": 1726471552, - "narHash": "sha256-h8u06o/NELfnSelU2zqyyBh3zD+w3Qtu32exwE3dKj8=", + "lastModified": 1727247704, + "narHash": "sha256-Jl1CYXNIdJ4Ac0MK15e8+vflFOgPxZZNw24CKfLC6QY=", "owner": "fort-nix", "repo": "nix-bitcoin", - "rev": "548f17d8680c26b429c086d68c98184bc6f6e840", + "rev": "a0d36d59248ac54f1b42a668326346a77640c7f5", "type": "github" }, "original": { @@ -262,11 +262,11 @@ ] }, "locked": { - "lastModified": 1726188813, - "narHash": "sha256-Vop/VRi6uCiScg/Ic+YlwsdIrLabWUJc57dNczp0eBc=", + "lastModified": 1727999297, + "narHash": "sha256-LTJuQPCsSItZ/8TieFeP30iY+uaLoD0mT0tAj1gLeyQ=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "21fe31f26473c180390cfa81e3ea81aca0204c80", + "rev": "8c8388ade72e58efdeae71b4cbb79e872c23a56b", "type": "github" }, "original": { @@ -293,11 +293,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1726206720, - "narHash": "sha256-tI7141IHDABMNgz4iXDo8agCp0SeTLbaIZ2DRndwcmk=", + "lastModified": 1726871744, + "narHash": "sha256-V5LpfdHyQkUF7RfOaDPrZDP+oqz88lTJrMT1+stXNwo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "673d99f1406cb09b8eb6feab4743ebdf70046557", + "rev": "a1d92660c6b3b7c26fb883500a80ea9d33321be2", "type": "github" }, "original": { @@ -309,11 +309,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1726062281, - "narHash": "sha256-PyFVySdGj3enKqm8RQuo4v1KLJLmNLOq2yYOHsI6e2Q=", + "lastModified": 1726969270, + "narHash": "sha256-8fnFlXBgM/uSvBlLWjZ0Z0sOdRBesyNdH0+esxqizGc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e65aa8301ba4f0ab8cb98f944c14aa9da07394f8", + "rev": "23cbb250f3bf4f516a2d0bf03c51a30900848075", "type": "github" }, "original": { @@ -325,11 +325,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1726243404, - "narHash": "sha256-sjiGsMh+1cWXb53Tecsm4skyFNag33GPbVgCdfj3n9I=", + "lastModified": 1728241625, + "narHash": "sha256-yumd4fBc/hi8a9QgA9IT8vlQuLZ2oqhkJXHPKxH/tRw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "345c263f2f53a3710abe117f28a5cb86d0ba4059", + "rev": "c31898adf5a8ed202ce5bea9f347b1c6871f32d1", "type": "github" }, "original": { @@ -341,11 +341,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1726243404, - "narHash": "sha256-sjiGsMh+1cWXb53Tecsm4skyFNag33GPbVgCdfj3n9I=", + "lastModified": 1728241625, + "narHash": "sha256-yumd4fBc/hi8a9QgA9IT8vlQuLZ2oqhkJXHPKxH/tRw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "345c263f2f53a3710abe117f28a5cb86d0ba4059", + "rev": "c31898adf5a8ed202ce5bea9f347b1c6871f32d1", "type": "github" }, "original": { @@ -368,11 +368,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1726502324, - "narHash": "sha256-I/WFSIBeIjlY3CgSJ6IRYxP2aEJ6b42Y1HAeATlBh48=", + "lastModified": 1728392812, + "narHash": "sha256-vphLzFlyrQR8hEECQQSEeikzXUzCdxq3OyoZFD1gwe4=", "owner": "nix-community", "repo": "nixvim", - "rev": "2e3083e42509c399b224239f6d7fa17976b18536", + "rev": "182ffa45838d22cd0d6e26718f8ac2b20dec389b", "type": "github" }, "original": { @@ -390,11 +390,11 @@ ] }, "locked": { - "lastModified": 1726392886, - "narHash": "sha256-9RtOuG7V8KG8IU8nZje5EQ1WSM/inr7+zb3tAgTiHDM=", + "lastModified": 1728343677, + "narHash": "sha256-KttVq9b9fwfpNaqvoLlcensvBz6t4O6r3h06DHvdMco=", "owner": "NuschtOS", "repo": "search", - "rev": "97d34b70deed4878fcb2449ac89dab717d72efa1", + "rev": "dedcfefe55152fa257b9871fe467d7f771f6e2c8", "type": "github" }, "original": { @@ -464,11 +464,11 @@ ] }, "locked": { - "lastModified": 1725271838, - "narHash": "sha256-VcqxWT0O/gMaeWTTjf1r4MOyG49NaNxW4GHTO3xuThE=", + "lastModified": 1727984844, + "narHash": "sha256-xpRqITAoD8rHlXQafYZOLvUXCF6cnZkPfoq67ThN0Hc=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "9fb342d14b69aefdf46187f6bb80a4a0d97007cd", + "rev": "4446c7a6fc0775df028c5a3f6727945ba8400e64", "type": "github" }, "original": { diff --git a/for_new_sovran_pros/sdpsp.sh b/for_new_sovran_pros/sdpsp.sh index 8a85113..a39509e 100755 --- a/for_new_sovran_pros/sdpsp.sh +++ b/for_new_sovran_pros/sdpsp.sh @@ -27,7 +27,7 @@ sudo mkdir -p /mnt/BTCEcoandBackup/Electrs_Data sudo mkdir -p /mnt/BTCEcoandBackup/NixOS_Snapshot_Backup -sudo mkdir -p /mnt/BTCEcoandBackup/clightning_db_Backup +sudo mkdir -p /mnt/BTCEcoandBackup/clightning_db_backup sudo systemctl stop bitcoind electrs nbxplorer btcpayserver lnd rtl lightning-loop lightning-pool From 9899c63165360413cbd9850cfe8261723cb5a498 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Wed, 23 Oct 2024 22:48:04 -0700 Subject: [PATCH 427/667] added fix for bisq1 --- configuration.nix | 5 ++--- flake.nix | 7 ++++++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/configuration.nix b/configuration.nix index fac7795..fee28dc 100755 --- a/configuration.nix +++ b/configuration.nix @@ -1,4 +1,4 @@ -{ config, pkgs, lib, ... }: +{ config, pkgs, libs, bisq1, ... }: let @@ -137,9 +137,9 @@ in # $ nix search wget environment.systemPackages = with pkgs; [ (callPackage ./modules/systemd-manager_sovran_systems.nix {}) + bisq1.packages.x86_64-linux.bisq-desktop git wget - # librewolf fish htop btop @@ -155,7 +155,6 @@ in papirus-icon-theme ranger sparrow - bisq-desktop neofetch gedit matrix-synapse diff --git a/flake.nix b/flake.nix index 994b162..4ce3828 100755 --- a/flake.nix +++ b/flake.nix @@ -13,14 +13,19 @@ nixvim.url = "github:nix-community/nixvim"; + bisq1.url = "github:emmanuelrosa/bisq-for-nixos"; + }; - outputs = { self, nixpkgs, nix-bitcoin, nixvim, agenix, ... }: + outputs = { self, nixpkgs, nix-bitcoin, nixvim, agenix, ... }:@attrs: { { nixosConfigurations.nixos = nixpkgs.lib.nixosSystem { + system ="x86_64-linux"; + + specialArgs = attrs; }; From b8f083781e35b5738c95196fddec86a5be99a578 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Wed, 23 Oct 2024 23:02:14 -0700 Subject: [PATCH 428/667] Update Nixpkgs --- flake.lock | 176 ++++++++++++++++++++++++++++++++++++++++++----------- flake.nix | 4 +- 2 files changed, 143 insertions(+), 37 deletions(-) diff --git a/flake.lock b/flake.lock index c43926e..dbf323e 100755 --- a/flake.lock +++ b/flake.lock @@ -21,6 +21,25 @@ "type": "github" } }, + "bisq1": { + "inputs": { + "nix-appimage": "nix-appimage", + "nixpkgs": "nixpkgs_2" + }, + "locked": { + "lastModified": 1728759865, + "narHash": "sha256-qoAmGWkMTDiRoROuQlg/GTVOP9INP3GhlyHllNKaMXU=", + "owner": "emmanuelrosa", + "repo": "bisq-for-nixos", + "rev": "52c03fbf0329c481a99893d3e0a067908b9b7d31", + "type": "github" + }, + "original": { + "owner": "emmanuelrosa", + "repo": "bisq-for-nixos", + "type": "github" + } + }, "devshell": { "inputs": { "nixpkgs": [ @@ -68,6 +87,22 @@ } }, "flake-compat": { + "flake": false, + "locked": { + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_2": { "locked": { "lastModified": 1696426674, "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", @@ -106,6 +141,24 @@ "inputs": { "systems": "systems_2" }, + "locked": { + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_2": { + "inputs": { + "systems": "systems_3" + }, "locked": { "lastModified": 1726560853, "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", @@ -120,9 +173,9 @@ "type": "github" } }, - "flake-utils_2": { + "flake-utils_3": { "inputs": { - "systems": "systems_3" + "systems": "systems_4" }, "locked": { "lastModified": 1726560853, @@ -155,11 +208,11 @@ ] }, "locked": { - "lastModified": 1728092656, - "narHash": "sha256-eMeCTJZ5xBeQ0f9Os7K8DThNVSo9gy4umZLDfF5q6OM=", + "lastModified": 1729104314, + "narHash": "sha256-pZRZsq5oCdJt3upZIU4aslS9XwFJ+/nVtALHIciX/BI=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "1211305a5b237771e13fcca0c51e60ad47326a9a", + "rev": "3c3e88f0f544d6bb54329832616af7eb971b6be6", "type": "github" }, "original": { @@ -219,11 +272,11 @@ ] }, "locked": { - "lastModified": 1728337164, - "narHash": "sha256-VdRTjJFyq4Q9U7Z/UoC2Q5jK8vSo6E86lHc2OanXtvc=", + "lastModified": 1729260213, + "narHash": "sha256-jAvHoU/1y/yCuXzr2fNF+q6uKmr8Jj2xgAisK4QB9to=", "owner": "nix-community", "repo": "home-manager", - "rev": "038630363e7de57c36c417fd2f5d7c14773403e4", + "rev": "09a0c0c02953318bf94425738c7061ffdc4cba75", "type": "github" }, "original": { @@ -232,11 +285,34 @@ "type": "github" } }, + "nix-appimage": { + "inputs": { + "flake-compat": "flake-compat", + "flake-utils": "flake-utils", + "nixpkgs": [ + "bisq1", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1725758175, + "narHash": "sha256-MhBOJHYhIJ30TNVrm7wX8B3x+MecMCdaBc94g4HXkPs=", + "owner": "ralismark", + "repo": "nix-appimage", + "rev": "fc1192dbec82f5857f86ccc6dfdf2ad97bc9c62a", + "type": "github" + }, + "original": { + "owner": "ralismark", + "repo": "nix-appimage", + "type": "github" + } + }, "nix-bitcoin": { "inputs": { "extra-container": "extra-container", - "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs_2", + "flake-utils": "flake-utils_2", + "nixpkgs": "nixpkgs_3", "nixpkgs-unstable": "nixpkgs-unstable" }, "locked": { @@ -262,11 +338,11 @@ ] }, "locked": { - "lastModified": 1727999297, - "narHash": "sha256-LTJuQPCsSItZ/8TieFeP30iY+uaLoD0mT0tAj1gLeyQ=", + "lastModified": 1728901530, + "narHash": "sha256-I9Qd0LnAsEGHtKE9+uVR0iDFmsijWSy7GT0g3jihG4Q=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "8c8388ade72e58efdeae71b4cbb79e872c23a56b", + "rev": "a60ac02f9466f85f092e576fd8364dfc4406b5a6", "type": "github" }, "original": { @@ -308,6 +384,22 @@ } }, "nixpkgs_2": { + "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" + } + }, + "nixpkgs_3": { "locked": { "lastModified": 1726969270, "narHash": "sha256-8fnFlXBgM/uSvBlLWjZ0Z0sOdRBesyNdH0+esxqizGc=", @@ -323,13 +415,13 @@ "type": "github" } }, - "nixpkgs_3": { + "nixpkgs_4": { "locked": { - "lastModified": 1728241625, - "narHash": "sha256-yumd4fBc/hi8a9QgA9IT8vlQuLZ2oqhkJXHPKxH/tRw=", + "lastModified": 1729413321, + "narHash": "sha256-I4tuhRpZFa6Fu6dcH9Dlo5LlH17peT79vx1y1SpeKt0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c31898adf5a8ed202ce5bea9f347b1c6871f32d1", + "rev": "1997e4aa514312c1af7e2bda7fad1644e778ff26", "type": "github" }, "original": { @@ -339,13 +431,13 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_5": { "locked": { - "lastModified": 1728241625, - "narHash": "sha256-yumd4fBc/hi8a9QgA9IT8vlQuLZ2oqhkJXHPKxH/tRw=", + "lastModified": 1729070438, + "narHash": "sha256-KOTTUfPkugH52avUvXGxvWy8ibKKj4genodIYUED+Kc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c31898adf5a8ed202ce5bea9f347b1c6871f32d1", + "rev": "5785b6bb5eaae44e627d541023034e1601455827", "type": "github" }, "original": { @@ -358,21 +450,21 @@ "nixvim": { "inputs": { "devshell": "devshell", - "flake-compat": "flake-compat", + "flake-compat": "flake-compat_2", "flake-parts": "flake-parts", "git-hooks": "git-hooks", "home-manager": "home-manager_2", "nix-darwin": "nix-darwin", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_5", "nuschtosSearch": "nuschtosSearch", "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1728392812, - "narHash": "sha256-vphLzFlyrQR8hEECQQSEeikzXUzCdxq3OyoZFD1gwe4=", + "lastModified": 1729699620, + "narHash": "sha256-f6S8JX5w9bPLMbaqR5dM5koybZntdSFfKyfq/LQU7rs=", "owner": "nix-community", "repo": "nixvim", - "rev": "182ffa45838d22cd0d6e26718f8ac2b20dec389b", + "rev": "029eafd70d6e28919a9ec01a94a46b51c4ccff40", "type": "github" }, "original": { @@ -383,18 +475,18 @@ }, "nuschtosSearch": { "inputs": { - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils_3", "nixpkgs": [ "nixvim", "nixpkgs" ] }, "locked": { - "lastModified": 1728343677, - "narHash": "sha256-KttVq9b9fwfpNaqvoLlcensvBz6t4O6r3h06DHvdMco=", + "lastModified": 1728905062, + "narHash": "sha256-W/lClt0bRgFRO0WFtytX/LEILpPNq+FOjIfESpkeu5c=", "owner": "NuschtOS", "repo": "search", - "rev": "dedcfefe55152fa257b9871fe467d7f771f6e2c8", + "rev": "f82d3e1c1c9d1eaeb91878519e2d27b27c66ce84", "type": "github" }, "original": { @@ -406,8 +498,9 @@ "root": { "inputs": { "agenix": "agenix", + "bisq1": "bisq1", "nix-bitcoin": "nix-bitcoin", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_4", "nixvim": "nixvim" } }, @@ -456,6 +549,21 @@ "type": "github" } }, + "systems_4": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "treefmt-nix": { "inputs": { "nixpkgs": [ @@ -464,11 +572,11 @@ ] }, "locked": { - "lastModified": 1727984844, - "narHash": "sha256-xpRqITAoD8rHlXQafYZOLvUXCF6cnZkPfoq67ThN0Hc=", + "lastModified": 1729242555, + "narHash": "sha256-6jWSWxv2crIXmYSEb3LEVsFkCkyVHNllk61X4uhqfCs=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "4446c7a6fc0775df028c5a3f6727945ba8400e64", + "rev": "d986489c1c757f6921a48c1439f19bfb9b8ecab5", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 4ce3828..54dd3e4 100755 --- a/flake.nix +++ b/flake.nix @@ -17,9 +17,7 @@ }; - outputs = { self, nixpkgs, nix-bitcoin, nixvim, agenix, ... }:@attrs: { - - { + outputs = { self, nixpkgs, nix-bitcoin, nixvim, agenix, ... }@attrs: { nixosConfigurations.nixos = nixpkgs.lib.nixosSystem { From c43c47d6afea36a4a948ee71c8e2128499652795 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Wed, 23 Oct 2024 23:22:28 -0700 Subject: [PATCH 429/667] nixpkgs update --- flake.lock | 6 +++--- flake.nix | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/flake.lock b/flake.lock index dbf323e..1b74d05 100755 --- a/flake.lock +++ b/flake.lock @@ -417,11 +417,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1729413321, - "narHash": "sha256-I4tuhRpZFa6Fu6dcH9Dlo5LlH17peT79vx1y1SpeKt0=", + "lastModified": 1729665710, + "narHash": "sha256-AlcmCXJZPIlO5dmFzV3V2XF6x/OpNWUV8Y/FMPGd8Z4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1997e4aa514312c1af7e2bda7fad1644e778ff26", + "rev": "2768c7d042a37de65bb1b5b3268fc987e534c49d", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 54dd3e4..6df2a79 100755 --- a/flake.nix +++ b/flake.nix @@ -17,18 +17,18 @@ }; - outputs = { self, nixpkgs, nix-bitcoin, nixvim, agenix, ... }@attrs: { + outputs = { self, nixpkgs, nix-bitcoin, nixvim, agenix, ... }: { nixosConfigurations.nixos = nixpkgs.lib.nixosSystem { system ="x86_64-linux"; - - specialArgs = attrs; }; - nixosModules.Sovran_SystemsOS = { pkgs, ... }: { + nixosModules.Sovran_SystemsOS = { pkgs, ... }@attrs: { + specialArgs = attrs; + imports = [ ./configuration.nix From 010cab9cc4f0b610573190acb11ea7b8e3c5d70a Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Wed, 23 Oct 2024 23:25:56 -0700 Subject: [PATCH 430/667] nixpkgs update --- flake.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/flake.nix b/flake.nix index 6df2a79..561a0f1 100755 --- a/flake.nix +++ b/flake.nix @@ -25,9 +25,7 @@ }; - nixosModules.Sovran_SystemsOS = { pkgs, ... }@attrs: { - - specialArgs = attrs; + nixosModules.Sovran_SystemsOS = { pkgs, bisq1, ... }@inputs: { imports = [ From 75d0a2624ec407ec79af1ab19b4c5f7facf21a5f Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Wed, 23 Oct 2024 23:35:42 -0700 Subject: [PATCH 431/667] nixpkgs update --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 561a0f1..50b3bab 100755 --- a/flake.nix +++ b/flake.nix @@ -25,7 +25,7 @@ }; - nixosModules.Sovran_SystemsOS = { pkgs, bisq1, ... }@inputs: { + nixosModules.Sovran_SystemsOS = { pkgs, ... }: { imports = [ From 49aa3634fefbd12d9c0cfaaa70a0016bea264172 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Wed, 23 Oct 2024 23:40:18 -0700 Subject: [PATCH 432/667] nixpkgs update --- configuration.nix | 2 +- flake.nix | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/configuration.nix b/configuration.nix index fee28dc..0b31e08 100755 --- a/configuration.nix +++ b/configuration.nix @@ -1,4 +1,4 @@ -{ config, pkgs, libs, bisq1, ... }: +{ config, pkgs, lib, bisq1, ... }: let diff --git a/flake.nix b/flake.nix index 50b3bab..4405ca5 100755 --- a/flake.nix +++ b/flake.nix @@ -17,11 +17,13 @@ }; - outputs = { self, nixpkgs, nix-bitcoin, nixvim, agenix, ... }: { + outputs = { self, nixpkgs, nix-bitcoin, nixvim, agenix, ... }@attrs: { nixosConfigurations.nixos = nixpkgs.lib.nixosSystem { system ="x86_64-linux"; + + specialArgs = attrs; }; From a10296664e11e85265057d2611804fc8ded5645f Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Wed, 23 Oct 2024 23:43:59 -0700 Subject: [PATCH 433/667] nixpkgs update --- flake.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.nix b/flake.nix index 4405ca5..ffb4b5a 100755 --- a/flake.nix +++ b/flake.nix @@ -17,18 +17,18 @@ }; - outputs = { self, nixpkgs, nix-bitcoin, nixvim, agenix, ... }@attrs: { + outputs = { self, nixpkgs, nix-bitcoin, nixvim, agenix, ... }: { nixosConfigurations.nixos = nixpkgs.lib.nixosSystem { system ="x86_64-linux"; - - specialArgs = attrs; }; - nixosModules.Sovran_SystemsOS = { pkgs, ... }: { + nixosModules.Sovran_SystemsOS = { pkgs, ... }@attrs: { + specialArgs = attrs; + imports = [ ./configuration.nix From f7c4f98d856611910a0bdafad501391fd3f33a40 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Wed, 23 Oct 2024 23:51:51 -0700 Subject: [PATCH 434/667] nixpkgs update --- flake.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/flake.nix b/flake.nix index ffb4b5a..6b35d73 100755 --- a/flake.nix +++ b/flake.nix @@ -25,9 +25,7 @@ }; - nixosModules.Sovran_SystemsOS = { pkgs, ... }@attrs: { - - specialArgs = attrs; + nixosModules.Sovran_SystemsOS = { pkgs, bisq1, ... }: { imports = [ From 024d8cbc59c4c87ae3dfc73b8a29170e5c366349 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Wed, 23 Oct 2024 23:56:40 -0700 Subject: [PATCH 435/667] nixpkgs update --- flake.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/flake.nix b/flake.nix index 6b35d73..a8863bf 100755 --- a/flake.nix +++ b/flake.nix @@ -17,15 +17,17 @@ }; - outputs = { self, nixpkgs, nix-bitcoin, nixvim, agenix, ... }: { + outputs = { self, nixpkgs, nix-bitcoin, nixvim, agenix, ... }@attrs: { nixosConfigurations.nixos = nixpkgs.lib.nixosSystem { system ="x86_64-linux"; + + specialArgs = attrs; }; - nixosModules.Sovran_SystemsOS = { pkgs, bisq1, ... }: { + nixosModules.Sovran_SystemsOS = { pkgs, ... }: { imports = [ From f23bac0ef2640811f3797f561883d7afa908c870 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Thu, 24 Oct 2024 00:08:46 -0700 Subject: [PATCH 436/667] nixpkgs update --- configuration.nix | 2 +- flake.nix | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/configuration.nix b/configuration.nix index 0b31e08..0af6285 100755 --- a/configuration.nix +++ b/configuration.nix @@ -1,4 +1,4 @@ -{ config, pkgs, lib, bisq1, ... }: +{ config, pkgs, lib, ... }: let diff --git a/flake.nix b/flake.nix index a8863bf..9569d47 100755 --- a/flake.nix +++ b/flake.nix @@ -17,13 +17,11 @@ }; - outputs = { self, nixpkgs, nix-bitcoin, nixvim, agenix, ... }@attrs: { + outputs = { self, nixpkgs, nix-bitcoin, nixvim, agenix, bisq1, ... }: { nixosConfigurations.nixos = nixpkgs.lib.nixosSystem { system ="x86_64-linux"; - - specialArgs = attrs; }; From 7ed861068cd93da183d7abad788d08ccaf8b69ab Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Thu, 24 Oct 2024 00:11:35 -0700 Subject: [PATCH 437/667] nixpkgs update --- configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configuration.nix b/configuration.nix index 0af6285..0b31e08 100755 --- a/configuration.nix +++ b/configuration.nix @@ -1,4 +1,4 @@ -{ config, pkgs, lib, ... }: +{ config, pkgs, lib, bisq1, ... }: let From e94b2dbbc53768d7816f2d6a76fc79f9902cf5b6 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Thu, 24 Oct 2024 00:14:09 -0700 Subject: [PATCH 438/667] nixpkgs update --- flake.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/flake.nix b/flake.nix index 9569d47..738cc49 100755 --- a/flake.nix +++ b/flake.nix @@ -17,7 +17,7 @@ }; - outputs = { self, nixpkgs, nix-bitcoin, nixvim, agenix, bisq1, ... }: { + outputs = { self, nixpkgs, nix-bitcoin, nixvim, agenix, ... }: { nixosConfigurations.nixos = nixpkgs.lib.nixosSystem { @@ -25,8 +25,10 @@ }; - nixosModules.Sovran_SystemsOS = { pkgs, ... }: { - + nixosModules.Sovran_SystemsOS = { pkgs, ... }@attrs: { + + specialArgs = attrs; + imports = [ ./configuration.nix From 0144de90fc7e9b49128f3388e8961bb003bf5c4e Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Thu, 24 Oct 2024 06:17:34 -0700 Subject: [PATCH 439/667] nixpkgs update --- flake.lock | 6 +++--- flake.nix | 9 ++++++--- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 1b74d05..eb88be7 100755 --- a/flake.lock +++ b/flake.lock @@ -460,11 +460,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1729699620, - "narHash": "sha256-f6S8JX5w9bPLMbaqR5dM5koybZntdSFfKyfq/LQU7rs=", + "lastModified": 1729758248, + "narHash": "sha256-xTe7A0cOue3c+IGJOQ3ofbitBf4XhfXViWeDGNZUGkM=", "owner": "nix-community", "repo": "nixvim", - "rev": "029eafd70d6e28919a9ec01a94a46b51c4ccff40", + "rev": "46f658d9606278ca8ebd0220039293e30d38a706", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 738cc49..3e87c1d 100755 --- a/flake.nix +++ b/flake.nix @@ -25,9 +25,7 @@ }; - nixosModules.Sovran_SystemsOS = { pkgs, ... }@attrs: { - - specialArgs = attrs; + nixosModules.Sovran_SystemsOS = { pkgs, bisq1, ... }: { imports = [ @@ -40,6 +38,11 @@ nixvim.nixosModules.nixvim ]; + + environment.systemPackages = with pkgs; [ + bisq1.packages.bisq-desktop + ]; + }; }; } From 6c9ebab5d99b3cb01f51cc7ccc2ee15a755c790e Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Thu, 24 Oct 2024 06:18:52 -0700 Subject: [PATCH 440/667] nixpkgs update --- configuration.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/configuration.nix b/configuration.nix index 0b31e08..fc3898b 100755 --- a/configuration.nix +++ b/configuration.nix @@ -1,4 +1,4 @@ -{ config, pkgs, lib, bisq1, ... }: +{ config, pkgs, lib, ... }: let @@ -137,7 +137,6 @@ in # $ nix search wget environment.systemPackages = with pkgs; [ (callPackage ./modules/systemd-manager_sovran_systems.nix {}) - bisq1.packages.x86_64-linux.bisq-desktop git wget fish From 84488e047aee780e8f61410adb042e01954f9cf7 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Thu, 24 Oct 2024 06:21:30 -0700 Subject: [PATCH 441/667] nixpkgs update --- flake.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/flake.nix b/flake.nix index 3e87c1d..c7b5bdc 100755 --- a/flake.nix +++ b/flake.nix @@ -17,7 +17,7 @@ }; - outputs = { self, nixpkgs, nix-bitcoin, nixvim, agenix, ... }: { + outputs = { self, nixpkgs, nix-bitcoin, nixvim, agenix, bisq1, ... }: { nixosConfigurations.nixos = nixpkgs.lib.nixosSystem { @@ -25,7 +25,7 @@ }; - nixosModules.Sovran_SystemsOS = { pkgs, bisq1, ... }: { + nixosModules.Sovran_SystemsOS = { pkgs, ... }: { imports = [ From e889cb4b3da2aa3131dcf90d8033b4b5c26514b3 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Thu, 24 Oct 2024 06:24:12 -0700 Subject: [PATCH 442/667] nixpkgs update --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index c7b5bdc..aff394e 100755 --- a/flake.nix +++ b/flake.nix @@ -40,7 +40,7 @@ ]; environment.systemPackages = with pkgs; [ - bisq1.packages.bisq-desktop + bisq1.packages.x86_64-linux.bisq-desktop ]; }; From f935b16a29e8a5527230a33559002394ab3ce191 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Sun, 3 Nov 2024 23:57:11 -0800 Subject: [PATCH 443/667] added Nextcloud High Preformance Backend Server --- modules/nextcloud_hpbs_default.nix | 47 ++++++++++++++++++++++++++++++ modules/nextcloud_hpbs_systemd.nix | 32 ++++++++++++++++++++ 2 files changed, 79 insertions(+) create mode 100644 modules/nextcloud_hpbs_default.nix create mode 100644 modules/nextcloud_hpbs_systemd.nix diff --git a/modules/nextcloud_hpbs_default.nix b/modules/nextcloud_hpbs_default.nix new file mode 100644 index 0000000..9a23c81 --- /dev/null +++ b/modules/nextcloud_hpbs_default.nix @@ -0,0 +1,47 @@ +{ lib, fetchFromGitHub, nixosTests, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "notify_push"; + version = "0.7.0"; + + src = fetchFromGitHub { + owner = "nextcloud"; + repo = pname; + rev = "v${version}"; + hash = "sha256-QHVWiH6qkwQay0wffoyDUyVxgxzNp10ieYIsdqoEdCM="; + }; + + cargoHash = "sha256-HwE/ql8rJcGIINy+hNnpaTFEJqbmuUDrIvVI8kCpfQ8="; + + passthru = rec { + test_client = rustPlatform.buildRustPackage { + pname = "${pname}-test_client"; + inherit src version; + + buildAndTestSubdir = "test_client"; + + cargoHash = "sha256-KybnPzCM9mLF55s5eZ3qr5GRcaaYFpEdNklWEo/72Ts="; + + meta = meta // { + mainProgram = "test_client"; + }; + }; + tests = + lib.filterAttrs + (key: lib.const (lib.hasPrefix "with-postgresql-and-redis" key)) + nixosTests.nextcloud + // { + inherit test_client; + }; + }; + + meta = with lib; { + changelog = "https://github.com/nextcloud/notify_push/releases/tag/v${version}"; + description = "Update notifications for nextcloud clients"; + mainProgram = "notify_push"; + homepage = "https://github.com/nextcloud/notify_push"; + license = licenses.agpl3Plus; + platforms = platforms.linux; + maintainers = teams.helsinki-systems.members; + }; +} diff --git a/modules/nextcloud_hpbs_systemd.nix b/modules/nextcloud_hpbs_systemd.nix new file mode 100644 index 0000000..66e51e9 --- /dev/null +++ b/modules/nextcloud_hpbs_systemd.nix @@ -0,0 +1,32 @@ +{config, pkgs, lib, ...}: + +let + + personalization = import ./personalization.nix; + +in + +{ + +systemd.services.nextcloud_notify_push_hpbs = { + + unitConfig = { + Description = "Push server (High Preformance Back End) for Nextcloud Clients"; + Requires = "network-online.target"; + }; + + serviceConfig = { + Enviornment = "PORT=7867"; + ExecStart = "/run/current-system/sw/bin/notify_push /var/lib/www/nextcloud/config/config.php"; + RemainAfterExit = "yes"; + Type = "notify"; + User = "caddy"; + Group = "php"; + }; + + wantedBy = [ "multi-user.target" ]; + + }; + + +} From 207339f1005f84a70a4d1bb2ef49f3a7917c8adc Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Mon, 4 Nov 2024 00:07:05 -0800 Subject: [PATCH 444/667] added Nextcloud HPBS to Configuration.nix --- configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/configuration.nix b/configuration.nix index fc3898b..9b2b00d 100755 --- a/configuration.nix +++ b/configuration.nix @@ -137,6 +137,7 @@ in # $ nix search wget environment.systemPackages = with pkgs; [ (callPackage ./modules/systemd-manager_sovran_systems.nix {}) + (callPackage ./modules/nextcloud_hpbs_default.nix {}) git wget fish From 6f060f3b908e80cb89eee5957a0d2a0ecb7606cc Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Mon, 4 Nov 2024 00:44:32 -0800 Subject: [PATCH 445/667] added Nextcloud HPBS to modules.nix --- modules/modules.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/modules.nix b/modules/modules.nix index 0a56366..cd64faf 100755 --- a/modules/modules.nix +++ b/modules/modules.nix @@ -9,6 +9,6 @@ ./bitcoinecosystem.nix ./vaultwarden.nix ./Sovran_SystemsOS_File_Fixes_And_New_Services.nix - + ./nextcloud_hpbs_systemd.nix ]; -} \ No newline at end of file +} From 4b2a52427a7f9f7392b46f73e57fef769d76251b Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Mon, 4 Nov 2024 00:49:24 -0800 Subject: [PATCH 446/667] added Nextcloud HPBS to Caddy --- configuration.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/configuration.nix b/configuration.nix index 9b2b00d..2a95447 100755 --- a/configuration.nix +++ b/configuration.nix @@ -243,7 +243,9 @@ in extraConfig = '' encode gzip zstd root * /var/lib/www/nextcloud - php_fastcgi unix//run/phpfpm/mypool.sock + 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 From 74d579fb94bcef845aefadf307819be7aa483a04 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Mon, 4 Nov 2024 00:57:54 -0800 Subject: [PATCH 447/667] Updated Coturn Settings --- modules/coturn.nix | 5 ++++- modules/personalization.nix | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/modules/coturn.nix b/modules/coturn.nix index 8748d57..8f93da9 100755 --- a/modules/coturn.nix +++ b/modules/coturn.nix @@ -34,16 +34,19 @@ let enable = true; use-auth-secret = true; - static-auth-secret = "${personalization.age.secrets.turn.file}"; + static-auth-secret = "${personalization.coturn_static_auth_secret}"; realm = personalization.matrix_url; cert = "/var/lib/coturn/${personalization.matrix_url}.crt.pem"; pkey = "/var/lib/coturn/${personalization.matrix_url}.key.pem"; min-port = 49152; max-port = 65535; + listing-port = 5349; no-cli = true; extraConfig = '' verbose external-ip=${personalization.external_ip_secret} + stale-nonce + fingerprint ''; }; diff --git a/modules/personalization.nix b/modules/personalization.nix index 120c7ed..ee22d1f 100755 --- a/modules/personalization.nix +++ b/modules/personalization.nix @@ -13,7 +13,6 @@ 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; @@ -22,5 +21,6 @@ age.secrets.wordpressdb.file = /var/lib/agenix-secrets/wordpressdb.age; ## external_ip_secret = builtins.readFile /var/lib/secrets/external_ip; +coturn_static_auth_secret = builtins.readFile /var/lib/secrets/turn; } From cafc56e39a9ce133658e00bb87a19281d8eb2ba9 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Mon, 4 Nov 2024 00:58:53 -0800 Subject: [PATCH 448/667] Updated Coturn Settings fix typo --- modules/coturn.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/coturn.nix b/modules/coturn.nix index 8f93da9..fbafb81 100755 --- a/modules/coturn.nix +++ b/modules/coturn.nix @@ -40,7 +40,7 @@ let pkey = "/var/lib/coturn/${personalization.matrix_url}.key.pem"; min-port = 49152; max-port = 65535; - listing-port = 5349; + listening-port = 5349; no-cli = true; extraConfig = '' verbose From a888d6da14ec511e710cee9b9b26c6da71d7e34d Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Mon, 4 Nov 2024 01:01:23 -0800 Subject: [PATCH 449/667] updated synapse.nix coturn --- modules/synapse.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/synapse.nix b/modules/synapse.nix index 184cba9..881d7f3 100755 --- a/modules/synapse.nix +++ b/modules/synapse.nix @@ -43,7 +43,7 @@ in "ff00::/8" ]; url_preview_ip_ranger_whitelist = [ "127.0.0.1" ]; - turn_shared_secret = "${personalization.age.secrets.turn.file}"; + turn_shared_secret = "${personalization.coturn_static_auth_secret}"; turn_uris = [ "turn:${personalization.matrix_url}:5349?transport=udp" "turn:${personalization.matrix_url}:5349?transport=tcp" From a059a1ea418531abc993b1e1f97cb9f680143053 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Wed, 6 Nov 2024 09:12:56 -0800 Subject: [PATCH 450/667] Nixpkgs update with Gnome 47 --- flake.lock | 89 ++++++++++++++++++++++++++++++++++++------------------ 1 file changed, 59 insertions(+), 30 deletions(-) diff --git a/flake.lock b/flake.lock index eb88be7..3703054 100755 --- a/flake.lock +++ b/flake.lock @@ -27,11 +27,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1728759865, - "narHash": "sha256-qoAmGWkMTDiRoROuQlg/GTVOP9INP3GhlyHllNKaMXU=", + "lastModified": 1730346198, + "narHash": "sha256-QpjT5tkA5144M0eF5TqU66S5V/QlohmkIeKndBxsHso=", "owner": "emmanuelrosa", "repo": "bisq-for-nixos", - "rev": "52c03fbf0329c481a99893d3e0a067908b9b7d31", + "rev": "4bb117abed1712b961bd68a3607c102b8958e109", "type": "github" }, "original": { @@ -124,11 +124,11 @@ ] }, "locked": { - "lastModified": 1727826117, - "narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=", + "lastModified": 1730504689, + "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1", + "rev": "506278e768c2a08bec68eb62932193e341f55c90", "type": "github" }, "original": { @@ -208,11 +208,11 @@ ] }, "locked": { - "lastModified": 1729104314, - "narHash": "sha256-pZRZsq5oCdJt3upZIU4aslS9XwFJ+/nVtALHIciX/BI=", + "lastModified": 1730814269, + "narHash": "sha256-fWPHyhYE6xvMI1eGY3pwBTq85wcy1YXqdzTZF+06nOg=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "3c3e88f0f544d6bb54329832616af7eb971b6be6", + "rev": "d70155fdc00df4628446352fc58adc640cd705c2", "type": "github" }, "original": { @@ -272,11 +272,11 @@ ] }, "locked": { - "lastModified": 1729260213, - "narHash": "sha256-jAvHoU/1y/yCuXzr2fNF+q6uKmr8Jj2xgAisK4QB9to=", + "lastModified": 1730837930, + "narHash": "sha256-0kZL4m+bKBJUBQse0HanewWO0g8hDdCvBhudzxgehqc=", "owner": "nix-community", "repo": "home-manager", - "rev": "09a0c0c02953318bf94425738c7061ffdc4cba75", + "rev": "2f607e07f3ac7e53541120536708e824acccfaa8", "type": "github" }, "original": { @@ -285,6 +285,34 @@ "type": "github" } }, + "ixx": { + "inputs": { + "flake-utils": [ + "nixvim", + "nuschtosSearch", + "flake-utils" + ], + "nixpkgs": [ + "nixvim", + "nuschtosSearch", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1729958008, + "narHash": "sha256-EiOq8jF4Z/zQe0QYVc3+qSKxRK//CFHMB84aYrYGwEs=", + "owner": "NuschtOS", + "repo": "ixx", + "rev": "9fd01aad037f345350eab2cd45e1946cc66da4eb", + "type": "github" + }, + "original": { + "owner": "NuschtOS", + "ref": "v0.0.6", + "repo": "ixx", + "type": "github" + } + }, "nix-appimage": { "inputs": { "flake-compat": "flake-compat", @@ -338,11 +366,11 @@ ] }, "locked": { - "lastModified": 1728901530, - "narHash": "sha256-I9Qd0LnAsEGHtKE9+uVR0iDFmsijWSy7GT0g3jihG4Q=", + "lastModified": 1730779758, + "narHash": "sha256-5WI9AnsBwhLzVRnQm3Qn9oAbROnuLDQTpaXeyZCK8qw=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "a60ac02f9466f85f092e576fd8364dfc4406b5a6", + "rev": "0e3f3f017c14467085f15d42343a3aaaacd89bcb", "type": "github" }, "original": { @@ -417,11 +445,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1729665710, - "narHash": "sha256-AlcmCXJZPIlO5dmFzV3V2XF6x/OpNWUV8Y/FMPGd8Z4=", + "lastModified": 1730785428, + "narHash": "sha256-Zwl8YgTVJTEum+L+0zVAWvXAGbWAuXHax3KzuejaDyo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2768c7d042a37de65bb1b5b3268fc987e534c49d", + "rev": "4aa36568d413aca0ea84a1684d2d46f55dbabad7", "type": "github" }, "original": { @@ -433,11 +461,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1729070438, - "narHash": "sha256-KOTTUfPkugH52avUvXGxvWy8ibKKj4genodIYUED+Kc=", + "lastModified": 1730785428, + "narHash": "sha256-Zwl8YgTVJTEum+L+0zVAWvXAGbWAuXHax3KzuejaDyo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5785b6bb5eaae44e627d541023034e1601455827", + "rev": "4aa36568d413aca0ea84a1684d2d46f55dbabad7", "type": "github" }, "original": { @@ -460,11 +488,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1729758248, - "narHash": "sha256-xTe7A0cOue3c+IGJOQ3ofbitBf4XhfXViWeDGNZUGkM=", + "lastModified": 1730877618, + "narHash": "sha256-HQTKujMb6SwnOqtWA+A7lR4MOCBZUW4vtrkK1E/QweU=", "owner": "nix-community", "repo": "nixvim", - "rev": "46f658d9606278ca8ebd0220039293e30d38a706", + "rev": "898246c943ba545a79d585093e97476ceb31f872", "type": "github" }, "original": { @@ -476,17 +504,18 @@ "nuschtosSearch": { "inputs": { "flake-utils": "flake-utils_3", + "ixx": "ixx", "nixpkgs": [ "nixvim", "nixpkgs" ] }, "locked": { - "lastModified": 1728905062, - "narHash": "sha256-W/lClt0bRgFRO0WFtytX/LEILpPNq+FOjIfESpkeu5c=", + "lastModified": 1730760712, + "narHash": "sha256-F4H98tjNgySlSLItuOqHYo9LF85rFoS/Vr0uOrq7BM4=", "owner": "NuschtOS", "repo": "search", - "rev": "f82d3e1c1c9d1eaeb91878519e2d27b27c66ce84", + "rev": "aa5214c81b904a19f7a54f7a8f288f7902586eee", "type": "github" }, "original": { @@ -572,11 +601,11 @@ ] }, "locked": { - "lastModified": 1729242555, - "narHash": "sha256-6jWSWxv2crIXmYSEb3LEVsFkCkyVHNllk61X4uhqfCs=", + "lastModified": 1730321837, + "narHash": "sha256-vK+a09qq19QNu2MlLcvN4qcRctJbqWkX7ahgPZ/+maI=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "d986489c1c757f6921a48c1439f19bfb9b8ecab5", + "rev": "746901bb8dba96d154b66492a29f5db0693dbfcc", "type": "github" }, "original": { From 50aad836a795355dac2213d9061e2672f334b56d Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Thu, 7 Nov 2024 10:21:52 -0800 Subject: [PATCH 451/667] updated PHP for Nextcloud --- configuration.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configuration.nix b/configuration.nix index 2a95447..d23f388 100755 --- a/configuration.nix +++ b/configuration.nix @@ -16,10 +16,10 @@ let opcache.enable=1; opcache.memory_consumption=512; opcache_revalidate_freq = 240; - opcache.max_accelerated_files=10000; + opcache.max_accelerated_files=20000; post_max_size = 3G upload_max_filesize = 3G - opcache.interned_strings_buffer = 32 + opcache.interned_strings_buffer = 64 redis.session.locking_enabled=1 redis.session.lock_retries=-1 redis.session.lock_wait_time=10000 From 253a8ff861298b1a0afe2483735c761de1a8dd6b Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Mon, 18 Nov 2024 16:20:16 -0800 Subject: [PATCH 452/667] Update Nixpkgs --- flake.lock | 72 +++++++++++++++++++++++++++--------------------------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/flake.lock b/flake.lock index 3703054..b9cac87 100755 --- a/flake.lock +++ b/flake.lock @@ -178,11 +178,11 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1726560853, - "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { @@ -208,11 +208,11 @@ ] }, "locked": { - "lastModified": 1730814269, - "narHash": "sha256-fWPHyhYE6xvMI1eGY3pwBTq85wcy1YXqdzTZF+06nOg=", + "lastModified": 1731363552, + "narHash": "sha256-vFta1uHnD29VUY4HJOO/D6p6rxyObnf+InnSMT4jlMU=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "d70155fdc00df4628446352fc58adc640cd705c2", + "rev": "cd1af27aa85026ac759d5d3fccf650abe7e1bbf0", "type": "github" }, "original": { @@ -272,11 +272,11 @@ ] }, "locked": { - "lastModified": 1730837930, - "narHash": "sha256-0kZL4m+bKBJUBQse0HanewWO0g8hDdCvBhudzxgehqc=", + "lastModified": 1731887066, + "narHash": "sha256-uw7K/RsYioJicV79Nl39yjtfhdfTDU2aRxnBgvFhkZ8=", "owner": "nix-community", "repo": "home-manager", - "rev": "2f607e07f3ac7e53541120536708e824acccfaa8", + "rev": "f3a2ff69586f3a54b461526e5702b1a2f81e740a", "type": "github" }, "original": { @@ -344,11 +344,11 @@ "nixpkgs-unstable": "nixpkgs-unstable" }, "locked": { - "lastModified": 1727247704, - "narHash": "sha256-Jl1CYXNIdJ4Ac0MK15e8+vflFOgPxZZNw24CKfLC6QY=", + "lastModified": 1731769069, + "narHash": "sha256-c1I6gTF8hahY1/y2DdtL7zqoGMGQcs7Qya0N+weeCZI=", "owner": "fort-nix", "repo": "nix-bitcoin", - "rev": "a0d36d59248ac54f1b42a668326346a77640c7f5", + "rev": "c0994bfc7bc866a8c67b6433a33a49a53b2fc546", "type": "github" }, "original": { @@ -366,11 +366,11 @@ ] }, "locked": { - "lastModified": 1730779758, - "narHash": "sha256-5WI9AnsBwhLzVRnQm3Qn9oAbROnuLDQTpaXeyZCK8qw=", + "lastModified": 1731885500, + "narHash": "sha256-ZrztYfSOS33J+ewq5alBOSdnIyZ0/sr1iy7FyBe9zIg=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "0e3f3f017c14467085f15d42343a3aaaacd89bcb", + "rev": "c60b5c924c6188a0b3ca2e139ead3d0f92ae5db5", "type": "github" }, "original": { @@ -397,11 +397,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1726871744, - "narHash": "sha256-V5LpfdHyQkUF7RfOaDPrZDP+oqz88lTJrMT1+stXNwo=", + "lastModified": 1730170245, + "narHash": "sha256-PRq4vJjDa+m1mNwkV9H7zVzMhuMqsHJrTGx0iJZ0e0w=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a1d92660c6b3b7c26fb883500a80ea9d33321be2", + "rev": "30c9efeef01e2ad4880bff6a01a61dd99536b3c9", "type": "github" }, "original": { @@ -429,11 +429,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1726969270, - "narHash": "sha256-8fnFlXBgM/uSvBlLWjZ0Z0sOdRBesyNdH0+esxqizGc=", + "lastModified": 1730137625, + "narHash": "sha256-9z8oOgFZiaguj+bbi3k4QhAD6JabWrnv7fscC/mt0KE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "23cbb250f3bf4f516a2d0bf03c51a30900848075", + "rev": "64b80bfb316b57cdb8919a9110ef63393d74382a", "type": "github" }, "original": { @@ -445,11 +445,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1730785428, - "narHash": "sha256-Zwl8YgTVJTEum+L+0zVAWvXAGbWAuXHax3KzuejaDyo=", + "lastModified": 1731676054, + "narHash": "sha256-OZiZ3m8SCMfh3B6bfGC/Bm4x3qc1m2SVEAlkV6iY7Yg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4aa36568d413aca0ea84a1684d2d46f55dbabad7", + "rev": "5e4fbfb6b3de1aa2872b76d49fafc942626e2add", "type": "github" }, "original": { @@ -461,11 +461,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1730785428, - "narHash": "sha256-Zwl8YgTVJTEum+L+0zVAWvXAGbWAuXHax3KzuejaDyo=", + "lastModified": 1731676054, + "narHash": "sha256-OZiZ3m8SCMfh3B6bfGC/Bm4x3qc1m2SVEAlkV6iY7Yg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4aa36568d413aca0ea84a1684d2d46f55dbabad7", + "rev": "5e4fbfb6b3de1aa2872b76d49fafc942626e2add", "type": "github" }, "original": { @@ -488,11 +488,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1730877618, - "narHash": "sha256-HQTKujMb6SwnOqtWA+A7lR4MOCBZUW4vtrkK1E/QweU=", + "lastModified": 1731969202, + "narHash": "sha256-k10MJfCQXUUzkvAQMs8b8UsCjIQQPNWEPMlBrHOoPqU=", "owner": "nix-community", "repo": "nixvim", - "rev": "898246c943ba545a79d585093e97476ceb31f872", + "rev": "2017830a2c81a97f6b7679ea5fa0d921cd0f4535", "type": "github" }, "original": { @@ -511,11 +511,11 @@ ] }, "locked": { - "lastModified": 1730760712, - "narHash": "sha256-F4H98tjNgySlSLItuOqHYo9LF85rFoS/Vr0uOrq7BM4=", + "lastModified": 1731936508, + "narHash": "sha256-z0BSSf78LkxIrrFXZYmCoRRAxAmxMUKpK7CyxQRvkZI=", "owner": "NuschtOS", "repo": "search", - "rev": "aa5214c81b904a19f7a54f7a8f288f7902586eee", + "rev": "fe07070f811b717a4626d01fab714a87d422a9e1", "type": "github" }, "original": { @@ -601,11 +601,11 @@ ] }, "locked": { - "lastModified": 1730321837, - "narHash": "sha256-vK+a09qq19QNu2MlLcvN4qcRctJbqWkX7ahgPZ/+maI=", + "lastModified": 1731944360, + "narHash": "sha256-sJxPh+V0vUkBhlA58ok/y0o96AtfqiEF0O8qsdolI6o=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "746901bb8dba96d154b66492a29f5db0693dbfcc", + "rev": "579b9a2fd0020cd9cd81a4ef4eab2dca4d20c94c", "type": "github" }, "original": { From aa5b2e0a0a6867376dcb5d5a3e3c9459d700cab6 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Wed, 27 Nov 2024 10:35:33 -0800 Subject: [PATCH 453/667] Nixpkgs Update and added Bisq2 --- configuration.nix | 1 + flake.lock | 42 +++++++++++++++++++++--------------------- 2 files changed, 22 insertions(+), 21 deletions(-) diff --git a/configuration.nix b/configuration.nix index d23f388..2d1c043 100755 --- a/configuration.nix +++ b/configuration.nix @@ -154,6 +154,7 @@ in gnome-tweaks papirus-icon-theme ranger + bisq2 sparrow neofetch gedit diff --git a/flake.lock b/flake.lock index b9cac87..86ffd7d 100755 --- a/flake.lock +++ b/flake.lock @@ -208,11 +208,11 @@ ] }, "locked": { - "lastModified": 1731363552, - "narHash": "sha256-vFta1uHnD29VUY4HJOO/D6p6rxyObnf+InnSMT4jlMU=", + "lastModified": 1732021966, + "narHash": "sha256-mnTbjpdqF0luOkou8ZFi2asa1N3AA2CchR/RqCNmsGE=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "cd1af27aa85026ac759d5d3fccf650abe7e1bbf0", + "rev": "3308484d1a443fc5bc92012435d79e80458fe43c", "type": "github" }, "original": { @@ -272,11 +272,11 @@ ] }, "locked": { - "lastModified": 1731887066, - "narHash": "sha256-uw7K/RsYioJicV79Nl39yjtfhdfTDU2aRxnBgvFhkZ8=", + "lastModified": 1732482255, + "narHash": "sha256-GUffLwzawz5WRVfWaWCg78n/HrBJrOG7QadFY6rtV8A=", "owner": "nix-community", "repo": "home-manager", - "rev": "f3a2ff69586f3a54b461526e5702b1a2f81e740a", + "rev": "a9953635d7f34e7358d5189751110f87e3ac17da", "type": "github" }, "original": { @@ -366,11 +366,11 @@ ] }, "locked": { - "lastModified": 1731885500, - "narHash": "sha256-ZrztYfSOS33J+ewq5alBOSdnIyZ0/sr1iy7FyBe9zIg=", + "lastModified": 1732603785, + "narHash": "sha256-AEjWTJwOmSnVYsSJCojKgoguGfFfwel6z/6ud6UFMU8=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "c60b5c924c6188a0b3ca2e139ead3d0f92ae5db5", + "rev": "6ab87b7c84d4ee873e937108c4ff80c015a40c7a", "type": "github" }, "original": { @@ -445,11 +445,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1731676054, - "narHash": "sha256-OZiZ3m8SCMfh3B6bfGC/Bm4x3qc1m2SVEAlkV6iY7Yg=", + "lastModified": 1732521221, + "narHash": "sha256-2ThgXBUXAE1oFsVATK1ZX9IjPcS4nKFOAjhPNKuiMn0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5e4fbfb6b3de1aa2872b76d49fafc942626e2add", + "rev": "4633a7c72337ea8fd23a4f2ba3972865e3ec685d", "type": "github" }, "original": { @@ -461,11 +461,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1731676054, - "narHash": "sha256-OZiZ3m8SCMfh3B6bfGC/Bm4x3qc1m2SVEAlkV6iY7Yg=", + "lastModified": 1732521221, + "narHash": "sha256-2ThgXBUXAE1oFsVATK1ZX9IjPcS4nKFOAjhPNKuiMn0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5e4fbfb6b3de1aa2872b76d49fafc942626e2add", + "rev": "4633a7c72337ea8fd23a4f2ba3972865e3ec685d", "type": "github" }, "original": { @@ -488,11 +488,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1731969202, - "narHash": "sha256-k10MJfCQXUUzkvAQMs8b8UsCjIQQPNWEPMlBrHOoPqU=", + "lastModified": 1732726573, + "narHash": "sha256-gvCPgtcXGf/GZaJBHYrXuM5r2pFRG3VDr7uOb7B1748=", "owner": "nix-community", "repo": "nixvim", - "rev": "2017830a2c81a97f6b7679ea5fa0d921cd0f4535", + "rev": "fc9178d124eba824f1862513314d351784e1a84c", "type": "github" }, "original": { @@ -601,11 +601,11 @@ ] }, "locked": { - "lastModified": 1731944360, - "narHash": "sha256-sJxPh+V0vUkBhlA58ok/y0o96AtfqiEF0O8qsdolI6o=", + "lastModified": 1732643199, + "narHash": "sha256-uI7TXEb231o8dkwB5AUCecx3AQtosRmL6hKgnckvjps=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "579b9a2fd0020cd9cd81a4ef4eab2dca4d20c94c", + "rev": "84637a7ab04179bdc42aa8fd0af1909fba76ad0c", "type": "github" }, "original": { From 810947a62fb34d24221fdcd43f46999e356eea10 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Tue, 10 Dec 2024 14:22:34 -0800 Subject: [PATCH 454/667] updated cln connect --- modules/bitcoinecosystem.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/bitcoinecosystem.nix b/modules/bitcoinecosystem.nix index 587ea66..040f277 100755 --- a/modules/bitcoinecosystem.nix +++ b/modules/bitcoinecosystem.nix @@ -119,9 +119,9 @@ experimental-offers onion = true; }; - services.clightning-rest = { + services.clightning.plugins.clnrest = { enable = true; - lndconnect = { + lnconnect = { enable = true; onion = true; }; From 30c6513dbe28bcf2d44da5e587d1bd86544f9abd Mon Sep 17 00:00:00 2001 From: naturallaw777 Date: Tue, 10 Dec 2024 14:26:45 -0800 Subject: [PATCH 455/667] revert 810947a62fb34d24221fdcd43f46999e356eea10 revert updated cln connect --- modules/bitcoinecosystem.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/bitcoinecosystem.nix b/modules/bitcoinecosystem.nix index 040f277..587ea66 100755 --- a/modules/bitcoinecosystem.nix +++ b/modules/bitcoinecosystem.nix @@ -119,9 +119,9 @@ experimental-offers onion = true; }; - services.clightning.plugins.clnrest = { + services.clightning-rest = { enable = true; - lnconnect = { + lndconnect = { enable = true; onion = true; }; From 17e17dc2c7c15500603694448d40a7de9836a494 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Fri, 13 Dec 2024 12:51:39 -0800 Subject: [PATCH 456/667] Nixpkgs update plus New CLN REST connect --- flake.lock | 78 +++++++++++++++++++++++++++--------------------------- 1 file changed, 39 insertions(+), 39 deletions(-) diff --git a/flake.lock b/flake.lock index 86ffd7d..616fa20 100755 --- a/flake.lock +++ b/flake.lock @@ -124,11 +124,11 @@ ] }, "locked": { - "lastModified": 1730504689, - "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=", + "lastModified": 1733312601, + "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "506278e768c2a08bec68eb62932193e341f55c90", + "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", "type": "github" }, "original": { @@ -160,11 +160,11 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1726560853, - "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { @@ -208,11 +208,11 @@ ] }, "locked": { - "lastModified": 1732021966, - "narHash": "sha256-mnTbjpdqF0luOkou8ZFi2asa1N3AA2CchR/RqCNmsGE=", + "lastModified": 1733318908, + "narHash": "sha256-SVQVsbafSM1dJ4fpgyBqLZ+Lft+jcQuMtEL3lQWx2Sk=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "3308484d1a443fc5bc92012435d79e80458fe43c", + "rev": "6f4e2a2112050951a314d2733a994fbab94864c6", "type": "github" }, "original": { @@ -272,11 +272,11 @@ ] }, "locked": { - "lastModified": 1732482255, - "narHash": "sha256-GUffLwzawz5WRVfWaWCg78n/HrBJrOG7QadFY6rtV8A=", + "lastModified": 1733484277, + "narHash": "sha256-i5ay20XsvpW91N4URET/nOc0VQWOAd4c4vbqYtcH8Rc=", "owner": "nix-community", "repo": "home-manager", - "rev": "a9953635d7f34e7358d5189751110f87e3ac17da", + "rev": "d00c6f6d0ad16d598bf7e2956f52c1d9d5de3c3a", "type": "github" }, "original": { @@ -344,11 +344,11 @@ "nixpkgs-unstable": "nixpkgs-unstable" }, "locked": { - "lastModified": 1731769069, - "narHash": "sha256-c1I6gTF8hahY1/y2DdtL7zqoGMGQcs7Qya0N+weeCZI=", + "lastModified": 1733172252, + "narHash": "sha256-J0nvKqLuVIQ/U1MkP8yl+Eacf9j/waWmlRpWuxqyndE=", "owner": "fort-nix", "repo": "nix-bitcoin", - "rev": "c0994bfc7bc866a8c67b6433a33a49a53b2fc546", + "rev": "ff847d527cc95efc8449946ce01a4dd6cea00489", "type": "github" }, "original": { @@ -366,11 +366,11 @@ ] }, "locked": { - "lastModified": 1732603785, - "narHash": "sha256-AEjWTJwOmSnVYsSJCojKgoguGfFfwel6z/6ud6UFMU8=", + "lastModified": 1733570843, + "narHash": "sha256-sQJAxY1TYWD1UyibN/FnN97paTFuwBw3Vp3DNCyKsMk=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "6ab87b7c84d4ee873e937108c4ff80c015a40c7a", + "rev": "a35b08d09efda83625bef267eb24347b446c80b8", "type": "github" }, "original": { @@ -397,11 +397,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1730170245, - "narHash": "sha256-PRq4vJjDa+m1mNwkV9H7zVzMhuMqsHJrTGx0iJZ0e0w=", + "lastModified": 1732997066, + "narHash": "sha256-9Vvu3a1ep1LB6F/kVE2hHH2HQzhSFtUyJYiJRkUkC4Q=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "30c9efeef01e2ad4880bff6a01a61dd99536b3c9", + "rev": "33b9d57c656e65a9c88c5f34e4eb00b83e2b0ca9", "type": "github" }, "original": { @@ -429,11 +429,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1730137625, - "narHash": "sha256-9z8oOgFZiaguj+bbi3k4QhAD6JabWrnv7fscC/mt0KE=", + "lastModified": 1732749044, + "narHash": "sha256-T38FQOg0BV5M8FN1712fovzNakSOENEYs+CSkg31C9Y=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "64b80bfb316b57cdb8919a9110ef63393d74382a", + "rev": "0c5b4ecbed5b155b705336aa96d878e55acd8685", "type": "github" }, "original": { @@ -445,11 +445,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1732521221, - "narHash": "sha256-2ThgXBUXAE1oFsVATK1ZX9IjPcS4nKFOAjhPNKuiMn0=", + "lastModified": 1733940404, + "narHash": "sha256-Pj39hSoUA86ZePPF/UXiYHHM7hMIkios8TYG29kQT4g=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4633a7c72337ea8fd23a4f2ba3972865e3ec685d", + "rev": "5d67ea6b4b63378b9c13be21e2ec9d1afc921713", "type": "github" }, "original": { @@ -461,11 +461,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1732521221, - "narHash": "sha256-2ThgXBUXAE1oFsVATK1ZX9IjPcS4nKFOAjhPNKuiMn0=", + "lastModified": 1733392399, + "narHash": "sha256-kEsTJTUQfQFIJOcLYFt/RvNxIK653ZkTBIs4DG+cBns=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4633a7c72337ea8fd23a4f2ba3972865e3ec685d", + "rev": "d0797a04b81caeae77bcff10a9dde78bc17f5661", "type": "github" }, "original": { @@ -488,11 +488,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1732726573, - "narHash": "sha256-gvCPgtcXGf/GZaJBHYrXuM5r2pFRG3VDr7uOb7B1748=", + "lastModified": 1734103614, + "narHash": "sha256-H5JN0fajkKZLir/GN6QHmLsR3cW+/EIOR+W/VmwHKfI=", "owner": "nix-community", "repo": "nixvim", - "rev": "fc9178d124eba824f1862513314d351784e1a84c", + "rev": "c181014422fa9261db06fc9b5ecbf67f42c30ec3", "type": "github" }, "original": { @@ -511,11 +511,11 @@ ] }, "locked": { - "lastModified": 1731936508, - "narHash": "sha256-z0BSSf78LkxIrrFXZYmCoRRAxAmxMUKpK7CyxQRvkZI=", + "lastModified": 1733411491, + "narHash": "sha256-315rJ7O9cOllPDaFscnJhcMleORHbxon0Kq9LAKJ5p4=", "owner": "NuschtOS", "repo": "search", - "rev": "fe07070f811b717a4626d01fab714a87d422a9e1", + "rev": "68e9fad70d95d08156cf10a030bd39487bed8ffe", "type": "github" }, "original": { @@ -601,11 +601,11 @@ ] }, "locked": { - "lastModified": 1732643199, - "narHash": "sha256-uI7TXEb231o8dkwB5AUCecx3AQtosRmL6hKgnckvjps=", + "lastModified": 1733440889, + "narHash": "sha256-qKL3vjO+IXFQ0nTinFDqNq/sbbnnS5bMI1y0xX215fU=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "84637a7ab04179bdc42aa8fd0af1909fba76ad0c", + "rev": "50862ba6a8a0255b87377b9d2d4565e96f29b410", "type": "github" }, "original": { From 6be12ee0fbd7c8312c63db49c2d417c8c3d0f400 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Fri, 13 Dec 2024 12:52:44 -0800 Subject: [PATCH 457/667] Nixpkgs Update and CLN REST update --- modules/bitcoinecosystem.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/bitcoinecosystem.nix b/modules/bitcoinecosystem.nix index 587ea66..040f277 100755 --- a/modules/bitcoinecosystem.nix +++ b/modules/bitcoinecosystem.nix @@ -119,9 +119,9 @@ experimental-offers onion = true; }; - services.clightning-rest = { + services.clightning.plugins.clnrest = { enable = true; - lndconnect = { + lnconnect = { enable = true; onion = true; }; From e43b5f5a21138c552642245ff9ddef1462c3b5e6 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Mon, 16 Dec 2024 10:53:46 -0800 Subject: [PATCH 458/667] updated custom-add-ons.md --- custom-add-ons.md | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/custom-add-ons.md b/custom-add-ons.md index 3eaa5ef..f06da1a 100644 --- a/custom-add-ons.md +++ b/custom-add-ons.md @@ -17,6 +17,10 @@ https://bitcoinknots.org https://blockstream.com/lightning/ +4. There is Mempool to be added on via a Tor connection. + +https://github.com/mempool/mempool + The code will be installed in the `custom.nix` file. @@ -111,7 +115,6 @@ systemd.services.jitsi-videobridge-helper = { "*/15 * * * * root /run/current-system/sw/bin/bash /var/lib/internal_ip/internal_ip.sh" ]; }; - ``` @@ -119,7 +122,6 @@ The code for Bitcoin Knots is as follows: ```nix services.bitcoind.package = pkgs.bitcoind-knots; - ``` @@ -127,6 +129,11 @@ The code for CLN for BTCpayserver backend is as follows: ```nix services.btcpayserver.lightningBackend = mkForce "clightning"; - +``` + +The code for Mempool is as follows: + +```nix +services.mempool.enable = true; ``` From 29a4dcdd0a9a07814165ea89a8aaaadb3043d2b1 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Mon, 16 Dec 2024 13:11:03 -0800 Subject: [PATCH 459/667] Update Nixpkgs --- flake.lock | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/flake.lock b/flake.lock index 616fa20..92dc628 100755 --- a/flake.lock +++ b/flake.lock @@ -208,11 +208,11 @@ ] }, "locked": { - "lastModified": 1733318908, - "narHash": "sha256-SVQVsbafSM1dJ4fpgyBqLZ+Lft+jcQuMtEL3lQWx2Sk=", + "lastModified": 1734279981, + "narHash": "sha256-NdaCraHPp8iYMWzdXAt5Nv6sA3MUzlCiGiR586TCwo0=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "6f4e2a2112050951a314d2733a994fbab94864c6", + "rev": "aa9f40c906904ebd83da78e7f328cd8aeaeae785", "type": "github" }, "original": { @@ -272,11 +272,11 @@ ] }, "locked": { - "lastModified": 1733484277, - "narHash": "sha256-i5ay20XsvpW91N4URET/nOc0VQWOAd4c4vbqYtcH8Rc=", + "lastModified": 1734093295, + "narHash": "sha256-hSwgGpcZtdDsk1dnzA0xj5cNaHgN9A99hRF/mxMtwS4=", "owner": "nix-community", "repo": "home-manager", - "rev": "d00c6f6d0ad16d598bf7e2956f52c1d9d5de3c3a", + "rev": "66c5d8b62818ec4c1edb3e941f55ef78df8141a8", "type": "github" }, "original": { @@ -445,11 +445,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1733940404, - "narHash": "sha256-Pj39hSoUA86ZePPF/UXiYHHM7hMIkios8TYG29kQT4g=", + "lastModified": 1734119587, + "narHash": "sha256-AKU6qqskl0yf2+JdRdD0cfxX4b9x3KKV5RqA6wijmPM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5d67ea6b4b63378b9c13be21e2ec9d1afc921713", + "rev": "3566ab7246670a43abd2ffa913cc62dad9cdf7d5", "type": "github" }, "original": { @@ -461,11 +461,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1733392399, - "narHash": "sha256-kEsTJTUQfQFIJOcLYFt/RvNxIK653ZkTBIs4DG+cBns=", + "lastModified": 1734119587, + "narHash": "sha256-AKU6qqskl0yf2+JdRdD0cfxX4b9x3KKV5RqA6wijmPM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d0797a04b81caeae77bcff10a9dde78bc17f5661", + "rev": "3566ab7246670a43abd2ffa913cc62dad9cdf7d5", "type": "github" }, "original": { @@ -488,11 +488,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1734103614, - "narHash": "sha256-H5JN0fajkKZLir/GN6QHmLsR3cW+/EIOR+W/VmwHKfI=", + "lastModified": 1734368549, + "narHash": "sha256-D8LYUU+IWbpmyjOAKEnKVOhd7Qfe7q+DvUNZTYoitKY=", "owner": "nix-community", "repo": "nixvim", - "rev": "c181014422fa9261db06fc9b5ecbf67f42c30ec3", + "rev": "6c30476a4d5f761149945a65e74179f4492b1ea6", "type": "github" }, "original": { @@ -511,11 +511,11 @@ ] }, "locked": { - "lastModified": 1733411491, - "narHash": "sha256-315rJ7O9cOllPDaFscnJhcMleORHbxon0Kq9LAKJ5p4=", + "lastModified": 1733773348, + "narHash": "sha256-Y47y+LesOCkJaLvj+dI/Oa6FAKj/T9sKVKDXLNsViPw=", "owner": "NuschtOS", "repo": "search", - "rev": "68e9fad70d95d08156cf10a030bd39487bed8ffe", + "rev": "3051be7f403bff1d1d380e4612f0c70675b44fc9", "type": "github" }, "original": { @@ -601,11 +601,11 @@ ] }, "locked": { - "lastModified": 1733440889, - "narHash": "sha256-qKL3vjO+IXFQ0nTinFDqNq/sbbnnS5bMI1y0xX215fU=", + "lastModified": 1733761991, + "narHash": "sha256-s4DalCDepD22jtKL5Nw6f4LP5UwoMcPzPZgHWjAfqbQ=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "50862ba6a8a0255b87377b9d2d4565e96f29b410", + "rev": "0ce9d149d99bc383d1f2d85f31f6ebd146e46085", "type": "github" }, "original": { From c318b0230bc4d8b1963b44e621ed3e60b4cefe14 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Mon, 16 Dec 2024 17:31:07 -0800 Subject: [PATCH 460/667] updated the Agenix sub-systems --- configuration.nix | 46 ++++++++++++++++++++++++++++++++++--- modules/personalization.nix | 11 --------- 2 files changed, 43 insertions(+), 14 deletions(-) diff --git a/configuration.nix b/configuration.nix index 2d1c043..441597d 100755 --- a/configuration.nix +++ b/configuration.nix @@ -293,6 +293,46 @@ in }; + + +###### AGENIX ####### + + age.identityPaths = [ "/root/.ssh/agenix/agenix-secret-keys" ]; + + age.secrets.matrix_reg_secret = { + file = /var/lib/agenix-secrets/matrix_reg_secret.age; + mode = "770"; + owner = "matrix-synapse"; + group = "matrix-synapse"; + + }; + + age.secrets.matrixdb = { + file = /var/lib/agenix-secrets/matrixdb.age; + mode = "770"; + owner = "postgres"; + group = "postgres"; + + }; + + age.secrets.nexclouddb = { + file = /var/lib/agenix-secrets/nextclouddb.age; + mode = "770"; + owner = "postgres"; + group = "postgres"; + + }; + + age.secrets.wordpress = { + file = /var/lib/agenix-secrets/wordpress.age; + mode = "770"; + owner = "mysql"; + group = "mysql"; + + }; + + + ###### CREATE DATABASE (WORDPRESS, MATRIX_SYNAPSE, AND NEXTCLOUD) ####### services.postgresql = { enable = true; @@ -315,14 +355,14 @@ in services.postgresql.initialScript = pkgs.writeText "begin-init.sql" '' - CREATE ROLE "ncusr" WITH LOGIN PASSWORD '${personalization.age.secrets.nextclouddb.file}'; + CREATE ROLE "ncusr" WITH LOGIN PASSWORD '${config.age.secrets.nextclouddb.path}'; CREATE DATABASE "nextclouddb" WITH OWNER "ncusr" TEMPLATE template0 LC_COLLATE = "C" LC_CTYPE = "C"; - CREATE ROLE "matrix-synapse" WITH LOGIN PASSWORD '${personalization.age.secrets.matrixdb.file}'; + CREATE ROLE "matrix-synapse" WITH LOGIN PASSWORD '${config.age.secrets.matrixdb.path}'; CREATE DATABASE "matrix-synapse" WITH OWNER "matrix-synapse" TEMPLATE template0 LC_COLLATE = "C" @@ -333,7 +373,7 @@ in services.mysql.initialScript = pkgs.writeText "wordpress-init.sql" '' CREATE DATABASE wordpressdb; - GRANT ALL ON *.* TO 'wpusr'@'localhost' IDENTIFIED BY '${personalization.age.secrets.wordpressdb.file}'; + GRANT ALL ON *.* TO 'wpusr'@'localhost' IDENTIFIED BY '${config.age.secrets.wordpressdb.path}'; FLUSH PRIVILEGES; '' ; diff --git a/modules/personalization.nix b/modules/personalization.nix index ee22d1f..49887ed 100755 --- a/modules/personalization.nix +++ b/modules/personalization.nix @@ -9,17 +9,6 @@ vaultwarden_url = builtins.readFile /var/lib/domains/vaultwarden; ## -age.identityPaths = [ "/root/.ssh/agenix/agenix-secret-keys" ]; - -## - -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; coturn_static_auth_secret = builtins.readFile /var/lib/secrets/turn; From 9bf8a61f79de1f03e0623b82434fbc96dbf95c1b Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Mon, 16 Dec 2024 17:35:15 -0800 Subject: [PATCH 461/667] updated the Agenix and Synapse --- modules/synapse.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/synapse.nix b/modules/synapse.nix index 881d7f3..a22735f 100755 --- a/modules/synapse.nix +++ b/modules/synapse.nix @@ -52,7 +52,7 @@ in ]; presence.enabled = true; enable_registration = false; - registration_shared_secret = "${personalization.age.secrets.matrix_reg_secret.file}"; + registration_shared_secret = config.age.secrets.matrix_reg_secret.path; listeners = [ { port = 8008; From 2d8c581317fc332761b89811fddac1069660b08b Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Mon, 16 Dec 2024 17:39:12 -0800 Subject: [PATCH 462/667] updated the Agenix --- configuration.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configuration.nix b/configuration.nix index 441597d..3505241 100755 --- a/configuration.nix +++ b/configuration.nix @@ -323,8 +323,8 @@ in }; - age.secrets.wordpress = { - file = /var/lib/agenix-secrets/wordpress.age; + age.secrets.wordpressdb = { + file = /var/lib/agenix-secrets/wordpressdb.age; mode = "770"; owner = "mysql"; group = "mysql"; From 5c65e394c1adbc3003d76233f45a3a34f84cc1b6 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Mon, 16 Dec 2024 17:41:28 -0800 Subject: [PATCH 463/667] updated the Agenix --- configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configuration.nix b/configuration.nix index 3505241..c402818 100755 --- a/configuration.nix +++ b/configuration.nix @@ -315,7 +315,7 @@ in }; - age.secrets.nexclouddb = { + age.secrets.nextclouddb = { file = /var/lib/agenix-secrets/nextclouddb.age; mode = "770"; owner = "postgres"; From 5251636f452c916731273b09e288266eb63aa956 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Mon, 16 Dec 2024 17:46:59 -0800 Subject: [PATCH 464/667] updated spacing on configuration.nix --- configuration.nix | 30 ++++++++++++------------------ 1 file changed, 12 insertions(+), 18 deletions(-) diff --git a/configuration.nix b/configuration.nix index c402818..8068e09 100755 --- a/configuration.nix +++ b/configuration.nix @@ -295,42 +295,36 @@ in -###### AGENIX ####### - - age.identityPaths = [ "/root/.ssh/agenix/agenix-secret-keys" ]; - - age.secrets.matrix_reg_secret = { +###### AGENIX ####### + age.identityPaths = [ "/root/.ssh/agenix/agenix-secret-keys" ]; + + age.secrets.matrix_reg_secret = { file = /var/lib/agenix-secrets/matrix_reg_secret.age; mode = "770"; owner = "matrix-synapse"; - group = "matrix-synapse"; - - }; + group = "matrix-synapse"; + }; age.secrets.matrixdb = { file = /var/lib/agenix-secrets/matrixdb.age; mode = "770"; owner = "postgres"; - group = "postgres"; - - }; + group = "postgres"; + }; age.secrets.nextclouddb = { file = /var/lib/agenix-secrets/nextclouddb.age; mode = "770"; owner = "postgres"; - group = "postgres"; - - }; + group = "postgres"; + }; age.secrets.wordpressdb = { file = /var/lib/agenix-secrets/wordpressdb.age; mode = "770"; owner = "mysql"; - group = "mysql"; - - }; - + group = "mysql"; + }; ###### CREATE DATABASE (WORDPRESS, MATRIX_SYNAPSE, AND NEXTCLOUD) ####### From db6288862acc327567ffe721c2631a429bcf5c25 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Mon, 16 Dec 2024 17:51:15 -0800 Subject: [PATCH 465/667] updated synapse.nix --- modules/synapse.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/modules/synapse.nix b/modules/synapse.nix index a22735f..d633653 100755 --- a/modules/synapse.nix +++ b/modules/synapse.nix @@ -44,12 +44,10 @@ in ]; url_preview_ip_ranger_whitelist = [ "127.0.0.1" ]; turn_shared_secret = "${personalization.coturn_static_auth_secret}"; - turn_uris = [ - "turn:${personalization.matrix_url}:5349?transport=udp" - "turn:${personalization.matrix_url}:5349?transport=tcp" - "turns:${personalization.matrix_url}:5349?transport=udp" - "turns:${personalization.matrix_url}:5349?transport=tcp" - ]; + turn_uris = [ + "turn:${personalization.matrix_url}:5349?transport=udp" + "turn:${personalization.matrix_url}:5349?transport=tcp" + ]; presence.enabled = true; enable_registration = false; registration_shared_secret = config.age.secrets.matrix_reg_secret.path; From 78b5631fececff873bd5647596f38c34996d1afe Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Mon, 16 Dec 2024 18:31:03 -0800 Subject: [PATCH 466/667] updated auto database --- configuration.nix | 6 +++--- modules/personalization.nix | 9 +++++++++ 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/configuration.nix b/configuration.nix index 8068e09..ef94124 100755 --- a/configuration.nix +++ b/configuration.nix @@ -349,14 +349,14 @@ in services.postgresql.initialScript = pkgs.writeText "begin-init.sql" '' - CREATE ROLE "ncusr" WITH LOGIN PASSWORD '${config.age.secrets.nextclouddb.path}'; + CREATE ROLE "ncusr" WITH LOGIN PASSWORD '${personalizatoin.nextclouddb}'; CREATE DATABASE "nextclouddb" WITH OWNER "ncusr" TEMPLATE template0 LC_COLLATE = "C" LC_CTYPE = "C"; - CREATE ROLE "matrix-synapse" WITH LOGIN PASSWORD '${config.age.secrets.matrixdb.path}'; + CREATE ROLE "matrix-synapse" WITH LOGIN PASSWORD '${personalization.matrixdb}'; CREATE DATABASE "matrix-synapse" WITH OWNER "matrix-synapse" TEMPLATE template0 LC_COLLATE = "C" @@ -367,7 +367,7 @@ in services.mysql.initialScript = pkgs.writeText "wordpress-init.sql" '' CREATE DATABASE wordpressdb; - GRANT ALL ON *.* TO 'wpusr'@'localhost' IDENTIFIED BY '${config.age.secrets.wordpressdb.path}'; + GRANT ALL ON *.* TO 'wpusr'@'localhost' IDENTIFIED BY '${personalizatoin.wordpressdb}'; FLUSH PRIVILEGES; '' ; diff --git a/modules/personalization.nix b/modules/personalization.nix index 49887ed..05cac8c 100755 --- a/modules/personalization.nix +++ b/modules/personalization.nix @@ -12,4 +12,13 @@ vaultwarden_url = builtins.readFile /var/lib/domains/vaultwarden; external_ip_secret = builtins.readFile /var/lib/secrets/external_ip; coturn_static_auth_secret = builtins.readFile /var/lib/secrets/turn; +## + +matrixdb = builtins.readFile /var/lib/secrets/matrixdb; +nextclouddb = builtins.readFile /var/lib/secrets/nextclouddb; +wordpressdb = builtins.readFile /var/lib/secrets/wordpressdb; + + + + } From 9467b6f7b0ce3c46b38cc110a58bad2076f14c52 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Mon, 16 Dec 2024 18:32:54 -0800 Subject: [PATCH 467/667] updated typos --- configuration.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configuration.nix b/configuration.nix index ef94124..3752784 100755 --- a/configuration.nix +++ b/configuration.nix @@ -349,7 +349,7 @@ in services.postgresql.initialScript = pkgs.writeText "begin-init.sql" '' - CREATE ROLE "ncusr" WITH LOGIN PASSWORD '${personalizatoin.nextclouddb}'; + CREATE ROLE "ncusr" WITH LOGIN PASSWORD '${personalization.nextclouddb}'; CREATE DATABASE "nextclouddb" WITH OWNER "ncusr" TEMPLATE template0 LC_COLLATE = "C" @@ -367,7 +367,7 @@ in services.mysql.initialScript = pkgs.writeText "wordpress-init.sql" '' CREATE DATABASE wordpressdb; - GRANT ALL ON *.* TO 'wpusr'@'localhost' IDENTIFIED BY '${personalizatoin.wordpressdb}'; + GRANT ALL ON *.* TO 'wpusr'@'localhost' IDENTIFIED BY '${personalization.wordpressdb}'; FLUSH PRIVILEGES; '' ; From bfd091c82a4b46457917ed4682def20e52da2be0 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Mon, 16 Dec 2024 19:05:24 -0800 Subject: [PATCH 468/667] updated agenix system --- configuration.nix | 28 ++++------------------------ modules/personalization.nix | 8 ++++---- 2 files changed, 8 insertions(+), 28 deletions(-) diff --git a/configuration.nix b/configuration.nix index 3752784..8aef595 100755 --- a/configuration.nix +++ b/configuration.nix @@ -304,27 +304,7 @@ in owner = "matrix-synapse"; group = "matrix-synapse"; }; - - age.secrets.matrixdb = { - file = /var/lib/agenix-secrets/matrixdb.age; - mode = "770"; - owner = "postgres"; - group = "postgres"; - }; - - age.secrets.nextclouddb = { - file = /var/lib/agenix-secrets/nextclouddb.age; - mode = "770"; - owner = "postgres"; - group = "postgres"; - }; - - age.secrets.wordpressdb = { - file = /var/lib/agenix-secrets/wordpressdb.age; - mode = "770"; - owner = "mysql"; - group = "mysql"; - }; + ###### CREATE DATABASE (WORDPRESS, MATRIX_SYNAPSE, AND NEXTCLOUD) ####### @@ -349,14 +329,14 @@ in services.postgresql.initialScript = pkgs.writeText "begin-init.sql" '' - CREATE ROLE "ncusr" WITH LOGIN PASSWORD '${personalization.nextclouddb}'; + 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.matrixdb}'; + 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" @@ -367,7 +347,7 @@ in services.mysql.initialScript = pkgs.writeText "wordpress-init.sql" '' CREATE DATABASE wordpressdb; - GRANT ALL ON *.* TO 'wpusr'@'localhost' IDENTIFIED BY '${personalization.wordpressdb}'; + GRANT ALL ON *.* TO 'wpusr'@'localhost' IDENTIFIED BY '${personalization.age.secrets.wordpressdb.file}'; FLUSH PRIVILEGES; '' ; diff --git a/modules/personalization.nix b/modules/personalization.nix index 05cac8c..544df7f 100755 --- a/modules/personalization.nix +++ b/modules/personalization.nix @@ -14,10 +14,10 @@ coturn_static_auth_secret = builtins.readFile /var/lib/secrets/turn; ## -matrixdb = builtins.readFile /var/lib/secrets/matrixdb; -nextclouddb = builtins.readFile /var/lib/secrets/nextclouddb; -wordpressdb = builtins.readFile /var/lib/secrets/wordpressdb; - +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; From 52bbad7a6ea99bbbba60e3214785fe9e856dc29b Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Mon, 16 Dec 2024 19:12:06 -0800 Subject: [PATCH 469/667] updated agenix system --- configuration.nix | 12 ++++++++---- modules/personalization.nix | 8 -------- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/configuration.nix b/configuration.nix index 8aef595..3249ef7 100755 --- a/configuration.nix +++ b/configuration.nix @@ -304,7 +304,11 @@ in owner = "matrix-synapse"; group = "matrix-synapse"; }; - + + 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; ###### CREATE DATABASE (WORDPRESS, MATRIX_SYNAPSE, AND NEXTCLOUD) ####### @@ -329,14 +333,14 @@ in services.postgresql.initialScript = pkgs.writeText "begin-init.sql" '' - CREATE ROLE "ncusr" WITH LOGIN PASSWORD '${personalization.age.secrets.nextclouddb.file}'; + CREATE ROLE "ncusr" WITH LOGIN PASSWORD '${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 ROLE "matrix-synapse" WITH LOGIN PASSWORD '${age.secrets.matrixdb.file}'; CREATE DATABASE "matrix-synapse" WITH OWNER "matrix-synapse" TEMPLATE template0 LC_COLLATE = "C" @@ -347,7 +351,7 @@ in services.mysql.initialScript = pkgs.writeText "wordpress-init.sql" '' CREATE DATABASE wordpressdb; - GRANT ALL ON *.* TO 'wpusr'@'localhost' IDENTIFIED BY '${personalization.age.secrets.wordpressdb.file}'; + GRANT ALL ON *.* TO 'wpusr'@'localhost' IDENTIFIED BY '${age.secrets.wordpressdb.file}'; FLUSH PRIVILEGES; '' ; diff --git a/modules/personalization.nix b/modules/personalization.nix index 544df7f..a582437 100755 --- a/modules/personalization.nix +++ b/modules/personalization.nix @@ -12,13 +12,5 @@ vaultwarden_url = builtins.readFile /var/lib/domains/vaultwarden; external_ip_secret = builtins.readFile /var/lib/secrets/external_ip; coturn_static_auth_secret = builtins.readFile /var/lib/secrets/turn; -## - -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; - - } From df94fe90301113275b49b0163e24550088c953f4 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Mon, 16 Dec 2024 19:15:06 -0800 Subject: [PATCH 470/667] updated agenix system --- configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configuration.nix b/configuration.nix index 3249ef7..370b5b1 100755 --- a/configuration.nix +++ b/configuration.nix @@ -305,7 +305,7 @@ in group = "matrix-synapse"; }; - 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; From 151573d29827b7e292dd53d271e41c09e16a8908 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Mon, 16 Dec 2024 19:29:32 -0800 Subject: [PATCH 471/667] updated agenix system --- configuration.nix | 11 +++-------- modules/personalization.nix | 7 +++++++ 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/configuration.nix b/configuration.nix index 370b5b1..9de3912 100755 --- a/configuration.nix +++ b/configuration.nix @@ -306,11 +306,6 @@ in }; - 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; - - ###### CREATE DATABASE (WORDPRESS, MATRIX_SYNAPSE, AND NEXTCLOUD) ####### services.postgresql = { enable = true; @@ -333,14 +328,14 @@ in services.postgresql.initialScript = pkgs.writeText "begin-init.sql" '' - CREATE ROLE "ncusr" WITH LOGIN PASSWORD '${age.secrets.nextclouddb.file}'; + 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 '${age.secrets.matrixdb.file}'; + 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" @@ -351,7 +346,7 @@ in services.mysql.initialScript = pkgs.writeText "wordpress-init.sql" '' CREATE DATABASE wordpressdb; - GRANT ALL ON *.* TO 'wpusr'@'localhost' IDENTIFIED BY '${age.secrets.wordpressdb.file}'; + GRANT ALL ON *.* TO 'wpusr'@'localhost' IDENTIFIED BY '${personalization.age.secrets.wordpressdb.file}'; FLUSH PRIVILEGES; '' ; diff --git a/modules/personalization.nix b/modules/personalization.nix index a582437..ff47d08 100755 --- a/modules/personalization.nix +++ b/modules/personalization.nix @@ -12,5 +12,12 @@ vaultwarden_url = builtins.readFile /var/lib/domains/vaultwarden; external_ip_secret = builtins.readFile /var/lib/secrets/external_ip; coturn_static_auth_secret = builtins.readFile /var/lib/secrets/turn; +## + +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; + } From 2fb53ba8b4092b36ec9cacd158d8fe07a54df59e Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Mon, 16 Dec 2024 20:17:14 -0800 Subject: [PATCH 472/667] updated agenix system --- modules/personalization.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/personalization.nix b/modules/personalization.nix index ff47d08..6593549 100755 --- a/modules/personalization.nix +++ b/modules/personalization.nix @@ -14,7 +14,6 @@ coturn_static_auth_secret = builtins.readFile /var/lib/secrets/turn; ## -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; From 2a597f7c2bb2dce9f0abf16efe58f6b34ccafc80 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Mon, 16 Dec 2024 20:39:49 -0800 Subject: [PATCH 473/667] updated synape personalizatoin configuration --- configuration.nix | 18 +++--------------- modules/personalization.nix | 6 +++--- modules/synapse.nix | 2 +- 3 files changed, 7 insertions(+), 19 deletions(-) diff --git a/configuration.nix b/configuration.nix index 9de3912..be28d42 100755 --- a/configuration.nix +++ b/configuration.nix @@ -292,18 +292,6 @@ in }; }; - - - -###### AGENIX ####### - age.identityPaths = [ "/root/.ssh/agenix/agenix-secret-keys" ]; - - age.secrets.matrix_reg_secret = { - file = /var/lib/agenix-secrets/matrix_reg_secret.age; - mode = "770"; - owner = "matrix-synapse"; - group = "matrix-synapse"; - }; ###### CREATE DATABASE (WORDPRESS, MATRIX_SYNAPSE, AND NEXTCLOUD) ####### @@ -328,14 +316,14 @@ in services.postgresql.initialScript = pkgs.writeText "begin-init.sql" '' - CREATE ROLE "ncusr" WITH LOGIN PASSWORD '${personalization.age.secrets.nextclouddb.file}'; + CREATE ROLE "ncusr" WITH LOGIN PASSWORD '${personalization.nextclouddb}'; CREATE DATABASE "nextclouddb" WITH OWNER "ncusr" TEMPLATE template0 LC_COLLATE = "C" LC_CTYPE = "C"; - CREATE ROLE "matrix-synapse" WITH LOGIN PASSWORD '${personalization.age.secrets.matrixdb.file}'; + CREATE ROLE "matrix-synapse" WITH LOGIN PASSWORD '${personalization.matrixdb}'; CREATE DATABASE "matrix-synapse" WITH OWNER "matrix-synapse" TEMPLATE template0 LC_COLLATE = "C" @@ -346,7 +334,7 @@ in services.mysql.initialScript = pkgs.writeText "wordpress-init.sql" '' CREATE DATABASE wordpressdb; - GRANT ALL ON *.* TO 'wpusr'@'localhost' IDENTIFIED BY '${personalization.age.secrets.wordpressdb.file}'; + GRANT ALL ON *.* TO 'wpusr'@'localhost' IDENTIFIED BY '${personalization.wordpressdb}'; FLUSH PRIVILEGES; '' ; diff --git a/modules/personalization.nix b/modules/personalization.nix index 6593549..b2f2ca5 100755 --- a/modules/personalization.nix +++ b/modules/personalization.nix @@ -14,9 +14,9 @@ coturn_static_auth_secret = builtins.readFile /var/lib/secrets/turn; ## -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; +matrixdb = builtins.readFile /var/lib/secrets/matrixdb; +nextclouddb = builtins.readFile /var/lib/secrets/nextclouddb; +wordpressdb = builtins.readFile /var/lib/secrets/wordpressdb; } diff --git a/modules/synapse.nix b/modules/synapse.nix index d633653..d61d66d 100755 --- a/modules/synapse.nix +++ b/modules/synapse.nix @@ -50,7 +50,7 @@ in ]; presence.enabled = true; enable_registration = false; - registration_shared_secret = config.age.secrets.matrix_reg_secret.path; + registration_shared_secret = ${services.matrix-synapse.extraConfigFiles = /var/lib/secrets/matrix_reg_secret}; listeners = [ { port = 8008; From b1aaf5052bb8cd6cd5245ddd0c14fdbfa2b7b757 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Mon, 16 Dec 2024 20:41:09 -0800 Subject: [PATCH 474/667] updated synape personalizatoin configuration --- modules/synapse.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/synapse.nix b/modules/synapse.nix index d61d66d..7adfdf5 100755 --- a/modules/synapse.nix +++ b/modules/synapse.nix @@ -50,7 +50,7 @@ in ]; presence.enabled = true; enable_registration = false; - registration_shared_secret = ${services.matrix-synapse.extraConfigFiles = /var/lib/secrets/matrix_reg_secret}; + registration_shared_secret = services.matrix-synapse.extraConfigFiles = /var/lib/secrets/matrix_reg_secret; listeners = [ { port = 8008; From 4d5fa89eb787139ec83687cc9f4de3f8e88bc510 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Mon, 16 Dec 2024 20:49:00 -0800 Subject: [PATCH 475/667] updated synape personalizatoin configuration --- configuration.nix | 13 ++++++++++++- modules/synapse.nix | 2 +- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/configuration.nix b/configuration.nix index be28d42..85fb107 100755 --- a/configuration.nix +++ b/configuration.nix @@ -292,7 +292,18 @@ in }; }; - +###### AGENIX ###### + age.identityPaths = [ "/root/.ssh/agenix/agenix-secret-keys" ]; + + age.secrets.matrix_reg_secret = { + + file = /var/lib/agenix-secrets/matrix_reg_secret.age; + mode = "770"; + owner = "matrix-synapse"; + group = "matrix-synapse"; + }; + + ###### CREATE DATABASE (WORDPRESS, MATRIX_SYNAPSE, AND NEXTCLOUD) ####### services.postgresql = { diff --git a/modules/synapse.nix b/modules/synapse.nix index 7adfdf5..d633653 100755 --- a/modules/synapse.nix +++ b/modules/synapse.nix @@ -50,7 +50,7 @@ in ]; presence.enabled = true; enable_registration = false; - registration_shared_secret = services.matrix-synapse.extraConfigFiles = /var/lib/secrets/matrix_reg_secret; + registration_shared_secret = config.age.secrets.matrix_reg_secret.path; listeners = [ { port = 8008; From 27fdbe2bf3addf7b2850b8150608b7111b3119be Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Mon, 16 Dec 2024 21:54:22 -0800 Subject: [PATCH 476/667] updated permissions --- configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configuration.nix b/configuration.nix index 85fb107..ca816f7 100755 --- a/configuration.nix +++ b/configuration.nix @@ -298,7 +298,7 @@ in age.secrets.matrix_reg_secret = { file = /var/lib/agenix-secrets/matrix_reg_secret.age; - mode = "770"; + mode = "777"; owner = "matrix-synapse"; group = "matrix-synapse"; }; From 825da38d15681973c0cb58919038e121c0f1f447 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Mon, 16 Dec 2024 23:05:07 -0800 Subject: [PATCH 477/667] updated permissions --- configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configuration.nix b/configuration.nix index ca816f7..85fb107 100755 --- a/configuration.nix +++ b/configuration.nix @@ -298,7 +298,7 @@ in age.secrets.matrix_reg_secret = { file = /var/lib/agenix-secrets/matrix_reg_secret.age; - mode = "777"; + mode = "770"; owner = "matrix-synapse"; group = "matrix-synapse"; }; From f748baf03e6052b587d04c1e96f00a143f9eb4ff Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Mon, 16 Dec 2024 23:24:12 -0800 Subject: [PATCH 478/667] updated inital script --- configuration.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/configuration.nix b/configuration.nix index 85fb107..1db7616 100755 --- a/configuration.nix +++ b/configuration.nix @@ -345,7 +345,8 @@ in services.mysql.initialScript = pkgs.writeText "wordpress-init.sql" '' CREATE DATABASE wordpressdb; - GRANT ALL ON *.* TO 'wpusr'@'localhost' IDENTIFIED BY '${personalization.wordpressdb}'; + CREATE USER wpusr WITH ENCRYPTED PASSWORD '${personalization.wordpressdb}'; + GRANT ALL PRIVILEGES ON DATABASE wordpressdb TO wpusr; FLUSH PRIVILEGES; '' ; From 9f66b9f06c47feb09936534bb6de2101d10da6cb Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Mon, 16 Dec 2024 23:32:00 -0800 Subject: [PATCH 479/667] updated inital script --- configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configuration.nix b/configuration.nix index 1db7616..f801be3 100755 --- a/configuration.nix +++ b/configuration.nix @@ -345,7 +345,7 @@ in services.mysql.initialScript = pkgs.writeText "wordpress-init.sql" '' CREATE DATABASE wordpressdb; - CREATE USER wpusr WITH ENCRYPTED PASSWORD '${personalization.wordpressdb}'; + CREATE USER wpusr WITH ENCRYPTED PASSWORD ${personalization.wordpressdb}; GRANT ALL PRIVILEGES ON DATABASE wordpressdb TO wpusr; FLUSH PRIVILEGES; '' From 0d4386f61b5dbe9824ac062b4231a60dd45c3ca4 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Mon, 16 Dec 2024 23:42:24 -0800 Subject: [PATCH 480/667] updated inital script --- configuration.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configuration.nix b/configuration.nix index f801be3..c05dd60 100755 --- a/configuration.nix +++ b/configuration.nix @@ -345,8 +345,8 @@ in services.mysql.initialScript = pkgs.writeText "wordpress-init.sql" '' CREATE DATABASE wordpressdb; - CREATE USER wpusr WITH ENCRYPTED PASSWORD ${personalization.wordpressdb}; - GRANT ALL PRIVILEGES ON DATABASE wordpressdb TO wpusr; + CREATE USER 'wpusr'@'localhost' IDENTIFIED BY 'new_password'; + GRANT ALL ON wordpressdb.* TO 'wpusr'@'localhost'; FLUSH PRIVILEGES; '' ; From 9a4d12c9bd78a7321f0aaa719bbd6df548b98ebb Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Mon, 16 Dec 2024 23:44:01 -0800 Subject: [PATCH 481/667] updated inital script --- configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configuration.nix b/configuration.nix index c05dd60..6e55b83 100755 --- a/configuration.nix +++ b/configuration.nix @@ -345,7 +345,7 @@ in services.mysql.initialScript = pkgs.writeText "wordpress-init.sql" '' CREATE DATABASE wordpressdb; - CREATE USER 'wpusr'@'localhost' IDENTIFIED BY 'new_password'; + CREATE USER 'wpusr'@'localhost' IDENTIFIED BY '${personalization.wordpressdb}'; GRANT ALL ON wordpressdb.* TO 'wpusr'@'localhost'; FLUSH PRIVILEGES; '' From 9208540f2655d5a50ead5277e94f33c9711ea108 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Tue, 17 Dec 2024 10:55:32 -0800 Subject: [PATCH 482/667] added fix to update all agenix files --- .../add_external_backup_app.sh | 0 .../nextcloud_maintenance_window_fix.sh | 0 file_fixes_and_new_services/update-agenix.sh | 84 +++++++++++++++++++ 3 files changed, 84 insertions(+) mode change 100644 => 100755 file_fixes_and_new_services/add_external_backup_app.sh mode change 100644 => 100755 file_fixes_and_new_services/nextcloud_maintenance_window_fix.sh create mode 100755 file_fixes_and_new_services/update-agenix.sh diff --git a/file_fixes_and_new_services/add_external_backup_app.sh b/file_fixes_and_new_services/add_external_backup_app.sh old mode 100644 new mode 100755 diff --git a/file_fixes_and_new_services/nextcloud_maintenance_window_fix.sh b/file_fixes_and_new_services/nextcloud_maintenance_window_fix.sh old mode 100644 new mode 100755 diff --git a/file_fixes_and_new_services/update-agenix.sh b/file_fixes_and_new_services/update-agenix.sh new file mode 100755 index 0000000..c066e12 --- /dev/null +++ b/file_fixes_and_new_services/update-agenix.sh @@ -0,0 +1,84 @@ +#!/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 #### + +ssh root@localhost " + + /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 +" + + +ssh root@localhost << 'EOF' + + pushd /var/lib/agenix-secrets/ + + /run/current-system/sw/bin/echo -n $(/run/current-system/sw/bin/cat /var/lib/secrets/wordpressdb) | EDITOR='cp /dev/stdin' 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='cp /dev/stdin' 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='cp /dev/stdin' 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='cp /dev/stdin' 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='cp /dev/stdin' nix run github:ryantm/agenix -- -e matrix_reg_secret.age -i /root/.ssh/agenix/agenix-secret-keys + + popd + +EOF + + + 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 + From 3f24d7e66ed4ee079bc5a7791a471568481cf07d Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Tue, 17 Dec 2024 11:01:09 -0800 Subject: [PATCH 483/667] added to update-agenix to systemd unit --- .../Sovran_SystemsOS_File_Fixes_And_New_Services.sh | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/file_fixes_and_new_services/Sovran_SystemsOS_File_Fixes_And_New_Services.sh b/file_fixes_and_new_services/Sovran_SystemsOS_File_Fixes_And_New_Services.sh index 1523bd5..3e84dc5 100755 --- a/file_fixes_and_new_services/Sovran_SystemsOS_File_Fixes_And_New_Services.sh +++ b/file_fixes_and_new_services/Sovran_SystemsOS_File_Fixes_And_New_Services.sh @@ -3,7 +3,6 @@ cd /home/free/Downloads - #### 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" @@ -13,7 +12,6 @@ cd /home/free/Downloads rm -rf /home/free/Downloads/sovran-pro-flake-update.sh - #### 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" @@ -50,6 +48,15 @@ rm -rf /home/free/Downloads/nextcloud_maintenance_window_fix.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 + + #### REMOVAL OF MAIN SCRIPT #### -rm -rf /home/free/Downloads/Sovran_SystemsOS_File_Fixes_And_New_Services.sh \ No newline at end of file +rm -rf /home/free/Downloads/Sovran_SystemsOS_File_Fixes_And_New_Services.sh From f7244d348b70e8ea7f7e0367be34cd0cfb93ce40 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Tue, 17 Dec 2024 11:09:27 -0800 Subject: [PATCH 484/667] code fix to update-agenix to systemd unit --- file_fixes_and_new_services/update-agenix.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/file_fixes_and_new_services/update-agenix.sh b/file_fixes_and_new_services/update-agenix.sh index c066e12..7217f6b 100755 --- a/file_fixes_and_new_services/update-agenix.sh +++ b/file_fixes_and_new_services/update-agenix.sh @@ -28,7 +28,7 @@ FILE=/var/lib/beacons/file_fixes_and_new_services/update-agenix/completed #### MAIN SCRIPT #### -ssh root@localhost " +/run/current-system/sw/bin/ssh root@localhost " /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 ; @@ -38,7 +38,7 @@ ssh root@localhost " " -ssh root@localhost << 'EOF' +/run/current-system/sw/bin/ssh root@localhost << 'EOF' pushd /var/lib/agenix-secrets/ From 95c8b77bef2d5baf5d122d58eeec7eb3491a9ae2 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Tue, 17 Dec 2024 11:19:04 -0800 Subject: [PATCH 485/667] update update-nix.sh --- file_fixes_and_new_services/update-agenix.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/file_fixes_and_new_services/update-agenix.sh b/file_fixes_and_new_services/update-agenix.sh index 7217f6b..cae4f74 100755 --- a/file_fixes_and_new_services/update-agenix.sh +++ b/file_fixes_and_new_services/update-agenix.sh @@ -42,15 +42,15 @@ FILE=/var/lib/beacons/file_fixes_and_new_services/update-agenix/completed pushd /var/lib/agenix-secrets/ - /run/current-system/sw/bin/echo -n $(/run/current-system/sw/bin/cat /var/lib/secrets/wordpressdb) | EDITOR='cp /dev/stdin' 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/wordpressdb) | /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='cp /dev/stdin' 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/nextclouddb) | /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='cp /dev/stdin' 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/matrixdb) | /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='cp /dev/stdin' 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/turn) | /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='cp /dev/stdin' nix run github:ryantm/agenix -- -e matrix_reg_secret.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) | /run/current-system/sw/bin/nix run github:ryantm/agenix -- -e matrix_reg_secret.age -i /root/.ssh/agenix/agenix-secret-keys popd From a580f7fa0857d52e1b806618f7f14d896c286337 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Tue, 17 Dec 2024 11:25:29 -0800 Subject: [PATCH 486/667] update update-nix.sh --- file_fixes_and_new_services/update-agenix.sh | 31 ++++++++------------ 1 file changed, 13 insertions(+), 18 deletions(-) diff --git a/file_fixes_and_new_services/update-agenix.sh b/file_fixes_and_new_services/update-agenix.sh index cae4f74..f66523e 100755 --- a/file_fixes_and_new_services/update-agenix.sh +++ b/file_fixes_and_new_services/update-agenix.sh @@ -28,33 +28,28 @@ FILE=/var/lib/beacons/file_fixes_and_new_services/update-agenix/completed #### MAIN SCRIPT #### -/run/current-system/sw/bin/ssh root@localhost " - - /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 -" +/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 -/run/current-system/sw/bin/ssh root@localhost << 'EOF' +pushd /var/lib/agenix-secrets/ - pushd /var/lib/agenix-secrets/ + + /run/current-system/sw/bin/echo -n $(/run/current-system/sw/bin/cat /var/lib/secrets/wordpressdb) | /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/wordpressdb) | /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) | /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/nextclouddb) | /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) | /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/matrixdb) | /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) | /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/turn) | /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) | /run/current-system/sw/bin/nix run github:ryantm/agenix -- -e matrix_reg_secret.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) | /run/current-system/sw/bin/nix run github:ryantm/agenix -- -e matrix_reg_secret.age -i /root/.ssh/agenix/agenix-secret-keys - popd - -EOF +popd if [[ $? != 0 ]]; then From 4d18ac4e2ee501e282d3eb4de6f552138d66a70f Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Tue, 17 Dec 2024 11:29:22 -0800 Subject: [PATCH 487/667] updated update-nix.sh --- file_fixes_and_new_services/update-agenix.sh | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/file_fixes_and_new_services/update-agenix.sh b/file_fixes_and_new_services/update-agenix.sh index f66523e..90af48d 100755 --- a/file_fixes_and_new_services/update-agenix.sh +++ b/file_fixes_and_new_services/update-agenix.sh @@ -28,10 +28,14 @@ FILE=/var/lib/beacons/file_fixes_and_new_services/update-agenix/completed #### 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/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 From 3d52dbd78ce6735ad5d944c15dfb8772bf8088cc Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Tue, 17 Dec 2024 11:32:54 -0800 Subject: [PATCH 488/667] updated update-nix.sh --- file_fixes_and_new_services/update-agenix.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/file_fixes_and_new_services/update-agenix.sh b/file_fixes_and_new_services/update-agenix.sh index 90af48d..a6a9fa5 100755 --- a/file_fixes_and_new_services/update-agenix.sh +++ b/file_fixes_and_new_services/update-agenix.sh @@ -42,15 +42,15 @@ FILE=/var/lib/beacons/file_fixes_and_new_services/update-agenix/completed pushd /var/lib/agenix-secrets/ - /run/current-system/sw/bin/echo -n $(/run/current-system/sw/bin/cat /var/lib/secrets/wordpressdb) | /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/wordpressdb) | /EDITOR='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) | /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/nextclouddb) | EDITOR='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) | /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/matrixdb) | EDITOR='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) | /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/turn) | EDITOR='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) | /run/current-system/sw/bin/nix run github:ryantm/agenix -- -e matrix_reg_secret.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='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 From 9a3ddb725dc0b3c52627d69292fec4496fbc5174 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Tue, 17 Dec 2024 11:36:01 -0800 Subject: [PATCH 489/667] updated update-nix.sh --- file_fixes_and_new_services/update-agenix.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/file_fixes_and_new_services/update-agenix.sh b/file_fixes_and_new_services/update-agenix.sh index a6a9fa5..a85301b 100755 --- a/file_fixes_and_new_services/update-agenix.sh +++ b/file_fixes_and_new_services/update-agenix.sh @@ -42,15 +42,15 @@ FILE=/var/lib/beacons/file_fixes_and_new_services/update-agenix/completed pushd /var/lib/agenix-secrets/ - /run/current-system/sw/bin/echo -n $(/run/current-system/sw/bin/cat /var/lib/secrets/wordpressdb) | /EDITOR='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/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='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/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='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/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='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/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='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 + /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 From 9edd28f7fe51c8de72740c25d5ee397e4090b6be Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Tue, 17 Dec 2024 11:38:21 -0800 Subject: [PATCH 490/667] updated update-nix.sh --- file_fixes_and_new_services/update-agenix.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/file_fixes_and_new_services/update-agenix.sh b/file_fixes_and_new_services/update-agenix.sh index a85301b..f78ee32 100755 --- a/file_fixes_and_new_services/update-agenix.sh +++ b/file_fixes_and_new_services/update-agenix.sh @@ -42,7 +42,7 @@ FILE=/var/lib/beacons/file_fixes_and_new_services/update-agenix/completed 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/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 From 940521c8afd30138bf5911e5b340eb8e212fad5a Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Tue, 17 Dec 2024 11:39:59 -0800 Subject: [PATCH 491/667] updated update-nix.sh --- file_fixes_and_new_services/update-agenix.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/file_fixes_and_new_services/update-agenix.sh b/file_fixes_and_new_services/update-agenix.sh index f78ee32..3e73666 100755 --- a/file_fixes_and_new_services/update-agenix.sh +++ b/file_fixes_and_new_services/update-agenix.sh @@ -42,7 +42,7 @@ FILE=/var/lib/beacons/file_fixes_and_new_services/update-agenix/completed 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/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 From c9ef182ddad48c48e3d169a5e0eb93bc03f7bfa7 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Tue, 17 Dec 2024 12:21:50 -0800 Subject: [PATCH 492/667] paused update-nix.sh --- .../Sovran_SystemsOS_File_Fixes_And_New_Services.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/file_fixes_and_new_services/Sovran_SystemsOS_File_Fixes_And_New_Services.sh b/file_fixes_and_new_services/Sovran_SystemsOS_File_Fixes_And_New_Services.sh index 3e84dc5..c82882c 100755 --- a/file_fixes_and_new_services/Sovran_SystemsOS_File_Fixes_And_New_Services.sh +++ b/file_fixes_and_new_services/Sovran_SystemsOS_File_Fixes_And_New_Services.sh @@ -50,11 +50,11 @@ 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/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 +#/run/current-system/sw/bin/bash /home/free/Downloads/update-agenix.sh -rm -rf /home/free/Downloads/update-agenix.sh +#rm -rf /home/free/Downloads/update-agenix.sh #### REMOVAL OF MAIN SCRIPT #### From c852b27b4ef598787480921383500f6529c42a50 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Tue, 17 Dec 2024 14:48:21 -0800 Subject: [PATCH 493/667] resumed update-nix.sh --- .../Sovran_SystemsOS_File_Fixes_And_New_Services.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/file_fixes_and_new_services/Sovran_SystemsOS_File_Fixes_And_New_Services.sh b/file_fixes_and_new_services/Sovran_SystemsOS_File_Fixes_And_New_Services.sh index c82882c..3e84dc5 100755 --- a/file_fixes_and_new_services/Sovran_SystemsOS_File_Fixes_And_New_Services.sh +++ b/file_fixes_and_new_services/Sovran_SystemsOS_File_Fixes_And_New_Services.sh @@ -50,11 +50,11 @@ 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/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 +/run/current-system/sw/bin/bash /home/free/Downloads/update-agenix.sh -#rm -rf /home/free/Downloads/update-agenix.sh +rm -rf /home/free/Downloads/update-agenix.sh #### REMOVAL OF MAIN SCRIPT #### From bfe5c88c9bd6b7de66a2468457e314532a4728af Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Fri, 20 Dec 2024 12:22:49 -0800 Subject: [PATCH 494/667] updated cron --- configuration.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/configuration.nix b/configuration.nix index 6e55b83..5efa675 100755 --- a/configuration.nix +++ b/configuration.nix @@ -386,9 +386,12 @@ backup /etc/nix-bitcoin-secrets/ localhost/ services.cron = { enable = true; systemCronJobs = [ + "*/5 * * * * caddy /run/current-system/sw/bin/php -f /var/lib/www/nextcloud/cron.php" "*/15 * * * * root /run/current-system/sw/bin/bash /var/lib/njalla/njalla.sh" "*/15 * * * * root /run/current-system/sw/bin/bash /var/lib/external_ip/external_ip.sh" + "0 0 * * 0 /run/current-system/sw/bin/echo y | docker-user /run/current-system/sw/bin/docker system prune -a" + ]; }; From c25e91bc1b790de8e82cb26d6f1799f968201c6b Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Fri, 20 Dec 2024 12:24:43 -0800 Subject: [PATCH 495/667] updated php apcu --- configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/configuration.nix b/configuration.nix index 5efa675..d91b340 100755 --- a/configuration.nix +++ b/configuration.nix @@ -19,6 +19,7 @@ let opcache.max_accelerated_files=20000; post_max_size = 3G upload_max_filesize = 3G + apc.enable_cli=1 opcache.interned_strings_buffer = 64 redis.session.locking_enabled=1 redis.session.lock_retries=-1 From 5054e2f97e7f9b3f1471d0558d92a1e2970b6961 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Sun, 22 Dec 2024 23:21:08 -0800 Subject: [PATCH 496/667] added php worpress security --- configuration.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/configuration.nix b/configuration.nix index d91b340..a3f386d 100755 --- a/configuration.nix +++ b/configuration.nix @@ -8,6 +8,7 @@ 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 @@ -24,6 +25,8 @@ let redis.session.locking_enabled=1 redis.session.lock_retries=-1 redis.session.lock_wait_time=10000 + auto_prepend_file='/var/lib/www/wordpress/aios-bootstrap.php' + ''; }; in From 97a94534dc08c99dce5307b1f9e8d58e6925dc7b Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Sun, 22 Dec 2024 23:27:24 -0800 Subject: [PATCH 497/667] removed php worpress security --- configuration.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/configuration.nix b/configuration.nix index a3f386d..f38b14c 100755 --- a/configuration.nix +++ b/configuration.nix @@ -25,7 +25,6 @@ let redis.session.locking_enabled=1 redis.session.lock_retries=-1 redis.session.lock_wait_time=10000 - auto_prepend_file='/var/lib/www/wordpress/aios-bootstrap.php' ''; }; From 3097eefb2b980280ff6099fed174054b3ce23df9 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Mon, 23 Dec 2024 07:19:12 -0800 Subject: [PATCH 498/667] update php --- configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configuration.nix b/configuration.nix index f38b14c..8198f02 100755 --- a/configuration.nix +++ b/configuration.nix @@ -5,7 +5,7 @@ let personalization = import ./modules/personalization.nix; - custom-php = pkgs.php83.buildEnv { + custom-php = pkgs.php.buildEnv { extensions = { enabled, all }: enabled ++ (with all; [ bz2 apcu redis imagick memcached ]); extraConfig = '' From a6099cacb0da8d17713e5eb579e5e49643e827cd Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Mon, 23 Dec 2024 07:24:04 -0800 Subject: [PATCH 499/667] Nixpkgs update and Nix-Bitcoin Update --- flake.lock | 69 +++++++++++++++++++++++++++--------------------------- 1 file changed, 35 insertions(+), 34 deletions(-) diff --git a/flake.lock b/flake.lock index 92dc628..2e587f8 100755 --- a/flake.lock +++ b/flake.lock @@ -27,11 +27,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1730346198, - "narHash": "sha256-QpjT5tkA5144M0eF5TqU66S5V/QlohmkIeKndBxsHso=", + "lastModified": 1734553734, + "narHash": "sha256-vcd8PPHTzh9nANPaeuW2yCkg3Aok5eI1uf6fatODNi0=", "owner": "emmanuelrosa", "repo": "bisq-for-nixos", - "rev": "4bb117abed1712b961bd68a3607c102b8958e109", + "rev": "4994e7c201eacd50167285c6e68fdd104e542791", "type": "github" }, "original": { @@ -73,15 +73,16 @@ ] }, "locked": { - "lastModified": 1722175938, - "narHash": "sha256-HKyB4HD+NdX3T233bY31hm76v3/tdQBNeLLvopKbZeY=", + "lastModified": 1734005403, + "narHash": "sha256-vgh3TqfkFdnPxREBedw4MQehIDc3N8YyxBOB45n+AvU=", "owner": "erikarvstedt", "repo": "extra-container", - "rev": "37e7207ac9f857eedb58b208b9dc91cd6b24e651", + "rev": "f4de6c329b306a9d3a9798a30e060c166f781baa", "type": "github" }, "original": { "owner": "erikarvstedt", + "ref": "0.13", "repo": "extra-container", "type": "github" } @@ -208,11 +209,11 @@ ] }, "locked": { - "lastModified": 1734279981, - "narHash": "sha256-NdaCraHPp8iYMWzdXAt5Nv6sA3MUzlCiGiR586TCwo0=", + "lastModified": 1734797603, + "narHash": "sha256-ulZN7ps8nBV31SE+dwkDvKIzvN6hroRY8sYOT0w+E28=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "aa9f40c906904ebd83da78e7f328cd8aeaeae785", + "rev": "f0f0dc4920a903c3e08f5bdb9246bb572fcae498", "type": "github" }, "original": { @@ -272,11 +273,11 @@ ] }, "locked": { - "lastModified": 1734093295, - "narHash": "sha256-hSwgGpcZtdDsk1dnzA0xj5cNaHgN9A99hRF/mxMtwS4=", + "lastModified": 1734862405, + "narHash": "sha256-bXZJvUMJ2A6sIpYcCUAGjYCD5UDzmpmQCdmJSkPhleU=", "owner": "nix-community", "repo": "home-manager", - "rev": "66c5d8b62818ec4c1edb3e941f55ef78df8141a8", + "rev": "cb27edb5221d2f2920a03155f8becc502cf60e35", "type": "github" }, "original": { @@ -344,11 +345,11 @@ "nixpkgs-unstable": "nixpkgs-unstable" }, "locked": { - "lastModified": 1733172252, - "narHash": "sha256-J0nvKqLuVIQ/U1MkP8yl+Eacf9j/waWmlRpWuxqyndE=", + "lastModified": 1734508046, + "narHash": "sha256-JN/PFBOVqWKc76zSdOunYoG5Q0m8W4zfrEh3V4EOIuk=", "owner": "fort-nix", "repo": "nix-bitcoin", - "rev": "ff847d527cc95efc8449946ce01a4dd6cea00489", + "rev": "33dbb41d581b86decf421cb3835c426d557e0e9c", "type": "github" }, "original": { @@ -397,11 +398,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1732997066, - "narHash": "sha256-9Vvu3a1ep1LB6F/kVE2hHH2HQzhSFtUyJYiJRkUkC4Q=", + "lastModified": 1734126203, + "narHash": "sha256-0XovF7BYP50rTD2v4r55tR5MuBLet7q4xIz6Rgh3BBU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "33b9d57c656e65a9c88c5f34e4eb00b83e2b0ca9", + "rev": "71a6392e367b08525ee710a93af2e80083b5b3e2", "type": "github" }, "original": { @@ -429,27 +430,27 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1732749044, - "narHash": "sha256-T38FQOg0BV5M8FN1712fovzNakSOENEYs+CSkg31C9Y=", + "lastModified": 1734323986, + "narHash": "sha256-m/lh6hYMIWDYHCAsn81CDAiXoT3gmxXI9J987W5tZrE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0c5b4ecbed5b155b705336aa96d878e55acd8685", + "rev": "394571358ce82dff7411395829aa6a3aad45b907", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-24.05", + "ref": "nixos-24.11", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_4": { "locked": { - "lastModified": 1734119587, - "narHash": "sha256-AKU6qqskl0yf2+JdRdD0cfxX4b9x3KKV5RqA6wijmPM=", + "lastModified": 1734649271, + "narHash": "sha256-4EVBRhOjMDuGtMaofAIqzJbg4Ql7Ai0PSeuVZTHjyKQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3566ab7246670a43abd2ffa913cc62dad9cdf7d5", + "rev": "d70bd19e0a38ad4790d3913bf08fcbfc9eeca507", "type": "github" }, "original": { @@ -461,11 +462,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1734119587, - "narHash": "sha256-AKU6qqskl0yf2+JdRdD0cfxX4b9x3KKV5RqA6wijmPM=", + "lastModified": 1734649271, + "narHash": "sha256-4EVBRhOjMDuGtMaofAIqzJbg4Ql7Ai0PSeuVZTHjyKQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3566ab7246670a43abd2ffa913cc62dad9cdf7d5", + "rev": "d70bd19e0a38ad4790d3913bf08fcbfc9eeca507", "type": "github" }, "original": { @@ -488,11 +489,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1734368549, - "narHash": "sha256-D8LYUU+IWbpmyjOAKEnKVOhd7Qfe7q+DvUNZTYoitKY=", + "lastModified": 1734956286, + "narHash": "sha256-8h7Fs6S+Ftg3NNmwT/KkYWI9epUNPCMPn56QFXOfmTM=", "owner": "nix-community", "repo": "nixvim", - "rev": "6c30476a4d5f761149945a65e74179f4492b1ea6", + "rev": "8938e09db14d510dcc2f266e8b2e738ee527d386", "type": "github" }, "original": { @@ -601,11 +602,11 @@ ] }, "locked": { - "lastModified": 1733761991, - "narHash": "sha256-s4DalCDepD22jtKL5Nw6f4LP5UwoMcPzPZgHWjAfqbQ=", + "lastModified": 1734704479, + "narHash": "sha256-MMi74+WckoyEWBRcg/oaGRvXC9BVVxDZNRMpL+72wBI=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "0ce9d149d99bc383d1f2d85f31f6ebd146e46085", + "rev": "65712f5af67234dad91a5a4baee986a8b62dbf8f", "type": "github" }, "original": { From b05edb922c78f0dd0ad92fe93a368dbba6871062 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Mon, 23 Dec 2024 08:42:54 -0800 Subject: [PATCH 500/667] updated custom-add-ons.md --- custom-add-ons.md | 3 --- 1 file changed, 3 deletions(-) diff --git a/custom-add-ons.md b/custom-add-ons.md index f06da1a..5d94690 100644 --- a/custom-add-ons.md +++ b/custom-add-ons.md @@ -96,11 +96,8 @@ systemd.services.jitsi-videobridge-helper = { ffmpeg = { - resolution = "1280x720"; - framerate = 30; video-encode-preset = "ultrafast"; h264-constant-rate-factor = 40; - }; }; From 80588c39d14c858a573d940404c923fdf7f94974 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Sun, 19 Jan 2025 18:40:57 -0800 Subject: [PATCH 501/667] updated flake.nix with new inputs --- configuration.nix | 2 +- flake.nix | 40 ++++++++++++++++++++++++++++++++---- modules/bitcoinecosystem.nix | 1 + 3 files changed, 38 insertions(+), 5 deletions(-) diff --git a/configuration.nix b/configuration.nix index 8198f02..af2e13e 100755 --- a/configuration.nix +++ b/configuration.nix @@ -228,7 +228,7 @@ in ####### CADDY ####### services.caddy = { enable = true; - package = pkgs.caddy; + package = pkgs.stable.caddy; user = "caddy"; group = "root"; email = "${personalization.caddy_email_for_acme}"; diff --git a/flake.nix b/flake.nix index aff394e..442cb8a 100755 --- a/flake.nix +++ b/flake.nix @@ -15,18 +15,50 @@ bisq1.url = "github:emmanuelrosa/bisq-for-nixos"; + nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-24.11"; + + btcpayserver-new.url = "github:Dreaming-Codes/nixpkgs/update-btcpayser"; + + + }; - outputs = { self, nixpkgs, nix-bitcoin, nixvim, agenix, bisq1, ... }: { + outputs = { self, nixpkgs, nix-bitcoin, nixvim, agenix, bisq1, nixpkgs-stable, btcpayserver-new, ... }: + + let + system = "x86_64-linux"; + + overlay-stable = final: prev: { + + stable = import nixpkgs-stable { + inherit system; + config.allowunfree = true; + + }; + + }; + + overlay-btcpaynew = final: prev: { + new-btcpaynew = import btcpayserver-new { + inhert system; + config.allowunfree = true; + }; + }; + in + + { - nixosConfigurations.nixos = nixpkgs.lib.nixosSystem { + nixosConfigurations.nixos = nixpkgs.lib.nixosSystem { - system ="x86_64-linux"; - + inherit systems; + + }; nixosModules.Sovran_SystemsOS = { pkgs, ... }: { + ({ config, pkgs, ... }: { nixpkgs.overlays = [ overlay-stable overlay-btcpaynew ]; }) + imports = [ ./configuration.nix diff --git a/modules/bitcoinecosystem.nix b/modules/bitcoinecosystem.nix index 040f277..919c205 100755 --- a/modules/bitcoinecosystem.nix +++ b/modules/bitcoinecosystem.nix @@ -132,6 +132,7 @@ experimental-offers services.btcpayserver = { enable = true; + package = pkgs.new-btcpaynew.btcpayserver; }; services.btcpayserver.lightningBackend = "lnd"; From 4c8cb5c821df53363f6c402571eb721e783ac82a Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Sun, 19 Jan 2025 18:43:31 -0800 Subject: [PATCH 502/667] updated flake.nix typo --- flake.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 442cb8a..5b67800 100755 --- a/flake.nix +++ b/flake.nix @@ -39,8 +39,9 @@ }; overlay-btcpaynew = final: prev: { + new-btcpaynew = import btcpayserver-new { - inhert system; + inherit system; config.allowunfree = true; }; }; From 0251c1b56c33da87c05e3fd592616391daf8b718 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Sun, 19 Jan 2025 18:45:25 -0800 Subject: [PATCH 503/667] updated flake.nix udpdate --- flake.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/flake.nix b/flake.nix index 5b67800..70e0977 100755 --- a/flake.nix +++ b/flake.nix @@ -57,11 +57,11 @@ }; nixosModules.Sovran_SystemsOS = { pkgs, ... }: { - - ({ config, pkgs, ... }: { nixpkgs.overlays = [ overlay-stable overlay-btcpaynew ]; }) imports = [ + ({ config, pkgs, ... }: { nixpkgs.overlays = [ overlay-stable overlay-btcpaynew ]; }) + ./configuration.nix nix-bitcoin.nixosModules.default From b903aac672029f03d1ee4fa14c6e39c3ad5c5ff7 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Sun, 19 Jan 2025 18:46:14 -0800 Subject: [PATCH 504/667] updated flake.nix typo2 --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 70e0977..8a12a76 100755 --- a/flake.nix +++ b/flake.nix @@ -51,7 +51,7 @@ nixosConfigurations.nixos = nixpkgs.lib.nixosSystem { - inherit systems; + inherit system; }; From b3c5a25e64aa46bec0c9ca41911221e73787ccaf Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Sun, 19 Jan 2025 18:47:37 -0800 Subject: [PATCH 505/667] updated flake.nix typo3 --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 8a12a76..20d4f24 100755 --- a/flake.nix +++ b/flake.nix @@ -17,7 +17,7 @@ nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-24.11"; - btcpayserver-new.url = "github:Dreaming-Codes/nixpkgs/update-btcpayser"; + btcpayserver-new.url = "github:Dreaming-Codes/nixpkgs/update-btcpayserver"; From 8aab7c73001f3654bcb331c982c6c6ce802f0e9b Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Sun, 19 Jan 2025 18:55:41 -0800 Subject: [PATCH 506/667] updated nextcloud-push --- modules/nextcloud_hpbs_default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/nextcloud_hpbs_default.nix b/modules/nextcloud_hpbs_default.nix index 9a23c81..eca57ae 100644 --- a/modules/nextcloud_hpbs_default.nix +++ b/modules/nextcloud_hpbs_default.nix @@ -1,17 +1,17 @@ { lib, fetchFromGitHub, nixosTests, rustPlatform }: -rustPlatform.buildRustPackage rec { +rustPlatform.b:uildRustPackage rec { pname = "notify_push"; - version = "0.7.0"; + version = "1.0.0"; src = fetchFromGitHub { owner = "nextcloud"; repo = pname; rev = "v${version}"; - hash = "sha256-QHVWiH6qkwQay0wffoyDUyVxgxzNp10ieYIsdqoEdCM="; + hash = "sha256-Y71o+ARi/YB2BRDfEyORbrA9HPvsUlWdh5UjM8hzmcA="; }; - cargoHash = "sha256-HwE/ql8rJcGIINy+hNnpaTFEJqbmuUDrIvVI8kCpfQ8="; + cargoHash = "sha256-Mk+0LKP55Um5YiCx2O49rUZPwaXtKFnWtRC+WPGBadE="; passthru = rec { test_client = rustPlatform.buildRustPackage { From c29da753bf41adab6a1024901b622dc1a351314c Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Sun, 19 Jan 2025 18:58:59 -0800 Subject: [PATCH 507/667] updated nextcloud-push typo --- modules/nextcloud_hpbs_default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/nextcloud_hpbs_default.nix b/modules/nextcloud_hpbs_default.nix index eca57ae..bfa375f 100644 --- a/modules/nextcloud_hpbs_default.nix +++ b/modules/nextcloud_hpbs_default.nix @@ -1,6 +1,6 @@ { lib, fetchFromGitHub, nixosTests, rustPlatform }: -rustPlatform.b:uildRustPackage rec { +rustPlatform.buildRustPackage rec { pname = "notify_push"; version = "1.0.0"; From 3df323793571d977d6cd711c821b49da21b22cdf Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Sun, 19 Jan 2025 19:09:12 -0800 Subject: [PATCH 508/667] updated README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 16700c7..feca799 100755 --- a/README.md +++ b/README.md @@ -35,7 +35,7 @@ https://matrix.to/#/%23DIY_Sovran_SystemsOS:anarchyislove.xyz ## -Created, Handcrafted, and Headquartered in Southern California – 2022-2024 🏖️. +Created, Handcrafted, and Headquartered in Southern California – 2022-2025 🏖️. All Open Source Software Used Falls Under Its Specific Open Source License. From a12dc153b68fb89d87fa3e90b5118de8b593f99a Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Sun, 19 Jan 2025 19:16:49 -0800 Subject: [PATCH 509/667] Update Nixpkgs and added BTCPayserver 2.0.5 --- flake.lock | 104 ++++++++++++++++++++++++++++++++++------------------- 1 file changed, 67 insertions(+), 37 deletions(-) diff --git a/flake.lock b/flake.lock index 2e587f8..669e71a 100755 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1723293904, - "narHash": "sha256-b+uqzj+Wa6xgMS9aNbX4I+sXeb5biPDi39VgvSFqFvU=", + "lastModified": 1736955230, + "narHash": "sha256-uenf8fv2eG5bKM8C/UvFaiJMZ4IpUFaQxk9OH5t/1gA=", "owner": "ryantm", "repo": "agenix", - "rev": "f6291c5935fdc4e0bef208cfc0dcab7e3f7a1c41", + "rev": "e600439ec4c273cf11e06fe4d9d906fb98fa097c", "type": "github" }, "original": { @@ -40,6 +40,22 @@ "type": "github" } }, + "btcpayserver-new": { + "locked": { + "lastModified": 1736549221, + "narHash": "sha256-T9CEfahq/DAQ74Gx9GuIaEwoavA2+aPhFHMY72Q4gsk=", + "owner": "Dreaming-Codes", + "repo": "nixpkgs", + "rev": "ea5ae3db9b3ccae0d8de77553a0939decddb6361", + "type": "github" + }, + "original": { + "owner": "Dreaming-Codes", + "ref": "update-btcpayserver", + "repo": "nixpkgs", + "type": "github" + } + }, "devshell": { "inputs": { "nixpkgs": [ @@ -48,11 +64,11 @@ ] }, "locked": { - "lastModified": 1728330715, - "narHash": "sha256-xRJ2nPOXb//u1jaBnDP56M7v5ldavjbtR6lfGqSvcKg=", + "lastModified": 1735644329, + "narHash": "sha256-tO3HrHriyLvipc4xr+Ewtdlo7wM1OjXNjlWRgmM7peY=", "owner": "numtide", "repo": "devshell", - "rev": "dd6b80932022cea34a019e2bb32f6fa9e494dfef", + "rev": "f7795ede5b02664b57035b3b757876703e2c3eac", "type": "github" }, "original": { @@ -125,11 +141,11 @@ ] }, "locked": { - "lastModified": 1733312601, - "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", + "lastModified": 1736143030, + "narHash": "sha256-+hu54pAoLDEZT9pjHlqL9DNzWz0NbUn8NEAHP7PQPzU=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", + "rev": "b905f6fc23a9051a6e1b741e1438dbfc0634c6de", "type": "github" }, "original": { @@ -202,18 +218,14 @@ "nixpkgs": [ "nixvim", "nixpkgs" - ], - "nixpkgs-stable": [ - "nixvim", - "nixpkgs" ] }, "locked": { - "lastModified": 1734797603, - "narHash": "sha256-ulZN7ps8nBV31SE+dwkDvKIzvN6hroRY8sYOT0w+E28=", + "lastModified": 1737043064, + "narHash": "sha256-I/OuxGwXwRi5gnFPsyCvVR+IfFstA+QXEpHu1hvsgD8=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "f0f0dc4920a903c3e08f5bdb9246bb572fcae498", + "rev": "94ee657f6032d913fe0ef49adaa743804635b0bb", "type": "github" }, "original": { @@ -273,11 +285,11 @@ ] }, "locked": { - "lastModified": 1734862405, - "narHash": "sha256-bXZJvUMJ2A6sIpYcCUAGjYCD5UDzmpmQCdmJSkPhleU=", + "lastModified": 1737075266, + "narHash": "sha256-u1gk5I1an975FOAMMdS6oBKnSIsZza5ZKhaeBZAskVo=", "owner": "nix-community", "repo": "home-manager", - "rev": "cb27edb5221d2f2920a03155f8becc502cf60e35", + "rev": "12851ae7467bad8ef422b20806ab4d6d81e12d29", "type": "github" }, "original": { @@ -367,11 +379,11 @@ ] }, "locked": { - "lastModified": 1733570843, - "narHash": "sha256-sQJAxY1TYWD1UyibN/FnN97paTFuwBw3Vp3DNCyKsMk=", + "lastModified": 1736819234, + "narHash": "sha256-deQVtIH4UJueELJqluAICUtX7OosD9paTP+5FgbiSwI=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "a35b08d09efda83625bef267eb24347b446c80b8", + "rev": "bd921223ba7cdac346477d7ea5204d6f4736fcc6", "type": "github" }, "original": { @@ -396,6 +408,22 @@ "type": "github" } }, + "nixpkgs-stable": { + "locked": { + "lastModified": 1737299813, + "narHash": "sha256-Qw2PwmkXDK8sPQ5YQ/y/icbQ+TYgbxfjhgnkNJyT1X8=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "107d5ef05c0b1119749e381451389eded30fb0d5", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-24.11", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs-unstable": { "locked": { "lastModified": 1734126203, @@ -446,11 +474,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1734649271, - "narHash": "sha256-4EVBRhOjMDuGtMaofAIqzJbg4Ql7Ai0PSeuVZTHjyKQ=", + "lastModified": 1737062831, + "narHash": "sha256-Tbk1MZbtV2s5aG+iM99U8FqwxU/YNArMcWAv6clcsBc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d70bd19e0a38ad4790d3913bf08fcbfc9eeca507", + "rev": "5df43628fdf08d642be8ba5b3625a6c70731c19c", "type": "github" }, "original": { @@ -462,11 +490,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1734649271, - "narHash": "sha256-4EVBRhOjMDuGtMaofAIqzJbg4Ql7Ai0PSeuVZTHjyKQ=", + "lastModified": 1736883708, + "narHash": "sha256-uQ+NQ0/xYU0N1CnXsa2zghgNaOPxWpMJXSUJJ9W7140=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d70bd19e0a38ad4790d3913bf08fcbfc9eeca507", + "rev": "eb62e6aa39ea67e0b8018ba8ea077efe65807dc8", "type": "github" }, "original": { @@ -489,11 +517,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1734956286, - "narHash": "sha256-8h7Fs6S+Ftg3NNmwT/KkYWI9epUNPCMPn56QFXOfmTM=", + "lastModified": 1737308837, + "narHash": "sha256-Sro74XNFgGgIIW4uo/YSVGafZhKnZwPLJNBvMsgpl4k=", "owner": "nix-community", "repo": "nixvim", - "rev": "8938e09db14d510dcc2f266e8b2e738ee527d386", + "rev": "8fb2fe22c237b25b8af346870e126fdaeaff688b", "type": "github" }, "original": { @@ -512,11 +540,11 @@ ] }, "locked": { - "lastModified": 1733773348, - "narHash": "sha256-Y47y+LesOCkJaLvj+dI/Oa6FAKj/T9sKVKDXLNsViPw=", + "lastModified": 1735854821, + "narHash": "sha256-Iv59gMDZajNfezTO0Fw6LHE7uKAShxbvMidmZREit7c=", "owner": "NuschtOS", "repo": "search", - "rev": "3051be7f403bff1d1d380e4612f0c70675b44fc9", + "rev": "836908e3bddd837ae0f13e215dd48767aee355f0", "type": "github" }, "original": { @@ -529,8 +557,10 @@ "inputs": { "agenix": "agenix", "bisq1": "bisq1", + "btcpayserver-new": "btcpayserver-new", "nix-bitcoin": "nix-bitcoin", "nixpkgs": "nixpkgs_4", + "nixpkgs-stable": "nixpkgs-stable", "nixvim": "nixvim" } }, @@ -602,11 +632,11 @@ ] }, "locked": { - "lastModified": 1734704479, - "narHash": "sha256-MMi74+WckoyEWBRcg/oaGRvXC9BVVxDZNRMpL+72wBI=", + "lastModified": 1737054102, + "narHash": "sha256-saLiCRQ5RtdTnznT/fja7GxcYRAzeY3k8S+IF/2s/2A=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "65712f5af67234dad91a5a4baee986a8b62dbf8f", + "rev": "97871d416166803134ba64597a1006f3f670fbde", "type": "github" }, "original": { From 8ba23a25358c0ab9fb2ac13f15048c0f0f6b39c1 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Sun, 19 Jan 2025 19:42:21 -0800 Subject: [PATCH 510/667] updated configuration.nix --- configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configuration.nix b/configuration.nix index af2e13e..b5460e0 100755 --- a/configuration.nix +++ b/configuration.nix @@ -88,7 +88,7 @@ in systemd.enableEmergencyMode = false; # Enable sound with pipewire. - hardware.pulseaudio.enable = false; + services.pulseaudio.enable = false; security.rtkit.enable = true; services.pipewire = { enable = true; From 9abe32c19be273837b13e539e3c4d8771d64b33d Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Mon, 10 Feb 2025 14:57:07 -0800 Subject: [PATCH 511/667] removed HBPS Nextcloud and old settings --- configuration.nix | 8 -------- 1 file changed, 8 deletions(-) diff --git a/configuration.nix b/configuration.nix index b5460e0..b7c4384 100755 --- a/configuration.nix +++ b/configuration.nix @@ -129,18 +129,11 @@ in # Allow unfree packages nixpkgs.config.allowUnfree = true; - - - nixpkgs.config.permittedInsecurePackages = [ - "jitsi-meet-1.0.8043" - ]; - # List packages installed in system profile. To search, run: # $ nix search wget environment.systemPackages = with pkgs; [ (callPackage ./modules/systemd-manager_sovran_systems.nix {}) - (callPackage ./modules/nextcloud_hpbs_default.nix {}) git wget fish @@ -228,7 +221,6 @@ in ####### CADDY ####### services.caddy = { enable = true; - package = pkgs.stable.caddy; user = "caddy"; group = "root"; email = "${personalization.caddy_email_for_acme}"; From 7448de24b7b628c5e91c523c22830c951ea9d9d9 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Mon, 10 Feb 2025 15:01:48 -0800 Subject: [PATCH 512/667] added jitsi-meet allow --- configuration.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/configuration.nix b/configuration.nix index b7c4384..35ba463 100755 --- a/configuration.nix +++ b/configuration.nix @@ -129,6 +129,11 @@ in # Allow unfree packages nixpkgs.config.allowUnfree = true; + + nixpkgs.config.permittedInsecurePackages = [ + + "jitsi-meet-1.0.8043" + ]; # List packages installed in system profile. To search, run: # $ nix search wget From c86edf0a90b4d0325517713e4a2cbae1a4eee15f Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Mon, 10 Feb 2025 15:10:25 -0800 Subject: [PATCH 513/667] Update Nixpkgs --- flake.lock | 90 +++++++++++++++++++++++++++--------------------------- 1 file changed, 45 insertions(+), 45 deletions(-) diff --git a/flake.lock b/flake.lock index 669e71a..1cb7ca8 100755 --- a/flake.lock +++ b/flake.lock @@ -121,12 +121,12 @@ }, "flake-compat_2": { "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "revCount": 57, + "lastModified": 1733328505, + "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", + "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", + "revCount": 69, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.0.1/018afb31-abd1-7bff-a5e4-cff7e18efb7a/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.1.0/01948eb7-9cba-704f-bbf3-3fa956735b52/source.tar.gz" }, "original": { "type": "tarball", @@ -141,11 +141,11 @@ ] }, "locked": { - "lastModified": 1736143030, - "narHash": "sha256-+hu54pAoLDEZT9pjHlqL9DNzWz0NbUn8NEAHP7PQPzU=", + "lastModified": 1738453229, + "narHash": "sha256-7H9XgNiGLKN1G1CgRh0vUL4AheZSYzPm+zmZ7vxbJdo=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "b905f6fc23a9051a6e1b741e1438dbfc0634c6de", + "rev": "32ea77a06711b758da0ad9bd6a844c5740a87abd", "type": "github" }, "original": { @@ -221,11 +221,11 @@ ] }, "locked": { - "lastModified": 1737043064, - "narHash": "sha256-I/OuxGwXwRi5gnFPsyCvVR+IfFstA+QXEpHu1hvsgD8=", + "lastModified": 1737465171, + "narHash": "sha256-R10v2hoJRLq8jcL4syVFag7nIGE7m13qO48wRIukWNg=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "94ee657f6032d913fe0ef49adaa743804635b0bb", + "rev": "9364dc02281ce2d37a1f55b6e51f7c0f65a75f17", "type": "github" }, "original": { @@ -285,11 +285,11 @@ ] }, "locked": { - "lastModified": 1737075266, - "narHash": "sha256-u1gk5I1an975FOAMMdS6oBKnSIsZza5ZKhaeBZAskVo=", + "lastModified": 1738878603, + "narHash": "sha256-fmhq8B3MvQLawLbMO+LWLcdC2ftLMmwSk+P29icJ3tE=", "owner": "nix-community", "repo": "home-manager", - "rev": "12851ae7467bad8ef422b20806ab4d6d81e12d29", + "rev": "433799271274c9f2ab520a49527ebfe2992dcfbd", "type": "github" }, "original": { @@ -357,11 +357,11 @@ "nixpkgs-unstable": "nixpkgs-unstable" }, "locked": { - "lastModified": 1734508046, - "narHash": "sha256-JN/PFBOVqWKc76zSdOunYoG5Q0m8W4zfrEh3V4EOIuk=", + "lastModified": 1737481937, + "narHash": "sha256-FJ0ATgYWavH3ZeA0ofTEMS+22HqYN2Lqu3G6IsqbKIg=", "owner": "fort-nix", "repo": "nix-bitcoin", - "rev": "33dbb41d581b86decf421cb3835c426d557e0e9c", + "rev": "dc4d14e07324e43b8773e3eb5eb2a10c6b469287", "type": "github" }, "original": { @@ -379,11 +379,11 @@ ] }, "locked": { - "lastModified": 1736819234, - "narHash": "sha256-deQVtIH4UJueELJqluAICUtX7OosD9paTP+5FgbiSwI=", + "lastModified": 1738743987, + "narHash": "sha256-O3bnAfsObto6l2tQOmQlrO6Z2kD6yKwOWfs7pA0CpOc=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "bd921223ba7cdac346477d7ea5204d6f4736fcc6", + "rev": "ae406c04577ff9a64087018c79b4fdc02468c87c", "type": "github" }, "original": { @@ -410,11 +410,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1737299813, - "narHash": "sha256-Qw2PwmkXDK8sPQ5YQ/y/icbQ+TYgbxfjhgnkNJyT1X8=", + "lastModified": 1739055578, + "narHash": "sha256-2MhC2Bgd06uI1A0vkdNUyDYsMD0SLNGKtD8600mZ69A=", "owner": "nixos", "repo": "nixpkgs", - "rev": "107d5ef05c0b1119749e381451389eded30fb0d5", + "rev": "a45fa362d887f4d4a7157d95c28ca9ce2899b70e", "type": "github" }, "original": { @@ -426,11 +426,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1734126203, - "narHash": "sha256-0XovF7BYP50rTD2v4r55tR5MuBLet7q4xIz6Rgh3BBU=", + "lastModified": 1737370608, + "narHash": "sha256-hFA6SmioeqvGW/XvZa9bxniAeulksCOcj3kokdNT/YE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "71a6392e367b08525ee710a93af2e80083b5b3e2", + "rev": "300081d0cc72df578b02d914df941b8ec62240e6", "type": "github" }, "original": { @@ -458,11 +458,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1734323986, - "narHash": "sha256-m/lh6hYMIWDYHCAsn81CDAiXoT3gmxXI9J987W5tZrE=", + "lastModified": 1737299813, + "narHash": "sha256-Qw2PwmkXDK8sPQ5YQ/y/icbQ+TYgbxfjhgnkNJyT1X8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "394571358ce82dff7411395829aa6a3aad45b907", + "rev": "107d5ef05c0b1119749e381451389eded30fb0d5", "type": "github" }, "original": { @@ -474,11 +474,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1737062831, - "narHash": "sha256-Tbk1MZbtV2s5aG+iM99U8FqwxU/YNArMcWAv6clcsBc=", + "lastModified": 1739020877, + "narHash": "sha256-mIvECo/NNdJJ/bXjNqIh8yeoSjVLAuDuTUzAo7dzs8Y=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5df43628fdf08d642be8ba5b3625a6c70731c19c", + "rev": "a79cfe0ebd24952b580b1cf08cd906354996d547", "type": "github" }, "original": { @@ -490,16 +490,16 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1736883708, - "narHash": "sha256-uQ+NQ0/xYU0N1CnXsa2zghgNaOPxWpMJXSUJJ9W7140=", + "lastModified": 1738797219, + "narHash": "sha256-KRwX9Z1XavpgeSDVM/THdFd6uH8rNm/6R+7kIbGa+2s=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "eb62e6aa39ea67e0b8018ba8ea077efe65807dc8", + "rev": "1da52dd49a127ad74486b135898da2cef8c62665", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } @@ -517,11 +517,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1737308837, - "narHash": "sha256-Sro74XNFgGgIIW4uo/YSVGafZhKnZwPLJNBvMsgpl4k=", + "lastModified": 1739121491, + "narHash": "sha256-BEmyAozR3Pc2qwPtC4rgUglzi3cw4nv4fXEY23NxOrQ=", "owner": "nix-community", "repo": "nixvim", - "rev": "8fb2fe22c237b25b8af346870e126fdaeaff688b", + "rev": "13341a4c1238b7974e7bad9c7a6d5c51ca3cf81a", "type": "github" }, "original": { @@ -540,11 +540,11 @@ ] }, "locked": { - "lastModified": 1735854821, - "narHash": "sha256-Iv59gMDZajNfezTO0Fw6LHE7uKAShxbvMidmZREit7c=", + "lastModified": 1738508923, + "narHash": "sha256-4DaDrQDAIxlWhTjH6h/+xfG05jt3qDZrZE/7zDLQaS4=", "owner": "NuschtOS", "repo": "search", - "rev": "836908e3bddd837ae0f13e215dd48767aee355f0", + "rev": "86e2038290859006e05ca7201425ea5b5de4aecb", "type": "github" }, "original": { @@ -632,11 +632,11 @@ ] }, "locked": { - "lastModified": 1737054102, - "narHash": "sha256-saLiCRQ5RtdTnznT/fja7GxcYRAzeY3k8S+IF/2s/2A=", + "lastModified": 1738680491, + "narHash": "sha256-8X7tR3kFGkE7WEF5EXVkt4apgaN85oHZdoTGutCFs6I=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "97871d416166803134ba64597a1006f3f670fbde", + "rev": "64dbb922d51a42c0ced6a7668ca008dded61c483", "type": "github" }, "original": { From 798650c57bb70e6105441c7adaced0ec062c05a4 Mon Sep 17 00:00:00 2001 From: naturallaw777 Date: Mon, 10 Feb 2025 15:14:43 -0800 Subject: [PATCH 514/667] revert c86edf0a90b4d0325517713e4a2cbae1a4eee15f revert Update Nixpkgs --- flake.lock | 90 +++++++++++++++++++++++++++--------------------------- 1 file changed, 45 insertions(+), 45 deletions(-) diff --git a/flake.lock b/flake.lock index 1cb7ca8..669e71a 100755 --- a/flake.lock +++ b/flake.lock @@ -121,12 +121,12 @@ }, "flake-compat_2": { "locked": { - "lastModified": 1733328505, - "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", - "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", - "revCount": 69, + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "revCount": 57, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.1.0/01948eb7-9cba-704f-bbf3-3fa956735b52/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.0.1/018afb31-abd1-7bff-a5e4-cff7e18efb7a/source.tar.gz" }, "original": { "type": "tarball", @@ -141,11 +141,11 @@ ] }, "locked": { - "lastModified": 1738453229, - "narHash": "sha256-7H9XgNiGLKN1G1CgRh0vUL4AheZSYzPm+zmZ7vxbJdo=", + "lastModified": 1736143030, + "narHash": "sha256-+hu54pAoLDEZT9pjHlqL9DNzWz0NbUn8NEAHP7PQPzU=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "32ea77a06711b758da0ad9bd6a844c5740a87abd", + "rev": "b905f6fc23a9051a6e1b741e1438dbfc0634c6de", "type": "github" }, "original": { @@ -221,11 +221,11 @@ ] }, "locked": { - "lastModified": 1737465171, - "narHash": "sha256-R10v2hoJRLq8jcL4syVFag7nIGE7m13qO48wRIukWNg=", + "lastModified": 1737043064, + "narHash": "sha256-I/OuxGwXwRi5gnFPsyCvVR+IfFstA+QXEpHu1hvsgD8=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "9364dc02281ce2d37a1f55b6e51f7c0f65a75f17", + "rev": "94ee657f6032d913fe0ef49adaa743804635b0bb", "type": "github" }, "original": { @@ -285,11 +285,11 @@ ] }, "locked": { - "lastModified": 1738878603, - "narHash": "sha256-fmhq8B3MvQLawLbMO+LWLcdC2ftLMmwSk+P29icJ3tE=", + "lastModified": 1737075266, + "narHash": "sha256-u1gk5I1an975FOAMMdS6oBKnSIsZza5ZKhaeBZAskVo=", "owner": "nix-community", "repo": "home-manager", - "rev": "433799271274c9f2ab520a49527ebfe2992dcfbd", + "rev": "12851ae7467bad8ef422b20806ab4d6d81e12d29", "type": "github" }, "original": { @@ -357,11 +357,11 @@ "nixpkgs-unstable": "nixpkgs-unstable" }, "locked": { - "lastModified": 1737481937, - "narHash": "sha256-FJ0ATgYWavH3ZeA0ofTEMS+22HqYN2Lqu3G6IsqbKIg=", + "lastModified": 1734508046, + "narHash": "sha256-JN/PFBOVqWKc76zSdOunYoG5Q0m8W4zfrEh3V4EOIuk=", "owner": "fort-nix", "repo": "nix-bitcoin", - "rev": "dc4d14e07324e43b8773e3eb5eb2a10c6b469287", + "rev": "33dbb41d581b86decf421cb3835c426d557e0e9c", "type": "github" }, "original": { @@ -379,11 +379,11 @@ ] }, "locked": { - "lastModified": 1738743987, - "narHash": "sha256-O3bnAfsObto6l2tQOmQlrO6Z2kD6yKwOWfs7pA0CpOc=", + "lastModified": 1736819234, + "narHash": "sha256-deQVtIH4UJueELJqluAICUtX7OosD9paTP+5FgbiSwI=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "ae406c04577ff9a64087018c79b4fdc02468c87c", + "rev": "bd921223ba7cdac346477d7ea5204d6f4736fcc6", "type": "github" }, "original": { @@ -410,11 +410,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1739055578, - "narHash": "sha256-2MhC2Bgd06uI1A0vkdNUyDYsMD0SLNGKtD8600mZ69A=", + "lastModified": 1737299813, + "narHash": "sha256-Qw2PwmkXDK8sPQ5YQ/y/icbQ+TYgbxfjhgnkNJyT1X8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a45fa362d887f4d4a7157d95c28ca9ce2899b70e", + "rev": "107d5ef05c0b1119749e381451389eded30fb0d5", "type": "github" }, "original": { @@ -426,11 +426,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1737370608, - "narHash": "sha256-hFA6SmioeqvGW/XvZa9bxniAeulksCOcj3kokdNT/YE=", + "lastModified": 1734126203, + "narHash": "sha256-0XovF7BYP50rTD2v4r55tR5MuBLet7q4xIz6Rgh3BBU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "300081d0cc72df578b02d914df941b8ec62240e6", + "rev": "71a6392e367b08525ee710a93af2e80083b5b3e2", "type": "github" }, "original": { @@ -458,11 +458,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1737299813, - "narHash": "sha256-Qw2PwmkXDK8sPQ5YQ/y/icbQ+TYgbxfjhgnkNJyT1X8=", + "lastModified": 1734323986, + "narHash": "sha256-m/lh6hYMIWDYHCAsn81CDAiXoT3gmxXI9J987W5tZrE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "107d5ef05c0b1119749e381451389eded30fb0d5", + "rev": "394571358ce82dff7411395829aa6a3aad45b907", "type": "github" }, "original": { @@ -474,11 +474,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1739020877, - "narHash": "sha256-mIvECo/NNdJJ/bXjNqIh8yeoSjVLAuDuTUzAo7dzs8Y=", + "lastModified": 1737062831, + "narHash": "sha256-Tbk1MZbtV2s5aG+iM99U8FqwxU/YNArMcWAv6clcsBc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a79cfe0ebd24952b580b1cf08cd906354996d547", + "rev": "5df43628fdf08d642be8ba5b3625a6c70731c19c", "type": "github" }, "original": { @@ -490,16 +490,16 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1738797219, - "narHash": "sha256-KRwX9Z1XavpgeSDVM/THdFd6uH8rNm/6R+7kIbGa+2s=", + "lastModified": 1736883708, + "narHash": "sha256-uQ+NQ0/xYU0N1CnXsa2zghgNaOPxWpMJXSUJJ9W7140=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1da52dd49a127ad74486b135898da2cef8c62665", + "rev": "eb62e6aa39ea67e0b8018ba8ea077efe65807dc8", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixpkgs-unstable", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } @@ -517,11 +517,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1739121491, - "narHash": "sha256-BEmyAozR3Pc2qwPtC4rgUglzi3cw4nv4fXEY23NxOrQ=", + "lastModified": 1737308837, + "narHash": "sha256-Sro74XNFgGgIIW4uo/YSVGafZhKnZwPLJNBvMsgpl4k=", "owner": "nix-community", "repo": "nixvim", - "rev": "13341a4c1238b7974e7bad9c7a6d5c51ca3cf81a", + "rev": "8fb2fe22c237b25b8af346870e126fdaeaff688b", "type": "github" }, "original": { @@ -540,11 +540,11 @@ ] }, "locked": { - "lastModified": 1738508923, - "narHash": "sha256-4DaDrQDAIxlWhTjH6h/+xfG05jt3qDZrZE/7zDLQaS4=", + "lastModified": 1735854821, + "narHash": "sha256-Iv59gMDZajNfezTO0Fw6LHE7uKAShxbvMidmZREit7c=", "owner": "NuschtOS", "repo": "search", - "rev": "86e2038290859006e05ca7201425ea5b5de4aecb", + "rev": "836908e3bddd837ae0f13e215dd48767aee355f0", "type": "github" }, "original": { @@ -632,11 +632,11 @@ ] }, "locked": { - "lastModified": 1738680491, - "narHash": "sha256-8X7tR3kFGkE7WEF5EXVkt4apgaN85oHZdoTGutCFs6I=", + "lastModified": 1737054102, + "narHash": "sha256-saLiCRQ5RtdTnznT/fja7GxcYRAzeY3k8S+IF/2s/2A=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "64dbb922d51a42c0ced6a7668ca008dded61c483", + "rev": "97871d416166803134ba64597a1006f3f670fbde", "type": "github" }, "original": { From c4d40b4010a224ccba29e4047c76cd41378ba125 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Mon, 10 Feb 2025 15:25:42 -0800 Subject: [PATCH 515/667] removed HBPS Nextcloud and old settings --- modules/modules.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/modules.nix b/modules/modules.nix index cd64faf..eb86ee8 100755 --- a/modules/modules.nix +++ b/modules/modules.nix @@ -9,6 +9,6 @@ ./bitcoinecosystem.nix ./vaultwarden.nix ./Sovran_SystemsOS_File_Fixes_And_New_Services.nix - ./nextcloud_hpbs_systemd.nix + ]; } From 4d48aa873beb42dbc12ec76f23a8ac9abc8f71f7 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Mon, 10 Feb 2025 15:27:42 -0800 Subject: [PATCH 516/667] removed HBPS Nextcloud from modules --- modules/nextcloud_hpbs_default.nix | 47 ------------------------------ modules/nextcloud_hpbs_systemd.nix | 32 -------------------- 2 files changed, 79 deletions(-) delete mode 100644 modules/nextcloud_hpbs_default.nix delete mode 100644 modules/nextcloud_hpbs_systemd.nix diff --git a/modules/nextcloud_hpbs_default.nix b/modules/nextcloud_hpbs_default.nix deleted file mode 100644 index bfa375f..0000000 --- a/modules/nextcloud_hpbs_default.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ lib, fetchFromGitHub, nixosTests, rustPlatform }: - -rustPlatform.buildRustPackage rec { - pname = "notify_push"; - version = "1.0.0"; - - src = fetchFromGitHub { - owner = "nextcloud"; - repo = pname; - rev = "v${version}"; - hash = "sha256-Y71o+ARi/YB2BRDfEyORbrA9HPvsUlWdh5UjM8hzmcA="; - }; - - cargoHash = "sha256-Mk+0LKP55Um5YiCx2O49rUZPwaXtKFnWtRC+WPGBadE="; - - passthru = rec { - test_client = rustPlatform.buildRustPackage { - pname = "${pname}-test_client"; - inherit src version; - - buildAndTestSubdir = "test_client"; - - cargoHash = "sha256-KybnPzCM9mLF55s5eZ3qr5GRcaaYFpEdNklWEo/72Ts="; - - meta = meta // { - mainProgram = "test_client"; - }; - }; - tests = - lib.filterAttrs - (key: lib.const (lib.hasPrefix "with-postgresql-and-redis" key)) - nixosTests.nextcloud - // { - inherit test_client; - }; - }; - - meta = with lib; { - changelog = "https://github.com/nextcloud/notify_push/releases/tag/v${version}"; - description = "Update notifications for nextcloud clients"; - mainProgram = "notify_push"; - homepage = "https://github.com/nextcloud/notify_push"; - license = licenses.agpl3Plus; - platforms = platforms.linux; - maintainers = teams.helsinki-systems.members; - }; -} diff --git a/modules/nextcloud_hpbs_systemd.nix b/modules/nextcloud_hpbs_systemd.nix deleted file mode 100644 index 66e51e9..0000000 --- a/modules/nextcloud_hpbs_systemd.nix +++ /dev/null @@ -1,32 +0,0 @@ -{config, pkgs, lib, ...}: - -let - - personalization = import ./personalization.nix; - -in - -{ - -systemd.services.nextcloud_notify_push_hpbs = { - - unitConfig = { - Description = "Push server (High Preformance Back End) for Nextcloud Clients"; - Requires = "network-online.target"; - }; - - serviceConfig = { - Enviornment = "PORT=7867"; - ExecStart = "/run/current-system/sw/bin/notify_push /var/lib/www/nextcloud/config/config.php"; - RemainAfterExit = "yes"; - Type = "notify"; - User = "caddy"; - Group = "php"; - }; - - wantedBy = [ "multi-user.target" ]; - - }; - - -} From f1d9456cb90e899b63793c44f0504ba770990ef1 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Wed, 12 Feb 2025 10:16:34 -0800 Subject: [PATCH 517/667] Nixpkgs Update --- flake.lock | 90 +++++++++++++++++++++++++++--------------------------- 1 file changed, 45 insertions(+), 45 deletions(-) diff --git a/flake.lock b/flake.lock index 669e71a..7360385 100755 --- a/flake.lock +++ b/flake.lock @@ -121,12 +121,12 @@ }, "flake-compat_2": { "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "revCount": 57, + "lastModified": 1733328505, + "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", + "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", + "revCount": 69, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.0.1/018afb31-abd1-7bff-a5e4-cff7e18efb7a/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.1.0/01948eb7-9cba-704f-bbf3-3fa956735b52/source.tar.gz" }, "original": { "type": "tarball", @@ -141,11 +141,11 @@ ] }, "locked": { - "lastModified": 1736143030, - "narHash": "sha256-+hu54pAoLDEZT9pjHlqL9DNzWz0NbUn8NEAHP7PQPzU=", + "lastModified": 1738453229, + "narHash": "sha256-7H9XgNiGLKN1G1CgRh0vUL4AheZSYzPm+zmZ7vxbJdo=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "b905f6fc23a9051a6e1b741e1438dbfc0634c6de", + "rev": "32ea77a06711b758da0ad9bd6a844c5740a87abd", "type": "github" }, "original": { @@ -221,11 +221,11 @@ ] }, "locked": { - "lastModified": 1737043064, - "narHash": "sha256-I/OuxGwXwRi5gnFPsyCvVR+IfFstA+QXEpHu1hvsgD8=", + "lastModified": 1737465171, + "narHash": "sha256-R10v2hoJRLq8jcL4syVFag7nIGE7m13qO48wRIukWNg=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "94ee657f6032d913fe0ef49adaa743804635b0bb", + "rev": "9364dc02281ce2d37a1f55b6e51f7c0f65a75f17", "type": "github" }, "original": { @@ -285,11 +285,11 @@ ] }, "locked": { - "lastModified": 1737075266, - "narHash": "sha256-u1gk5I1an975FOAMMdS6oBKnSIsZza5ZKhaeBZAskVo=", + "lastModified": 1738878603, + "narHash": "sha256-fmhq8B3MvQLawLbMO+LWLcdC2ftLMmwSk+P29icJ3tE=", "owner": "nix-community", "repo": "home-manager", - "rev": "12851ae7467bad8ef422b20806ab4d6d81e12d29", + "rev": "433799271274c9f2ab520a49527ebfe2992dcfbd", "type": "github" }, "original": { @@ -357,11 +357,11 @@ "nixpkgs-unstable": "nixpkgs-unstable" }, "locked": { - "lastModified": 1734508046, - "narHash": "sha256-JN/PFBOVqWKc76zSdOunYoG5Q0m8W4zfrEh3V4EOIuk=", + "lastModified": 1737481937, + "narHash": "sha256-FJ0ATgYWavH3ZeA0ofTEMS+22HqYN2Lqu3G6IsqbKIg=", "owner": "fort-nix", "repo": "nix-bitcoin", - "rev": "33dbb41d581b86decf421cb3835c426d557e0e9c", + "rev": "dc4d14e07324e43b8773e3eb5eb2a10c6b469287", "type": "github" }, "original": { @@ -379,11 +379,11 @@ ] }, "locked": { - "lastModified": 1736819234, - "narHash": "sha256-deQVtIH4UJueELJqluAICUtX7OosD9paTP+5FgbiSwI=", + "lastModified": 1738743987, + "narHash": "sha256-O3bnAfsObto6l2tQOmQlrO6Z2kD6yKwOWfs7pA0CpOc=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "bd921223ba7cdac346477d7ea5204d6f4736fcc6", + "rev": "ae406c04577ff9a64087018c79b4fdc02468c87c", "type": "github" }, "original": { @@ -410,11 +410,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1737299813, - "narHash": "sha256-Qw2PwmkXDK8sPQ5YQ/y/icbQ+TYgbxfjhgnkNJyT1X8=", + "lastModified": 1739206421, + "narHash": "sha256-PwQASeL2cGVmrtQYlrBur0U20Xy07uSWVnFup2PHnDs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "107d5ef05c0b1119749e381451389eded30fb0d5", + "rev": "44534bc021b85c8d78e465021e21f33b856e2540", "type": "github" }, "original": { @@ -426,11 +426,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1734126203, - "narHash": "sha256-0XovF7BYP50rTD2v4r55tR5MuBLet7q4xIz6Rgh3BBU=", + "lastModified": 1737370608, + "narHash": "sha256-hFA6SmioeqvGW/XvZa9bxniAeulksCOcj3kokdNT/YE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "71a6392e367b08525ee710a93af2e80083b5b3e2", + "rev": "300081d0cc72df578b02d914df941b8ec62240e6", "type": "github" }, "original": { @@ -458,11 +458,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1734323986, - "narHash": "sha256-m/lh6hYMIWDYHCAsn81CDAiXoT3gmxXI9J987W5tZrE=", + "lastModified": 1737299813, + "narHash": "sha256-Qw2PwmkXDK8sPQ5YQ/y/icbQ+TYgbxfjhgnkNJyT1X8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "394571358ce82dff7411395829aa6a3aad45b907", + "rev": "107d5ef05c0b1119749e381451389eded30fb0d5", "type": "github" }, "original": { @@ -474,11 +474,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1737062831, - "narHash": "sha256-Tbk1MZbtV2s5aG+iM99U8FqwxU/YNArMcWAv6clcsBc=", + "lastModified": 1739214665, + "narHash": "sha256-26L8VAu3/1YRxS8MHgBOyOM8xALdo6N0I04PgorE7UM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5df43628fdf08d642be8ba5b3625a6c70731c19c", + "rev": "64e75cd44acf21c7933d61d7721e812eac1b5a0a", "type": "github" }, "original": { @@ -490,16 +490,16 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1736883708, - "narHash": "sha256-uQ+NQ0/xYU0N1CnXsa2zghgNaOPxWpMJXSUJJ9W7140=", + "lastModified": 1738797219, + "narHash": "sha256-KRwX9Z1XavpgeSDVM/THdFd6uH8rNm/6R+7kIbGa+2s=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "eb62e6aa39ea67e0b8018ba8ea077efe65807dc8", + "rev": "1da52dd49a127ad74486b135898da2cef8c62665", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } @@ -517,11 +517,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1737308837, - "narHash": "sha256-Sro74XNFgGgIIW4uo/YSVGafZhKnZwPLJNBvMsgpl4k=", + "lastModified": 1739353096, + "narHash": "sha256-w/T2uYCoq4k6K46GX2CMGWsKfMvcqnxC41LIgnvGifE=", "owner": "nix-community", "repo": "nixvim", - "rev": "8fb2fe22c237b25b8af346870e126fdaeaff688b", + "rev": "78b6f8e1e5b37a7789216e17a96ebc117660f0e7", "type": "github" }, "original": { @@ -540,11 +540,11 @@ ] }, "locked": { - "lastModified": 1735854821, - "narHash": "sha256-Iv59gMDZajNfezTO0Fw6LHE7uKAShxbvMidmZREit7c=", + "lastModified": 1738508923, + "narHash": "sha256-4DaDrQDAIxlWhTjH6h/+xfG05jt3qDZrZE/7zDLQaS4=", "owner": "NuschtOS", "repo": "search", - "rev": "836908e3bddd837ae0f13e215dd48767aee355f0", + "rev": "86e2038290859006e05ca7201425ea5b5de4aecb", "type": "github" }, "original": { @@ -632,11 +632,11 @@ ] }, "locked": { - "lastModified": 1737054102, - "narHash": "sha256-saLiCRQ5RtdTnznT/fja7GxcYRAzeY3k8S+IF/2s/2A=", + "lastModified": 1738680491, + "narHash": "sha256-8X7tR3kFGkE7WEF5EXVkt4apgaN85oHZdoTGutCFs6I=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "97871d416166803134ba64597a1006f3f670fbde", + "rev": "64dbb922d51a42c0ced6a7668ca008dded61c483", "type": "github" }, "original": { From f29cdb36da8cfc6c73e1f64cbd57f2fe65797058 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Thu, 13 Feb 2025 01:40:37 -0800 Subject: [PATCH 518/667] made php with own module --- configuration.nix | 60 ++--------------------------------------- modules/modules.nix | 3 ++- modules/php.nix | 66 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 70 insertions(+), 59 deletions(-) create mode 100644 modules/php.nix diff --git a/configuration.nix b/configuration.nix index 35ba463..940caff 100755 --- a/configuration.nix +++ b/configuration.nix @@ -2,32 +2,7 @@ let - personalization = import ./modules/personalization.nix; - - - custom-php = pkgs.php.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 = 64 - redis.session.locking_enabled=1 - redis.session.lock_retries=-1 - redis.session.lock_wait_time=10000 - - ''; - }; + personalization = import ./modules/personalization.nix; in { @@ -103,19 +78,8 @@ in description = "free"; extraGroups = [ "networkmanager" ]; }; - - -####### PHP user for PHPFPM ####### - php = { - isSystemUser = true; - createHome = false; - uid = 7777; - }; }; - users.users.php.group = "php"; - users.groups.php = {}; - # Enable automatic login for the user. services.displayManager.autoLogin.enable = true; services.displayManager.autoLogin.user = "free"; @@ -133,7 +97,7 @@ in nixpkgs.config.permittedInsecurePackages = [ "jitsi-meet-1.0.8043" - ]; + ]; # List packages installed in system profile. To search, run: # $ nix search wget @@ -167,7 +131,6 @@ in lm_sensors hunspell hunspellDicts.en_US - custom-php matrix-synapse-tools.synadm brave dua @@ -204,25 +167,6 @@ in }; -####### 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"; - }; - }; - }; - - ####### CADDY ####### services.caddy = { enable = true; diff --git a/modules/modules.nix b/modules/modules.nix index eb86ee8..dc4fe3c 100755 --- a/modules/modules.nix +++ b/modules/modules.nix @@ -3,7 +3,8 @@ { imports = [ - + + ./php.nix ./synapse.nix ./coturn.nix ./bitcoinecosystem.nix diff --git a/modules/php.nix b/modules/php.nix new file mode 100644 index 0000000..855b6aa --- /dev/null +++ b/modules/php.nix @@ -0,0 +1,66 @@ +{ config, pkgs, lib, ... }: + + +let + + custom-php = pkgs.php.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 = 64 + 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"; + }; + }; + }; +} From c8078ac7d455f67283825f0b50038c067ca28607 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Thu, 13 Feb 2025 06:32:47 -0800 Subject: [PATCH 519/667] php lowered --- modules/php.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/php.nix b/modules/php.nix index 855b6aa..ccff74d 100644 --- a/modules/php.nix +++ b/modules/php.nix @@ -3,7 +3,7 @@ let - custom-php = pkgs.php.buildEnv { + custom-php = pkgs.php82.buildEnv { extensions = { enabled, all }: enabled ++ (with all; [ bz2 apcu redis imagick memcached ]); extraConfig = '' From 08b62580116c57d108d74a884619d6d7c68d40bc Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Thu, 13 Feb 2025 06:38:45 -0800 Subject: [PATCH 520/667] php 83 --- modules/php.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/php.nix b/modules/php.nix index ccff74d..191d536 100644 --- a/modules/php.nix +++ b/modules/php.nix @@ -3,7 +3,7 @@ let - custom-php = pkgs.php82.buildEnv { + custom-php = pkgs.php83.buildEnv { extensions = { enabled, all }: enabled ++ (with all; [ bz2 apcu redis imagick memcached ]); extraConfig = '' From 8697d6fd2fa57ee1cf9c111f29fc3cccaf2f3747 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Thu, 13 Feb 2025 06:49:36 -0800 Subject: [PATCH 521/667] updated Sovran_Systems_File_Fixes --- modules/Sovran_SystemsOS_File_Fixes_And_New_Services.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/Sovran_SystemsOS_File_Fixes_And_New_Services.nix b/modules/Sovran_SystemsOS_File_Fixes_And_New_Services.nix index 2fc67a1..05f9e67 100755 --- a/modules/Sovran_SystemsOS_File_Fixes_And_New_Services.nix +++ b/modules/Sovran_SystemsOS_File_Fixes_And_New_Services.nix @@ -10,6 +10,7 @@ }; serviceConfig = { + ExecStartPre= "/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"; From 7c626f34147fbbdda73881b8f0d47d4f178b1c01 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Thu, 13 Feb 2025 06:51:34 -0800 Subject: [PATCH 522/667] updated Sovran_Systems_File_Fixes --- modules/Sovran_SystemsOS_File_Fixes_And_New_Services.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/Sovran_SystemsOS_File_Fixes_And_New_Services.nix b/modules/Sovran_SystemsOS_File_Fixes_And_New_Services.nix index 05f9e67..f35a2d0 100755 --- a/modules/Sovran_SystemsOS_File_Fixes_And_New_Services.nix +++ b/modules/Sovran_SystemsOS_File_Fixes_And_New_Services.nix @@ -10,7 +10,7 @@ }; serviceConfig = { - ExecStartPre= "/bin/sleep 30" + ExecStartPre= "/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"; From b0b81ef1013b151af2fc8807e8c94ac07d0a441f Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Thu, 13 Feb 2025 06:53:39 -0800 Subject: [PATCH 523/667] updated Sovran_Systems_File_Fixes 3 --- modules/Sovran_SystemsOS_File_Fixes_And_New_Services.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/Sovran_SystemsOS_File_Fixes_And_New_Services.nix b/modules/Sovran_SystemsOS_File_Fixes_And_New_Services.nix index f35a2d0..5d766e1 100755 --- a/modules/Sovran_SystemsOS_File_Fixes_And_New_Services.nix +++ b/modules/Sovran_SystemsOS_File_Fixes_And_New_Services.nix @@ -10,7 +10,7 @@ }; serviceConfig = { - ExecStartPre= "/bin/sleep 30"; + 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"; From 254b17eb47bd0be4762fdf3dc0cf24cfcf0e564e Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Sun, 16 Feb 2025 19:17:37 -0800 Subject: [PATCH 524/667] added wp admin --- configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/configuration.nix b/configuration.nix index 940caff..08d7409 100755 --- a/configuration.nix +++ b/configuration.nix @@ -149,6 +149,7 @@ in firefox element-desktop helix + wp-cli ]; From 3f362937c796b45774c4fe6637cdad654a70c849 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Wed, 19 Feb 2025 10:29:58 -0800 Subject: [PATCH 525/667] updated second drive script --- for_new_sovran_pros/sdpsp.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/for_new_sovran_pros/sdpsp.sh b/for_new_sovran_pros/sdpsp.sh index a39509e..e703efc 100755 --- a/for_new_sovran_pros/sdpsp.sh +++ b/for_new_sovran_pros/sdpsp.sh @@ -29,13 +29,13 @@ sudo mkdir -p /mnt/BTCEcoandBackup/NixOS_Snapshot_Backup sudo mkdir -p /mnt/BTCEcoandBackup/clightning_db_backup -sudo systemctl stop bitcoind electrs nbxplorer btcpayserver lnd rtl lightning-loop lightning-pool +sudo systemctl stop bitcoind electrs nbxplorer btcpayserver lnd rtl lightning-loop lightning-pool clightning rsync -ar --info=progress2 --info=name0 /run/media/Second_Drive/BTCEcoandBackup/Bitcoin_Node/ /mnt/BTCEcoandBackup/Bitcoin_Node/ rsync -ar --info=progress2 --info=name0 /run/media/Second_Drive/BTCEcoandBackup/Electrs_Data/ /mnt/BTCEcoandBackup/Electrs_Data/ -sudo systemctl start bitcoind electrs nbxplorer btcpayserver lnd rtl lightning-loop lightning-pool +sudo systemctl start bitcoind electrs nbxplorer btcpayserver lnd rtl lightning-loop lightning-pool clightning sudo chown bitcoin:bitcoin /mnt/BTCEcoandBackup/Bitcoin_Node -R From c11ac0da3ba5b40fb0cf278649bded3ce0961dbe Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Wed, 19 Feb 2025 10:46:42 -0800 Subject: [PATCH 526/667] changed second drive script --- for_new_sovran_pros/sdpsp.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/for_new_sovran_pros/sdpsp.sh b/for_new_sovran_pros/sdpsp.sh index e703efc..7272d22 100755 --- a/for_new_sovran_pros/sdpsp.sh +++ b/for_new_sovran_pros/sdpsp.sh @@ -29,13 +29,13 @@ sudo mkdir -p /mnt/BTCEcoandBackup/NixOS_Snapshot_Backup sudo mkdir -p /mnt/BTCEcoandBackup/clightning_db_backup -sudo systemctl stop bitcoind electrs nbxplorer btcpayserver lnd rtl lightning-loop lightning-pool clightning +sudo systemctl stop bitcoind electrs nbxplorer btcpayserver lnd rtl lightning-loop clightning rsync -ar --info=progress2 --info=name0 /run/media/Second_Drive/BTCEcoandBackup/Bitcoin_Node/ /mnt/BTCEcoandBackup/Bitcoin_Node/ rsync -ar --info=progress2 --info=name0 /run/media/Second_Drive/BTCEcoandBackup/Electrs_Data/ /mnt/BTCEcoandBackup/Electrs_Data/ -sudo systemctl start bitcoind electrs nbxplorer btcpayserver lnd rtl lightning-loop lightning-pool clightning +sudo systemctl start bitcoind electrs nbxplorer btcpayserver lnd rtl lightning-loop clightning sudo chown bitcoin:bitcoin /mnt/BTCEcoandBackup/Bitcoin_Node -R From d89adab1cb7559c1b25c7b8227729d1f49f69cf4 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Mon, 24 Feb 2025 10:31:41 -0800 Subject: [PATCH 527/667] Nixpkgs Update + Bisq1 Update --- flake.lock | 196 ++++++----------------------------------------------- 1 file changed, 22 insertions(+), 174 deletions(-) diff --git a/flake.lock b/flake.lock index 7360385..a096ac2 100755 --- a/flake.lock +++ b/flake.lock @@ -27,11 +27,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1734553734, - "narHash": "sha256-vcd8PPHTzh9nANPaeuW2yCkg3Aok5eI1uf6fatODNi0=", + "lastModified": 1740417526, + "narHash": "sha256-bY9F1lJSB5TKKdHuu+xihHHIaHYjXQa+ejJIIfDrppY=", "owner": "emmanuelrosa", "repo": "bisq-for-nixos", - "rev": "4994e7c201eacd50167285c6e68fdd104e542791", + "rev": "6cf899a8b85c22a48746f9407366bc3d0764842e", "type": "github" }, "original": { @@ -56,27 +56,6 @@ "type": "github" } }, - "devshell": { - "inputs": { - "nixpkgs": [ - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1735644329, - "narHash": "sha256-tO3HrHriyLvipc4xr+Ewtdlo7wM1OjXNjlWRgmM7peY=", - "owner": "numtide", - "repo": "devshell", - "rev": "f7795ede5b02664b57035b3b757876703e2c3eac", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "devshell", - "type": "github" - } - }, "extra-container": { "inputs": { "flake-utils": [ @@ -119,20 +98,6 @@ "type": "github" } }, - "flake-compat_2": { - "locked": { - "lastModified": 1733328505, - "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", - "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", - "revCount": 69, - "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.1.0/01948eb7-9cba-704f-bbf3-3fa956735b52/source.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz" - } - }, "flake-parts": { "inputs": { "nixpkgs-lib": [ @@ -208,54 +173,6 @@ "type": "github" } }, - "git-hooks": { - "inputs": { - "flake-compat": [ - "nixvim", - "flake-compat" - ], - "gitignore": "gitignore", - "nixpkgs": [ - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1737465171, - "narHash": "sha256-R10v2hoJRLq8jcL4syVFag7nIGE7m13qO48wRIukWNg=", - "owner": "cachix", - "repo": "git-hooks.nix", - "rev": "9364dc02281ce2d37a1f55b6e51f7c0f65a75f17", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "git-hooks.nix", - "type": "github" - } - }, - "gitignore": { - "inputs": { - "nixpkgs": [ - "nixvim", - "git-hooks", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1709087332, - "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", - "owner": "hercules-ci", - "repo": "gitignore.nix", - "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "gitignore.nix", - "type": "github" - } - }, "home-manager": { "inputs": { "nixpkgs": [ @@ -277,27 +194,6 @@ "type": "github" } }, - "home-manager_2": { - "inputs": { - "nixpkgs": [ - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1738878603, - "narHash": "sha256-fmhq8B3MvQLawLbMO+LWLcdC2ftLMmwSk+P29icJ3tE=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "433799271274c9f2ab520a49527ebfe2992dcfbd", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "home-manager", - "type": "github" - } - }, "ixx": { "inputs": { "flake-utils": [ @@ -357,11 +253,11 @@ "nixpkgs-unstable": "nixpkgs-unstable" }, "locked": { - "lastModified": 1737481937, - "narHash": "sha256-FJ0ATgYWavH3ZeA0ofTEMS+22HqYN2Lqu3G6IsqbKIg=", + "lastModified": 1739709805, + "narHash": "sha256-8/OuhPELneYOtncScsPrAwmlzBNSAFotoTKd6JxU6OA=", "owner": "fort-nix", "repo": "nix-bitcoin", - "rev": "dc4d14e07324e43b8773e3eb5eb2a10c6b469287", + "rev": "bff10a66e50f6a3387b3e5acbbdf2519c624e8bc", "type": "github" }, "original": { @@ -371,27 +267,6 @@ "type": "github" } }, - "nix-darwin": { - "inputs": { - "nixpkgs": [ - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1738743987, - "narHash": "sha256-O3bnAfsObto6l2tQOmQlrO6Z2kD6yKwOWfs7pA0CpOc=", - "owner": "lnl7", - "repo": "nix-darwin", - "rev": "ae406c04577ff9a64087018c79b4fdc02468c87c", - "type": "github" - }, - "original": { - "owner": "lnl7", - "repo": "nix-darwin", - "type": "github" - } - }, "nixpkgs": { "locked": { "lastModified": 1703013332, @@ -410,11 +285,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1739206421, - "narHash": "sha256-PwQASeL2cGVmrtQYlrBur0U20Xy07uSWVnFup2PHnDs=", + "lastModified": 1740339700, + "narHash": "sha256-cbrw7EgQhcdFnu6iS3vane53bEagZQy/xyIkDWpCgVE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "44534bc021b85c8d78e465021e21f33b856e2540", + "rev": "04ef94c4c1582fd485bbfdb8c4a8ba250e359195", "type": "github" }, "original": { @@ -426,11 +301,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1737370608, - "narHash": "sha256-hFA6SmioeqvGW/XvZa9bxniAeulksCOcj3kokdNT/YE=", + "lastModified": 1739451785, + "narHash": "sha256-3ebRdThRic9bHMuNi2IAA/ek9b32bsy8F5R4SvGTIog=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "300081d0cc72df578b02d914df941b8ec62240e6", + "rev": "1128e89fd5e11bb25aedbfc287733c6502202ea9", "type": "github" }, "original": { @@ -458,11 +333,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1737299813, - "narHash": "sha256-Qw2PwmkXDK8sPQ5YQ/y/icbQ+TYgbxfjhgnkNJyT1X8=", + "lastModified": 1739357830, + "narHash": "sha256-9xim3nJJUFbVbJCz48UP4fGRStVW5nv4VdbimbKxJ3I=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "107d5ef05c0b1119749e381451389eded30fb0d5", + "rev": "0ff09db9d034a04acd4e8908820ba0b410d7a33a", "type": "github" }, "original": { @@ -474,11 +349,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1739214665, - "narHash": "sha256-26L8VAu3/1YRxS8MHgBOyOM8xALdo6N0I04PgorE7UM=", + "lastModified": 1740367490, + "narHash": "sha256-WGaHVAjcrv+Cun7zPlI41SerRtfknGQap281+AakSAw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "64e75cd44acf21c7933d61d7721e812eac1b5a0a", + "rev": "0196c0175e9191c474c26ab5548db27ef5d34b05", "type": "github" }, "original": { @@ -506,22 +381,16 @@ }, "nixvim": { "inputs": { - "devshell": "devshell", - "flake-compat": "flake-compat_2", "flake-parts": "flake-parts", - "git-hooks": "git-hooks", - "home-manager": "home-manager_2", - "nix-darwin": "nix-darwin", "nixpkgs": "nixpkgs_5", - "nuschtosSearch": "nuschtosSearch", - "treefmt-nix": "treefmt-nix" + "nuschtosSearch": "nuschtosSearch" }, "locked": { - "lastModified": 1739353096, - "narHash": "sha256-w/T2uYCoq4k6K46GX2CMGWsKfMvcqnxC41LIgnvGifE=", + "lastModified": 1740413069, + "narHash": "sha256-DUentJypG+n1yuL60WBYM+SOfH4tFivKzuuJRQLCtF0=", "owner": "nix-community", "repo": "nixvim", - "rev": "78b6f8e1e5b37a7789216e17a96ebc117660f0e7", + "rev": "4b0de83c39718e6fca0c80fdeae7c4a9b2cb6c10", "type": "github" }, "original": { @@ -623,27 +492,6 @@ "repo": "default", "type": "github" } - }, - "treefmt-nix": { - "inputs": { - "nixpkgs": [ - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1738680491, - "narHash": "sha256-8X7tR3kFGkE7WEF5EXVkt4apgaN85oHZdoTGutCFs6I=", - "owner": "numtide", - "repo": "treefmt-nix", - "rev": "64dbb922d51a42c0ced6a7668ca008dded61c483", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "treefmt-nix", - "type": "github" - } } }, "root": "root", From 3c578037e65f54fb19b45b484c63e1c3202f000f Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Wed, 26 Feb 2025 22:35:53 -0800 Subject: [PATCH 528/667] increased php opcache --- modules/php.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/php.nix b/modules/php.nix index 191d536..f432c0f 100644 --- a/modules/php.nix +++ b/modules/php.nix @@ -19,7 +19,7 @@ let post_max_size = 3G upload_max_filesize = 3G apc.enable_cli=1 - opcache.interned_strings_buffer = 64 + opcache.interned_strings_buffer = 192 redis.session.locking_enabled=1 redis.session.lock_retries=-1 redis.session.lock_wait_time=10000 From dd783e1d3e88e034357cef66d5cbe70a1dd010b6 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Sat, 8 Mar 2025 14:22:31 -0600 Subject: [PATCH 529/667] Nixpkgs Update --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index a096ac2..b1bf342 100755 --- a/flake.lock +++ b/flake.lock @@ -285,11 +285,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1740339700, - "narHash": "sha256-cbrw7EgQhcdFnu6iS3vane53bEagZQy/xyIkDWpCgVE=", + "lastModified": 1741332913, + "narHash": "sha256-ri1e8ZliWS3Jnp9yqpKApHaOo7KBN33W8ECAKA4teAQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "04ef94c4c1582fd485bbfdb8c4a8ba250e359195", + "rev": "20755fa05115c84be00b04690630cb38f0a203ad", "type": "github" }, "original": { @@ -349,11 +349,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1740367490, - "narHash": "sha256-WGaHVAjcrv+Cun7zPlI41SerRtfknGQap281+AakSAw=", + "lastModified": 1741246872, + "narHash": "sha256-Q6pMP4a9ed636qilcYX8XUguvKl/0/LGXhHcRI91p0U=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0196c0175e9191c474c26ab5548db27ef5d34b05", + "rev": "10069ef4cf863633f57238f179a0297de84bd8d3", "type": "github" }, "original": { @@ -386,11 +386,11 @@ "nuschtosSearch": "nuschtosSearch" }, "locked": { - "lastModified": 1740413069, - "narHash": "sha256-DUentJypG+n1yuL60WBYM+SOfH4tFivKzuuJRQLCtF0=", + "lastModified": 1741098523, + "narHash": "sha256-gXDSXDr6tAb+JgxGMvcEjKC9YO8tVOd8hMMZHJLyQ6Q=", "owner": "nix-community", "repo": "nixvim", - "rev": "4b0de83c39718e6fca0c80fdeae7c4a9b2cb6c10", + "rev": "03065fd4708bfdf47dd541d655392a60daa25ded", "type": "github" }, "original": { From 8ee29e661fa4a9ca689e6fbbe3a72a188710d236 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Sun, 23 Mar 2025 19:36:55 -0500 Subject: [PATCH 530/667] updated BTCPayserver, nixpkgs, and systemd-extension --- flake.nix | 15 ++------------- modules/bitcoinecosystem.nix | 1 - modules/systemd-manager_sovran_systems.nix | 6 +++--- 3 files changed, 5 insertions(+), 17 deletions(-) diff --git a/flake.nix b/flake.nix index 20d4f24..76b5566 100755 --- a/flake.nix +++ b/flake.nix @@ -17,13 +17,9 @@ nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-24.11"; - btcpayserver-new.url = "github:Dreaming-Codes/nixpkgs/update-btcpayserver"; - - - }; - outputs = { self, nixpkgs, nix-bitcoin, nixvim, agenix, bisq1, nixpkgs-stable, btcpayserver-new, ... }: + outputs = { self, nixpkgs, nix-bitcoin, nixvim, agenix, bisq1, nixpkgs-stable, ... }: let system = "x86_64-linux"; @@ -38,13 +34,6 @@ }; - overlay-btcpaynew = final: prev: { - - new-btcpaynew = import btcpayserver-new { - inherit system; - config.allowunfree = true; - }; - }; in { @@ -60,7 +49,7 @@ imports = [ - ({ config, pkgs, ... }: { nixpkgs.overlays = [ overlay-stable overlay-btcpaynew ]; }) + ({ config, pkgs, ... }: { nixpkgs.overlays = [ overlay-stable ]; }) ./configuration.nix diff --git a/modules/bitcoinecosystem.nix b/modules/bitcoinecosystem.nix index 919c205..040f277 100755 --- a/modules/bitcoinecosystem.nix +++ b/modules/bitcoinecosystem.nix @@ -132,7 +132,6 @@ experimental-offers services.btcpayserver = { enable = true; - package = pkgs.new-btcpaynew.btcpayserver; }; services.btcpayserver.lightningBackend = "lnd"; diff --git a/modules/systemd-manager_sovran_systems.nix b/modules/systemd-manager_sovran_systems.nix index 7f76f5d..5b376f3 100755 --- a/modules/systemd-manager_sovran_systems.nix +++ b/modules/systemd-manager_sovran_systems.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "systemd-manager"; - version = "17"; + version = "18"; src = fetchzip { url = "https://github.com/hardpixel/systemd-manager/releases/download/v${version}/systemd-manager-v${version}.zip"; - hash = "sha256-NaOqhiVTACiGiUn8ISTtBMIDkeGkv1M2kCDnAxl5cwk="; + hash = "sha256-Kd8ZxZ1f6aR1vThrWStsjk8cHrjo2KCYQgpg1em/n2k="; stripRoot = false; }; @@ -38,4 +38,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ ]; homepage = "https://github.com/hardpixel/systemd-manager"; }; -} \ No newline at end of file +} From 857104cdb8a781c98589a5b2474bf14bc84ab226 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Sun, 23 Mar 2025 19:45:46 -0500 Subject: [PATCH 531/667] Update Nixpkgs --- flake.lock | 71 +++++++++++++++++++++--------------------------------- 1 file changed, 27 insertions(+), 44 deletions(-) diff --git a/flake.lock b/flake.lock index b1bf342..93c3945 100755 --- a/flake.lock +++ b/flake.lock @@ -40,22 +40,6 @@ "type": "github" } }, - "btcpayserver-new": { - "locked": { - "lastModified": 1736549221, - "narHash": "sha256-T9CEfahq/DAQ74Gx9GuIaEwoavA2+aPhFHMY72Q4gsk=", - "owner": "Dreaming-Codes", - "repo": "nixpkgs", - "rev": "ea5ae3db9b3ccae0d8de77553a0939decddb6361", - "type": "github" - }, - "original": { - "owner": "Dreaming-Codes", - "ref": "update-btcpayserver", - "repo": "nixpkgs", - "type": "github" - } - }, "extra-container": { "inputs": { "flake-utils": [ @@ -106,11 +90,11 @@ ] }, "locked": { - "lastModified": 1738453229, - "narHash": "sha256-7H9XgNiGLKN1G1CgRh0vUL4AheZSYzPm+zmZ7vxbJdo=", + "lastModified": 1741352980, + "narHash": "sha256-+u2UunDA4Cl5Fci3m7S643HzKmIDAe+fiXrLqYsR2fs=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "32ea77a06711b758da0ad9bd6a844c5740a87abd", + "rev": "f4330d22f1c5d2ba72d3d22df5597d123fdb60a9", "type": "github" }, "original": { @@ -253,11 +237,11 @@ "nixpkgs-unstable": "nixpkgs-unstable" }, "locked": { - "lastModified": 1739709805, - "narHash": "sha256-8/OuhPELneYOtncScsPrAwmlzBNSAFotoTKd6JxU6OA=", + "lastModified": 1741725077, + "narHash": "sha256-p9mLfWb9PPLtRUKlJoQG71jFH6xU4Ox+rzPkExvAglY=", "owner": "fort-nix", "repo": "nix-bitcoin", - "rev": "bff10a66e50f6a3387b3e5acbbdf2519c624e8bc", + "rev": "875d25066d4ad4df2ced3a0a16be0e40bb469d95", "type": "github" }, "original": { @@ -285,11 +269,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1741332913, - "narHash": "sha256-ri1e8ZliWS3Jnp9yqpKApHaOo7KBN33W8ECAKA4teAQ=", + "lastModified": 1742512142, + "narHash": "sha256-8XfURTDxOm6+33swQJu/hx6xw1Tznl8vJJN5HwVqckg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "20755fa05115c84be00b04690630cb38f0a203ad", + "rev": "7105ae3957700a9646cc4b766f5815b23ed0c682", "type": "github" }, "original": { @@ -301,11 +285,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1739451785, - "narHash": "sha256-3ebRdThRic9bHMuNi2IAA/ek9b32bsy8F5R4SvGTIog=", + "lastModified": 1741678040, + "narHash": "sha256-rmBsz7BBcDwfvDkxnKHmolKceGJrr0nyz5PQYZg0kMk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1128e89fd5e11bb25aedbfc287733c6502202ea9", + "rev": "3ee8818da146871cd570b164fc4f438f78479a50", "type": "github" }, "original": { @@ -333,11 +317,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1739357830, - "narHash": "sha256-9xim3nJJUFbVbJCz48UP4fGRStVW5nv4VdbimbKxJ3I=", + "lastModified": 1741600792, + "narHash": "sha256-yfDy6chHcM7pXpMF4wycuuV+ILSTG486Z/vLx/Bdi6Y=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0ff09db9d034a04acd4e8908820ba0b410d7a33a", + "rev": "ebe2788eafd539477f83775ef93c3c7e244421d3", "type": "github" }, "original": { @@ -349,11 +333,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1741246872, - "narHash": "sha256-Q6pMP4a9ed636qilcYX8XUguvKl/0/LGXhHcRI91p0U=", + "lastModified": 1742669843, + "narHash": "sha256-G5n+FOXLXcRx+3hCJ6Rt6ZQyF1zqQ0DL0sWAMn2Nk0w=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "10069ef4cf863633f57238f179a0297de84bd8d3", + "rev": "1e5b653dff12029333a6546c11e108ede13052eb", "type": "github" }, "original": { @@ -365,11 +349,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1738797219, - "narHash": "sha256-KRwX9Z1XavpgeSDVM/THdFd6uH8rNm/6R+7kIbGa+2s=", + "lastModified": 1742606399, + "narHash": "sha256-NAxwF5cjgh8o5aylhePXWNQETCWYaTpNvdO2bMfINpQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1da52dd49a127ad74486b135898da2cef8c62665", + "rev": "0740f6f238767d4caf9afe774d3e88105766dfc6", "type": "github" }, "original": { @@ -386,11 +370,11 @@ "nuschtosSearch": "nuschtosSearch" }, "locked": { - "lastModified": 1741098523, - "narHash": "sha256-gXDSXDr6tAb+JgxGMvcEjKC9YO8tVOd8hMMZHJLyQ6Q=", + "lastModified": 1742732006, + "narHash": "sha256-ZIBMfPNb/hfoFf79MRnhDXGKl0yGhjlYEpy3+/jbxFI=", "owner": "nix-community", "repo": "nixvim", - "rev": "03065fd4708bfdf47dd541d655392a60daa25ded", + "rev": "7776e37b67e7875c3cd56d9d20fd050798071706", "type": "github" }, "original": { @@ -409,11 +393,11 @@ ] }, "locked": { - "lastModified": 1738508923, - "narHash": "sha256-4DaDrQDAIxlWhTjH6h/+xfG05jt3qDZrZE/7zDLQaS4=", + "lastModified": 1742659553, + "narHash": "sha256-i/JCrr/jApVorI9GkSV5to+USrRCa0rWuQDH8JSlK2A=", "owner": "NuschtOS", "repo": "search", - "rev": "86e2038290859006e05ca7201425ea5b5de4aecb", + "rev": "508752835128a3977985a4d5225ff241f7756181", "type": "github" }, "original": { @@ -426,7 +410,6 @@ "inputs": { "agenix": "agenix", "bisq1": "bisq1", - "btcpayserver-new": "btcpayserver-new", "nix-bitcoin": "nix-bitcoin", "nixpkgs": "nixpkgs_4", "nixpkgs-stable": "nixpkgs-stable", From 992e80559af8474258d56b1b717283326c3f1c3a Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Mon, 24 Mar 2025 10:58:19 -0500 Subject: [PATCH 532/667] updated name of synadm --- configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configuration.nix b/configuration.nix index 08d7409..9f43c7b 100755 --- a/configuration.nix +++ b/configuration.nix @@ -131,7 +131,7 @@ in lm_sensors hunspell hunspellDicts.en_US - matrix-synapse-tools.synadm + synadm brave dua bitwarden-desktop From 9edad89e98a99c22e17be191bc15b46e672d5c71 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Wed, 9 Apr 2025 09:58:27 -0500 Subject: [PATCH 533/667] Nixpkgs Update --- flake.lock | 54 +++++++++++++++++++++++++++--------------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/flake.lock b/flake.lock index 93c3945..4ec1402 100755 --- a/flake.lock +++ b/flake.lock @@ -90,11 +90,11 @@ ] }, "locked": { - "lastModified": 1741352980, - "narHash": "sha256-+u2UunDA4Cl5Fci3m7S643HzKmIDAe+fiXrLqYsR2fs=", + "lastModified": 1743550720, + "narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "f4330d22f1c5d2ba72d3d22df5597d123fdb60a9", + "rev": "c621e8422220273271f52058f618c94e405bb0f5", "type": "github" }, "original": { @@ -237,11 +237,11 @@ "nixpkgs-unstable": "nixpkgs-unstable" }, "locked": { - "lastModified": 1741725077, - "narHash": "sha256-p9mLfWb9PPLtRUKlJoQG71jFH6xU4Ox+rzPkExvAglY=", + "lastModified": 1743155549, + "narHash": "sha256-yU7iYlDSD8lOrm02igxIl3y+bXGZDDO0qcG0gO48Cto=", "owner": "fort-nix", "repo": "nix-bitcoin", - "rev": "875d25066d4ad4df2ced3a0a16be0e40bb469d95", + "rev": "990805aa7c7fcd1552c6e14e8c6df9a88ba9be41", "type": "github" }, "original": { @@ -269,11 +269,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1742512142, - "narHash": "sha256-8XfURTDxOm6+33swQJu/hx6xw1Tznl8vJJN5HwVqckg=", + "lastModified": 1743975612, + "narHash": "sha256-o4FjFOUmjSRMK7dn0TFdAT0RRWUWD+WsspPHa+qEQT8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "7105ae3957700a9646cc4b766f5815b23ed0c682", + "rev": "a880f49904d68b5e53338d1e8c7bf80f59903928", "type": "github" }, "original": { @@ -285,11 +285,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1741678040, - "narHash": "sha256-rmBsz7BBcDwfvDkxnKHmolKceGJrr0nyz5PQYZg0kMk=", + "lastModified": 1742923925, + "narHash": "sha256-biPjLws6FiBVUUDHEMFq5pUQL84Wf7PntPYdo3oKkFw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3ee8818da146871cd570b164fc4f438f78479a50", + "rev": "25d1b84f5c90632a623c48d83a2faf156451e6b1", "type": "github" }, "original": { @@ -317,11 +317,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1741600792, - "narHash": "sha256-yfDy6chHcM7pXpMF4wycuuV+ILSTG486Z/vLx/Bdi6Y=", + "lastModified": 1742937945, + "narHash": "sha256-lWc+79eZRyvHp/SqMhHTMzZVhpxkRvthsP1Qx6UCq0E=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ebe2788eafd539477f83775ef93c3c7e244421d3", + "rev": "d02d88f8de5b882ccdde0465d8fa2db3aa1169f7", "type": "github" }, "original": { @@ -333,11 +333,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1742669843, - "narHash": "sha256-G5n+FOXLXcRx+3hCJ6Rt6ZQyF1zqQ0DL0sWAMn2Nk0w=", + "lastModified": 1744098102, + "narHash": "sha256-tzCdyIJj9AjysC3OuKA+tMD/kDEDAF9mICPDU7ix0JA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1e5b653dff12029333a6546c11e108ede13052eb", + "rev": "c8cd81426f45942bb2906d5ed2fe21d2f19d95b7", "type": "github" }, "original": { @@ -349,11 +349,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1742606399, - "narHash": "sha256-NAxwF5cjgh8o5aylhePXWNQETCWYaTpNvdO2bMfINpQ=", + "lastModified": 1744096231, + "narHash": "sha256-kUfx3FKU1Etnua3EaKvpeuXs7zoFiAcli1gBwkPvGSs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0740f6f238767d4caf9afe774d3e88105766dfc6", + "rev": "b2b0718004cc9a5bca610326de0a82e6ea75920b", "type": "github" }, "original": { @@ -370,11 +370,11 @@ "nuschtosSearch": "nuschtosSearch" }, "locked": { - "lastModified": 1742732006, - "narHash": "sha256-ZIBMfPNb/hfoFf79MRnhDXGKl0yGhjlYEpy3+/jbxFI=", + "lastModified": 1744200902, + "narHash": "sha256-BqTLjxT1C1XfREDBQSxPrfKI9DBpZHBVLHzfXZs+h8M=", "owner": "nix-community", "repo": "nixvim", - "rev": "7776e37b67e7875c3cd56d9d20fd050798071706", + "rev": "51203927e395535c4a427295efed4e1b2ef8349b", "type": "github" }, "original": { @@ -393,11 +393,11 @@ ] }, "locked": { - "lastModified": 1742659553, - "narHash": "sha256-i/JCrr/jApVorI9GkSV5to+USrRCa0rWuQDH8JSlK2A=", + "lastModified": 1743683223, + "narHash": "sha256-LdXtHFvhEC3S64dphap1pkkzwjErbW65eH1VRerCUT0=", "owner": "NuschtOS", "repo": "search", - "rev": "508752835128a3977985a4d5225ff241f7756181", + "rev": "56a49ffef2908dad1e9a8adef1f18802bc760962", "type": "github" }, "original": { From 184ae31de8ef1f73f1832d6b31bababa6f8083b5 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Sun, 20 Apr 2025 20:02:10 -0500 Subject: [PATCH 534/667] added btc-clients flake --- configuration.nix | 8 ++++---- flake.nix | 10 +++++++--- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/configuration.nix b/configuration.nix index 9f43c7b..7eaf991 100755 --- a/configuration.nix +++ b/configuration.nix @@ -301,10 +301,10 @@ in services.xserver.displayManager.gdm.autoSuspend = false; systemd.sleep.extraConfig = '' - AllowSuspend=no - AllowHibernation=no - AllowHybridSleep=no - AllowSuspendThenHibernate=no + AllowSuspend=no + AllowHibernation=no + AllowHybridSleep=no + AllowSuspendThenHibernate=no ''; diff --git a/flake.nix b/flake.nix index 76b5566..6ff0a82 100755 --- a/flake.nix +++ b/flake.nix @@ -13,13 +13,13 @@ nixvim.url = "github:nix-community/nixvim"; - bisq1.url = "github:emmanuelrosa/bisq-for-nixos"; + btc-clients.url = "github:emmanuelrosa/btc-clients-nix"; nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-24.11"; }; - outputs = { self, nixpkgs, nix-bitcoin, nixvim, agenix, bisq1, nixpkgs-stable, ... }: + outputs = { self, nixpkgs, nix-bitcoin, nixvim, agenix, btc-clients, nixpkgs-stable, ... }: let system = "x86_64-linux"; @@ -62,7 +62,11 @@ ]; environment.systemPackages = with pkgs; [ - bisq1.packages.x86_64-linux.bisq-desktop + btc-clients.packages.x86_64-linux.bisq + btc-clients.packages.x86_64-linux.bisq2 + btc-clients.packages.x86_64-linux.sparrow + + ]; }; From f496542aa15f5fd8a1d57bee107ace94fa0788c7 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Sun, 20 Apr 2025 20:07:58 -0500 Subject: [PATCH 535/667] updated configuration.nix --- configuration.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/configuration.nix b/configuration.nix index 7eaf991..4994f29 100755 --- a/configuration.nix +++ b/configuration.nix @@ -119,8 +119,6 @@ in gnome-tweaks papirus-icon-theme ranger - bisq2 - sparrow neofetch gedit matrix-synapse From f081404b3e492b9cbc8e3f3330d144e4b736958e Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Sun, 20 Apr 2025 20:17:37 -0500 Subject: [PATCH 536/667] updated cron script --- configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configuration.nix b/configuration.nix index 4994f29..377b554 100755 --- a/configuration.nix +++ b/configuration.nix @@ -333,7 +333,7 @@ backup /etc/nix-bitcoin-secrets/ localhost/ "*/5 * * * * caddy /run/current-system/sw/bin/php -f /var/lib/www/nextcloud/cron.php" "*/15 * * * * root /run/current-system/sw/bin/bash /var/lib/njalla/njalla.sh" "*/15 * * * * root /run/current-system/sw/bin/bash /var/lib/external_ip/external_ip.sh" - "0 0 * * 0 /run/current-system/sw/bin/echo y | docker-user /run/current-system/sw/bin/docker system prune -a" + "0 0 * * 0 docker-user yes | /run/current-system/sw/bin/docker system prune -a" ]; }; From 58a51c88f148e795ebfa9e0db1d7f6af2523b27b Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Sun, 20 Apr 2025 20:24:09 -0500 Subject: [PATCH 537/667] Nixpkgs Update --- flake.lock | 159 +++++++++++++++++------------------------------------ 1 file changed, 51 insertions(+), 108 deletions(-) diff --git a/flake.lock b/flake.lock index 4ec1402..8496b81 100755 --- a/flake.lock +++ b/flake.lock @@ -21,22 +21,22 @@ "type": "github" } }, - "bisq1": { + "btc-clients": { "inputs": { - "nix-appimage": "nix-appimage", - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs_2", + "oldNixpkgs": "oldNixpkgs" }, "locked": { - "lastModified": 1740417526, - "narHash": "sha256-bY9F1lJSB5TKKdHuu+xihHHIaHYjXQa+ejJIIfDrppY=", + "lastModified": 1744151825, + "narHash": "sha256-/bx2DPQ2AuUdlVAQBIWQmaRVSNgeDYdJPMUelpVJBuU=", "owner": "emmanuelrosa", - "repo": "bisq-for-nixos", - "rev": "6cf899a8b85c22a48746f9407366bc3d0764842e", + "repo": "btc-clients-nix", + "rev": "8d6c5e094912d9858bde0f7b5f078238b2e24ab6", "type": "github" }, "original": { "owner": "emmanuelrosa", - "repo": "bisq-for-nixos", + "repo": "btc-clients-nix", "type": "github" } }, @@ -66,22 +66,6 @@ "type": "github" } }, - "flake-compat": { - "flake": false, - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, "flake-parts": { "inputs": { "nixpkgs-lib": [ @@ -107,24 +91,6 @@ "inputs": { "systems": "systems_2" }, - "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_2": { - "inputs": { - "systems": "systems_3" - }, "locked": { "lastModified": 1731533236, "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", @@ -139,9 +105,9 @@ "type": "github" } }, - "flake-utils_3": { + "flake-utils_2": { "inputs": { - "systems": "systems_4" + "systems": "systems_3" }, "locked": { "lastModified": 1731533236, @@ -192,47 +158,24 @@ ] }, "locked": { - "lastModified": 1729958008, - "narHash": "sha256-EiOq8jF4Z/zQe0QYVc3+qSKxRK//CFHMB84aYrYGwEs=", + "lastModified": 1737371634, + "narHash": "sha256-fTVAWzT1UMm1lT+YxHuVPtH+DATrhYfea3B0MxG/cGw=", "owner": "NuschtOS", "repo": "ixx", - "rev": "9fd01aad037f345350eab2cd45e1946cc66da4eb", + "rev": "a1176e2a10ce745ff8f63e4af124ece8fe0b1648", "type": "github" }, "original": { "owner": "NuschtOS", - "ref": "v0.0.6", + "ref": "v0.0.7", "repo": "ixx", "type": "github" } }, - "nix-appimage": { - "inputs": { - "flake-compat": "flake-compat", - "flake-utils": "flake-utils", - "nixpkgs": [ - "bisq1", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1725758175, - "narHash": "sha256-MhBOJHYhIJ30TNVrm7wX8B3x+MecMCdaBc94g4HXkPs=", - "owner": "ralismark", - "repo": "nix-appimage", - "rev": "fc1192dbec82f5857f86ccc6dfdf2ad97bc9c62a", - "type": "github" - }, - "original": { - "owner": "ralismark", - "repo": "nix-appimage", - "type": "github" - } - }, "nix-bitcoin": { "inputs": { "extra-container": "extra-container", - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils", "nixpkgs": "nixpkgs_3", "nixpkgs-unstable": "nixpkgs-unstable" }, @@ -269,11 +212,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1743975612, - "narHash": "sha256-o4FjFOUmjSRMK7dn0TFdAT0RRWUWD+WsspPHa+qEQT8=", + "lastModified": 1744440957, + "narHash": "sha256-FHlSkNqFmPxPJvy+6fNLaNeWnF1lZSgqVCl/eWaJRc4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a880f49904d68b5e53338d1e8c7bf80f59903928", + "rev": "26d499fc9f1d567283d5d56fcf367edd815dba1d", "type": "github" }, "original": { @@ -301,16 +244,15 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1727619874, - "narHash": "sha256-a4Jcd+vjQAzF675/7B1LN3U2ay22jfDAVA8pOml5J/0=", + "lastModified": 1744149594, + "narHash": "sha256-UnxvUJmytIEx6a9g4Bm0TvjgWWcxyvWAMgbn7IyGS3w=", "owner": "nixos", "repo": "nixpkgs", - "rev": "6710d0dd013f55809648dfb1265b8f85447d30a6", + "rev": "5a3f77c88fb11321441c40260244fada45acfc44", "type": "github" }, "original": { "owner": "nixos", - "ref": "6710d0dd013f55809648dfb1265b8f85447d30a6", "repo": "nixpkgs", "type": "github" } @@ -333,11 +275,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1744098102, - "narHash": "sha256-tzCdyIJj9AjysC3OuKA+tMD/kDEDAF9mICPDU7ix0JA=", + "lastModified": 1744932701, + "narHash": "sha256-fusHbZCyv126cyArUwwKrLdCkgVAIaa/fQJYFlCEqiU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c8cd81426f45942bb2906d5ed2fe21d2f19d95b7", + "rev": "b024ced1aac25639f8ca8fdfc2f8c4fbd66c48ef", "type": "github" }, "original": { @@ -349,11 +291,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1744096231, - "narHash": "sha256-kUfx3FKU1Etnua3EaKvpeuXs7zoFiAcli1gBwkPvGSs=", + "lastModified": 1744536153, + "narHash": "sha256-awS2zRgF4uTwrOKwwiJcByDzDOdo3Q1rPZbiHQg/N38=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b2b0718004cc9a5bca610326de0a82e6ea75920b", + "rev": "18dd725c29603f582cf1900e0d25f9f1063dbf11", "type": "github" }, "original": { @@ -370,11 +312,11 @@ "nuschtosSearch": "nuschtosSearch" }, "locked": { - "lastModified": 1744200902, - "narHash": "sha256-BqTLjxT1C1XfREDBQSxPrfKI9DBpZHBVLHzfXZs+h8M=", + "lastModified": 1745182672, + "narHash": "sha256-xh4O19Hre9LiJk0Aa3ZY/XlN00gAGhRUxCRz15j00JU=", "owner": "nix-community", "repo": "nixvim", - "rev": "51203927e395535c4a427295efed4e1b2ef8349b", + "rev": "6c4e2d9279e57369203ecfa159696c6a2af22130", "type": "github" }, "original": { @@ -385,7 +327,7 @@ }, "nuschtosSearch": { "inputs": { - "flake-utils": "flake-utils_3", + "flake-utils": "flake-utils_2", "ixx": "ixx", "nixpkgs": [ "nixvim", @@ -393,11 +335,11 @@ ] }, "locked": { - "lastModified": 1743683223, - "narHash": "sha256-LdXtHFvhEC3S64dphap1pkkzwjErbW65eH1VRerCUT0=", + "lastModified": 1745046075, + "narHash": "sha256-8v4y6k16Ra/fiecb4DxhsoOGtzLKgKlS+9/XJ9z0T2I=", "owner": "NuschtOS", "repo": "search", - "rev": "56a49ffef2908dad1e9a8adef1f18802bc760962", + "rev": "066afe8643274470f4a294442aadd988356a478f", "type": "github" }, "original": { @@ -406,10 +348,26 @@ "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", - "bisq1": "bisq1", + "btc-clients": "btc-clients", "nix-bitcoin": "nix-bitcoin", "nixpkgs": "nixpkgs_4", "nixpkgs-stable": "nixpkgs-stable", @@ -460,21 +418,6 @@ "repo": "default", "type": "github" } - }, - "systems_4": { - "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", From 73703aa09a2f599e567370004438edeabfd1fd49 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Thu, 24 Apr 2025 23:53:12 -0500 Subject: [PATCH 538/667] Updated Nixpkgs --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 8496b81..c5f2b3c 100755 --- a/flake.lock +++ b/flake.lock @@ -212,11 +212,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1744440957, - "narHash": "sha256-FHlSkNqFmPxPJvy+6fNLaNeWnF1lZSgqVCl/eWaJRc4=", + "lastModified": 1745487689, + "narHash": "sha256-FQoi3R0NjQeBAsEOo49b5tbDPcJSMWc3QhhaIi9eddw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "26d499fc9f1d567283d5d56fcf367edd815dba1d", + "rev": "5630cf13cceac06cefe9fc607e8dfa8fb342dde3", "type": "github" }, "original": { @@ -275,11 +275,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1744932701, - "narHash": "sha256-fusHbZCyv126cyArUwwKrLdCkgVAIaa/fQJYFlCEqiU=", + "lastModified": 1745391562, + "narHash": "sha256-sPwcCYuiEopaafePqlG826tBhctuJsLx/mhKKM5Fmjo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b024ced1aac25639f8ca8fdfc2f8c4fbd66c48ef", + "rev": "8a2f738d9d1f1d986b5a4cd2fd2061a7127237d7", "type": "github" }, "original": { @@ -291,11 +291,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1744536153, - "narHash": "sha256-awS2zRgF4uTwrOKwwiJcByDzDOdo3Q1rPZbiHQg/N38=", + "lastModified": 1745377448, + "narHash": "sha256-jhZDfXVKdD7TSEGgzFJQvEEZ2K65UMiqW5YJ2aIqxMA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "18dd725c29603f582cf1900e0d25f9f1063dbf11", + "rev": "507b63021ada5fee621b6ca371c4fca9ca46f52c", "type": "github" }, "original": { @@ -312,11 +312,11 @@ "nuschtosSearch": "nuschtosSearch" }, "locked": { - "lastModified": 1745182672, - "narHash": "sha256-xh4O19Hre9LiJk0Aa3ZY/XlN00gAGhRUxCRz15j00JU=", + "lastModified": 1745538632, + "narHash": "sha256-f2BzxQNoMF+wb+7b5O5p3fQ5r7I9u0ezzGBq2f38kl8=", "owner": "nix-community", "repo": "nixvim", - "rev": "6c4e2d9279e57369203ecfa159696c6a2af22130", + "rev": "d86fe3df569c748b2632cfa5d27da0ea59709212", "type": "github" }, "original": { From ae74af0436c3bef84df459915fe2a1f77ee0949f Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Tue, 6 May 2025 15:22:49 -0500 Subject: [PATCH 539/667] Nixpkgs Update --- flake.lock | 54 +++++++++++++++++++++++++++--------------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/flake.lock b/flake.lock index c5f2b3c..d840fad 100755 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1736955230, - "narHash": "sha256-uenf8fv2eG5bKM8C/UvFaiJMZ4IpUFaQxk9OH5t/1gA=", + "lastModified": 1745630506, + "narHash": "sha256-bHCFgGeu8XjWlVuaWzi3QONjDW3coZDqSHvnd4l7xus=", "owner": "ryantm", "repo": "agenix", - "rev": "e600439ec4c273cf11e06fe4d9d906fb98fa097c", + "rev": "96e078c646b711aee04b82ba01aefbff87004ded", "type": "github" }, "original": { @@ -27,11 +27,11 @@ "oldNixpkgs": "oldNixpkgs" }, "locked": { - "lastModified": 1744151825, - "narHash": "sha256-/bx2DPQ2AuUdlVAQBIWQmaRVSNgeDYdJPMUelpVJBuU=", + "lastModified": 1746464518, + "narHash": "sha256-AS2BIXwoE1Ji0F11QQ3CJmhDqzOV1UYcDSYCN3ADwoE=", "owner": "emmanuelrosa", "repo": "btc-clients-nix", - "rev": "8d6c5e094912d9858bde0f7b5f078238b2e24ab6", + "rev": "b38c43bf939ebd58b84fa8d8b4f179ef1d880568", "type": "github" }, "original": { @@ -131,11 +131,11 @@ ] }, "locked": { - "lastModified": 1703113217, - "narHash": "sha256-7ulcXOk63TIT2lVDSExj7XzFx09LpdSAPtvgtM7yQPE=", + "lastModified": 1745494811, + "narHash": "sha256-YZCh2o9Ua1n9uCvrvi5pRxtuVNml8X2a03qIFfRKpFs=", "owner": "nix-community", "repo": "home-manager", - "rev": "3bfaacf46133c037bb356193bd2f1765d9dc82c1", + "rev": "abfad3d2958c9e6300a883bd443512c55dfeb1be", "type": "github" }, "original": { @@ -196,11 +196,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1703013332, - "narHash": "sha256-+tFNwMvlXLbJZXiMHqYq77z/RfmpfpiI3yjL6o/Zo9M=", + "lastModified": 1745391562, + "narHash": "sha256-sPwcCYuiEopaafePqlG826tBhctuJsLx/mhKKM5Fmjo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "54aac082a4d9bb5bbc5c4e899603abfb76a3f6d6", + "rev": "8a2f738d9d1f1d986b5a4cd2fd2061a7127237d7", "type": "github" }, "original": { @@ -212,11 +212,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1745487689, - "narHash": "sha256-FQoi3R0NjQeBAsEOo49b5tbDPcJSMWc3QhhaIi9eddw=", + "lastModified": 1746422338, + "narHash": "sha256-NTtKOTLQv6dPfRe00OGSywg37A1FYqldS6xiNmqBUYc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5630cf13cceac06cefe9fc607e8dfa8fb342dde3", + "rev": "5b35d248e9206c1f3baf8de6a7683fee126364aa", "type": "github" }, "original": { @@ -244,11 +244,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1744149594, - "narHash": "sha256-UnxvUJmytIEx6a9g4Bm0TvjgWWcxyvWAMgbn7IyGS3w=", + "lastModified": 1745997950, + "narHash": "sha256-FklMkU+bPPx0L3i6pdrw65js05VO9He3DTeKguX9GQY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5a3f77c88fb11321441c40260244fada45acfc44", + "rev": "cf3ffa5d140899101f1deb3f4d16b1a1aa2de849", "type": "github" }, "original": { @@ -275,11 +275,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1745391562, - "narHash": "sha256-sPwcCYuiEopaafePqlG826tBhctuJsLx/mhKKM5Fmjo=", + "lastModified": 1746461020, + "narHash": "sha256-7+pG1I9jvxNlmln4YgnlW4o+w0TZX24k688mibiFDUE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8a2f738d9d1f1d986b5a4cd2fd2061a7127237d7", + "rev": "3730d8a308f94996a9ba7c7138ede69c1b9ac4ae", "type": "github" }, "original": { @@ -291,11 +291,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1745377448, - "narHash": "sha256-jhZDfXVKdD7TSEGgzFJQvEEZ2K65UMiqW5YJ2aIqxMA=", + "lastModified": 1746397377, + "narHash": "sha256-5oLdRa3vWSRbuqPIFFmQBGGUqaYZBxX+GGtN9f/n4lU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "507b63021ada5fee621b6ca371c4fca9ca46f52c", + "rev": "ed30f8aba41605e3ab46421e3dcb4510ec560ff8", "type": "github" }, "original": { @@ -312,11 +312,11 @@ "nuschtosSearch": "nuschtosSearch" }, "locked": { - "lastModified": 1745538632, - "narHash": "sha256-f2BzxQNoMF+wb+7b5O5p3fQ5r7I9u0ezzGBq2f38kl8=", + "lastModified": 1746536883, + "narHash": "sha256-EJax0aiJIVJlqF7QyAefZ9fi1HgGcm7U1rBkcm2Z3Ps=", "owner": "nix-community", "repo": "nixvim", - "rev": "d86fe3df569c748b2632cfa5d27da0ea59709212", + "rev": "c26f5c2e31c1da895bf9289783ff8e2fe3637ca0", "type": "github" }, "original": { From 659c727b9f74a6c9f89cdedf1dd7db19ed46b3a4 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Wed, 7 May 2025 13:56:31 -0500 Subject: [PATCH 540/667] Nixpkgs Update --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index d840fad..7d2eefe 100755 --- a/flake.lock +++ b/flake.lock @@ -212,11 +212,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1746422338, - "narHash": "sha256-NTtKOTLQv6dPfRe00OGSywg37A1FYqldS6xiNmqBUYc=", + "lastModified": 1746557022, + "narHash": "sha256-QkNoyEf6TbaTW5UZYX0OkwIJ/ZMeKSSoOMnSDPQuol0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5b35d248e9206c1f3baf8de6a7683fee126364aa", + "rev": "1d3aeb5a193b9ff13f63f4d9cc169fb88129f860", "type": "github" }, "original": { From 6dc247815c947da8c02c50d1d10975e3cfbb1f49 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Tue, 27 May 2025 18:15:53 -0500 Subject: [PATCH 541/667] Nixpkgs, Bitcoin Software Update --- flake.lock | 86 ++++++++++++++++++++++++++++++++---------------------- 1 file changed, 51 insertions(+), 35 deletions(-) diff --git a/flake.lock b/flake.lock index 7d2eefe..0a535bd 100755 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1745630506, - "narHash": "sha256-bHCFgGeu8XjWlVuaWzi3QONjDW3coZDqSHvnd4l7xus=", + "lastModified": 1747575206, + "narHash": "sha256-NwmAFuDUO/PFcgaGGr4j3ozG9Pe5hZ/ogitWhY+D81k=", "owner": "ryantm", "repo": "agenix", - "rev": "96e078c646b711aee04b82ba01aefbff87004ded", + "rev": "4835b1dc898959d8547a871ef484930675cb47f1", "type": "github" }, "original": { @@ -27,11 +27,11 @@ "oldNixpkgs": "oldNixpkgs" }, "locked": { - "lastModified": 1746464518, - "narHash": "sha256-AS2BIXwoE1Ji0F11QQ3CJmhDqzOV1UYcDSYCN3ADwoE=", + "lastModified": 1747853558, + "narHash": "sha256-F52wpsLKfkW1jMdNLeWVTtxbYm3/zpkiK0bezJS4CVs=", "owner": "emmanuelrosa", "repo": "btc-clients-nix", - "rev": "b38c43bf939ebd58b84fa8d8b4f179ef1d880568", + "rev": "70f6e611fc1382873e4153b12397a0cf4ca99df2", "type": "github" }, "original": { @@ -158,16 +158,16 @@ ] }, "locked": { - "lastModified": 1737371634, - "narHash": "sha256-fTVAWzT1UMm1lT+YxHuVPtH+DATrhYfea3B0MxG/cGw=", + "lastModified": 1748294338, + "narHash": "sha256-FVO01jdmUNArzBS7NmaktLdGA5qA3lUMJ4B7a05Iynw=", "owner": "NuschtOS", "repo": "ixx", - "rev": "a1176e2a10ce745ff8f63e4af124ece8fe0b1648", + "rev": "cc5f390f7caf265461d4aab37e98d2292ebbdb85", "type": "github" }, "original": { "owner": "NuschtOS", - "ref": "v0.0.7", + "ref": "v0.0.8", "repo": "ixx", "type": "github" } @@ -180,11 +180,11 @@ "nixpkgs-unstable": "nixpkgs-unstable" }, "locked": { - "lastModified": 1743155549, - "narHash": "sha256-yU7iYlDSD8lOrm02igxIl3y+bXGZDDO0qcG0gO48Cto=", + "lastModified": 1748187031, + "narHash": "sha256-F4zdOfeg0xjEnvFjlHvoMmdmh/FxK1qIsZyscnGDgA0=", "owner": "fort-nix", "repo": "nix-bitcoin", - "rev": "990805aa7c7fcd1552c6e14e8c6df9a88ba9be41", + "rev": "a06d1d8118865af14a9187e7d1a7a141dd89af74", "type": "github" }, "original": { @@ -212,11 +212,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1746557022, - "narHash": "sha256-QkNoyEf6TbaTW5UZYX0OkwIJ/ZMeKSSoOMnSDPQuol0=", + "lastModified": 1748037224, + "narHash": "sha256-92vihpZr6dwEMV6g98M5kHZIttrWahb9iRPBm1atcPk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "1d3aeb5a193b9ff13f63f4d9cc169fb88129f860", + "rev": "f09dede81861f3a83f7f06641ead34f02f37597f", "type": "github" }, "original": { @@ -228,11 +228,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1742923925, - "narHash": "sha256-biPjLws6FiBVUUDHEMFq5pUQL84Wf7PntPYdo3oKkFw=", + "lastModified": 1747958103, + "narHash": "sha256-qmmFCrfBwSHoWw7cVK4Aj+fns+c54EBP8cGqp/yK410=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "25d1b84f5c90632a623c48d83a2faf156451e6b1", + "rev": "fe51d34885f7b5e3e7b59572796e1bcb427eccb1", "type": "github" }, "original": { @@ -259,11 +259,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1742937945, - "narHash": "sha256-lWc+79eZRyvHp/SqMhHTMzZVhpxkRvthsP1Qx6UCq0E=", + "lastModified": 1748037224, + "narHash": "sha256-92vihpZr6dwEMV6g98M5kHZIttrWahb9iRPBm1atcPk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d02d88f8de5b882ccdde0465d8fa2db3aa1169f7", + "rev": "f09dede81861f3a83f7f06641ead34f02f37597f", "type": "github" }, "original": { @@ -275,11 +275,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1746461020, - "narHash": "sha256-7+pG1I9jvxNlmln4YgnlW4o+w0TZX24k688mibiFDUE=", + "lastModified": 1748190013, + "narHash": "sha256-R5HJFflOfsP5FBtk+zE8FpL8uqE7n62jqOsADvVshhE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3730d8a308f94996a9ba7c7138ede69c1b9ac4ae", + "rev": "62b852f6c6742134ade1abdd2a21685fd617a291", "type": "github" }, "original": { @@ -291,11 +291,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1746397377, - "narHash": "sha256-5oLdRa3vWSRbuqPIFFmQBGGUqaYZBxX+GGtN9f/n4lU=", + "lastModified": 1748217807, + "narHash": "sha256-P3u2PXxMlo49PutQLnk2PhI/imC69hFl1yY4aT5Nax8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ed30f8aba41605e3ab46421e3dcb4510ec560ff8", + "rev": "3108eaa516ae22c2360928589731a4f1581526ef", "type": "github" }, "original": { @@ -309,14 +309,15 @@ "inputs": { "flake-parts": "flake-parts", "nixpkgs": "nixpkgs_5", - "nuschtosSearch": "nuschtosSearch" + "nuschtosSearch": "nuschtosSearch", + "systems": "systems_4" }, "locked": { - "lastModified": 1746536883, - "narHash": "sha256-EJax0aiJIVJlqF7QyAefZ9fi1HgGcm7U1rBkcm2Z3Ps=", + "lastModified": 1748348238, + "narHash": "sha256-etRxo4m9zbKuZbb1Tjt20mab7hc9bQGIlm+U5X4sctc=", "owner": "nix-community", "repo": "nixvim", - "rev": "c26f5c2e31c1da895bf9289783ff8e2fe3637ca0", + "rev": "65b1bffd3d36e9392083c6efcf2e087921afa86e", "type": "github" }, "original": { @@ -335,11 +336,11 @@ ] }, "locked": { - "lastModified": 1745046075, - "narHash": "sha256-8v4y6k16Ra/fiecb4DxhsoOGtzLKgKlS+9/XJ9z0T2I=", + "lastModified": 1748298102, + "narHash": "sha256-PP11GVwUt7F4ZZi5A5+99isuq39C59CKc5u5yVisU/U=", "owner": "NuschtOS", "repo": "search", - "rev": "066afe8643274470f4a294442aadd988356a478f", + "rev": "f8a1c221afb8b4c642ed11ac5ee6746b0fe1d32f", "type": "github" }, "original": { @@ -418,6 +419,21 @@ "repo": "default", "type": "github" } + }, + "systems_4": { + "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", From e40c043d1c9ae47d5018228f6a090caf61ae8c25 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Sat, 7 Jun 2025 20:00:28 -0500 Subject: [PATCH 542/667] Nixpkgs Update with Sparrow Update --- flake.lock | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index 0a535bd..6047318 100755 --- a/flake.lock +++ b/flake.lock @@ -27,11 +27,11 @@ "oldNixpkgs": "oldNixpkgs" }, "locked": { - "lastModified": 1747853558, - "narHash": "sha256-F52wpsLKfkW1jMdNLeWVTtxbYm3/zpkiK0bezJS4CVs=", + "lastModified": 1748868940, + "narHash": "sha256-MhFXrMQdxIHgUvQIJcKB+jT3a5qgf+K3mMYDja97fu4=", "owner": "emmanuelrosa", "repo": "btc-clients-nix", - "rev": "70f6e611fc1382873e4153b12397a0cf4ca99df2", + "rev": "bb9b143b5391c977dc739fadc87e00a6086dadce", "type": "github" }, "original": { @@ -212,11 +212,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1748037224, - "narHash": "sha256-92vihpZr6dwEMV6g98M5kHZIttrWahb9iRPBm1atcPk=", + "lastModified": 1749173751, + "narHash": "sha256-ENY3y3v6S9ZmLDDLI3LUT8MXmfXg/fSt2eA4GCnMVCE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "f09dede81861f3a83f7f06641ead34f02f37597f", + "rev": "ed29f002b6d6e5e7e32590deb065c34a31dc3e91", "type": "github" }, "original": { @@ -244,11 +244,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1745997950, - "narHash": "sha256-FklMkU+bPPx0L3i6pdrw65js05VO9He3DTeKguX9GQY=", + "lastModified": 1748868509, + "narHash": "sha256-mQlxDHHwHmZfRB4nZNibHndrJINfoaLMIYI8hdVXs5k=", "owner": "nixos", "repo": "nixpkgs", - "rev": "cf3ffa5d140899101f1deb3f4d16b1a1aa2de849", + "rev": "c9ee6d2f7c1d41b8cf7c39474d47d0c6b24a8de3", "type": "github" }, "original": { @@ -275,11 +275,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1748190013, - "narHash": "sha256-R5HJFflOfsP5FBtk+zE8FpL8uqE7n62jqOsADvVshhE=", + "lastModified": 1749143949, + "narHash": "sha256-QuUtALJpVrPnPeozlUG/y+oIMSLdptHxb3GK6cpSVhA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "62b852f6c6742134ade1abdd2a21685fd617a291", + "rev": "d3d2d80a2191a73d1e86456a751b83aa13085d7d", "type": "github" }, "original": { @@ -291,11 +291,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1748217807, - "narHash": "sha256-P3u2PXxMlo49PutQLnk2PhI/imC69hFl1yY4aT5Nax8=", + "lastModified": 1748406211, + "narHash": "sha256-B3BsCRbc+x/d0WiG1f+qfSLUy+oiIfih54kalWBi+/M=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3108eaa516ae22c2360928589731a4f1581526ef", + "rev": "3d1f29646e4b57ed468d60f9d286cde23a8d1707", "type": "github" }, "original": { @@ -313,11 +313,11 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1748348238, - "narHash": "sha256-etRxo4m9zbKuZbb1Tjt20mab7hc9bQGIlm+U5X4sctc=", + "lastModified": 1749200997, + "narHash": "sha256-In+NjXI8kfJpamTmtytt+rnBzQ213Y9KW55IXvAAK/4=", "owner": "nix-community", "repo": "nixvim", - "rev": "65b1bffd3d36e9392083c6efcf2e087921afa86e", + "rev": "00524c7935f05606fd1b09e8700e9abcc4af7be8", "type": "github" }, "original": { From a865a124d328eb2a7ba5447028a3cec19a2b907a Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Sat, 7 Jun 2025 20:12:27 -0500 Subject: [PATCH 543/667] updated configuration.nix --- configuration.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configuration.nix b/configuration.nix index 377b554..d46772b 100755 --- a/configuration.nix +++ b/configuration.nix @@ -47,8 +47,8 @@ in services.xserver.enable = true; # Enable the GNOME Desktop Environment. - services.xserver.displayManager.gdm.enable = true; - services.xserver.desktopManager.gnome.enable = true; + services.displayManager.gdm.enable = true; + services.desktopManager.gnome.enable = true; # Configure keymap in X11 services.xserver.xkb = { From e209a3bc94d14010502f1d7ceecc185a32f81002 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Sat, 7 Jun 2025 20:21:04 -0500 Subject: [PATCH 544/667] updated configuration.nix again --- configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configuration.nix b/configuration.nix index d46772b..a6f13b8 100755 --- a/configuration.nix +++ b/configuration.nix @@ -296,7 +296,7 @@ in ####### KEEP AWAKE for DISPLAY and HEADLESS ####### - services.xserver.displayManager.gdm.autoSuspend = false; + services.displayManager.gdm.autoSuspend = false; systemd.sleep.extraConfig = '' AllowSuspend=no From cc6208072e3139fa80b0d065dfbe52c34d559153 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Sun, 22 Jun 2025 19:14:27 -0500 Subject: [PATCH 545/667] removed nextcloud client and gnome extension --- configuration.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/configuration.nix b/configuration.nix index a6f13b8..36cf444 100755 --- a/configuration.nix +++ b/configuration.nix @@ -109,13 +109,11 @@ in htop btop gnomeExtensions.dash-to-dock - gnomeExtensions.transparent-top-bar-adjustable-transparency gnomeExtensions.vitals gnomeExtensions.pop-shell gnomeExtensions.just-perfection gnomeExtensions.appindicator gnomeExtensions.date-menu-formatter - gnomeExtensions.espresso gnome-tweaks papirus-icon-theme ranger @@ -143,10 +141,8 @@ in gnome-terminal libreoffice-fresh dig - nextcloud-client firefox element-desktop - helix wp-cli ]; From f829f908a5a8dde8469dc78ad4e1e0bf3be91ca2 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Sun, 22 Jun 2025 19:41:49 -0500 Subject: [PATCH 546/667] Nixpkgsk Update and NixBitcoin Update --- flake.lock | 68 +++++++++++++++++++++++++++--------------------------- 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/flake.lock b/flake.lock index 6047318..0b6799b 100755 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1747575206, - "narHash": "sha256-NwmAFuDUO/PFcgaGGr4j3ozG9Pe5hZ/ogitWhY+D81k=", + "lastModified": 1750173260, + "narHash": "sha256-9P1FziAwl5+3edkfFcr5HeGtQUtrSdk/MksX39GieoA=", "owner": "ryantm", "repo": "agenix", - "rev": "4835b1dc898959d8547a871ef484930675cb47f1", + "rev": "531beac616433bac6f9e2a19feb8e99a22a66baf", "type": "github" }, "original": { @@ -27,11 +27,11 @@ "oldNixpkgs": "oldNixpkgs" }, "locked": { - "lastModified": 1748868940, - "narHash": "sha256-MhFXrMQdxIHgUvQIJcKB+jT3a5qgf+K3mMYDja97fu4=", + "lastModified": 1749558209, + "narHash": "sha256-x9NAbshKZuf+Bfa2Q1GS/HNjy0eGyMo7aVPP1pcd3oY=", "owner": "emmanuelrosa", "repo": "btc-clients-nix", - "rev": "bb9b143b5391c977dc739fadc87e00a6086dadce", + "rev": "9a656628c10f2c7e76df0d2f93122506511a1c14", "type": "github" }, "original": { @@ -74,11 +74,11 @@ ] }, "locked": { - "lastModified": 1743550720, - "narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=", + "lastModified": 1749398372, + "narHash": "sha256-tYBdgS56eXYaWVW3fsnPQ/nFlgWi/Z2Ymhyu21zVM98=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "c621e8422220273271f52058f618c94e405bb0f5", + "rev": "9305fe4e5c2a6fcf5ba6a3ff155720fbe4076569", "type": "github" }, "original": { @@ -180,11 +180,11 @@ "nixpkgs-unstable": "nixpkgs-unstable" }, "locked": { - "lastModified": 1748187031, - "narHash": "sha256-F4zdOfeg0xjEnvFjlHvoMmdmh/FxK1qIsZyscnGDgA0=", + "lastModified": 1749652690, + "narHash": "sha256-qLwBEXlGY2pLNPhPNpeOE0DNC1luovTYE3ZDPMyMPXc=", "owner": "fort-nix", "repo": "nix-bitcoin", - "rev": "a06d1d8118865af14a9187e7d1a7a141dd89af74", + "rev": "ac1344fb6d91e2af219803eaaa67d1d974666156", "type": "github" }, "original": { @@ -212,11 +212,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1749173751, - "narHash": "sha256-ENY3y3v6S9ZmLDDLI3LUT8MXmfXg/fSt2eA4GCnMVCE=", + "lastModified": 1750330365, + "narHash": "sha256-hJ7XMNVsTnnbV2NPmStCC07gvv5l2x7+Skb7hyUzazg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ed29f002b6d6e5e7e32590deb065c34a31dc3e91", + "rev": "d883b6213afa179b58ba8bace834f1419707d0ad", "type": "github" }, "original": { @@ -228,11 +228,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1747958103, - "narHash": "sha256-qmmFCrfBwSHoWw7cVK4Aj+fns+c54EBP8cGqp/yK410=", + "lastModified": 1749558678, + "narHash": "sha256-DUVAe8E2X2QM0dAnTGlTiqemMqUMMyIeCH7UeNo0g64=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fe51d34885f7b5e3e7b59572796e1bcb427eccb1", + "rev": "a12f3a99614894502e73eb816e9e076b0ab05730", "type": "github" }, "original": { @@ -259,27 +259,27 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1748037224, - "narHash": "sha256-92vihpZr6dwEMV6g98M5kHZIttrWahb9iRPBm1atcPk=", + "lastModified": 1749494155, + "narHash": "sha256-FG4DEYBpROupu758beabUk9lhrblSf5hnv84v1TLqMc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f09dede81861f3a83f7f06641ead34f02f37597f", + "rev": "88331c17ba434359491e8d5889cce872464052c2", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-24.11", + "ref": "nixos-25.05", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_4": { "locked": { - "lastModified": 1749143949, - "narHash": "sha256-QuUtALJpVrPnPeozlUG/y+oIMSLdptHxb3GK6cpSVhA=", + "lastModified": 1750506804, + "narHash": "sha256-VLFNc4egNjovYVxDGyBYTrvVCgDYgENp5bVi9fPTDYc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d3d2d80a2191a73d1e86456a751b83aa13085d7d", + "rev": "4206c4cb56751df534751b058295ea61357bbbaa", "type": "github" }, "original": { @@ -291,11 +291,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1748406211, - "narHash": "sha256-B3BsCRbc+x/d0WiG1f+qfSLUy+oiIfih54kalWBi+/M=", + "lastModified": 1750386251, + "narHash": "sha256-1ovgdmuDYVo5OUC5NzdF+V4zx2uT8RtsgZahxidBTyw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3d1f29646e4b57ed468d60f9d286cde23a8d1707", + "rev": "076e8c6678d8c54204abcb4b1b14c366835a58bb", "type": "github" }, "original": { @@ -313,11 +313,11 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1749200997, - "narHash": "sha256-In+NjXI8kfJpamTmtytt+rnBzQ213Y9KW55IXvAAK/4=", + "lastModified": 1750619045, + "narHash": "sha256-ucgldLHtLTbtk09NadxBWi8m4tE07VinTSECR+m9lN4=", "owner": "nix-community", "repo": "nixvim", - "rev": "00524c7935f05606fd1b09e8700e9abcc4af7be8", + "rev": "d2c3b26bf739686bcb08247692a99766f7c44a3b", "type": "github" }, "original": { @@ -336,11 +336,11 @@ ] }, "locked": { - "lastModified": 1748298102, - "narHash": "sha256-PP11GVwUt7F4ZZi5A5+99isuq39C59CKc5u5yVisU/U=", + "lastModified": 1749730855, + "narHash": "sha256-L3x2nSlFkXkM6tQPLJP3oCBMIsRifhIDPMQQdHO5xWo=", "owner": "NuschtOS", "repo": "search", - "rev": "f8a1c221afb8b4c642ed11ac5ee6746b0fe1d32f", + "rev": "8dfe5879dd009ff4742b668d9c699bc4b9761742", "type": "github" }, "original": { From 2c4f7b8a90e41c361ddcc17f0e5300042aaa7c0a Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Sun, 22 Jun 2025 21:16:31 -0500 Subject: [PATCH 547/667] removed jitsi --- custom-add-ons.md | 103 ++-------------------------------------------- 1 file changed, 4 insertions(+), 99 deletions(-) diff --git a/custom-add-ons.md b/custom-add-ons.md index 5d94690..57a6724 100644 --- a/custom-add-ons.md +++ b/custom-add-ons.md @@ -2,22 +2,17 @@ Add-ons are extra features you can have installed before your Sovran Pro is shipped to you. - -1. There is Jitsi Meet that is available to be added on. Jitsi is a video conference software in which you send a web link to a video conference and anyone can join. - -https://jitsi.org - - -2. There is also Bitcoin Knots Node available to be added instead of the regular Bitcoin Node. Bitcoin Knots allows a special filter to block unwanted, unusable, erroneous, yet harmless data on the Bitcoin Block chain. +1. There is also Bitcoin Knots Node available to be added instead of the regular Bitcoin Node. Bitcoin Knots allows a special filter to block unwanted, unusable, erroneous data on the Bitcoin Timechain chain. https://bitcoinknots.org -3. By default Sovran_SystemsOS runs LND as the default Lightning node software for BTCpayserver. You are now able to run CLN as the backend to BTCpayserver instead of LND. +2. By default Sovran_SystemsOS runs LND as the default Lightning node software for BTCpayserver. You are now able to run CLN as the backend to BTCpayserver instead of LND. https://blockstream.com/lightning/ -4. There is Mempool to be added on via a Tor connection. + +3. There is Mempool to be added on via a Tor connection. https://github.com/mempool/mempool @@ -25,96 +20,6 @@ https://github.com/mempool/mempool The code will be installed in the `custom.nix` file. -The code for Jitsi Meet is as follows: - -```nix -systemd.services.jitsi-videobridge-helper = { - - script = '' - - systemctl restart jitsi-videobridge2 jicofo jibri - - ''; - - unitConfig = { - Type = "simple"; - After = "btcpayserver.service"; - Requires = "network-online.target"; - }; - - serviceConfig = { - RemainAfterExit = "yes"; - Type = "oneshot"; - }; - - wantedBy = [ "multi-user.target" ]; - - }; - - - services.jitsi-videobridge.config = { - videobridge = { - http-servers = { - private = { - port = 8090; - }; - }; - }; - }; - - services.jitsi-meet = { - enable = true; - hostName = "**CUSTOM_DOMAIN_NAME**"; - config = { - enableWelcomePage = false; - prejoinPageEnabled = true; - defaultLang = "en"; - liveStreamingEnabled = false; - fileRecordingsEnabled = true; - fileRecordingsServiceEnabled = true; - localRecording = { - enable = true; - notifyAllParticipants = true; - }; - }; - - interfaceConfig = { - SHOW_JITSI_WATERMARK = false; - SHOW_WATERMARK_FOR_GUESTS = false; - }; - }; - - - services.jitsi-meet.caddy.enable = true; - services.jitsi-meet.nginx.enable = false; - services.jitsi-videobridge.openFirewall = true; - services.jitsi-meet.jibri.enable = true; - services.jibri.config = { - recording = { - recordings-directory = "/run/media/Second_Drive/BTCEcoandBackup/Jitsi_Recordings"; - }; - - - ffmpeg = { - video-encode-preset = "ultrafast"; - h264-constant-rate-factor = 40; - }; - - }; - - - services.jitsi-videobridge.nat.publicAddress = builtins.readFile /var/lib/secrets/external_ip; - services.jitsi-videobridge.nat.localAddress = builtins.readFile /var/lib/secrets/internal_ip; - - services.cron = { - enable = true; - systemCronJobs = [ - "*/15 * * * * root /run/current-system/sw/bin/bash /var/lib/internal_ip/internal_ip.sh" - ]; - }; -``` - - The code for Bitcoin Knots is as follows: ```nix From 041f2dbccdd5847f34b393ccccc60e70403c2d51 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Tue, 8 Jul 2025 14:30:31 -0500 Subject: [PATCH 548/667] added bigger buffer size --- configuration.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/configuration.nix b/configuration.nix index 36cf444..79d5cc5 100755 --- a/configuration.nix +++ b/configuration.nix @@ -30,7 +30,12 @@ in fileSystems."/boot/efi".options = [ "umask=0077" "defaults" ]; - nix.settings.experimental-features = [ "nix-command" "flakes" ]; + nix.settings = { + + experimental-features = [ "nix-command" "flakes" ]; + download-buffer-size = 524288000; + + }; networking.hostName = "nixos"; # Define your hostname. From 8b116d535bc0384b5a56b6718e14c75b31073b1c Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Wed, 16 Jul 2025 12:55:58 -0500 Subject: [PATCH 549/667] added btcserver-fix --- modules/btcpayserver-fix.nix | 8 ++++++++ modules/modules.nix | 1 + 2 files changed, 9 insertions(+) create mode 100644 modules/btcpayserver-fix.nix diff --git a/modules/btcpayserver-fix.nix b/modules/btcpayserver-fix.nix new file mode 100644 index 0000000..dfee4d0 --- /dev/null +++ b/modules/btcpayserver-fix.nix @@ -0,0 +1,8 @@ +{ config, pkgs, lib, ... }: + +{ + + systemd.services.postgresql.postStart = lib.mkForce ''''; + + +} diff --git a/modules/modules.nix b/modules/modules.nix index dc4fe3c..f596c89 100755 --- a/modules/modules.nix +++ b/modules/modules.nix @@ -10,6 +10,7 @@ ./bitcoinecosystem.nix ./vaultwarden.nix ./Sovran_SystemsOS_File_Fixes_And_New_Services.nix + ./btcpayserver-fix.nix ]; } From e8b48b0339d9f52d479714114e33ee79ce07c608 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Wed, 16 Jul 2025 13:00:24 -0500 Subject: [PATCH 550/667] Update Nixpkgs and Bitcoin client update --- flake.lock | 60 +++++++++++++++++++++++++++--------------------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/flake.lock b/flake.lock index 0b6799b..7499946 100755 --- a/flake.lock +++ b/flake.lock @@ -27,11 +27,11 @@ "oldNixpkgs": "oldNixpkgs" }, "locked": { - "lastModified": 1749558209, - "narHash": "sha256-x9NAbshKZuf+Bfa2Q1GS/HNjy0eGyMo7aVPP1pcd3oY=", + "lastModified": 1752424923, + "narHash": "sha256-fWWjIAEJ/GDSBDKKseb5VkuY4PIeeSAriWBg77frICU=", "owner": "emmanuelrosa", "repo": "btc-clients-nix", - "rev": "9a656628c10f2c7e76df0d2f93122506511a1c14", + "rev": "2f89d641a5f6a7b72b9025d87347c51e64d97db3", "type": "github" }, "original": { @@ -74,11 +74,11 @@ ] }, "locked": { - "lastModified": 1749398372, - "narHash": "sha256-tYBdgS56eXYaWVW3fsnPQ/nFlgWi/Z2Ymhyu21zVM98=", + "lastModified": 1751413152, + "narHash": "sha256-Tyw1RjYEsp5scoigs1384gIg6e0GoBVjms4aXFfRssQ=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "9305fe4e5c2a6fcf5ba6a3ff155720fbe4076569", + "rev": "77826244401ea9de6e3bac47c2db46005e1f30b5", "type": "github" }, "original": { @@ -180,11 +180,11 @@ "nixpkgs-unstable": "nixpkgs-unstable" }, "locked": { - "lastModified": 1749652690, - "narHash": "sha256-qLwBEXlGY2pLNPhPNpeOE0DNC1luovTYE3ZDPMyMPXc=", + "lastModified": 1751530600, + "narHash": "sha256-9YzlL/TIcVmuqXbN5VKEjzLAUO189h0DOBq9eNGgpaQ=", "owner": "fort-nix", "repo": "nix-bitcoin", - "rev": "ac1344fb6d91e2af219803eaaa67d1d974666156", + "rev": "e2ca2e496769a787a06c068acb43cb077c1fdc8c", "type": "github" }, "original": { @@ -212,11 +212,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1750330365, - "narHash": "sha256-hJ7XMNVsTnnbV2NPmStCC07gvv5l2x7+Skb7hyUzazg=", + "lastModified": 1751274312, + "narHash": "sha256-/bVBlRpECLVzjV19t5KMdMFWSwKLtb5RyXdjz3LJT+g=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d883b6213afa179b58ba8bace834f1419707d0ad", + "rev": "50ab793786d9de88ee30ec4e4c24fb4236fc2674", "type": "github" }, "original": { @@ -228,11 +228,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1749558678, - "narHash": "sha256-DUVAe8E2X2QM0dAnTGlTiqemMqUMMyIeCH7UeNo0g64=", + "lastModified": 1750994206, + "narHash": "sha256-3u6rEbIX9CN/5A5/mc3u0wIO1geZ0EhjvPBXmRDHqWM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a12f3a99614894502e73eb816e9e076b0ab05730", + "rev": "80d50fc87924c2a0d346372d242c27973cf8cdbf", "type": "github" }, "original": { @@ -244,11 +244,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1748868509, - "narHash": "sha256-mQlxDHHwHmZfRB4nZNibHndrJINfoaLMIYI8hdVXs5k=", + "lastModified": 1751186460, + "narHash": "sha256-tSnI50oYaXOi/SFUmJC+gZ2xE9pAhTnV0D2/3JoKL7g=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c9ee6d2f7c1d41b8cf7c39474d47d0c6b24a8de3", + "rev": "dd5540905b1a13176efa13fa2f8dac776bcb275a", "type": "github" }, "original": { @@ -259,11 +259,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1749494155, - "narHash": "sha256-FG4DEYBpROupu758beabUk9lhrblSf5hnv84v1TLqMc=", + "lastModified": 1750969886, + "narHash": "sha256-zW/OFnotiz/ndPFdebpo3X0CrbVNf22n4DjN2vxlb58=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "88331c17ba434359491e8d5889cce872464052c2", + "rev": "a676066377a2fe7457369dd37c31fd2263b662f4", "type": "github" }, "original": { @@ -275,11 +275,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1750506804, - "narHash": "sha256-VLFNc4egNjovYVxDGyBYTrvVCgDYgENp5bVi9fPTDYc=", + "lastModified": 1752480373, + "narHash": "sha256-JHQbm+OcGp32wAsXTE/FLYGNpb+4GLi5oTvCxwSoBOA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4206c4cb56751df534751b058295ea61357bbbaa", + "rev": "62e0f05ede1da0d54515d4ea8ce9c733f12d9f08", "type": "github" }, "original": { @@ -291,11 +291,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1750386251, - "narHash": "sha256-1ovgdmuDYVo5OUC5NzdF+V4zx2uT8RtsgZahxidBTyw=", + "lastModified": 1752077645, + "narHash": "sha256-HM791ZQtXV93xtCY+ZxG1REzhQenSQO020cu6rHtAPk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "076e8c6678d8c54204abcb4b1b14c366835a58bb", + "rev": "be9e214982e20b8310878ac2baa063a961c1bdf6", "type": "github" }, "original": { @@ -313,11 +313,11 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1750619045, - "narHash": "sha256-ucgldLHtLTbtk09NadxBWi8m4tE07VinTSECR+m9lN4=", + "lastModified": 1752546848, + "narHash": "sha256-WzHqmJ1wEZoUGAedomwcVLCuNsiB9bZzZXk7K9ZDBwk=", "owner": "nix-community", "repo": "nixvim", - "rev": "d2c3b26bf739686bcb08247692a99766f7c44a3b", + "rev": "1fb1bf8a73ccf207dbe967cdb7f2f4e0122c8bd5", "type": "github" }, "original": { From 30cdce121c806e0aafa5ba3e36e6bbc62cc04b87 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Sat, 2 Aug 2025 21:52:35 -0500 Subject: [PATCH 551/667] Nixpkgs Update and Bitcoin Client and Server Software Update --- flake.lock | 54 +++++++++++++++++++++++++++--------------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/flake.lock b/flake.lock index 7499946..9ab1442 100755 --- a/flake.lock +++ b/flake.lock @@ -27,11 +27,11 @@ "oldNixpkgs": "oldNixpkgs" }, "locked": { - "lastModified": 1752424923, - "narHash": "sha256-fWWjIAEJ/GDSBDKKseb5VkuY4PIeeSAriWBg77frICU=", + "lastModified": 1753100264, + "narHash": "sha256-r8GxTvfLcX9D4+2NHUfWyM+r0OsqgSHld9N+/QF5XXU=", "owner": "emmanuelrosa", "repo": "btc-clients-nix", - "rev": "2f89d641a5f6a7b72b9025d87347c51e64d97db3", + "rev": "2c87f483bcd868ab0dad2e7562496344eff77536", "type": "github" }, "original": { @@ -74,11 +74,11 @@ ] }, "locked": { - "lastModified": 1751413152, - "narHash": "sha256-Tyw1RjYEsp5scoigs1384gIg6e0GoBVjms4aXFfRssQ=", + "lastModified": 1753121425, + "narHash": "sha256-TVcTNvOeWWk1DXljFxVRp+E0tzG1LhrVjOGGoMHuXio=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "77826244401ea9de6e3bac47c2db46005e1f30b5", + "rev": "644e0fc48951a860279da645ba77fe4a6e814c5e", "type": "github" }, "original": { @@ -180,11 +180,11 @@ "nixpkgs-unstable": "nixpkgs-unstable" }, "locked": { - "lastModified": 1751530600, - "narHash": "sha256-9YzlL/TIcVmuqXbN5VKEjzLAUO189h0DOBq9eNGgpaQ=", + "lastModified": 1753079037, + "narHash": "sha256-c1MvgF+0dU75CmowEAez8oC+M9dtXZ5WKfDZzuFTkP0=", "owner": "fort-nix", "repo": "nix-bitcoin", - "rev": "e2ca2e496769a787a06c068acb43cb077c1fdc8c", + "rev": "5031e254696c72f36a7e41ddf70dacdf6bd83e46", "type": "github" }, "original": { @@ -228,11 +228,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1750994206, - "narHash": "sha256-3u6rEbIX9CN/5A5/mc3u0wIO1geZ0EhjvPBXmRDHqWM=", + "lastModified": 1752900028, + "narHash": "sha256-dPALCtmik9Wr14MGqVXm+OQcv7vhPBXcWNIOThGnB/Q=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "80d50fc87924c2a0d346372d242c27973cf8cdbf", + "rev": "6b4955211758ba47fac850c040a27f23b9b4008f", "type": "github" }, "original": { @@ -259,11 +259,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1750969886, - "narHash": "sha256-zW/OFnotiz/ndPFdebpo3X0CrbVNf22n4DjN2vxlb58=", + "lastModified": 1752866191, + "narHash": "sha256-NV4S2Lf2hYmZQ3Qf4t/YyyBaJNuxLPyjzvDma0zPp/M=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a676066377a2fe7457369dd37c31fd2263b662f4", + "rev": "f01fe91b0108a7aff99c99f2e9abbc45db0adc2a", "type": "github" }, "original": { @@ -275,11 +275,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1752480373, - "narHash": "sha256-JHQbm+OcGp32wAsXTE/FLYGNpb+4GLi5oTvCxwSoBOA=", + "lastModified": 1753939845, + "narHash": "sha256-K2ViRJfdVGE8tpJejs8Qpvvejks1+A4GQej/lBk5y7I=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "62e0f05ede1da0d54515d4ea8ce9c733f12d9f08", + "rev": "94def634a20494ee057c76998843c015909d6311", "type": "github" }, "original": { @@ -291,11 +291,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1752077645, - "narHash": "sha256-HM791ZQtXV93xtCY+ZxG1REzhQenSQO020cu6rHtAPk=", + "lastModified": 1753432016, + "narHash": "sha256-cnL5WWn/xkZoyH/03NNUS7QgW5vI7D1i74g48qplCvg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "be9e214982e20b8310878ac2baa063a961c1bdf6", + "rev": "6027c30c8e9810896b92429f0092f624f7b1aace", "type": "github" }, "original": { @@ -313,11 +313,11 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1752546848, - "narHash": "sha256-WzHqmJ1wEZoUGAedomwcVLCuNsiB9bZzZXk7K9ZDBwk=", + "lastModified": 1753977315, + "narHash": "sha256-AM3CZh+Emk/cr5Gf6RUf2xzkWdRB+yewP1YWoRxUbYQ=", "owner": "nix-community", "repo": "nixvim", - "rev": "1fb1bf8a73ccf207dbe967cdb7f2f4e0122c8bd5", + "rev": "a16c89c175277309fd3dd065fb5bc4eab450ae07", "type": "github" }, "original": { @@ -336,11 +336,11 @@ ] }, "locked": { - "lastModified": 1749730855, - "narHash": "sha256-L3x2nSlFkXkM6tQPLJP3oCBMIsRifhIDPMQQdHO5xWo=", + "lastModified": 1753450833, + "narHash": "sha256-Pmpke0JtLRzgdlwDC5a+aiLVZ11JPUO5Bcqkj0nHE/k=", "owner": "NuschtOS", "repo": "search", - "rev": "8dfe5879dd009ff4742b668d9c699bc4b9761742", + "rev": "40987cc1a24feba378438d691f87c52819f7bd75", "type": "github" }, "original": { From 9492ce415cd8cd6fe8cf388c3566c61c04397939 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Sat, 2 Aug 2025 21:57:43 -0500 Subject: [PATCH 552/667] update autologin --- configuration.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/configuration.nix b/configuration.nix index 79d5cc5..078156d 100755 --- a/configuration.nix +++ b/configuration.nix @@ -89,10 +89,6 @@ in services.displayManager.autoLogin.enable = true; services.displayManager.autoLogin.user = "free"; - # Workaround for GNOME autologin: https://github.com/NixOS/nixpkgs/issues/103746#issuecomment-945091229 - systemd.services."getty@tty1".enable = true; - systemd.services."autovt@tty1".enable = true; - # Allow Flatpak services.flatpak.enable = true; From b5a191320c1b7b987e1894e5c2881af1d5917f20 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Tue, 26 Aug 2025 14:14:14 -0500 Subject: [PATCH 553/667] Nixpkgs Update --- flake.lock | 82 +++++++++++++++++++++++++++--------------------------- 1 file changed, 41 insertions(+), 41 deletions(-) diff --git a/flake.lock b/flake.lock index 9ab1442..865ebb5 100755 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1750173260, - "narHash": "sha256-9P1FziAwl5+3edkfFcr5HeGtQUtrSdk/MksX39GieoA=", + "lastModified": 1754433428, + "narHash": "sha256-NA/FT2hVhKDftbHSwVnoRTFhes62+7dxZbxj5Gxvghs=", "owner": "ryantm", "repo": "agenix", - "rev": "531beac616433bac6f9e2a19feb8e99a22a66baf", + "rev": "9edb1787864c4f59ae5074ad498b6272b3ec308d", "type": "github" }, "original": { @@ -27,11 +27,11 @@ "oldNixpkgs": "oldNixpkgs" }, "locked": { - "lastModified": 1753100264, - "narHash": "sha256-r8GxTvfLcX9D4+2NHUfWyM+r0OsqgSHld9N+/QF5XXU=", + "lastModified": 1754324984, + "narHash": "sha256-Arn0ZOsSfQ3LvEYqLh7x0OF3uxooCBUodrzYCRYtIYA=", "owner": "emmanuelrosa", "repo": "btc-clients-nix", - "rev": "2c87f483bcd868ab0dad2e7562496344eff77536", + "rev": "74f8ee13d1d0de1af729b239b4d902824040466e", "type": "github" }, "original": { @@ -74,11 +74,11 @@ ] }, "locked": { - "lastModified": 1753121425, - "narHash": "sha256-TVcTNvOeWWk1DXljFxVRp+E0tzG1LhrVjOGGoMHuXio=", + "lastModified": 1754487366, + "narHash": "sha256-pHYj8gUBapuUzKV/kN/tR3Zvqc7o6gdFB9XKXIp1SQ8=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "644e0fc48951a860279da645ba77fe4a6e814c5e", + "rev": "af66ad14b28a127c5c0f3bbb298218fc63528a18", "type": "github" }, "original": { @@ -158,16 +158,16 @@ ] }, "locked": { - "lastModified": 1748294338, - "narHash": "sha256-FVO01jdmUNArzBS7NmaktLdGA5qA3lUMJ4B7a05Iynw=", + "lastModified": 1754860581, + "narHash": "sha256-EM0IE63OHxXCOpDHXaTyHIOk2cNvMCGPqLt/IdtVxgk=", "owner": "NuschtOS", "repo": "ixx", - "rev": "cc5f390f7caf265461d4aab37e98d2292ebbdb85", + "rev": "babfe85a876162c4acc9ab6fb4483df88fa1f281", "type": "github" }, "original": { "owner": "NuschtOS", - "ref": "v0.0.8", + "ref": "v0.1.1", "repo": "ixx", "type": "github" } @@ -180,11 +180,11 @@ "nixpkgs-unstable": "nixpkgs-unstable" }, "locked": { - "lastModified": 1753079037, - "narHash": "sha256-c1MvgF+0dU75CmowEAez8oC+M9dtXZ5WKfDZzuFTkP0=", + "lastModified": 1755588182, + "narHash": "sha256-CSF/5xwReoyeHa7++rklrjEaYhNdUGhpyE3plbY6vEs=", "owner": "fort-nix", "repo": "nix-bitcoin", - "rev": "5031e254696c72f36a7e41ddf70dacdf6bd83e46", + "rev": "21442ea33f5f7d95b7c7e51f5ed27971a53564b2", "type": "github" }, "original": { @@ -196,16 +196,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1745391562, - "narHash": "sha256-sPwcCYuiEopaafePqlG826tBhctuJsLx/mhKKM5Fmjo=", + "lastModified": 1754028485, + "narHash": "sha256-IiiXB3BDTi6UqzAZcf2S797hWEPCRZOwyNThJIYhUfk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8a2f738d9d1f1d986b5a4cd2fd2061a7127237d7", + "rev": "59e69648d345d6e8fef86158c555730fa12af9de", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable", + "ref": "nixos-25.05", "repo": "nixpkgs", "type": "github" } @@ -228,11 +228,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1752900028, - "narHash": "sha256-dPALCtmik9Wr14MGqVXm+OQcv7vhPBXcWNIOThGnB/Q=", + "lastModified": 1754772842, + "narHash": "sha256-aKmIQcvT857VRc3XbLvsuMdLeUuYfz+8zQ4eTXe78KE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6b4955211758ba47fac850c040a27f23b9b4008f", + "rev": "1ef586712f85b4b004caecd385d6b023e7fd2450", "type": "github" }, "original": { @@ -244,11 +244,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1751186460, - "narHash": "sha256-tSnI50oYaXOi/SFUmJC+gZ2xE9pAhTnV0D2/3JoKL7g=", + "lastModified": 1754002724, + "narHash": "sha256-1NBby4k2UU9FR7a9ioXtCOpv8jYO0tZAGarMsxN8sz8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "dd5540905b1a13176efa13fa2f8dac776bcb275a", + "rev": "8271ed4b2e366339dd622f329151e45745ade121", "type": "github" }, "original": { @@ -259,11 +259,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1752866191, - "narHash": "sha256-NV4S2Lf2hYmZQ3Qf4t/YyyBaJNuxLPyjzvDma0zPp/M=", + "lastModified": 1754689972, + "narHash": "sha256-eogqv6FqZXHgqrbZzHnq43GalnRbLTkbBbFtEfm1RSc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f01fe91b0108a7aff99c99f2e9abbc45db0adc2a", + "rev": "fc756aa6f5d3e2e5666efcf865d190701fef150a", "type": "github" }, "original": { @@ -275,11 +275,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1753939845, - "narHash": "sha256-K2ViRJfdVGE8tpJejs8Qpvvejks1+A4GQej/lBk5y7I=", + "lastModified": 1756125398, + "narHash": "sha256-XexyKZpf46cMiO5Vbj+dWSAXOnr285GHsMch8FBoHbc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "94def634a20494ee057c76998843c015909d6311", + "rev": "3b9f00d7a7bf68acd4c4abb9d43695afb04e03a5", "type": "github" }, "original": { @@ -291,11 +291,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1753432016, - "narHash": "sha256-cnL5WWn/xkZoyH/03NNUS7QgW5vI7D1i74g48qplCvg=", + "lastModified": 1755829505, + "narHash": "sha256-4/Jd+LkQ2ssw8luQVkqVs9spDBVE6h/u/hC/tzngsPo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6027c30c8e9810896b92429f0092f624f7b1aace", + "rev": "f937f8ecd1c70efd7e9f90ba13dfb400cf559de4", "type": "github" }, "original": { @@ -313,11 +313,11 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1753977315, - "narHash": "sha256-AM3CZh+Emk/cr5Gf6RUf2xzkWdRB+yewP1YWoRxUbYQ=", + "lastModified": 1756148061, + "narHash": "sha256-9QlWBvwDlizUa7YwlBnrmdXvh5pjaVGLG7u1N68VX5k=", "owner": "nix-community", "repo": "nixvim", - "rev": "a16c89c175277309fd3dd065fb5bc4eab450ae07", + "rev": "8e3ca3fc1f3ae23dee0e6d35dd4a70ea8ef7164c", "type": "github" }, "original": { @@ -336,11 +336,11 @@ ] }, "locked": { - "lastModified": 1753450833, - "narHash": "sha256-Pmpke0JtLRzgdlwDC5a+aiLVZ11JPUO5Bcqkj0nHE/k=", + "lastModified": 1755555503, + "narHash": "sha256-WiOO7GUOsJ4/DoMy2IC5InnqRDSo2U11la48vCCIjjY=", "owner": "NuschtOS", "repo": "search", - "rev": "40987cc1a24feba378438d691f87c52819f7bd75", + "rev": "6f3efef888b92e6520f10eae15b86ff537e1d2ea", "type": "github" }, "original": { From 4a0ee99a7482f90e77cf3703bb126f2008a04367 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Wed, 17 Sep 2025 22:01:04 -0500 Subject: [PATCH 554/667] Nixpkgs update --- flake.lock | 60 +++++++++++++++++++++++++++--------------------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/flake.lock b/flake.lock index 865ebb5..063be05 100755 --- a/flake.lock +++ b/flake.lock @@ -27,11 +27,11 @@ "oldNixpkgs": "oldNixpkgs" }, "locked": { - "lastModified": 1754324984, - "narHash": "sha256-Arn0ZOsSfQ3LvEYqLh7x0OF3uxooCBUodrzYCRYtIYA=", + "lastModified": 1757554433, + "narHash": "sha256-OY44IENa+YWjM4xUkjx25SS0MN66oWRHC/Mq2SmH34w=", "owner": "emmanuelrosa", "repo": "btc-clients-nix", - "rev": "74f8ee13d1d0de1af729b239b4d902824040466e", + "rev": "0adce0a2161bcf354d16744de5602d94016218be", "type": "github" }, "original": { @@ -74,11 +74,11 @@ ] }, "locked": { - "lastModified": 1754487366, - "narHash": "sha256-pHYj8gUBapuUzKV/kN/tR3Zvqc7o6gdFB9XKXIp1SQ8=", + "lastModified": 1756770412, + "narHash": "sha256-+uWLQZccFHwqpGqr2Yt5VsW/PbeJVTn9Dk6SHWhNRPw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "af66ad14b28a127c5c0f3bbb298218fc63528a18", + "rev": "4524271976b625a4a605beefd893f270620fd751", "type": "github" }, "original": { @@ -180,11 +180,11 @@ "nixpkgs-unstable": "nixpkgs-unstable" }, "locked": { - "lastModified": 1755588182, - "narHash": "sha256-CSF/5xwReoyeHa7++rklrjEaYhNdUGhpyE3plbY6vEs=", + "lastModified": 1757876184, + "narHash": "sha256-ezKJm8vzMb6bZf2lG+/s4AGhXtMvshEYBYqDT2PLtIU=", "owner": "fort-nix", "repo": "nix-bitcoin", - "rev": "21442ea33f5f7d95b7c7e51f5ed27971a53564b2", + "rev": "0c961fa789d69ccd9503d2548dca1a9285acf2ff", "type": "github" }, "original": { @@ -228,11 +228,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1754772842, - "narHash": "sha256-aKmIQcvT857VRc3XbLvsuMdLeUuYfz+8zQ4eTXe78KE=", + "lastModified": 1757584362, + "narHash": "sha256-XeTX/w16rUNUNBsfaOVCDoMMa7Xu7KvIMT7tn1zIEcg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1ef586712f85b4b004caecd385d6b023e7fd2450", + "rev": "d33e926c80e6521a55da380a4c4c44a7462af405", "type": "github" }, "original": { @@ -244,11 +244,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1754002724, - "narHash": "sha256-1NBby4k2UU9FR7a9ioXtCOpv8jYO0tZAGarMsxN8sz8=", + "lastModified": 1756686622, + "narHash": "sha256-7RIjltx7tQAr/pDmcb/zNNgRtUDlXh+EppSEqD4IIa8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "8271ed4b2e366339dd622f329151e45745ade121", + "rev": "23da0aa9ec413ed894af3fdc6313e6b8ff623833", "type": "github" }, "original": { @@ -259,11 +259,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1754689972, - "narHash": "sha256-eogqv6FqZXHgqrbZzHnq43GalnRbLTkbBbFtEfm1RSc=", + "lastModified": 1757545623, + "narHash": "sha256-mCxPABZ6jRjUQx3bPP4vjA68ETbPLNz9V2pk9tO7pRQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fc756aa6f5d3e2e5666efcf865d190701fef150a", + "rev": "8cd5ce828d5d1d16feff37340171a98fc3bf6526", "type": "github" }, "original": { @@ -275,11 +275,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1756125398, - "narHash": "sha256-XexyKZpf46cMiO5Vbj+dWSAXOnr285GHsMch8FBoHbc=", + "lastModified": 1757745802, + "narHash": "sha256-hLEO2TPj55KcUFUU1vgtHE9UEIOjRcH/4QbmfHNF820=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3b9f00d7a7bf68acd4c4abb9d43695afb04e03a5", + "rev": "c23193b943c6c689d70ee98ce3128239ed9e32d1", "type": "github" }, "original": { @@ -291,11 +291,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1755829505, - "narHash": "sha256-4/Jd+LkQ2ssw8luQVkqVs9spDBVE6h/u/hC/tzngsPo=", + "lastModified": 1757967192, + "narHash": "sha256-/aA9A/OBmnuOMgwfzdsXRusqzUpd8rQnQY8jtrHK+To=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f937f8ecd1c70efd7e9f90ba13dfb400cf559de4", + "rev": "0d7c15863b251a7a50265e57c1dca1a7add2e291", "type": "github" }, "original": { @@ -313,11 +313,11 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1756148061, - "narHash": "sha256-9QlWBvwDlizUa7YwlBnrmdXvh5pjaVGLG7u1N68VX5k=", + "lastModified": 1758134550, + "narHash": "sha256-Rj0v5VZuljxG4trz3IHJedEKghNDd1HsK6yVwTNPyJ0=", "owner": "nix-community", "repo": "nixvim", - "rev": "8e3ca3fc1f3ae23dee0e6d35dd4a70ea8ef7164c", + "rev": "0c867f9e635ce70e829a562b20851cfc17a94196", "type": "github" }, "original": { @@ -336,11 +336,11 @@ ] }, "locked": { - "lastModified": 1755555503, - "narHash": "sha256-WiOO7GUOsJ4/DoMy2IC5InnqRDSo2U11la48vCCIjjY=", + "lastModified": 1757885130, + "narHash": "sha256-56CMb5W/pgjKLh0bx2ekhn5rde/YmgR63HAqrY9/BCw=", "owner": "NuschtOS", "repo": "search", - "rev": "6f3efef888b92e6520f10eae15b86ff537e1d2ea", + "rev": "fae3c59a646e00c4b1d359c50b27458a0713d2fd", "type": "github" }, "original": { From bc4ac44e7b6492b1212ddcba96357731693a6762 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Fri, 19 Sep 2025 10:20:08 -0500 Subject: [PATCH 555/667] updated custom to reflect Knots --- custom-add-ons.md | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/custom-add-ons.md b/custom-add-ons.md index 57a6724..270dfa6 100644 --- a/custom-add-ons.md +++ b/custom-add-ons.md @@ -2,9 +2,9 @@ Add-ons are extra features you can have installed before your Sovran Pro is shipped to you. -1. There is also Bitcoin Knots Node available to be added instead of the regular Bitcoin Node. Bitcoin Knots allows a special filter to block unwanted, unusable, erroneous data on the Bitcoin Timechain chain. +1. Since Sovran_SystemsOS runs Bitcoin Knots by default as opposed to Bitcion Core, you can customize your Sovran Pro or Sovran Pro Max node to run Bitcoin Core. -https://bitcoinknots.org +https://github.com/bitcoin/bitcoin 2. By default Sovran_SystemsOS runs LND as the default Lightning node software for BTCpayserver. You are now able to run CLN as the backend to BTCpayserver instead of LND. @@ -20,19 +20,21 @@ https://github.com/mempool/mempool The code will be installed in the `custom.nix` file. -The code for Bitcoin Knots is as follows: +The code for Bitcoin Core is as follows: ```nix -services.bitcoind.package = pkgs.bitcoind-knots; +services.bitcoind.package = mkForce config.nix-bitcoin.pkgs.bitcoind; + ``` The code for CLN for BTCpayserver backend is as follows: ```nix -services.btcpayserver.lightningBackend = mkForce "clightning"; +services.btcpayserver.lightningBackend = mkForce clightning; ``` + The code for Mempool is as follows: ```nix From c71ea024476004ebded54bd34992b5885130ce24 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Fri, 19 Sep 2025 10:22:50 -0500 Subject: [PATCH 556/667] updated custom to reflect Knots --- custom-add-ons.md | 1 - 1 file changed, 1 deletion(-) diff --git a/custom-add-ons.md b/custom-add-ons.md index 270dfa6..61201e0 100644 --- a/custom-add-ons.md +++ b/custom-add-ons.md @@ -24,7 +24,6 @@ The code for Bitcoin Core is as follows: ```nix services.bitcoind.package = mkForce config.nix-bitcoin.pkgs.bitcoind; - ``` From faeb6566306565cec733004c1f6c74c1a95dbb4d Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Fri, 19 Sep 2025 10:25:42 -0500 Subject: [PATCH 557/667] revised custom-add-on --- custom-add-ons.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/custom-add-ons.md b/custom-add-ons.md index 61201e0..8dc318f 100644 --- a/custom-add-ons.md +++ b/custom-add-ons.md @@ -30,7 +30,7 @@ services.bitcoind.package = mkForce config.nix-bitcoin.pkgs.bitcoind; The code for CLN for BTCpayserver backend is as follows: ```nix -services.btcpayserver.lightningBackend = mkForce clightning; +services.btcpayserver.lightningBackend = mkForce "clightning"; ``` From b3a764616d969a44d635ead30054b276b07f42d0 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Fri, 19 Sep 2025 22:13:29 -0500 Subject: [PATCH 558/667] revised custom-add-on (2) --- custom-add-ons.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/custom-add-ons.md b/custom-add-ons.md index 8dc318f..dc880c2 100644 --- a/custom-add-ons.md +++ b/custom-add-ons.md @@ -23,14 +23,14 @@ The code will be installed in the `custom.nix` file. The code for Bitcoin Core is as follows: ```nix -services.bitcoind.package = mkForce config.nix-bitcoin.pkgs.bitcoind; +services.bitcoind.package = lib.mkForce config.nix-bitcoin.pkgs.bitcoind; ``` The code for CLN for BTCpayserver backend is as follows: ```nix -services.btcpayserver.lightningBackend = mkForce "clightning"; +services.btcpayserver.lightningBackend = lib.mkForce "clightning"; ``` From eb05d18cd11fcbdf5ba7e27db1d3a7eaf3e630d6 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Fri, 24 Oct 2025 15:32:04 -0500 Subject: [PATCH 559/667] added axel --- configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/configuration.nix b/configuration.nix index 078156d..0320bd1 100755 --- a/configuration.nix +++ b/configuration.nix @@ -145,6 +145,7 @@ in firefox element-desktop wp-cli + axel ]; From b95d105077e59af84b4caa5c8e3e5bdee4af1227 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Tue, 28 Oct 2025 14:31:44 -0500 Subject: [PATCH 560/667] removed out dated systemd-manager tooling --- configuration.nix | 8 ++--- flake.nix | 6 ++-- modules/systemd-manager_sovran_systems.nix | 41 ---------------------- 3 files changed, 7 insertions(+), 48 deletions(-) delete mode 100755 modules/systemd-manager_sovran_systems.nix diff --git a/configuration.nix b/configuration.nix index 0320bd1..ed40a82 100755 --- a/configuration.nix +++ b/configuration.nix @@ -103,13 +103,13 @@ in # List packages installed in system profile. To search, run: # $ nix search wget environment.systemPackages = with pkgs; [ - (callPackage ./modules/systemd-manager_sovran_systems.nix {}) git wget fish htop btop - gnomeExtensions.dash-to-dock + gnomeExtensions.systemd-manager + gnomeExtensions.dash-to-dock gnomeExtensions.vitals gnomeExtensions.pop-shell gnomeExtensions.just-perfection @@ -372,8 +372,8 @@ backup /etc/nix-bitcoin-secrets/ localhost/ ####### 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.allowedTCPPorts = [ 80 443 5349 8448 3051 ]; + networking.firewall.allowedUDPPorts = [ 80 443 5349 8448 3051 ]; networking.firewall.allowedUDPPortRanges = [ { from=49152; to=65535; } # TURN relay diff --git a/flake.nix b/flake.nix index 6ff0a82..d712f3f 100755 --- a/flake.nix +++ b/flake.nix @@ -1,5 +1,5 @@ { - description = "The Ultimate Sovran_SystemsOS Configuration for the Sovran Pro from Sovran Systems"; + description = "The Ultimate Sovran_SystemsOS Configuration from Sovran Systems"; inputs = { @@ -62,11 +62,11 @@ ]; environment.systemPackages = with pkgs; [ - btc-clients.packages.x86_64-linux.bisq + + btc-clients.packages.x86_64-linux.bisq btc-clients.packages.x86_64-linux.bisq2 btc-clients.packages.x86_64-linux.sparrow - ]; }; diff --git a/modules/systemd-manager_sovran_systems.nix b/modules/systemd-manager_sovran_systems.nix deleted file mode 100755 index 5b376f3..0000000 --- a/modules/systemd-manager_sovran_systems.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ lib, stdenv, fetchzip, buildPackages }: - -stdenv.mkDerivation rec { - pname = "systemd-manager"; - version = "18"; - - src = fetchzip { - url = "https://github.com/hardpixel/systemd-manager/releases/download/v${version}/systemd-manager-v${version}.zip"; - hash = "sha256-Kd8ZxZ1f6aR1vThrWStsjk8cHrjo2KCYQgpg1em/n2k="; - stripRoot = false; - }; - - passthru = { - extensionUuid = "systemd-manager@hardpixel.eu"; - extensionPortalSlug = "systemd-manager"; - }; - - nativeBuildInputs = [ buildPackages.glib ]; - - buildPhase = '' - runHook preBuild - if [ -d schemas ]; then - glib-compile-schemas --strict schemas - fi - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - mkdir -p $out/share/gnome-shell/extensions - cp -r -T . $out/share/gnome-shell/extensions/${passthru.extensionUuid} - runHook postInstall - ''; - - meta = with lib; { - description = "GNOME Shell extension to manage systemd services"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ ]; - homepage = "https://github.com/hardpixel/systemd-manager"; - }; -} From 7753dc5dc47251269eab5e1877ec4de4b549538b Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Tue, 28 Oct 2025 14:52:37 -0500 Subject: [PATCH 561/667] updated Bitcoin excosystem --- modules/bitcoinecosystem.nix | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/modules/bitcoinecosystem.nix b/modules/bitcoinecosystem.nix index 040f277..15bf723 100755 --- a/modules/bitcoinecosystem.nix +++ b/modules/bitcoinecosystem.nix @@ -6,6 +6,7 @@ services.bitcoind = { enable = true; + package = pkgs.stable.bitcoind-knots; dataDir = "/run/media/Second_Drive/BTCEcoandBackup/Bitcoin_Node"; txindex = true; tor.proxy = true; @@ -16,8 +17,6 @@ ''; }; - systemd.services.bitcoind.wants = [ "network-online.target" ]; - nix-bitcoin.onionServices.bitcoind.enable = true; nix-bitcoin.onionServices.electrs.enable = true; nix-bitcoin.onionServices.rtl.enable = true; @@ -41,9 +40,6 @@ tor.proxy = true; tor.enforce = true; port = 9737; - extraConfig = '' -experimental-offers -''; }; nix-bitcoin.onionServices.clightning.public = true; From 8e56941dfb488c308ce4d0df4b37e0c6bc954bb2 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Tue, 28 Oct 2025 14:55:23 -0500 Subject: [PATCH 562/667] updated Bitcoin excosystem1 --- modules/bitcoinecosystem.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/bitcoinecosystem.nix b/modules/bitcoinecosystem.nix index 15bf723..6112943 100755 --- a/modules/bitcoinecosystem.nix +++ b/modules/bitcoinecosystem.nix @@ -6,7 +6,7 @@ services.bitcoind = { enable = true; - package = pkgs.stable.bitcoind-knots; + package = pkgs.bitcoind-knots; dataDir = "/run/media/Second_Drive/BTCEcoandBackup/Bitcoin_Node"; txindex = true; tor.proxy = true; From 3b0dcfa1cc6bfbcfbd6f0c9873e701e1c9aae3bb Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Tue, 28 Oct 2025 15:04:14 -0500 Subject: [PATCH 563/667] Nixpkgs Update Bitcoin Knots --- flake.lock | 66 +++++++++++++++++++++++++++--------------------------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/flake.lock b/flake.lock index 063be05..2abceca 100755 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1754433428, - "narHash": "sha256-NA/FT2hVhKDftbHSwVnoRTFhes62+7dxZbxj5Gxvghs=", + "lastModified": 1761656077, + "narHash": "sha256-lsNWuj4Z+pE7s0bd2OKicOFq9bK86JE0ZGeKJbNqb94=", "owner": "ryantm", "repo": "agenix", - "rev": "9edb1787864c4f59ae5074ad498b6272b3ec308d", + "rev": "9ba0d85de3eaa7afeab493fed622008b6e4924f5", "type": "github" }, "original": { @@ -27,11 +27,11 @@ "oldNixpkgs": "oldNixpkgs" }, "locked": { - "lastModified": 1757554433, - "narHash": "sha256-OY44IENa+YWjM4xUkjx25SS0MN66oWRHC/Mq2SmH34w=", + "lastModified": 1760190224, + "narHash": "sha256-QHHgg35BikVeyhP8MvquKA3G+LY0rjBOHTCFgGkvTgA=", "owner": "emmanuelrosa", "repo": "btc-clients-nix", - "rev": "0adce0a2161bcf354d16744de5602d94016218be", + "rev": "c76dcd51fba66f0bcf9f8c479e8d5337aef745a0", "type": "github" }, "original": { @@ -74,11 +74,11 @@ ] }, "locked": { - "lastModified": 1756770412, - "narHash": "sha256-+uWLQZccFHwqpGqr2Yt5VsW/PbeJVTn9Dk6SHWhNRPw=", + "lastModified": 1760948891, + "narHash": "sha256-TmWcdiUUaWk8J4lpjzu4gCGxWY6/Ok7mOK4fIFfBuU4=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "4524271976b625a4a605beefd893f270620fd751", + "rev": "864599284fc7c0ba6357ed89ed5e2cd5040f0c04", "type": "github" }, "original": { @@ -180,11 +180,11 @@ "nixpkgs-unstable": "nixpkgs-unstable" }, "locked": { - "lastModified": 1757876184, - "narHash": "sha256-ezKJm8vzMb6bZf2lG+/s4AGhXtMvshEYBYqDT2PLtIU=", + "lastModified": 1761560050, + "narHash": "sha256-dbMLlIEamKfXP/Ww205FGDMkfEKd6Pzs/VpxUbSsmtU=", "owner": "fort-nix", "repo": "nix-bitcoin", - "rev": "0c961fa789d69ccd9503d2548dca1a9285acf2ff", + "rev": "b217b6019c3bba6eba2f2f5a277464b7579c3ab9", "type": "github" }, "original": { @@ -228,11 +228,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1757584362, - "narHash": "sha256-XeTX/w16rUNUNBsfaOVCDoMMa7Xu7KvIMT7tn1zIEcg=", + "lastModified": 1760965567, + "narHash": "sha256-0JDOal5P7xzzAibvD0yTE3ptyvoVOAL0rcELmDdtSKg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d33e926c80e6521a55da380a4c4c44a7462af405", + "rev": "cb82756ecc37fa623f8cf3e88854f9bf7f64af93", "type": "github" }, "original": { @@ -244,11 +244,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1756686622, - "narHash": "sha256-7RIjltx7tQAr/pDmcb/zNNgRtUDlXh+EppSEqD4IIa8=", + "lastModified": 1759360550, + "narHash": "sha256-feL8xklo97a8o8ISOszUU2tfHskJdu3zKbpcltzSblw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "23da0aa9ec413ed894af3fdc6313e6b8ff623833", + "rev": "28b8fe20c34f94a537f71950a9b0c1dc7224d036", "type": "github" }, "original": { @@ -259,11 +259,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1757545623, - "narHash": "sha256-mCxPABZ6jRjUQx3bPP4vjA68ETbPLNz9V2pk9tO7pRQ=", + "lastModified": 1761016216, + "narHash": "sha256-G/iC4t/9j/52i/nm+0/4ybBmAF4hzR8CNHC75qEhjHo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8cd5ce828d5d1d16feff37340171a98fc3bf6526", + "rev": "481cf557888e05d3128a76f14c76397b7d7cc869", "type": "github" }, "original": { @@ -275,11 +275,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1757745802, - "narHash": "sha256-hLEO2TPj55KcUFUU1vgtHE9UEIOjRcH/4QbmfHNF820=", + "lastModified": 1761373498, + "narHash": "sha256-Q/uhWNvd7V7k1H1ZPMy/vkx3F8C13ZcdrKjO7Jv7v0c=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c23193b943c6c689d70ee98ce3128239ed9e32d1", + "rev": "6a08e6bb4e46ff7fcbb53d409b253f6bad8a28ce", "type": "github" }, "original": { @@ -291,11 +291,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1757967192, - "narHash": "sha256-/aA9A/OBmnuOMgwfzdsXRusqzUpd8rQnQY8jtrHK+To=", + "lastModified": 1761594641, + "narHash": "sha256-sImk6SJQASDLQo8l+0zWWaBgg7TueLS6lTvdH5pBZpo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0d7c15863b251a7a50265e57c1dca1a7add2e291", + "rev": "1666250dbe4141e4ca8aaf89b40a3a51c2e36144", "type": "github" }, "original": { @@ -313,11 +313,11 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1758134550, - "narHash": "sha256-Rj0v5VZuljxG4trz3IHJedEKghNDd1HsK6yVwTNPyJ0=", + "lastModified": 1761657569, + "narHash": "sha256-2D4Tw5Vp52RU5amnBvq0/z+zgZqafwl4bhg8dJBBjXI=", "owner": "nix-community", "repo": "nixvim", - "rev": "0c867f9e635ce70e829a562b20851cfc17a94196", + "rev": "03c0dabb9a63f52bc2ebf571f3755720df1ca81e", "type": "github" }, "original": { @@ -336,11 +336,11 @@ ] }, "locked": { - "lastModified": 1757885130, - "narHash": "sha256-56CMb5W/pgjKLh0bx2ekhn5rde/YmgR63HAqrY9/BCw=", + "lastModified": 1760652422, + "narHash": "sha256-C88Pgz38QIl9JxQceexqL2G7sw9vodHWx1Uaq+NRJrw=", "owner": "NuschtOS", "repo": "search", - "rev": "fae3c59a646e00c4b1d359c50b27458a0713d2fd", + "rev": "3ebeebe8b6a49dfb11f771f761e0310f7c48d726", "type": "github" }, "original": { From 94fb965d3c16e57d1eea9c4bb279860770dbf805 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Tue, 28 Oct 2025 15:05:52 -0500 Subject: [PATCH 564/667] Knots to NixOSstable --- modules/bitcoinecosystem.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/bitcoinecosystem.nix b/modules/bitcoinecosystem.nix index 6112943..15bf723 100755 --- a/modules/bitcoinecosystem.nix +++ b/modules/bitcoinecosystem.nix @@ -6,7 +6,7 @@ services.bitcoind = { enable = true; - package = pkgs.bitcoind-knots; + package = pkgs.stable.bitcoind-knots; dataDir = "/run/media/Second_Drive/BTCEcoandBackup/Bitcoin_Node"; txindex = true; tor.proxy = true; From 2912d38a13858a47c19793ba02a8636dd574e966 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Wed, 12 Nov 2025 15:26:39 -0600 Subject: [PATCH 565/667] added flapak repo --- configuration.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/configuration.nix b/configuration.nix index ed40a82..5edc8cc 100755 --- a/configuration.nix +++ b/configuration.nix @@ -92,6 +92,14 @@ in # Allow Flatpak services.flatpak.enable = true; + systemd.services.flatpak-repo = { + wantedBy = [ "multi-user.target" ]; + path = [ pkgs.flatpak ]; + script = '' + flatpak remote-add --if-not-exists flathub https://dl.flathub.org/repo/flathub.flatpakrepo + ''; + }; + # Allow unfree packages nixpkgs.config.allowUnfree = true; From 2d01d66e3a7ced05bc97e810176226bba5670060 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Sun, 15 Feb 2026 18:50:03 -0600 Subject: [PATCH 566/667] merge sync --- README.md | 12 +- README_1.md | 46 ++++ configuration.nix | 46 ++-- configuration_1.nix | 405 +++++++++++++++++++++++++++++++++ custom-add-ons.md | 35 +-- custom-add-ons_1.md | 47 ++++ flake.lock | 174 +++++--------- flake_1.lock | 373 ++++++++++++++++++++++++++++++ modules/bitcoinecosystem.nix | 78 +------ modules/bitcoinecosystem_1.nix | 95 ++++++++ modules/modules.nix | 3 +- modules/modules_1.nix | 15 ++ modules/php.nix | 0 13 files changed, 1097 insertions(+), 232 deletions(-) create mode 100755 README_1.md create mode 100755 configuration_1.nix create mode 100644 custom-add-ons_1.md create mode 100755 flake_1.lock create mode 100755 modules/bitcoinecosystem_1.nix create mode 100755 modules/modules_1.nix mode change 100644 => 100755 modules/php.nix diff --git a/README.md b/README.md index feca799..7016f44 100755 --- a/README.md +++ b/README.md @@ -33,14 +33,14 @@ The DIY support chat on Matrix is located here: https://matrix.to/#/%23DIY_Sovran_SystemsOS:anarchyislove.xyz +## License + +Sovran_SystemsOS is licensed under the Apache 2 software licence. + ## -Created, Handcrafted, and Headquartered in Southern California – 2022-2025 🏖️. +Created, Handcrafted, and Headquartered in the Midwest – 2022-2026. -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+ +This Gitea is Proudly Powered by a Sovran Pro. All Is Love. Fear Is Illusion. All Beings Are Free. Truth Can Never Be Destroyed. diff --git a/README_1.md b/README_1.md new file mode 100755 index 0000000..7016f44 --- /dev/null +++ b/README_1.md @@ -0,0 +1,46 @@ +
+
+ +

+ +

+ +
+
+
+ +# 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://sovransystems.com + +Connect on Matrix here: https://matrix.to/#/#sovran-systems:anarchyislove.xyz + +Connect for Support on Matrix here: https://matrix.to/#/#sovran-systems-support:anarchyislove.xyz + +### + +## DIY Install Of Sovran_SystemsOS + +The write-up to install Sovran_SystemsOS on your own hardware is located here: + +https://git.sovransystems.com/Sovran_Systems/Sovran_SystemsOS/src/branch/main/DIY%20Install%20Sovran_SystemsOS.md + +The DIY support chat on Matrix is located here: + +https://matrix.to/#/%23DIY_Sovran_SystemsOS:anarchyislove.xyz + +## License + +Sovran_SystemsOS is licensed under the Apache 2 software licence. + +## + +Created, Handcrafted, and Headquartered in the Midwest – 2022-2026. + +This Gitea is Proudly Powered by a Sovran Pro. + +All Is Love. Fear Is Illusion. All Beings Are Free. Truth Can Never Be Destroyed. diff --git a/configuration.nix b/configuration.nix index 5edc8cc..c8d1146 100755 --- a/configuration.nix +++ b/configuration.nix @@ -92,13 +92,15 @@ in # Allow Flatpak services.flatpak.enable = true; - systemd.services.flatpak-repo = { - wantedBy = [ "multi-user.target" ]; - path = [ pkgs.flatpak ]; - script = '' - flatpak remote-add --if-not-exists flathub https://dl.flathub.org/repo/flathub.flatpakrepo - ''; - }; + systemd.services.flatpak-repo = { + wantedBy = [ "multi-user.target" ]; + after = [ "network-online.target" ]; + wants = [ "network-online.target" ]; + path = [ pkgs.flatpak ]; + script = '' + flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo + ''; + }; # Allow unfree packages nixpkgs.config.allowUnfree = true; @@ -108,16 +110,16 @@ in "jitsi-meet-1.0.8043" ]; - # List packages installed in system profile. To search, run: - # $ nix search wget + # List packages installed environment.systemPackages = with pkgs; [ git wget fish htop btop + gnomeExtensions.transparent-top-bar-adjustable-transparency gnomeExtensions.systemd-manager - gnomeExtensions.dash-to-dock + gnomeExtensions.dash-to-dock gnomeExtensions.vitals gnomeExtensions.pop-shell gnomeExtensions.just-perfection @@ -153,7 +155,7 @@ in firefox element-desktop wp-cli - axel + axel ]; @@ -172,7 +174,7 @@ in }; -####### CADDY ####### + ####### CADDY ####### services.caddy = { enable = true; user = "caddy"; @@ -241,7 +243,7 @@ in }; }; -###### AGENIX ###### + ###### AGENIX ###### age.identityPaths = [ "/root/.ssh/agenix/agenix-secret-keys" ]; age.secrets.matrix_reg_secret = { @@ -254,7 +256,7 @@ in -###### CREATE DATABASE (WORDPRESS, MATRIX_SYNAPSE, AND NEXTCLOUD) ####### + ###### CREATE DATABASE (WORDPRESS, MATRIX_SYNAPSE, AND NEXTCLOUD) ####### services.postgresql = { enable = true; }; @@ -301,7 +303,7 @@ in ; -####### KEEP AWAKE for DISPLAY and HEADLESS ####### + ####### KEEP AWAKE for DISPLAY and HEADLESS ####### services.displayManager.gdm.autoSuspend = false; systemd.sleep.extraConfig = '' @@ -312,7 +314,7 @@ in ''; -####### BACKUP TO INTERNAL DRIVE ####### + ####### BACKUP TO INTERNAL DRIVE ####### services.rsnapshot = { enable = true; extraConfig = '' @@ -331,7 +333,7 @@ backup /etc/nix-bitcoin-secrets/ localhost/ }; -####### CRON ####### + ####### CRON ####### services.cron = { enable = true; systemCronJobs = [ @@ -345,7 +347,7 @@ backup /etc/nix-bitcoin-secrets/ localhost/ }; -####### TOR ####### + ####### TOR ####### services.tor = { enable = true; client.enable = true; @@ -355,7 +357,7 @@ backup /etc/nix-bitcoin-secrets/ localhost/ services.privoxy.enableTor = true; -####### Enable the OpenSSH daemon ####### + ####### Enable the SSH ####### services.openssh = { enable = true; settings = { @@ -366,7 +368,7 @@ backup /etc/nix-bitcoin-secrets/ localhost/ }; -#######FailtoBan####### + #######FailtoBan####### services.fail2ban = { enable = true; ignoreIP = [ @@ -379,7 +381,7 @@ backup /etc/nix-bitcoin-secrets/ localhost/ }; -####### Open ports in the firewall ####### + ####### Open ports in the firewall ####### networking.firewall.allowedTCPPorts = [ 80 443 5349 8448 3051 ]; networking.firewall.allowedUDPPorts = [ 80 443 5349 8448 3051 ]; @@ -390,7 +392,7 @@ backup /etc/nix-bitcoin-secrets/ localhost/ networking.firewall.enable = true; -####### AUTO COLLECT GARABAGE ####### + ####### AUTO COLLECT GARABAGE ####### nix.gc = { automatic = true; dates = "weekly"; diff --git a/configuration_1.nix b/configuration_1.nix new file mode 100755 index 0000000..476ca23 --- /dev/null +++ b/configuration_1.nix @@ -0,0 +1,405 @@ +{ config, pkgs, lib, ... }: + + +let + personalization = import ./modules/personalization.nix; +in + +{ + + imports = + + [ + + ./modules/modules.nix + + ]; + + # Bootloader. + boot.loader.systemd-boot.enable = true; + boot.loader.efi.canTouchEfiVariables = true; + boot.loader.efi.efiSysMountPoint = "/boot/efi"; + boot.kernelPackages = pkgs.linuxPackages_latest; + + # Enable Automount without Fail for Internal Drive. + fileSystems."/run/media/Second_Drive" = { + device = "LABEL=BTCEcoandBackup"; + fsType = "ext4"; + options = [ "nofail" ]; + }; + + fileSystems."/boot/efi".options = [ "umask=0077" "defaults" ]; + + nix.settings = { + + experimental-features = [ "nix-command" "flakes" ]; + download-buffer-size = 524288000; + + }; + + networking.hostName = "nixos"; # Define your hostname. + + # 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.displayManager.gdm.enable = true; + services.desktopManager.gnome.enable = true; + + # Configure keymap in X11 + services.xserver.xkb = { + layout = "us"; + variant = ""; + }; + + # Enable CUPS to print documents. + services.printing.enable = true; + + # Systemd Settings + systemd.enableEmergencyMode = false; + + # Enable sound with pipewire. + services.pulseaudio.enable = false; + security.rtkit.enable = true; + services.pipewire = { + enable = true; + alsa.enable = true; + alsa.support32Bit = true; + pulse.enable = true; + }; + + users.users = { + free = { + isNormalUser = true; + description = "free"; + extraGroups = [ "networkmanager" ]; + }; + }; + + # Enable automatic login for the user. + services.displayManager.autoLogin.enable = true; + services.displayManager.autoLogin.user = "free"; + + # Allow Flatpak + services.flatpak.enable = true; + + systemd.services.flatpak-repo = { + wantedBy = [ "multi-user.target" ]; + after = [ "network-online.target" ]; + wants = [ "network-online.target" ]; + path = [ pkgs.flatpak ]; + script = '' + flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo + ''; + }; + + # Allow unfree packages + nixpkgs.config.allowUnfree = true; + + nixpkgs.config.permittedInsecurePackages = [ + + "jitsi-meet-1.0.8043" + ]; + + # List packages installed + environment.systemPackages = with pkgs; [ + git + wget + fish + htop + btop + gnomeExtensions.transparent-top-bar-adjustable-transparency + gnomeExtensions.systemd-manager + gnomeExtensions.dash-to-dock + gnomeExtensions.vitals + gnomeExtensions.pop-shell + gnomeExtensions.just-perfection + gnomeExtensions.appindicator + gnomeExtensions.date-menu-formatter + gnome-tweaks + papirus-icon-theme + ranger + neofetch + gedit + matrix-synapse + openssl + pwgen + aspell + aspellDicts.en + lm_sensors + hunspell + hunspellDicts.en_US + synadm + brave + dua + bitwarden-desktop + gparted + pv + unzip + parted + screen + zenity + libargon2 + gnome-terminal + libreoffice-fresh + dig + firefox + element-desktop + wp-cli + axel + + ]; + + programs.nixvim = { + enable = true; + colorschemes.catppuccin.enable = true; + plugins.lualine.enable = true; + }; + + + programs.bash.promptInit = "fish"; + + programs.fish = { + enable = true; + promptInit = "neofetch"; + }; + + + ####### CADDY ####### + services.caddy = { + enable = true; + user = "caddy"; + group = "root"; + email = "${personalization.caddy_email_for_acme}"; + + virtualHosts = { + "${personalization.wordpress_url}" = { + extraConfig = '' + encode gzip zstd + root * /var/lib/www/wordpress + php_fastcgi unix//run/phpfpm/mypool.sock + file_server browse + ''; + }; + + "${personalization.nextcloud_url}" = { + extraConfig = '' + encode gzip zstd + root * /var/lib/www/nextcloud + php_fastcgi unix//run/phpfpm/mypool.sock { + trusted_proxies private_ranges + } + file_server + redir /.well-known/carddav /remote.php/dav/ 301 + redir /.well-known/caldav /remote.php/dav/ 301 + header { + Strict-Transport-Security max-age=31536000; + } + ''; + }; + + "${personalization.matrix_url}" = { + extraConfig = '' + reverse_proxy /_matrix/* http://localhost:8008 + reverse_proxy /_synapse/client/* http://localhost:8008 + ''; + }; + + "${personalization.matrix_url}:8448" = { + extraConfig = '' + reverse_proxy http://localhost:8008 + ''; + }; + + "${personalization.btcpayserver_url}" = { + extraConfig = '' + reverse_proxy http://localhost:23000 + encode gzip zstd + ''; + }; + + "https://${personalization.vaultwarden_url}" = { + extraConfig = '' + reverse_proxy http://localhost:8777 + encode gzip zstd + ''; + }; + + ":3051" = { + extraConfig = '' + reverse_proxy :3050 + encode gzip zstd + ''; + }; + }; + }; + + ###### AGENIX ###### + age.identityPaths = [ "/root/.ssh/agenix/agenix-secret-keys" ]; + + age.secrets.matrix_reg_secret = { + + file = /var/lib/agenix-secrets/matrix_reg_secret.age; + mode = "770"; + owner = "matrix-synapse"; + group = "matrix-synapse"; + }; + + + + ###### CREATE DATABASE (WORDPRESS, MATRIX_SYNAPSE, AND NEXTCLOUD) ####### + services.postgresql = { + enable = true; + }; + + + services.postgresql.authentication = lib.mkForce '' + # Generated file; do not edit! + # TYPE DATABASE USER ADDRESS METHOD + local all all trust + host all all 127.0.0.1/32 trust + host all all ::1/128 trust + ''; + + + services.mysql = { + enable = true; + package = pkgs.mariadb; + }; + + + services.postgresql.initialScript = pkgs.writeText "begin-init.sql" '' + CREATE ROLE "ncusr" WITH LOGIN PASSWORD '${personalization.nextclouddb}'; + CREATE DATABASE "nextclouddb" WITH OWNER "ncusr" + TEMPLATE template0 + LC_COLLATE = "C" + LC_CTYPE = "C"; + + + CREATE ROLE "matrix-synapse" WITH LOGIN PASSWORD '${personalization.matrixdb}'; + CREATE DATABASE "matrix-synapse" WITH OWNER "matrix-synapse" + TEMPLATE template0 + LC_COLLATE = "C" + LC_CTYPE = "C"; + + '' + ; + + services.mysql.initialScript = pkgs.writeText "wordpress-init.sql" '' + CREATE DATABASE wordpressdb; + CREATE USER 'wpusr'@'localhost' IDENTIFIED BY '${personalization.wordpressdb}'; + GRANT ALL ON wordpressdb.* TO 'wpusr'@'localhost'; + FLUSH PRIVILEGES; + '' + ; + + + ####### KEEP AWAKE for DISPLAY and HEADLESS ####### + services.displayManager.gdm.autoSuspend = false; + + systemd.sleep.extraConfig = '' + AllowSuspend=no + AllowHibernation=no + AllowHybridSleep=no + AllowSuspendThenHibernate=no + ''; + + + ####### BACKUP TO INTERNAL DRIVE ####### + 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 = [ + + "*/5 * * * * caddy /run/current-system/sw/bin/php -f /var/lib/www/nextcloud/cron.php" + "*/15 * * * * root /run/current-system/sw/bin/bash /var/lib/njalla/njalla.sh" + "*/15 * * * * root /run/current-system/sw/bin/bash /var/lib/external_ip/external_ip.sh" + "0 0 * * 0 docker-user yes | /run/current-system/sw/bin/docker system prune -a" + + ]; + }; + + + ####### TOR ####### + services.tor = { + enable = true; + client.enable = true; + torsocks.enable = true; + }; + + services.privoxy.enableTor = true; + + + ####### Enable the SSH ####### + services.openssh = { + enable = true; + settings = { + PasswordAuthentication = false; + KbdInteractiveAuthentication = false; + PermitRootLogin = "yes"; + }; + }; + + + #######FailtoBan####### + services.fail2ban = { + enable = true; + ignoreIP = [ + "127.0.0.0/8" + "10.0.0.0/8" + "172.16.0.0/12" + "192.168.0.0/16" + "8.8.8.8" + ]; + }; + + + ####### Open ports in the firewall ####### + networking.firewall.allowedTCPPorts = [ 80 443 5349 8448 3051 ]; + networking.firewall.allowedUDPPorts = [ 80 443 5349 8448 3051 ]; + + networking.firewall.allowedUDPPortRanges = [ + { from=49152; to=65535; } # TURN relay + ]; + + networking.firewall.enable = true; + + + ####### AUTO COLLECT GARABAGE ####### + nix.gc = { + automatic = true; + dates = "weekly"; + options = "--delete-older-than 7d"; + }; + + + system.stateVersion = "22.05"; + +} diff --git a/custom-add-ons.md b/custom-add-ons.md index dc880c2..ea7ca30 100644 --- a/custom-add-ons.md +++ b/custom-add-ons.md @@ -7,12 +7,7 @@ Add-ons are extra features you can have installed before your Sovran Pro is ship https://github.com/bitcoin/bitcoin -2. By default Sovran_SystemsOS runs LND as the default Lightning node software for BTCpayserver. You are now able to run CLN as the backend to BTCpayserver instead of LND. - -https://blockstream.com/lightning/ - - -3. There is Mempool to be added on via a Tor connection. +2. The Bitcoin Mempool can be added and can be accessed via Tor or on your local network. https://github.com/mempool/mempool @@ -27,16 +22,26 @@ services.bitcoind.package = lib.mkForce config.nix-bitcoin.pkgs.bitcoind; ``` -The code for CLN for BTCpayserver backend is as follows: - -```nix -services.btcpayserver.lightningBackend = lib.mkForce "clightning"; -``` - - The code for Mempool is as follows: ```nix -services.mempool.enable = true; -``` +services.mempool = { + enable = true; + frontend.enable = true; +}; +services.mysql.package = lib.mkForce pkgs.mariadb; + +nix-bitcoin.onionServices.mempool-frontend.enable = true; + +services.caddy = { + virtualHosts = { + ":60847" = { + extraConfig = '' + reverse_proxy :60845 + encode gzip zstd + ''; + }; + }; +}; +``` diff --git a/custom-add-ons_1.md b/custom-add-ons_1.md new file mode 100644 index 0000000..7b4c322 --- /dev/null +++ b/custom-add-ons_1.md @@ -0,0 +1,47 @@ +## Custom Add-ons for your Sovran Pro or Sovran Pro Max + +Add-ons are extra features you can have installed before your Sovran Pro is shipped to you. + +1. Since Sovran_SystemsOS runs Bitcoin Knots by default as opposed to Bitcion Core, you can customize your Sovran Pro or Sovran Pro Max node to run Bitcoin Core. + +https://github.com/bitcoin/bitcoin + + +2. The Bitcoin Mempool can be added and can be accessed via Tor or on your local network. + +https://github.com/mempool/mempool + + +The code will be installed in the `custom.nix` file. + + +The code for Bitcoin Core is as follows: + +```nix +services.bitcoind.package = lib.mkForce config.nix-bitcoin.pkgs.bitcoind; +``` + + +The code for Mempool is as follows: + +```nix +services.mempool = { + enable = true; + frontend.enable = true; +}; + +services.mysql.package = lib.mkForce pkgs.mariadb; + +nix-bitcoin.onionServices.mempool-frontend.enable = true; + +services.caddy = { + virtualHosts = { + ":60847" = { + extraConfig = '' + reverse_proxy :60845 + encode gzip zstd + ''; + }; + }; +}; +``` diff --git a/flake.lock b/flake.lock index 2abceca..8b4017f 100755 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1761656077, - "narHash": "sha256-lsNWuj4Z+pE7s0bd2OKicOFq9bK86JE0ZGeKJbNqb94=", + "lastModified": 1762618334, + "narHash": "sha256-wyT7Pl6tMFbFrs8Lk/TlEs81N6L+VSybPfiIgzU8lbQ=", "owner": "ryantm", "repo": "agenix", - "rev": "9ba0d85de3eaa7afeab493fed622008b6e4924f5", + "rev": "fcdea223397448d35d9b31f798479227e80183f6", "type": "github" }, "original": { @@ -27,11 +27,11 @@ "oldNixpkgs": "oldNixpkgs" }, "locked": { - "lastModified": 1760190224, - "narHash": "sha256-QHHgg35BikVeyhP8MvquKA3G+LY0rjBOHTCFgGkvTgA=", + "lastModified": 1766936379, + "narHash": "sha256-VBhwuhoz/byfK2OdYUKkzc1vTPqUddJaMr6elUOHeuM=", "owner": "emmanuelrosa", "repo": "btc-clients-nix", - "rev": "c76dcd51fba66f0bcf9f8c479e8d5337aef745a0", + "rev": "36cbe17a6160121bbae1ea7521593314d55e023c", "type": "github" }, "original": { @@ -52,16 +52,16 @@ ] }, "locked": { - "lastModified": 1734005403, - "narHash": "sha256-vgh3TqfkFdnPxREBedw4MQehIDc3N8YyxBOB45n+AvU=", + "lastModified": 1766155727, + "narHash": "sha256-XGp4HHH6D6ZKiO5RnMzqYJYnZB538EnEflvlTsOKpvo=", "owner": "erikarvstedt", "repo": "extra-container", - "rev": "f4de6c329b306a9d3a9798a30e060c166f781baa", + "rev": "b450bdb24fca1076973c852d87bcb49b8eb5fd49", "type": "github" }, "original": { "owner": "erikarvstedt", - "ref": "0.13", + "ref": "0.14", "repo": "extra-container", "type": "github" } @@ -74,11 +74,11 @@ ] }, "locked": { - "lastModified": 1760948891, - "narHash": "sha256-TmWcdiUUaWk8J4lpjzu4gCGxWY6/Ok7mOK4fIFfBuU4=", + "lastModified": 1765835352, + "narHash": "sha256-XswHlK/Qtjasvhd1nOa1e8MgZ8GS//jBoTqWtrS1Giw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "864599284fc7c0ba6357ed89ed5e2cd5040f0c04", + "rev": "a34fae9c08a15ad73f295041fec82323541400a9", "type": "github" }, "original": { @@ -105,24 +105,6 @@ "type": "github" } }, - "flake-utils_2": { - "inputs": { - "systems": "systems_3" - }, - "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "home-manager": { "inputs": { "nixpkgs": [ @@ -144,47 +126,20 @@ "type": "github" } }, - "ixx": { - "inputs": { - "flake-utils": [ - "nixvim", - "nuschtosSearch", - "flake-utils" - ], - "nixpkgs": [ - "nixvim", - "nuschtosSearch", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1754860581, - "narHash": "sha256-EM0IE63OHxXCOpDHXaTyHIOk2cNvMCGPqLt/IdtVxgk=", - "owner": "NuschtOS", - "repo": "ixx", - "rev": "babfe85a876162c4acc9ab6fb4483df88fa1f281", - "type": "github" - }, - "original": { - "owner": "NuschtOS", - "ref": "v0.1.1", - "repo": "ixx", - "type": "github" - } - }, "nix-bitcoin": { "inputs": { "extra-container": "extra-container", "flake-utils": "flake-utils", "nixpkgs": "nixpkgs_3", + "nixpkgs-25_05": "nixpkgs-25_05", "nixpkgs-unstable": "nixpkgs-unstable" }, "locked": { - "lastModified": 1761560050, - "narHash": "sha256-dbMLlIEamKfXP/Ww205FGDMkfEKd6Pzs/VpxUbSsmtU=", + "lastModified": 1767721199, + "narHash": "sha256-UzRxDiJlopBGPTjyhCdMP+QdTwXK+l+y45urXCyH69A=", "owner": "fort-nix", "repo": "nix-bitcoin", - "rev": "b217b6019c3bba6eba2f2f5a277464b7579c3ab9", + "rev": "5b532698ce9e8bd79b07d77ab4fc60e1a8408f73", "type": "github" }, "original": { @@ -210,6 +165,22 @@ "type": "github" } }, + "nixpkgs-25_05": { + "locked": { + "lastModified": 1767051569, + "narHash": "sha256-0MnuWoN+n1UYaGBIpqpPs9I9ZHW4kynits4mrnh1Pk4=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "40ee5e1944bebdd128f9fbada44faefddfde29bd", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-25.05", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs-stable": { "locked": { "lastModified": 1751274312, @@ -228,11 +199,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1760965567, - "narHash": "sha256-0JDOal5P7xzzAibvD0yTE3ptyvoVOAL0rcELmDdtSKg=", + "lastModified": 1767364772, + "narHash": "sha256-fFUnEYMla8b7UKjijLnMe+oVFOz6HjijGGNS1l7dYaQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "cb82756ecc37fa623f8cf3e88854f9bf7f64af93", + "rev": "16c7794d0a28b5a37904d55bcca36003b9109aaa", "type": "github" }, "original": { @@ -244,11 +215,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1759360550, - "narHash": "sha256-feL8xklo97a8o8ISOszUU2tfHskJdu3zKbpcltzSblw=", + "lastModified": 1764255304, + "narHash": "sha256-oQPux8afXmkbb88ceRtz1lgSGqL9auOgdYnBSqpVgSA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "28b8fe20c34f94a537f71950a9b0c1dc7224d036", + "rev": "6e86c955fc372d12face4a9c0d932a6e0f7bff4d", "type": "github" }, "original": { @@ -259,27 +230,27 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1761016216, - "narHash": "sha256-G/iC4t/9j/52i/nm+0/4ybBmAF4hzR8CNHC75qEhjHo=", + "lastModified": 1767480499, + "narHash": "sha256-8IQQUorUGiSmFaPnLSo2+T+rjHtiNWc+OAzeHck7N48=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "481cf557888e05d3128a76f14c76397b7d7cc869", + "rev": "30a3c519afcf3f99e2c6df3b359aec5692054d92", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-25.05", + "ref": "nixos-25.11", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_4": { "locked": { - "lastModified": 1761373498, - "narHash": "sha256-Q/uhWNvd7V7k1H1ZPMy/vkx3F8C13ZcdrKjO7Jv7v0c=", + "lastModified": 1767767207, + "narHash": "sha256-Mj3d3PfwltLmukFal5i3fFt27L6NiKXdBezC1EBuZs4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6a08e6bb4e46ff7fcbb53d409b253f6bad8a28ce", + "rev": "5912c1772a44e31bf1c63c0390b90501e5026886", "type": "github" }, "original": { @@ -291,11 +262,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1761594641, - "narHash": "sha256-sImk6SJQASDLQo8l+0zWWaBgg7TueLS6lTvdH5pBZpo=", + "lastModified": 1767026758, + "narHash": "sha256-7fsac/f7nh/VaKJ/qm3I338+wAJa/3J57cOGpXi0Sbg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1666250dbe4141e4ca8aaf89b40a3a51c2e36144", + "rev": "346dd96ad74dc4457a9db9de4f4f57dab2e5731d", "type": "github" }, "original": { @@ -309,15 +280,14 @@ "inputs": { "flake-parts": "flake-parts", "nixpkgs": "nixpkgs_5", - "nuschtosSearch": "nuschtosSearch", - "systems": "systems_4" + "systems": "systems_3" }, "locked": { - "lastModified": 1761657569, - "narHash": "sha256-2D4Tw5Vp52RU5amnBvq0/z+zgZqafwl4bhg8dJBBjXI=", + "lastModified": 1767608728, + "narHash": "sha256-kmSJCTgrx+BxgqQOTPHAOkohvO+lbRsPWqu+PSPcz3I=", "owner": "nix-community", "repo": "nixvim", - "rev": "03c0dabb9a63f52bc2ebf571f3755720df1ca81e", + "rev": "851399eebd0fb383d2fd76269d859f16021dc7a8", "type": "github" }, "original": { @@ -326,29 +296,6 @@ "type": "github" } }, - "nuschtosSearch": { - "inputs": { - "flake-utils": "flake-utils_2", - "ixx": "ixx", - "nixpkgs": [ - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1760652422, - "narHash": "sha256-C88Pgz38QIl9JxQceexqL2G7sw9vodHWx1Uaq+NRJrw=", - "owner": "NuschtOS", - "repo": "search", - "rev": "3ebeebe8b6a49dfb11f771f761e0310f7c48d726", - "type": "github" - }, - "original": { - "owner": "NuschtOS", - "repo": "search", - "type": "github" - } - }, "oldNixpkgs": { "locked": { "lastModified": 1727619874, @@ -419,21 +366,6 @@ "repo": "default", "type": "github" } - }, - "systems_4": { - "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", diff --git a/flake_1.lock b/flake_1.lock new file mode 100755 index 0000000..8b4017f --- /dev/null +++ b/flake_1.lock @@ -0,0 +1,373 @@ +{ + "nodes": { + "agenix": { + "inputs": { + "darwin": [], + "home-manager": "home-manager", + "nixpkgs": "nixpkgs", + "systems": "systems" + }, + "locked": { + "lastModified": 1762618334, + "narHash": "sha256-wyT7Pl6tMFbFrs8Lk/TlEs81N6L+VSybPfiIgzU8lbQ=", + "owner": "ryantm", + "repo": "agenix", + "rev": "fcdea223397448d35d9b31f798479227e80183f6", + "type": "github" + }, + "original": { + "owner": "ryantm", + "repo": "agenix", + "type": "github" + } + }, + "btc-clients": { + "inputs": { + "nixpkgs": "nixpkgs_2", + "oldNixpkgs": "oldNixpkgs" + }, + "locked": { + "lastModified": 1766936379, + "narHash": "sha256-VBhwuhoz/byfK2OdYUKkzc1vTPqUddJaMr6elUOHeuM=", + "owner": "emmanuelrosa", + "repo": "btc-clients-nix", + "rev": "36cbe17a6160121bbae1ea7521593314d55e023c", + "type": "github" + }, + "original": { + "owner": "emmanuelrosa", + "repo": "btc-clients-nix", + "type": "github" + } + }, + "extra-container": { + "inputs": { + "flake-utils": [ + "nix-bitcoin", + "flake-utils" + ], + "nixpkgs": [ + "nix-bitcoin", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1766155727, + "narHash": "sha256-XGp4HHH6D6ZKiO5RnMzqYJYnZB538EnEflvlTsOKpvo=", + "owner": "erikarvstedt", + "repo": "extra-container", + "rev": "b450bdb24fca1076973c852d87bcb49b8eb5fd49", + "type": "github" + }, + "original": { + "owner": "erikarvstedt", + "ref": "0.14", + "repo": "extra-container", + "type": "github" + } + }, + "flake-parts": { + "inputs": { + "nixpkgs-lib": [ + "nixvim", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1765835352, + "narHash": "sha256-XswHlK/Qtjasvhd1nOa1e8MgZ8GS//jBoTqWtrS1Giw=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "a34fae9c08a15ad73f295041fec82323541400a9", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-utils": { + "inputs": { + "systems": "systems_2" + }, + "locked": { + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "home-manager": { + "inputs": { + "nixpkgs": [ + "agenix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1745494811, + "narHash": "sha256-YZCh2o9Ua1n9uCvrvi5pRxtuVNml8X2a03qIFfRKpFs=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "abfad3d2958c9e6300a883bd443512c55dfeb1be", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "home-manager", + "type": "github" + } + }, + "nix-bitcoin": { + "inputs": { + "extra-container": "extra-container", + "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs_3", + "nixpkgs-25_05": "nixpkgs-25_05", + "nixpkgs-unstable": "nixpkgs-unstable" + }, + "locked": { + "lastModified": 1767721199, + "narHash": "sha256-UzRxDiJlopBGPTjyhCdMP+QdTwXK+l+y45urXCyH69A=", + "owner": "fort-nix", + "repo": "nix-bitcoin", + "rev": "5b532698ce9e8bd79b07d77ab4fc60e1a8408f73", + "type": "github" + }, + "original": { + "owner": "fort-nix", + "ref": "release", + "repo": "nix-bitcoin", + "type": "github" + } + }, + "nixpkgs": { + "locked": { + "lastModified": 1754028485, + "narHash": "sha256-IiiXB3BDTi6UqzAZcf2S797hWEPCRZOwyNThJIYhUfk=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "59e69648d345d6e8fef86158c555730fa12af9de", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-25.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-25_05": { + "locked": { + "lastModified": 1767051569, + "narHash": "sha256-0MnuWoN+n1UYaGBIpqpPs9I9ZHW4kynits4mrnh1Pk4=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "40ee5e1944bebdd128f9fbada44faefddfde29bd", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-25.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-stable": { + "locked": { + "lastModified": 1751274312, + "narHash": "sha256-/bVBlRpECLVzjV19t5KMdMFWSwKLtb5RyXdjz3LJT+g=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "50ab793786d9de88ee30ec4e4c24fb4236fc2674", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-24.11", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-unstable": { + "locked": { + "lastModified": 1767364772, + "narHash": "sha256-fFUnEYMla8b7UKjijLnMe+oVFOz6HjijGGNS1l7dYaQ=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "16c7794d0a28b5a37904d55bcca36003b9109aaa", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_2": { + "locked": { + "lastModified": 1764255304, + "narHash": "sha256-oQPux8afXmkbb88ceRtz1lgSGqL9auOgdYnBSqpVgSA=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "6e86c955fc372d12face4a9c0d932a6e0f7bff4d", + "type": "github" + }, + "original": { + "owner": "nixos", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { + "locked": { + "lastModified": 1767480499, + "narHash": "sha256-8IQQUorUGiSmFaPnLSo2+T+rjHtiNWc+OAzeHck7N48=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "30a3c519afcf3f99e2c6df3b359aec5692054d92", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-25.11", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_4": { + "locked": { + "lastModified": 1767767207, + "narHash": "sha256-Mj3d3PfwltLmukFal5i3fFt27L6NiKXdBezC1EBuZs4=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "5912c1772a44e31bf1c63c0390b90501e5026886", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_5": { + "locked": { + "lastModified": 1767026758, + "narHash": "sha256-7fsac/f7nh/VaKJ/qm3I338+wAJa/3J57cOGpXi0Sbg=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "346dd96ad74dc4457a9db9de4f4f57dab2e5731d", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixvim": { + "inputs": { + "flake-parts": "flake-parts", + "nixpkgs": "nixpkgs_5", + "systems": "systems_3" + }, + "locked": { + "lastModified": 1767608728, + "narHash": "sha256-kmSJCTgrx+BxgqQOTPHAOkohvO+lbRsPWqu+PSPcz3I=", + "owner": "nix-community", + "repo": "nixvim", + "rev": "851399eebd0fb383d2fd76269d859f16021dc7a8", + "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", + "btc-clients": "btc-clients", + "nix-bitcoin": "nix-bitcoin", + "nixpkgs": "nixpkgs_4", + "nixpkgs-stable": "nixpkgs-stable", + "nixvim": "nixvim" + } + }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_2": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_3": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/modules/bitcoinecosystem.nix b/modules/bitcoinecosystem.nix index 15bf723..7750cdf 100755 --- a/modules/bitcoinecosystem.nix +++ b/modules/bitcoinecosystem.nix @@ -6,7 +6,7 @@ services.bitcoind = { enable = true; - package = pkgs.stable.bitcoind-knots; + package = config.nix-bitcoin.pkgs.bitcoind-knots; dataDir = "/run/media/Second_Drive/BTCEcoandBackup/Bitcoin_Node"; txindex = true; tor.proxy = true; @@ -32,55 +32,28 @@ }; - - ## CLN - - services.clightning = { - enable = true; - tor.proxy = true; - tor.enforce = true; - port = 9737; - }; - - nix-bitcoin.onionServices.clightning.public = true; - - - services.clightning.replication = { - enable = true; - local.directory = "/run/media/Second_Drive/BTCEcoandBackup/clightning_db_backup"; - encrypt = false; - }; - - - - ## LND + ## LND services.lnd = { enable = true; tor.enforce = true; tor.proxy = true; extraConfig = '' - protocol.option-scid-alias=true - ''; }; nix-bitcoin.onionServices.lnd.public = true; - - services.lightning-loop = { - enable = true; - tor.enforce = true; - tor.proxy = true; - }; - services.lightning-pool = { - enable = true; - tor.enforce = true; - tor.proxy = true; - }; - + ## LNDconnect + + services.lnd.lndconnect = { + enable = true; + onion = true; + }; + + ## RTL services.rtl = { @@ -89,50 +62,23 @@ port = 3050; nightTheme = true; nodes = { - clightning = { - enable = true; - extraConfig = { - Settings = { - enableOffers = true; - }; - }; - }; - lnd = { enable = true; - loop = true; }; - reverseOrder = true; - }; }; - ## Lndconnect - services.lnd.lndconnect = { - enable = true; - onion = true; - }; - - services.clightning.plugins.clnrest = { - enable = true; - lnconnect = { - enable = true; - onion = true; - }; - }; - - - ## BTCpay Server + ## BTCpayserver services.btcpayserver = { enable = true; }; services.btcpayserver.lightningBackend = "lnd"; - + ## System nix-bitcoin.generateSecrets = true; diff --git a/modules/bitcoinecosystem_1.nix b/modules/bitcoinecosystem_1.nix new file mode 100755 index 0000000..7750cdf --- /dev/null +++ b/modules/bitcoinecosystem_1.nix @@ -0,0 +1,95 @@ +{ config, pkgs, lib, ... }: + +{ + + ## Bitcoind + + services.bitcoind = { + enable = true; + package = config.nix-bitcoin.pkgs.bitcoind-knots; + dataDir = "/run/media/Second_Drive/BTCEcoandBackup/Bitcoin_Node"; + txindex = true; + tor.proxy = true; + disablewallet = true; + extraConfig = '' + peerbloomfilters=1 + server=1 + ''; + }; + + nix-bitcoin.onionServices.bitcoind.enable = true; + nix-bitcoin.onionServices.electrs.enable = true; + nix-bitcoin.onionServices.rtl.enable = true; + + + + ## Electrs + + services.electrs = { + enable = true; + tor.enforce = true; + dataDir = "/run/media/Second_Drive/BTCEcoandBackup/Electrs_Data"; + }; + + + ## LND + + services.lnd = { + enable = true; + tor.enforce = true; + tor.proxy = true; + extraConfig = '' + protocol.option-scid-alias=true + ''; + }; + + nix-bitcoin.onionServices.lnd.public = true; + + + ## LNDconnect + + services.lnd.lndconnect = { + enable = true; + onion = true; + }; + + + ## RTL + + services.rtl = { + enable = true; + tor.enforce = true; + port = 3050; + nightTheme = true; + nodes = { + lnd = { + enable = true; + }; + + }; + }; + + + ## BTCpayserver + + services.btcpayserver = { + enable = true; + }; + + services.btcpayserver.lightningBackend = "lnd"; + + + ## System + + nix-bitcoin.generateSecrets = true; + + nix-bitcoin.nodeinfo.enable = true; + + nix-bitcoin.operator = { + enable = true; + name = "free"; + }; + + nix-bitcoin.useVersionLockedPkgs = true; + +} diff --git a/modules/modules.nix b/modules/modules.nix index f596c89..c4617cb 100755 --- a/modules/modules.nix +++ b/modules/modules.nix @@ -10,7 +10,6 @@ ./bitcoinecosystem.nix ./vaultwarden.nix ./Sovran_SystemsOS_File_Fixes_And_New_Services.nix - ./btcpayserver-fix.nix - + ]; } diff --git a/modules/modules_1.nix b/modules/modules_1.nix new file mode 100755 index 0000000..c4617cb --- /dev/null +++ b/modules/modules_1.nix @@ -0,0 +1,15 @@ +{ config, pkgs, lib, ... }: + +{ + + imports = [ + + ./php.nix + ./synapse.nix + ./coturn.nix + ./bitcoinecosystem.nix + ./vaultwarden.nix + ./Sovran_SystemsOS_File_Fixes_And_New_Services.nix + + ]; +} diff --git a/modules/php.nix b/modules/php.nix old mode 100644 new mode 100755 From 38f4f317e20ff6a63fd8d43453863772bb65521a Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Sun, 15 Feb 2026 19:01:04 -0600 Subject: [PATCH 567/667] removed duplicate files --- README_1.md | 46 ---- custom-add-ons_1.md | 47 ----- flake_1.lock | 373 --------------------------------- modules/bitcoinecosystem_1.nix | 95 --------- modules/modules_1.nix | 15 -- 5 files changed, 576 deletions(-) delete mode 100755 README_1.md delete mode 100644 custom-add-ons_1.md delete mode 100755 flake_1.lock delete mode 100755 modules/bitcoinecosystem_1.nix delete mode 100755 modules/modules_1.nix diff --git a/README_1.md b/README_1.md deleted file mode 100755 index 7016f44..0000000 --- a/README_1.md +++ /dev/null @@ -1,46 +0,0 @@ -
-
- -

- -

- -
-
-
- -# 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://sovransystems.com - -Connect on Matrix here: https://matrix.to/#/#sovran-systems:anarchyislove.xyz - -Connect for Support on Matrix here: https://matrix.to/#/#sovran-systems-support:anarchyislove.xyz - -### - -## DIY Install Of Sovran_SystemsOS - -The write-up to install Sovran_SystemsOS on your own hardware is located here: - -https://git.sovransystems.com/Sovran_Systems/Sovran_SystemsOS/src/branch/main/DIY%20Install%20Sovran_SystemsOS.md - -The DIY support chat on Matrix is located here: - -https://matrix.to/#/%23DIY_Sovran_SystemsOS:anarchyislove.xyz - -## License - -Sovran_SystemsOS is licensed under the Apache 2 software licence. - -## - -Created, Handcrafted, and Headquartered in the Midwest – 2022-2026. - -This Gitea is Proudly Powered by a Sovran Pro. - -All Is Love. Fear Is Illusion. All Beings Are Free. Truth Can Never Be Destroyed. diff --git a/custom-add-ons_1.md b/custom-add-ons_1.md deleted file mode 100644 index 7b4c322..0000000 --- a/custom-add-ons_1.md +++ /dev/null @@ -1,47 +0,0 @@ -## Custom Add-ons for your Sovran Pro or Sovran Pro Max - -Add-ons are extra features you can have installed before your Sovran Pro is shipped to you. - -1. Since Sovran_SystemsOS runs Bitcoin Knots by default as opposed to Bitcion Core, you can customize your Sovran Pro or Sovran Pro Max node to run Bitcoin Core. - -https://github.com/bitcoin/bitcoin - - -2. The Bitcoin Mempool can be added and can be accessed via Tor or on your local network. - -https://github.com/mempool/mempool - - -The code will be installed in the `custom.nix` file. - - -The code for Bitcoin Core is as follows: - -```nix -services.bitcoind.package = lib.mkForce config.nix-bitcoin.pkgs.bitcoind; -``` - - -The code for Mempool is as follows: - -```nix -services.mempool = { - enable = true; - frontend.enable = true; -}; - -services.mysql.package = lib.mkForce pkgs.mariadb; - -nix-bitcoin.onionServices.mempool-frontend.enable = true; - -services.caddy = { - virtualHosts = { - ":60847" = { - extraConfig = '' - reverse_proxy :60845 - encode gzip zstd - ''; - }; - }; -}; -``` diff --git a/flake_1.lock b/flake_1.lock deleted file mode 100755 index 8b4017f..0000000 --- a/flake_1.lock +++ /dev/null @@ -1,373 +0,0 @@ -{ - "nodes": { - "agenix": { - "inputs": { - "darwin": [], - "home-manager": "home-manager", - "nixpkgs": "nixpkgs", - "systems": "systems" - }, - "locked": { - "lastModified": 1762618334, - "narHash": "sha256-wyT7Pl6tMFbFrs8Lk/TlEs81N6L+VSybPfiIgzU8lbQ=", - "owner": "ryantm", - "repo": "agenix", - "rev": "fcdea223397448d35d9b31f798479227e80183f6", - "type": "github" - }, - "original": { - "owner": "ryantm", - "repo": "agenix", - "type": "github" - } - }, - "btc-clients": { - "inputs": { - "nixpkgs": "nixpkgs_2", - "oldNixpkgs": "oldNixpkgs" - }, - "locked": { - "lastModified": 1766936379, - "narHash": "sha256-VBhwuhoz/byfK2OdYUKkzc1vTPqUddJaMr6elUOHeuM=", - "owner": "emmanuelrosa", - "repo": "btc-clients-nix", - "rev": "36cbe17a6160121bbae1ea7521593314d55e023c", - "type": "github" - }, - "original": { - "owner": "emmanuelrosa", - "repo": "btc-clients-nix", - "type": "github" - } - }, - "extra-container": { - "inputs": { - "flake-utils": [ - "nix-bitcoin", - "flake-utils" - ], - "nixpkgs": [ - "nix-bitcoin", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1766155727, - "narHash": "sha256-XGp4HHH6D6ZKiO5RnMzqYJYnZB538EnEflvlTsOKpvo=", - "owner": "erikarvstedt", - "repo": "extra-container", - "rev": "b450bdb24fca1076973c852d87bcb49b8eb5fd49", - "type": "github" - }, - "original": { - "owner": "erikarvstedt", - "ref": "0.14", - "repo": "extra-container", - "type": "github" - } - }, - "flake-parts": { - "inputs": { - "nixpkgs-lib": [ - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1765835352, - "narHash": "sha256-XswHlK/Qtjasvhd1nOa1e8MgZ8GS//jBoTqWtrS1Giw=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "a34fae9c08a15ad73f295041fec82323541400a9", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-utils": { - "inputs": { - "systems": "systems_2" - }, - "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "home-manager": { - "inputs": { - "nixpkgs": [ - "agenix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1745494811, - "narHash": "sha256-YZCh2o9Ua1n9uCvrvi5pRxtuVNml8X2a03qIFfRKpFs=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "abfad3d2958c9e6300a883bd443512c55dfeb1be", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "home-manager", - "type": "github" - } - }, - "nix-bitcoin": { - "inputs": { - "extra-container": "extra-container", - "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs_3", - "nixpkgs-25_05": "nixpkgs-25_05", - "nixpkgs-unstable": "nixpkgs-unstable" - }, - "locked": { - "lastModified": 1767721199, - "narHash": "sha256-UzRxDiJlopBGPTjyhCdMP+QdTwXK+l+y45urXCyH69A=", - "owner": "fort-nix", - "repo": "nix-bitcoin", - "rev": "5b532698ce9e8bd79b07d77ab4fc60e1a8408f73", - "type": "github" - }, - "original": { - "owner": "fort-nix", - "ref": "release", - "repo": "nix-bitcoin", - "type": "github" - } - }, - "nixpkgs": { - "locked": { - "lastModified": 1754028485, - "narHash": "sha256-IiiXB3BDTi6UqzAZcf2S797hWEPCRZOwyNThJIYhUfk=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "59e69648d345d6e8fef86158c555730fa12af9de", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-25.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-25_05": { - "locked": { - "lastModified": 1767051569, - "narHash": "sha256-0MnuWoN+n1UYaGBIpqpPs9I9ZHW4kynits4mrnh1Pk4=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "40ee5e1944bebdd128f9fbada44faefddfde29bd", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-25.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-stable": { - "locked": { - "lastModified": 1751274312, - "narHash": "sha256-/bVBlRpECLVzjV19t5KMdMFWSwKLtb5RyXdjz3LJT+g=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "50ab793786d9de88ee30ec4e4c24fb4236fc2674", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-24.11", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-unstable": { - "locked": { - "lastModified": 1767364772, - "narHash": "sha256-fFUnEYMla8b7UKjijLnMe+oVFOz6HjijGGNS1l7dYaQ=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "16c7794d0a28b5a37904d55bcca36003b9109aaa", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_2": { - "locked": { - "lastModified": 1764255304, - "narHash": "sha256-oQPux8afXmkbb88ceRtz1lgSGqL9auOgdYnBSqpVgSA=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "6e86c955fc372d12face4a9c0d932a6e0f7bff4d", - "type": "github" - }, - "original": { - "owner": "nixos", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { - "locked": { - "lastModified": 1767480499, - "narHash": "sha256-8IQQUorUGiSmFaPnLSo2+T+rjHtiNWc+OAzeHck7N48=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "30a3c519afcf3f99e2c6df3b359aec5692054d92", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-25.11", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_4": { - "locked": { - "lastModified": 1767767207, - "narHash": "sha256-Mj3d3PfwltLmukFal5i3fFt27L6NiKXdBezC1EBuZs4=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "5912c1772a44e31bf1c63c0390b90501e5026886", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_5": { - "locked": { - "lastModified": 1767026758, - "narHash": "sha256-7fsac/f7nh/VaKJ/qm3I338+wAJa/3J57cOGpXi0Sbg=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "346dd96ad74dc4457a9db9de4f4f57dab2e5731d", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixvim": { - "inputs": { - "flake-parts": "flake-parts", - "nixpkgs": "nixpkgs_5", - "systems": "systems_3" - }, - "locked": { - "lastModified": 1767608728, - "narHash": "sha256-kmSJCTgrx+BxgqQOTPHAOkohvO+lbRsPWqu+PSPcz3I=", - "owner": "nix-community", - "repo": "nixvim", - "rev": "851399eebd0fb383d2fd76269d859f16021dc7a8", - "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", - "btc-clients": "btc-clients", - "nix-bitcoin": "nix-bitcoin", - "nixpkgs": "nixpkgs_4", - "nixpkgs-stable": "nixpkgs-stable", - "nixvim": "nixvim" - } - }, - "systems": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_2": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_3": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - } - }, - "root": "root", - "version": 7 -} diff --git a/modules/bitcoinecosystem_1.nix b/modules/bitcoinecosystem_1.nix deleted file mode 100755 index 7750cdf..0000000 --- a/modules/bitcoinecosystem_1.nix +++ /dev/null @@ -1,95 +0,0 @@ -{ config, pkgs, lib, ... }: - -{ - - ## Bitcoind - - services.bitcoind = { - enable = true; - package = config.nix-bitcoin.pkgs.bitcoind-knots; - dataDir = "/run/media/Second_Drive/BTCEcoandBackup/Bitcoin_Node"; - txindex = true; - tor.proxy = true; - disablewallet = true; - extraConfig = '' - peerbloomfilters=1 - server=1 - ''; - }; - - nix-bitcoin.onionServices.bitcoind.enable = true; - nix-bitcoin.onionServices.electrs.enable = true; - nix-bitcoin.onionServices.rtl.enable = true; - - - - ## Electrs - - services.electrs = { - enable = true; - tor.enforce = true; - dataDir = "/run/media/Second_Drive/BTCEcoandBackup/Electrs_Data"; - }; - - - ## LND - - services.lnd = { - enable = true; - tor.enforce = true; - tor.proxy = true; - extraConfig = '' - protocol.option-scid-alias=true - ''; - }; - - nix-bitcoin.onionServices.lnd.public = true; - - - ## LNDconnect - - services.lnd.lndconnect = { - enable = true; - onion = true; - }; - - - ## RTL - - services.rtl = { - enable = true; - tor.enforce = true; - port = 3050; - nightTheme = true; - nodes = { - lnd = { - enable = true; - }; - - }; - }; - - - ## BTCpayserver - - services.btcpayserver = { - enable = true; - }; - - services.btcpayserver.lightningBackend = "lnd"; - - - ## System - - nix-bitcoin.generateSecrets = true; - - nix-bitcoin.nodeinfo.enable = true; - - nix-bitcoin.operator = { - enable = true; - name = "free"; - }; - - nix-bitcoin.useVersionLockedPkgs = true; - -} diff --git a/modules/modules_1.nix b/modules/modules_1.nix deleted file mode 100755 index c4617cb..0000000 --- a/modules/modules_1.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ config, pkgs, lib, ... }: - -{ - - imports = [ - - ./php.nix - ./synapse.nix - ./coturn.nix - ./bitcoinecosystem.nix - ./vaultwarden.nix - ./Sovran_SystemsOS_File_Fixes_And_New_Services.nix - - ]; -} From db81ece99c273ea9489c67bef304edea1c374793 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Sun, 15 Feb 2026 19:02:38 -0600 Subject: [PATCH 568/667] removed duplicate file --- configuration_1.nix | 405 -------------------------------------------- 1 file changed, 405 deletions(-) delete mode 100755 configuration_1.nix diff --git a/configuration_1.nix b/configuration_1.nix deleted file mode 100755 index 476ca23..0000000 --- a/configuration_1.nix +++ /dev/null @@ -1,405 +0,0 @@ -{ config, pkgs, lib, ... }: - - -let - personalization = import ./modules/personalization.nix; -in - -{ - - imports = - - [ - - ./modules/modules.nix - - ]; - - # Bootloader. - boot.loader.systemd-boot.enable = true; - boot.loader.efi.canTouchEfiVariables = true; - boot.loader.efi.efiSysMountPoint = "/boot/efi"; - boot.kernelPackages = pkgs.linuxPackages_latest; - - # Enable Automount without Fail for Internal Drive. - fileSystems."/run/media/Second_Drive" = { - device = "LABEL=BTCEcoandBackup"; - fsType = "ext4"; - options = [ "nofail" ]; - }; - - fileSystems."/boot/efi".options = [ "umask=0077" "defaults" ]; - - nix.settings = { - - experimental-features = [ "nix-command" "flakes" ]; - download-buffer-size = 524288000; - - }; - - networking.hostName = "nixos"; # Define your hostname. - - # 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.displayManager.gdm.enable = true; - services.desktopManager.gnome.enable = true; - - # Configure keymap in X11 - services.xserver.xkb = { - layout = "us"; - variant = ""; - }; - - # Enable CUPS to print documents. - services.printing.enable = true; - - # Systemd Settings - systemd.enableEmergencyMode = false; - - # Enable sound with pipewire. - services.pulseaudio.enable = false; - security.rtkit.enable = true; - services.pipewire = { - enable = true; - alsa.enable = true; - alsa.support32Bit = true; - pulse.enable = true; - }; - - users.users = { - free = { - isNormalUser = true; - description = "free"; - extraGroups = [ "networkmanager" ]; - }; - }; - - # Enable automatic login for the user. - services.displayManager.autoLogin.enable = true; - services.displayManager.autoLogin.user = "free"; - - # Allow Flatpak - services.flatpak.enable = true; - - systemd.services.flatpak-repo = { - wantedBy = [ "multi-user.target" ]; - after = [ "network-online.target" ]; - wants = [ "network-online.target" ]; - path = [ pkgs.flatpak ]; - script = '' - flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo - ''; - }; - - # Allow unfree packages - nixpkgs.config.allowUnfree = true; - - nixpkgs.config.permittedInsecurePackages = [ - - "jitsi-meet-1.0.8043" - ]; - - # List packages installed - environment.systemPackages = with pkgs; [ - git - wget - fish - htop - btop - gnomeExtensions.transparent-top-bar-adjustable-transparency - gnomeExtensions.systemd-manager - gnomeExtensions.dash-to-dock - gnomeExtensions.vitals - gnomeExtensions.pop-shell - gnomeExtensions.just-perfection - gnomeExtensions.appindicator - gnomeExtensions.date-menu-formatter - gnome-tweaks - papirus-icon-theme - ranger - neofetch - gedit - matrix-synapse - openssl - pwgen - aspell - aspellDicts.en - lm_sensors - hunspell - hunspellDicts.en_US - synadm - brave - dua - bitwarden-desktop - gparted - pv - unzip - parted - screen - zenity - libargon2 - gnome-terminal - libreoffice-fresh - dig - firefox - element-desktop - wp-cli - axel - - ]; - - programs.nixvim = { - enable = true; - colorschemes.catppuccin.enable = true; - plugins.lualine.enable = true; - }; - - - programs.bash.promptInit = "fish"; - - programs.fish = { - enable = true; - promptInit = "neofetch"; - }; - - - ####### CADDY ####### - services.caddy = { - enable = true; - user = "caddy"; - group = "root"; - email = "${personalization.caddy_email_for_acme}"; - - virtualHosts = { - "${personalization.wordpress_url}" = { - extraConfig = '' - encode gzip zstd - root * /var/lib/www/wordpress - php_fastcgi unix//run/phpfpm/mypool.sock - file_server browse - ''; - }; - - "${personalization.nextcloud_url}" = { - extraConfig = '' - encode gzip zstd - root * /var/lib/www/nextcloud - php_fastcgi unix//run/phpfpm/mypool.sock { - trusted_proxies private_ranges - } - file_server - redir /.well-known/carddav /remote.php/dav/ 301 - redir /.well-known/caldav /remote.php/dav/ 301 - header { - Strict-Transport-Security max-age=31536000; - } - ''; - }; - - "${personalization.matrix_url}" = { - extraConfig = '' - reverse_proxy /_matrix/* http://localhost:8008 - reverse_proxy /_synapse/client/* http://localhost:8008 - ''; - }; - - "${personalization.matrix_url}:8448" = { - extraConfig = '' - reverse_proxy http://localhost:8008 - ''; - }; - - "${personalization.btcpayserver_url}" = { - extraConfig = '' - reverse_proxy http://localhost:23000 - encode gzip zstd - ''; - }; - - "https://${personalization.vaultwarden_url}" = { - extraConfig = '' - reverse_proxy http://localhost:8777 - encode gzip zstd - ''; - }; - - ":3051" = { - extraConfig = '' - reverse_proxy :3050 - encode gzip zstd - ''; - }; - }; - }; - - ###### AGENIX ###### - age.identityPaths = [ "/root/.ssh/agenix/agenix-secret-keys" ]; - - age.secrets.matrix_reg_secret = { - - file = /var/lib/agenix-secrets/matrix_reg_secret.age; - mode = "770"; - owner = "matrix-synapse"; - group = "matrix-synapse"; - }; - - - - ###### CREATE DATABASE (WORDPRESS, MATRIX_SYNAPSE, AND NEXTCLOUD) ####### - services.postgresql = { - enable = true; - }; - - - services.postgresql.authentication = lib.mkForce '' - # Generated file; do not edit! - # TYPE DATABASE USER ADDRESS METHOD - local all all trust - host all all 127.0.0.1/32 trust - host all all ::1/128 trust - ''; - - - services.mysql = { - enable = true; - package = pkgs.mariadb; - }; - - - services.postgresql.initialScript = pkgs.writeText "begin-init.sql" '' - CREATE ROLE "ncusr" WITH LOGIN PASSWORD '${personalization.nextclouddb}'; - CREATE DATABASE "nextclouddb" WITH OWNER "ncusr" - TEMPLATE template0 - LC_COLLATE = "C" - LC_CTYPE = "C"; - - - CREATE ROLE "matrix-synapse" WITH LOGIN PASSWORD '${personalization.matrixdb}'; - CREATE DATABASE "matrix-synapse" WITH OWNER "matrix-synapse" - TEMPLATE template0 - LC_COLLATE = "C" - LC_CTYPE = "C"; - - '' - ; - - services.mysql.initialScript = pkgs.writeText "wordpress-init.sql" '' - CREATE DATABASE wordpressdb; - CREATE USER 'wpusr'@'localhost' IDENTIFIED BY '${personalization.wordpressdb}'; - GRANT ALL ON wordpressdb.* TO 'wpusr'@'localhost'; - FLUSH PRIVILEGES; - '' - ; - - - ####### KEEP AWAKE for DISPLAY and HEADLESS ####### - services.displayManager.gdm.autoSuspend = false; - - systemd.sleep.extraConfig = '' - AllowSuspend=no - AllowHibernation=no - AllowHybridSleep=no - AllowSuspendThenHibernate=no - ''; - - - ####### BACKUP TO INTERNAL DRIVE ####### - 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 = [ - - "*/5 * * * * caddy /run/current-system/sw/bin/php -f /var/lib/www/nextcloud/cron.php" - "*/15 * * * * root /run/current-system/sw/bin/bash /var/lib/njalla/njalla.sh" - "*/15 * * * * root /run/current-system/sw/bin/bash /var/lib/external_ip/external_ip.sh" - "0 0 * * 0 docker-user yes | /run/current-system/sw/bin/docker system prune -a" - - ]; - }; - - - ####### TOR ####### - services.tor = { - enable = true; - client.enable = true; - torsocks.enable = true; - }; - - services.privoxy.enableTor = true; - - - ####### Enable the SSH ####### - services.openssh = { - enable = true; - settings = { - PasswordAuthentication = false; - KbdInteractiveAuthentication = false; - PermitRootLogin = "yes"; - }; - }; - - - #######FailtoBan####### - services.fail2ban = { - enable = true; - ignoreIP = [ - "127.0.0.0/8" - "10.0.0.0/8" - "172.16.0.0/12" - "192.168.0.0/16" - "8.8.8.8" - ]; - }; - - - ####### Open ports in the firewall ####### - networking.firewall.allowedTCPPorts = [ 80 443 5349 8448 3051 ]; - networking.firewall.allowedUDPPorts = [ 80 443 5349 8448 3051 ]; - - networking.firewall.allowedUDPPortRanges = [ - { from=49152; to=65535; } # TURN relay - ]; - - networking.firewall.enable = true; - - - ####### AUTO COLLECT GARABAGE ####### - nix.gc = { - automatic = true; - dates = "weekly"; - options = "--delete-older-than 7d"; - }; - - - system.stateVersion = "22.05"; - -} From ae39b2a9b40b8a931d9999fbf1c8822048addacc Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Mon, 16 Feb 2026 08:36:00 -0600 Subject: [PATCH 569/667] updated LICENSE Apache License --- LICENSE | 432 ++++++++++++++++------------------- modules/btcpayserver-fix.nix | 8 - 2 files changed, 201 insertions(+), 239 deletions(-) delete mode 100644 modules/btcpayserver-fix.nix diff --git a/LICENSE b/LICENSE index d41c0bd..d645695 100755 --- a/LICENSE +++ b/LICENSE @@ -1,232 +1,202 @@ -GNU GENERAL PUBLIC LICENSE -Version 3, 29 June 2007 -Copyright © 2007 Free Software Foundation, Inc. - -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. - - - Copyright (C) - - 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 . - -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: - - Copyright (C) - 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 . - -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 . + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/modules/btcpayserver-fix.nix b/modules/btcpayserver-fix.nix deleted file mode 100644 index dfee4d0..0000000 --- a/modules/btcpayserver-fix.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ config, pkgs, lib, ... }: - -{ - - systemd.services.postgresql.postStart = lib.mkForce ''''; - - -} From 0d5373be982812dfaa432ab65c7538b06b132d08 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Mon, 16 Feb 2026 08:41:08 -0600 Subject: [PATCH 570/667] updated custom-add on --- custom-add-ons.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/custom-add-ons.md b/custom-add-ons.md index ea7ca30..9c76dc4 100644 --- a/custom-add-ons.md +++ b/custom-add-ons.md @@ -2,7 +2,7 @@ Add-ons are extra features you can have installed before your Sovran Pro is shipped to you. -1. Since Sovran_SystemsOS runs Bitcoin Knots by default as opposed to Bitcion Core, you can customize your Sovran Pro or Sovran Pro Max node to run Bitcoin Core. +1. Since Sovran_SystemsOS runs Bitcoin Knots by default as opposed to Bitcion Core, you can customize your Sovran Pro's Bitcoin node to run Bitcoin Core. https://github.com/bitcoin/bitcoin From c643f7f1b8d3fdf445c72a3f6ed8213322066119 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Mon, 2 Mar 2026 15:27:55 -0600 Subject: [PATCH 571/667] Nixpkgs Update and BTC Client Update --- flake.lock | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/flake.lock b/flake.lock index 8b4017f..03f7188 100755 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1762618334, - "narHash": "sha256-wyT7Pl6tMFbFrs8Lk/TlEs81N6L+VSybPfiIgzU8lbQ=", + "lastModified": 1770165109, + "narHash": "sha256-9VnK6Oqai65puVJ4WYtCTvlJeXxMzAp/69HhQuTdl/I=", "owner": "ryantm", "repo": "agenix", - "rev": "fcdea223397448d35d9b31f798479227e80183f6", + "rev": "b027ee29d959fda4b60b57566d64c98a202e0feb", "type": "github" }, "original": { @@ -27,11 +27,11 @@ "oldNixpkgs": "oldNixpkgs" }, "locked": { - "lastModified": 1766936379, - "narHash": "sha256-VBhwuhoz/byfK2OdYUKkzc1vTPqUddJaMr6elUOHeuM=", + "lastModified": 1772464976, + "narHash": "sha256-60dn9xVSKRvHbkLRDTKxdOQG4OsL1i84hHix9p+Rbec=", "owner": "emmanuelrosa", "repo": "btc-clients-nix", - "rev": "36cbe17a6160121bbae1ea7521593314d55e023c", + "rev": "70366ef295530dea4f4ec7e60a4eb1b2d2f1a55f", "type": "github" }, "original": { @@ -74,11 +74,11 @@ ] }, "locked": { - "lastModified": 1765835352, - "narHash": "sha256-XswHlK/Qtjasvhd1nOa1e8MgZ8GS//jBoTqWtrS1Giw=", + "lastModified": 1769996383, + "narHash": "sha256-AnYjnFWgS49RlqX7LrC4uA+sCCDBj0Ry/WOJ5XWAsa0=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "a34fae9c08a15ad73f295041fec82323541400a9", + "rev": "57928607ea566b5db3ad13af0e57e921e6b12381", "type": "github" }, "original": { @@ -215,11 +215,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1764255304, - "narHash": "sha256-oQPux8afXmkbb88ceRtz1lgSGqL9auOgdYnBSqpVgSA=", - "owner": "nixos", + "lastModified": 1772380631, + "narHash": "sha256-FhW0uxeXjefINP0vUD4yRBB52Us7fXZPk9RiPAopfiY=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "6e86c955fc372d12face4a9c0d932a6e0f7bff4d", + "rev": "6d3b61b190a899042ce82a5355111976ba76d698", "type": "github" }, "original": { @@ -246,11 +246,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1767767207, - "narHash": "sha256-Mj3d3PfwltLmukFal5i3fFt27L6NiKXdBezC1EBuZs4=", + "lastModified": 1772433332, + "narHash": "sha256-izhTDFKsg6KeVBxJS9EblGeQ8y+O8eCa6RcW874vxEc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5912c1772a44e31bf1c63c0390b90501e5026886", + "rev": "cf59864ef8aa2e178cccedbe2c178185b0365705", "type": "github" }, "original": { @@ -262,11 +262,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1767026758, - "narHash": "sha256-7fsac/f7nh/VaKJ/qm3I338+wAJa/3J57cOGpXi0Sbg=", + "lastModified": 1770380644, + "narHash": "sha256-P7dWMHRUWG5m4G+06jDyThXO7kwSk46C1kgjEWcybkE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "346dd96ad74dc4457a9db9de4f4f57dab2e5731d", + "rev": "ae67888ff7ef9dff69b3cf0cc0fbfbcd3a722abe", "type": "github" }, "original": { @@ -283,11 +283,11 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1767608728, - "narHash": "sha256-kmSJCTgrx+BxgqQOTPHAOkohvO+lbRsPWqu+PSPcz3I=", + "lastModified": 1772402258, + "narHash": "sha256-3DmCFOdmbkFML1/G9gj8Wb+rCCZFPOQtNoMCpqOF8SA=", "owner": "nix-community", "repo": "nixvim", - "rev": "851399eebd0fb383d2fd76269d859f16021dc7a8", + "rev": "21ae25e13b01d3b4cdc750b5f9e7bad68b150c10", "type": "github" }, "original": { From 280ba7ced996f0f9ab7b0b2b552704bb82c11b6a Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Mon, 2 Mar 2026 16:25:36 -0600 Subject: [PATCH 572/667] syntax fix --- modules/bitcoinecosystem.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/bitcoinecosystem.nix b/modules/bitcoinecosystem.nix index 7750cdf..89bf91d 100755 --- a/modules/bitcoinecosystem.nix +++ b/modules/bitcoinecosystem.nix @@ -6,7 +6,7 @@ services.bitcoind = { enable = true; - package = config.nix-bitcoin.pkgs.bitcoind-knots; + package = config.nix-bitcoin.pkgs.bitcoind-knots; dataDir = "/run/media/Second_Drive/BTCEcoandBackup/Bitcoin_Node"; txindex = true; tor.proxy = true; @@ -32,7 +32,7 @@ }; - ## LND + ## LND services.lnd = { enable = true; @@ -46,7 +46,7 @@ nix-bitcoin.onionServices.lnd.public = true; - ## LNDconnect + ## LNDconnect services.lnd.lndconnect = { enable = true; From c10629c48b0cd2650821c22086a1b1ae2de61b18 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Mon, 2 Mar 2026 16:37:14 -0600 Subject: [PATCH 573/667] btcecosystem update --- modules/bitcoinecosystem.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/bitcoinecosystem.nix b/modules/bitcoinecosystem.nix index 89bf91d..5763481 100755 --- a/modules/bitcoinecosystem.nix +++ b/modules/bitcoinecosystem.nix @@ -10,6 +10,7 @@ dataDir = "/run/media/Second_Drive/BTCEcoandBackup/Bitcoin_Node"; txindex = true; tor.proxy = true; + tor.enforce = true; disablewallet = true; extraConfig = '' peerbloomfilters=1 @@ -21,7 +22,6 @@ nix-bitcoin.onionServices.electrs.enable = true; nix-bitcoin.onionServices.rtl.enable = true; - ## Electrs @@ -90,6 +90,6 @@ name = "free"; }; - nix-bitcoin.useVersionLockedPkgs = true; + nix-bitcoin.useVersionLockedPkgs = false; } From 819ee63f8db1c290667b139ac418884641c51593 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Fri, 6 Mar 2026 11:43:32 -0600 Subject: [PATCH 574/667] updated outdated packages --- configuration.nix | 45 +++++++++++++++++---------------------------- 1 file changed, 17 insertions(+), 28 deletions(-) diff --git a/configuration.nix b/configuration.nix index c8d1146..f348418 100755 --- a/configuration.nix +++ b/configuration.nix @@ -92,15 +92,15 @@ in # Allow Flatpak services.flatpak.enable = true; - systemd.services.flatpak-repo = { - wantedBy = [ "multi-user.target" ]; - after = [ "network-online.target" ]; - wants = [ "network-online.target" ]; - path = [ pkgs.flatpak ]; - script = '' - flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo - ''; - }; + systemd.services.flatpak-repo = { + wantedBy = [ "multi-user.target" ]; + after = [ "network-online.target" ]; + wants = [ "network-online.target" ]; + path = [ pkgs.flatpak ]; + script = '' + flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo + ''; + }; # Allow unfree packages nixpkgs.config.allowUnfree = true; @@ -117,9 +117,9 @@ in fish htop btop - gnomeExtensions.transparent-top-bar-adjustable-transparency + gnomeExtensions.transparent-top-bar-adjustable-transparency gnomeExtensions.systemd-manager - gnomeExtensions.dash-to-dock + gnomeExtensions.dash-to-dock gnomeExtensions.vitals gnomeExtensions.pop-shell gnomeExtensions.just-perfection @@ -128,7 +128,7 @@ in gnome-tweaks papirus-icon-theme ranger - neofetch + fastfetch gedit matrix-synapse openssl @@ -155,25 +155,23 @@ in firefox element-desktop wp-cli - axel - + axel ]; programs.nixvim = { enable = true; colorschemes.catppuccin.enable = true; plugins.lualine.enable = true; - }; + }; programs.bash.promptInit = "fish"; programs.fish = { enable = true; - promptInit = "neofetch"; + promptInit = "fastfetch"; }; - ####### CADDY ####### services.caddy = { enable = true; @@ -252,9 +250,8 @@ in mode = "770"; owner = "matrix-synapse"; group = "matrix-synapse"; - }; - - + + }; ###### CREATE DATABASE (WORDPRESS, MATRIX_SYNAPSE, AND NEXTCLOUD) ####### services.postgresql = { @@ -302,17 +299,9 @@ in '' ; - ####### KEEP AWAKE for DISPLAY and HEADLESS ####### services.displayManager.gdm.autoSuspend = false; - systemd.sleep.extraConfig = '' - AllowSuspend=no - AllowHibernation=no - AllowHybridSleep=no - AllowSuspendThenHibernate=no - ''; - ####### BACKUP TO INTERNAL DRIVE ####### services.rsnapshot = { From 615f0f8a7994caff0f15561363e5cb42fd67a0a1 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Fri, 6 Mar 2026 11:48:51 -0600 Subject: [PATCH 575/667] Nixpkgs Update --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 03f7188..4c1e238 100755 --- a/flake.lock +++ b/flake.lock @@ -246,11 +246,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1772433332, - "narHash": "sha256-izhTDFKsg6KeVBxJS9EblGeQ8y+O8eCa6RcW874vxEc=", + "lastModified": 1772624091, + "narHash": "sha256-QKyJ0QGWBn6r0invrMAK8dmJoBYWoOWy7lN+UHzW1jc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "cf59864ef8aa2e178cccedbe2c178185b0365705", + "rev": "80bdc1e5ce51f56b19791b52b2901187931f5353", "type": "github" }, "original": { From ba9e71ae2c01c31e0550967d82b2f448140e7394 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Mon, 23 Mar 2026 11:50:40 -0500 Subject: [PATCH 576/667] Nixpkgs Update --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 4c1e238..1361b31 100755 --- a/flake.lock +++ b/flake.lock @@ -27,11 +27,11 @@ "oldNixpkgs": "oldNixpkgs" }, "locked": { - "lastModified": 1772464976, - "narHash": "sha256-60dn9xVSKRvHbkLRDTKxdOQG4OsL1i84hHix9p+Rbec=", + "lastModified": 1774138208, + "narHash": "sha256-a0jEd8Q9DI0uSWKQcDRRLfYvQUWojKtyY61jZ5W+6Js=", "owner": "emmanuelrosa", "repo": "btc-clients-nix", - "rev": "70366ef295530dea4f4ec7e60a4eb1b2d2f1a55f", + "rev": "8671254e14ed042384729662c8ab8e970b4a6d87", "type": "github" }, "original": { @@ -246,11 +246,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1772624091, - "narHash": "sha256-QKyJ0QGWBn6r0invrMAK8dmJoBYWoOWy7lN+UHzW1jc=", + "lastModified": 1774106199, + "narHash": "sha256-US5Tda2sKmjrg2lNHQL3jRQ6p96cgfWh3J1QBliQ8Ws=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "80bdc1e5ce51f56b19791b52b2901187931f5353", + "rev": "6c9a78c09ff4d6c21d0319114873508a6ec01655", "type": "github" }, "original": { From ff68c222b0a70f7deadaa0fbfd836fc49a60e640 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Tue, 24 Mar 2026 10:49:26 -0500 Subject: [PATCH 577/667] added BIP110 --- flake.nix | 4 +++- modules/bitcoinecosystem.nix | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/flake.nix b/flake.nix index d712f3f..93607c8 100755 --- a/flake.nix +++ b/flake.nix @@ -17,9 +17,11 @@ nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-24.11"; + bip110.url = "github:emmanuelrosa/bitcoin-knots-bip-110-nix"; + }; - outputs = { self, nixpkgs, nix-bitcoin, nixvim, agenix, btc-clients, nixpkgs-stable, ... }: + outputs = { self, nixpkgs, nix-bitcoin, nixvim, agenix, btc-clients, nixpkgs-stable, bip110, ... }: let system = "x86_64-linux"; diff --git a/modules/bitcoinecosystem.nix b/modules/bitcoinecosystem.nix index 5763481..b50959c 100755 --- a/modules/bitcoinecosystem.nix +++ b/modules/bitcoinecosystem.nix @@ -1,4 +1,4 @@ -{ config, pkgs, lib, ... }: +{ config, pkgs, lib, bip110, ... }: { From ca30ce77d116d3449a42860482b345bf6c787c3f Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Tue, 24 Mar 2026 16:38:45 -0500 Subject: [PATCH 578/667] retooling and updated README --- README.md | 242 +++++++++++++++++++++++++++++++++--- custom-add-ons.md | 71 +++++++---- modules/bip110.nix | 7 ++ modules/bitcoin-core.nix | 7 ++ modules/core/role-logix.nix | 37 ++++++ modules/core/roles.nix | 27 ++++ modules/element-calling.nix | 161 ++++++++++++++++++++++++ modules/haven.nix | 150 ++++++++++++++++++++++ modules/mempool.nix | 25 ++++ modules/modules.nix | 28 +++-- modules/personalization.nix | 2 + modules/rdp.nix | 52 ++++++++ 12 files changed, 754 insertions(+), 55 deletions(-) create mode 100755 modules/bip110.nix create mode 100755 modules/bitcoin-core.nix create mode 100755 modules/core/role-logix.nix create mode 100755 modules/core/roles.nix create mode 100755 modules/element-calling.nix create mode 100755 modules/haven.nix create mode 100755 modules/mempool.nix create mode 100755 modules/rdp.nix diff --git a/README.md b/README.md index 7016f44..1e3d482 100755 --- a/README.md +++ b/README.md @@ -9,38 +9,244 @@

-# Complete Configuration for Sovran_SystemsOS and the Sovran Pro +# Sovran_SystemsOS -A Nix Flake Implementation +**Own Your Stack. Run Your World.** -Thanks to all the NixOS creators and developers for creating what is the future of computing. +--- -https://sovransystems.com +## 🌐 What is Sovran_SystemsOS? -Connect on Matrix here: https://matrix.to/#/#sovran-systems:anarchyislove.xyz +Sovran_SystemsOS is a **declarative, self-hosted operating system built on NixOS** that turns a single machine into your: -Connect for Support on Matrix here: https://matrix.to/#/#sovran-systems-support:anarchyislove.xyz +* Personal cloud +* Private communications hub +* Bitcoin node +* Web server +* Daily desktop -### +This isn’t just an OS config — it’s a **complete sovereign computing environment**. -## DIY Install Of Sovran_SystemsOS +--- -The write-up to install Sovran_SystemsOS on your own hardware is located here: +## ⚡ Why It Matters -https://git.sovransystems.com/Sovran_Systems/Sovran_SystemsOS/src/branch/main/DIY%20Install%20Sovran_SystemsOS.md +Most people rely on a patchwork of third-party services: -The DIY support chat on Matrix is located here: +* Cloud storage owned by corporations +* Messaging platforms that mine metadata +* Financial infrastructure you don’t control -https://matrix.to/#/%23DIY_Sovran_SystemsOS:anarchyislove.xyz +Sovran_SystemsOS flips that model. -## License +👉 You run the services. +👉 You own the data. +👉 You control the system. -Sovran_SystemsOS is licensed under the Apache 2 software licence. +--- -## +## 🚀 What You’re Actually Getting -Created, Handcrafted, and Headquartered in the Midwest – 2022-2026. +This system doesn’t just install apps — it **assembles an ecosystem**. -This Gitea is Proudly Powered by a Sovran Pro. +### 🖥 A Unified Desktop + Server + +* Full GNOME desktop +* Ready for daily use *and* backend services +* Remote access capabilities + +--- + +### 🌍 A Real Web Stack (Out of the Box) + +* Caddy web server with automatic HTTPS +* Reverse proxy routing already wired +* Multi-service hosting under your domains + +--- + +### ☁️ Your Own Cloud Platform + +* Nextcloud → file storage, sync, collaboration +* WordPress → publish and host content +* Vaultwarden → secure password management + +--- + +### 💬 Private Communication Layer + +* Matrix Synapse → decentralized messaging backend +* Element support → modern chat + collaboration +* Optional voice/video infrastructure + +--- + +### ₿ Sovereign Financial Stack + +* Run your own Bitcoin node +* BTCPay Server for payments +* Optional mempool explorer + +No intermediaries. No permissions. + +--- + +### 🔐 Built-In Security Posture + +* Hardened SSH (no password logins) +* Fail2ban active by default +* Tor integration available +* Encrypted secrets via Agenix + +--- + +### 💾 Reliability Without Babysitting + +* Automated backups (rsnapshot) +* Cron jobs for maintenance +* Database initialization included + +--- + +## 🧠 What Makes It Stand Out + +### 1. **This Is Not a “Toolkit” — It’s a System** + +Most projects give you pieces. + +Sovran_SystemsOS gives you a **pre-integrated stack** where: + +* Services already talk to each other +* Reverse proxy is configured +* Databases are initialized +* Ports and firewall rules are handled + +You’re not assembling — you’re **activating**. + +--- + +### 2. **Feature Toggles = Power Without Bloat** + +Turn features on or off like switches: + +```nix id="z91x8a" +sovran_systemsOS.features.mempool = true; +sovran_systemsOS.features.haven = true; +``` + +No unnecessary services. No wasted resources. + +--- + +### 3. **Reproducibility = Control** + +Your entire system is code: + +* Rebuild anytime +* Move to new hardware +* Roll back instantly + +This is infrastructure you can trust because you can **recreate it exactly**. + +--- + +### 4. **Automation Where It Counts** + +A huge amount is handled for you: + +* Service wiring +* Reverse proxy setup +* Scheduled jobs +* Base security + +But unlike “black box” systems, you still retain **full visibility and control**. + +--- + +## ⚠️ Honest Reality (No Hype) + +This system **does not eliminate effort**. + +You will still need to: + +* Configure DNS and domains +* Manage secrets (Agenix) +* Understand your enabled services +* Perform initial setup steps + +But here’s the difference: + +👉 You’re not starting from scratch +👉 You’re not duct-taping services together +👉 You’re not fighting your system + +You’re building on a **solid, opinionated foundation** + +--- + +## 🔌 Expand As You Grow + +Enable advanced features anytime: + +```nix id="0p9k21" +sovran_systemsOS.features.bitcoin-core = true; +sovran_systemsOS.features.bip110 = true; +sovran_systemsOS.features.mempool = true; +sovran_systemsOS.features.rdp = true; +``` + +Available add-ons include: + +* Bitcoin Core / Knots switching +* BIP-110 (enhanced Bitcoin consensus policy) +* Mempool explorer +* Nostr relay (Haven) +* Element voice/video backend +* Remote desktop + +--- + +## 🛠 Installation + +Full guide: + +👉 https://git.sovransystems.com/Sovran_Systems/Sovran_SystemsOS/src/branch/main/DIY%20Install%20Sovran_SystemsOS.md + +--- + +## 💬 Community + +* General Chat: + https://matrix.to/#/#sovran-systems:anarchyislove.xyz + +* DIY Support: + https://matrix.to/#/#DIY_Sovran_SystemsOS:anarchyislove.xyz + +--- + +## 🧭 Who This Is For + +Sovran_SystemsOS is for people who want to: + +* Move off Big Tech platforms +* Run their own infrastructure +* Understand and control their system +* Build a sovereign digital life + +--- + +## 🧭 Final Thought + +You can keep renting your digital life… + +Or you can start owning it. + +Sovran_SystemsOS doesn’t promise magic. +It gives you something more valuable: + +👉 **A system you control, understand, and can rebuild at will.** + +--- + +**All Is Love. Fear Is Illusion. All Beings Are Free. Truth Can Never Be Destroyed.** -All Is Love. Fear Is Illusion. All Beings Are Free. Truth Can Never Be Destroyed. diff --git a/custom-add-ons.md b/custom-add-ons.md index 9c76dc4..7fbff53 100644 --- a/custom-add-ons.md +++ b/custom-add-ons.md @@ -1,47 +1,66 @@ ## Custom Add-ons for your Sovran Pro -Add-ons are extra features you can have installed before your Sovran Pro is shipped to you. +Add-ons are extra features you can have installed before your Sovran Pro is shipped to you or you can install them yourself. 1. Since Sovran_SystemsOS runs Bitcoin Knots by default as opposed to Bitcion Core, you can customize your Sovran Pro's Bitcoin node to run Bitcoin Core. https://github.com/bitcoin/bitcoin +2. BIP-110 keeps Bitcoin more efficient as Peer to Peer Cash and you can run it along side your Bitocoin node. -2. The Bitcoin Mempool can be added and can be accessed via Tor or on your local network. +https://github.com/bitcoin/bips/blob/master/bip-0110.mediawiki + +3. The Bitcoin Mempool can be added and can be accessed via Tor or on your local network. https://github.com/mempool/mempool +4. The Haven Relay for NOSTR (NOTES AND OTHER STUFF TRANSMITED BY RELAYS) is a Decenterized Social Media/File Sharing. -The code will be installed in the `custom.nix` file. +https://github.com/barrydeen/haven + +5. You can run the new Element Voice and Video calling backend. + +https://github.com/element-hq/element-call + +6. You can run the Gnome Remote Desktop to view your desktop from another computer in the nextwork. + +https://gitlab.gnome.org/GNOME/gnome-remote-desktop + +#### The code will be installed in the `custom.nix` file. -The code for Bitcoin Core is as follows: +1. The code for Bitcoin Core is as follows: ```nix -services.bitcoind.package = lib.mkForce config.nix-bitcoin.pkgs.bitcoind; +sovran_systemsOS.features.bitcoin-core = true; ``` - -The code for Mempool is as follows: +2. The code for BIP-110 is as follows: ```nix -services.mempool = { - enable = true; - frontend.enable = true; -}; - -services.mysql.package = lib.mkForce pkgs.mariadb; - -nix-bitcoin.onionServices.mempool-frontend.enable = true; - -services.caddy = { - virtualHosts = { - ":60847" = { - extraConfig = '' - reverse_proxy :60845 - encode gzip zstd - ''; - }; - }; -}; +sovran_systemsOS.features.bip110 = true; +``` + +3. The code for Mempool is as follows: + +```nix +sovran_systemsOS.features.mempool = true; +``` + +4. The code for Haven Relay is as follows: + +```nix +sovran_systemsOS.features.haven = true; +``` + +5. The code for Element Calling is as follows: + +```nix +sovran_systemsOS.features.element-calling = true; +``` + +6. The code for Gnome Remote Desktop is as follows: + +```nix +sovran_systemsOS.features.rdp = true; ``` diff --git a/modules/bip110.nix b/modules/bip110.nix new file mode 100755 index 0000000..5e07e9c --- /dev/null +++ b/modules/bip110.nix @@ -0,0 +1,7 @@ +{ config, lib, pkgs, bip110, ... }: + +{ + +services.bitcoind.packages = lib.mkForce bip110.packages.x86_64-linux.bitcoind-knots-bip-110; + +} diff --git a/modules/bitcoin-core.nix b/modules/bitcoin-core.nix new file mode 100755 index 0000000..a4951d1 --- /dev/null +++ b/modules/bitcoin-core.nix @@ -0,0 +1,7 @@ +{ config, pkgs, lib, ... }: + +{ + + services.bitcoind.package = lib.mkForce config.nix-bitcoin.pkgs.bitcoind; + +} diff --git a/modules/core/role-logix.nix b/modules/core/role-logix.nix new file mode 100755 index 0000000..e52331b --- /dev/null +++ b/modules/core/role-logix.nix @@ -0,0 +1,37 @@ +{ config, lib, ... }: + +{ + config = lib.mkMerge [ + + # Server-Desktop Role most services enabled + (lib.mkIf config.sovran_systemsOS.roles.server-desktop { + sovran_systemsOS.features = { + synapse = true; + bitcoin = true; + coturn = true; + vaultwarden = true; + haven = false; + mempool = false; + bip110 = false; + element-calling = false; + bitcoin-core = false; + rdp = false; + }; + }) + + # Desktop role + (lib.mkIf config.sovran_systemsOS.roles.desktop { + services.xserver.enable = true; + services.desktopManager.gnome.enable = true; + }) + + # Bitcoin node role + (lib.mkIf config.sovran_systemsOS.roles.node { + sovran_systemsOS.features = { + bitcoin = true; + bip110 = false; + }; + }) + + ]; +} diff --git a/modules/core/roles.nix b/modules/core/roles.nix new file mode 100755 index 0000000..fd0c4eb --- /dev/null +++ b/modules/core/roles.nix @@ -0,0 +1,27 @@ +{ config, lib, ... }: + +{ + options.sovran_systemsOS = { + roles = { + server-desktop = lib.mkOption { + type = lib.types.bool; + default = !config.sovran_sovransystemsOS.roles.desktop && !config.sovran_systemsOS.roles.node; + }; + desktop = lib.mkEnableOption "Desktop Role"; + node = lib.mkEnableOption "Bitcoin Node Only Role"; + }; + + features = { + coturn = lib.mkEnableOption "TURN server"; + synapse = lib.mkEnableOption "Matrix Synapse"; + bitcoin = lib.mkEnableOption "Bitcoin Ecosystem"; + vaultwarden = lib.mkEnableOption "Vaultwarden"; + haven = lib.mkEnableOption "Haven NOSTR relay"; + bip110 = lib.mkEnableOption "BIP-110 Bitcoin Better Money"; + mempool = lib.mkEnableOption "Bitcoin Mempool Explorer"; + element-calling = lib.mkEnableOption "Element Video and Audio Calling"; + bitcoin-core = lib.mkEnableOption "Bitcoin Core"; + rdp = lib.mkEnableOption "Gnome Remote Desktop"; + }; + }; +} diff --git a/modules/element-calling.nix b/modules/element-calling.nix new file mode 100755 index 0000000..bdbe8b4 --- /dev/null +++ b/modules/element-calling.nix @@ -0,0 +1,161 @@ +{ config, pkgs, lib, ... }: + +let + +personalization = import ./personalization.nix; + +in + +{ + + systemd.tmpfiles.rules = [ + "d /var/lib/domains/element-calling 0750 caddy php -" + ]; + + + "${personalization.matrix_url}" = lib.mkForce { + extraConfig = '' + reverse_proxy /_matrix/* http://localhost:8008 + reverse_proxy /_synapse/client/* http://localhost:8008 + header /.well-known/matrix/* Content-Type "application/json" + header /.well-known/matrix/* Access-Control-Allow-Origin "*" + header /.well-known/matrix/* Access-Control-Allow-Methods "GET, POST, PUT, DELETE, OPTIONS" + header /.well-known/matrix/* Access-Control-Allow-Headers "X-Requested-With, Content-Type, Authorization" + respond /.well-known/matrix/client `{ "m.homeserver": {"base_url": "https://anarchyislove.xyz" }, "org.matrix.msc4143.rtc_foci": [{ "type":"livekit", "livekit_service_url":"https://${personalization.element-calling_url}/livekit/jwt" }] }` + ''; + }; + + + "${personalization.element-calling_url}" = { + extraConfig = '' + handle /livekit/jwt/sfu/get { + uri strip_prefix /livekit/jwt + reverse_proxy [::1]:8073 { + header_up Host {host} + header_up X-Forwarded-Server {host} + header_up X-Real-IP {remote_host} + header_up X-Forwarded-For {remote_host} + } + } + + handle { + reverse_proxy localhost:7880 + } + ''; + }; + + services.livekit = { + enable = true; + openFirewall = true; + settings = { + rtc.use_external_ip = true; + rtc.udp_port = "7882-7894"; + room = { + auto_create = false; + }; + turn = { + enabled = true; + domain = "${personalization.matrix_url}"; + tls_port = 5349; + udp_port = 3478; + cert_file = "/var/lib/livekit/${personalization.matrix_url}.crt"; + key_file = "/var/lib/livekit/${personalization.matrix_url}.key"; + }; + }; + keyFile = "/var/lib/livekit/livekit_keyFile"; + }; + + networking.firewall.allowedTCPPorts = [ 7881 ]; #Livekit TCP Port + + networking.firewall.allowedUDPPortRanges = [ + { from=7882; to=7894; } + ]; + + services.lk-jwt-service = { + enable = true; + port = 8073; + livekitUrl = "wss://${personalization.element-calling_url}"; + keyFile = "/var/lib/livekit/livekit_keyFile"; + }; + + services.matrix-synapse = { + settings = lib.mkForce { + + serve_server_wellknown = true; + + public_baseurl = ${personalization.matrix_url}; + + experimental_features = { + msc3266_enabled = true; + msc4222_enabled = true; + }; + + max_event_delay_duration = "24h"; + + rc_message = { + per_second = 0.5; + burst_count = 30; + }; + + rc_delayed_event_mgmt = { + per_second = 1; + burst_count = 20; + }; + + push.include_content = false; + server_name = personalization.matrix_url; + url_preview_enabled = true; + max_upload_size = "1024M"; + group_unread_count_by_room = false; + encryption_enabled_by_default_for_room_type = "invite"; + allow_profile_lookup_over_federation = false; + allow_device_name_lookup_over_federation = false; + + url_preview_ip_range_blacklist = [ + "10.0.0.0/8" + "100.64.0.0/10" + "169.254.0.0/16" + "172.16.0.0/12" + "192.0.0.0/24" + "192.0.2.0/24" + "192.168.0.0/16" + "192.88.99.0/24" + "198.18.0.0/15" + "198.51.100.0/24" + "2001:db8::/32" + "203.0.113.0/24" + "224.0.0.0/4" + "::1/128" + "fc00::/7" + "fe80::/10" + "fec0::/10" + "ff00::/8" + ]; + + url_preview_ip_ranger_whitelist = [ "127.0.0.1" ]; + presence.enabled = true; + enable_registration = false; + registration_shared_secret = config.age.secrets.matrix_reg_secret.path; + listeners = [ + { + port = 8008; + bind_addresses = [ "::1" ]; + type = "http"; + tls = false; + x_forwarded = true; + resources = [ + { + names = [ "client" ]; + compress = true; + } + { + names = [ "federation" ]; + compress = false; + } + ]; + } + ]; + }; + }; +} + diff --git a/modules/haven.nix b/modules/haven.nix new file mode 100755 index 0000000..045c7bb --- /dev/null +++ b/modules/haven.nix @@ -0,0 +1,150 @@ +{config, pkgs, lib, ...}: + +let + +personalization = import ./personalization.nix; + +in + +{ + + services.haven = { + enable = true; + settings = { + OWNER_NPUB=""; + RELAY_URL="*name*"; + + RELAY_PORT=3355; + RELAY_BIND_ADDRESS="0.0.0.0"; # Can be set to a specific IP4 or IP6 address ("" for all interfaces) + DB_ENGINE="badger"; # badger, lmdb (lmdb works best with an nvme, otherwise you might have stability issues) + LMDB_MAPSIZE=3000000000; # 0 for default (currently ~273GB), or set to a different size in bytes, e.g. 10737418240 for 10GB + BLOSSOM_PATH="blossom/"; + +## Private Relay Settings + PRIVATE_RELAY_NAME="*name* private relay"; + PRIVATE_RELAY_NPUB=""; + PRIVATE_RELAY_DESCRIPTION="The Relay From Sovran Systems"; +#PRIVATE_RELAY_ICON="https://i.nostr.build/6G6wW.gif" + +## Private Relay Rate Limiters + 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 Settings + CHAT_RELAY_NAME="*name* chat relay"; + CHAT_RELAY_NPUB=""; + CHAT_RELAY_DESCRIPTION="a relay for private chats"; +#CHAT_RELAY_ICON="https://i.nostr.build/6G6wW.gif" + CHAT_RELAY_WOT_DEPTH=3; + CHAT_RELAY_WOT_REFRESH_INTERVAL_HOURS=24; + CHAT_RELAY_MINIMUM_FOLLOWERS=3; + +## Chat Relay Rate Limiters + 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 Settings + OUTBOX_RELAY_NAME="*name* outbox relay"; + OUTBOX_RELAY_NPUB=""; + OUTBOX_RELAY_DESCRIPTION="a relay and Blossom server for public messages and media"; +#OUTBOX_RELAY_ICON="https://i.nostr.build/6G6wW.gif" + +## Outbox Relay Rate Limiters + 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 Settings + INBOX_RELAY_NAME="*name* inbox relay"; + INBOX_RELAY_NPUB=""; + INBOX_RELAY_DESCRIPTION="send your interactions with my notes here"; +#INBOX_RELAY_ICON="https://i.nostr.build/6G6wW.gif" + INBOX_PULL_INTERVAL_SECONDS=600; + +## Inbox Relay Rate Limiters + 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 Settings + WOT_FETCH_TIMEOUT_SECONDS=60; + + WHITELISTED_NPUBS_FILE="/var/lib/haven/whitelisted_npubs.json"; + + BLACKLISTED_NPUBS_FILE=""; + + +## LOGGING + HAVEN_LOG_LEVEL="INFO"; # DEBUG, INFO, WARNING or ERROR + }; + + blastrRelays = [ + "nos.lol" + "relay.nostr.band" + "relay.snort.social" + "nostr.mom" + "relay.primal.net" + "no.str.cr" + "nostr21.com" + "nostrue.com" + "wot.nostr.party" + "wot.sovbit.host" + "wot.girino.org" + "relay.lexingtonbitcoin.org" + "zap.watch" + "satsage.xyz" + "wons.calva.dev" + ]; + + }; + + systemd.tmpfiles.rules = [ + "d /var/lib/haven 0750 haven haven -" + "f /var/lib/haven/whitelisted_npubs.json 0770 haven haven -" + ]; + + services.caddy = { + virtualHosts = { + "${personalization.haven_url}" = { + extraConfig = '' + reverse_proxy localhost:3355 { + header_up Host {host} + header_up X-Real-IP {remote_host} + header_up X-Forwarded-For {remote_host} + header_up X-Forwarded-Proto {scheme} + transport http { + versions 1.1 + } + } + request_body { + max_size 100MB + } + ''; + }; + }; + }; +} + + diff --git a/modules/mempool.nix b/modules/mempool.nix new file mode 100755 index 0000000..e95f793 --- /dev/null +++ b/modules/mempool.nix @@ -0,0 +1,25 @@ +{ config, pkgs, lib, ... }: + +{ + + services.mempool = { + enable = true; + frontend.enable = true; + }; + + services.mysql.package = lib.mkForce pkgs.mariadb; + + nix-bitcoin.onionServices.mempool-frontend.enable = true; + + services.caddy = { + virtualHosts = { + ":60847" = { + extraConfig = '' + reverse_proxy :60845 + encode gzip zstd + ''; + }; + }; + }; + +} diff --git a/modules/modules.nix b/modules/modules.nix index c4617cb..8e705fd 100755 --- a/modules/modules.nix +++ b/modules/modules.nix @@ -1,15 +1,21 @@ { config, pkgs, lib, ... }: { - - imports = [ - - ./php.nix - ./synapse.nix - ./coturn.nix - ./bitcoinecosystem.nix - ./vaultwarden.nix - ./Sovran_SystemsOS_File_Fixes_And_New_Services.nix - - ]; + imports = + [ + ./core/roles.nix + ./core/role-logic.nix + ./php.nix + ./Sovran_SystemsOS_File_Fixes_And_New_Services.nix + ] + ++ lib.optional config.sovran_systemsOS.features.synapse ./synapse.nix + ++ lib.optional config.sovran_systemsOS.features.coturn ./coturn.nix + ++ lib.optional config.sovran_systemsOS.features.bitcoin ./bitcoinecosystem.nix + ++ lib.optional config.sovran_systemsOS.features.vaultwarden ./vaultwarden.nix + ++ lib.optional config.sovran_systemsOS.features.haven ./haven.nix + ++ lib.optional config.sovran_systemsOS.features.bip110 ./bip110.nix + ++ lib.optional config.sovran_systemsOS.features.element-calling ./element-calling.nix + ++ lib.optional config.sovran_systemsOS.features.mempool ./mempool.nix + ++ lib.optional config.sovran_systemsOS.features.bitcoin-core ./bitcoin-core.nix + ++ lib.optional config.sovran_systemsOS.features.rdp ./rdp.nix; } diff --git a/modules/personalization.nix b/modules/personalization.nix index b2f2ca5..f828a53 100755 --- a/modules/personalization.nix +++ b/modules/personalization.nix @@ -6,6 +6,8 @@ nextcloud_url = builtins.readFile /var/lib/domains/nextcloud; btcpayserver_url = builtins.readFile /var/lib/domains/btcpayserver; caddy_email_for_acme = builtins.readFile /var/lib/domains/sslemail; vaultwarden_url = builtins.readFile /var/lib/domains/vaultwarden; +haven_url = builtins.readFile /var/lib/domains/haven; +element-calling_url = builtins.readFile /var/lib/domains/element-calling; ## diff --git a/modules/rdp.nix b/modules/rdp.nix new file mode 100755 index 0000000..2f3c7a7 --- /dev/null +++ b/modules/rdp.nix @@ -0,0 +1,52 @@ +{ config, pkgs, lib, ... }: + +{ + services.gnome.gnome-remote-desktop.enable = true; + + systemd.services.gnome-remote-desktop = { + wantedBy = [ "graphical.target" ]; # for starting the unit automatically at boot + }; + + services.displayManager.autoLogin.enable = lib.mkForce false; + + networking.firewall.allowedTCPPorts = [ 3389 ]; + + environment.systemPackages = with pkgs; [ + freerdp + ]; + + systemd.services.gnome-remote-desktop-setup = { + description = "Initialize GNOME Remote Desktop RDP TLS and config"; + wantedBy = [ "multi-user.target" ]; + after = [ "gnome-remote-desktop.service" ]; + + serviceConfig = { + Type = "oneshot"; + StateDirectory = "gnome-remote-desktop"; + }; + + script = '' + set -e + + CERT_DIR=/var/lib/gnome-remote-desktop + KEY_FILE=$CERT_DIR/rdp-tls.key + CRT_FILE=$CERT_DIR/rdp-tls.crt + + if [ ! -f "$KEY_FILE" ]; then + echo "Generating RDP TLS certificate..." + + runuser -u gnome-remote-desktop -- \ + ${pkgs.freerdp}/bin/winpr-makecert -silent -rdp \ + -path "$CERT_DIR" rdp-tls + else + echo "TLS key already exists, skipping generation" + fi + + # Always ensure config is set (safe to re-run) + ${pkgs.gnome.gnome-remote-desktop}/bin/grdctl --system rdp set-tls-key "$KEY_FILE" + ${pkgs.gnome.gnome-remote-desktop}/bin/grdctl --system rdp set-tls-cert "$CRT_FILE" + ${pkgs.gnome.gnome-remote-desktop}/bin/grdctl --system rdp enable + ${pkgs.gnome.gnome-remote-desktop}/bin/grdctl --system rdp set-credentials "free" "a" + ''; + }; +} From 0427d85220d83f8d8fb7bac419c762c758bdd804 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Tue, 24 Mar 2026 16:43:38 -0500 Subject: [PATCH 579/667] fixed loop --- configuration.nix | 6 ------ 1 file changed, 6 deletions(-) diff --git a/configuration.nix b/configuration.nix index f348418..4e8ed39 100755 --- a/configuration.nix +++ b/configuration.nix @@ -8,12 +8,6 @@ in { imports = - - [ - - ./modules/modules.nix - - ]; # Bootloader. boot.loader.systemd-boot.enable = true; From 4c646883dcfd4733b0d5416356ebfd3df2def7aa Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Tue, 24 Mar 2026 16:45:02 -0500 Subject: [PATCH 580/667] fixed typo --- configuration.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/configuration.nix b/configuration.nix index 4e8ed39..fc7828a 100755 --- a/configuration.nix +++ b/configuration.nix @@ -6,9 +6,6 @@ let in { - - imports = - # Bootloader. boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; From ba3318369de56c2c6d088526563f7a5a68a91474 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Tue, 24 Mar 2026 17:03:02 -0500 Subject: [PATCH 581/667] fixed tooling --- modules/bip110.nix | 2 +- modules/bitcoin-core.nix | 4 ++-- modules/bitcoinecosystem.nix | 2 +- modules/core/roles.nix | 2 +- modules/element-calling.nix | 2 +- modules/haven.nix | 2 +- modules/mempool.nix | 2 +- modules/modules.nix | 39 ++++++++++++++++++++---------------- modules/rdp.nix | 3 ++- 9 files changed, 32 insertions(+), 26 deletions(-) diff --git a/modules/bip110.nix b/modules/bip110.nix index 5e07e9c..a79b5a1 100755 --- a/modules/bip110.nix +++ b/modules/bip110.nix @@ -1,6 +1,6 @@ { config, lib, pkgs, bip110, ... }: -{ +lib.mkIf config.sovran_systemsOS.features.bip110 { services.bitcoind.packages = lib.mkForce bip110.packages.x86_64-linux.bitcoind-knots-bip-110; diff --git a/modules/bitcoin-core.nix b/modules/bitcoin-core.nix index a4951d1..609c8f3 100755 --- a/modules/bitcoin-core.nix +++ b/modules/bitcoin-core.nix @@ -1,7 +1,7 @@ { config, pkgs, lib, ... }: -{ - +lib.mkIf config.sovran_systemsOS.features.bitcoin-core { + services.bitcoind.package = lib.mkForce config.nix-bitcoin.pkgs.bitcoind; } diff --git a/modules/bitcoinecosystem.nix b/modules/bitcoinecosystem.nix index b50959c..dc447f8 100755 --- a/modules/bitcoinecosystem.nix +++ b/modules/bitcoinecosystem.nix @@ -1,6 +1,6 @@ { config, pkgs, lib, bip110, ... }: -{ +lib.mkIf config.sovran_systemsOS.features.bitcoin { ## Bitcoind diff --git a/modules/core/roles.nix b/modules/core/roles.nix index fd0c4eb..6b4e732 100755 --- a/modules/core/roles.nix +++ b/modules/core/roles.nix @@ -5,7 +5,7 @@ roles = { server-desktop = lib.mkOption { type = lib.types.bool; - default = !config.sovran_sovransystemsOS.roles.desktop && !config.sovran_systemsOS.roles.node; + default = !config.sovran_systemsOS.roles.desktop && !config.sovran_systemsOS.roles.node; }; desktop = lib.mkEnableOption "Desktop Role"; node = lib.mkEnableOption "Bitcoin Node Only Role"; diff --git a/modules/element-calling.nix b/modules/element-calling.nix index bdbe8b4..7a09b33 100755 --- a/modules/element-calling.nix +++ b/modules/element-calling.nix @@ -6,7 +6,7 @@ personalization = import ./personalization.nix; in -{ +lib.mkIf config.sovran_systemsOS.features.element-calling { systemd.tmpfiles.rules = [ "d /var/lib/domains/element-calling 0750 caddy php -" diff --git a/modules/haven.nix b/modules/haven.nix index 045c7bb..8092537 100755 --- a/modules/haven.nix +++ b/modules/haven.nix @@ -6,7 +6,7 @@ personalization = import ./personalization.nix; in -{ +lib.mkIf config.sovran_systemsOS.features.haven { services.haven = { enable = true; diff --git a/modules/mempool.nix b/modules/mempool.nix index e95f793..5a6b1d3 100755 --- a/modules/mempool.nix +++ b/modules/mempool.nix @@ -1,6 +1,6 @@ { config, pkgs, lib, ... }: -{ +lib.mkIf config.sovran_systemsOS.features.mempool { services.mempool = { enable = true; diff --git a/modules/modules.nix b/modules/modules.nix index 8e705fd..4f49a02 100755 --- a/modules/modules.nix +++ b/modules/modules.nix @@ -1,21 +1,26 @@ { config, pkgs, lib, ... }: { - imports = - [ - ./core/roles.nix - ./core/role-logic.nix - ./php.nix - ./Sovran_SystemsOS_File_Fixes_And_New_Services.nix - ] - ++ lib.optional config.sovran_systemsOS.features.synapse ./synapse.nix - ++ lib.optional config.sovran_systemsOS.features.coturn ./coturn.nix - ++ lib.optional config.sovran_systemsOS.features.bitcoin ./bitcoinecosystem.nix - ++ lib.optional config.sovran_systemsOS.features.vaultwarden ./vaultwarden.nix - ++ lib.optional config.sovran_systemsOS.features.haven ./haven.nix - ++ lib.optional config.sovran_systemsOS.features.bip110 ./bip110.nix - ++ lib.optional config.sovran_systemsOS.features.element-calling ./element-calling.nix - ++ lib.optional config.sovran_systemsOS.features.mempool ./mempool.nix - ++ lib.optional config.sovran_systemsOS.features.bitcoin-core ./bitcoin-core.nix - ++ lib.optional config.sovran_systemsOS.features.rdp ./rdp.nix; + + imports = [ + + ./core/roles.nix + ./core/role-logic.nix + ./php.nix + ./Sovran_SystemsOS_File_Fixes_And_New_Services.nix + + # Always imported feature modules + ./synapse.nix + ./coturn.nix + ./bitcoinecosystem.nix + ./vaultwarden.nix + ./haven.nix + ./bip110.nix + ./element-calling.nix + ./mempool.nix + ./bitcoin-core.nix + ./rdp.nix + + ]; + } diff --git a/modules/rdp.nix b/modules/rdp.nix index 2f3c7a7..164e239 100755 --- a/modules/rdp.nix +++ b/modules/rdp.nix @@ -1,6 +1,7 @@ { config, pkgs, lib, ... }: -{ +lib.mkIf config.sovran_systemsOS.features.rpd { + services.gnome.gnome-remote-desktop.enable = true; systemd.services.gnome-remote-desktop = { From 5adc45481373ae8fb577d604ed23a21c1b1749cf Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Tue, 24 Mar 2026 17:06:37 -0500 Subject: [PATCH 582/667] added modules --- modules/coturn.nix | 2 +- modules/synapse.nix | 2 +- modules/vaultwarden.nix | 5 +++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/modules/coturn.nix b/modules/coturn.nix index fbafb81..fac4c86 100755 --- a/modules/coturn.nix +++ b/modules/coturn.nix @@ -4,7 +4,7 @@ let personalization = import ./personalization.nix; in -{ +lib.mkIf config.sovran_systemsOS.features.coturn { systemd.services.coturn-helper = { diff --git a/modules/synapse.nix b/modules/synapse.nix index d633653..3208eae 100755 --- a/modules/synapse.nix +++ b/modules/synapse.nix @@ -10,7 +10,7 @@ let personalization = import ./personalization.nix; in -{ +lib.mkIf config.sovran_systemsOS.features.synapse { services.matrix-synapse = { enable = true; settings = { diff --git a/modules/vaultwarden.nix b/modules/vaultwarden.nix index 2f34110..aac1ef8 100755 --- a/modules/vaultwarden.nix +++ b/modules/vaultwarden.nix @@ -3,7 +3,8 @@ let personalization = import ./personalization.nix; in -{ + +lib.mkIf config.sovran_systemsOS.features.vaultwarden { services.vaultwarden = { enable = true; @@ -18,4 +19,4 @@ in dbBackend = "sqlite"; environmentFile = "/var/lib/secrets/vaultwarden/vaultwarden.env"; }; -} \ No newline at end of file +} From af00a49ac413a6fd92795f875764951c69c8bc4c Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Tue, 24 Mar 2026 17:10:37 -0500 Subject: [PATCH 583/667] added modules link --- configuration.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/configuration.nix b/configuration.nix index fc7828a..eef8351 100755 --- a/configuration.nix +++ b/configuration.nix @@ -6,6 +6,16 @@ let in { + + imports = + + [ + + ./modules/modules.nix + + ]; + + # Bootloader. boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; From e637a95ee90ea31db52d37ed83a0a2d669182842 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Tue, 24 Mar 2026 17:15:33 -0500 Subject: [PATCH 584/667] Rename roleLogic.nix to role-logic.nix --- modules/core/{role-logix.nix => role-logic.nix} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename modules/core/{role-logix.nix => role-logic.nix} (100%) diff --git a/modules/core/role-logix.nix b/modules/core/role-logic.nix similarity index 100% rename from modules/core/role-logix.nix rename to modules/core/role-logic.nix From 199203bb741d0dd177a7cd6f2de41c856fe746b8 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Tue, 24 Mar 2026 17:17:30 -0500 Subject: [PATCH 585/667] fixed syntax --- modules/element-calling.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/element-calling.nix b/modules/element-calling.nix index 7a09b33..ad2a893 100755 --- a/modules/element-calling.nix +++ b/modules/element-calling.nix @@ -83,7 +83,7 @@ lib.mkIf config.sovran_systemsOS.features.element-calling { serve_server_wellknown = true; - public_baseurl = ${personalization.matrix_url}; + public_baseurl = "${personalization.matrix_url}"; experimental_features = { msc3266_enabled = true; From e755d021994610467bca3da33bc300439698c2e8 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Tue, 24 Mar 2026 17:22:22 -0500 Subject: [PATCH 586/667] fixed syntax for elment-calling --- modules/element-calling.nix | 158 ++++++++++++++---------------------- 1 file changed, 63 insertions(+), 95 deletions(-) diff --git a/modules/element-calling.nix b/modules/element-calling.nix index ad2a893..8bb91fb 100755 --- a/modules/element-calling.nix +++ b/modules/element-calling.nix @@ -1,88 +1,84 @@ { config, pkgs, lib, ... }: let - -personalization = import ./personalization.nix; - + personalization = import ./personalization.nix; in - + lib.mkIf config.sovran_systemsOS.features.element-calling { + ####### SYSTEMD TMPFILES ####### systemd.tmpfiles.rules = [ "d /var/lib/domains/element-calling 0750 caddy php -" ]; - + ####### CADDY EXTRA CONFIG ####### "${personalization.matrix_url}" = lib.mkForce { extraConfig = '' - reverse_proxy /_matrix/* http://localhost:8008 - reverse_proxy /_synapse/client/* http://localhost:8008 + 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://anarchyislove.xyz" }, "org.matrix.msc4143.rtc_foci": [{ "type":"livekit", "livekit_service_url":"https://${personalization.element-calling_url}/livekit/jwt" }] }` - ''; + respond /.well-known/matrix/client `{ "m.homeserver": {"base_url": "https://${personalization.matrix_url}" }, "org.matrix.msc4143.rtc_foci": [{ "type":"livekit", "livekit_service_url":"https://${personalization.element-calling_url}/livekit/jwt" }] }` + ''; }; - - "${personalization.element-calling_url}" = { - extraConfig = '' - handle /livekit/jwt/sfu/get { - uri strip_prefix /livekit/jwt - reverse_proxy [::1]:8073 { - header_up Host {host} - header_up X-Forwarded-Server {host} - header_up X-Real-IP {remote_host} - header_up X-Forwarded-For {remote_host} - } - } - - handle { - reverse_proxy localhost:7880 - } - ''; - }; + "${personalization.element-calling_url}" = lib.mkForce { + extraConfig = '' + handle /livekit/jwt/sfu/get { + uri strip_prefix /livekit/jwt + reverse_proxy [::1]:8073 { + header_up Host {host} + header_up X-Forwarded-Server {host} + header_up X-Real-IP {remote_host} + header_up X-Forwarded-For {remote_host} + } + } + handle { + reverse_proxy localhost:7880 + } + ''; + }; + ####### LIVEKIT SERVICE ####### services.livekit = { enable = true; - openFirewall = true; + openFirewall = true; settings = { rtc.use_external_ip = true; rtc.udp_port = "7882-7894"; - room = { - auto_create = false; - }; - turn = { - enabled = true; - domain = "${personalization.matrix_url}"; - tls_port = 5349; - udp_port = 3478; - cert_file = "/var/lib/livekit/${personalization.matrix_url}.crt"; - key_file = "/var/lib/livekit/${personalization.matrix_url}.key"; + room.auto_create = false; + + turn = { + enabled = true; + domain = "${personalization.matrix_url}"; + tls_port = 5349; + udp_port = 3478; + cert_file = "/var/lib/livekit/${personalization.matrix_url}.crt"; + key_file = "/var/lib/livekit/${personalization.matrix_url}.key"; }; }; keyFile = "/var/lib/livekit/livekit_keyFile"; }; - - networking.firewall.allowedTCPPorts = [ 7881 ]; #Livekit TCP Port - + + networking.firewall.allowedTCPPorts = [ 7881 ]; networking.firewall.allowedUDPPortRanges = [ - { from=7882; to=7894; } + { from = 7882; to = 7894; } ]; + ####### JWT SERVICE ####### services.lk-jwt-service = { - enable = true; - port = 8073; - livekitUrl = "wss://${personalization.element-calling_url}"; - keyFile = "/var/lib/livekit/livekit_keyFile"; + enable = true; + port = 8073; + livekitUrl = "wss://${personalization.element-calling_url}"; + keyFile = "/var/lib/livekit/livekit_keyFile"; }; + ####### MATRIX-SYNAPSE SETTINGS ####### services.matrix-synapse = { - settings = lib.mkForce { - + settings = { serve_server_wellknown = true; - public_baseurl = "${personalization.matrix_url}"; experimental_features = { @@ -92,70 +88,42 @@ lib.mkIf config.sovran_systemsOS.features.element-calling { max_event_delay_duration = "24h"; - rc_message = { - per_second = 0.5; - burst_count = 30; - }; - - rc_delayed_event_mgmt = { - per_second = 1; - burst_count = 20; - }; + rc_message = { per_second = 0.5; burst_count = 30; }; + rc_delayed_event_mgmt = { per_second = 1; burst_count = 20; }; push.include_content = false; server_name = personalization.matrix_url; url_preview_enabled = true; - max_upload_size = "1024M"; group_unread_count_by_room = false; encryption_enabled_by_default_for_room_type = "invite"; allow_profile_lookup_over_federation = false; allow_device_name_lookup_over_federation = false; - - url_preview_ip_range_blacklist = [ - "10.0.0.0/8" - "100.64.0.0/10" - "169.254.0.0/16" - "172.16.0.0/12" - "192.0.0.0/24" - "192.0.2.0/24" - "192.168.0.0/16" - "192.88.99.0/24" - "198.18.0.0/15" - "198.51.100.0/24" - "2001:db8::/32" - "203.0.113.0/24" - "224.0.0.0/4" - "::1/128" - "fc00::/7" - "fe80::/10" - "fec0::/10" - "ff00::/8" - ]; - url_preview_ip_ranger_whitelist = [ "127.0.0.1" ]; - presence.enabled = true; - enable_registration = false; - registration_shared_secret = config.age.secrets.matrix_reg_secret.path; - listeners = [ + url_preview_ip_range_blacklist = [ + "10.0.0.0/8" "100.64.0.0/10" "169.254.0.0/16" "172.16.0.0/12" + "192.0.0.0/24" "192.0.2.0/24" "192.168.0.0/16" "192.88.99.0/24" + "198.18.0.0/15" "198.51.100.0/24" "2001:db8::/32" "203.0.113.0/24" + "224.0.0.0/4" "::1/128" "fc00::/7" "fe80::/10" "fec0::/10" "ff00::/8" + ]; + + url_preview_ip_ranger_whitelist = [ "127.0.0.1" ]; + presence.enabled = true; + enable_registration = false; + registration_shared_secret = config.age.secrets.matrix_reg_secret.path; + + listeners = [ { port = 8008; bind_addresses = [ "::1" ]; type = "http"; tls = false; x_forwarded = true; - resources = [ - { - names = [ "client" ]; - compress = true; - } - { - names = [ "federation" ]; - compress = false; - } + resources = [ + { names = [ "client" ]; compress = true; } + { names = [ "federation" ]; compress = false; } ]; } ]; }; }; } - From a02cb49fdfc05e8fe810450da95ab840938b21d9 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Tue, 24 Mar 2026 17:29:17 -0500 Subject: [PATCH 587/667] fixed delayed loading for element-calling --- modules/element-calling.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/element-calling.nix b/modules/element-calling.nix index 8bb91fb..08bcc14 100755 --- a/modules/element-calling.nix +++ b/modules/element-calling.nix @@ -7,7 +7,7 @@ in lib.mkIf config.sovran_systemsOS.features.element-calling { ####### SYSTEMD TMPFILES ####### - systemd.tmpfiles.rules = [ + systemd.tmpfiles.rules = lib.mkIf config.sovran_systemsOS.features.element-calling [ "d /var/lib/domains/element-calling 0750 caddy php -" ]; From c783b20a6d2f758f0e45b168393eb96a33e0ad52 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Tue, 24 Mar 2026 17:37:49 -0500 Subject: [PATCH 588/667] fixed directory make --- modules/element-calling.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/modules/element-calling.nix b/modules/element-calling.nix index 08bcc14..f3890e1 100755 --- a/modules/element-calling.nix +++ b/modules/element-calling.nix @@ -6,12 +6,15 @@ in lib.mkIf config.sovran_systemsOS.features.element-calling { - ####### SYSTEMD TMPFILES ####### - systemd.tmpfiles.rules = lib.mkIf config.sovran_systemsOS.features.element-calling [ + ####### SYSTEMD TMPFILES: create directories automatically ####### + systemd.tmpfiles.rules = [ + # Ensure parent directories exist + "d /var/lib/domains 0755 root root -" "d /var/lib/domains/element-calling 0750 caddy php -" + "d /var/lib/livekit 0750 root root -" ]; - ####### CADDY EXTRA CONFIG ####### + ####### CADDY CONFIGS ####### "${personalization.matrix_url}" = lib.mkForce { extraConfig = '' reverse_proxy /_matrix/* http://localhost:8008 @@ -49,7 +52,6 @@ lib.mkIf config.sovran_systemsOS.features.element-calling { rtc.use_external_ip = true; rtc.udp_port = "7882-7894"; room.auto_create = false; - turn = { enabled = true; domain = "${personalization.matrix_url}"; From 195160edd3db2216d734da892c28aa8ca6035e40 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Tue, 24 Mar 2026 17:44:34 -0500 Subject: [PATCH 589/667] fixed directory make --- modules/element-calling.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/modules/element-calling.nix b/modules/element-calling.nix index f3890e1..ee545dc 100755 --- a/modules/element-calling.nix +++ b/modules/element-calling.nix @@ -9,9 +9,7 @@ lib.mkIf config.sovran_systemsOS.features.element-calling { ####### SYSTEMD TMPFILES: create directories automatically ####### systemd.tmpfiles.rules = [ # Ensure parent directories exist - "d /var/lib/domains 0755 root root -" - "d /var/lib/domains/element-calling 0750 caddy php -" - "d /var/lib/livekit 0750 root root -" + "d /var/lib/domains/element-calling 0750 - - -" ]; ####### CADDY CONFIGS ####### @@ -79,7 +77,7 @@ lib.mkIf config.sovran_systemsOS.features.element-calling { ####### MATRIX-SYNAPSE SETTINGS ####### services.matrix-synapse = { - settings = { + settings = lib.mkForce { serve_server_wellknown = true; public_baseurl = "${personalization.matrix_url}"; From 4abce7065d68892c6ebfedfd99338a134ece270d Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Tue, 24 Mar 2026 17:49:33 -0500 Subject: [PATCH 590/667] fixed directory make --- modules/element-calling.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/modules/element-calling.nix b/modules/element-calling.nix index ee545dc..8976234 100755 --- a/modules/element-calling.nix +++ b/modules/element-calling.nix @@ -7,10 +7,9 @@ in lib.mkIf config.sovran_systemsOS.features.element-calling { ####### SYSTEMD TMPFILES: create directories automatically ####### - systemd.tmpfiles.rules = [ - # Ensure parent directories exist - "d /var/lib/domains/element-calling 0750 - - -" - ]; + systemd.tmpfiles.rules = lib.mkDefault (lib.mkIf config.sovran_systemsOS.features.element-calling [ + "d /var/lib/domains/element-calling 0750 caddy php -" + ]); ####### CADDY CONFIGS ####### "${personalization.matrix_url}" = lib.mkForce { From 404a6130179e1d18b1a65200ba66a98616888e37 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Tue, 24 Mar 2026 17:53:41 -0500 Subject: [PATCH 591/667] fixed directory make --- modules/element-calling.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/element-calling.nix b/modules/element-calling.nix index 8976234..350da4b 100755 --- a/modules/element-calling.nix +++ b/modules/element-calling.nix @@ -8,7 +8,7 @@ lib.mkIf config.sovran_systemsOS.features.element-calling { ####### SYSTEMD TMPFILES: create directories automatically ####### systemd.tmpfiles.rules = lib.mkDefault (lib.mkIf config.sovran_systemsOS.features.element-calling [ - "d /var/lib/domains/element-calling 0750 caddy php -" + 'd /var/lib/domains/element-calling 0750 caddy php -' ]); ####### CADDY CONFIGS ####### From 178b007f5665dd785a6ceec9a746099c77580c40 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Tue, 24 Mar 2026 18:10:24 -0500 Subject: [PATCH 592/667] fixed personalization.nix to help elment-calling --- modules/element-calling.nix | 6 +++--- modules/personalization.nix | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/element-calling.nix b/modules/element-calling.nix index 350da4b..5c3f2da 100755 --- a/modules/element-calling.nix +++ b/modules/element-calling.nix @@ -7,9 +7,9 @@ in lib.mkIf config.sovran_systemsOS.features.element-calling { ####### SYSTEMD TMPFILES: create directories automatically ####### - systemd.tmpfiles.rules = lib.mkDefault (lib.mkIf config.sovran_systemsOS.features.element-calling [ - 'd /var/lib/domains/element-calling 0750 caddy php -' - ]); + systemd.tmpfiles.rules = [ + ''d /var/lib/domains/element-calling 0750 caddy php -'' + ]; ####### CADDY CONFIGS ####### "${personalization.matrix_url}" = lib.mkForce { diff --git a/modules/personalization.nix b/modules/personalization.nix index f828a53..ee05e58 100755 --- a/modules/personalization.nix +++ b/modules/personalization.nix @@ -6,8 +6,8 @@ nextcloud_url = builtins.readFile /var/lib/domains/nextcloud; btcpayserver_url = builtins.readFile /var/lib/domains/btcpayserver; caddy_email_for_acme = builtins.readFile /var/lib/domains/sslemail; vaultwarden_url = builtins.readFile /var/lib/domains/vaultwarden; -haven_url = builtins.readFile /var/lib/domains/haven; -element-calling_url = builtins.readFile /var/lib/domains/element-calling; +haven_url = /var/lib/domains/haven; +element-calling_url = /var/lib/domains/element-calling; ## From 89aedec013f3a93f641df25ee28feec3d4ef41b3 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Tue, 24 Mar 2026 18:12:57 -0500 Subject: [PATCH 593/667] fixed element-calling --- modules/element-calling.nix | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/modules/element-calling.nix b/modules/element-calling.nix index 5c3f2da..f953f10 100755 --- a/modules/element-calling.nix +++ b/modules/element-calling.nix @@ -1,14 +1,10 @@ { config, pkgs, lib, ... }: -let - personalization = import ./personalization.nix; -in +imports = lib.optional config.sovran_systemsOS.features.element-calling + ./personalization.nix; -lib.mkIf config.sovran_systemsOS.features.element-calling { - - ####### SYSTEMD TMPFILES: create directories automatically ####### - systemd.tmpfiles.rules = [ - ''d /var/lib/domains/element-calling 0750 caddy php -'' + systemd.tmpfiles.rules = lib.mkIf config.sovran_systemsOS.features.element-calling [ + "d /var/lib/domains/element-calling 0750 caddy php -" ]; ####### CADDY CONFIGS ####### From 0fe6395aeadcea9f1f0b01f174a7b5fecaf848a7 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Tue, 24 Mar 2026 18:14:38 -0500 Subject: [PATCH 594/667] syntax error --- modules/element-calling.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/modules/element-calling.nix b/modules/element-calling.nix index f953f10..e2ad9c8 100755 --- a/modules/element-calling.nix +++ b/modules/element-calling.nix @@ -1,6 +1,8 @@ { config, pkgs, lib, ... }: -imports = lib.optional config.sovran_systemsOS.features.element-calling +{ + + imports = lib.optional config.sovran_systemsOS.features.element-calling ./personalization.nix; systemd.tmpfiles.rules = lib.mkIf config.sovran_systemsOS.features.element-calling [ From 26feecdf4fb5e41abbca446236645b9864244c39 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Tue, 24 Mar 2026 18:19:34 -0500 Subject: [PATCH 595/667] retool personalization --- modules/element-calling.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/modules/element-calling.nix b/modules/element-calling.nix index e2ad9c8..1642cbf 100755 --- a/modules/element-calling.nix +++ b/modules/element-calling.nix @@ -2,8 +2,12 @@ { - imports = lib.optional config.sovran_systemsOS.features.element-calling - ./personalization.nix; + let + personalization = + if config.sovran_systemsOS.features.element-calling + then import ./personalization.nix + else {}; + in systemd.tmpfiles.rules = lib.mkIf config.sovran_systemsOS.features.element-calling [ "d /var/lib/domains/element-calling 0750 caddy php -" From dc88f8a65df3c1b2595cc10cb3a25f702308dced Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Tue, 24 Mar 2026 18:21:56 -0500 Subject: [PATCH 596/667] syntax error --- modules/element-calling.nix | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/modules/element-calling.nix b/modules/element-calling.nix index 1642cbf..7c82754 100755 --- a/modules/element-calling.nix +++ b/modules/element-calling.nix @@ -1,14 +1,13 @@ { config, pkgs, lib, ... }: +let + personalization = + if config.sovran_systemsOS.features.element-calling + then import ./personalization.nix + else {}; +in + { - - let - personalization = - if config.sovran_systemsOS.features.element-calling - then import ./personalization.nix - else {}; - in - systemd.tmpfiles.rules = lib.mkIf config.sovran_systemsOS.features.element-calling [ "d /var/lib/domains/element-calling 0750 caddy php -" ]; From c53647ec28519f615c2d6dc46a7e7513e717699d Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Tue, 24 Mar 2026 18:28:46 -0500 Subject: [PATCH 597/667] syntax error --- modules/element-calling.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/modules/element-calling.nix b/modules/element-calling.nix index 7c82754..af2b34a 100755 --- a/modules/element-calling.nix +++ b/modules/element-calling.nix @@ -1,17 +1,18 @@ { config, pkgs, lib, ... }: let - personalization = - if config.sovran_systemsOS.features.element-calling - then import ./personalization.nix - else {}; + personalization = import ./personalization.nix; in - { systemd.tmpfiles.rules = lib.mkIf config.sovran_systemsOS.features.element-calling [ "d /var/lib/domains/element-calling 0750 caddy php -" ]; + services.element-call = lib.mkIf config.sovran_systemsOS.features.element-calling { + server_name = personalization.matrix_url or null; + }; +} + ####### CADDY CONFIGS ####### "${personalization.matrix_url}" = lib.mkForce { extraConfig = '' From 7be1f5fa15298a11cfe789f0f713c676cac6afcf Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Tue, 24 Mar 2026 18:32:14 -0500 Subject: [PATCH 598/667] syntax error --- modules/element-calling.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/element-calling.nix b/modules/element-calling.nix index af2b34a..592d1cd 100755 --- a/modules/element-calling.nix +++ b/modules/element-calling.nix @@ -3,7 +3,9 @@ let personalization = import ./personalization.nix; in -{ + +lib.mkIf config.sovran_systemsOS.features.element-calling { + systemd.tmpfiles.rules = lib.mkIf config.sovran_systemsOS.features.element-calling [ "d /var/lib/domains/element-calling 0750 caddy php -" ]; @@ -11,7 +13,6 @@ in services.element-call = lib.mkIf config.sovran_systemsOS.features.element-calling { server_name = personalization.matrix_url or null; }; -} ####### CADDY CONFIGS ####### "${personalization.matrix_url}" = lib.mkForce { From e408d115fdd345ebf1889ea0fd3429fc2403aa0c Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Tue, 24 Mar 2026 18:43:07 -0500 Subject: [PATCH 599/667] added script to make directories --- ...n_SystemsOS_File_Fixes_And_New_Services.sh | 8 +++ .../element-calling_haven.sh | 63 +++++++++++++++++++ modules/element-calling.nix | 6 +- 3 files changed, 72 insertions(+), 5 deletions(-) create mode 100644 file_fixes_and_new_services/element-calling_haven.sh diff --git a/file_fixes_and_new_services/Sovran_SystemsOS_File_Fixes_And_New_Services.sh b/file_fixes_and_new_services/Sovran_SystemsOS_File_Fixes_And_New_Services.sh index 3e84dc5..538aa4f 100755 --- a/file_fixes_and_new_services/Sovran_SystemsOS_File_Fixes_And_New_Services.sh +++ b/file_fixes_and_new_services/Sovran_SystemsOS_File_Fixes_And_New_Services.sh @@ -56,6 +56,14 @@ rm -rf /home/free/Downloads/add_external_backup_app.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 #### diff --git a/file_fixes_and_new_services/element-calling_haven.sh b/file_fixes_and_new_services/element-calling_haven.sh new file mode 100644 index 0000000..331a693 --- /dev/null +++ b/file_fixes_and_new_services/element-calling_haven.sh @@ -0,0 +1,63 @@ +#!/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/element-calling_haven/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/element-calling_haven ; touch /var/lib/beacons/file_fixes_and_new_services/element-calling_haven/started + + if [[ $? != 0 ]]; then + + /run/current-system/sw/bin/echo "Could Not Create Initial Tag" + + exit 1 + + fi + + +#### MAIN SCRIPT #### + + touch /var/lib/domains/haven + touch /var/lib/domains/element-calling + + if [[ $? != 0 ]]; then + + /run/current-system/sw/bin/echo "Could Not Run element-calling_haven" + + exit 1 + + fi + + + +#### CREATE COMPELETE TAG #### + +/run/current-system/sw/bin/touch /var/lib/beacons/file_fixes_and_new_services/element-calling_haven/completed + + if [[ $? != 0 ]]; then + + /run/current-system/sw/bin/echo "Could Not Create Completed Tag" + + exit 1 + + fi + + +exit 0 diff --git a/modules/element-calling.nix b/modules/element-calling.nix index 592d1cd..04b7c40 100755 --- a/modules/element-calling.nix +++ b/modules/element-calling.nix @@ -6,14 +6,10 @@ in lib.mkIf config.sovran_systemsOS.features.element-calling { - systemd.tmpfiles.rules = lib.mkIf config.sovran_systemsOS.features.element-calling [ + systemd.tmpfiles.rules = [ "d /var/lib/domains/element-calling 0750 caddy php -" ]; - services.element-call = lib.mkIf config.sovran_systemsOS.features.element-calling { - server_name = personalization.matrix_url or null; - }; - ####### CADDY CONFIGS ####### "${personalization.matrix_url}" = lib.mkForce { extraConfig = '' From 48e0c1168e523f71e5167ffeee3dc531be8072bd Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Tue, 24 Mar 2026 18:50:22 -0500 Subject: [PATCH 600/667] fixed personalization --- modules/personalization.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/personalization.nix b/modules/personalization.nix index ee05e58..f828a53 100755 --- a/modules/personalization.nix +++ b/modules/personalization.nix @@ -6,8 +6,8 @@ nextcloud_url = builtins.readFile /var/lib/domains/nextcloud; btcpayserver_url = builtins.readFile /var/lib/domains/btcpayserver; caddy_email_for_acme = builtins.readFile /var/lib/domains/sslemail; vaultwarden_url = builtins.readFile /var/lib/domains/vaultwarden; -haven_url = /var/lib/domains/haven; -element-calling_url = /var/lib/domains/element-calling; +haven_url = builtins.readFile /var/lib/domains/haven; +element-calling_url = builtins.readFile /var/lib/domains/element-calling; ## From 87f8e8b8551cfbff3c850735e38a1e5fc27cc411 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Tue, 24 Mar 2026 18:57:32 -0500 Subject: [PATCH 601/667] fixed element-calling --- modules/element-calling.nix | 56 ++++++++++++++++++------------------- 1 file changed, 27 insertions(+), 29 deletions(-) diff --git a/modules/element-calling.nix b/modules/element-calling.nix index 04b7c40..c19e38a 100755 --- a/modules/element-calling.nix +++ b/modules/element-calling.nix @@ -6,38 +6,36 @@ in lib.mkIf config.sovran_systemsOS.features.element-calling { - systemd.tmpfiles.rules = [ - "d /var/lib/domains/element-calling 0750 caddy php -" - ]; - ####### CADDY CONFIGS ####### - "${personalization.matrix_url}" = lib.mkForce { - extraConfig = '' - reverse_proxy /_matrix/* http://localhost:8008 - reverse_proxy /_synapse/client/* http://localhost:8008 - header /.well-known/matrix/* Content-Type "application/json" - header /.well-known/matrix/* Access-Control-Allow-Origin "*" - header /.well-known/matrix/* Access-Control-Allow-Methods "GET, POST, PUT, DELETE, OPTIONS" - header /.well-known/matrix/* Access-Control-Allow-Headers "X-Requested-With, Content-Type, Authorization" - respond /.well-known/matrix/client `{ "m.homeserver": {"base_url": "https://${personalization.matrix_url}" }, "org.matrix.msc4143.rtc_foci": [{ "type":"livekit", "livekit_service_url":"https://${personalization.element-calling_url}/livekit/jwt" }] }` - ''; - }; + services.caddy.virtualHosts = lib.mkForce { + "${personalization.matrix_url}" = { + extraConfig = '' + reverse_proxy /_matrix/* http://localhost:8008 + reverse_proxy /_synapse/client/* http://localhost:8008 + header /.well-known/matrix/* Content-Type "application/json" + header /.well-known/matrix/* Access-Control-Allow-Origin "*" + header /.well-known/matrix/* Access-Control-Allow-Methods "GET, POST, PUT, DELETE, OPTIONS" + header /.well-known/matrix/* Access-Control-Allow-Headers "X-Requested-With, Content-Type, Authorization" + respond /.well-known/matrix/client `{ "m.homeserver": {"base_url": "https://${personalization.matrix_url}" }, "org.matrix.msc4143.rtc_foci": [{ "type":"livekit", "livekit_service_url":"https://${personalization.element-calling_url}/livekit/jwt" }] }` + ''; + }; - "${personalization.element-calling_url}" = lib.mkForce { - extraConfig = '' - handle /livekit/jwt/sfu/get { - uri strip_prefix /livekit/jwt - reverse_proxy [::1]:8073 { - header_up Host {host} - header_up X-Forwarded-Server {host} - header_up X-Real-IP {remote_host} - header_up X-Forwarded-For {remote_host} + "${personalization.element-calling_url}" = { + extraConfig = '' + handle /livekit/jwt/sfu/get { + uri strip_prefix /livekit/jwt + reverse_proxy [::1]:8073 { + header_up Host {host} + header_up X-Forwarded-Server {host} + header_up X-Real-IP {remote_host} + header_up X-Forwarded-For {remote_host} + } } - } - handle { - reverse_proxy localhost:7880 - } - ''; + handle { + reverse_proxy localhost:7880 + } + ''; + }; }; ####### LIVEKIT SERVICE ####### From 61a53a6690cdc87ede6673f4215d7418c08c6828 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Tue, 24 Mar 2026 19:03:33 -0500 Subject: [PATCH 602/667] fixed bip110 --- modules/bip110.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/bip110.nix b/modules/bip110.nix index a79b5a1..3963549 100755 --- a/modules/bip110.nix +++ b/modules/bip110.nix @@ -1,7 +1,7 @@ -{ config, lib, pkgs, bip110, ... }: +{ config, lib, pkgs, ... }: lib.mkIf config.sovran_systemsOS.features.bip110 { -services.bitcoind.packages = lib.mkForce bip110.packages.x86_64-linux.bitcoind-knots-bip-110; + services.bitcoind.packages = lib.mkForce bip110.packages.x86_64-linux.bitcoind-knots-bip-110; } From 59c495eb894b2bcd8edc00add0a1befce4986ee7 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Tue, 24 Mar 2026 19:05:54 -0500 Subject: [PATCH 603/667] fixed typo --- modules/bip110.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/bip110.nix b/modules/bip110.nix index 3963549..0b4d0fa 100755 --- a/modules/bip110.nix +++ b/modules/bip110.nix @@ -1,7 +1,7 @@ -{ config, lib, pkgs, ... }: +{ config, lib, pkgs, bip110, ... }: lib.mkIf config.sovran_systemsOS.features.bip110 { - services.bitcoind.packages = lib.mkForce bip110.packages.x86_64-linux.bitcoind-knots-bip-110; + services.bitcoind.package = lib.mkForce bip110.packages.x86_64-linux.bitcoind-knots-bip-110; } From a3b9b9e983bfa015cee9c274e33717f1230cf38e Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Tue, 24 Mar 2026 19:07:12 -0500 Subject: [PATCH 604/667] fixed typo --- modules/rdp.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/rdp.nix b/modules/rdp.nix index 164e239..9f4c5a7 100755 --- a/modules/rdp.nix +++ b/modules/rdp.nix @@ -1,6 +1,6 @@ { config, pkgs, lib, ... }: -lib.mkIf config.sovran_systemsOS.features.rpd { +lib.mkIf config.sovran_systemsOS.features.rdp { services.gnome.gnome-remote-desktop.enable = true; From 793c500b2b147a9dc2d52eab2922305be82c8e9a Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Tue, 24 Mar 2026 19:18:11 -0500 Subject: [PATCH 605/667] fixed handling rdp.nix --- modules/rdp.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/rdp.nix b/modules/rdp.nix index 9f4c5a7..8194c73 100755 --- a/modules/rdp.nix +++ b/modules/rdp.nix @@ -44,10 +44,10 @@ lib.mkIf config.sovran_systemsOS.features.rdp { fi # Always ensure config is set (safe to re-run) - ${pkgs.gnome.gnome-remote-desktop}/bin/grdctl --system rdp set-tls-key "$KEY_FILE" - ${pkgs.gnome.gnome-remote-desktop}/bin/grdctl --system rdp set-tls-cert "$CRT_FILE" - ${pkgs.gnome.gnome-remote-desktop}/bin/grdctl --system rdp enable - ${pkgs.gnome.gnome-remote-desktop}/bin/grdctl --system rdp set-credentials "free" "a" + ${pkgs.gnome-remote-desktop}/bin/grdctl --system rdp set-tls-key "$KEY_FILE" + ${pkgs.gnome-remote-desktop}/bin/grdctl --system rdp set-tls-cert "$CRT_FILE" + ${pkgs.gnome-remote-desktop}/bin/grdctl --system rdp enable + ${pkgs.gnome-remote-desktop}/bin/grdctl --system rdp set-credentials "free" "a" ''; }; } From d02562e7894efb8dd6c4de8df816ab3d0962ac26 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Tue, 24 Mar 2026 19:26:59 -0500 Subject: [PATCH 606/667] fixed systemd rdp.nix --- modules/rdp.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/rdp.nix b/modules/rdp.nix index 8194c73..e09e087 100755 --- a/modules/rdp.nix +++ b/modules/rdp.nix @@ -44,10 +44,10 @@ lib.mkIf config.sovran_systemsOS.features.rdp { fi # Always ensure config is set (safe to re-run) - ${pkgs.gnome-remote-desktop}/bin/grdctl --system rdp set-tls-key "$KEY_FILE" - ${pkgs.gnome-remote-desktop}/bin/grdctl --system rdp set-tls-cert "$CRT_FILE" - ${pkgs.gnome-remote-desktop}/bin/grdctl --system rdp enable - ${pkgs.gnome-remote-desktop}/bin/grdctl --system rdp set-credentials "free" "a" + ${pkgs.gnome-remote-desktop}/bin/grdctl rdp set-tls-key "$KEY_FILE" + ${pkgs.gnome-remote-desktop}/bin/grdctl rdp set-tls-cert "$CRT_FILE" + ${pkgs.gnome-remote-desktop}/bin/grdctl rdp enable + ${pkgs.gnome-remote-desktop}/bin/grdctl rdp set-credentials "free" "a" ''; }; } From e0a8afd989791c3a3ac8d75c7fb77a15cbbee1ae Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Tue, 24 Mar 2026 19:31:19 -0500 Subject: [PATCH 607/667] fixed systemd rdp.nix --- modules/rdp.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/modules/rdp.nix b/modules/rdp.nix index e09e087..795bef2 100755 --- a/modules/rdp.nix +++ b/modules/rdp.nix @@ -14,6 +14,7 @@ lib.mkIf config.sovran_systemsOS.features.rdp { environment.systemPackages = with pkgs; [ freerdp + polkit ]; systemd.services.gnome-remote-desktop-setup = { @@ -44,10 +45,10 @@ lib.mkIf config.sovran_systemsOS.features.rdp { fi # Always ensure config is set (safe to re-run) - ${pkgs.gnome-remote-desktop}/bin/grdctl rdp set-tls-key "$KEY_FILE" - ${pkgs.gnome-remote-desktop}/bin/grdctl rdp set-tls-cert "$CRT_FILE" - ${pkgs.gnome-remote-desktop}/bin/grdctl rdp enable - ${pkgs.gnome-remote-desktop}/bin/grdctl rdp set-credentials "free" "a" + ${pkgs.gnome-remote-desktop}/bin/grdctl --system rdp set-tls-key "$KEY_FILE" + ${pkgs.gnome-remote-desktop}/bin/grdctl --system rdp set-tls-cert "$CRT_FILE" + ${pkgs.gnome-remote-desktop}/bin/grdctl --system rdp enable + ${pkgs.gnome-remote-desktop}/bin/grdctl --system rdp set-credentials "free" "a" ''; }; } From 4d87a572eaca87b85817150cf325be032646d83d Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Tue, 24 Mar 2026 19:34:35 -0500 Subject: [PATCH 608/667] systemd rdp script fix --- modules/rdp.nix | 54 +++++++++++++++++++++++++++++++------------------ 1 file changed, 34 insertions(+), 20 deletions(-) diff --git a/modules/rdp.nix b/modules/rdp.nix index 795bef2..51724c1 100755 --- a/modules/rdp.nix +++ b/modules/rdp.nix @@ -3,32 +3,43 @@ lib.mkIf config.sovran_systemsOS.features.rdp { services.gnome.gnome-remote-desktop.enable = true; - - systemd.services.gnome-remote-desktop = { - wantedBy = [ "graphical.target" ]; # for starting the unit automatically at boot - }; - - services.displayManager.autoLogin.enable = lib.mkForce false; - + networking.firewall.allowedTCPPorts = [ 3389 ]; environment.systemPackages = with pkgs; [ freerdp - polkit ]; + # Ensure GNOME remote desktop user exists properly + users.users.gnome-remote-desktop = { + isSystemUser = true; + group = "gnome-remote-desktop"; + }; + + users.groups.gnome-remote-desktop = {}; + systemd.services.gnome-remote-desktop-setup = { - description = "Initialize GNOME Remote Desktop RDP TLS and config"; + description = "GNOME Remote Desktop RDP Setup (declarative)"; + wantedBy = [ "multi-user.target" ]; - after = [ "gnome-remote-desktop.service" ]; + + after = [ + "gnome-remote-desktop.service" + ]; + + requires = [ + "gnome-remote-desktop.service" + ]; serviceConfig = { Type = "oneshot"; + RemainAfterExit = true; + StateDirectory = "gnome-remote-desktop"; }; script = '' - set -e + set -euo pipefail CERT_DIR=/var/lib/gnome-remote-desktop KEY_FILE=$CERT_DIR/rdp-tls.key @@ -37,18 +48,21 @@ lib.mkIf config.sovran_systemsOS.features.rdp { if [ ! -f "$KEY_FILE" ]; then echo "Generating RDP TLS certificate..." - runuser -u gnome-remote-desktop -- \ - ${pkgs.freerdp}/bin/winpr-makecert -silent -rdp \ + ${pkgs.freerdp}/bin/winpr-makecert -silent -rdp \ -path "$CERT_DIR" rdp-tls - else - echo "TLS key already exists, skipping generation" + + chown gnome-remote-desktop:gnome-remote-desktop $CERT_DIR/* fi - # Always ensure config is set (safe to re-run) - ${pkgs.gnome-remote-desktop}/bin/grdctl --system rdp set-tls-key "$KEY_FILE" - ${pkgs.gnome-remote-desktop}/bin/grdctl --system rdp set-tls-cert "$CRT_FILE" - ${pkgs.gnome-remote-desktop}/bin/grdctl --system rdp enable - ${pkgs.gnome-remote-desktop}/bin/grdctl --system rdp set-credentials "free" "a" + # Configure RDP (no pkexec, no --system) + ${pkgs.gnome-remote-desktop}/bin/grdctl rdp set-tls-key "$KEY_FILE" + ${pkgs.gnome-remote-desktop}/bin/grdctl rdp set-tls-cert "$CRT_FILE" + ${pkgs.gnome-remote-desktop}/bin/grdctl rdp enable + + # Only set credentials if not already set + if ! ${pkgs.gnome-remote-desktop}/bin/grdctl rdp show | grep -q "username"; then + ${pkgs.gnome-remote-desktop}/bin/grdctl rdp set-credentials "free" "a" + fi ''; }; } From c389fe7c4d1460a0c6013ce13bec3891159a7450 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Tue, 24 Mar 2026 19:53:26 -0500 Subject: [PATCH 609/667] rdp retooling --- modules/rdp.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/modules/rdp.nix b/modules/rdp.nix index 51724c1..1f34bbf 100755 --- a/modules/rdp.nix +++ b/modules/rdp.nix @@ -65,4 +65,9 @@ lib.mkIf config.sovran_systemsOS.features.rdp { fi ''; }; + + systemd.tmpfiles.rules = [ + "d /var/lib/gnome-remote-desktop 0700 gnome-remote-desktop gnome-remote-desktop -" + ]; + } From fce2d0d855695e1a1d4857fc70b24614280f21e6 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Tue, 24 Mar 2026 20:05:25 -0500 Subject: [PATCH 610/667] rdp retooling --- modules/rdp.nix | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/modules/rdp.nix b/modules/rdp.nix index 1f34bbf..8b3f7d5 100755 --- a/modules/rdp.nix +++ b/modules/rdp.nix @@ -45,6 +45,8 @@ lib.mkIf config.sovran_systemsOS.features.rdp { KEY_FILE=$CERT_DIR/rdp-tls.key CRT_FILE=$CERT_DIR/rdp-tls.crt + chown gnome-remote-desktop:gnome-remote-desktop $CERT_DIR/ -R + if [ ! -f "$KEY_FILE" ]; then echo "Generating RDP TLS certificate..." @@ -54,10 +56,10 @@ lib.mkIf config.sovran_systemsOS.features.rdp { chown gnome-remote-desktop:gnome-remote-desktop $CERT_DIR/* fi - # Configure RDP (no pkexec, no --system) - ${pkgs.gnome-remote-desktop}/bin/grdctl rdp set-tls-key "$KEY_FILE" - ${pkgs.gnome-remote-desktop}/bin/grdctl rdp set-tls-cert "$CRT_FILE" - ${pkgs.gnome-remote-desktop}/bin/grdctl rdp enable + # Configure RDP + ${pkgs.gnome-remote-desktop}/bin/grdctl --system rdp set-tls-key "$KEY_FILE" + ${pkgs.gnome-remote-desktop}/bin/grdctl --system rdp set-tls-cert "$CRT_FILE" + ${pkgs.gnome-remote-desktop}/bin/grdctl --system rdp enable # Only set credentials if not already set if ! ${pkgs.gnome-remote-desktop}/bin/grdctl rdp show | grep -q "username"; then @@ -66,8 +68,4 @@ lib.mkIf config.sovran_systemsOS.features.rdp { ''; }; - systemd.tmpfiles.rules = [ - "d /var/lib/gnome-remote-desktop 0700 gnome-remote-desktop gnome-remote-desktop -" - ]; - } From 0029ee74090322e95689570e4ae8a386b7e02002 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Tue, 24 Mar 2026 20:07:54 -0500 Subject: [PATCH 611/667] rdp retooling --- modules/rdp.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/modules/rdp.nix b/modules/rdp.nix index 8b3f7d5..9e061cd 100755 --- a/modules/rdp.nix +++ b/modules/rdp.nix @@ -19,7 +19,7 @@ lib.mkIf config.sovran_systemsOS.features.rdp { users.groups.gnome-remote-desktop = {}; systemd.services.gnome-remote-desktop-setup = { - description = "GNOME Remote Desktop RDP Setup (declarative)"; + description = "GNOME Remote Desktop RDP Setup"; wantedBy = [ "multi-user.target" ]; @@ -35,7 +35,6 @@ lib.mkIf config.sovran_systemsOS.features.rdp { Type = "oneshot"; RemainAfterExit = true; - StateDirectory = "gnome-remote-desktop"; }; script = '' From 9bb42784b90995b445efe7a15b5fce2007805d1c Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Tue, 24 Mar 2026 20:15:41 -0500 Subject: [PATCH 612/667] rdp added systemd unit --- modules/rdp.nix | 34 ++++++++++++++++++++++++---------- 1 file changed, 24 insertions(+), 10 deletions(-) diff --git a/modules/rdp.nix b/modules/rdp.nix index 9e061cd..058bc93 100755 --- a/modules/rdp.nix +++ b/modules/rdp.nix @@ -10,14 +10,6 @@ lib.mkIf config.sovran_systemsOS.features.rdp { freerdp ]; - # Ensure GNOME remote desktop user exists properly - users.users.gnome-remote-desktop = { - isSystemUser = true; - group = "gnome-remote-desktop"; - }; - - users.groups.gnome-remote-desktop = {}; - systemd.services.gnome-remote-desktop-setup = { description = "GNOME Remote Desktop RDP Setup"; @@ -44,8 +36,6 @@ lib.mkIf config.sovran_systemsOS.features.rdp { KEY_FILE=$CERT_DIR/rdp-tls.key CRT_FILE=$CERT_DIR/rdp-tls.crt - chown gnome-remote-desktop:gnome-remote-desktop $CERT_DIR/ -R - if [ ! -f "$KEY_FILE" ]; then echo "Generating RDP TLS certificate..." @@ -66,5 +56,29 @@ lib.mkIf config.sovran_systemsOS.features.rdp { fi ''; }; + + systemd.services.gnome-remote-desktop-permission = { + description = "GNOME Remote Desktop File Permission"; + + wantedBy = [ "multi-user.target" ]; + + after = [ + "gnome-remote-desktop.service" + ]; + + requires = [ + "gnome-remote-desktop.service" + ]; + + serviceConfig = { + Type = "oneshot"; + RemainAfterExit = true; + + }; + + script = '' + chown gnome-remote-desktop:gnome-remote-desktop /var/lib/gnome-remote-desktop -R + ''; + }; } From b9616b808caa5100995e49644a1d2e2db41d2741 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Tue, 24 Mar 2026 20:24:05 -0500 Subject: [PATCH 613/667] rdp added systemd unit --- modules/rdp.nix | 84 ++++++++++++++++++++++--------------------------- 1 file changed, 38 insertions(+), 46 deletions(-) diff --git a/modules/rdp.nix b/modules/rdp.nix index 058bc93..b00853a 100755 --- a/modules/rdp.nix +++ b/modules/rdp.nix @@ -1,6 +1,9 @@ { config, pkgs, lib, ... }: -lib.mkIf config.sovran_systemsOS.features.rdp { +let + cfg = config.sovran_systemsOS.features.rdp; +in +lib.mkIf cfg { services.gnome.gnome-remote-desktop.enable = true; @@ -10,23 +13,24 @@ lib.mkIf config.sovran_systemsOS.features.rdp { freerdp ]; + # Ensure correct directory ownership declaratively + systemd.tmpfiles.rules = [ + "d /var/lib/gnome-remote-desktop 0700 gnome-remote-desktop gnome-remote-desktop -" + ]; + + # 🔹 Single unified setup service systemd.services.gnome-remote-desktop-setup = { - description = "GNOME Remote Desktop RDP Setup"; - + description = "GNOME Remote Desktop (TLS + RDP config)"; + wantedBy = [ "multi-user.target" ]; - after = [ - "gnome-remote-desktop.service" - ]; - - requires = [ - "gnome-remote-desktop.service" - ]; + # Run AFTER daemon is up, but don't fail if it isn't + after = [ "gnome-remote-desktop.service" ]; + wants = [ "gnome-remote-desktop.service" ]; serviceConfig = { Type = "oneshot"; RemainAfterExit = true; - }; script = '' @@ -36,49 +40,37 @@ lib.mkIf config.sovran_systemsOS.features.rdp { KEY_FILE=$CERT_DIR/rdp-tls.key CRT_FILE=$CERT_DIR/rdp-tls.crt + echo "[GRD] Ensuring TLS cert exists..." + if [ ! -f "$KEY_FILE" ]; then - echo "Generating RDP TLS certificate..." - - ${pkgs.freerdp}/bin/winpr-makecert -silent -rdp \ + ${pkgs.util-linux}/bin/runuser -u gnome-remote-desktop -- \ + ${pkgs.freerdp}/bin/winpr-makecert -silent -rdp \ -path "$CERT_DIR" rdp-tls - - chown gnome-remote-desktop:gnome-remote-desktop $CERT_DIR/* fi - # Configure RDP - ${pkgs.gnome-remote-desktop}/bin/grdctl --system rdp set-tls-key "$KEY_FILE" - ${pkgs.gnome-remote-desktop}/bin/grdctl --system rdp set-tls-cert "$CRT_FILE" - ${pkgs.gnome-remote-desktop}/bin/grdctl --system rdp enable + echo "[GRD] Waiting for daemon..." - # Only set credentials if not already set - if ! ${pkgs.gnome-remote-desktop}/bin/grdctl rdp show | grep -q "username"; then + # Wait for GRD to be responsive (prevents race condition) + for i in $(seq 1 10); do + if ${pkgs.gnome-remote-desktop}/bin/grdctl rdp show >/dev/null 2>&1; then + break + fi + sleep 1 + done + + echo "[GRD] Applying configuration..." + + ${pkgs.gnome-remote-desktop}/bin/grdctl rdp set-tls-key "$KEY_FILE" + ${pkgs.gnome-remote-desktop}/bin/grdctl rdp set-tls-cert "$CRT_FILE" + ${pkgs.gnome-remote-desktop}/bin/grdctl rdp enable + + # Idempotent credential setup + if ! ${pkgs.gnome-remote-desktop}/bin/grdctl rdp show | grep -q username; then ${pkgs.gnome-remote-desktop}/bin/grdctl rdp set-credentials "free" "a" fi + + echo "[GRD] Setup complete" ''; }; - - systemd.services.gnome-remote-desktop-permission = { - description = "GNOME Remote Desktop File Permission"; - - wantedBy = [ "multi-user.target" ]; - - after = [ - "gnome-remote-desktop.service" - ]; - - requires = [ - "gnome-remote-desktop.service" - ]; - - serviceConfig = { - Type = "oneshot"; - RemainAfterExit = true; - - }; - - script = '' - chown gnome-remote-desktop:gnome-remote-desktop /var/lib/gnome-remote-desktop -R - ''; - }; } From 54ab8d52bee9369d3f667b39124df55c4f1bc359 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Tue, 24 Mar 2026 20:34:37 -0500 Subject: [PATCH 614/667] rdp added systemd unit --- modules/rdp.nix | 62 +++++++++++++++++++------------------------------ 1 file changed, 24 insertions(+), 38 deletions(-) diff --git a/modules/rdp.nix b/modules/rdp.nix index b00853a..9b9e789 100755 --- a/modules/rdp.nix +++ b/modules/rdp.nix @@ -18,58 +18,44 @@ lib.mkIf cfg { "d /var/lib/gnome-remote-desktop 0700 gnome-remote-desktop gnome-remote-desktop -" ]; - # 🔹 Single unified setup service - systemd.services.gnome-remote-desktop-setup = { - description = "GNOME Remote Desktop (TLS + RDP config)"; + systemd.services.grd-cert = { + description = "GRD TLS cert"; - wantedBy = [ "multi-user.target" ]; + wantedBy = [ "multi-user.target" ]; - # Run AFTER daemon is up, but don't fail if it isn't - after = [ "gnome-remote-desktop.service" ]; - wants = [ "gnome-remote-desktop.service" ]; + serviceConfig.Type = "oneshot"; - serviceConfig = { - Type = "oneshot"; - RemainAfterExit = true; - }; + script = '' + CERT_DIR=/var/lib/gnome-remote-desktop + + if [ ! -f "$CERT_DIR/rdp-tls.key" ]; then + ${pkgs.util-linux}/bin/runuser -u gnome-remote-desktop -- \ + ${pkgs.freerdp}/bin/winpr-makecert -silent -rdp \ + -path "$CERT_DIR" rdp-tls + fi + ''; +}; + + systemd.user.services.grd-setup = { + description = "GNOME Remote Desktop setup"; + + wantedBy = [ "default.target" ]; + after = [ "graphical-session.target" ]; + + serviceConfig.Type = "oneshot"; script = '' set -euo pipefail CERT_DIR=/var/lib/gnome-remote-desktop - KEY_FILE=$CERT_DIR/rdp-tls.key - CRT_FILE=$CERT_DIR/rdp-tls.crt - echo "[GRD] Ensuring TLS cert exists..." - - if [ ! -f "$KEY_FILE" ]; then - ${pkgs.util-linux}/bin/runuser -u gnome-remote-desktop -- \ - ${pkgs.freerdp}/bin/winpr-makecert -silent -rdp \ - -path "$CERT_DIR" rdp-tls - fi - - echo "[GRD] Waiting for daemon..." - - # Wait for GRD to be responsive (prevents race condition) - for i in $(seq 1 10); do - if ${pkgs.gnome-remote-desktop}/bin/grdctl rdp show >/dev/null 2>&1; then - break - fi - sleep 1 - done - - echo "[GRD] Applying configuration..." - - ${pkgs.gnome-remote-desktop}/bin/grdctl rdp set-tls-key "$KEY_FILE" - ${pkgs.gnome-remote-desktop}/bin/grdctl rdp set-tls-cert "$CRT_FILE" + ${pkgs.gnome-remote-desktop}/bin/grdctl rdp set-tls-key "$CERT_DIR/rdp-tls.key" + ${pkgs.gnome-remote-desktop}/bin/grdctl rdp set-tls-cert "$CERT_DIR/rdp-tls.crt" ${pkgs.gnome-remote-desktop}/bin/grdctl rdp enable - # Idempotent credential setup if ! ${pkgs.gnome-remote-desktop}/bin/grdctl rdp show | grep -q username; then ${pkgs.gnome-remote-desktop}/bin/grdctl rdp set-credentials "free" "a" fi - - echo "[GRD] Setup complete" ''; }; From 629cf701dd967965aa92bd6fc1371ab46254abcc Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Tue, 24 Mar 2026 20:48:25 -0500 Subject: [PATCH 615/667] simplified RDP --- custom-add-ons.md | 19 ++++++++++++++ modules/rdp.nix | 66 +++++++---------------------------------------- 2 files changed, 29 insertions(+), 56 deletions(-) diff --git a/custom-add-ons.md b/custom-add-ons.md index 7fbff53..c350ed8 100644 --- a/custom-add-ons.md +++ b/custom-add-ons.md @@ -64,3 +64,22 @@ sovran_systemsOS.features.element-calling = true; ```nix sovran_systemsOS.features.rdp = true; ``` +Next in a new termianl window paste this in: + +```bash +ssh root@localhost +``` +Type in password for if required it is the password to run the Sovran_SystemsOS_Updater app + +Next paste in these commands and make sure you add your own username and password +```bash +sudo -u gnome-remote-desktop winpr-makecert -silent -rdp -path /var/lib/gnome-remote-desktop rdp-tls +grdctl --system rdp set-tls-key /var/lib/gnome-remote-desktop/rdp-tls.key +grdctl --system rdp set-tls-cert /var/lib/gnome-remote-desktop/rdp-tls.crt +grdctl --system rdp enable +grdctl --system rdp set-credentials "username" "passaword" +``` +Last access Sovran_SystemsOS Desktop from any computer in your nextwork by using any software that connects thrthrough RDP + + + diff --git a/modules/rdp.nix b/modules/rdp.nix index 9b9e789..a7f5d02 100755 --- a/modules/rdp.nix +++ b/modules/rdp.nix @@ -1,62 +1,16 @@ { config, pkgs, lib, ... }: -let - cfg = config.sovran_systemsOS.features.rdp; -in -lib.mkIf cfg { + config.sovran_systemsOS.features.rdp { - services.gnome.gnome-remote-desktop.enable = true; + services.gnome.gnome-remote-desktop.enable = true; - networking.firewall.allowedTCPPorts = [ 3389 ]; - - environment.systemPackages = with pkgs; [ - freerdp - ]; - - # Ensure correct directory ownership declaratively - systemd.tmpfiles.rules = [ - "d /var/lib/gnome-remote-desktop 0700 gnome-remote-desktop gnome-remote-desktop -" - ]; - - systemd.services.grd-cert = { - description = "GRD TLS cert"; - - wantedBy = [ "multi-user.target" ]; - - serviceConfig.Type = "oneshot"; - - script = '' - CERT_DIR=/var/lib/gnome-remote-desktop - - if [ ! -f "$CERT_DIR/rdp-tls.key" ]; then - ${pkgs.util-linux}/bin/runuser -u gnome-remote-desktop -- \ - ${pkgs.freerdp}/bin/winpr-makecert -silent -rdp \ - -path "$CERT_DIR" rdp-tls - fi - ''; -}; - - systemd.user.services.grd-setup = { - description = "GNOME Remote Desktop setup"; - - wantedBy = [ "default.target" ]; - after = [ "graphical-session.target" ]; - - serviceConfig.Type = "oneshot"; - - script = '' - set -euo pipefail - - CERT_DIR=/var/lib/gnome-remote-desktop - - ${pkgs.gnome-remote-desktop}/bin/grdctl rdp set-tls-key "$CERT_DIR/rdp-tls.key" - ${pkgs.gnome-remote-desktop}/bin/grdctl rdp set-tls-cert "$CERT_DIR/rdp-tls.crt" - ${pkgs.gnome-remote-desktop}/bin/grdctl rdp enable - - if ! ${pkgs.gnome-remote-desktop}/bin/grdctl rdp show | grep -q username; then - ${pkgs.gnome-remote-desktop}/bin/grdctl rdp set-credentials "free" "a" - fi - ''; - }; + networking.firewall.allowedTCPPorts = [ 3389 ]; + environment.systemPackages = with pkgs; [ + freerdp + ]; } + + + + From 55cd6d3278efa7163753c740e7ce12947c44e74a Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Tue, 24 Mar 2026 20:53:01 -0500 Subject: [PATCH 616/667] fixed rdp.nix and updated custom add readme --- custom-add-ons.md | 14 +++++++------- modules/rdp.nix | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/custom-add-ons.md b/custom-add-ons.md index c350ed8..47c72e4 100644 --- a/custom-add-ons.md +++ b/custom-add-ons.md @@ -32,44 +32,44 @@ https://gitlab.gnome.org/GNOME/gnome-remote-desktop 1. The code for Bitcoin Core is as follows: ```nix -sovran_systemsOS.features.bitcoin-core = true; +sovran_systemsOS.features.bitcoin-core = lib.mkForce true; ``` 2. The code for BIP-110 is as follows: ```nix -sovran_systemsOS.features.bip110 = true; +sovran_systemsOS.features.bip110 = lib.mkForce true; ``` 3. The code for Mempool is as follows: ```nix -sovran_systemsOS.features.mempool = true; +sovran_systemsOS.features.mempool = lib.mkForce true; ``` 4. The code for Haven Relay is as follows: ```nix -sovran_systemsOS.features.haven = true; +sovran_systemsOS.features.haven = lib.mkForce true; ``` 5. The code for Element Calling is as follows: ```nix -sovran_systemsOS.features.element-calling = true; +sovran_systemsOS.features.element-calling = lib.mkForce true; ``` 6. The code for Gnome Remote Desktop is as follows: ```nix -sovran_systemsOS.features.rdp = true; +sovran_systemsOS.features.rdp = lib.mkForce true; ``` Next in a new termianl window paste this in: ```bash ssh root@localhost ``` -Type in password for if required it is the password to run the Sovran_SystemsOS_Updater app +Type in the password if required. It will be the same password to run the Sovran_SystemsOS_Updater app. Next paste in these commands and make sure you add your own username and password ```bash diff --git a/modules/rdp.nix b/modules/rdp.nix index a7f5d02..3d28dd2 100755 --- a/modules/rdp.nix +++ b/modules/rdp.nix @@ -1,6 +1,6 @@ { config, pkgs, lib, ... }: - config.sovran_systemsOS.features.rdp { + lib.mkIf config.sovran_systemsOS.features.rdp { services.gnome.gnome-remote-desktop.enable = true; From ff5a24ef04419a2136c772fda9c1e6260f353946 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Tue, 24 Mar 2026 20:54:58 -0500 Subject: [PATCH 617/667] rewored custom add on --- custom-add-ons.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/custom-add-ons.md b/custom-add-ons.md index 47c72e4..6f89766 100644 --- a/custom-add-ons.md +++ b/custom-add-ons.md @@ -79,7 +79,7 @@ grdctl --system rdp set-tls-cert /var/lib/gnome-remote-desktop/rdp-tls.crt grdctl --system rdp enable grdctl --system rdp set-credentials "username" "passaword" ``` -Last access Sovran_SystemsOS Desktop from any computer in your nextwork by using any software that connects thrthrough RDP +Last access Sovran_SystemsOS Desktop from any computer in your nextwork by using any software client that can connectsthrough RDP service. From beb8efa8f1b5fe343204a941c0a1923fdb3e6dc1 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Tue, 24 Mar 2026 21:00:02 -0500 Subject: [PATCH 618/667] updated custom add on --- custom-add-ons.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/custom-add-ons.md b/custom-add-ons.md index 6f89766..8cd9984 100644 --- a/custom-add-ons.md +++ b/custom-add-ons.md @@ -77,7 +77,11 @@ sudo -u gnome-remote-desktop winpr-makecert -silent -rdp -path /var/lib/gnome-re grdctl --system rdp set-tls-key /var/lib/gnome-remote-desktop/rdp-tls.key grdctl --system rdp set-tls-cert /var/lib/gnome-remote-desktop/rdp-tls.crt grdctl --system rdp enable -grdctl --system rdp set-credentials "username" "passaword" +grdctl --system rdp set-credentials "custom-username" "custom-password" +``` +Next restart Gnome-Remote-Desktop +```bash +systemctl restart gnome-remote-desktop ``` Last access Sovran_SystemsOS Desktop from any computer in your nextwork by using any software client that can connectsthrough RDP service. From 415cc7c4062ee6ef21c1ba81193201c30bdfe586 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Tue, 24 Mar 2026 21:05:13 -0500 Subject: [PATCH 619/667] updated bip110 --- modules/bip110.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/bip110.nix b/modules/bip110.nix index 0b4d0fa..f3d64fb 100755 --- a/modules/bip110.nix +++ b/modules/bip110.nix @@ -2,6 +2,6 @@ lib.mkIf config.sovran_systemsOS.features.bip110 { - services.bitcoind.package = lib.mkForce bip110.packages.x86_64-linux.bitcoind-knots-bip-110; + services.bitcoind.package = bip110.packages.x86_64-linux.bitcoind-knots-bip-110; } From e99cf7cd100a81cb33c1fc0ed397614076405876 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Tue, 24 Mar 2026 21:13:23 -0500 Subject: [PATCH 620/667] updated flake --- flake.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/flake.nix b/flake.nix index 93607c8..b0f9c5f 100755 --- a/flake.nix +++ b/flake.nix @@ -44,6 +44,9 @@ inherit system; + specialArgs = { + inherit bip110; + }; }; @@ -64,11 +67,9 @@ ]; environment.systemPackages = with pkgs; [ - - btc-clients.packages.x86_64-linux.bisq + btc-clients.packages.x86_64-linux.bisq btc-clients.packages.x86_64-linux.bisq2 btc-clients.packages.x86_64-linux.sparrow - ]; }; From 37050290a6795c7a46c2e8b8da5fa3714305176e Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Tue, 24 Mar 2026 21:21:00 -0500 Subject: [PATCH 621/667] updated flake --- flake.nix | 8 ++++---- modules/bitcoinecosystem.nix | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/flake.nix b/flake.nix index b0f9c5f..a9791c8 100755 --- a/flake.nix +++ b/flake.nix @@ -26,6 +26,10 @@ let system = "x86_64-linux"; + specialArgs = { + inherit bip110; + }; + overlay-stable = final: prev: { stable = import nixpkgs-stable { @@ -44,10 +48,6 @@ inherit system; - specialArgs = { - inherit bip110; - }; - }; nixosModules.Sovran_SystemsOS = { pkgs, ... }: { diff --git a/modules/bitcoinecosystem.nix b/modules/bitcoinecosystem.nix index dc447f8..a468d85 100755 --- a/modules/bitcoinecosystem.nix +++ b/modules/bitcoinecosystem.nix @@ -1,4 +1,4 @@ -{ config, pkgs, lib, bip110, ... }: +{ config, pkgs, lib, ... }: lib.mkIf config.sovran_systemsOS.features.bitcoin { From abc60c2a9b207d6cf5fac1decbb74e23099070c3 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Tue, 24 Mar 2026 21:24:52 -0500 Subject: [PATCH 622/667] updated flake --- flake.nix | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/flake.nix b/flake.nix index a9791c8..e043e15 100755 --- a/flake.nix +++ b/flake.nix @@ -24,11 +24,8 @@ outputs = { self, nixpkgs, nix-bitcoin, nixvim, agenix, btc-clients, nixpkgs-stable, bip110, ... }: let - system = "x86_64-linux"; - - specialArgs = { - inherit bip110; - }; + + system = "x86_64-linux"; overlay-stable = final: prev: { @@ -48,7 +45,7 @@ inherit system; - }; + specialArgs = attrs; nixosModules.Sovran_SystemsOS = { pkgs, ... }: { From a8b03fde6733bcbae7a0603eb1af68caaf470e21 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Tue, 24 Mar 2026 21:29:30 -0500 Subject: [PATCH 623/667] updated flake --- flake.nix | 39 ++++++++++++++++++++------------------- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/flake.nix b/flake.nix index e043e15..5b2e952 100755 --- a/flake.nix +++ b/flake.nix @@ -41,34 +41,35 @@ { - nixosConfigurations.nixos = nixpkgs.lib.nixosSystem { + nixosConfigurations.nixos = nixpkgs.lib.nixosSystem { - inherit system; + inherit system; - specialArgs = attrs; + specialArgs = attrs; + + }; - nixosModules.Sovran_SystemsOS = { pkgs, ... }: { + nixosModules.Sovran_SystemsOS = { pkgs, ... }: { - imports = [ + imports = [ - ({ config, pkgs, ... }: { nixpkgs.overlays = [ overlay-stable ]; }) + ({ config, pkgs, ... }: { nixpkgs.overlays = [ overlay-stable ]; }) - ./configuration.nix + ./configuration.nix - nix-bitcoin.nixosModules.default + nix-bitcoin.nixosModules.default - agenix.nixosModules.default + agenix.nixosModules.default - nixvim.nixosModules.nixvim + nixvim.nixosModules.nixvim - ]; - - environment.systemPackages = with pkgs; [ - btc-clients.packages.x86_64-linux.bisq - btc-clients.packages.x86_64-linux.bisq2 - btc-clients.packages.x86_64-linux.sparrow - ]; - - }; + ]; + + environment.systemPackages = with pkgs; [ + btc-clients.packages.x86_64-linux.bisq + btc-clients.packages.x86_64-linux.bisq2 + btc-clients.packages.x86_64-linux.sparrow + ]; + }; }; } From 5044ae08d4a209b3a57d0cc37aceb669f610bf34 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Tue, 24 Mar 2026 21:31:28 -0500 Subject: [PATCH 624/667] updated flake --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 5b2e952..eccad7f 100755 --- a/flake.nix +++ b/flake.nix @@ -21,7 +21,7 @@ }; - outputs = { self, nixpkgs, nix-bitcoin, nixvim, agenix, btc-clients, nixpkgs-stable, bip110, ... }: + outputs = { self, nixpkgs, nix-bitcoin, nixvim, agenix, btc-clients, nixpkgs-stable, bip110, ... }@attrs: let From 0755971cfad159b5162ca1a334d0393601795728 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Tue, 24 Mar 2026 22:00:00 -0500 Subject: [PATCH 625/667] updated flake --- flake.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/flake.nix b/flake.nix index eccad7f..048c2a6 100755 --- a/flake.nix +++ b/flake.nix @@ -21,7 +21,7 @@ }; - outputs = { self, nixpkgs, nix-bitcoin, nixvim, agenix, btc-clients, nixpkgs-stable, bip110, ... }@attrs: + outputs = { self, nixpkgs, nix-bitcoin, nixvim, agenix, btc-clients, nixpkgs-stable, bip110, ... }: let @@ -44,8 +44,6 @@ nixosConfigurations.nixos = nixpkgs.lib.nixosSystem { inherit system; - - specialArgs = attrs; }; @@ -69,6 +67,7 @@ btc-clients.packages.x86_64-linux.bisq btc-clients.packages.x86_64-linux.bisq2 btc-clients.packages.x86_64-linux.sparrow + bip110.packages.x86_64-linux.bitcoind-knots-bip-110; ]; }; }; From 1655568ab150d54fe5335d460be6a7143a06c0cf Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Tue, 24 Mar 2026 22:00:37 -0500 Subject: [PATCH 626/667] updated flake --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 048c2a6..fb8ca9a 100755 --- a/flake.nix +++ b/flake.nix @@ -67,7 +67,7 @@ btc-clients.packages.x86_64-linux.bisq btc-clients.packages.x86_64-linux.bisq2 btc-clients.packages.x86_64-linux.sparrow - bip110.packages.x86_64-linux.bitcoind-knots-bip-110; + bip110.packages.x86_64-linux.bitcoind-knots-bip-110 ]; }; }; From 9a893bb29c8f68192d2f94dbb9fb57cbf44d9c8f Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Tue, 24 Mar 2026 22:04:44 -0500 Subject: [PATCH 627/667] updated flake --- flake.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index fb8ca9a..5f5cbcd 100755 --- a/flake.nix +++ b/flake.nix @@ -21,7 +21,7 @@ }; - outputs = { self, nixpkgs, nix-bitcoin, nixvim, agenix, btc-clients, nixpkgs-stable, bip110, ... }: + outputs = { self, nixpkgs, nix-bitcoin, nixvim, agenix, btc-clients, nixpkgs-stable, bip110, ... }@attrs: let @@ -44,6 +44,8 @@ nixosConfigurations.nixos = nixpkgs.lib.nixosSystem { inherit system; + + specialArgs = attrs; }; From f1c39b70fab11baa1c533e1e0c1c06be99c27f0d Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Tue, 24 Mar 2026 22:25:48 -0500 Subject: [PATCH 628/667] updated flake --- flake.nix | 10 ++++++---- modules/bip110.nix | 19 ++++++++++++++++--- 2 files changed, 22 insertions(+), 7 deletions(-) diff --git a/flake.nix b/flake.nix index 5f5cbcd..6ad8001 100755 --- a/flake.nix +++ b/flake.nix @@ -21,7 +21,7 @@ }; - outputs = { self, nixpkgs, nix-bitcoin, nixvim, agenix, btc-clients, nixpkgs-stable, bip110, ... }@attrs: + outputs = { self, nixpkgs, nix-bitcoin, nixvim, agenix, btc-clients, nixpkgs-stable, bip110, ... }: let @@ -44,8 +44,6 @@ nixosConfigurations.nixos = nixpkgs.lib.nixosSystem { inherit system; - - specialArgs = attrs; }; @@ -64,12 +62,16 @@ nixvim.nixosModules.nixvim ]; + + config = { + sovran_systemsOS.bip110.package = + bip110.packages.${pkgs.system}.bitcoind-knots-bip-110; + }; environment.systemPackages = with pkgs; [ btc-clients.packages.x86_64-linux.bisq btc-clients.packages.x86_64-linux.bisq2 btc-clients.packages.x86_64-linux.sparrow - bip110.packages.x86_64-linux.bitcoind-knots-bip-110 ]; }; }; diff --git a/modules/bip110.nix b/modules/bip110.nix index f3d64fb..a6cd617 100755 --- a/modules/bip110.nix +++ b/modules/bip110.nix @@ -1,7 +1,20 @@ -{ config, lib, pkgs, bip110, ... }: +{ config, lib, pkgs, ... }: -lib.mkIf config.sovran_systemsOS.features.bip110 { +let + cfg = config.sovran_systemsOS; +in +{ + options.sovran_systemsOS = { + features.bip110 = lib.mkEnableOption "Enable BIP110 bitcoind"; - services.bitcoind.package = bip110.packages.x86_64-linux.bitcoind-knots-bip-110; + bip110.package = lib.mkOption { + type = lib.types.nullOr lib.types.package; + default = null; + description = "Custom bitcoind package for BIP110"; + }; + }; + config = lib.mkIf (cfg.features.bip110 && cfg.bip110.package != null) { + services.bitcoind.package = cfg.bip110.package; + }; } From 19340c09adf62f75ed2e4612d0063c93af8653c0 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Tue, 24 Mar 2026 22:31:51 -0500 Subject: [PATCH 629/667] updated flake --- flake.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/flake.nix b/flake.nix index 6ad8001..f69a9dc 100755 --- a/flake.nix +++ b/flake.nix @@ -64,15 +64,15 @@ ]; config = { - sovran_systemsOS.bip110.package = + environment.systemPackages = with pkgs; [ + btc-clients.packages.x86_64-linux.bisq + btc-clients.packages.x86_64-linux.bisq2 + btc-clients.packages.x86_64-linux.sparrow + ] + + sovran_systemsOS.bip110.package = bip110.packages.${pkgs.system}.bitcoind-knots-bip-110; - }; - - environment.systemPackages = with pkgs; [ - btc-clients.packages.x86_64-linux.bisq - btc-clients.packages.x86_64-linux.bisq2 - btc-clients.packages.x86_64-linux.sparrow - ]; + }; }; } From 84a8b5625627253160f51d9b14c79b1041310906 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Tue, 24 Mar 2026 22:40:03 -0500 Subject: [PATCH 630/667] updated flake --- flake.nix | 48 ++++++++++++++++++++++-------------------------- 1 file changed, 22 insertions(+), 26 deletions(-) diff --git a/flake.nix b/flake.nix index f69a9dc..67d525f 100755 --- a/flake.nix +++ b/flake.nix @@ -39,40 +39,36 @@ in - { +{ - nixosConfigurations.nixos = nixpkgs.lib.nixosSystem { + nixosConfigurations.nixos = nixpkgs.lib.nixosSystem { - inherit system; + inherit system; - }; + }; - nixosModules.Sovran_SystemsOS = { pkgs, ... }: { + nixosModules.Sovran_SystemsOS = { pkgs, lib, config, ... }: { - imports = [ + imports = [ + ({ config, pkgs, ... }: { + nixpkgs.overlays = [ overlay-stable ]; + }) - ({ config, pkgs, ... }: { nixpkgs.overlays = [ overlay-stable ]; }) - - ./configuration.nix - - nix-bitcoin.nixosModules.default - - agenix.nixosModules.default - - nixvim.nixosModules.nixvim + ./configuration.nix + nix-bitcoin.nixosModules.default + agenix.nixosModules.default + nixvim.nixosModules.nixvim + ]; + config = { + environment.systemPackages = with pkgs; [ + btc-clients.packages.${pkgs.system}.bisq + btc-clients.packages.${pkgs.system}.bisq2 + btc-clients.packages.${pkgs.system}.sparrow ]; - config = { - environment.systemPackages = with pkgs; [ - btc-clients.packages.x86_64-linux.bisq - btc-clients.packages.x86_64-linux.bisq2 - btc-clients.packages.x86_64-linux.sparrow - ] - - sovran_systemsOS.bip110.package = - bip110.packages.${pkgs.system}.bitcoind-knots-bip-110; - + sovran_systemsOS.bip110.package = + bip110.packages.${pkgs.system}.bitcoind-knots-bip-110; }; - }; + }; } From 611a3da5eee240d70c5b5d2004bb4eee5a7ddaca Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Tue, 24 Mar 2026 22:46:18 -0500 Subject: [PATCH 631/667] updated flake --- flake.nix | 45 +++++++++++++++++++++++---------------------- 1 file changed, 23 insertions(+), 22 deletions(-) diff --git a/flake.nix b/flake.nix index 67d525f..29ffb11 100755 --- a/flake.nix +++ b/flake.nix @@ -39,36 +39,37 @@ in -{ + { - nixosConfigurations.nixos = nixpkgs.lib.nixosSystem { + nixosConfigurations.nixos = nixpkgs.lib.nixosSystem { - inherit system; + inherit system; - }; + }; - nixosModules.Sovran_SystemsOS = { pkgs, lib, config, ... }: { + nixosModules.Sovran_SystemsOS = { pkgs, lib, config, ... }: { - imports = [ - ({ config, pkgs, ... }: { - nixpkgs.overlays = [ overlay-stable ]; - }) + imports = [ + ({ config, pkgs, ... }: { + nixpkgs.overlays = [ overlay-stable ]; + }) - ./configuration.nix - nix-bitcoin.nixosModules.default - agenix.nixosModules.default - nixvim.nixosModules.nixvim - ]; - - config = { - environment.systemPackages = with pkgs; [ - btc-clients.packages.${pkgs.system}.bisq - btc-clients.packages.${pkgs.system}.bisq2 - btc-clients.packages.${pkgs.system}.sparrow + ./configuration.nix + nix-bitcoin.nixosModules.default + agenix.nixosModules.default + nixvim.nixosModules.nixvim ]; - sovran_systemsOS.bip110.package = - bip110.packages.${pkgs.system}.bitcoind-knots-bip-110; + 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.bip110.package = + bip110.packages.${pkgs.system}.bitcoind-knots-bip-110; + }; }; }; } From b7053607da73b1462f50b5110ab047a4dcb85a18 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Tue, 24 Mar 2026 22:51:39 -0500 Subject: [PATCH 632/667] updated bip110 module --- modules/bip110.nix | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/modules/bip110.nix b/modules/bip110.nix index a6cd617..b32b412 100755 --- a/modules/bip110.nix +++ b/modules/bip110.nix @@ -4,17 +4,13 @@ let cfg = config.sovran_systemsOS; in { - options.sovran_systemsOS = { - features.bip110 = lib.mkEnableOption "Enable BIP110 bitcoind"; - - bip110.package = lib.mkOption { - type = lib.types.nullOr lib.types.package; - default = null; - description = "Custom bitcoind package for BIP110"; - }; - }; - config = lib.mkIf (cfg.features.bip110 && cfg.bip110.package != null) { + services.bitcoind.package = cfg.bip110.package; + + # Optional: also expose it in system packages if desired + environment.systemPackages = [ + cfg.bip110.package + ]; }; } From 388aa24f51290926a9425476f01a4f82e837b986 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Tue, 24 Mar 2026 23:02:02 -0500 Subject: [PATCH 633/667] updated bip110 module and flake --- modules/bip110.nix | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/modules/bip110.nix b/modules/bip110.nix index b32b412..ab983fc 100755 --- a/modules/bip110.nix +++ b/modules/bip110.nix @@ -4,13 +4,22 @@ let cfg = config.sovran_systemsOS; in { - config = lib.mkIf (cfg.features.bip110 && cfg.bip110.package != null) { + # ✅ Option definition + options.sovran_systemsOS.packages.bip110 = lib.mkOption { + type = lib.types.nullOr lib.types.package; + default = null; + description = "BIP110 Bitcoin package"; + }; - services.bitcoind.package = cfg.bip110.package; + # ✅ Implementation + config = lib.mkIf ( + cfg.features.bip110 && + cfg.packages.bip110 != null + ) { + services.bitcoind.package = cfg.packages.bip110; - # Optional: also expose it in system packages if desired environment.systemPackages = [ - cfg.bip110.package + cfg.packages.bip110 ]; }; } From 3520442352a1775600027a7e101e70f3060f50f3 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Tue, 24 Mar 2026 23:04:17 -0500 Subject: [PATCH 634/667] updated flake --- flake.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/flake.nix b/flake.nix index 29ffb11..51a4610 100755 --- a/flake.nix +++ b/flake.nix @@ -67,8 +67,7 @@ btc-clients.packages.${pkgs.system}.sparrow ]; - sovran_systemsOS.bip110.package = - bip110.packages.${pkgs.system}.bitcoind-knots-bip-110; + sovran_systemsOS.packages.bip110 = bip110.packages.${system}.bitcoind-knots-bip-110; }; }; }; From ad0f6ed95c603e9f5b81e5b8169106a3690baf05 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Tue, 24 Mar 2026 23:06:28 -0500 Subject: [PATCH 635/667] updated bip110 module --- modules/bip110.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/bip110.nix b/modules/bip110.nix index ab983fc..249ce52 100755 --- a/modules/bip110.nix +++ b/modules/bip110.nix @@ -16,7 +16,7 @@ in cfg.features.bip110 && cfg.packages.bip110 != null ) { - services.bitcoind.package = cfg.packages.bip110; + services.bitcoind.package = lib.mkForce cfg.packages.bip110; environment.systemPackages = [ cfg.packages.bip110 From 0591c90a7f71176c1f36be6c20f4d5d393043ed5 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Wed, 25 Mar 2026 07:07:59 -0500 Subject: [PATCH 636/667] updated element-calling --- modules/element-calling.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/modules/element-calling.nix b/modules/element-calling.nix index c19e38a..75e0715 100755 --- a/modules/element-calling.nix +++ b/modules/element-calling.nix @@ -64,6 +64,11 @@ lib.mkIf config.sovran_systemsOS.features.element-calling { ]; ####### JWT SERVICE ####### + + environment.systemPackages = with pkgs; [ + lk-jwt-service + ]; + services.lk-jwt-service = { enable = true; port = 8073; From 2b5bc3a036a76444c43978a02c4192f5f9bb5f1d Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Wed, 25 Mar 2026 07:19:08 -0500 Subject: [PATCH 637/667] added livekit lk-jwt --- configuration.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/configuration.nix b/configuration.nix index eef8351..d14e981 100755 --- a/configuration.nix +++ b/configuration.nix @@ -157,6 +157,10 @@ in element-desktop wp-cli axel + lk-jwt-service + livekit-libwebrtc + livekit-cli + livekit ]; programs.nixvim = { From eea4485164dfbaf62d7a330cd1c45ef8592d3610 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Wed, 25 Mar 2026 07:23:16 -0500 Subject: [PATCH 638/667] fixed element-calling --- modules/element-calling.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/modules/element-calling.nix b/modules/element-calling.nix index 75e0715..ce5a2b8 100755 --- a/modules/element-calling.nix +++ b/modules/element-calling.nix @@ -42,6 +42,7 @@ lib.mkIf config.sovran_systemsOS.features.element-calling { services.livekit = { enable = true; openFirewall = true; + package = pkgs.livekit; settings = { rtc.use_external_ip = true; rtc.udp_port = "7882-7894"; @@ -64,13 +65,10 @@ lib.mkIf config.sovran_systemsOS.features.element-calling { ]; ####### JWT SERVICE ####### - - environment.systemPackages = with pkgs; [ - lk-jwt-service - ]; services.lk-jwt-service = { enable = true; + package = pkgs.lk-jwt-service; port = 8073; livekitUrl = "wss://${personalization.element-calling_url}"; keyFile = "/var/lib/livekit/livekit_keyFile"; From b21cceb9ee727a90429b26e59fdd2b9b682181e9 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Wed, 25 Mar 2026 07:34:30 -0500 Subject: [PATCH 639/667] fixed element-calling --- modules/element-calling.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/modules/element-calling.nix b/modules/element-calling.nix index ce5a2b8..fe6626a 100755 --- a/modules/element-calling.nix +++ b/modules/element-calling.nix @@ -42,7 +42,6 @@ lib.mkIf config.sovran_systemsOS.features.element-calling { services.livekit = { enable = true; openFirewall = true; - package = pkgs.livekit; settings = { rtc.use_external_ip = true; rtc.udp_port = "7882-7894"; @@ -68,7 +67,6 @@ lib.mkIf config.sovran_systemsOS.features.element-calling { services.lk-jwt-service = { enable = true; - package = pkgs.lk-jwt-service; port = 8073; livekitUrl = "wss://${personalization.element-calling_url}"; keyFile = "/var/lib/livekit/livekit_keyFile"; From 9f575418cff1ff5bc6d092279ae26583a1a169d8 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Wed, 25 Mar 2026 11:17:19 -0500 Subject: [PATCH 640/667] updated element-calling --- modules/element-calling.nix | 47 +++++++++++++++++++++++++++++-------- 1 file changed, 37 insertions(+), 10 deletions(-) diff --git a/modules/element-calling.nix b/modules/element-calling.nix index fe6626a..1e43b29 100755 --- a/modules/element-calling.nix +++ b/modules/element-calling.nix @@ -2,10 +2,45 @@ let personalization = import ./personalization.nix; + livekitKeyFile = "/var/lib/livekit/livekit_keyFile"; in lib.mkIf config.sovran_systemsOS.features.element-calling { + ####### LIVEKIT KEY GENERATION ####### + systemd.tmpfiles.rules = [ + "d /var/lib/livekit 0750 root root -" + ]; + + systemd.services.livekit-key-setup = { + description = "Generate LiveKit key file if missing"; + wantedBy = [ "multi-user.target" ]; + before = [ "livekit.service" "lk-jwt-service.service" ]; + requires = []; + serviceConfig = { + Type = "oneshot"; + RemainAfterExit = true; + }; + path = [ pkgs.openssl ]; + script = '' + if [ ! -f ${livekitKeyFile} ]; then + API_KEY="devkey_$(openssl rand -hex 16)" + API_SECRET="$(openssl rand -base64 36 | tr -d '\n')" + echo "$API_KEY: $API_SECRET" > ${livekitKeyFile} + chmod 600 ${livekitKeyFile} + echo "LiveKit key file generated at ${livekitKeyFile}" + else + echo "LiveKit key file already exists, skipping generation" + fi + ''; + }; + + ####### ENSURE SERVICES START AFTER KEY EXISTS ####### + systemd.services.livekit.after = [ "livekit-key-setup.service" ]; + systemd.services.livekit.wants = [ "livekit-key-setup.service" ]; + systemd.services.lk-jwt-service.after = [ "livekit-key-setup.service" ]; + systemd.services.lk-jwt-service.wants = [ "livekit-key-setup.service" ]; + ####### CADDY CONFIGS ####### services.caddy.virtualHosts = lib.mkForce { "${personalization.matrix_url}" = { @@ -42,6 +77,7 @@ lib.mkIf config.sovran_systemsOS.features.element-calling { services.livekit = { enable = true; openFirewall = true; + keyFile = livekitKeyFile; settings = { rtc.use_external_ip = true; rtc.udp_port = "7882-7894"; @@ -55,7 +91,6 @@ lib.mkIf config.sovran_systemsOS.features.element-calling { key_file = "/var/lib/livekit/${personalization.matrix_url}.key"; }; }; - keyFile = "/var/lib/livekit/livekit_keyFile"; }; networking.firewall.allowedTCPPorts = [ 7881 ]; @@ -64,12 +99,11 @@ lib.mkIf config.sovran_systemsOS.features.element-calling { ]; ####### JWT SERVICE ####### - services.lk-jwt-service = { enable = true; port = 8073; livekitUrl = "wss://${personalization.element-calling_url}"; - keyFile = "/var/lib/livekit/livekit_keyFile"; + keyFile = livekitKeyFile; }; ####### MATRIX-SYNAPSE SETTINGS ####### @@ -77,17 +111,13 @@ lib.mkIf config.sovran_systemsOS.features.element-calling { settings = lib.mkForce { serve_server_wellknown = true; public_baseurl = "${personalization.matrix_url}"; - experimental_features = { msc3266_enabled = true; msc4222_enabled = true; }; - max_event_delay_duration = "24h"; - rc_message = { per_second = 0.5; burst_count = 30; }; rc_delayed_event_mgmt = { per_second = 1; burst_count = 20; }; - push.include_content = false; server_name = personalization.matrix_url; url_preview_enabled = true; @@ -95,19 +125,16 @@ lib.mkIf config.sovran_systemsOS.features.element-calling { encryption_enabled_by_default_for_room_type = "invite"; allow_profile_lookup_over_federation = false; allow_device_name_lookup_over_federation = false; - url_preview_ip_range_blacklist = [ "10.0.0.0/8" "100.64.0.0/10" "169.254.0.0/16" "172.16.0.0/12" "192.0.0.0/24" "192.0.2.0/24" "192.168.0.0/16" "192.88.99.0/24" "198.18.0.0/15" "198.51.100.0/24" "2001:db8::/32" "203.0.113.0/24" "224.0.0.0/4" "::1/128" "fc00::/7" "fe80::/10" "fec0::/10" "ff00::/8" ]; - url_preview_ip_ranger_whitelist = [ "127.0.0.1" ]; presence.enabled = true; enable_registration = false; registration_shared_secret = config.age.secrets.matrix_reg_secret.path; - listeners = [ { port = 8008; From 57b115414f6d98b84c0b4d20d6c40be3c7483613 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Wed, 25 Mar 2026 11:36:55 -0500 Subject: [PATCH 641/667] updated haven.nix --- custom-add-ons.md | 1 + modules/core/roles.nix | 6 ++ modules/haven.nix | 232 +++++++++++++++++++---------------------- 3 files changed, 112 insertions(+), 127 deletions(-) diff --git a/custom-add-ons.md b/custom-add-ons.md index 8cd9984..2c280b6 100644 --- a/custom-add-ons.md +++ b/custom-add-ons.md @@ -51,6 +51,7 @@ sovran_systemsOS.features.mempool = lib.mkForce true; ```nix sovran_systemsOS.features.haven = lib.mkForce true; +sovran_systemsOS.nostr_npub = "pasteyournpubhere"; ``` 5. The code for Element Calling is as follows: diff --git a/modules/core/roles.nix b/modules/core/roles.nix index 6b4e732..01ae202 100755 --- a/modules/core/roles.nix +++ b/modules/core/roles.nix @@ -23,5 +23,11 @@ bitcoin-core = lib.mkEnableOption "Bitcoin Core"; rdp = lib.mkEnableOption "Gnome Remote Desktop"; }; + + nostr_npub = lib.mkOption { + type = lib.types.str; + default = ""; + description = "Nostr public key (npub1...) for Haven relay"; + }; }; } diff --git a/modules/haven.nix b/modules/haven.nix index 8092537..cc9891f 100755 --- a/modules/haven.nix +++ b/modules/haven.nix @@ -1,150 +1,128 @@ -{config, pkgs, lib, ...}: +{ config, pkgs, lib, ... }: let - -personalization = import ./personalization.nix; - + personalization = import ./personalization.nix; + npub = config.sovran_systemsOS.nostr_npub; in -lib.mkIf config.sovran_systemsOS.features.haven { +lib.mkIf (config.sovran_systemsOS.features.haven && npub != "") { - services.haven = { - enable = true; - settings = { - OWNER_NPUB=""; - RELAY_URL="*name*"; + services.haven = { + enable = true; + settings = { + OWNER_NPUB = npub; + RELAY_URL = personalization.haven_url; - RELAY_PORT=3355; - RELAY_BIND_ADDRESS="0.0.0.0"; # Can be set to a specific IP4 or IP6 address ("" for all interfaces) - DB_ENGINE="badger"; # badger, lmdb (lmdb works best with an nvme, otherwise you might have stability issues) - LMDB_MAPSIZE=3000000000; # 0 for default (currently ~273GB), or set to a different size in bytes, e.g. 10737418240 for 10GB - BLOSSOM_PATH="blossom/"; + RELAY_PORT = 3355; + RELAY_BIND_ADDRESS = "0.0.0.0"; + DB_ENGINE = "badger"; + LMDB_MAPSIZE = 3000000000; + BLOSSOM_PATH = "blossom/"; -## Private Relay Settings - PRIVATE_RELAY_NAME="*name* private relay"; - PRIVATE_RELAY_NPUB=""; - PRIVATE_RELAY_DESCRIPTION="The Relay From Sovran Systems"; -#PRIVATE_RELAY_ICON="https://i.nostr.build/6G6wW.gif" + PRIVATE_RELAY_NAME = "${personalization.haven_url} private relay"; + PRIVATE_RELAY_NPUB = npub; + PRIVATE_RELAY_DESCRIPTION = "The Relay From Sovran Systems"; -## Private Relay Rate Limiters - 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_NAME = "${personalization.haven_url} chat relay"; + CHAT_RELAY_NPUB = npub; + CHAT_RELAY_DESCRIPTION = "a relay for private chats"; -## Chat Relay Settings - CHAT_RELAY_NAME="*name* chat relay"; - CHAT_RELAY_NPUB=""; - CHAT_RELAY_DESCRIPTION="a relay for private chats"; -#CHAT_RELAY_ICON="https://i.nostr.build/6G6wW.gif" - CHAT_RELAY_WOT_DEPTH=3; - CHAT_RELAY_WOT_REFRESH_INTERVAL_HOURS=24; - CHAT_RELAY_MINIMUM_FOLLOWERS=3; + OUTBOX_RELAY_NAME = "${personalization.haven_url} outbox relay"; + OUTBOX_RELAY_NPUB = npub; + OUTBOX_RELAY_DESCRIPTION = "a relay and Blossom server for public messages and media"; -## Chat Relay Rate Limiters - 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; + INBOX_RELAY_NAME = "${personalization.haven_url} inbox relay"; + INBOX_RELAY_NPUB = npub; + INBOX_RELAY_DESCRIPTION = "send your interactions with my notes here"; -## Outbox Relay Settings - OUTBOX_RELAY_NAME="*name* outbox relay"; - OUTBOX_RELAY_NPUB=""; - OUTBOX_RELAY_DESCRIPTION="a relay and Blossom server for public messages and media"; -#OUTBOX_RELAY_ICON="https://i.nostr.build/6G6wW.gif" + INBOX_PULL_INTERVAL_SECONDS = 600; -## Outbox Relay Rate Limiters - 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; + # ... all your rate limiter and WOT settings unchanged ... + PRIVATE_RELAY_EVENT_IP_LIMITER_TOKENS_PER_INTERVAL = 50; + PRIVATE_RELAY_EVENT_IP_LIMITER_INTERVAL = 1; + PRIVATE_RELAY_EVENT_IP_LIMITER_MAX_TOKENS = 100; + PRIVATE_RELAY_ALLOW_EMPTY_FILTERS = true; + PRIVATE_RELAY_ALLOW_COMPLEX_FILTERS = true; + PRIVATE_RELAY_CONNECTION_RATE_LIMITER_TOKENS_PER_INTERVAL = 3; + PRIVATE_RELAY_CONNECTION_RATE_LIMITER_INTERVAL = 5; + PRIVATE_RELAY_CONNECTION_RATE_LIMITER_MAX_TOKENS = 9; -## Inbox Relay Settings - INBOX_RELAY_NAME="*name* inbox relay"; - INBOX_RELAY_NPUB=""; - INBOX_RELAY_DESCRIPTION="send your interactions with my notes here"; -#INBOX_RELAY_ICON="https://i.nostr.build/6G6wW.gif" - INBOX_PULL_INTERVAL_SECONDS=600; + 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; -## Inbox Relay Rate Limiters - 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; + 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; -## WOT Settings - WOT_FETCH_TIMEOUT_SECONDS=60; - - WHITELISTED_NPUBS_FILE="/var/lib/haven/whitelisted_npubs.json"; - - BLACKLISTED_NPUBS_FILE=""; + 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"; + }; -## LOGGING - HAVEN_LOG_LEVEL="INFO"; # DEBUG, INFO, WARNING or ERROR - }; - - 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" - ]; - - }; + blastrRelays = [ + "nos.lol" + "relay.nostr.band" + "relay.snort.social" + "nostr.mom" + "relay.primal.net" + "no.str.cr" + "nostr21.com" + "nostrue.com" + "wot.nostr.party" + "wot.sovbit.host" + "wot.girino.org" + "relay.lexingtonbitcoin.org" + "zap.watch" + "satsage.xyz" + "wons.calva.dev" + ]; + }; systemd.tmpfiles.rules = [ "d /var/lib/haven 0750 haven haven -" "f /var/lib/haven/whitelisted_npubs.json 0770 haven haven -" ]; - services.caddy = { - virtualHosts = { - "${personalization.haven_url}" = { - extraConfig = '' - reverse_proxy localhost:3355 { - header_up Host {host} - header_up X-Real-IP {remote_host} - header_up X-Forwarded-For {remote_host} - header_up X-Forwarded-Proto {scheme} - transport http { - versions 1.1 - } - } - request_body { - max_size 100MB - } - ''; - }; - }; - }; -} - - + services.caddy.virtualHosts = { + "${personalization.haven_url}" = { + extraConfig = '' + reverse_proxy localhost:3355 { + header_up Host {host} + header_up X-Real-IP {remote_host} + header_up X-Forwarded-For {remote_host} + header_up X-Forwarded-Proto {scheme} + transport http { + versions 1.1 + } + } + request_body { + max_size 100MB + } + ''; + }; + }; +} From b7703e799758c228d658118340f76a0b76056103 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Wed, 25 Mar 2026 11:45:39 -0500 Subject: [PATCH 642/667] updated haven.nix --- modules/haven.nix | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/modules/haven.nix b/modules/haven.nix index cc9891f..a00fa7f 100755 --- a/modules/haven.nix +++ b/modules/haven.nix @@ -104,9 +104,28 @@ lib.mkIf (config.sovran_systemsOS.features.haven && npub != "") { systemd.tmpfiles.rules = [ "d /var/lib/haven 0750 haven haven -" - "f /var/lib/haven/whitelisted_npubs.json 0770 haven haven -" ]; + systemd.services.haven-whitelist-setup = { + description = "Ensure Haven whitelisted_npubs.json exists"; + wantedBy = [ "multi-user.target" ]; + before = [ "haven.service" ]; + serviceConfig = { + Type = "oneshot"; + RemainAfterExit = true; + }; + script = '' + if [ ! -f /var/lib/haven/whitelisted_npubs.json ]; then + echo '[]' > /var/lib/haven/whitelisted_npubs.json + chown haven:haven /var/lib/haven/whitelisted_npubs.json + chmod 770 /var/lib/haven/whitelisted_npubs.json + fi + ''; + }; + + systemd.services.haven.after = [ "haven-whitelist-setup.service" ]; + systemd.services.haven.wants = [ "haven-whitelist-setup.service" ]; + services.caddy.virtualHosts = { "${personalization.haven_url}" = { extraConfig = '' From 4f48e3c05d257bd5dd741c8fea9deb2ae755cb0d Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Wed, 25 Mar 2026 11:49:04 -0500 Subject: [PATCH 643/667] updated haven.nix error code --- modules/haven.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/modules/haven.nix b/modules/haven.nix index a00fa7f..19bdbb9 100755 --- a/modules/haven.nix +++ b/modules/haven.nix @@ -107,7 +107,7 @@ lib.mkIf (config.sovran_systemsOS.features.haven && npub != "") { ]; systemd.services.haven-whitelist-setup = { - description = "Ensure Haven whitelisted_npubs.json exists"; + description = "Ensure Haven whitelisted_npubs.json is valid"; wantedBy = [ "multi-user.target" ]; before = [ "haven.service" ]; serviceConfig = { @@ -115,10 +115,14 @@ lib.mkIf (config.sovran_systemsOS.features.haven && npub != "") { RemainAfterExit = true; }; script = '' - if [ ! -f /var/lib/haven/whitelisted_npubs.json ]; then - echo '[]' > /var/lib/haven/whitelisted_npubs.json - chown haven:haven /var/lib/haven/whitelisted_npubs.json - chmod 770 /var/lib/haven/whitelisted_npubs.json + 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 ''; }; From a1b48f89383ad6046b5b56398c709e106ca6a354 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Wed, 25 Mar 2026 11:54:18 -0500 Subject: [PATCH 644/667] optimzed flake.nix --- flake.nix | 41 +++++++++++++++++------------------------ 1 file changed, 17 insertions(+), 24 deletions(-) diff --git a/flake.nix b/flake.nix index 51a4610..78c9d64 100755 --- a/flake.nix +++ b/flake.nix @@ -21,32 +21,25 @@ }; - outputs = { self, nixpkgs, nix-bitcoin, nixvim, agenix, btc-clients, nixpkgs-stable, bip110, ... }: + outputs = { self, nixpkgs, nix-bitcoin, nixvim, agenix, btc-clients, nixpkgs-stable, bip110, ... }: - let - - system = "x86_64-linux"; + let - overlay-stable = final: prev: { - - stable = import nixpkgs-stable { - inherit system; - config.allowunfree = true; - - }; - - }; - - in - - { - - nixosConfigurations.nixos = nixpkgs.lib.nixosSystem { - - inherit system; - + 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"; + }; + nixosModules.Sovran_SystemsOS = { pkgs, lib, config, ... }: { imports = [ @@ -67,7 +60,7 @@ btc-clients.packages.${pkgs.system}.sparrow ]; - sovran_systemsOS.packages.bip110 = bip110.packages.${system}.bitcoind-knots-bip-110; + sovran_systemsOS.packages.bip110 = bip110.packages.${pkgs.system}.bitcoind-knots-bip-110; }; }; }; From a4f84291b876bacee42b4e664d76ec96cc3754fa Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Wed, 25 Mar 2026 12:01:26 -0500 Subject: [PATCH 645/667] optimized both flake.nix --- flake.nix | 75 +++++++++++++++++++---------------- for_new_sovran_pros/flake.nix | 6 +-- 2 files changed, 44 insertions(+), 37 deletions(-) diff --git a/flake.nix b/flake.nix index 78c9d64..f686d46 100755 --- a/flake.nix +++ b/flake.nix @@ -17,51 +17,58 @@ nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-24.11"; - bip110.url = "github:emmanuelrosa/bitcoin-knots-bip-110-nix"; + bip110.url = "github:emmanuelrosa/bitcoin-knots-bip-110-nix"; }; - outputs = { self, nixpkgs, nix-bitcoin, nixvim, agenix, btc-clients, nixpkgs-stable, bip110, ... }: + outputs = { self, nixpkgs, nix-bitcoin, nixvim, agenix, btc-clients, nixpkgs-stable, bip110, ... }: - let + let - overlay-stable = final: prev: { - stable = import nixpkgs-stable { - system = prev.stdenv.hostPlatform.system; - config.allowUnfree = true; - }; - }; + overlay-stable = final: prev: { - in + stable = import nixpkgs-stable { + system = prev.stdenv.hostPlatform.system; + config.allowUnfree = true; - { + }; - nixosConfigurations.nixos = nixpkgs.lib.nixosSystem { - system = "x86_64-linux"; - }; + }; - nixosModules.Sovran_SystemsOS = { pkgs, lib, config, ... }: { + in - imports = [ - ({ config, pkgs, ... }: { - nixpkgs.overlays = [ overlay-stable ]; - }) + { + + nixosConfigurations.nixos = nixpkgs.lib.nixosSystem { + + modules = [ + { nixpkgs.hostPlatform = "x86_64-linux"; } + ]; + + }; + + nixosModules.Sovran_SystemsOS = { pkgs, lib, config, ... }: { - ./configuration.nix - nix-bitcoin.nixosModules.default - agenix.nixosModules.default - nixvim.nixosModules.nixvim - ]; + imports = [ + ({ config, pkgs, ... }: { + nixpkgs.overlays = [ overlay-stable ]; + }) - config = { - environment.systemPackages = with pkgs; [ - btc-clients.packages.${pkgs.system}.bisq - btc-clients.packages.${pkgs.system}.bisq2 - btc-clients.packages.${pkgs.system}.sparrow - ]; + ./configuration.nix + nix-bitcoin.nixosModules.default + agenix.nixosModules.default + nixvim.nixosModules.nixvim + ]; - sovran_systemsOS.packages.bip110 = bip110.packages.${pkgs.system}.bitcoind-knots-bip-110; - }; - }; - }; + 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; + }; + }; + }; } diff --git a/for_new_sovran_pros/flake.nix b/for_new_sovran_pros/flake.nix index a8969a6..416e872 100755 --- a/for_new_sovran_pros/flake.nix +++ b/for_new_sovran_pros/flake.nix @@ -10,11 +10,11 @@ outputs = { self, Sovran_Systems, ... }@inputs: { nixosConfigurations."nixos" = Sovran_Systems.inputs.nixpkgs.lib.nixosSystem { - - system = "x86_64-linux"; modules = [ + { nixpkgs.hostPlatform = "x86_64-linux"; } + ./hardware-configuration.nix ./custom.nix @@ -27,4 +27,4 @@ }; -} \ No newline at end of file +} From 974c58e66e1d15530ce7433601778e6ed4cd27c9 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Wed, 25 Mar 2026 12:12:02 -0500 Subject: [PATCH 646/667] Nixpkgs Update --- flake.lock | 53 ++++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 44 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index 1361b31..ec7c7aa 100755 --- a/flake.lock +++ b/flake.lock @@ -21,9 +21,27 @@ "type": "github" } }, + "bip110": { + "inputs": { + "nixpkgs": "nixpkgs_2" + }, + "locked": { + "lastModified": 1773169138, + "narHash": "sha256-6X41z8o2z8KjF4gMzLTPD41WjvCDGXTc0muPGmwcOMk=", + "owner": "emmanuelrosa", + "repo": "bitcoin-knots-bip-110-nix", + "rev": "b9d018b71e20ce8c1567cbc2401b6edc2c1c7793", + "type": "github" + }, + "original": { + "owner": "emmanuelrosa", + "repo": "bitcoin-knots-bip-110-nix", + "type": "github" + } + }, "btc-clients": { "inputs": { - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs_3", "oldNixpkgs": "oldNixpkgs" }, "locked": { @@ -130,7 +148,7 @@ "inputs": { "extra-container": "extra-container", "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_4", "nixpkgs-25_05": "nixpkgs-25_05", "nixpkgs-unstable": "nixpkgs-unstable" }, @@ -224,11 +242,27 @@ }, "original": { "owner": "nixos", + "ref": "master", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_3": { + "locked": { + "lastModified": 1772380631, + "narHash": "sha256-FhW0uxeXjefINP0vUD4yRBB52Us7fXZPk9RiPAopfiY=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "6d3b61b190a899042ce82a5355111976ba76d698", + "type": "github" + }, + "original": { + "owner": "nixos", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_4": { "locked": { "lastModified": 1767480499, "narHash": "sha256-8IQQUorUGiSmFaPnLSo2+T+rjHtiNWc+OAzeHck7N48=", @@ -244,7 +278,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_5": { "locked": { "lastModified": 1774106199, "narHash": "sha256-US5Tda2sKmjrg2lNHQL3jRQ6p96cgfWh3J1QBliQ8Ws=", @@ -260,7 +294,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_6": { "locked": { "lastModified": 1770380644, "narHash": "sha256-P7dWMHRUWG5m4G+06jDyThXO7kwSk46C1kgjEWcybkE=", @@ -279,15 +313,15 @@ "nixvim": { "inputs": { "flake-parts": "flake-parts", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_6", "systems": "systems_3" }, "locked": { - "lastModified": 1772402258, - "narHash": "sha256-3DmCFOdmbkFML1/G9gj8Wb+rCCZFPOQtNoMCpqOF8SA=", + "lastModified": 1774309640, + "narHash": "sha256-8oWL7YLwElBY9ebYri1LlSlhf/gd1Qoqj0nbBwG2yso=", "owner": "nix-community", "repo": "nixvim", - "rev": "21ae25e13b01d3b4cdc750b5f9e7bad68b150c10", + "rev": "28c58bf023bf537354f78d6e496a349d7a0ed554", "type": "github" }, "original": { @@ -315,9 +349,10 @@ "root": { "inputs": { "agenix": "agenix", + "bip110": "bip110", "btc-clients": "btc-clients", "nix-bitcoin": "nix-bitcoin", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_5", "nixpkgs-stable": "nixpkgs-stable", "nixvim": "nixvim" } From 9987d6e42bdd55fcc7b90f16f857261d81d69ba1 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Wed, 25 Mar 2026 12:24:00 -0500 Subject: [PATCH 647/667] updated rdp.nix --- modules/rdp.nix | 55 ++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 45 insertions(+), 10 deletions(-) diff --git a/modules/rdp.nix b/modules/rdp.nix index 3d28dd2..9fb154a 100755 --- a/modules/rdp.nix +++ b/modules/rdp.nix @@ -1,16 +1,51 @@ { config, pkgs, lib, ... }: - lib.mkIf config.sovran_systemsOS.features.rdp { +lib.mkIf config.sovran_systemsOS.features.rdp { - services.gnome.gnome-remote-desktop.enable = true; + services.gnome.gnome-remote-desktop.enable = true; - networking.firewall.allowedTCPPorts = [ 3389 ]; + networking.firewall.allowedTCPPorts = [ 3389 ]; - environment.systemPackages = with pkgs; [ - freerdp - ]; + environment.systemPackages = with pkgs; [ + freerdp + ]; + + # gnome-remote-desktop ships a system service that needs to be explicitly enabled + systemd.services.gnome-remote-desktop = { + wantedBy = [ "graphical.target" ]; + after = [ "graphical.target" ]; + serviceConfig = { + Restart = "on-failure"; + RestartSec = 5; + }; + }; + + # Configure RDP credentials and enable RDP mode on first boot + systemd.services.gnome-remote-desktop-setup = { + description = "Configure GNOME Remote Desktop RDP"; + wantedBy = [ "multi-user.target" ]; + before = [ "gnome-remote-desktop.service" ]; + serviceConfig = { + Type = "oneshot"; + RemainAfterExit = true; + }; + path = [ pkgs.gnome-remote-desktop ]; + script = '' + # Enable RDP backend + grdctl --system rdp enable + + # Disable requiring a prompt/handshake for unattended access + grdctl --system rdp set-credentials sovran "$(cat /var/lib/gnome-remote-desktop/rdp-password 2>/dev/null || echo 'changeme')" + + # Generate a default password file if one doesn't exist + if [ ! -f /var/lib/gnome-remote-desktop/rdp-password ]; then + mkdir -p /var/lib/gnome-remote-desktop + ${pkgs.openssl}/bin/openssl rand -base64 16 > /var/lib/gnome-remote-desktop/rdp-password + chmod 600 /var/lib/gnome-remote-desktop/rdp-password + echo "Generated new RDP password at /var/lib/gnome-remote-desktop/rdp-password" + fi + + grdctl --system rdp set-credentials sovran "$(cat /var/lib/gnome-remote-desktop/rdp-password)" + ''; + }; } - - - - From 204e6c75d1fe2308005a48ebae22ce38b55f8dc6 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Wed, 25 Mar 2026 13:01:10 -0500 Subject: [PATCH 648/667] retooled rdp.nix --- modules/rdp.nix | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/modules/rdp.nix b/modules/rdp.nix index 9fb154a..72a0a93 100755 --- a/modules/rdp.nix +++ b/modules/rdp.nix @@ -10,7 +10,6 @@ lib.mkIf config.sovran_systemsOS.features.rdp { freerdp ]; - # gnome-remote-desktop ships a system service that needs to be explicitly enabled systemd.services.gnome-remote-desktop = { wantedBy = [ "graphical.target" ]; after = [ "graphical.target" ]; @@ -20,7 +19,6 @@ lib.mkIf config.sovran_systemsOS.features.rdp { }; }; - # Configure RDP credentials and enable RDP mode on first boot systemd.services.gnome-remote-desktop-setup = { description = "Configure GNOME Remote Desktop RDP"; wantedBy = [ "multi-user.target" ]; @@ -29,22 +27,22 @@ lib.mkIf config.sovran_systemsOS.features.rdp { Type = "oneshot"; RemainAfterExit = true; }; - path = [ pkgs.gnome-remote-desktop ]; + path = [ + pkgs.gnome-remote-desktop + pkgs.polkit + pkgs.openssl + ]; script = '' - # Enable RDP backend - grdctl --system rdp enable - - # Disable requiring a prompt/handshake for unattended access - grdctl --system rdp set-credentials sovran "$(cat /var/lib/gnome-remote-desktop/rdp-password 2>/dev/null || echo 'changeme')" - # Generate a default password file if one doesn't exist if [ ! -f /var/lib/gnome-remote-desktop/rdp-password ]; then mkdir -p /var/lib/gnome-remote-desktop - ${pkgs.openssl}/bin/openssl rand -base64 16 > /var/lib/gnome-remote-desktop/rdp-password + openssl rand -base64 16 > /var/lib/gnome-remote-desktop/rdp-password chmod 600 /var/lib/gnome-remote-desktop/rdp-password echo "Generated new RDP password at /var/lib/gnome-remote-desktop/rdp-password" fi + # Enable RDP backend and set credentials + grdctl --system rdp enable grdctl --system rdp set-credentials sovran "$(cat /var/lib/gnome-remote-desktop/rdp-password)" ''; }; From 8d64edd8bd12bef9ae0650956fa5cf8da97476de Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Wed, 25 Mar 2026 13:06:23 -0500 Subject: [PATCH 649/667] retooled rdp.nix --- modules/rdp.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/modules/rdp.nix b/modules/rdp.nix index 72a0a93..e381f1b 100755 --- a/modules/rdp.nix +++ b/modules/rdp.nix @@ -19,10 +19,18 @@ lib.mkIf config.sovran_systemsOS.features.rdp { }; }; + 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" ]; serviceConfig = { Type = "oneshot"; RemainAfterExit = true; @@ -35,8 +43,8 @@ lib.mkIf config.sovran_systemsOS.features.rdp { script = '' # Generate a default password file if one doesn't exist if [ ! -f /var/lib/gnome-remote-desktop/rdp-password ]; then - mkdir -p /var/lib/gnome-remote-desktop openssl rand -base64 16 > /var/lib/gnome-remote-desktop/rdp-password + chown gnome-remote-desktop:gnome-remote-desktop /var/lib/gnome-remote-desktop/rdp-password chmod 600 /var/lib/gnome-remote-desktop/rdp-password echo "Generated new RDP password at /var/lib/gnome-remote-desktop/rdp-password" fi From b5886dace9806e4239cea7b7a5f11658d7daf3de Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Wed, 25 Mar 2026 13:12:44 -0500 Subject: [PATCH 650/667] added more features rdp.nix --- modules/rdp.nix | 40 +++++++++++++++++++++++++++++++++------- 1 file changed, 33 insertions(+), 7 deletions(-) diff --git a/modules/rdp.nix b/modules/rdp.nix index e381f1b..a65c329 100755 --- a/modules/rdp.nix +++ b/modules/rdp.nix @@ -30,7 +30,8 @@ lib.mkIf config.sovran_systemsOS.features.rdp { description = "Configure GNOME Remote Desktop RDP"; wantedBy = [ "multi-user.target" ]; before = [ "gnome-remote-desktop.service" ]; - after = [ "systemd-tmpfiles-setup.service" ]; + after = [ "systemd-tmpfiles-setup.service" "network-online.target" ]; + wants = [ "network-online.target" ]; serviceConfig = { Type = "oneshot"; RemainAfterExit = true; @@ -39,19 +40,44 @@ lib.mkIf config.sovran_systemsOS.features.rdp { pkgs.gnome-remote-desktop pkgs.polkit pkgs.openssl + pkgs.hostname ]; script = '' - # Generate a default password file if one doesn't exist - if [ ! -f /var/lib/gnome-remote-desktop/rdp-password ]; then - openssl rand -base64 16 > /var/lib/gnome-remote-desktop/rdp-password - chown gnome-remote-desktop:gnome-remote-desktop /var/lib/gnome-remote-desktop/rdp-password + CRED_FILE="/var/lib/gnome-remote-desktop/rdp-credentials" + PASSWORD="" + + # Generate password on first boot only + if [ ! -f "$CRED_FILE" ]; then + PASSWORD=$(openssl rand -base64 16) + echo "$PASSWORD" > /var/lib/gnome-remote-desktop/rdp-password chmod 600 /var/lib/gnome-remote-desktop/rdp-password - echo "Generated new RDP password at /var/lib/gnome-remote-desktop/rdp-password" + else + PASSWORD=$(grep "Password:" "$CRED_FILE" | awk '{print $2}') fi + # Get current IP address + LOCAL_IP=$(hostname -I | awk '{print $1}') + + # Always rewrite the credentials file with the current IP + cat > "$CRED_FILE" < Date: Wed, 25 Mar 2026 13:16:30 -0500 Subject: [PATCH 651/667] fixed rdp.nix --- modules/rdp.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/modules/rdp.nix b/modules/rdp.nix index a65c329..c9033b7 100755 --- a/modules/rdp.nix +++ b/modules/rdp.nix @@ -43,16 +43,20 @@ lib.mkIf config.sovran_systemsOS.features.rdp { pkgs.hostname ]; 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 + CRED_FILE="/var/lib/gnome-remote-desktop/rdp-credentials" PASSWORD="" # Generate password on first boot only - if [ ! -f "$CRED_FILE" ]; then + 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=$(grep "Password:" "$CRED_FILE" | awk '{print $2}') + PASSWORD=$(cat /var/lib/gnome-remote-desktop/rdp-password) fi # Get current IP address From 9b7e7153f4d54e1f1cceff560e5f1e144cff1af1 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Wed, 25 Mar 2026 13:19:31 -0500 Subject: [PATCH 652/667] fixed rdp.nix --- modules/rdp.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/rdp.nix b/modules/rdp.nix index c9033b7..5b9085d 100755 --- a/modules/rdp.nix +++ b/modules/rdp.nix @@ -41,6 +41,7 @@ lib.mkIf config.sovran_systemsOS.features.rdp { pkgs.polkit pkgs.openssl pkgs.hostname + pkgs.gawk ]; script = '' # Ensure directory structure exists From 6bc9a1f78757d7d88396096315e7e31d3906fd80 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Wed, 25 Mar 2026 13:31:18 -0500 Subject: [PATCH 653/667] retooling rdp.nix --- modules/rdp.nix | 31 +++++++++++++++++++++++++------ 1 file changed, 25 insertions(+), 6 deletions(-) diff --git a/modules/rdp.nix b/modules/rdp.nix index 5b9085d..67b4c34 100755 --- a/modules/rdp.nix +++ b/modules/rdp.nix @@ -10,13 +10,11 @@ lib.mkIf config.sovran_systemsOS.features.rdp { freerdp ]; + # The NixOS module installs the unit but doesn't enable it — we just need to start it and order it systemd.services.gnome-remote-desktop = { wantedBy = [ "graphical.target" ]; - after = [ "graphical.target" ]; - serviceConfig = { - Restart = "on-failure"; - RestartSec = 5; - }; + after = [ "gnome-remote-desktop-setup.service" ]; + wants = [ "gnome-remote-desktop-setup.service" ]; }; systemd.tmpfiles.rules = [ @@ -48,10 +46,29 @@ lib.mkIf config.sovran_systemsOS.features.rdp { 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" - PASSWORD="" + + # Generate TLS certificate if it doesn't exist + if [ ! -f "$TLS_DIR/rdp-tls.crt" ]; then + mkdir -p "$TLS_DIR" + openssl req -x509 -newkey ec -pkeyopt ec_paramgen_curve:prime256v1 \ + -sha256 -nodes -days 3650 \ + -keyout "$TLS_DIR/rdp-tls.key" \ + -out "$TLS_DIR/rdp-tls.crt" \ + -subj "/CN=gnome-remote-desktop" + chown -R gnome-remote-desktop:gnome-remote-desktop "$TLS_DIR" + chmod 600 "$TLS_DIR/rdp-tls.key" + chmod 644 "$TLS_DIR/rdp-tls.crt" + echo "Generated RDP TLS certificate" + fi + + # Configure TLS certificate + grdctl --system rdp set-tls-cert "$TLS_DIR/rdp-tls.crt" + grdctl --system rdp set-tls-key "$TLS_DIR/rdp-tls.key" # Generate password on first boot only + PASSWORD="" if [ ! -f /var/lib/gnome-remote-desktop/rdp-password ]; then PASSWORD=$(openssl rand -base64 16) echo "$PASSWORD" > /var/lib/gnome-remote-desktop/rdp-password @@ -83,6 +100,8 @@ lib.mkIf config.sovran_systemsOS.features.rdp { # Enable RDP backend and set credentials grdctl --system rdp enable grdctl --system rdp set-credentials sovran "$PASSWORD" + + echo "GNOME Remote Desktop RDP configured successfully" ''; }; } From c124d3b48d9feb5d098ccc164fcaf7a8c8257017 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Wed, 25 Mar 2026 13:41:46 -0500 Subject: [PATCH 654/667] updated custom nix --- custom-add-ons.md | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/custom-add-ons.md b/custom-add-ons.md index 2c280b6..528bf31 100644 --- a/custom-add-ons.md +++ b/custom-add-ons.md @@ -65,26 +65,19 @@ sovran_systemsOS.features.element-calling = lib.mkForce true; ```nix sovran_systemsOS.features.rdp = lib.mkForce true; ``` -Next in a new termianl window paste this in: +Next, in a open the terminal app and in the new window paste this in: ```bash ssh root@localhost ``` +Press enter + Type in the password if required. It will be the same password to run the Sovran_SystemsOS_Updater app. -Next paste in these commands and make sure you add your own username and password +Last, paste in this command to see the log in information to log in from any RDP client software (i.e. Remmina) from any computer on your home network ```bash -sudo -u gnome-remote-desktop winpr-makecert -silent -rdp -path /var/lib/gnome-remote-desktop rdp-tls -grdctl --system rdp set-tls-key /var/lib/gnome-remote-desktop/rdp-tls.key -grdctl --system rdp set-tls-cert /var/lib/gnome-remote-desktop/rdp-tls.crt -grdctl --system rdp enable -grdctl --system rdp set-credentials "custom-username" "custom-password" +cat /var/lib/gnome-remote-desktop/rdp-credentials ``` -Next restart Gnome-Remote-Desktop -```bash -systemctl restart gnome-remote-desktop -``` -Last access Sovran_SystemsOS Desktop from any computer in your nextwork by using any software client that can connectsthrough RDP service. From a461380bde51ca6837e43899d2a8a4b849bea84a Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Wed, 25 Mar 2026 14:16:05 -0500 Subject: [PATCH 655/667] updated readme --- README.md | 319 ++++++++++++++++++++---------------------------------- 1 file changed, 119 insertions(+), 200 deletions(-) diff --git a/README.md b/README.md index 1e3d482..244edee 100755 --- a/README.md +++ b/README.md @@ -11,242 +11,161 @@ # Sovran_SystemsOS -**Own Your Stack. Run Your World.** +**A declarative, self-hosted operating system built on NixOS.** --- -## 🌐 What is Sovran_SystemsOS? +## Overview -Sovran_SystemsOS is a **declarative, self-hosted operating system built on NixOS** that turns a single machine into your: +Sovran_SystemsOS is a fully integrated NixOS configuration that transforms a single machine into a personal cloud, communications hub, Bitcoin node, web server, and daily-use desktop — all managed declaratively. -* Personal cloud -* Private communications hub -* Bitcoin node -* Web server -* Daily desktop - -This isn’t just an OS config — it’s a **complete sovereign computing environment**. +Every service is pre-wired: reverse proxy routing, database initialization, firewall rules, and inter-service communication are handled out of the box. You activate what you need; the system does the rest. --- -## ⚡ Why It Matters +## Architecture -Most people rely on a patchwork of third-party services: +Sovran_SystemsOS is structured as a set of NixOS modules exposed via a flake. A remote machine consumes the flake and selectively enables features through a simple configuration interface. -* Cloud storage owned by corporations -* Messaging platforms that mine metadata -* Financial infrastructure you don’t control - -Sovran_SystemsOS flips that model. - -👉 You run the services. -👉 You own the data. -👉 You control the system. - ---- - -## 🚀 What You’re Actually Getting - -This system doesn’t just install apps — it **assembles an ecosystem**. - -### 🖥 A Unified Desktop + Server - -* Full GNOME desktop -* Ready for daily use *and* backend services -* Remote access capabilities - ---- - -### 🌍 A Real Web Stack (Out of the Box) - -* Caddy web server with automatic HTTPS -* Reverse proxy routing already wired -* Multi-service hosting under your domains - ---- - -### ☁️ Your Own Cloud Platform - -* Nextcloud → file storage, sync, collaboration -* WordPress → publish and host content -* Vaultwarden → secure password management - ---- - -### 💬 Private Communication Layer - -* Matrix Synapse → decentralized messaging backend -* Element support → modern chat + collaboration -* Optional voice/video infrastructure - ---- - -### ₿ Sovereign Financial Stack - -* Run your own Bitcoin node -* BTCPay Server for payments -* Optional mempool explorer - -No intermediaries. No permissions. - ---- - -### 🔐 Built-In Security Posture - -* Hardened SSH (no password logins) -* Fail2ban active by default -* Tor integration available -* Encrypted secrets via Agenix - ---- - -### 💾 Reliability Without Babysitting - -* Automated backups (rsnapshot) -* Cron jobs for maintenance -* Database initialization included - ---- - -## 🧠 What Makes It Stand Out - -### 1. **This Is Not a “Toolkit” — It’s a System** - -Most projects give you pieces. - -Sovran_SystemsOS gives you a **pre-integrated stack** where: - -* Services already talk to each other -* Reverse proxy is configured -* Databases are initialized -* Ports and firewall rules are handled - -You’re not assembling — you’re **activating**. - ---- - -### 2. **Feature Toggles = Power Without Bloat** - -Turn features on or off like switches: - -```nix id="z91x8a" -sovran_systemsOS.features.mempool = true; -sovran_systemsOS.features.haven = true; +``` +Remote Machine (flake.nix) + └── Sovran_SystemsOS flake (nixosModules.Sovran_SystemsOS) + ├── configuration.nix/ # Base system + │ ├── Gnome Desktop # Gnome Desktop Interface + │ ├── caddy # Reverse proxy + HTTPS + │ ├── nextcloud # Cloud storage + │ ├── wordpress # CMS / publishing + │ ├── element # Matrix Synapse via Element Messaging App + ├── modules/ + │ ├── bitcoinecosystem.nix # Bitcoin Core / Knots / BTCPay Server / Bitcoin Lightning + │ ├── bip110.nix # Bip110 Node Consensus Policy + │ ├── element-calling.nix # Matrix Synapse via Element + Element Voice and Video Calling + │ ├── haven.nix # Nostr relay + │ ├── mempool.nix # Mempool explorer + │ ├── rdp.nix # Remote desktop (RDP) + │ ├── vaultwarden.nix # Password management + │ └── ... + ├── nix-bitcoin integration + ├── agenix (secrets management) + └── nixvim ``` -No unnecessary services. No wasted resources. +## Features ---- +### Feature Toggles -### 3. **Reproducibility = Control** +Every major service is gated behind a feature flag. Enable only what you need: -Your entire system is code: - -* Rebuild anytime -* Move to new hardware -* Roll back instantly - -This is infrastructure you can trust because you can **recreate it exactly**. - ---- - -### 4. **Automation Where It Counts** - -A huge amount is handled for you: - -* Service wiring -* Reverse proxy setup -* Scheduled jobs -* Base security - -But unlike “black box” systems, you still retain **full visibility and control**. - ---- - -## ⚠️ Honest Reality (No Hype) - -This system **does not eliminate effort**. - -You will still need to: - -* Configure DNS and domains -* Manage secrets (Agenix) -* Understand your enabled services -* Perform initial setup steps - -But here’s the difference: - -👉 You’re not starting from scratch -👉 You’re not duct-taping services together -👉 You’re not fighting your system - -You’re building on a **solid, opinionated foundation** - ---- - -## 🔌 Expand As You Grow - -Enable advanced features anytime: - -```nix id="0p9k21" -sovran_systemsOS.features.bitcoin-core = true; -sovran_systemsOS.features.bip110 = true; -sovran_systemsOS.features.mempool = true; -sovran_systemsOS.features.rdp = true; +```nix +# custom.nix +{ lib, ... }: +{ + sovran_systemsOS.features = { + bitcoin-core = lib.mkForce true; + bip110 = lib.mkForce true; + element-calling = lib.mkForce true; + haven = lib.mkForce true; + mempool = lib.mkForce true; + rdp = lib.mkForce true; + }; +} ``` -Available add-ons include: - -* Bitcoin Core / Knots switching -* BIP-110 (enhanced Bitcoin consensus policy) -* Mempool explorer -* Nostr relay (Haven) -* Element voice/video backend -* Remote desktop +No unnecessary services run. No wasted resources. --- -## 🛠 Installation +### Service Stack -Full guide: - -👉 https://git.sovransystems.com/Sovran_Systems/Sovran_SystemsOS/src/branch/main/DIY%20Install%20Sovran_SystemsOS.md +| Category | Service | Description | +|---|---|---| +| **Web** | Caddy | Automatic HTTPS, reverse proxy for all services | +| **Cloud** | Nextcloud | File storage, sync, and collaboration | +| **CMS** | WordPress | Self-hosted publishing and content management | +| **Passwords** | Vaultwarden | Bitwarden-compatible password vault | +| **Messaging** | Element/Matrix Synapse | Federated, decentralized messaging backend | +| **Video/Voice Calling** | Element Video and Voice Calling | Decentralized Voice Over IP for Matrix with optional TURN/STUN | +| **Bitcoin** | Bitcoin Core / Knots | Full node with optional BIP-110 consensus policy | +| **Bitcoin Lightning** | LND Full node connected over TOR | +| **Payments** | BTCPay Server | Self-hosted Bitcoin payment processor | +| **Explorer** | Mempool | Bitcoin mempool visualizer and block explorer | +| **Nostr** | Haven | Nostr relay server | +| **Remote Access** | GNOME Remote Desktop | RDP access with auto-generated TLS and credentials | --- -## 💬 Community +### Security -* General Chat: - https://matrix.to/#/#sovran-systems:anarchyislove.xyz +- **SSH hardened** — password authentication disabled by default +- **Fail2ban** — active on all exposed services +- **Agenix** — encrypted secrets management integrated into the flake +- **Tor** — optional integration available +- **Firewall** — ports managed per-module; only enabled services are exposed -* DIY Support: - https://matrix.to/#/#DIY_Sovran_SystemsOS:anarchyislove.xyz +### Reliability + +- **Automated backups** via rsnapshot +- **Scheduled maintenance** via systemd timers +- **Database initialization** handled declaratively +- **Reproducible builds** — the entire system is defined in code and can be rebuilt or migrated to new hardware at any time --- -## 🧭 Who This Is For +## Installation -Sovran_SystemsOS is for people who want to: +### Full Guide -* Move off Big Tech platforms -* Run their own infrastructure -* Understand and control their system -* Build a sovereign digital life +👉 [DIY Install Sovran_SystemsOS](https://git.sovransystems.com/Sovran_Systems/Sovran_SystemsOS/src/branch/main/DIY%20Install%20Sovran_SystemsOS.md) --- -## 🧭 Final Thought +## Requirements -You can keep renting your digital life… - -Or you can start owning it. - -Sovran_SystemsOS doesn’t promise magic. -It gives you something more valuable: - -👉 **A system you control, understand, and can rebuild at will.** +| Resource | Minimum | Recommended | +|---|---|---| +| CPU | 4 cores | 8+ cores | +| RAM | 16 GB | 32+ GB | +| Storage | 512 GB SSD + 4 TB SSD | 2GB SSD + 4+ TB SSD (Bitcoin node requires significant disk) | +| Network | Stable broadband | Static IP or DDNS for public-facing services | --- -**All Is Love. Fear Is Illusion. All Beings Are Free. Truth Can Never Be Destroyed.** +## Contributing + +Contributions are welcome. If you want to add a module, fix a bug, or improve documentation: + +1. Fork the repository +2. Create a feature branch +3. Submit a pull request with a clear description of the change + +Please keep modules self-contained and gated behind a feature flag. + +--- + +## Community + +| Channel | Link | +|---|---| +| General Chat | [#sovran-systems:anarchyislove.xyz](https://matrix.to/#/#sovran-systems:anarchyislove.xyz) | +| DIY Support | [#DIY_Sovran_SystemsOS:anarchyislove.xyz](https://matrix.to/#/#DIY_Sovran_SystemsOS:anarchyislove.xyz) | + +--- + +## License + +See [LICENSE](LICENSE) for details. + +--- + +## Project Philosophy + +Sovran_SystemsOS exists to provide a complete, self-hosted infrastructure stack that eliminates dependency on third-party platforms. It is opinionated by design — services are pre-integrated so you spend time using your system, not assembling it. + +This is not a toolkit. It is a working system. + +You retain full visibility into every module, every service definition, and every configuration choice. Nothing is hidden. Everything is reproducible. + +--- + +**Own your stack. Run your world.** From 38c20c3d5b02d0dd0beaa3441cdd9612ff53ca54 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Wed, 25 Mar 2026 14:35:00 -0500 Subject: [PATCH 656/667] updated readme --- README.md | 55 ++++++++++++++++++++++++++----------------------------- 1 file changed, 26 insertions(+), 29 deletions(-) diff --git a/README.md b/README.md index 244edee..27afe25 100755 --- a/README.md +++ b/README.md @@ -17,9 +17,9 @@ ## Overview -Sovran_SystemsOS is a fully integrated NixOS configuration that transforms a single machine into a personal cloud, communications hub, Bitcoin node, web server, and daily-use desktop — all managed declaratively. +Sovran_SystemsOS is a fully integrated NixOS configuration that transforms a single machine into a personal cloud, communications hub, Bitcoin node, web server, and **daily-use desktop** — all managed declaratively. -Every service is pre-wired: reverse proxy routing, database initialization, firewall rules, and inter-service communication are handled out of the box. You activate what you need; the system does the rest. +Every service is pre-wired: reverse proxy routing, database initialization, firewall rules, automated backups, and inter-service communication are handled out of the box. Moreover, you can activate the other custom packages; the system does the rest. --- @@ -28,10 +28,10 @@ Every service is pre-wired: reverse proxy routing, database initialization, fire Sovran_SystemsOS is structured as a set of NixOS modules exposed via a flake. A remote machine consumes the flake and selectively enables features through a simple configuration interface. ``` -Remote Machine (flake.nix) +Repository Main Flake (flake.nix) └── Sovran_SystemsOS flake (nixosModules.Sovran_SystemsOS) ├── configuration.nix/ # Base system - │ ├── Gnome Desktop # Gnome Desktop Interface + │ ├── gnome Desktop # Gnome Desktop Interface │ ├── caddy # Reverse proxy + HTTPS │ ├── nextcloud # Cloud storage │ ├── wordpress # CMS / publishing @@ -44,8 +44,10 @@ Remote Machine (flake.nix) │ ├── mempool.nix # Mempool explorer │ ├── rdp.nix # Remote desktop (RDP) │ ├── vaultwarden.nix # Password management - │ └── ... ├── nix-bitcoin integration + ├── bitcoin clients integration + │ ├── sparrow wallet # Trusted and Standard Open Source Bitcoin Wallet + │ ├── bisq/bisq2 # Non KYC Bitcoin Buying and Selling ├── agenix (secrets management) └── nixvim ``` @@ -54,20 +56,27 @@ Remote Machine (flake.nix) ### Feature Toggles +[Custom Add-On Guide](custom-add-ons.md) + Every major service is gated behind a feature flag. Enable only what you need: ```nix # custom.nix -{ lib, ... }: +{ config, pkgs, lib, ... }: + { - sovran_systemsOS.features = { - bitcoin-core = lib.mkForce true; - bip110 = lib.mkForce true; - element-calling = lib.mkForce true; - haven = lib.mkForce true; - mempool = lib.mkForce true; - rdp = lib.mkForce true; + + sovran_systemsOS = { + features = { + bip110 = lib.mkForce true; + element-calling = lib.mkForce true; + haven = lib.mkForce true; + mempool = lib.mkForce true; + rdp = lib.mkForce true; + }; + nostr_npub = "pasteyournpubhere"; }; + } ``` @@ -85,7 +94,7 @@ No unnecessary services run. No wasted resources. | **Passwords** | Vaultwarden | Bitwarden-compatible password vault | | **Messaging** | Element/Matrix Synapse | Federated, decentralized messaging backend | | **Video/Voice Calling** | Element Video and Voice Calling | Decentralized Voice Over IP for Matrix with optional TURN/STUN | -| **Bitcoin** | Bitcoin Core / Knots | Full node with optional BIP-110 consensus policy | +| **Bitcoin** | Bitcoin Core / Knots | **Full node with optional BIP-110 consensus policy** | | **Bitcoin Lightning** | LND Full node connected over TOR | | **Payments** | BTCPay Server | Self-hosted Bitcoin payment processor | | **Explorer** | Mempool | Bitcoin mempool visualizer and block explorer | @@ -97,9 +106,9 @@ No unnecessary services run. No wasted resources. ### Security - **SSH hardened** — password authentication disabled by default -- **Fail2ban** — active on all exposed services +- **Fail2ban** — active on https - **Agenix** — encrypted secrets management integrated into the flake -- **Tor** — optional integration available +- **Tor** — integration into the bitcoin ecosystem - **Firewall** — ports managed per-module; only enabled services are exposed ### Reliability @@ -130,18 +139,6 @@ No unnecessary services run. No wasted resources. --- -## Contributing - -Contributions are welcome. If you want to add a module, fix a bug, or improve documentation: - -1. Fork the repository -2. Create a feature branch -3. Submit a pull request with a clear description of the change - -Please keep modules self-contained and gated behind a feature flag. - ---- - ## Community | Channel | Link | @@ -167,5 +164,5 @@ You retain full visibility into every module, every service definition, and ever --- -**Own your stack. Run your world.** +**Be Digtially Sovereign** From d9cf50b5b638260fc6129d33ae6eb20de1e363cd Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Wed, 25 Mar 2026 14:38:09 -0500 Subject: [PATCH 657/667] typo readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 27afe25..00e4c23 100755 --- a/README.md +++ b/README.md @@ -164,5 +164,5 @@ You retain full visibility into every module, every service definition, and ever --- -**Be Digtially Sovereign** +**Be Digitally Sovereign** From ee624bf5fe28b5b1ae44a3a7eeec3e518e0b0ab5 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Wed, 25 Mar 2026 14:53:18 -0500 Subject: [PATCH 658/667] updated readme --- README.md | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 00e4c23..4ac5f69 100755 --- a/README.md +++ b/README.md @@ -120,6 +120,27 @@ No unnecessary services run. No wasted resources. --- +### Network Configuration + +Sovran_SystemsOS hosts public-facing services (Wordpress, Element/Element Calling, Nextcloud, BTCPayserver, Haven Relay, and Vaultwarden) that require inbound connections from the internet. To make these services accessible outside your local network, you must configure **port forwarding** on your home router. + +**Before deploying, ensure you have:** + +- Access to your router's administration interface (typically at `192.168.1.1` or `192.168.0.1`) +- The ability to create port forwarding rules +- The local/private IP address of the machine running Sovran_SystemsOS +- The external public IP address of the machine running Sovran_SystemsOS + +**Required port forwards (depending on enabled features):** + +Forward each port to the **private IP address** of your Sovran_SystemsOS machine. Only forward ports for services you have enabled. + +> **Tip:** Assign a static IP or DHCP reservation to your Sovran_SystemsOS machine so the forwarding rules remain valid after reboots. + +> **Note:** If your ISP uses CGNAT (Carrier-Grade NAT), standard port forwarding will not work. Contact your ISP to request a public IP address. + +--- + ## Installation ### Full Guide @@ -135,7 +156,7 @@ No unnecessary services run. No wasted resources. | CPU | 4 cores | 8+ cores | | RAM | 16 GB | 32+ GB | | Storage | 512 GB SSD + 4 TB SSD | 2GB SSD + 4+ TB SSD (Bitcoin node requires significant disk) | -| Network | Stable broadband | Static IP or DDNS for public-facing services | +| Network | 100Mbs Down 20Mbs Up + No need for DDNS if domains are brought through https://njal.la | 1Gbs Up and 1 Gbs Down + No need for DDNS if domains are brought through https://njal.la | --- From 0989220a2b88b569fc352d0694333b26b8b38bec Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Wed, 25 Mar 2026 15:19:04 -0500 Subject: [PATCH 659/667] updated readme --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 4ac5f69..7b25b35 100755 --- a/README.md +++ b/README.md @@ -95,7 +95,7 @@ No unnecessary services run. No wasted resources. | **Messaging** | Element/Matrix Synapse | Federated, decentralized messaging backend | | **Video/Voice Calling** | Element Video and Voice Calling | Decentralized Voice Over IP for Matrix with optional TURN/STUN | | **Bitcoin** | Bitcoin Core / Knots | **Full node with optional BIP-110 consensus policy** | -| **Bitcoin Lightning** | LND Full node connected over TOR | +| **Bitcoin Lightning** | LND | Full LND Node Connected over Tor intergrated into BTCPay Server | | **Payments** | BTCPay Server | Self-hosted Bitcoin payment processor | | **Explorer** | Mempool | Bitcoin mempool visualizer and block explorer | | **Nostr** | Haven | Nostr relay server | @@ -116,7 +116,7 @@ No unnecessary services run. No wasted resources. - **Automated backups** via rsnapshot - **Scheduled maintenance** via systemd timers - **Database initialization** handled declaratively -- **Reproducible builds** — the entire system is defined in code and can be rebuilt or migrated to new hardware at any time +- **Reproducible builds** — the main system is defined in code and can be rebuilt to match most systems --- @@ -156,7 +156,7 @@ Forward each port to the **private IP address** of your Sovran_SystemsOS machine | CPU | 4 cores | 8+ cores | | RAM | 16 GB | 32+ GB | | Storage | 512 GB SSD + 4 TB SSD | 2GB SSD + 4+ TB SSD (Bitcoin node requires significant disk) | -| Network | 100Mbs Down 20Mbs Up + No need for DDNS if domains are brought through https://njal.la | 1Gbs Up and 1 Gbs Down + No need for DDNS if domains are brought through https://njal.la | +| Network | 100 Mbs Down/20 Mbs Up + No need for DDNS if domains are brought through https://njal.la | 1 Gbs Down/1 Gbs Up + No need for DDNS if domains are brought through https://njal.la | --- From 99f3a3273a0246d95ad024a2c281c2d16679cbdf Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Wed, 25 Mar 2026 15:27:22 -0500 Subject: [PATCH 660/667] updated readme --- README.md | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 7b25b35..f210b21 100755 --- a/README.md +++ b/README.md @@ -11,7 +11,9 @@ # Sovran_SystemsOS -**A declarative, self-hosted operating system built on NixOS.** +### The Officaly Repository of Sovran_SystemsOS and the Sovran Pro + +**A declarative, self-hosted server and desktop operating system built on NixOS by [https://sovransytems.com](Sovran Systems)** --- @@ -19,6 +21,8 @@ Sovran_SystemsOS is a fully integrated NixOS configuration that transforms a single machine into a personal cloud, communications hub, Bitcoin node, web server, and **daily-use desktop** — all managed declaratively. +**It comes preinstalled on The Sovran Pro*** + Every service is pre-wired: reverse proxy routing, database initialization, firewall rules, automated backups, and inter-service communication are handled out of the box. Moreover, you can activate the other custom packages; the system does the rest. --- @@ -143,7 +147,7 @@ Forward each port to the **private IP address** of your Sovran_SystemsOS machine ## Installation -### Full Guide +### Full Guide (A bit outdated as of now... will be working on a smoother DIY soon) 👉 [DIY Install Sovran_SystemsOS](https://git.sovransystems.com/Sovran_Systems/Sovran_SystemsOS/src/branch/main/DIY%20Install%20Sovran_SystemsOS.md) From 8d4031344ea5ed0d918e66b06fd6f87f0972948e Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Wed, 25 Mar 2026 15:30:47 -0500 Subject: [PATCH 661/667] updated readme --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index f210b21..59447fc 100755 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ ### The Officaly Repository of Sovran_SystemsOS and the Sovran Pro -**A declarative, self-hosted server and desktop operating system built on NixOS by [https://sovransytems.com](Sovran Systems)** +**A declarative, self-hosted server and desktop operating system built on NixOS by [Sovran Systems](https://sovransytems.com)** --- @@ -21,7 +21,7 @@ Sovran_SystemsOS is a fully integrated NixOS configuration that transforms a single machine into a personal cloud, communications hub, Bitcoin node, web server, and **daily-use desktop** — all managed declaratively. -**It comes preinstalled on The Sovran Pro*** +**It comes preinstalled on The Sovran Pro** Every service is pre-wired: reverse proxy routing, database initialization, firewall rules, automated backups, and inter-service communication are handled out of the box. Moreover, you can activate the other custom packages; the system does the rest. From d7c2e1f333ecac1055b08f482bc0abffeea16ae1 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Wed, 25 Mar 2026 15:31:37 -0500 Subject: [PATCH 662/667] typos readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 59447fc..7456bf4 100755 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ ### The Officaly Repository of Sovran_SystemsOS and the Sovran Pro -**A declarative, self-hosted server and desktop operating system built on NixOS by [Sovran Systems](https://sovransytems.com)** +**A declarative, self-hosted server and desktop operating system built on NixOS by [Sovran Systems](https://sovransystems.com)** --- From 0d94ef92200857ae3cc6e0ceb3ffe8b3cde41e83 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Wed, 25 Mar 2026 16:12:46 -0500 Subject: [PATCH 663/667] updated custom-add-on --- custom-add-ons.md | 33 ++++++++++++++++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) diff --git a/custom-add-ons.md b/custom-add-ons.md index 528bf31..3581d4a 100644 --- a/custom-add-ons.md +++ b/custom-add-ons.md @@ -26,8 +26,39 @@ https://github.com/element-hq/element-call https://gitlab.gnome.org/GNOME/gnome-remote-desktop -#### The code will be installed in the `custom.nix` file. +#### The code will be installed in the `custom.nix` file located at `/etc/nixos/custom.nix` from the initial setup. +If you would like to add in these features your self, then open the *terminal* app and type or paste in + +```bash +ssh root@localhost +``` +Type in the password in the diaolog box if necessary. It is the same password to run the Sovran_Systems_Updater app. + +Then press enter. + +Next, type or paste in +```bash +nano /etc/nixos/custom.nix +``` +Then press enter. + +Next type or paste the codes below *(Sovran_SystemsOS Features)* in to the termainl/nano window. + +Once done, press `ctr s` then `ctr x` to save and exit. + +Last, type or paste in +```bash +nixos-rebuild switch --impure +``` +Then press enter. + +After it is done bulding, reboot your Sovran Pro typeing or pasting in +```bash +reboot +``` + +--- 1. The code for Bitcoin Core is as follows: From fb4e6263e24c4a288f59fe2094d99dacd1b9de6e Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Wed, 25 Mar 2026 16:15:08 -0500 Subject: [PATCH 664/667] updated custom-add-on --- custom-add-ons.md | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/custom-add-ons.md b/custom-add-ons.md index 3581d4a..02998bb 100644 --- a/custom-add-ons.md +++ b/custom-add-ons.md @@ -26,9 +26,12 @@ https://github.com/element-hq/element-call https://gitlab.gnome.org/GNOME/gnome-remote-desktop + +--- + #### The code will be installed in the `custom.nix` file located at `/etc/nixos/custom.nix` from the initial setup. -If you would like to add in these features your self, then open the *terminal* app and type or paste in +If you would like to add in these features yourself, then open the *terminal* app and type or paste in ```bash ssh root@localhost @@ -43,7 +46,7 @@ nano /etc/nixos/custom.nix ``` Then press enter. -Next type or paste the codes below *(Sovran_SystemsOS Features)* in to the termainl/nano window. +Next type or paste the codes below *(Sovran_SystemsOS Features)* into the termainl/nano window. Once done, press `ctr s` then `ctr x` to save and exit. @@ -58,8 +61,11 @@ After it is done bulding, reboot your Sovran Pro typeing or pasting in reboot ``` + --- +#### Sovran_SystemsOS Feature Set + 1. The code for Bitcoin Core is as follows: ```nix From ba68eda41008241d115698aee54a448a22e773d7 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Wed, 25 Mar 2026 16:30:30 -0500 Subject: [PATCH 665/667] updated custom-add-on --- custom-add-ons.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/custom-add-ons.md b/custom-add-ons.md index 02998bb..e787955 100644 --- a/custom-add-ons.md +++ b/custom-add-ons.md @@ -64,40 +64,40 @@ reboot --- -#### Sovran_SystemsOS Feature Set +### Sovran_SystemsOS Feature Set (All Features are off by default) -1. The code for Bitcoin Core is as follows: +1. The code to enable Bitcoin Core is as follows: ```nix sovran_systemsOS.features.bitcoin-core = lib.mkForce true; ``` -2. The code for BIP-110 is as follows: +2. The code to enable BIP-110 is as follows: ```nix sovran_systemsOS.features.bip110 = lib.mkForce true; ``` -3. The code for Mempool is as follows: +3. The code to enable Mempool is as follows: ```nix sovran_systemsOS.features.mempool = lib.mkForce true; ``` -4. The code for Haven Relay is as follows: +4. The code to enable Haven Relay is as follows (also Haven will need a new domain to work): ```nix sovran_systemsOS.features.haven = lib.mkForce true; sovran_systemsOS.nostr_npub = "pasteyournpubhere"; ``` -5. The code for Element Calling is as follows: +5. The code to enable Element Calling is as follows (also Element Calling will need a new domain to work): ```nix sovran_systemsOS.features.element-calling = lib.mkForce true; ``` -6. The code for Gnome Remote Desktop is as follows: +6. The code to enable Gnome Remote Desktop is as follows: ```nix sovran_systemsOS.features.rdp = lib.mkForce true; From fb8654d03e64665025c57ac84fb4b315c646e6de Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Wed, 25 Mar 2026 16:35:29 -0500 Subject: [PATCH 666/667] updated custom-add-on --- custom-add-ons.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/custom-add-ons.md b/custom-add-ons.md index e787955..1c4f04e 100644 --- a/custom-add-ons.md +++ b/custom-add-ons.md @@ -1,6 +1,6 @@ -## Custom Add-ons for your Sovran Pro +## Custom Add-ons for Sovran_SystemsOS and The Sovran Pro -Add-ons are extra features you can have installed before your Sovran Pro is shipped to you or you can install them yourself. +Add-ons are extra features you can have enabled before your Sovran Pro is shipped to you or you can enable them yourself. 1. Since Sovran_SystemsOS runs Bitcoin Knots by default as opposed to Bitcion Core, you can customize your Sovran Pro's Bitcoin node to run Bitcoin Core. @@ -29,9 +29,9 @@ https://gitlab.gnome.org/GNOME/gnome-remote-desktop --- -#### The code will be installed in the `custom.nix` file located at `/etc/nixos/custom.nix` from the initial setup. +#### The code (Features) below will be put into the `custom.nix` file located at `/etc/nixos/custom.nix` from the initial setup. -If you would like to add in these features yourself, then open the *terminal* app and type or paste in +If you would like to enable these features yourself after you have recived your Sovran Pro, then open the *terminal* app and type or paste in ```bash ssh root@localhost From 86d5417731b5346e0465113da16a7b69eb0615ef Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Wed, 25 Mar 2026 16:53:43 -0500 Subject: [PATCH 667/667] updated custom-add-on --- custom-add-ons.md | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/custom-add-ons.md b/custom-add-ons.md index 1c4f04e..6ca6e27 100644 --- a/custom-add-ons.md +++ b/custom-add-ons.md @@ -1,6 +1,8 @@ ## Custom Add-ons for Sovran_SystemsOS and The Sovran Pro -Add-ons are extra features you can have enabled before your Sovran Pro is shipped to you or you can enable them yourself. +Add-ons are extra features you can have enabled before your Sovran Pro is shipped to you or you can enable them yourself. + +## The information about each Feature 1. Since Sovran_SystemsOS runs Bitcoin Knots by default as opposed to Bitcion Core, you can customize your Sovran Pro's Bitcoin node to run Bitcoin Core. @@ -29,9 +31,11 @@ https://gitlab.gnome.org/GNOME/gnome-remote-desktop --- -#### The code (Features) below will be put into the `custom.nix` file located at `/etc/nixos/custom.nix` from the initial setup. +## The DIY for each Feature -If you would like to enable these features yourself after you have recived your Sovran Pro, then open the *terminal* app and type or paste in +All code belongs in the `custom.nix` file located at `/etc/nixos/custom.nix`. + +If you would like to enable these features yourself after you have received your Sovran Pro, then open the *terminal* app and type or paste in ```bash ssh root@localhost @@ -46,7 +50,7 @@ nano /etc/nixos/custom.nix ``` Then press enter. -Next type or paste the codes below *(Sovran_SystemsOS Features)* into the termainl/nano window. +Next type or paste the codes below *(Code for each Feature)* each on their own line into the termainl/nano window right above the last `}` Once done, press `ctr s` then `ctr x` to save and exit. @@ -64,7 +68,7 @@ reboot --- -### Sovran_SystemsOS Feature Set (All Features are off by default) +## The code for each Feature (All Features are disabled by default) 1. The code to enable Bitcoin Core is as follows: