modules/graphical: update alacritty settings for NixOS 24.05

This reverts commit 5ab157f0d5.

CHANGELOG.md

@@ -1,112 +0,0 @@
-# Changelog
-
-## [v0.10.0](https://github.com/divnix/devos/tree/v0.10.0) (2021-05-24)
-
-**Implemented enhancements:**
-
-- Providing an interface to nixpkgs.config [\#237](https://github.com/divnix/devos/issues/237)
-- Making the user available in profiles [\#230](https://github.com/divnix/devos/issues/230)
-- copy evaluation store paths to iso [\#195](https://github.com/divnix/devos/issues/195)
-- Extract custom system builds from devosSystem out of lib [\#170](https://github.com/divnix/devos/issues/170)
-- Allow setting of channel host-wide [\#117](https://github.com/divnix/devos/issues/117)
-- alacritty: CSIu support [\#51](https://github.com/divnix/devos/issues/51)
-
-**Fixed bugs:**
-
-- Cachix timeouts + how to disable nrdxp cachix \(if needed\) [\#294](https://github.com/divnix/devos/issues/294)
-- default.nix flake-compat is broken [\#285](https://github.com/divnix/devos/issues/285)
-- All suites return "attribute missing" [\#282](https://github.com/divnix/devos/issues/282)
-- nix is built two times [\#203](https://github.com/divnix/devos/issues/203)
-- fix lib docs [\#166](https://github.com/divnix/devos/issues/166)
-
-**Closed issues:**
-
-- eliminate userFlakeNixOS [\#257](https://github.com/divnix/devos/issues/257)
-- devos-as-library [\#214](https://github.com/divnix/devos/issues/214)
-
-**Merged pull requests:**
-
-- Update evalArgs to match the new planned API [\#239](https://github.com/divnix/devos/pull/239)
-
-## [v0.9.0](https://github.com/divnix/devos/tree/v0.9.0) (2021-04-19)
-
-**Implemented enhancements:**
-
-- pin inputs into iso live registry [\#190](https://github.com/divnix/devos/issues/190)
-- Pass 'self' to lib [\#169](https://github.com/divnix/devos/issues/169)
-- doc: quickstart "ISO. What next?" [\#167](https://github.com/divnix/devos/issues/167)
-- Integrate Android AOSP putting mobile under control [\#149](https://github.com/divnix/devos/issues/149)
-- Inoculate host identity on first use [\#132](https://github.com/divnix/devos/issues/132)
-- kubenix support [\#130](https://github.com/divnix/devos/issues/130)
-- Improve Home Manager support: profiles/suites, modules, extern, flake outputs [\#119](https://github.com/divnix/devos/issues/119)
-- Local CA \(between hosts\) [\#104](https://github.com/divnix/devos/issues/104)
-- Q5: git annex for machine state [\#68](https://github.com/divnix/devos/issues/68)
-- name space ./pkgs overlays [\#60](https://github.com/divnix/devos/issues/60)
-- remap global keys easily [\#57](https://github.com/divnix/devos/issues/57)
-- make pass state part of this repo's structure [\#56](https://github.com/divnix/devos/issues/56)
-- Incorporate ./shells [\#38](https://github.com/divnix/devos/issues/38)
-- Encrypt with \(r\)age [\#37](https://github.com/divnix/devos/issues/37)
-
-**Fixed bugs:**
-
-- `pathsToImportedAttrs` does not accept directories [\#221](https://github.com/divnix/devos/issues/221)
-- Cachix caches aren't added to the configuration [\#208](https://github.com/divnix/devos/issues/208)
-- Issues with current changelog workflow [\#205](https://github.com/divnix/devos/issues/205)
-- iso: systemd service startup [\#194](https://github.com/divnix/devos/issues/194)
-- Help adding easy-hls-nix to devos [\#174](https://github.com/divnix/devos/issues/174)
-- `flk update` fails because of obsolete flag [\#159](https://github.com/divnix/devos/issues/159)
-- Expected that not all packages are exported? [\#151](https://github.com/divnix/devos/issues/151)
-- Segmentation fault when generating iso [\#150](https://github.com/divnix/devos/issues/150)
-
-**Documentation:**
-
-- doc: split iso [\#193](https://github.com/divnix/devos/issues/193)
-- lib: can depend on pkgs \(a la nixpkgs\#pkgs/pkgs-lib\) [\#147](https://github.com/divnix/devos/pull/147)
-
-**Closed issues:**
-
-- FRRouting router implementation [\#154](https://github.com/divnix/devos/issues/154)
-- ARM aarch64 Support [\#72](https://github.com/divnix/devos/issues/72)
-
-## [v0.8.0](https://github.com/divnix/devos/tree/v0.8.0) (2021-03-02)
-
-**Implemented enhancements:**
-
-- semi automatic update for /pkgs [\#118](https://github.com/divnix/devos/issues/118)
-- Home-manager external modules from flakes [\#106](https://github.com/divnix/devos/issues/106)
-
-**Fixed bugs:**
-
-- My emacsGcc overlay is not working [\#146](https://github.com/divnix/devos/issues/146)
-- local flake registry freezes branches [\#142](https://github.com/divnix/devos/issues/142)
-- nixos-option no longer works after collect garbage [\#138](https://github.com/divnix/devos/issues/138)
-- Profiles imports are brittle, causing failure if imported twice [\#136](https://github.com/divnix/devos/issues/136)
-
-## [0.7.0](https://github.com/divnix/devos/tree/0.7.0) (2021-02-20)
-
-**Implemented enhancements:**
-
-- add zoxide [\#53](https://github.com/divnix/devos/issues/53)
-- Multiarch support? [\#17](https://github.com/divnix/devos/issues/17)
-- initial multiArch support [\#18](https://github.com/divnix/devos/pull/18)
-
-**Fixed bugs:**
-
-- Missing shebang from flk.sh [\#131](https://github.com/divnix/devos/issues/131)
-- Rename Meta Issue [\#128](https://github.com/divnix/devos/issues/128)
-- specialisations break the `system` argument [\#46](https://github.com/divnix/devos/issues/46)
-- Revert "Add extraArgs to lib.nixosSystem call to add system args." [\#47](https://github.com/divnix/devos/pull/47)
-
-**Documentation:**
-
-- update home-manager urls [\#62](https://github.com/divnix/devos/pull/62)
-
-**Closed issues:**
-
-- add github action for cachix build ci [\#59](https://github.com/divnix/devos/issues/59)
-
-## [12052020](https://github.com/divnix/devos/tree/12052020) (2020-12-06)
-
-## [07092020](https://github.com/divnix/devos/tree/07092020) (2020-07-09)
-
-\* _This Changelog was automatically generated by [github_changelog_generator](https://github.com/github-changelog-generator/github-changelog-generator)_

CONTRIBUTING.md

@@ -1,33 +0,0 @@
-# Quick branch overview
-
-We work with several branches in this repo. This document aims to explain how
-to contribute changes to the existing branches.
-
-### `main` branch
-
-- Changes to `modules` and `profiles` should go [the main branch](https://git.pub.solar/pub-solar/os/src/branch/main)
-- Changes can get accepted via: Pull Request
-- Branch protected from direct `git push`
-
-### `infra` branch
-
-- Changes to the [pub.solar](https://pub.solar) infrastructure should be merged [into this branch](https://git.pub.solar/pub-solar/os/src/branch/infra)
-- Changes can get accepted via: Pull Request
-- Branch protected from direct `git push`
-
-### `momo/main` branch
-
-- Changes to the [Momo](https://momo.koeln) infrastructure should be merged [into this branch](https://git.pub.solar/pub-solar/os/src/branch/momo/main)
-- Changes can get accepted via: Pull Request
-- Deployment of changes is [automatic via CI pipeline](https://git.pub.solar/pub-solar/os/src/commit/43bd7421509f7cc9ba06d7c740f3f536a4a2af76/.drone.yml#L20-L38)
-- Branch protected from direct `git push`
-
-### `$USER` branches
-
-- User's custom hosts and changes can be worked on in these branches
-- Direct `git push` possible
-- Examples:
-  - [hensoko](https://git.pub.solar/pub-solar/os/src/branch/hensoko)
-  - [b12f](https://git.pub.solar/pub-solar/os/src/branch/b12f)
-  - [axeman](https://git.pub.solar/pub-solar/os/src/branch/axeman)
-  - [teutat3s](https://git.pub.solar/pub-solar/os/src/branch/teutat3s)

COPYING

@@ -1,18 +0,0 @@
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

LICENSE.md

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

default.nix

@@ -1,35 +0,0 @@
-let
-  inherit (default.inputs.nixos) lib;
-
-  default = (import ./lib/compat).defaultNix;
-
-  ciSystems = [
-    "aarch64-linux"
-    "x86_64-linux"
-  ];
-
-  filterSystems =
-    lib.filterAttrs
-    (system: _: lib.elem system ciSystems);
-
-  recurseIntoAttrsRecursive = lib.mapAttrs (
-    _: v:
-      if lib.isAttrs v
-      then recurseIntoAttrsRecursive (lib.recurseIntoAttrs v)
-      else v
-  );
-
-  systemOutputs =
-    lib.filterAttrs
-    (
-      name: set:
-        lib.isAttrs set
-        && lib.any
-        (system: set ? ${system} && name != "legacyPackages")
-        ciSystems
-    )
-    default.outputs;
-
-  ciDrvs = lib.mapAttrs (_: system: filterSystems system) systemOutputs;
-in
-  (recurseIntoAttrsRecursive ciDrvs) // {shell = import ./shell.nix;}

flake.lock

@@ -10,7 +10,7 @@
         ]
       },
       "locked": {
-        "lastModified": 1682101079,
+        "lastModified": 1680281360,
         "narHash": "sha256-MdAhtjrLKnk2uiqun1FWABbKpLH090oeqCSiWemtuck=",
         "owner": "ryantm",
         "repo": "agenix",
@@ -30,11 +30,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1696360011,
-        "narHash": "sha256-HpPv27qMuPou4acXcZ8Klm7Zt0Elv9dgDvSJaomWb9Y=",
+        "lastModified": 1699437533,
+        "narHash": "sha256-lMoPz9c89CpPVuJ95OFFesM9JagCF0soGbQatj3ZhqM=",
         "owner": "LnL7",
         "repo": "nix-darwin",
-        "rev": "8b6ea26d5d2e8359d06278364f41fbc4b903b28a",
+        "rev": "eb2b9b64238349bd351561e32e260cac15db6f9a",
         "type": "github"
       },
       "original": {
@@ -54,11 +54,11 @@
         "utils": "utils"
       },
       "locked": {
-        "lastModified": 1695052866,
-        "narHash": "sha256-agn7F9Oww4oU6nPiw+YiYI9Xb4vOOE73w8PAoBRP4AA=",
+        "lastModified": 1698921442,
+        "narHash": "sha256-7KmvhQ7FuXlT/wG4zjTssap6maVqeAMBdtel+VjClSM=",
         "owner": "serokell",
         "repo": "deploy-rs",
-        "rev": "e3f41832680801d0ee9e2ed33eb63af398b090e9",
+        "rev": "660180bbbeae7d60dad5a92b30858306945fd427",
         "type": "github"
       },
       "original": {
@@ -129,14 +129,30 @@
         "type": "github"
       }
     },
+    "factorio-pr": {
+      "locked": {
+        "lastModified": 1676729025,
+        "narHash": "sha256-342GXq1CGPbztLGJcSlbdRbglXlCWMYykeYg/d5Nvyk=",
+        "owner": "werner291",
+        "repo": "nixpkgs",
+        "rev": "e37b8db403154b3c421c6bc21afd725a5ad2df3e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "werner291",
+        "ref": "master",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "flake-compat": {
       "flake": false,
       "locked": {
-        "lastModified": 1673956053,
-        "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
+        "lastModified": 1696426674,
+        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
         "owner": "edolstra",
         "repo": "flake-compat",
-        "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
+        "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
         "type": "github"
       },
       "original": {
@@ -236,11 +252,11 @@
     },
     "latest": {
       "locked": {
-        "lastModified": 1696604326,
-        "narHash": "sha256-YXUNI0kLEcI5g8lqGMb0nh67fY9f2YoJsILafh6zlMo=",
+        "lastModified": 1699099776,
+        "narHash": "sha256-X09iKJ27mGsGambGfkKzqvw5esP1L/Rf8H3u3fCqIiU=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "87828a0e03d1418e848d3dd3f3014a632e4a4f64",
+        "rev": "85f1ba3e51676fa8cc604a3d863d729026a6b8eb",
         "type": "github"
       },
       "original": {
@@ -250,13 +266,33 @@
         "type": "github"
       }
     },
+    "musnix": {
+      "inputs": {
+        "nixpkgs": [
+          "nixos"
+        ]
+      },
+      "locked": {
+        "lastModified": 1679269409,
+        "narHash": "sha256-f52ph0rV/tn2Gge6WHqO55K/TNTHAOhgp23uZ7QhlSE=",
+        "owner": "musnix",
+        "repo": "musnix",
+        "rev": "79a6cf5a711e7d2dbf0a3ba0df9bae016d6247f8",
+        "type": "github"
+      },
+      "original": {
+        "owner": "musnix",
+        "repo": "musnix",
+        "type": "github"
+      }
+    },
     "nixos": {
       "locked": {
-        "lastModified": 1696697597,
-        "narHash": "sha256-q26Qv4DQ+h6IeozF2o1secyQG0jt2VUT3V0K58jr3pg=",
+        "lastModified": 1699291058,
+        "narHash": "sha256-5ggduoaAMPHUy4riL+OrlAZE14Kh7JWX4oLEs22ZqfU=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "5a237aecb57296f67276ac9ab296a41c23981f56",
+        "rev": "41de143fda10e33be0f47eab2bfe08a50f234267",
         "type": "github"
       },
       "original": {
@@ -268,11 +304,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1696614066,
-        "narHash": "sha256-nAyYhO7TCr1tikacP37O9FnGr2USOsVBD3IgvndUYjM=",
+        "lastModified": 1699159446,
+        "narHash": "sha256-cL63IjsbPl2otS7R4kdXbVOJOXYMpGw5KGZoWgdCuCM=",
         "owner": "nixos",
         "repo": "nixos-hardware",
-        "rev": "bb2db418b616fea536b1be7f6ee72fb45c11afe0",
+        "rev": "627bc9b88256379578885a7028c9e791c29fb581",
         "type": "github"
       },
       "original": {
@@ -281,6 +317,40 @@
         "type": "github"
       }
     },
+    "nixpkgs": {
+      "locked": {
+        "lastModified": 1654994491,
+        "narHash": "sha256-HFu3HTFFFcZSKImuiki3q+MLvcc85hRgYvW+sXmH8LE=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "1f8d88087a3753e55a29b5207f7f0997f7c813fa",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-22.05",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs-hensoko": {
+      "inputs": {
+        "nixpkgs": "nixpkgs"
+      },
+      "locked": {
+        "lastModified": 1666884246,
+        "narHash": "sha256-nSiYCIlMiYodY7GPCFPMF6YHVS2RM/XQZwn2Zrhu2eU=",
+        "ref": "master",
+        "rev": "f1863fb8e3866c1559ca885e1b319ea82baecdbb",
+        "revCount": 23,
+        "type": "git",
+        "url": "https://git.b12f.io/hensoko/nixpkgs"
+      },
+      "original": {
+        "type": "git",
+        "url": "https://git.b12f.io/hensoko/nixpkgs"
+      }
+    },
     "nixpkgs-unstable": {
       "locked": {
         "lastModified": 1672791794,
@@ -303,12 +373,15 @@
         "darwin": "darwin",
         "deploy": "deploy",
         "digga": "digga",
+        "factorio-pr": "factorio-pr",
         "flake-compat": "flake-compat",
         "fork": "fork",
         "home": "home",
         "latest": "latest",
+        "musnix": "musnix",
         "nixos": "nixos",
-        "nixos-hardware": "nixos-hardware"
+        "nixos-hardware": "nixos-hardware",
+        "nixpkgs-hensoko": "nixpkgs-hensoko"
       }
     },
     "utils": {

flake.nix

@@ -1,175 +1,125 @@
 {
-  description = "A highly structured configuration database.";
+  description = "pub.solar NixOS flake";
 
   nixConfig.extra-experimental-features = "nix-command flakes";
 
   inputs = {
     # Track channels with commits tested and built by hydra
-    nixos.url = "github:nixos/nixpkgs/nixos-23.05";
-    latest.url = "github:nixos/nixpkgs/nixos-unstable";
-
-    fork.url = "github:teutat3s/nixpkgs/nvfetcher-fix";
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-23.11";
+    unstable.url = "github:nixos/nixpkgs/nixos-unstable";
 
     flake-compat.url = "github:edolstra/flake-compat";
     flake-compat.flake = false;
 
-    digga.url = "github:pub-solar/digga/fix/bootstrap-iso";
-    digga.inputs.nixpkgs.follows = "nixos";
-    digga.inputs.nixlib.follows = "nixos";
-    digga.inputs.home-manager.follows = "home";
-    digga.inputs.deploy.follows = "deploy";
-    digga.inputs.darwin.follows = "darwin";
-    digga.inputs.flake-compat.follows = "flake-compat";
+    nix-darwin.url = "github:lnl7/nix-darwin/master";
+    nix-darwin.inputs.nixpkgs.follows = "nixpkgs";
 
-    home.url = "github:nix-community/home-manager/release-23.05";
-    home.inputs.nixpkgs.follows = "nixos";
+    home-manager.url = "github:nix-community/home-manager/release-23.11";
+    home-manager.inputs.nixpkgs.follows = "nixpkgs";
 
-    darwin.url = "github:LnL7/nix-darwin";
-    darwin.inputs.nixpkgs.follows = "nixos";
+    flake-parts.url = "github:hercules-ci/flake-parts";
+    nixos-flake.url = "github:srid/nixos-flake";
 
-    deploy.url = "github:serokell/deploy-rs";
-    deploy.inputs.nixpkgs.follows = "nixos";
-    deploy.inputs.flake-compat.follows = "flake-compat";
+    deploy-rs.url = "github:serokell/deploy-rs";
+    deploy-rs.inputs.nixpkgs.follows = "nixpkgs";
+    deploy-rs.inputs.flake-compat.follows = "flake-compat";
 
     agenix.url = "github:ryantm/agenix";
-    agenix.inputs.nixpkgs.follows = "nixos";
-    agenix.inputs.darwin.follows = "darwin";
+    agenix.inputs.nixpkgs.follows = "nixpkgs";
+    agenix.inputs.darwin.follows = "nix-darwin";
 
     nixos-hardware.url = "github:nixos/nixos-hardware";
+    master.url = "github:nixos/nixpkgs/master";
+
+    # hensoko additions
+    musnix.url = "github:musnix/musnix";
+    musnix.inputs.nixpkgs.follows = "nixpkgs";
+
+    nixmodules-hensoko.url = "git+ssh://gitea@git.pub.solar/hensoko/nix-modules.git?ref=main";
+    nixos-config.url = "git+ssh://gitea@git.pub.solar/hensoko/nixos-config.git?ref=feature/work-on-home-assistant";
   };
 
-  outputs = {
-    self,
-    digga,
-    nixos,
-    home,
-    nixos-hardware,
-    agenix,
-    deploy,
-    ...
-  } @ inputs:
-    digga.lib.mkFlake
-    {
-      inherit self inputs;
-
-      channelsConfig = {
-        # allowUnfree = true;
-      };
-
-      supportedSystems = ["x86_64-linux" "aarch64-linux" "aarch64-darwin"];
-
-      channels = {
-        nixos = {
-          imports = [(digga.lib.importOverlays ./overlays)];
-          overlays = [
-            (self: super: {
-              deploy-rs = {
-                inherit (inputs.nixos.legacyPackages.x86_64-linux) deploy-rs;
-                lib = inputs.deploy.lib.x86_64-linux;
-              };
-            })
-          ];
-        };
-        latest = {};
-        fork = {};
-      };
-
-      lib = import ./lib {lib = digga.lib // nixos.lib;};
-
-      sharedOverlays = [
-        (final: prev: {
-          __dontExport = true;
-          lib = prev.lib.extend (lfinal: lprev: {
-            our = self.lib;
-          });
-        })
-        agenix.overlays.default
-
-        (import ./pkgs)
+  outputs = inputs@{ self, ... }:
+    inputs.flake-parts.lib.mkFlake { inherit inputs; } {
+      systems = [
+        "x86_64-linux"
+        "aarch64-linux"
+        "x86_64-darwin"
+        "aarch64-darwin"
       ];
 
-      nixos = {
-        hostDefaults = {
-          system = "x86_64-linux";
-          channelName = "nixos";
-          imports = [(digga.lib.importExportableModules ./modules)];
-          modules = [
-            {lib.our = self.lib;}
-            # FIXME: upstream module causes a huge number of unnecessary
-            # dependencies to be pulled in for all systems -- many of them are
-            # graphical. should only be imported as needed.
-            # digga.nixosModules.bootstrapIso
-            digga.nixosModules.nixConfig
-            home.nixosModules.home-manager
-            agenix.nixosModules.age
+      imports = [
+        inputs.nixos-flake.flakeModule
+        ./lib
+        ./overlays
+        ./modules
+        ./hosts
+        ./users
+      ];
+
+      perSystem = args@{ system, pkgs, config, ... }: {
+        _module.args = {
+          inherit inputs;
+          pkgs = import inputs.nixpkgs {
+            inherit system;
+            overlays = [
+              inputs.agenix.overlays.default
+            ];
+          };
+
+          unstable = import inputs.unstable { inherit system; };
+          master = import inputs.master { inherit system; };
+        };
+
+        devShells.default = pkgs.mkShell {
+          buildInputs = with pkgs; [
+            deploy-rs
+            nixpkgs-fmt
+            agenix
+            cachix
+            editorconfig-checker
+            nix
+            nodePackages.prettier
+            nvfetcher
+            shellcheck
+            shfmt
+            treefmt
+            nixos-generators
           ];
         };
-
-        imports = [(digga.lib.importHosts ./hosts)];
-        hosts = {
-          # Set host-specific properties here
-          bootstrap = {
-            modules = [
-              digga.nixosModules.bootstrapIso
-            ];
-          };
-          PubSolarOS = {
-            tests = [
-              #(import ./tests/first-test.nix {
-              #  pkgs = nixos.legacyPackages.x86_64-linux;
-              #  lib = nixos.lib;
-              #})
-            ];
-          };
-        };
-        importables = rec {
-          profiles =
-            digga.lib.rakeLeaves ./profiles
-            // {
-              users = digga.lib.rakeLeaves ./users;
-            };
-          suites = with profiles; rec {
-            base = [users.pub-solar users.root];
-            iso = base ++ [base-user graphical pub-solar-iso];
-            pubsolaros = [full-install base-user users.root];
-            anonymous = [pubsolaros users.pub-solar];
-          };
-        };
       };
 
-      home = {
-        imports = [(digga.lib.importExportableModules ./users/modules)];
-        modules = [];
-        importables = rec {
-          profiles = digga.lib.rakeLeaves ./users/profiles;
-          suites = with profiles; rec {
-            base = [direnv git];
+      flake = {
+        deploy.nodes = self.pub-solar-os.lib.deploy.mkDeployNodes self.nixosConfigurations {
+          companion = {
+            sshUser = "iot";
+          };
+          cox = {
+            sshUser = "iot";
+          };
+          falcone = {
+            sshUser = "iot";
+          };
+          giggles = {
+            sshUser = "iot";
+          };
+          cube = {
+            sshUser = "iot";
+          };
+          chonk = {
+            sshUser = "iot";
+          };
+
+          norman = {};
+
+          harrison = {
+            sshUser = "iot";
+          };
+
+          surfplace = {
+            sshUser = "iot";
           };
         };
-        users = {
-          pub-solar = {suites, ...}: {
-            imports = suites.base;
-
-            home.stateVersion = "21.03";
-          };
-        }; # digga.lib.importers.rakeLeaves ./users/hm;
-      };
-
-      devshell = ./shell;
-
-      homeConfigurations = digga.lib.mkHomeConfigurations self.nixosConfigurations;
-
-      deploy.nodes = digga.lib.mkDeployNodes self.nixosConfigurations {
-        #example = {
-        #  hostname = "example.com:22";
-        #  sshUser = "bartender";
-        #  fastConnect = true;
-        #  profilesOrder = ["system" "direnv"];
-        #  profiles.direnv = {
-        #    user = "bartender";
-        #    path = self.pkgs.x86_64-linux.nixos.deploy-rs.lib.x86_64-linux.activate.home-manager self.homeConfigurationsPortable.x86_64-linux.bartender;
-        #  };
-        #};
       };
     };
 }

hosts/PubSolarOS.nix

@@ -1,21 +0,0 @@
-{suites, ...}: {
-  ### root password is empty by default ###
-  ### default password: pub-solar, optional: add your SSH keys
-  imports =
-    suites.iso;
-
-  boot.loader.systemd-boot.enable = true;
-  boot.loader.efi.canTouchEfiVariables = true;
-
-  networking.networkmanager.enable = true;
-
-  fileSystems."/" = {device = "/dev/disk/by-label/nixos";};
-
-  # This value determines the NixOS release from which the default
-  # settings for stateful data, like file locations and database versions
-  # on your system were taken. It‘s perfectly fine and recommended to leave
-  # this value at the release version of the first install of this system.
-  # Before changing this value read the documentation for this option
-  # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
-  system.stateVersion = "22.05"; # Did you read the comment?
-}

hosts/bootstrap.nix

@@ -1,54 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  profiles,
-  ...
-}:
-with lib; let
-  # Gets hostname of host to be bundled inside iso
-  # Copied from https://github.com/divnix/digga/blob/30ffa0b02272dc56c94fd3c7d8a5a0f07ca197bf/modules/bootstrap-iso.nix#L3-L11
-  getFqdn = config: let
-    net = config.networking;
-    fqdn =
-      if (net ? domain) && (net.domain != null)
-      then "${net.hostName}.${net.domain}"
-      else net.hostName;
-  in
-    fqdn;
-in {
-  # build with: `nix build ".#nixosConfigurations.bootstrap.config.system.build.isoImage"`
-  imports = [
-    # profiles.networking
-    profiles.users.root # make sure to configure ssh keys
-    profiles.users.pub-solar
-    profiles.base-user
-    profiles.graphical
-    profiles.pub-solar-iso
-  ];
-
-  config = {
-    boot.loader.systemd-boot.enable = true;
-
-    # will be overridden by the bootstrapIso instrumentation
-    fileSystems."/" = {device = "/dev/disk/by-label/nixos";};
-
-    system.nixos.label = "PubSolarOS-" + config.system.nixos.version;
-
-    # mkForce because a similar transformation gets double applied otherwise
-    # https://github.com/divnix/digga/blob/30ffa0b02272dc56c94fd3c7d8a5a0f07ca197bf/modules/bootstrap-iso.nix#L17
-    # https://github.com/NixOS/nixpkgs/blob/aecd4d8349b94f9bd5718c74a5b789f233f67326/nixos/modules/installer/cd-dvd/installation-cd-base.nix#L21-L22
-    isoImage = {
-      isoBaseName = mkForce (getFqdn config);
-      isoName = mkForce "${config.system.nixos.label}-${config.isoImage.isoBaseName}-${pkgs.stdenv.hostPlatform.system}.iso";
-    };
-
-    # This value determines the NixOS release from which the default
-    # settings for stateful data, like file locations and database versions
-    # on your system were taken. It‘s perfectly fine and recommended to leave
-    # this value at the release version of the first install of this system.
-    # Before changing this value read the documentation for this option
-    # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
-    system.stateVersion = "21.05"; # Did you read the comment?
-  };
-}

hosts/default.nix

@@ -0,0 +1,31 @@
+{ withSystem, self, inputs, ... }:
+
+let
+  mkNixosConfig = host: platform: user: {
+    "${host}" = self.nixos-flake.lib.mkLinuxSystem {
+      nixpkgs.hostPlatform = "${platform}";
+      networking.hostName = host;
+      imports = [
+        self.nixosModules.base
+        inputs.nixos-config.nixosHosts.${host}
+        self.nixosModules.${user}
+      ];
+    };
+  };
+in
+{
+  flake = {
+    nixosConfigurations = {} //
+      (mkNixosConfig "chonk" "x86_64-linux" "iot") //
+      (mkNixosConfig "companion" "aarch64-linux" "iot") //
+      (mkNixosConfig "cox" "aarch64-linux" "iot") //
+      (mkNixosConfig "cube" "x86_64-linux" "iot") //
+      (mkNixosConfig "falcone" "aarch64-linux" "iot") //
+      (mkNixosConfig "giggles" "aarch64-linux" "iot") //
+      (mkNixosConfig "harrison" "x86_64-linux" "hensoko") //
+      (mkNixosConfig "norman" "x86_64-linux" "hensoko") //
+      (mkNixosConfig "redpanda" "x86_64-linux" "hensoko") //
+      (mkNixosConfig "ringo" "x86_64-linux" "hensoko") //
+      (mkNixosConfig "surfplace" "x86_64-linux" "hensoko");
+    };
+}

lib/default.nix

@@ -1,10 +1,17 @@
-{lib}:
-lib.makeExtensible (self: let
-  callLibs = file: import file {lib = self;};
-in rec {
-  ## Define your own library functions here!
-  #id = x: x;
-  ## Or in files, containing functions that take {lib}
-  #foo = callLibs ./foo.nix;
-  ## In configs, they can be used under "lib.our"
-})
+{ lib, inputs, ... }:
+
+{
+  flake = {
+    pub-solar-os.lib = let
+      callLibs = file: import file {inherit lib;};
+    in rec {
+      ## Define your own library functions here!
+      #id = x: x;
+      ## Or in files, containing functions that take {lib}
+      #foo = callLibs ./foo.nix;
+      ## In configs, they can be used under "lib.our"
+
+      deploy = import ./deploy.nix { inherit inputs lib; };
+    };
+  };
+}

lib/deploy.nix

@@ -0,0 +1,74 @@
+/*
+* The contents of this file are adapted from digga
+* https://github.com/divnix/digga
+*
+* Licensed under the MIT license
+*/
+{
+  lib,
+  inputs,
+}: let
+  # https://github.com/serokell/deploy-rs#overall-usage
+  system = "x86_64-linux";
+  pkgs = import inputs.nixpkgs { inherit system; };
+  deployPkgs = import inputs.nixpkgs {
+    inherit system;
+    overlays = [
+      inputs.deploy-rs.overlay
+      (self: super: { deploy-rs = { inherit (pkgs) deploy-rs; lib = super.deploy-rs.lib; }; })
+    ];
+  };
+  getFqdn = c: let
+    net = c.config.networking;
+    fqdn =
+      if (net ? domain) && (net.domain != null)
+      then "${net.hostName}.${net.domain}"
+      else net.hostName;
+  in
+    fqdn;
+in {
+  mkDeployNodes = systemConfigurations: extraConfig:
+  /*
+   *
+   Synopsis: mkNodes _systemConfigurations_ _extraConfig_
+
+   Generate the `nodes` attribute expected by deploy-rs
+   where _systemConfigurations_ are `nodes`.
+
+   _systemConfigurations_ should take the form of a flake's
+   _nixosConfigurations_. Note that deploy-rs does not currently support
+   deploying to darwin hosts.
+
+   _extraConfig_, if specified, will be merged into each of the
+   nodes' configurations.
+
+   Example _systemConfigurations_ input:
+
+   ```
+   {
+   hostname-1 = {
+   fastConnection = true;
+   sshOpts = [ "-p" "25" ];
+   };
+   hostname-2 = {
+   sshOpts = [ "-p" "19999" ];
+   sshUser = "root";
+   };
+   }
+   ```
+   *
+   */
+    lib.recursiveUpdate
+    (lib.mapAttrs
+      (
+        _: c: {
+          hostname = getFqdn c;
+          profiles.system = {
+            user = "root";
+            path = deployPkgs.deploy-rs.lib.activate.nixos c;
+          };
+        }
+      )
+      systemConfigurations)
+    extraConfig;
+}

modules/arduino/default.nix

@@ -9,7 +9,10 @@ with lib; let
   cfg = config.pub-solar.devops;
 in {
   options.pub-solar.arduino = {
-    enable = mkEnableOption "Life with home automation";
+    enable = mkOption {
+      description = "Life with home automation";
+      default = false;
+    };
   };
   config = mkIf cfg.enable {
     users.users = pkgs.lib.setAttrByPath [psCfg.user.name] {

modules/ci-runner/default.nix

@@ -2,7 +2,7 @@
   lib,
   config,
   pkgs,
-  self,
+  flake,
   ...
 }:
 with lib; let
@@ -37,7 +37,7 @@ in {
     };
 
     age.secrets."drone-runner-exec-config" = {
-      file = "${self}/secrets/drone-runner-exec-config";
+      file = "${flake.self}/secrets/drone-runner-exec-config";
       mode = "700";
       owner = psCfg.user.name;
     };

modules/core/default.nix

@@ -12,7 +12,6 @@ in {
     ./fonts.nix
     ./i18n.nix
     ./networking.nix
-    ./nix.nix
     ./packages.nix
     ./services.nix
   ];

modules/core/fonts.nix

@@ -5,7 +5,7 @@
   ...
 }: {
   fonts = {
-    fonts = with pkgs; [powerline-fonts dejavu_fonts];
+    packages = with pkgs; [powerline-fonts dejavu_fonts];
     fontconfig.defaultFonts = {
       monospace = ["DejaVu Sans Mono for Powerline"];
       sansSerif = ["DejaVu Sans"];

modules/core/networking.nix

@@ -35,7 +35,7 @@ in {
 
     networking.networkmanager = {
       # Enable networkmanager. REMEMBER to add yourself to group in order to use nm related stuff.
-      enable = true;
+      enable = lib.mkDefault true;
       wifi.backend = "iwd";
     };
 

modules/crypto/default.nix

@@ -19,12 +19,17 @@ in {
 
     services.gnome.gnome-keyring.enable = true;
 
+    environment.shellInit = ''
+      gpg-connect-agent /bye
+      export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket)
+    '';
     home-manager = with pkgs;
       pkgs.lib.setAttrByPath ["users" psCfg.user.name] {
         systemd.user.services.polkit-gnome-authentication-agent = import ./polkit-gnome-authentication-agent.service.nix pkgs;
 
         services.gpg-agent = {
           enable = true;
+          enableSshSupport = true;
           pinentryFlavor = "gnome3";
           verbose = true;
         };
@@ -36,10 +41,7 @@ in {
         home.packages = [
           gnome.seahorse
           keepassxc
-          libsecret
-          qMasterPassword
-          restic
         ];
-      };
+    };
   };
 }

modules/default.nix

@@ -0,0 +1,75 @@
+{
+  self,
+  lib,
+  inputs,
+  ...
+}:
+
+let
+  mkNixosModule = name: [{ ${name} = import ./${name}; }];
+  mkBaseImport = name: [ self.nixosModules.${name} ];
+
+  # create a list of directory names from given folder
+  filterModules = dir: builtins.attrNames (lib.attrsets.filterAttrs (n: v: v == "directory") (builtins.readDir dir));
+
+  # create nixosModules imports from list
+  flakeNixosModulesList = modules: lib.attrsets.mergeAttrsList (builtins.concatMap mkNixosModule modules);
+  flakeNixosBaseImports = modules: lib.lists.flatten (builtins.concatMap mkBaseImport modules);
+in
+{
+  # Configuration common to all Linux systems
+  flake = {
+    nixosModules = rec {} //
+      (flakeNixosModulesList (filterModules ./.)) //
+      {
+        base.imports = [
+          self.nixosModules.home-manager
+          self.nixosModules.overlays
+          inputs.agenix.nixosModules.default
+          inputs.musnix.nixosModules.musnix
+          inputs.nixmodules-hensoko.nixosModules.all
+
+          ({
+            flake,
+            pkgs,
+            lib,
+            unstable,
+            master,
+            ...
+          }: {
+            nixpkgs.overlays = [
+              (prev: next: {
+                nixd = inputs.unstable.legacyPackages.${prev.system}.nixd;
+
+                # needed by sway module
+                waybar = inputs.master.legacyPackages.${prev.system}.waybar;
+
+
+                # unstable
+                appflowy = inputs.unstable.legacyPackages.${prev.system}.appflowy;
+                docker_24 = inputs.unstable.legacyPackages.${prev.system}.docker_24;
+                home-assistant = inputs.unstable.legacyPackages.${prev.system}.home-assistant;
+
+                scan2paperless = inputs.scan2paperless.legacyPackages.${prev.system}.scan2paperless;
+                paperless-ngx = inputs.unstable.legacyPackages.${prev.system}.paperless-ngx;
+
+                adlist = inputs.adblock-unbound.packages.${prev.system};
+              })
+
+              (prev: next: {
+                vimPlugins = next.vimPlugins // {
+                    inherit (inputs.master.legacyPackages.${prev.system}.vimPlugins) nvim-lspconfig;
+                };
+              })
+            ];
+
+            nix.nixPath = [
+              "nixpkgs=${inputs.nixpkgs}"
+              "nixos-config=${../lib/compat/nixos}"
+              "home-manager=${inputs.home-manager}"
+            ];
+          })
+        ] ++ (flakeNixosBaseImports (filterModules ./.));
+    };
+  };
+}

modules/docker-ci-runner/default.nix

@@ -2,7 +2,6 @@
   lib,
   config,
   pkgs,
-  self,
   ...
 }:
 with lib; let

modules/docker/default.nix

@@ -14,7 +14,8 @@ in {
 
   config = mkIf cfg.enable {
     virtualisation.docker.enable = true;
-    virtualisation.docker.package = pkgs.docker_24;
+    # unstable
+    #virtualisation.docker.package = pkgs.docker_24;
     users.users = with pkgs;
       pkgs.lib.setAttrByPath [psCfg.user.name] {
         extraGroups = ["docker"];

modules/graphical/alacritty.nix

@@ -30,9 +30,6 @@
     multiplier = 3;
   };
 
-  # When true, bold text is drawn using the bright variant of colors.
-  draw_bold_text_with_bright_colors = true;
-
   font = {
     # The normal (roman) font face to use.
     normal = {
@@ -68,7 +65,7 @@
     };
   };
 
-  key_bindings = [
+  keyboard.bindings = [
     {
       key = "V";
       mods = "Control|Alt";
@@ -168,6 +165,9 @@
       foreground = "0xe3e1e4";
     };
 
+    # When true, bold text is drawn using the bright variant of colors.
+    draw_bold_text_with_bright_colors = true;
+
     # Cursor colors
     #
     # Colors which should be used to draw the terminal cursor.

modules/graphical/default.nix

@@ -7,7 +7,7 @@
 with lib; let
   psCfg = config.pub-solar;
   cfg = config.pub-solar.graphical;
-  yamlFormat = pkgs.formats.yaml {};
+  tomlFormat = pkgs.formats.toml {};
   recursiveMerge = attrList: let
     f = attrPath:
       zipAttrsWith (
@@ -27,7 +27,7 @@ in {
     enable = mkEnableOption "Life in color";
     alacritty = {
       settings = mkOption {
-        type = yamlFormat.type;
+        type = tomlFormat.type;
         default = {};
       };
     };
@@ -80,8 +80,8 @@ in {
     # Enable GVfs, a userspace virtual filesystem
     services.gvfs.enable = true;
 
-    fonts.enableDefaultFonts = true;
-    fonts.fonts = with pkgs; [
+    fonts.enableDefaultPackages = true;
+    fonts.packages = with pkgs; [
       fira-code
       fira-code-symbols
       google-fonts
@@ -110,20 +110,11 @@ in {
           gnome.nautilus
           gnome.yelp
           hicolor-icon-theme
-
-          wine
-
           toggle-kbd-layout
-
-          wcwd
-
-          vlc
-
-          gimp
         ];
 
-        xdg.configFile."alacritty/alacritty.yml" = {
-          source = yamlFormat.generate "alacritty.yml" (recursiveMerge [(import ./alacritty.nix) cfg.alacritty.settings]);
+        xdg.configFile."alacritty/alacritty.toml" = {
+          source = tomlFormat.generate "alacritty.toml" (recursiveMerge [(import ./alacritty.nix) cfg.alacritty.settings]);
         };
 
         gtk = {

modules/nix-path.nix

@@ -1,11 +0,0 @@
-{
-  channel,
-  inputs,
-  ...
-}: {
-  nix.nixPath = [
-    "nixpkgs=${channel.input}"
-    "nixos-config=${../lib/compat/nixos}"
-    "home-manager=${inputs.home}"
-  ];
-}

modules/nix/default.nix

@@ -2,14 +2,15 @@
   config,
   pkgs,
   lib,
-  inputs,
+  flake,
   ...
 }: {
   nix = {
     # Use default version alias for nix package
     package = pkgs.nix;
-    gc.automatic = true;
+    gc.automatic = lib.mkDefault false;
     optimise.automatic = true;
+
     settings = {
       # Improve nix store disk usage
       auto-optimise-store = true;
@@ -20,6 +21,7 @@
       # Allow only group wheel to connect to the nix daemon
       allowed-users = ["@wheel"];
     };
+
     # Generally useful nix option defaults
     extraOptions = lib.mkForce ''
       experimental-features = flakes nix-command
@@ -28,5 +30,11 @@
       keep-derivations = true
       fallback = true
     '';
+
+    nixPath = [
+      "nixpkgs=${flake.inputs.nixpkgs}"
+      "nixos-config=${../../lib/compat/nixos}"
+      "home-manager=${flake.inputs.home-manager}"
+    ];
   };
 }

modules/paranoia/default.nix

@@ -26,8 +26,6 @@ in {
     # The options below are directly taken from or inspired by
     # https://xeiaso.net/blog/paranoid-nixos-2021-07-18
 
-    # Don't set this if you need sftp
-    services.openssh.allowSFTP = false;
     services.openssh.openFirewall = false; # Lock yourself out
 
     # Limit the use of sudo to the group wheel
@@ -40,7 +38,11 @@ in {
     # fileSystems."/".options = [ "noexec" ];
 
     services.openssh = {
-      kbdInteractiveAuthentication = false;
+      settings = {
+        # Don't set this if you need sftp
+        AllowSFTP = false;
+        KbdInteractiveAuthentication = false;
+      };
       extraConfig = ''
         AllowTcpForwarding yes
         X11Forwarding no

modules/printing/default.nix

@@ -13,6 +13,7 @@ in {
   };
 
   config = mkIf cfg.enable {
+    nixpkgs.config.allowUnfree = true;
     services.avahi.enable = true;
     services.avahi.nssmdns = true;
     services.avahi.publish.enable = true;

modules/social/default.nix

@@ -19,7 +19,7 @@ in {
           signal-desktop
           tdesktop
           element-desktop
-          irssi
+          mattermost-desktop
         ];
       };
   };

modules/sway/config/config.d/applications.conf

@@ -1,15 +1,17 @@
 # switch to workspace with urgent window automatically
 for_window [urgent=latest] focus
 
+assign [app_id="Element"] $ws7
+assign [app_id="Signal"] $ws7
+assign [app_id="telegramdesktop"] $ws7
+assign [app_id="rambox"] $ws7
+assign [class="Mattermost"] $ws7
+
 for_window [app_id="keepassxc"] floating disable
 assign [app_id="keepassxc"] $ws8
 
-for_window [app_id="virt-manager"] floating disable
-assign [app_id="virt-manager"] $ws9
-
-assign [instance="element"] $ws4
-assign [app_id="Signal"] $ws4
-assign [app_id="telegramdesktop"] $ws4
+assign [app_id=thunderbird title="^.+$"] $ws9
+for_window [app_id=thunderbird title="^$"] floating enable
 
 # Launcher
 for_window [app_id="launcher" title="Alacritty"] floating enable, border pixel 10, sticky enable

modules/sway/default.nix

@@ -82,8 +82,8 @@ in {
             sway-launcher
             record-screen
             import-gtk-settings
-            s
             wcwd
+            wdisplays
           ];
 
           programs.waybar.enable = true;

modules/terminal-life/bash/default.nix

@@ -1,7 +1,6 @@
 {
   config,
   pkgs,
-  self,
   ...
 }: let
   psCfg = config.pub-solar;
@@ -104,8 +103,6 @@ in {
     irssi = "irssi --config=$XDG_CONFIG_HOME/irssi/config --home=$XDG_DATA_HOME/irssi";
     drone = "DRONE_TOKEN=$(secret-tool lookup drone token) drone";
     no = "manix \"\" | grep '^# ' | sed 's/^# \(.*\) (.*/\1/;s/ (.*//;s/^# //' | fzf --preview=\"manix '{}'\" | xargs manix";
-    # fix nixos-option
-    nixos-option = "nixos-option -I nixpkgs=${self}/lib/compat";
     myip = "dig +short myip.opendns.com @208.67.222.222 2>&1";
     nnn = "nnn -d -e -H -r";
   };

modules/terminal-life/default.nix

@@ -2,7 +2,6 @@
   lib,
   config,
   pkgs,
-  self,
   ...
 }:
 with lib; let
@@ -28,25 +27,19 @@ in {
       screen
     ];
 
-    # Starship is a fast and featureful shell prompt
-    # starship.toml has sane defaults that can be changed there
-    programs.starship = {
-      enable = true;
-      settings = import ./starship.toml.nix;
-    };
-
     home-manager = with pkgs;
       pkgs.lib.setAttrByPath ["users" psCfg.user.name] {
         home.packages = [
+          blesh
+          exa
+          jump
+        ] ++ lib.optionals (!cfg.lite) [
           ack
           asciinema
           bat
-          blesh
-          exa
           fd
           gh
           glow
-          jump
           (nnn.overrideAttrs (o: {
             patches =
               (o.patches or [])
@@ -59,20 +52,25 @@ in {
           watson
         ];
 
+        programs.starship = {
+          enable = true;
+          settings = import ./starship.toml.nix;
+        };
+
         programs.bash = import ./bash {
           inherit config;
           inherit pkgs;
-          inherit self;
-        };
-        programs.fzf = import ./fzf {
-          inherit config;
-          inherit pkgs;
+          inherit lib;
         };
         programs.neovim = import ./nvim {
           inherit config;
           inherit pkgs;
           inherit lib;
         };
+        programs.fzf = import ./fzf {
+          inherit config;
+          inherit pkgs;
+        };
       };
   };
 }

modules/terminal-life/nvim/default.nix

@@ -10,7 +10,7 @@
 
   preview-file = pkgs.writeShellScriptBin "preview-file" (import ./preview-file.nix pkgs);
 in {
-  enable = true;
+  enable = lib.mkIf (!cfg.lite) true;
 
   viAlias = true;
   vimAlias = true;
@@ -20,8 +20,7 @@ in {
   withRuby = true;
   withPython3 = true;
 
-  extraPackages = with pkgs;
-    lib.mkIf (!cfg.lite) [
+  extraPackages = with pkgs; lib.mkIf (!cfg.lite) ([
       ansible-language-server
       ccls
       gopls
@@ -41,12 +40,15 @@ in {
       rust-analyzer
       solargraph
       terraform-ls
+      rnix-lsp
       universal-ctags
-    ];
+    ] ++ lib.optionals (!cfg.lite) [
+      gopls
+      python3Full
+    ]);
 
   plugins = with pkgs.vimPlugins;
-    []
-    ++ lib.optionals (!cfg.lite) [
+    [
       (pkgs.vimPlugins.nvim-treesitter.withPlugins (p: [
         p.ini
         p.json

modules/terminal-life/zsh/default.nix

@@ -0,0 +1,118 @@
+{
+  config,
+  pkgs,
+  self,
+  lib,
+  ...
+}: let
+  psCfg = config.pub-solar;
+  xdg = config.home-manager.users."${psCfg.user.name}".xdg;
+in {
+  enable = true;
+  enableAutosuggestions = true;
+  enableCompletion = true;
+  dotDir = ".config/zsh";
+
+  history = {
+    ignoreDups = true;
+    expireDuplicatesFirst = true;
+    ignoreSpace = true;
+    path = "$HOME/.local/share/zsh/zsh_history";
+    save = 10000;
+    size = 10000;
+  };
+
+  loginExtra = lib.mkIf psCfg.sway.enable ''
+    [ "$(tty)" = "/dev/tty1" ] && exec ${pkgs.sway-service}/bin/sway-service
+  '';
+
+  shellAliases = {
+    nano = "nvim";
+    vi = "nvim";
+    vim = "nvim";
+    mutt = "neomutt";
+    ls = "exa";
+    la = "exa --group-directories-first -lag";
+    fm = "vifm .";
+    vifm = "vifm .";
+    wget = "wget --hsts-file=$XDG_CACHE_HOME/wget-hsts";
+    irssi = "irssi --config=$XDG_CONFIG_HOME/irssi/config --home=$XDG_DATA_HOME/irssi";
+    drone = "DRONE_TOKEN=$(secret-tool lookup drone token) drone";
+    no = "manix \"\" | grep '^# ' | sed 's/^# \(.*\) (.*/\1/;s/ (.*//;s/^# //' | fzf --preview=\"manix '{}'\" | xargs manix";
+    # fix nixos-option
+    nixos-option = "nixos-option -I nixpkgs=${self}/lib/compat";
+    myip = "dig +short myip.opendns.com @208.67.222.222 2>&1";
+  };
+  plugins = [
+    # src gets fetched by nvfetcher, see: ./pkgs/sources.toml
+    {
+      # will source ohmyzsh/plugins/z/
+      name = "zsh-plugins-z";
+      file = "plugins/z/z.plugin.zsh";
+      src = pkgs.sources.ohmyzsh.src;
+    }
+    {
+      name = "zsh-powerlevel10k";
+      file = "powerlevel10k.zsh-theme";
+      src = pkgs.sources.powerlevel10k.src;
+    }
+    {
+      name = "zsh-fast-syntax-highlighting";
+      file = "F-Sy-H.plugin.zsh";
+      src = pkgs.sources.F-Sy-H.src;
+    }
+    {
+      name = "zsh-nix-shell";
+      file = "nix-shell.plugin.zsh";
+      src = pkgs.sources.zsh-nix-shell.src;
+    }
+  ];
+
+  initExtra =
+    ''
+      bindkey -v
+      bindkey -v 'jj' vi-cmd-mode
+      bindkey -a 'i' up-line
+      bindkey -a 'k' down-line
+      bindkey -a 'j' backward-char
+      bindkey -a 'h' vi-insert
+      bindkey '^[[H' beginning-of-line
+      bindkey '^[[F' end-of-line
+      bindkey '^R' history-incremental-pattern-search-backward
+      bindkey '^ ' autosuggest-accept
+      bindkey '^q' push-line-or-edit
+
+      bindkey '^R' fzf-history-widget
+
+      # ArrowUp/Down start searching history with current input
+      autoload -U up-line-or-beginning-search
+      autoload -U down-line-or-beginning-search
+      zle -N up-line-or-beginning-search
+      zle -N down-line-or-beginning-search
+      bindkey "^[[A" up-line-or-beginning-search
+      bindkey "^[[B" down-line-or-beginning-search
+      bindkey "^P" up-line-or-beginning-search
+      bindkey "^N" down-line-or-beginning-search
+
+      # MAKE CTRL+S WORK IN VIM
+      stty -ixon
+      stty erase '^?'
+
+      precmd () {
+        DIR_NAME=$(pwd | sed "s|^$HOME|~|g")
+        echo -e -n "\e]2;$DIR_NAME\e\\"
+      }
+
+      # If a command is not found, show me where it is
+      source ${pkgs.nix-index}/etc/profile.d/command-not-found.sh
+    ''
+    + builtins.readFile ./base16.zsh
+    + builtins.readFile ./p10k.zsh
+    + ''
+      source ${pkgs.fzf}/share/fzf/key-bindings.zsh
+      source ${pkgs.fzf}/share/fzf/completion.zsh
+      source ${pkgs.git-bug}/share/zsh/site-functions/git-bug
+      eval "$(direnv hook zsh)"
+    ''
+    + builtins.readFile ./fzf.zsh;
+}

modules/user/default.nix

@@ -1,12 +1,16 @@
 {
-  lib,
   config,
   pkgs,
+  lib,
   ...
 }:
 with lib; let
-  cfg = config.pub-solar;
-in {
+  psCfg = config.pub-solar;
+in
+with lib; {
+  imports = [
+    ./home.nix
+  ];
   options.pub-solar = {
     user = {
       name = mkOption {
@@ -44,6 +48,49 @@ in {
         type = types.nullOr types.str;
         default = null;
       };
+      latitude = mkOption {
+        description = "Latitude";
+        type = types.nullOr types.str;
+        default = null;
+      };
+      longitude = mkOption {
+        description = "Longitude";
+        type = types.nullOr types.str;
+        default = null;
+      };
+    };
+  };
+
+  config = {
+    users = {
+      mutableUsers = false;
+
+      users = with pkgs;
+        pkgs.lib.setAttrByPath [psCfg.user.name] {
+          # Indicates whether this is an account for a “real” user.
+          # This automatically sets group to users, createHome to true,
+          # home to /home/username, useDefaultShell to true, and isSystemUser to false.
+          isNormalUser = true;
+          description = psCfg.user.description;
+          extraGroups = [
+            "input"
+            "lp"
+            "networkmanager"
+            "scanner"
+            "video"
+            "dialout"
+            "wheel"
+          ];
+          shell = pkgs.bash;
+          initialHashedPassword =
+            if psCfg.user.password != null
+            then psCfg.user.password
+            else "";
+          openssh.authorizedKeys.keys =
+            if psCfg.user.publicKeys != null
+            then psCfg.user.publicKeys
+            else [];
+        };
     };
   };
 }

modules/user/home.nix

@@ -20,6 +20,7 @@ in {
     # paths it should manage.
     home.username = psCfg.user.name;
     home.homeDirectory = "/home/${psCfg.user.name}";
+    home.stateVersion = "22.11";
 
     home.packages = with pkgs; [];
 

modules/user/session-variables.nix

@@ -29,7 +29,7 @@
     VISUAL = "/etc/profiles/per-user/${psCfg.user.name}/bin/nvim";
 
     # fix "xdg-open fork-bomb" your preferred browser from here
-    BROWSER = "${pkgs.firefox-wayland}/bin/firefox";
+    BROWSER = "firefox";
 
     # node
     NODE_REPL_HISTORY = "${xdg.dataHome}/node_repl_history";

modules/virtualisation/default.nix

@@ -24,6 +24,8 @@ in {
       "iommu=pt"
     ];
 
+    virtualisation.spiceUSBRedirection.enable = true;
+
     virtualisation.libvirtd = {
       enable = true;
       qemu.ovmf.enable = true;

overlays/blesh.nix

@@ -1,32 +0,0 @@
-final: prev: {
-  blesh = prev.blesh.overrideAttrs (oldAttrs: rec {
-    inherit (prev.sources.blesh-nvfetcher) version src;
-
-    dontBuild = false;
-    buildInputs = [prev.git];
-    patchPhase = ''
-      substituteInPlace GNUmakefile \
-        --replace "git submodule update --init --recursive" ""
-    '';
-    nativeCheckInputs = oldAttrs.nativeCheckInputs ++ [prev.busybox];
-
-    installPhase = ''
-      runHook preInstall
-
-      mkdir -p "$out/share/blesh/lib"
-
-      cat <<EOF >"$out/share/blesh/lib/_package.sh"
-      _ble_base_package_type=nix
-
-      function ble/base/package:nix/update {
-        echo "Ble.sh is installed by Nix. You can update it there." >&2
-        return 1
-      }
-      EOF
-
-      make install INSDIR=$out/share/blesh
-
-      runHook postInstall
-    '';
-  });
-}

overlays/default.nix

@@ -0,0 +1,34 @@
+{
+  self,
+  lib,
+  inputs,
+  ...
+}: {
+  flake = {
+    nixosModules = rec {
+      overlays = ({ ... }: {
+        nixpkgs.overlays = [
+
+          (final: prev:
+          let
+            unstable = import inputs.unstable {
+              system = prev.system;
+              #config.allowUnfreePredicate = pkg: builtins.elem (prev.lib.getName pkg) [
+              #  "1password-cli"
+              #  "1password"
+              #  "slack"
+              #];
+            };
+          in
+          {
+            #slack = unstable.slack;
+            #vimPlugins = prev.vimPlugins // {inherit (unstable.vimPlugins) nvim-lspconfig;};
+          })
+          (import ../pkgs)
+          (import ./neovim-plugins.nix)
+          (import ./nix-index.nix)
+        ];
+      });
+    };
+  };
+}

overlays/overrides.nix

@@ -1,30 +0,0 @@
-channels: final: prev: {
-  __dontExport = true; # overrides clutter up actual creations
-
-  inherit
-    (channels.latest)
-    nixd
-    docker_24
-    ;
-
-  inherit
-    (channels.fork)
-    nvfetcher
-    ;
-
-  haskellPackages =
-    prev.haskellPackages.override
-    (old: {
-      overrides = prev.lib.composeExtensions (old.overrides or (_: _: {})) (hfinal: hprev: let
-        version = prev.lib.replaceChars ["."] [""] prev.ghc.version;
-      in {
-        # same for haskell packages, matching ghc versions
-        inherit
-          (channels.latest.haskell.packages."ghc${version}")
-          haskell-language-server
-          ;
-      });
-    });
-
-  vimPlugins = prev.vimPlugins // {inherit (channels.latest.vimPlugins) nvim-lspconfig;};
-}

pkgs/_sources/generated.nix

@@ -1,114 +1,128 @@
 # This file was generated by nvfetcher, please do not modify it manually.
-{ fetchgit, fetchurl, fetchFromGitHub, dockerTools }:
+{ fetchgit, fetchurl, fetchFromGitHub }:
 {
   blesh-nvfetcher = {
     pname = "blesh-nvfetcher";
-    version = "9d84b424daf31b192891c06275fff316fa5ddd35";
+    version = "4089c4e1cb411121472180189953664b978d8972";
     src = fetchFromGitHub {
       owner = "akinomyoga";
       repo = "ble.sh";
-      rev = "9d84b424daf31b192891c06275fff316fa5ddd35";
+      rev = "4089c4e1cb411121472180189953664b978d8972";
       fetchSubmodules = true;
       deepClone = false;
       leaveDotGit = true;
-      sha256 = "sha256-7aX5UtDB9pUHHeOi9n+qWsM2KGenHVL6O18vG9W8tmQ=";
+      sha256 = "sha256-ZLkiBm3vsRe42crLffM9Z8F5yzKvNRV2/AqK9RkuU+8=";
     };
-    date = "2023-10-02";
+    date = "2023-07-18";
   };
   instant-nvim-nvfetcher = {
     pname = "instant-nvim-nvfetcher";
     version = "294b6d08143b3db8f9db7f606829270149e1a786";
-    src = fetchFromGitHub {
+    src = fetchFromGitHub ({
       owner = "jbyuki";
       repo = "instant.nvim";
       rev = "294b6d08143b3db8f9db7f606829270149e1a786";
       fetchSubmodules = false;
       sha256 = "sha256-DXJWji/NR8ZCxe014rD51v3EHJHMhRQeOoI3SsY8mR4=";
-    };
-    date = "2022-06-25";
+    });
   };
   manix = {
     pname = "manix";
     version = "d08e7ca185445b929f097f8bfb1243a8ef3e10e4";
-    src = fetchFromGitHub {
+    src = fetchFromGitHub ({
       owner = "mlvzk";
       repo = "manix";
       rev = "d08e7ca185445b929f097f8bfb1243a8ef3e10e4";
       fetchSubmodules = false;
       sha256 = "sha256-GqPuYscLhkR5E2HnSFV4R48hCWvtM3C++3zlJhiK/aw=";
-    };
-    date = "2021-04-20";
+    });
+  };
+  ohmyzsh = {
+    pname = "ohmyzsh";
+    version = "4181e8a2cc936bc7b7a89d674bf261023159ed35";
+    src = fetchFromGitHub ({
+      owner = "ohmyzsh";
+      repo = "ohmyzsh";
+      rev = "4181e8a2cc936bc7b7a89d674bf261023159ed35";
+      fetchSubmodules = false;
+      sha256 = "sha256-kne/2ErEqUqBx1xzQrvk6scrhOZYJDlUnNOlx0MbqNQ=";
+    });
+  };
+  powerlevel10k = {
+    pname = "powerlevel10k";
+    version = "35165798a83e2e4f2f0aa6c820e2f7fba23e0179";
+    src = fetchFromGitHub ({
+      owner = "romkatv";
+      repo = "powerlevel10k";
+      rev = "35165798a83e2e4f2f0aa6c820e2f7fba23e0179";
+      fetchSubmodules = false;
+      sha256 = "sha256-tThgRiE0iZH84yTSGtNxfFemLocbg71McAKyT7YWG8U=";
+    });
   };
   rnix-lsp-nvfetcher = {
     pname = "rnix-lsp-nvfetcher";
     version = "95d40673fe43642e2e1144341e86d0036abd95d9";
-    src = fetchFromGitHub {
+    src = fetchFromGitHub ({
       owner = "nix-community";
       repo = "rnix-lsp";
       rev = "95d40673fe43642e2e1144341e86d0036abd95d9";
       fetchSubmodules = false;
       sha256 = "sha256-F0s0m62S5bHNVWNHLZD6SeHiLrsDx98VQbRjDyIu+qQ=";
-    };
-    date = "2022-11-27";
+    });
   };
   vim-apprentice-nvfetcher = {
     pname = "vim-apprentice-nvfetcher";
-    version = "59ad13661fa15edaf72c62218903c7817b5a3691";
-    src = fetchFromGitHub {
+    version = "9942d0bb0a5d82f7a24450b00051c1f2cc008659";
+    src = fetchFromGitHub ({
       owner = "romainl";
       repo = "Apprentice";
-      rev = "59ad13661fa15edaf72c62218903c7817b5a3691";
+      rev = "9942d0bb0a5d82f7a24450b00051c1f2cc008659";
       fetchSubmodules = false;
-      sha256 = "sha256-03B9tmU9+6t2hxhOgZxBqJr9r41CAqhHLUkHYvFdcks=";
-    };
-    date = "2023-02-15";
+      sha256 = "sha256-Xs+vTdnihNbBFPOKsW+NB40pqN9eaadqzc0DIeNoOFo=";
+    });
   };
   vim-beautify-nvfetcher = {
     pname = "vim-beautify-nvfetcher";
     version = "e0691483927dc5a0c051433602397419f9628623";
-    src = fetchFromGitHub {
+    src = fetchFromGitHub ({
       owner = "zeekay";
       repo = "vim-beautify";
       rev = "e0691483927dc5a0c051433602397419f9628623";
       fetchSubmodules = false;
       sha256 = "sha256-QPTCl6KaGcAjTS5yVDov9yxmv0fDaFoPLMsrtVIG6GQ=";
-    };
-    date = "2018-12-27";
+    });
   };
   vim-caddyfile-nvfetcher = {
     pname = "vim-caddyfile-nvfetcher";
     version = "24fe0720551883e407cb70ae1d7c03f162d1d5a0";
-    src = fetchFromGitHub {
+    src = fetchFromGitHub ({
       owner = "isobit";
       repo = "vim-caddyfile";
       rev = "24fe0720551883e407cb70ae1d7c03f162d1d5a0";
       fetchSubmodules = false;
       sha256 = "sha256-rRYv3vnt31g7hNTxttTD6BWdv5JJ+ko3rPNyDUEOZ9o=";
-    };
-    date = "2022-05-09";
+    });
   };
   vim-workspace-nvfetcher = {
     pname = "vim-workspace-nvfetcher";
-    version = "c0d1e4332a378f58bfdf363b4957168fa78e79b4";
-    src = fetchFromGitHub {
+    version = "c26b473f9b073f24bacecd38477f44c5cd1f5a62";
+    src = fetchFromGitHub ({
       owner = "thaerkh";
       repo = "vim-workspace";
-      rev = "c0d1e4332a378f58bfdf363b4957168fa78e79b4";
+      rev = "c26b473f9b073f24bacecd38477f44c5cd1f5a62";
       fetchSubmodules = false;
-      sha256 = "sha256-2Brx098dk5THiieBiW71FG9mUUwS1CSY9mpOPWA/Tq4=";
-    };
-    date = "2023-05-28";
+      sha256 = "sha256-XV7opLyfkHIDO0+JJaO/x0za0gsHuklrzapTGdLHJmI=";
+    });
   };
   vimagit-nvfetcher = {
     pname = "vimagit-nvfetcher";
     version = "308650ddc1e9a94e49fae0ea04bbc1c45f23d4c4";
-    src = fetchFromGitHub {
+    src = fetchFromGitHub ({
       owner = "jreybert";
       repo = "vimagit";
       rev = "308650ddc1e9a94e49fae0ea04bbc1c45f23d4c4";
       fetchSubmodules = false;
       sha256 = "sha256-fhazQQqyFaO0fdoeNI9nBshwTDhKNHH262H/QThtuO0=";
-    };
-    date = "2022-07-03";
+    });
   };
 }

pkgs/concourse.nix

@@ -0,0 +1,21 @@
+self:
+with self;
+  stdenv.mkDerivation rec {
+    pname = "concourse";
+    version = "7.10.0";
+    buildInputs = [
+    ];
+
+    src = fetchTarball {
+      inherit version;
+      url = "https://github.com/concourse/concourse/releases/download/v${version}/concourse-${version}-linux-amd64.tgz";
+      sha256 = "";
+    };
+
+    phases = ["installPhase"];
+
+    installPhase = ''
+      mkdir -p $out/bin/
+      cp concourse/bin/* $out/bin/
+    '';
+  }

pkgs/default.nix

@@ -3,6 +3,7 @@ with final; {
   # keep sources this first
   sources = prev.callPackage (import ./_sources/generated.nix) {};
   # then, call packages with `final.callPackage`
+  concourse = import ./concourse.nix final;
   import-gtk-settings = writeShellScriptBin "import-gtk-settings" (import ./import-gtk-settings.nix final);
   lgcl = writeShellScriptBin "lgcl" (import ./lgcl.nix final);
   mailto-mutt = writeShellScriptBin "mailto-mutt" (import ./mailto-mutt.nix final);

pkgs/sources.toml

@@ -31,8 +31,6 @@ fetch.github = "zeekay/vim-beautify"
 src.git = "https://github.com/romainl/Apprentice"
 fetch.github = "romainl/Apprentice"
 
-[blesh-nvfetcher]
-src.git = "https://github.com/akinomyoga/ble.sh"
-fetch.github = "akinomyoga/ble.sh"
-git.fetchSubmodules = true
-git.leaveDotGit = true
+[waybar-nvfetcher]
+src.git = "https://github.com/Alexays/Waybar"
+fetch.github = "Alexays/Waybar"

profiles/audio/default.nix

@@ -1,11 +0,0 @@
-{
-  self,
-  config,
-  lib,
-  pkgs,
-  ...
-}: let
-  inherit (lib) fileContents;
-in {
-  pub-solar.audio.enable = true;
-}

profiles/base-user/default.nix

@@ -1,41 +0,0 @@
-{
-  config,
-  pkgs,
-  lib,
-  ...
-}: let
-  psCfg = config.pub-solar;
-in {
-  imports = [
-    ./home.nix
-  ];
-
-  users = {
-    mutableUsers = false;
-
-    users = with pkgs;
-      pkgs.lib.setAttrByPath [psCfg.user.name] {
-        # Indicates whether this is an account for a “real” user.
-        # This automatically sets group to users, createHome to true,
-        # home to /home/username, useDefaultShell to true, and isSystemUser to false.
-        isNormalUser = true;
-        description = psCfg.user.description;
-        extraGroups = [
-          "input"
-          "lp"
-          "networkmanager"
-          "scanner"
-          "video"
-          "wheel"
-        ];
-        initialHashedPassword =
-          if psCfg.user.password != null
-          then psCfg.user.password
-          else "";
-        openssh.authorizedKeys.keys =
-          if psCfg.user.publicKeys != null
-          then psCfg.user.publicKeys
-          else [];
-      };
-  };
-}

profiles/full-install/default.nix

@@ -1,18 +0,0 @@
-{
-  self,
-  config,
-  lib,
-  pkgs,
-  ...
-}: let
-  inherit (lib) fileContents;
-in {
-  config = {
-    pub-solar.audio.mopidy.enable = true;
-    pub-solar.audio.bluetooth.enable = true;
-    pub-solar.docker.enable = true;
-    pub-solar.nextcloud.enable = true;
-    pub-solar.office.enable = true;
-    # pub-solar.printing.enable = true; # this is enabled automatically if office is enabled
-  };
-}

profiles/gaming/default.nix

@@ -1,12 +0,0 @@
-{
-  self,
-  config,
-  lib,
-  pkgs,
-  ...
-}: let
-  inherit (lib) fileContents;
-in {
-  pub-solar.gaming.enable = true;
-  pub-solar.docker.enable = true;
-}

profiles/graphical/default.nix

@@ -1,12 +0,0 @@
-{
-  self,
-  config,
-  lib,
-  pkgs,
-  ...
-}: let
-  inherit (lib) fileContents;
-in {
-  pub-solar.graphical.enable = true;
-  pub-solar.sway.enable = true;
-}

profiles/pub-solar-iso/default.nix

@@ -1,15 +0,0 @@
-{
-  self,
-  config,
-  lib,
-  pkgs,
-  ...
-}: let
-  inherit (lib) fileContents;
-in {
-  config = {
-    pub-solar.graphical.wayland.software-renderer.enable = true;
-    pub-solar.sway.terminal = "foot";
-    pub-solar.core.iso-options.enable = true;
-  };
-}

profiles/social/default.nix

@@ -1,11 +0,0 @@
-{
-  self,
-  config,
-  lib,
-  pkgs,
-  ...
-}: let
-  inherit (lib) fileContents;
-in {
-  pub-solar.social.enable = true;
-}

secrets/chonk_authelia_jwt_secret.age

@@ -0,0 +1,15 @@
+age-encryption.org/v1
+-> ssh-ed25519 hPyiJw Apw//H4a37XD/Ahc2H6sMgJoM0VQ8RWyNIq56yEm+no
+BNUgGmTl9JIbreob+8AbQA5wxpdW7WygDI92niy1jgQ
+-> ssh-ed25519 YFSOsg ASLv+TOx0DWmbNXSS3HUKS5puniN1w0FMrmMun4/2Xs
+W+/rf6VjlutzLfEFuukc12k9Gz2qMtO1dM16NIWyCUw
+-> ssh-ed25519 iHV63A gOWG5xpmZkOsbJwtA/LizsKTCPBlaYgUhzv6dS3GikU
+Jc8nEl5qGWwqQbucqy2AY1DWEwj7605OlTgtgqSOe2g
+-> ssh-ed25519 Oya/Zw JiLOj7SedW6XSY+XFrXf6Q4A0BCQ34Kjdara9LongzI
+mjxxUFLYHnTFtCWLVZpiHDDTSBR/uhz9hB4d741mahc
+-> @wmC-grease l~lJ rW HpVY S|
+6KfyYCevSvxvlGf4Ts/hB1JS5V2lG077PrgoVBlx5sLjeCRr2KF5dThtRfoeVTZV
+BGJ5
+--- R2Kjwn9GDi6oTDWE5SvGnPz/0RNHRwm6FuSB166gbTk
+lŒJU3ª´Ì{©«É XgG¬z<C2AC>ùó-È’°T®Ó^LX-7U%Ï7H>"44ºå]¦„>Œ?i<>
+³Æ¹2/¡Ð¦

secrets/chonk_authelia_storage_encryption_key.age

@@ -0,0 +1,15 @@
+age-encryption.org/v1
+-> ssh-ed25519 hPyiJw BKaJOaemFofcTtYVUXTMApzwEd42LdRA2vRmXCKpxwQ
+QXOGSdJoJEbtUK+G+TFY5AKCo1TgWuy2qnRu6zbymJQ
+-> ssh-ed25519 YFSOsg UJcVYMY7iS5QlW6nfdLnK5a7wAdpygYtZhPBiuwx8FQ
+Ubhix1fkykeOD6U0ytKSMHdsjbmY0Mtc07zBLFl9uvE
+-> ssh-ed25519 iHV63A d2+m6Ryo5TkgJ1uNvoIZk9qHUQWkGJ1Dv5SX21inQUw
+/JP9RcaA+Hu3UsHhhZuF2mBOTpcCG5Mfa98mNxWmD1s
+-> ssh-ed25519 Oya/Zw 5DsVfU4lP7BhBRc4AAhHdc1flHULF9AQgH0i7mv00h4
+Ba7poebUMFXd8Jl8rHWqivxDC6aQhhZy7/14ynRHk6U
+-> &qpx-grease v}*
+NRFo9WSsLJZjKaA/hGI88QQjJxBX8enh99hsF8lgZPO4Cd8x1qsWhseO2vBHBHGa
+
+--- Xjb/GVPQNCC9+3X3rue8nBToJipoEJb4O/ixjpOrBsg
+ä&ñ(Ã;
9™6ÒQ"1w#¡nøº[×GX.
+î!;µù=­4‹+Yà¬×ÄRSnq<6E>]‚ŽÕãz#ÉFòCàÃ

secrets/chonk_authelia_users.age

@@ -0,0 +1,14 @@
+age-encryption.org/v1
+-> ssh-ed25519 hPyiJw seAHnMdOhbSvm2EmyY6rf9i0rfApCHTAKHVnpGSNvzI
+PzY8+xJCIemo42mUFgt/0Zep7tiNpgwOyb8fAJVKB/s
+-> ssh-ed25519 YFSOsg doaGH3q9/oHUfXjnuhY5zg+h0eWdw1qDP8XntmVy2Ac
+4eEvBcoWIqJJWC2fy5lQv+dCpFnbVtBBdzLg5Ftjf6A
+-> ssh-ed25519 iHV63A LNjKmQl/+9sZgv1a60+L3peU7LMSufmIOeZqaHDVji8
+Gzvb3Bd8EAHqDDxc8cruTKHE0+uyek4UP8UH2QbnedA
+-> ssh-ed25519 Oya/Zw NzA3tUU554imIollIvRKhphlrbq4y9x6Q4EVQEes8ls
+qpY+Vb6EKmhh45SdJsDlWlIDzWKSj1P5yrme4pmn63A
+-> R"^mQ-grease
+Q/i8Ht0+HG1Ekuy9kpjLmRXWEBDUtBX3ldS6+ME
+--- vz5tu+PqfzucpQXuSTZoIE1b9NodOPsBqh8VSDzW0to
+@¸z¼å¹ûfJ}_ïì¢MÍÅ£ž!Sôè’
Õüøäõš€‰*wR[å-µ±*üyŠÒØçʾ† Õ’Bȉ
+­^
1vÆ€W=¯§‚O‹FµFY
å_LLF<5c5cýot£„À5\lÇOclbál¾¡àî3ñšˆ{1\ãT§¤è*ÆCÃŽ<C383>R¹z<™x<E284A2>‡©’\ˆÚ<CB86>4M™ÝÇ׳ev7îBÍ'vÒt°-ý­¿Zš“•_ŸY{A³¡—<C2A1>øé›ðu‚éÐŒô¾&ïU£~ì±3Lq(w‰Îø:<3A>SŽ!ŦÔûÿ±ÇÚà<03>Y	1º…[;60Ö.:ù·]*óüæ!

secrets/chonk_garage_rpc_secret.age

@@ -0,0 +1,13 @@
+age-encryption.org/v1
+-> ssh-ed25519 hPyiJw Ip6mcFDyrPdGZiXZp8J7bDruJSvTIElf8ligYZ70YG4
+Hc4GfqP7pPaodrM7fmjNWI/eD8fa2FoS1VbhmTxOYjw
+-> ssh-ed25519 YFSOsg XakKNGSkB1fsaWZvqblI9fmsTXofW5T29yrcvuWclBc
+NksfMfA2D6GgfSoTQoj7BRXhf+sqLKVxFWljWg72XiQ
+-> ssh-ed25519 iHV63A axHU3NCfQrxbQKlpL0D1uUCZ9ovKNnABYwzl2MPqhlw
+AKVkfejM49H+kD7ZPB6gUOyhA4OeGgovFo9tvt1x4hc
+-> ssh-ed25519 Oya/Zw U8OGXSvciVRupv1h5z/OjJbVQYMdQKW5H18S0U0rFhw
+y2C5ZesGsbhx/KJhf/Km+x26yL7FJFl/dRPos3a6arU
+-> cZ"-grease r2$$~# V=
+v8RbfnzpQyQVco6u2TW/ijXnk9CWUrs4nPCi
+--- dXdYdEVGow044KgF/hW+D8oPRrct/87hsntZQI+J4es
+ö3ZzIAƒ<41>Il‡w¾6änuh«_—ÿ§–+;<3B>r«³ê®:˜äidD1ó‚þÏö<C38F>2«<32>©ÄLÛýã–<C3A3>Y–î¤àÜÎ~Aš
ðLê»ø…”Çžƒ˜íTê<54>Ê

secrets/chonk_invidious_db_password.age

@@ -0,0 +1,13 @@
+age-encryption.org/v1
+-> ssh-ed25519 hPyiJw BzbEPs8LDz17/aVKQoDoRaTdQmKw8MKb4oqKvBFGuAM
+/zMIU+KoMrQ6ouI4vK/YyvEtzZ7ut8c9BJH8YTYldac
+-> ssh-ed25519 YFSOsg CUwGu/W2wYrVNLHlGETFtsVhchDZUXfEi9JYZ88VkBU
+ZD3lYlRTgk2g/L5Hy+Fcs1fLh3gKDdhRhWn0Gc4JP/A
+-> ssh-ed25519 iHV63A mZ2DkCasSr/s3S6RXjf8QLi5P4UXOzQqqPNkLUkh4VU
+E/eXCLd9cZt+i9Bg7iEh8LbWFn0rsTtzqDB9kaFtVUg
+-> ssh-ed25519 Oya/Zw kD7aVVY0BrrNbDyoHa/7/8bUF8W74mYFPgHe/CVMpxg
+jytr3knsUz9aaGf421m6mN9QgU4Tt3UykTEt8T8mNVg
+-> p'c-grease J
+vWgF1GduUf9hstTzuVdrUC6ytMofGgYE8nglE/mUTa+a69SDKrn/
+--- kKHfCTImeN1RY9HxI2fWeJTec47FBwwr2gQB13sYdrw
+Jýéø) Ù:
†Ó½–бèW—¡"~»cgRÔ _ù¥@­wD‰‹Ì+ûjÁ'D¤Í3ÐýaS‘j2U¶&-5ÁÐÑ

secrets/chonk_invoiceplane_db_password.age

@@ -0,0 +1,23 @@
+age-encryption.org/v1
+-> ssh-ed25519 hPyiJw yDJ66eI1Mp9+UoFYkd4ur3aaUBAALqveNM5FK1cpSx0
+r7eXodJ94kzvLq2oRIk7aPZtArJ1xm37FShQwr1BBSA
+-> ssh-ed25519 YFSOsg Sef4VkHt4bMmPsUPJLXOB7nOgPO0pDcV+6MHvBItOG8
+MDyOFqyzDJ6MMxkgFqkxYQl25a7cXOn9iCu2sbONhBs
+-> ssh-rsa 42S2Dw
+Y3yN6FJOz5eDG7gRDLZJiujOaGJ/fm5lPNHvSVl7T5DYmiHedJ5F7on6CztMDuvv
+LNrWXTO7Jy/LBPLZ516SG+o752sTfby1xpDAgo0pKejSs/o7XmccMDvwzdVAsPkt
+Dk7ou4Fba0D9MnIeIwnhZolKxVPyFeUBfoPNkvDLtQeb48lqJ2N+bgVzjHQEKpL5
+1Hx/v4x9jUKTj/cK7eds5j3tzitLNpaxkm20LcVpWlLLGZkAmYijwXPphaY0EXJY
+qw0Z1OSJd6WnLUo0ozGtoYGiqxnP42duL31ajI7HiNfMMJqWER7WJaB2h4pA9eTO
+1HCHP/C+rNCeWHtjXr8b0Q
+-> ssh-ed25519 iHV63A cpEqVauWzNmXoGgNcdV438BLDyWh+pQBCXVOEg98x1o
+fFmcIWj3kv3ZdhFTMjaxxYIw0/9rO+HKTnTq3pbSz58
+-> ssh-ed25519 uTVbSg NODGHdge8Dp8fz1wvBRXJF+syIdZmvX/AL3I2u+tkwE
+foU59bLRz6NOvaZZA/bYU/eQ97/z+ONINGVB30yk6vI
+-> ssh-ed25519 Oya/Zw huI2DM77Xa7yPaUg0hnLZmsXOLvgOJALO+ixfmpfwF0
+vOcIEA+mfsferBNqnM/XdaoDDtDS+fJu4gPHMHuIenc
+-> l-grease T= 30lLW1F G
+dHaeEO9LZVIC+26ZVLfGP0thkSDKwwqzM9OdH4Yj2ixuSxdGHKg8eYUmkc4aUmr4
+Qa3y5GzKf8nQkfSJceG8/FsQrcm1OvjhePi99yE
+--- DugQPlVCIYj1uGYP1Bta+9P7HdN9Ej4di5AjQWK0CKg
+éÿ	õÑ4QW„ó Y»<59>í­œµóϹ.^æ°Ÿ(tÆÒ3w="пy4/‹3xÙàÀŠQáŒÆÏ•Q
…"X:R-å
U­˜å
£)«œ

secrets/chonk_nextcloud_admin_pass.age

@@ -0,0 +1,23 @@
+age-encryption.org/v1
+-> ssh-ed25519 hPyiJw Zv5YkeU/1DPR0tuZ+dkI76xF473aFaLltqfO5ZfvFy0
+xoWSTmpQSc84tskFAv2XfKkD2gzunCH6XSttO5dVCQM
+-> ssh-ed25519 YFSOsg datPvOnMKeP6zH7ThhAeK9k0uyKIulbgY5CAoAsu+w0
+0YjqwWWpkYHqT7XEAfPKynQFgjRHfdg1eNVECEJeXMA
+-> ssh-rsa 42S2Dw
+Waw5Z5JSx5ZpSrqptOjFDlXPiZIFY+YeT5vZBwvSY4eRNIOsvALR+53zKuDkIHEl
+TZ1CsgOU1DLuONSS0mP0Oa+eQImVR4NuDaxvfLNqTiLKwYEeBs6DwSL77xwMLtw/
+wQL1MWMIcFTtExA/ul3rX3Y4B1TS7t50nvhgohFu5WTeNtXkIdgmbJ3CyflhqamN
+L/Kxxn+/92scpIItKu5kgPJEO2MpX2GiwjokD6uY+3kxbS1HGXUJAc3COOwWMgEs
+1BwQk/SKt8URcxGiugoagQ6M0zFqZRgGNkqh2uCsjaaT5we0lUuhYlL1gIMbe/FG
+CR85WlwoEhzKvnnfgdYLFA
+-> ssh-ed25519 iHV63A OqkSBucVJtboalsYV3/heEz1ZkSIADNDLEarRPWgklc
+76HOz0Vi1oGwSZCBA3bOSNn7auAnmPE7uHVedVjxGTM
+-> ssh-ed25519 uTVbSg +X8ylXfSx+Yg14KORdcPSTr1FvDaTMeb62MjQ/gqA2k
+r7M9BL070ijThnFLczko29G5P0ikwRW+6VJ8JYhHevs
+-> ssh-ed25519 Oya/Zw wXPvHIhPEqbKPme+OLfrJdxIVAghA0LGTGWwOr2yoys
+FsriMbp2jb40ZyxapHratwoA/C7dk8nNhvaFU0YAfpM
+-> =HAZ-grease 6e?x*"~
+y4DPqeGgLo+PJv/Nja0AMPZ2g31nIqbXwKt3g1I8xHu4rwkM9G/c
+--- O3v2CaEy4phy18h9152SkVV6qQhdz/aWJQ9bVI9YHHY
+<EFBFBD>$邀孻f
@
#}▂&rゲy砲𡟻3癦ロ<E799A6>鏴U蒀𧡰s唚<73>f鱣[缸N利紊T#h
+b<EFBFBD>鵜攤𪊓iR
衁<>犟e!z<>

secrets/chonk_nextcloud_db_pass.age

@@ -0,0 +1,22 @@
+age-encryption.org/v1
+-> ssh-ed25519 hPyiJw 7kU8OQWy/jGDRUq1hkGl9cNldEgWvk4oG3O2DMw0qGI
+XlIzPLT0Gh2/bse6ch4TemO+uzIK4oqyFwDDa7ylXuA
+-> ssh-ed25519 YFSOsg dWvGDRO+/3dT7qN04Ykuh4u4aVZSkNAZQl2bbCE0jkg
+5QxL1xUjv1OHCJR/+rxw055lIKngtDvarTg7wOaiqu4
+-> ssh-rsa 42S2Dw
+V9Zo+91MGptezt9ZGX7aGd4sGsoFmBV9k4gbImTXz2CGOXuHUbzFv73j/ikpvXU6
+NpCU8nYgBuM8E3GTxrorCFIlBgGpjQI28PrbD7Y8b7nqn585Zqn7S+E5DFln0Zd5
+phKfY4NdWypRW4xjuHVjDO8I2uiVd8qD7rhYbE6c611hySudPmrY7k2m41Qz7D2O
+j97ATtt2FNFk5MpsNjSKk0w5QeKIVqDTIXTlewRi4eFf3TdLI5vzpBwIELStf/XU
+sBmEzqX3EEBvrB41brSPPwQJ7mJ7MaRzjNXmtgytEwirgnI9TA2dv4/xc5zksJgF
+zg1F+rlyRC2TOWDNi8Om5g
+-> ssh-ed25519 iHV63A IVXUYIxX37FZw+Vn7ZmLc14du4M6120vS+XAY+amx3Q
+G9J8NhNx3bwLF1vCWuq1fWQq9//r1IxoXPdJfjg5oQQ
+-> ssh-ed25519 uTVbSg v7e3YZQJqK0SZ/F/YSrMPOX8hwAt1+UNf+1YDlzkMSI
+1kqIoiR7Oojue2JFHYJB7+piw1j/9U86Thy+eYqphPQ
+-> ssh-ed25519 Oya/Zw /EUf0yv0UBi0wPFEl48IK7dJ7m2Z+Y+6EpYqoP75Kx8
+dDDQ+dZhrujnyo2Z40cwisFMpwC+4TsaBTGH7ofn8qU
+-> Gg'26s6y-grease 8c
+X06Ld3joZpAZby/RIFlRb9gqVT4grrQXQInV/g
+--- FVcdFxUlZ7vydcDrU7jzFjipxKygYL8t/aDHNC/TN7w
++øgOAóìiœ‹§nùûW<C3BB>¹÷¿xŠT“¾UÍ3ü¯"Âxo<78>`“?Õáf<C3A1>:¡iÚMrúÒ̓¦m™

secrets/chonk_restic_repository_password.age

@@ -0,0 +1,23 @@
+age-encryption.org/v1
+-> ssh-ed25519 hPyiJw x2nB3+kHq5bhYL4Gmu7mcLx8jW8ywUEEkInvVkmH5m8
+cMDnbfUtv4AUTlsBh39xeVFyn8jndfd/XxPU01Re1FU
+-> ssh-ed25519 YFSOsg rSr6F981RuhKipasm4xcFTqORbkyCxiId/UvtBy8SW0
+763z8aYG61IYtSfaKBUuQfe7s6SsfujvQF8qx+ALqVY
+-> ssh-rsa 42S2Dw
+M78y3Q2hLhSGwWe+sVixdgdkL/NPRp3yVdmsLSJ7dkU/JlIikTJ1Idzp2WR9VbZ9
+PyIrBLSVmYlx5SI9ksLfeQZyFoocP7/yKOAdHh7HMvXjpkakN6ZBa4dHELPxLMy0
+x7DQX09Q1h6xTfyghYoIyk29sOHHpT66WaTAPz/cHciJst2TAojJU1qfdJ/ZPU0T
+9tq/iOaAhGSdFkFVjhETDwS1lYxKnzxYaMKQeoRBcCdWTVGrbSJLVUMH4pFT1iIv
+I8auITrGbSZdm1tJAc8aiBIDI1r5lHz1ozrkamazI9dn+5iF5qWIj+9MVtg0l06X
+In7knX1skVcG2x2USjdZgw
+-> ssh-ed25519 iHV63A SP+EEU7gJi6o2xnzlsJO2RBplyNWjIMrOYOWweBtKQU
+Q/9+4yyRRndmPKjx8up5lijZhICDamxrBAUZtbzteB0
+-> ssh-ed25519 uTVbSg v4RUldxeE2I7Sw1ASpkfcBLiv9b8yJMUOmeydaqa4hk
+OreiiziBBpTCKM/D/4eI181AvRD9mwjTUULGeatKUgo
+-> ssh-ed25519 Oya/Zw 51sjyVTCtYbG4e4pROOjg7Cr4lX8LGXdGtf+8drR9y8
+Hc6H9PPDJGAmwgO/qOjbt2W2KNXEGlqlbcExmsZQNAE
+-> <O-grease lr/]6 OsFzy7 E@<zV R
+LhERj36DtC7MwfGTT1Z85I42SCUnJMdl6oToreQSERKbBa5SpTuUo5baqRqM7MdW
+JQjLt5MZ0dna
+--- SUtdBUH80GU2DjGWmvigOpbRWYkki1VdZi8NkMXFTcE
+ê|9µ¼µ÷´a<C2B4>ÒÒUÒšÀˆšÄã>õ–÷9<C3B7>.Q¨ÈßÑÞ¢©¨zD6È‘‚Af„-Ååz“SSÝf¥t<C2A5>“Íc\Ón’.ÿhÿN[``çõ

secrets/chonk_wireguard_key.age

@@ -0,0 +1,21 @@
+age-encryption.org/v1
+-> ssh-ed25519 hPyiJw YN25mqloDpfTK9BHraZeaX4wlMNyGmuaB9ikhc1qPx0
+MBblsaQ14v/aUrt9BT7Sdef5t7zLXujlNBbKOoKRNvQ
+-> ssh-ed25519 YFSOsg GPhY1N8XFr0vxYcho63L/tF1QFuE6vlxGpf+fEUaDn0
+jCVovM/dwU839i3Ry7hjvdJcAKcjAshZE00zfxmSc/c
+-> ssh-rsa 42S2Dw
+khLfcbecRWa0gNw1vCfP8FIbYll+uNrGEysaPHzEtk6hYzOrPw5BOct9PGG32M63
+USRC5onMkkZXH3RJjAze+JOaNIQML3l5Wx6LNfAiKE7MBtrbEFw9WpPb3yA3vBtF
+/h/ngNIjMTryltOq4ovXTDif6bC2CBcBi4zfThqGaBmIk+hqZHAPZIEaQAH5i6JM
+Sic+Y0VTUbNDsz9qvE6RFfs4plGAoRG1RDFBTwdYhReXf/7/ISSQE1sm0r8rY7wk
+rFp3AGyQQaAJqa2RlA4LeI9z+0okmXrA9e4Q0VezQPN65Ru2qGFKUGg6dgA0czmM
+3rIX9HbzV9vlgmjtXhf6Aw
+-> ssh-ed25519 iHV63A CJ6pAaBDuZtsVnBHYvlbhwkTSQmHLVNksADDRW1j/A4
+/Vww88tZwVUWwWg8gqdXhKI5vVggGUxgbgeMUkqQagI
+-> ssh-ed25519 Oya/Zw ExTtW9P8FWD9s0o3GBycwN16McaP0LVbJuD9cLUejgs
+G2BJ8FGHPSqB8/ks5hrGKVDQ0GcaEcS3CK3b7AzB7mI
+-> C-grease \T$\ Fn4_2KJ E 2Ju.&t'
+jBuy2c0fpq3ibHy3LJOj6xmga+6C9z2WwvSTBTs/lyEXDNgFG9sgEDmjPayMJhAN
+JTHQmBJyJ9ae2dMZqhfEPXrcZynNR/F8gd8TyWodXWZhvw
+--- FH53Gij4AICM76S4DTZkI1BwEVohhnw/Qnanc4BphE4
+ňŠÐߌÜB7#pB†pþ¡§¡X˜O7ê_c^Í<>6Àû<C380>IÜÞͪƹEìoâ·Ï¸¤/Þ<>ÛM˜µÚ<>JÉ(;ÖÅìU‡ä 6

secrets/cube_invoiceplane_db_password.age

@@ -0,0 +1,20 @@
+age-encryption.org/v1
+-> ssh-ed25519 hPyiJw YnfnbbrYnmZj+Sp7IzNko2UN++D+5RPRKUO4s9BJYm0
+250etp+3Xk98f3p464gytQzuOUZtmb0wp2weOOr3TKs
+-> ssh-ed25519 YFSOsg Ugqj12V4oVALYruVs2gAvdmX7FPj8bXhw6rADRIQCTA
+HL2RU0FMjuVUnNr0NjFYya19D77biMTjY0NUNXw+X5k
+-> ssh-rsa 42S2Dw
+C0Kwv29evJTIMvtQJt7t3qBaFC6kKd2KXLiQt9PLdotVirMilNxTBAahgPPf5+Wh
+vpykEhQdnPGRITlxRLHQARVtwr0sERTi3KSdU5w2FSoAbMx7MoMpct/OvT32UTI5
+atUpIbZRKiVaCNvgdMBYYuHzbndaZ1xiuUkm+TH+VPcvzGpIHew7V86T/R86O3Gy
+UK0eeT7bgKCLzV9B/A0MMnzQ2+bw3ArXwwivxhWWDO9nIAyF6aOxdZr+X3rl2p/6
+IYf0AoEV/miqKm7yuxDExFkrJ1fRrZ1nq+lHPneURb/1rXJFfgZ2FQ+knDtokfp6
+fDBLGXXB7NSXkKAv7VLpXg
+-> ssh-ed25519 iHV63A z0GdyHGN7aJwL9oYkcUY3Qw/BMJ5W5D8i+tU6W7Haw4
+nSCKSMvJDvkGQfxaAnskwKEk6a7XKjbaB/Bkyq1X/c8
+-> ssh-ed25519 uTVbSg 2Ho8KrV3xfNtwN+TepeS52aQZaqn8R9RpbZXTv7Tpjo
+kUX//t2VYMPdGwSa3Xx/wgI2mcPvksBb85BE869K7V4
+-> mk!&q*4-grease PdOI 5~Z: NZD
+ItuRMmjRrLT8EiY4zEmCW3uC9x3/5Ol4mzwmFXe0wT0
+--- /gVjl7gfaIAgikOCRKcz6BMaFTNFi8n2OM3DrWn1qkQ
+*½W^äeYó-¿Š¹2v•"¤]òÐ0UÕñ3 çñvo@c@%<25>Ó{I('Ê9(¿À´t³Qyò¶©ó²ô>BŒò“Yžî+II˜í5¯†D

secrets/cube_nextcloud_admin_pass.age

@@ -0,0 +1,20 @@
+age-encryption.org/v1
+-> ssh-ed25519 hPyiJw Lb3cUJx1ruB5F2snfYFnLyoefqBcW4DTokzXRXCeDEU
+DrdiYlMciVJv4E7g3OC4oKSP4GUJGpSSD8OdtRI5Ie8
+-> ssh-ed25519 YFSOsg TRLTf+SzNp6crC1/J2UPMjTkv1AC31BgC9tq/yReSHM
+qoxXTpcTkIKFe4saj5L93IGW9VAh+g3S+JB+YGiyQPk
+-> ssh-rsa 42S2Dw
+m+3/ZseNUvXVKrlBwDyaYl8iPIw8jpiqwzyVfxov9gCOTxBOgysgtaxrxt/afDbl
+baoPurJd3X3ybBIweLF5yA/7/hdVinm8mf5Lx6/CLeex3z/2mk0Q4HgL2Hr4Og0I
+vyto/IlcUuELNEUSAR3yN2tioPr0UO4cQZ2BLS+33PHy1KVmkQkdFfKJnZ5rsZR+
+idjxpgP1dCBrWQFX+xlpuBSQaQh1Myt1zOgFMxnn1TkfVlycVGZ+9n8WemJhwLsL
+W8wME3yVXGst6+eBVJCC4TJn8C8HMM74y8UWn+cs3nEBLOxroNoiyzRxfxNKTjKT
+z58U883ysiE1Ek+YUDifaQ
+-> ssh-ed25519 iHV63A R3oijyljfqkwjOaYxvr9URPGoYkGp9UBAiD02Jkfnmk
+Lp0TRJKQnmzqZQVZWOgKZ8lW4c6IIbzb1i3l2rMu0wY
+-> ssh-ed25519 uTVbSg ie3Tms/F40dyce0h78X7Rz5UOL7OZTiCikZHFkx08C4
+bE7/mDTbbYdZrblfeRBzPIUbIP+xk7Sbnhe6hr1QKjI
+-> 11ptM-grease 3G5&ES {rbC;\ hvt^Bbt
+H/uWAA3ZxrIp6DJdpq+GKvzPyUiFZJeZiZYhd0FjfHynYcCDAZX7sSg
+--- qcN8XPWUDeupoo9UwYA0/1xtcwODav/m5jfD10pwk+E
+|õˆÛï–nëv?cg/4yp2j Í4'D[]˜$ô¾Çrô†V*ß³;ÁF<ät¥ßaO4Ècœ¹"8"ÁÓ³yL¦låò"Ê€ëu[oT

secrets/cube_nextcloud_db_pass.age

@@ -0,0 +1,20 @@
+age-encryption.org/v1
+-> ssh-ed25519 hPyiJw MVw8LNthB8QmaZkImEqh0WEJbMOpHbyxJDMSy2EHPg8
+SCMM/6XKd/vxgdax905gBlmJoLSy4gzXye90qolLbvA
+-> ssh-ed25519 YFSOsg 9PWhN9+Fu6271HD1xxf05y8R0tvkNJh2YPQDFwql1UI
+lEde6zjTg3JlxmJDL1YPY6qJcvnweN9yShOFtqSi68M
+-> ssh-rsa 42S2Dw
+rJFYtgtLCfDKxJ+/be9SQyqH9djIcHtTv5Xz539ip02V8if8GytrN/1BjB5MuKEz
+UwyQevUmd0ulXD9C5Tq+S+6XQDxb/ZvYBmVLb7X5vMDyLejSM2G8Fm3GBgoVNSby
+29O3TYBxiYQZ2LIteHjG2a02AS70EY4A9uBCqewIL14aSkpsV3NQszZOIaz8IkiA
+i+dfzSqUvinru05px902axtlCbPBzLe7OYsDrMnY+tX9QAofRRyoC+iTzJ/m3llO
+7PiqyBULHFkmO61+HLuswYa0JZmdK01BgRwStQWUF/qvmyKmGodQMrZQeH1xhzaQ
+GjAGfFdh4qqyjOnroiubWg
+-> ssh-ed25519 iHV63A 41ScxFCeSMjWHjDJUSj67ds1z9ZNPBzEAmEYN4731Do
+Z0492PapySyaR55QieONJ5shfEYZ18BXDxJjbg1YDpc
+-> ssh-ed25519 uTVbSg MAMpK9Taay/HTdwetp+KulK2H5l/2VHUagmAp6J4Yxk
+HVIj+fQz4Do3igFV0Io608pAhJYiKbkPBzGGfCDdZBA
+-> T(Zcs<^-grease
+aWEKrfAoGHq1M6KlBEMTHkyoN3eyQ7Q
+--- jYM2HW6lhvyad0W7tly1RQ5CTzaqoxhyUZXAwky7lmc
+oãp§îwvËÉœN^ŸŽIµ+rû3%³<14>ä˜ê‹±ES„²ì0Ê4ðJ—a<¡{gú£	Û

secrets/cube_restic_nextcloud_password.age

@@ -0,0 +1,22 @@
+age-encryption.org/v1
+-> ssh-ed25519 hPyiJw zqUMfOd04sohMIlfrNdHj9XJPh+1AiZDSG82rALFEn0
+AjULNhyeKzMJYzas/Ck5te047CGGkoTGWrl4Zf+fK/g
+-> ssh-ed25519 YFSOsg Wf12fsV6ddeCYGrJG/IEc/pm3qltWroW9+xgUvBNhBg
+FB6dw6npV16JNMcmhLOh2CrV+Ytxym1Q3X6fi8mXPh4
+-> ssh-rsa 42S2Dw
+QSORqDFOuGhFBNjCjF1u43tfgAp9okVheVWdY851j4b3JAtX8nsygwEpx0ntNZIk
+pYIH7/QreainFDB0WM+sj8too/96YOmrjqf6k1strpP12pI75ArCcQq27XJWk0oD
+cIaiAgtzmO8jk1YQTKUDUxvaEv6tX1Lb3r+j3MfHuR6nX4Zx0C6YdmUBFT4t9/9C
+DLh990iFG6/wHO+1HSiknGf5V4eUChMfpyh9FgXkOVAQC7JprKgfePbyh2TY9usj
+ViRmP6kT8jV7EvqpnsXRuMB3MC0yzrX92OGC1QKArTdj9sNgPduawamposGYiwNm
+HAYgbfRbzgcRl/tN8MNSfg
+-> ssh-ed25519 iHV63A w9EB0URrVNcTMDhUA+D3z6eDPvaLZihSVpzT8Vr9jHo
+ofmrgw+5Jaf1wWXTzBDeijQwY59I/tHfU1fmrZCUTyo
+-> ssh-ed25519 uTVbSg qH1A4EHjDjauEa0ideqeWvSwP6ADmziNZOnXnEnrYyg
+y7MfmMtWlIGWl/HLyUQVQgJUxzvDKez0WXD6VGq4TfM
+-> w>S%-grease nxLQF J+B{F F+"3V
+wAF9N9WZyJAygP6EoouxvH9CG0EIIgXBNcnToP73VNNTaPxWOWRyL4rP7yZ9jSyR
+JRaZzh9xwASjiqG2GAStcHormaz1JMVy
+--- 8QzYdkT1uITqWc6bhvOvDxygLgaiVwWZrgWKOTF0pKc
+
L‹æÉGAÖxIó³i
¾Š˜¢ŠêÌ+Jg-“p±Dfy¾ü­<C3BC>ø[÷1xÅä
ùï©’<C2A9>Bqn'¾DkèO<´*n£ØÉ?u[o•ÐlÔ.µ&$”9|Øe
+â‘+õEíŠ	:ô8ÃZg­Ø׉E(]ˆõ~å»

secrets/cube_restic_repository_password.age

@@ -0,0 +1,22 @@
+age-encryption.org/v1
+-> ssh-ed25519 hPyiJw fUCzt+HSlnbvcpt70692+TpoX+eVJiuAKuBBOVGDlAU
+lt/jtC5XLRNXJ/SG3fkqSF3sfL6wKz4x+YmdXf5LPbk
+-> ssh-ed25519 YFSOsg 9zVMrXIpIfvBbSG4rlVIIIqBQeB24EI+CcAXWA5IXjk
+4kZ+vD6vp2SikzhwmOtZjCz+AMuCZMvbAXTnhZmk5Mw
+-> ssh-rsa 42S2Dw
+pPLgaBmvbDZEp7vwHKf+RlIZ1mthJ5uT1nIDIvRiMx51PX2nFcR9ynRVWVB3DFSr
+GujDJ3WCvf3qUg/E35EaEHiJaG8Ey8yWBmswj2O7FOtnM9Gq3BbbedHDLcWEcT+T
+9K12UvXQfM/Gki2CxIO8umpV4OHMXkRn/jsn+p/V7pfiVZoEaBa6UHWAhBm0fZjV
+B9yR4MjjuOQJYzemowwa6ZdFLxxUfudCAJBkn785hu3vbMVDPQpdd7XzXXFM/Ewk
+pIanTQ+DH58DrMOEy0v8PMvoNtG5QFAtl6AizEZtJmH9+a3HLcPOhXO9BSQBFdu4
+Zv1cX4JvCrTOF+iopufJpg
+-> ssh-ed25519 iHV63A z9+KV9tDTwZW9MAmvlMYPZMQFfZJxR3JhxHpXmfWhyU
+OxlOMSKY5L/j/91FJmxoBMDHhD/jDiI5sdmpv+zZ0ZQ
+-> ssh-ed25519 uTVbSg HOHFEOuv/AjJGSmI5uaIXk+5y2FzM3UmiPbvOZByO38
+zf2RI2U4Q0djP3wwpiRAe0bpr5LQwFkjxV2n4cFwgeI
+-> Xw\=9[g(-grease &J6]O2WG
+wCODexJaCztNZwXvcpZkodVUh3LWIk50eacTlWmwt47TuBaRqV3DIdxw4h7VwsOk
+8Ax3o91+Fxpq1ys4QCJfECDaVhgadTqRWIfoq5KNmgUVFhRB3H2L0et7tp+S
+--- xEJ2HSGLdcewY/QpuHVBdUdzvbH4NnOq6X4hnefQEEA
+ƒE_Ê27݉ùnÎWT¢Ô½"žø–œ±ES÷Œ$UQýÃl¹œ§\
âÌDr6•…â¾´ƒ­
+ð5ÒÞš´Oz¥Ô6èqDÆõÀ‚m<E2809A>'ž

secrets/home-assistant_giggles_secrets.age

@@ -0,0 +1,13 @@
+age-encryption.org/v1
+-> ssh-ed25519 hPyiJw oG/5rmZ9UgGK3e8qXKmZzhiryYmCVYeKS1nDpwSTfVs
+MJKlWHLkFM5fha9l6BabAnj+bLHpwv6cjidybl+vOAc
+-> ssh-ed25519 YFSOsg Ia9u8+B4u40MKJc2FcOic76b2cwz1u2rihwX/XPpySc
+q82pu1G1QSYLycGElN094KRDTm8RBUeM6NiYpYer+UE
+-> ssh-ed25519 iHV63A uf6L+90o2IeCY7V8434HN66Gt5L4UL6gIRfc6dYTeCs
+UGYpeHJeP6h994sUFSK82Y8OgHwtP3LVbqFtJnwsND8
+-> ssh-ed25519 g09OFQ BYBvE0DQe8k1YEx8YddrGbWVLcf/ejXqispXsLWahw4
+a2fZ7U6C6oSvUQMUx8V6rBwNanyxzLTKEIxAqHJmKhU
+-> Vd0/1*-grease
+KHpMCkTFMg
+--- zWpaOBCCbGyYYdtiMRR1qQBLltGh+voIBeGnncruCfk
+ó&(8f+ä…$à'ˆ6Q7(–ƵhEŸGÍ!P9Fã–ÅHh5í…Ôÿ=BOýN°6~°Ã8è[vçÅù óùãË̘,ô­y»<>¼ê‹n
i§cÚ„…¹
p¡ì_dâêE’¨³Ç:32a,„
È}­c<C2AD>ãÈ7&銧‡e