Merge pull request 'Pull in upstream devos commits' (#150) from feature/pull-in-upstream-devos-commits into main

Reviewed-on: https://git.b12f.io/pub-solar/os/pulls/150
Reviewed-by: Benjamin Bädorf <hello@benjaminbaedorf.eu>

.drone.yml

@@ -1,79 +1,72 @@
+---
+kind: pipeline
+type: exec
+name: Check
+node:
+  hosttype: baremetal
+
+steps:
+  - name: "Check"
+    when:
+      event:
+        - pull_request
+    environment:
+      NIX_FLAGS: "--print-build-logs --verbose"
+    commands:
+      - 'echo DEBUG: Using NIX_FLAGS: $NIX_FLAGS'
+      - nix $$NIX_FLAGS develop --command nix flake show
+      - nix $$NIX_FLAGS build ".#nixosConfigurations.PubSolarOS.config.system.build.toplevel"
+
+---
+kind: pipeline
+type: exec
+name: Tests
+node:
+  hosttype: baremetal
+
+steps:
+  - name: "Tests"
+    environment:
+      NIX_FLAGS: "--print-build-logs --verbose"
+    commands:
+      - 'echo DEBUG: Using NIX_FLAGS: $NIX_FLAGS'
+      - nix $$NIX_FLAGS build ".#checks.x86_64-linux.customTestFor-PubSolarOS-firstTest"
+      - nix-store --read-log result
+      - nix $$NIX_FLAGS flake check
+      - nix $$NIX_FLAGS develop --command echo OK
+
+  - name: "Upload artifacts"
+    environment:
+      TRITON_DONT_SOURCE_PROFILE: 1
+      PRIVATE_SSH_KEY:
+        from_secret: private_ssh_key
+      MANTA_USER: pub_solar
+      MANTA_URL: https://eu-central.manta.greenbaum.cloud
+      MANTA_KEY_ID: "5d:5f:3d:22:8d:37:1f:e6:d6:ab:06:18:d9:a2:04:67"
+    commands:
+      - export TARGET_DIR="ci/$${DRONE_REPO}/$${DRONE_BUILD_NUMBER}"
+      - echo env var TARGET_DIR is set to $$TARGET_DIR
+      - "mkdir ~/.ssh && chmod 700 ~/.ssh"
+      - echo "$$PRIVATE_SSH_KEY" > ~/.ssh/id_ed25519 && chmod 600 ~/.ssh/id_ed25519
+      - nix flake new --template "git+https://git.greenbaum.cloud/dev/tritonshell?ref=main" ./tritonshell
+      - git add tritonshell
+      - cd tritonshell
+      - nix develop --command mput -p -f ../result/foot_wayland_info.png ~~/public/$${TARGET_DIR}/foot_wayland_info.png
+      - nix develop --command mput -p -f ../result/test-wayland.out ~~/public/$${TARGET_DIR}/test-wayland.out
+
+trigger:
+  ref:
+    - refs/tags/v*
+    - refs/tags/t*
+
 ---
 kind: pipeline
 type: docker
-name: Upstreaming
+name: Notification
 
 steps:
-  - name: "Sync 'devos' branch with upstream"
-    image: alpine/git
-    when:
-      event:
-        - cron
-      cron:
-        - sync-main-with-upstream
-    environment:
-      GITEA_SSH_KEY:
-        from_secret: gitea_ssh_key
-    commands:
-      - ./.drone/setup_ssh.sh
-      - git remote add devos git@git.b12f.io:pub-solar/devos
-      - git remote set-url origin git@git.b12f.io:pub-solar/os
-      - git fetch --all
-      - git checkout -b devos --track origin/devos
-      - git merge -X theirs devos/main
-      - git push origin devos
-      - git remote set-url origin https://git.b12f.io/pub-solar/os.git
-
-  - name: "Sync $BRANCH with upstream"
-    image: alpine/git
-    when:
-      event:
-        - cron
-      cron:
-        - sync-main-with-upstream
-        - sync-b12f-with-main
-        - sync-teutat3s-with-main
-    environment:
-      GITEA_SSH_KEY:
-        from_secret: gitea_ssh_key
-    commands:
-      - git fetch origin
-      - git checkout origin/main
-      - ./.drone/setup_ssh.sh
-      - git remote set-url origin git@git.b12f.io:pub-solar/os
-      - git fetch --all
-      - ./.drone/upstream-branch.sh
-
-  - name: "Open pull request for failed merge"
-    image: nixery.dev/shell/tea
-    when:
-      status:
-        - failure
-      event:
-        - cron
-      cron:
-        - sync-main-with-upstream
-        - sync-b12f-with-main
-        - sync-teutat3s-with-main
-    environment:
-      TEA_CONFIG:
-        from_secret: tea_config
-    commands:
-      - mkdir -p ~/.config/tea
-      - echo "$$TEA_CONFIG" > ~/.config/tea/config.yml
-      - tea pulls create --base main --head devos
-
   - name: "Notify matrix"
     image: plugins/matrix
-    when:
-      status:
-        - failure
-      event:
-        - cron
-      cron:
-        - sync-main-with-upstream
-        - sync-b12f-with-main
-        - sync-teutat3s-with-main
     settings:
       homeserver: https://matrix.pub.solar
       roomid: dfQBqwkhIzrFjMSsxy:pub.solar
@@ -81,32 +74,15 @@ steps:
         from_secret: matrix_username
       password:
         from_secret: matrix_password
-      template: "Upstreaming {{ build.status }} [{{ build.branch }}#{{ truncate build.commit 8 }}]({{ build.link }}) by {{ build.author }}. [Pull requests](https://git.b12f.io/pub-solar/os/pulls)"
+      template: "Test run triggered by tag: {{ build.tag }}. Test run exit status: {{ build.status }}. Artifacts uploaded to Manta: https://eu-central.manta.greenbaum.cloud/pub_solar/public/ci/{{ repo.Owner }}/{{ repo.Name }}/{{ build.number }}/foot_wayland_info.png"
+
+depends_on:
+  - Tests
 
 trigger:
-  event:
-    - cron
-
----
-kind: pipeline
-type: docker
-name: Check
-
-steps:
-  - name: "Check"
-    image: docker.nix-community.org/nixpkgs/nix-flakes:latest
-    when:
-      event:
-        - pull_request
-        - tag
-    environment:
-      NIX_FLAGS: "--print-build-logs --verbose"
-    commands:
-      - 'echo DEBUG: Using NIX_FLAGS: $NIX_FLAGS'
-      - nix $$NIX_FLAGS flake check
-      - nix $$NIX_FLAGS build ".#nixosConfigurations.PubSolarOS.config.system.build.toplevel"
-      - nix $$NIX_FLAGS develop --command echo OK
-      - nix $$NIX_FLAGS develop --command bud --help
+  ref:
+    - refs/tags/v*
+    - refs/tags/t*
 
 ---
 kind: pipeline
@@ -116,41 +92,55 @@ name: Publish ISO
 steps:
   - name: "Build ISO"
     image: docker.nix-community.org/nixpkgs/nix-flakes:latest
+    environment:
+      NIX_FLAGS: "--print-build-logs --verbose"
     volumes:
       - name: file-exchange
         path: /var/nix/iso-cache
     commands:
       - |
-        nix --print-build-logs --verbose \
-          develop --command \
-            bud build bootstrap bootstrapIso
-      - cp $(readlink -f result)/iso/*.iso /var/nix/iso-cache/
+        nix $$NIX_FLAGS build \
+          '.#nixosConfigurations.bootstrap.config.system.build.isoImage'
+      - cp $(readlink -f result)/iso/PubSolarOS*.iso /var/nix/iso-cache/
+      - nix shell nixpkgs#findutils
+      - cd /var/nix/iso-cache/
+      - export ISO_NAME=$(find . -name '*.iso' -printf "%f\n")
+      - sha256sum $ISO_NAME > $ISO_NAME.sha256
+      - ln -s $ISO_NAME PubSolarOS-latest.iso
+      - cp $ISO_NAME.sha256 PubSolarOS-latest.iso.sha256
+      - nix run nixpkgs#gnused -- --in-place "s/$ISO_NAME/PubSolarOS-latest.iso/" PubSolarOS-latest.iso.sha256
 
   - name: "Publish ISO"
-    image: appleboy/drone-scp
+    # custom drone-scp image, source: https://git.b12f.io/pub-solar/drone-scp/
+    # docker build --tag registry.greenbaum.cloud/library/drone-scp:v1.6.5 --file ./docker/Dockerfile.linux.amd64 .
+    image: registry.greenbaum.cloud/library/drone-scp:v1.6.5
     volumes:
       - name: file-exchange
         path: /var/nix/iso-cache
     settings:
       host:
-        from_secret: ssh_host
+        from_secret: iso_web_ssh_host
       user:
-        from_secret: ssh_user
+        from_secret: iso_web_ssh_user
       port:
-        from_secret: ssh_port
+        from_secret: iso_web_ssh_port
       key:
-        from_secret: ssh_key
-      target: /srv/os
+        from_secret: iso_web_ssh_key
+      target: /srv/os/download
       source:
         - /var/nix/iso-cache/*.iso
+        - /var/nix/iso-cache/*.iso.sha256
+      unlink_first: true
       strip_components: 3
 
 depends_on:
   - Check
 
 trigger:
+  branch:
+    - main
   event:
-    - tag
+    - push
 
 volumes:
   - name: file-exchange
@@ -158,6 +148,6 @@ volumes:
 
 ---
 kind: signature
-hmac: bdbefb07b97dc8efc44d8eb36ee4d1bb89eec3b7255b49929e126e86a4b4a788
+hmac: 291be33bbf2954d1f5e4bf569679e24a773e7d6f90db4765fb9dacb3686a825e
 
 ...

LICENSE.md

@@ -0,0 +1,660 @@
+### 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/>.

README.md

@@ -1,95 +1,46 @@
-[![NixOS](https://img.shields.io/badge/NixOS-unstable-blue.svg?style=flat&logo=NixOS&logoColor=white)](https://nixos.org)
-[![MIT License](https://img.shields.io/github/license/divnix/devos)][mit]
-[![Chat](https://img.shields.io/matrix/devos:nixos.org.svg?label=%23devos%3Anixos.org&logo=matrix&server_fqdn=matrix.org)][matrix]
+# PubSolarOS
 
-> #### ⚠ Advisory ⚠
-> DevOS requires the [flakes][flakes] feature available via an _experimental_
-> branch of [nix][nix]. Until nix 2.4 is released, this project
-> should be considered unstable.
+Welcome to PubSolarOS, a very opiniated Linux (NixOS) distribution for the nerdy.
 
-### Why?
-Make an awesome template for NixOS users, with consideration for common tools like [home-manager][home-manager],
-[devshell][devshell], and [more](./doc/integrations).
+We're creating this distribution for our own personal use and fun, but
+take pride in our craft. As of 14.08.22 it's running on 14 physical devices,
+both `x86_64` and `aarch64`.
 
-### No. Why _flakes_?
-Flakes are a part of an explicit push to improve [Nix's UX](https://github.com/NixOS/nix/blob/master/doc/manual/src/contributing/cli-guideline.md), and have become an integral part of that effort. 
+At its core, it's a NixOS installation running our configuration. The UX
+decisions and the way the project is structured are what make it
+_PubSolarOS_:
 
-They also make [Nix expressions](https://nixos.org/manual/nix/unstable/expressions/expression-syntax.html) easier to distribute and reuse with convient [flake references](https://github.com/NixOS/nix/blob/master/src/nix/flake.md#flake-references) for building or using packages, modules, and whole systems.
+* Reproducibility is king, and the future is with declarative and functional
+    programming. Even if Nix does not turn out to be the end-all-be-all of
+    reproducible package management (Guix looks good), it has a plethora
+    of packages, a very active and helpful community, and very solid
+    software engineering practices.
+* Because reproducibility is king, we're using nix flakes for locking flake
+    dependencies. [Digga](https://github.com/divnix/digga) is our flake
+    utility library, made by the wonderful people of the Divnix community.
+* Physical devices are not shared anymore nowadays. Only seldomly will you
+    find shared devices that need more than one user account. For this
+    reason, only one user (excluding `root`) is assumed.
+* Keyboard navigation wins where it matters; ergonomics, programmability,
+    efficiency, and speed. We use a tiling window manager (`sway`) and
+    prioritize cli-based solutions where sensible. The editor is `neovim`
+    configured to be just as opiniated as the operating system it is a part
+    of. For mailing, `neomutt` is the default, but we're more divided on
+    that part.
+* We like new and shiny things, so we've moved to Wayland and pipewire.
+* SICHERHEIT is written in capital letters at pub.solar, so we have first-
+    class disk-encryption support. Currently in the works is a paranoid
+    mode where the device can only hibernate (no more sleep or lockscreen)
+    so your data is locked any time you leave the device.
+* Free software is better. If we can avoid it, nonfree software is avoided.
+    By default, `allowUnfree` is `false` so we don't ship non-free software
+    in a basic PubSolarOS ISO. However, nothing prevents you from using
+    as much non-free software as you like.
+* Automation is better. The reproducibility of nix feels so much more
+    powerful once you're deploying your new configuration from your laptop
+    to all your other devices with one command. [We have an automated CI using drone](https://ci.b12f.io/pub-solar/os).
+* Community is important. We just like working on this together, and it
+    feels really good to see our progress at the end of a
+    [hakken.irl](https://pub.solar/hakken) session.
 
-## Getting Started
-Check out the [guide](https://devos.divnix.com/start) to get up and running.
-Also, have a look at [_flake.nix_](./flake.nix). If anything is not immediately 
-discoverable via "[`digga`][digga]'s [`mkFlake`][mk-flake],
-please file a bug report.
-
-### Status: Beta
-Although this project has already matured quite a bit, especially through
-recent outfactoring of [`digga`][digga], a fair amount of api polishing is still
-expected. There are unstable versions (0._x_._x_) to help users keep track
-of changes and progress, and a [`develop`](https://github.com/divnix/devos/tree/develop) branch for the brave 😜
-
-## In the Wild
-* @Pacman99: [Personal](https://gitlab.com/coffeetables/lower), [Server](https://gitlab.com/coffeetables/myrdd)
-* [@danielphan2003](https://github.com/danielphan2003/flk) and make sure to also check out [devos-ext-lib][devos-ext-lib]
-* [PubSolarOS](https://git.sr.ht/~b12f/pub-solar-os)
-
-## Shoulders
-This work does not reinvent the wheel. It stands on the [shoulders of the
-following giants][giants]:
-
-### :onion: — like the layers of an onion
-- [`divnix/digga`][digga]
-- [`gytis-ivaskevicius/flake-utils-plus`][fup]
-- [`numtide/flake-utils`][fu]
-
-### :family: — like family
-- [`numtide/devshell`][devshell]
-- [`serokell/deploy-rs`][deploy]
-- [`berberman/nvfetcher`][nvfetcher]
-- [`NixOS/nixpkgs`][nixpkgs]
-
-:heart:
-
-## Inspiration & Art
-- [hlissner/dotfiles][dotfiles]
-- [nix-user-chroot](https://github.com/nix-community/nix-user-chroot)
-- [Nickel](https://github.com/tweag/nickel)
-- [Awesome Nix](https://github.com/nix-community/awesome-nix)
-- [devshell](https://github.com/numtide/devshell)
-
-## Divnix
-The divnix org is an open space that spontaneously formed out of "the Nix".
-It is really just a place where otherwise unrelated people work
-together and get stuff done.
-
-It's a place to stop "geeking out in isolation" (or within company boundaries).
-A place to experiment, learn together, and iterate quickly on best practices.
-That's what it is.
-
-It might eventually become a non-profit if that's not too complicated or, if those
-goals are sufficiently upstreamed into "the Nix", dissolved.
-
-# License
-DevOS is licensed under the [MIT License][mit].
-
-[community]: https://github.com/divnix/devos/tree/community
-[core]: https://github.com/divnix/devos
-[deploy]: https://github.com/serokell/deploy-rs
-[devshell]: https://github.com/numtide/devshell
-[digga]: https://github.com/divnix/digga
-[dotfiles]: https://github.com/hlissner/dotfiles
-[flake-doc]: https://github.com/NixOS/nix/blob/master/src/nix/flake.md
-[flakes]: https://nixos.wiki/wiki/Flakes
-[fu]: https://github.com/numtide/flake-utils
-[fup]: https://github.com/gytis-ivaskevicius/flake-utils-plus
-[giants]: https://en.wikipedia.org/wiki/Standing_on_the_shoulders_of_giants
-[home-manager]: https://nix-community.github.io/home-manager
-[mit]: https://mit-license.org
-[mk-flake]: https://github.com/divnix/digga/tree/main/src/mkFlake
-[nix]: https://nixos.org/manual/nix/stable
-[nixos]: https://nixos.org/manual/nixos/stable
-[nixpkgs]: https://github.com/NixOS/nixpkgs
-[nvfetcher]: https://github.com/berberman/nvfetcher
-[please]: https://github.com/nrdxp/devos/tree/nrd
-[matrix]: https://matrix.to/#/#devos:nixos.org
-[devos-ext-lib]: https://github.com/divnix/devos-ext-lib
+To get started, take a look at the quick start guide in our docs.

doc/CONTRIBUTING.md

@@ -1,18 +1,13 @@
-# Pull Requests
-
-## TL;DR;
+# TL;DR;
 - **Target Branch**: `main`
-- **Merge Policy**: [`bors`][bors] is always right (→ `bors try`)
-- **Docs**: every changeset is expected to contain doc updates
+- **Merge Policy**: green check: merge away. yellow circle: have patience. red x: try again.
+- **Docs**: every change set is expected to contain doc updates
 - **Commit Msg**: be a poet! Comprehensive and explanatory commit messages 
   should cover the motivation and use case in an easily understandable manner
   even when read after a few months.
-- **Test Driven Development**: please default to test driven development where possible.
+- **Test Driven Development**: please default to test driven development you can
+  make use of the `./examples` & `./e2e` and wire test up in the devshell. 
 
 ### Within the Devshell (`nix develop`)
 - **Hooks**: please `git commit` within the devshell
-- **Fail Early**: please run from within the devshell on your local machine:
-  - `nix flake check`
-
-[bors]: https://bors.tech
-
+- **Fail Early**: please run `check-all` from within the devshell on your local machine

doc/SUMMARY.md

@@ -3,8 +3,6 @@
 - [Introduction](../README.md)
 - [Quick Start](./start/index.md)
   - [ISO](./start/iso.md)
-  - [Bootstrapping](./start/bootstrapping.md)
-  - [From NixOS](./start/from-nixos.md)
 - [Key Concepts](./concepts/index.md)
   - [Hosts](./concepts/hosts.md)
   - [Overrides](./concepts/overrides.md)
@@ -18,11 +16,16 @@
 - [Concerns]()
   - [Secrets](./secrets.md)
   - [Tests](./tests.md)
-- [Helper Script – `bud`](./bud/index.md)
-  - [get](./bud/get.md)
 - [Integrations](./integrations/index.md)
   - [Cachix](./integrations/cachix.md)
   - [Deploy RS](./integrations/deploy.md)
   - [NvFetcher](./integrations/nvfetcher.md)
   - [Hercules CI](./integrations/hercules.md)
+- [API Reference](./api-reference.md)
+  - [Channels](./api-reference-channels.md)
+  - [Home](./api-reference-home.md)
+  - [Devshell](./api-reference-devshell.md)
+  - [NixOS](./api-reference-nixos.md)
+- [Library Reference]()
 - [Contributing](./CONTRIBUTING.md)
+

doc/api-reference-channels.md

@@ -0,0 +1,91 @@
+# Channels API Container
+Configure your channels that you can use throughout your configurations.
+
+> #### ⚠ Gotcha ⚠
+> Devshell & (non-host-specific) Home-Manager `pkgs` instances are rendered off the
+> `nixos.hostDefaults.channelName` (default) channel.
+
+
+## channels
+nixpkgs channels to create
+
+
+*_Type_*:
+attribute set of submodules or path convertible to it
+
+
+*_Default_*
+```
+{}
+```
+
+
+
+
+## channels.\<name\>.config
+nixpkgs config for this channel
+
+
+*_Type_*:
+attribute set or path convertible to it
+
+
+*_Default_*
+```
+{}
+```
+
+
+
+
+## channels.\<name\>.input
+nixpkgs flake input to use for this channel
+
+
+*_Type_*:
+nix flake
+
+
+*_Default_*
+```
+"self.inputs.<name>"
+```
+
+
+
+
+## channels.\<name\>.overlays
+overlays to apply to this channel
+these will get exported under the 'overlays' flake output
+as \<channel\>/\<name\> and any overlay pulled from \<inputs\>
+will be filtered out
+
+
+*_Type_*:
+list of valid Nixpkgs overlay or path convertible to its or anything convertible to it or path convertible to it
+
+
+*_Default_*
+```
+[]
+```
+
+
+
+
+## channels.\<name\>.patches
+patches to apply to this channel
+
+
+*_Type_*:
+list of paths
+
+
+*_Default_*
+```
+[]
+```
+
+
+
+

doc/api-reference-devshell.md

@@ -0,0 +1,72 @@
+# Devshell API Container
+Configure your devshell module collections of your environment.
+
+
+## devshell
+Modules to include in your DevOS shell. the `modules` argument
+will be exported under the `devshellModules` output
+
+
+*_Type_*:
+submodule or path convertible to it
+
+
+*_Default_*
+```
+{}
+```
+
+
+
+
+## devshell.exportedModules
+modules to include in all hosts and export to devshellModules output
+
+
+*_Type_*:
+list of valid module or path convertible to its or anything convertible to it
+
+
+*_Default_*
+```
+[]
+```
+
+
+
+
+## devshell.externalModules
+The `externalModules` option has been removed.
+Any modules that should be exported should be defined with the `exportedModules`
+option and all other modules should just go into the `modules` option.
+
+
+*_Type_*:
+list of valid modules or anything convertible to it
+
+
+*_Default_*
+```
+[]
+```
+
+
+
+
+## devshell.modules
+modules to include that won't be exported
+meant importing modules from external flakes
+
+
+*_Type_*:
+list of valid modules or anything convertible to it or path convertible to it
+
+
+*_Default_*
+```
+[]
+```
+
+
+
+

doc/api-reference-home.md

@@ -0,0 +1,119 @@
+# Home-Manager API Container
+Configure your home manager modules, profiles & suites.
+
+
+## home
+hosts, modules, suites, and profiles for home-manager
+
+
+*_Type_*:
+submodule or path convertible to it
+
+
+*_Default_*
+```
+{}
+```
+
+
+
+
+## home.exportedModules
+modules to include in all hosts and export to homeModules output
+
+
+*_Type_*:
+list of valid modules or anything convertible to it or path convertible to it
+
+
+*_Default_*
+```
+[]
+```
+
+
+
+
+## home.externalModules
+The `externalModules` option has been removed.
+Any modules that should be exported should be defined with the `exportedModules`
+option and all other modules should just go into the `modules` option.
+
+
+*_Type_*:
+list of valid modules or anything convertible to it
+
+
+*_Default_*
+```
+[]
+```
+
+
+
+
+## home.importables
+Packages of paths to be passed to modules as `specialArgs`.
+
+
+*_Type_*:
+attribute set
+
+
+*_Default_*
+```
+{}
+```
+
+
+
+
+## home.importables.suites
+collections of profiles
+
+
+*_Type_*:
+null or attribute set of list of paths or anything convertible to its or path convertible to it
+
+
+*_Default_*
+```
+null
+```
+
+
+
+
+## home.modules
+modules to include that won't be exported
+meant importing modules from external flakes
+
+
+*_Type_*:
+list of valid modules or anything convertible to it or path convertible to it
+
+
+*_Default_*
+```
+[]
+```
+
+
+
+
+## home.users
+HM users that can be deployed portably without a host.
+
+
+*_Type_*:
+attribute set of HM user configs
+
+
+*_Default_*
+```
+{}
+```
+
+
+
+

doc/api-reference-nixos.md

@@ -0,0 +1,234 @@
+# NixOS API Container
+Configure your nixos modules, profiles & suites.
+
+
+## nixos
+hosts, modules, suites, and profiles for NixOS
+
+
+*_Type_*:
+submodule or path convertible to it
+
+
+*_Default_*
+```
+{}
+```
+
+
+
+
+## nixos.hostDefaults
+Defaults for all hosts.
+the modules passed under hostDefaults will be exported
+to the 'nixosModules' flake output.
+They will also be added to all hosts.
+
+
+*_Type_*:
+submodule
+
+
+*_Default_*
+```
+{}
+```
+
+
+
+
+## nixos.hostDefaults.channelName
+Channel this host should follow
+
+
+*_Type_*:
+channel defined in `channels`
+
+
+
+
+
+
+## nixos.hostDefaults.exportedModules
+modules to include in all hosts and export to nixosModules output
+
+
+*_Type_*:
+list of valid modules or anything convertible to it or path convertible to it
+
+
+*_Default_*
+```
+[]
+```
+
+
+
+
+## nixos.hostDefaults.externalModules
+The `externalModules` option has been removed.
+Any modules that should be exported should be defined with the `exportedModules`
+option and all other modules should just go into the `modules` option.
+
+
+*_Type_*:
+list of valid modules or anything convertible to it
+
+
+*_Default_*
+```
+[]
+```
+
+
+
+
+## nixos.hostDefaults.modules
+modules to include that won't be exported
+meant importing modules from external flakes
+
+
+*_Type_*:
+list of valid modules or anything convertible to it or path convertible to it
+
+
+*_Default_*
+```
+[]
+```
+
+
+
+
+## nixos.hostDefaults.system
+system for this host
+
+
+*_Type_*:
+null or system defined in `supportedSystems`
+
+
+*_Default_*
+```
+null
+```
+
+
+
+
+## nixos.hosts
+configurations to include in the nixosConfigurations output
+
+
+*_Type_*:
+attribute set of submodules
+
+
+*_Default_*
+```
+{}
+```
+
+
+
+
+## nixos.hosts.\<name\>.channelName
+Channel this host should follow
+
+
+*_Type_*:
+null or channel defined in `channels`
+
+
+*_Default_*
+```
+null
+```
+
+
+
+
+## nixos.hosts.\<name\>.modules
+modules to include
+
+
+*_Type_*:
+list of valid modules or anything convertible to it or path convertible to it
+
+
+*_Default_*
+```
+[]
+```
+
+
+
+
+## nixos.hosts.\<name\>.system
+system for this host
+
+
+*_Type_*:
+null or system defined in `supportedSystems`
+
+
+*_Default_*
+```
+null
+```
+
+
+
+
+## nixos.hosts.\<name\>.tests
+tests to run
+
+
+*_Type_*:
+list of valid NixOS test or path convertible to its or anything convertible to it
+
+
+*_Default_*
+```
+[]
+```
+
+
+*_Example_*
+```
+{"_type":"literalExpression","text":"[\n  {\n    name = \"testname1\";\n    machine = { ... };\n    testScript = ''\n      # ...\n    '';\n  }\n  ({ corutils, writers, ... }: {\n    name = \"testname2\";\n    machine = { ... };\n    testScript = ''\n      # ...\n    '';\n  })\n  ./path/to/test.nix\n];\n"}
+```
+
+
+## nixos.importables
+Packages of paths to be passed to modules as `specialArgs`.
+
+
+*_Type_*:
+attribute set
+
+
+*_Default_*
+```
+{}
+```
+
+
+
+
+## nixos.importables.suites
+collections of profiles
+
+
+*_Type_*:
+null or attribute set of list of paths or anything convertible to its or path convertible to it
+
+
+*_Default_*
+```
+null
+```
+
+
+
+

doc/api-reference.md

@@ -0,0 +1,80 @@
+# Top Level API
+`digga`'s top level API. API Containers are documented in their respective sub-chapter:
+
+- [Channels](./api-reference-channels.md)
+- [Home](./api-reference-home.md)
+- [Devshell](./api-reference-devshell.md)
+- [NixOS](./api-reference-nixos.md)
+- [Darwin](./api-reference-darwin.md)
+
+## channelsConfig
+nixpkgs config for all channels
+
+
+*_Type_*:
+attribute set or path convertible to it
+
+
+*_Default_*
+```
+{}
+```
+
+
+
+
+## inputs
+The flake's inputs
+
+*_Type_*:
+attribute set of nix flakes
+
+
+
+
+
+
+## outputsBuilder
+builder for flake system-spaced outputs
+The builder gets passed an attrset of all channels
+
+
+*_Type_*:
+function that evaluates to a(n) attribute set or path convertible to it
+
+
+*_Default_*
+```
+"channels: { }"
+```
+
+
+
+
+## self
+The flake to create the DevOS outputs for
+
+*_Type_*:
+nix flake
+
+
+
+
+
+
+## supportedSystems
+The systems supported by this flake
+
+
+*_Type_*:
+list of strings
+
+
+*_Default_*
+```
+["aarch64-linux","aarch64-darwin","i686-linux","x86_64-darwin","x86_64-linux"]
+```
+
+
+
+

doc/book.toml

@@ -3,4 +3,4 @@ authors = ["Timothy DeHerrera"]
 language = "en"
 multilingual = false
 src = "."
-title = "devos docs"
+title = "PubSolarOS documentation"

doc/bud/get.md

@@ -1,10 +0,0 @@
-# get
-The `get` subcommand is useful for getting a bare copy of devos without the
-git history.
-
-## Usage
-```sh
-bud get DEST-DIR
-```
-
-If DEST-DIR is ommitted, it defaults to _./devos_.

doc/bud/index.md

@@ -1,24 +0,0 @@
-# [`bud`][bud] command
-The template incudes a convenient script for managing your system called [`bud`][bud].
-
-It is a portable and highly composable system control tool that work anywhere on your host
-or in the flake's devshell. 
-
-Although it comes with some predefined standard helpers,
-it is very extensible and you are encouraged to write your own script snippets
-to ease your workflows. An example is the bud module for a `get` command that
-comes included with `devos`.
-
-While writing scripts you can convenientely access smart environment variables
-that can tell the current architecture, user or host name, among others, regardless
-wether you invoke `bud` within the devshell or as the system-wide installed `bud`.
-
-For details, please review the [bud repo][bud].
-
-## Usage
-```sh
-bud help
-```
-
-
-[bud]: https://github.com/divnix/bud

doc/concepts/users.md

@@ -49,19 +49,18 @@ argument that gets passed to your home-manager users.
 
 ## External Usage
 You can easily use the defined home-manager configurations outside of NixOS
-using the `homeConfigurations` flake output. The [bud](../bud/index.md) helper
-script makes this even easier.
+using the `homeConfigurations` flake output.
 
-This is great for keeping your environment consistent across Unix systems,
-including OSX.
+This is great for keeping your environment consistent across Unix-like systems,
+including macOS.
 
 ### From within the projects devshell:
 ```sh
-# builds the nixos user defined in the NixOS host
-bud home NixOS nixos
+# builds the pub-solar user defined in the PubSolarOS host
+nix build '.#homeConfigurations."pub-solar@PubSolarOS".activationPackage'
 
 # build and activate
-bud home NixOS nixos switch
+nix build '.#homeConfigurations."pub-solar@PubSolarOS".activationPackage' && ./result/activate && unlink result
 ```
 
 ### Manually from outside the project:

doc/start/bootstrapping.md

@@ -1,102 +0,0 @@
-# Bootstrapping
-
-This will help you boostrap a bare host with the help of the
-[bespoke iso](./iso.md) live installer.
-
-_Note: nothing prevents you from remotely executing the boostrapping
-process. See below._
-
-Once your target host has booted into the live iso, you need to partition
-and format your disk according to the [official manual][manual].
-
-## Mount partitions
-
-Then properly mount the formatted partitions at `/mnt`, so that you can
-install your system to those new partitions.
-
-Mount `nixos` partition to `/mnt` and — for UEFI — `boot`
-partition to `/mnt/boot`:
-
-```console
-$ mount /dev/disk/by-label/nixos /mnt
-$ mkdir -p /mnt/boot && mount /dev/disk/by-label/boot /mnt/boot # UEFI only
-$ swapon /dev/disk/by-label/swap
-```
-
-Add some extra space to the store. In the iso, it's running on a tmpfs
-off your RAM:
-```console
-$ mkdir -p /mnt/tmpstore/{work,store}
-$ mount -t overlay overlay -olowerdir=/nix/store,upperdir=/mnt/tmpstore/store,workdir=/mnt/tmpstore/work /nix/store
-```
-
-## Install
-
-Install off of a copy of devos from the time the iso was built:
-
-```console
-$ cd /iso/devos
-$ nixos-install --flake .#NixOS
-```
-
-## Notes of interest
-
-### Remote access to the live installer
-
-The iso live installer comes preconfigured with a network configuration
-which announces it's hostname via [MulticastDNS][mDNS] as `hostname.local`,
-that is `bootstrap.local` in the [iso example](./iso).
-
-In the rare case that [MulticastDNS][mDNS] is not availabe or turned off
-in your network, there is a static link-local IPv6 address configured to
-`fe80::47`(mnemonic from the letter's position in the english alphabet:
-`n=14 i=9 x=24; 47 = n+i+x`).
-
-Provided that you have added your public key to the authorized keys of the
-`root` user _(hint: [`deploy-rs`](../integrations/deploy.md) needs passwordless
-sudo access)_:
-
-```nix
-{ ... }:
-{
-  users.users.root.openssh.authorizedKeys.keyFiles = [
-    ../secrets/path/to/key.pub
-  ];
-}
-```
-
-You can then ssh into the live installer through one of the
-following options:
-
-```console
-ssh root@bootstrap.local
-
-ssh root@fe80::47%eno1  # where eno1 is your network interface on which you are linked to the target
-```
-
-_Note: the [static link-local IPv6 address][staticLLA] and [MulticastDNS][mDNS] is only
-configured on the live installer. If you wish to enable [MulticastDNS][mDNS]
-for your environment, you ought to configure that in a regular [profile](../concepts/profiles.md)._
-
-### EUI-64 LLA & Host Identity
-
-The iso's IPv6 Link Local Address (LLA) is configured with a static 64-bit Extended
-Unique Identifiers (EUI-64) that is derived from the host interface's Message
-Authentication Code (MAC) address.
-
-After a little while (a few seconds), you can remotely discover this unique and host
-specific address over [NDP][NDP] for example with:
-
-```console
-ip -6 neigh show # also shows fe80::47
-```
-
-***This LLA is stable for the host, unless you need to swap that particular network card.***
-Under this reservation, though, you may use this EUI-64 to wire up a specific
-(cryptographic) host identity.
-
-
-[manual]: https://nixos.org/manual/nixos/stable/index.html#sec-installation-partitioning
-[mDNS]: https://en.wikipedia.org/wiki/Multicast_DNS
-[NDP]: https://en.wikipedia.org/wiki/Neighbor_Discovery_Protocol
-[staticLLA]: https://tools.ietf.org/html/rfc7404

doc/start/from-nixos.md

@@ -1,51 +0,0 @@
-# From NixOS
-
-## Generate Configuration
-Assuming you're happy with your existing partition layout, you can generate a
-basic NixOS configuration for your system using:
-```sh
-bud up
-```
-
-This will make a new file `hosts/up-$(hostname).nix`, which you can edit to
-your liking.
-
-You must then add a host to `nixos.hosts` in flake.nix:
-```nix
-{
-  nixos.hosts = {
-    modules = hosts/NixOS.nix;
-  };
-}
-```
-
-Make sure your `i18n.defaultLocale` and `time.timeZone` are set properly for
-your region. Keep in mind that `networking.hostName` will be automatically
-set to the name of your host;
-
-Now might be a good time to read the docs on [suites](../concepts/suites.md) and
-[profiles](../concepts/profiles.md) and add or create any that you need.
-
-> ##### _Note:_
-> While the `up` sub-command is provided as a convenience to quickly set up and
-> install a "fresh" NixOS system on current hardware, committing these files is
-> discouraged.
->
-> They are placed in the git staging area automatically because they would be
-> invisible to the flake otherwise, but it is best to move what you need from
-> them directly into a host module of your own making, and commit that instead.
-# Installation
-
-Once you're ready to deploy `hosts/my-host.nix`:
-```sh
-bud my-host switch
-```
-
-
-This calls `nixos-rebuild` with sudo to build and install your configuration.
-
-> ##### _Notes:_
-> - Instead of `switch`, you can pass `build`, `test`, `boot`, etc just as with
->   `nixos-rebuild`.
-
-

doc/start/index.md

@@ -2,25 +2,35 @@
 The only dependency is nix, so make sure you have it [installed][install-nix].
 
 ## Get the Template
-Here is a snippet that will get you the template without the git history:
+If you currently don't have flakes setup, you can utilize the digga shell to pull the template:
 ```sh
-nix-shell -p cachix --run "cachix use nrdxp"
-
-nix-shell https://github.com/divnix/devos/archive/main.tar.gz -A shell \
-  --run "bud get main"
-
-cd devos
-
-nix-shell
+nix-shell "https://github.com/divnix/digga/archive/main.tar.gz" \
+  --run "nix flake init -t github:divnix/digga"
+```
+If you already have flakes support, you can directly pull the template:
+```sh
+nix flake init -t github:divnix/digga
+```
 
+Then make sure to create the git repository:
+```sh
 git init
 git add .
 git commit -m init
 ```
 
-This will place you in a new folder named `devos` with git initialized, and a
-nix-shell that provides all the dependencies, including the unstable nix
-version required.
+To drop into a nix-shell, if you don't have flakes setup, use the digga shell to create a `flake.lock`:
+```sh
+nix-shell "https://github.com/divnix/digga/archive/main.tar.gz" \
+  --run "nix flake lock"
+```
+Or if you do have flakes support, just run:
+```sh
+nix flake lock
+```
+
+Finally, run `nix-shell` to get to an interactive shell with all the dependencies, including the unstable nix
+version required. You can run `menu` to confirm that you are using digga (expected output includes [docs], [general commands], [linter], etc.).
 
 In addition, the [binary cache](../integrations/cachix.md) is added for faster deployment.
 
@@ -33,9 +43,8 @@ In addition, the [binary cache](../integrations/cachix.md) is added for faster d
 >   you can try with sudo: `sudo nix-shell -p cachix --run "cachix use nrdxp"`
 
 ## Next Steps:
+
 - [Make installable ISO](./iso.md)
-- [Bootstrap Host](./bootstrapping.md)
-- [Already on NixOS](./from-nixos.md)
 
 
 [install-nix]: https://nixos.org/manual/nix/stable/#sect-multi-user-installation

doc/start/iso.md

@@ -1,22 +1,36 @@
-# ISO
+# Installation Media
+
+This project leverages [nix-community/nixos-generators][nixos-generators] for
+building machine images. In most cases, you'll probably want to use the
+`install-iso` format.
+
+Making an installable ISO for `hosts/bootstrap.nix` is as simple as:
 
-Making and writing an installable iso for `hosts/bootstrap.nix` is as simple as:
 ```sh
-bud build bootstrap bootstrapIso
-sudo -E $(which bud) burn
+nix run github:nix-community/nixos-generators -- \
+  --format install-iso \
+  --flake '.#bootstrap'
 ```
 
-This works for any host.
+Then "burn" the ISO to your USB stick (or CD-R if you like!) following the
+[instructions in the NixOS manual][burn] (or using your preferred USB burner).
 
-## ISO image nix store & cache
+You can also swap out the `--format` for [any of the others][formats] supported
+by nixos-generators.
 
-The iso image holds the store to the live environment and _also_ acts as a binary cache
-to the installer. To considerably speed up things, the image already includes all flake
-`inputs` as well as the `devshell` closures.
+Continue by following the usual installation instructions in the NixOS manual.
 
-While you _could_ provision any machine with a single stick, a custom-made iso for
-the host you want to install DevOS to, maximises those local cache hits.
+## ISO Nix Store and Cache
 
-For hosts that don't differ too much, a single usb stick might be ok, whereas when
-there are bigger differences, a custom-made usb stick will be considerably faster.
+The ISO image holds the Nix store for the live environment and _also_ acts as a
+binary cache to the installer. To considerably speed things up, the image
+already includes all flake `inputs` as well as the `devshell` closures.
 
+While you _could_ provision any NixOS machine with the same USB stick, an ISO
+custom-made for your target host will maximise those local cache hits. For hosts
+that don't differ too much, a single USB stick might be ok, whereas when there
+are bigger differences, a custom-made USB stick will be considerably faster.
+
+[nixos-generators]: https://github.com/nix-community/nixos-generators 
+[burn]: https://nixos.org/manual/nixos/stable/index.html#sec-booting-from-usb
+[formats]: https://github.com/nix-community/nixos-generators/tree/master/formats

flake.lock

@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1648942457,
-        "narHash": "sha256-i29Z1t3sVfCNfpp+KAfeExvpqHQSbLO1KWylTtfradU=",
+        "lastModified": 1665870395,
+        "narHash": "sha256-Tsbqb27LDNxOoPLh0gw2hIb6L/6Ow/6lIBvqcHzEKBI=",
         "owner": "ryantm",
         "repo": "agenix",
-        "rev": "0d5e59ed645e4c7b60174bc6f6aac6a203dc0b01",
+        "rev": "a630400067c6d03c9b3e0455347dc8559db14288",
         "type": "github"
       },
       "original": {
@@ -20,26 +20,6 @@
         "type": "github"
       }
     },
-    "beautysh": {
-      "inputs": {
-        "flake-utils": "flake-utils",
-        "nixpkgs": "nixpkgs",
-        "poetry2nix": "poetry2nix"
-      },
-      "locked": {
-        "lastModified": 1641830469,
-        "narHash": "sha256-uhDmgNP/biOWe4FtOa6c2xZnREH+NP9rdrMm0LccRUk=",
-        "owner": "lovesegfault",
-        "repo": "beautysh",
-        "rev": "e85d9736927c0fcf2abb05cb3a2d8d9b4502a2eb",
-        "type": "github"
-      },
-      "original": {
-        "owner": "lovesegfault",
-        "repo": "beautysh",
-        "type": "github"
-      }
-    },
     "blank": {
       "locked": {
         "lastModified": 1625557891,
@@ -55,31 +35,6 @@
         "type": "github"
       }
     },
-    "bud": {
-      "inputs": {
-        "beautysh": "beautysh",
-        "devshell": [
-          "digga",
-          "devshell"
-        ],
-        "nixpkgs": [
-          "nixos"
-        ]
-      },
-      "locked": {
-        "lastModified": 1642035816,
-        "narHash": "sha256-1Lq5c1AeUv/1SK08+O704JVfDdD/zodHzA0cv0TIga8=",
-        "owner": "divnix",
-        "repo": "bud",
-        "rev": "a789d710851441ba7e7cd59be378623b1fe05688",
-        "type": "github"
-      },
-      "original": {
-        "owner": "divnix",
-        "repo": "bud",
-        "type": "github"
-      }
-    },
     "darwin": {
       "inputs": {
         "nixpkgs": [
@@ -87,11 +42,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1650976225,
-        "narHash": "sha256-PGM65SQHS63Dd5MmLJo3GJsZP9lJVZmpWxluQoG1Dt8=",
+        "lastModified": 1667419884,
+        "narHash": "sha256-oLNw87ZI5NxTMlNQBv1wG2N27CUzo9admaFlnmavpiY=",
         "owner": "LnL7",
         "repo": "nix-darwin",
-        "rev": "bb3baef6e115ae47bc2ab4973bd3a486488485b0",
+        "rev": "cfc0125eafadc9569d3d6a16ee928375b77e3100",
         "type": "github"
       },
       "original": {
@@ -108,11 +63,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1650976225,
-        "narHash": "sha256-PGM65SQHS63Dd5MmLJo3GJsZP9lJVZmpWxluQoG1Dt8=",
+        "lastModified": 1651916036,
+        "narHash": "sha256-UuD9keUGm4IuVEV6wdSYbuRm7CwfXE63hVkzKDjVsh4=",
         "owner": "LnL7",
         "repo": "nix-darwin",
-        "rev": "bb3baef6e115ae47bc2ab4973bd3a486488485b0",
+        "rev": "2f2bdf658d2b79bada78dc914af99c53cad37cba",
         "type": "github"
       },
       "original": {
@@ -130,11 +85,11 @@
         "utils": "utils"
       },
       "locked": {
-        "lastModified": 1648475189,
-        "narHash": "sha256-gAGAS6IagwoUr1B0ohE3iR6sZ8hP4LSqzYLC8Mq3WGU=",
+        "lastModified": 1659725433,
+        "narHash": "sha256-1ZxuK67TL29YLw88vQ18Y2Y6iYg8Jb7I6/HVzmNB6nM=",
         "owner": "serokell",
         "repo": "deploy-rs",
-        "rev": "83e0c78291cd08cb827ba0d553ad9158ae5a95c3",
+        "rev": "41f15759dd8b638e7b4f299730d94d5aa46ab7eb",
         "type": "github"
       },
       "original": {
@@ -145,18 +100,18 @@
     },
     "devshell": {
       "inputs": {
-        "flake-utils": "flake-utils_2",
+        "flake-utils": "flake-utils",
         "nixpkgs": [
           "digga",
           "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1650389807,
-        "narHash": "sha256-GFRBdHMJ/T/ifaE2GS58RWpxyufH0LqI3oGS6oWAnHk=",
+        "lastModified": 1655976588,
+        "narHash": "sha256-VreHyH6ITkf/1EX/8h15UqhddJnUleb0HgbC3gMkAEQ=",
         "owner": "numtide",
         "repo": "devshell",
-        "rev": "5a53bbf3eb4c908d83884d725a86b3a3bde35979",
+        "rev": "899ca4629020592a13a46783587f6e674179d1db",
         "type": "github"
       },
       "original": {
@@ -188,15 +143,16 @@
         "nixpkgs-unstable": "nixpkgs-unstable"
       },
       "locked": {
-        "lastModified": 1651210705,
-        "narHash": "sha256-2RzKrjEnWDhsBQ4Et2gm2LjV5pXyszeqV1xNe+LtNT8=",
-        "owner": "divnix",
+        "lastModified": 1661600857,
+        "narHash": "sha256-KfQCcTtfvU0PXV4fD9XKIMcKx9lUUR0xWJoBgc12fKE=",
+        "owner": "pub-solar",
         "repo": "digga",
-        "rev": "0ffa2dff5ede12a03ca83fbc514972f94cf18f42",
+        "rev": "c902b3ef0aa45cb4f336c390f647bb182c38a221",
         "type": "github"
       },
       "original": {
-        "owner": "divnix",
+        "owner": "pub-solar",
+        "ref": "fix/bootstrap-iso",
         "repo": "digga",
         "type": "github"
       }
@@ -236,11 +192,27 @@
     "flake-compat_3": {
       "flake": false,
       "locked": {
-        "lastModified": 1648199409,
-        "narHash": "sha256-JwPKdC2PoVBkG6E+eWw3j6BMR6sL3COpYWfif7RVb8Y=",
+        "lastModified": 1650374568,
+        "narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=",
         "owner": "edolstra",
         "repo": "flake-compat",
-        "rev": "64a525ee38886ab9028e6f61790de0832aa3ef03",
+        "rev": "b4a34015c698c7793d592d66adbab377907a2be8",
+        "type": "github"
+      },
+      "original": {
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "type": "github"
+      }
+    },
+    "flake-compat_4": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1650374568,
+        "narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=",
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "rev": "b4a34015c698c7793d592d66adbab377907a2be8",
         "type": "github"
       },
       "original": {
@@ -250,39 +222,6 @@
       }
     },
     "flake-utils": {
-      "locked": {
-        "lastModified": 1631561581,
-        "narHash": "sha256-3VQMV5zvxaVLvqqUrNz3iJelLw30mIVSfZmAaauM3dA=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "7e5bf3925f6fbdfaf50a2a7ca0be2879c4261d19",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
-    "flake-utils-plus": {
-      "inputs": {
-        "flake-utils": "flake-utils_3"
-      },
-      "locked": {
-        "lastModified": 1647259887,
-        "narHash": "sha256-yEkMbEHVO9qydluQ3uHGWX1PkfZhgDKxnd1rhZYZ72w=",
-        "owner": "gytis-ivaskevicius",
-        "repo": "flake-utils-plus",
-        "rev": "06dba5f3b4fa2cc0bfc98ce9cd6f9a4d8db11d46",
-        "type": "github"
-      },
-      "original": {
-        "owner": "gytis-ivaskevicius",
-        "repo": "flake-utils-plus",
-        "type": "github"
-      }
-    },
-    "flake-utils_2": {
       "locked": {
         "lastModified": 1642700792,
         "narHash": "sha256-XqHrk7hFb+zBvRg6Ghl+AZDq03ov6OshJLiSWOoX5es=",
@@ -297,43 +236,47 @@
         "type": "github"
       }
     },
+    "flake-utils-plus": {
+      "inputs": {
+        "flake-utils": "flake-utils_2"
+      },
+      "locked": {
+        "lastModified": 1654029967,
+        "narHash": "sha256-my3GQ3mQIw/1f6GPV1IhUZrcYQSWh0YJAMPNBjhXJDw=",
+        "owner": "gytis-ivaskevicius",
+        "repo": "flake-utils-plus",
+        "rev": "6271cf3842ff9c8a9af9e3508c547f86bc77d199",
+        "type": "github"
+      },
+      "original": {
+        "owner": "gytis-ivaskevicius",
+        "ref": "refs/pull/120/head",
+        "repo": "flake-utils-plus",
+        "type": "github"
+      }
+    },
+    "flake-utils_2": {
+      "locked": {
+        "lastModified": 1644229661,
+        "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
     "flake-utils_3": {
       "locked": {
-        "lastModified": 1644229661,
-        "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=",
+        "lastModified": 1667077288,
+        "narHash": "sha256-bdC8sFNDpT0HK74u9fUkpbf1MEzVYJ+ka7NXCdgBoaA=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
-    "flake-utils_4": {
-      "locked": {
-        "lastModified": 1644229661,
-        "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
-    "flake-utils_5": {
-      "locked": {
-        "lastModified": 1649676176,
-        "narHash": "sha256-OWKJratjt2RW151VUlJPRALb7OU2S5s+f0vLj4o1bHM=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "a4b154ebbdc88c8498a5c7b01589addc9e9cb678",
+        "rev": "6ee9ebb6b1ee695d2cacc4faa053a7b9baa76817",
         "type": "github"
       },
       "original": {
@@ -349,27 +292,27 @@
         ]
       },
       "locked": {
-        "lastModified": 1651007218,
-        "narHash": "sha256-NkQAMtqW0PSJTbLHalyZtaqj0ai2TZMOedug9yDIcFw=",
+        "lastModified": 1667677389,
+        "narHash": "sha256-y9Zdq8vtsn0T5TO1iTvWA7JndYIAGjzCjbYVi/hOSmA=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "d14adb99f3fb562ec74ad18c032efc154b438034",
+        "rev": "87d55517f6f36aa1afbd7a4a064869d5a1d405b8",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
-        "ref": "release-21.11",
+        "ref": "release-22.05",
         "repo": "home-manager",
         "type": "github"
       }
     },
     "latest": {
       "locked": {
-        "lastModified": 1650701402,
-        "narHash": "sha256-XKfstdtqDg+O+gNBx1yGVKWIhLgfEDg/e2lvJSsp9vU=",
+        "lastModified": 1657265485,
+        "narHash": "sha256-PUQ9C7mfi0/BnaAUX2R/PIkoNCb/Jtx9EpnhMBNrO/o=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "bc41b01dd7a9fdffd32d9b03806798797532a5fe",
+        "rev": "b39924fc7764c08ae3b51beef9a3518c414cdb7d",
         "type": "github"
       },
       "original": {
@@ -381,11 +324,11 @@
     },
     "latest_2": {
       "locked": {
-        "lastModified": 1651007983,
-        "narHash": "sha256-GNay7yDPtLcRcKCNHldug85AhAvBpTtPEJWSSDYBw8U=",
+        "lastModified": 1667629849,
+        "narHash": "sha256-P+v+nDOFWicM4wziFK9S/ajF2lc0N2Rg9p6Y35uMoZI=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "e10da1c7f542515b609f8dfbcf788f3d85b14936",
+        "rev": "3bacde6273b09a21a8ccfba15586fb165078fb62",
         "type": "github"
       },
       "original": {
@@ -395,22 +338,6 @@
         "type": "github"
       }
     },
-    "master": {
-      "locked": {
-        "lastModified": 1651837199,
-        "narHash": "sha256-odvwvHfXQDYFtwtywISSS6EDlSN4AfcFZOon4LK9zX8=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "defb285c96a521555d48e8757bc482f71e8dd12f",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "master",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "naersk": {
       "inputs": {
         "nixpkgs": [
@@ -418,11 +345,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1650265945,
-        "narHash": "sha256-SO8+1db4jTOjnwP++29vVgImLIfETSXyoz0FuLkiikE=",
+        "lastModified": 1662220400,
+        "narHash": "sha256-9o2OGQqu4xyLZP9K6kNe1pTHnyPz0Wr3raGYnr9AIgY=",
         "owner": "nmattia",
         "repo": "naersk",
-        "rev": "e8f9f8d037774becd82fce2781e1abdb7836d7df",
+        "rev": "6944160c19cb591eb85bbf9b2f2768a935623ed3",
         "type": "github"
       },
       "original": {
@@ -431,27 +358,6 @@
         "type": "github"
       }
     },
-    "nix-dram": {
-      "inputs": {
-        "flake-utils": "flake-utils_4",
-        "nixpkgs": [
-          "latest"
-        ]
-      },
-      "locked": {
-        "lastModified": 1649569158,
-        "narHash": "sha256-Wtmiyu/1d+3YGGcRxTnQyEtnJaKKR/Ry0kNbOY48Afs=",
-        "owner": "dramforever",
-        "repo": "nix-dram",
-        "rev": "84c47c0dc93c77f7edfd996f71618d278844c1c4",
-        "type": "github"
-      },
-      "original": {
-        "owner": "dramforever",
-        "repo": "nix-dram",
-        "type": "github"
-      }
-    },
     "nixlib": {
       "locked": {
         "lastModified": 1636849918,
@@ -469,16 +375,16 @@
     },
     "nixos": {
       "locked": {
-        "lastModified": 1651093906,
-        "narHash": "sha256-kHXSbv+Hc73eV0/JVJ5YsJGr08bA4vJ3/XZew5PgZg0=",
+        "lastModified": 1667653703,
+        "narHash": "sha256-Xow4vx52/g5zkhlgZnMEm/TEXsj+13jTPCc2jIhW1xU=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "feea25c58657fa81d16e0e51f80e1a02ef4cbd49",
+        "rev": "f09ad462c5a121d0239fde645aacb2221553a217",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
-        "ref": "nixos-21.11",
+        "ref": "nixos-22.05",
         "repo": "nixpkgs",
         "type": "github"
       }
@@ -486,14 +392,14 @@
     "nixos-generators": {
       "inputs": {
         "nixlib": "nixlib",
-        "nixpkgs": "nixpkgs_2"
+        "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1650997411,
-        "narHash": "sha256-r4a3qsSv5UTtx+pxTUEdOphBkwTx1+AAVog3c457A0M=",
+        "lastModified": 1666812839,
+        "narHash": "sha256-0nBDgjPU+iDsvz89W+cDEyhnFGSwCJmwDl/gMGqYiU0=",
         "owner": "nix-community",
         "repo": "nixos-generators",
-        "rev": "3cdf22c79bc80910e2b610cd59fcb8408354ddbc",
+        "rev": "41f3518bc194389df22a3d198215eae75e6b5ab9",
         "type": "github"
       },
       "original": {
@@ -504,11 +410,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1650522846,
-        "narHash": "sha256-SxWHXRI3qJwswyXAtzsi6PKVY3KLNNnb072KaJthII8=",
+        "lastModified": 1667768008,
+        "narHash": "sha256-PGbX0s2hhXGnZDFVE6UIhPSOf5YegpWs5dUXpT/14F0=",
         "owner": "nixos",
         "repo": "nixos-hardware",
-        "rev": "6b4ebea9093c997c5f275c820e679108de4871ab",
+        "rev": "f6483e0def85efb9c1e884efbaff45a5e7aabb34",
         "type": "github"
       },
       "original": {
@@ -518,38 +424,6 @@
       }
     },
     "nixpkgs": {
-      "locked": {
-        "lastModified": 1633971123,
-        "narHash": "sha256-WmI4NbH1IPGFWVkuBkKoYgOnxgwSfWDgdZplJlQ93vA=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "e4ef597edfd8a0ba5f12362932fc9b1dd01a0aef",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable-small",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs-unstable": {
-      "locked": {
-        "lastModified": 1650726686,
-        "narHash": "sha256-hE5PCqQlsdgWH3AUTwesvjZWs5ZUZ8SjMS5cnFB6W54=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "3c0f57e36ed0cf9947281e3b31f1bebb7ce5d4a1",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixpkgs-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_2": {
       "locked": {
         "lastModified": 1637186689,
         "narHash": "sha256-NU7BhgnwA/3ibmCeSzFK6xGi+Bari9mPfn+4cBmyEjw=",
@@ -565,12 +439,27 @@
         "type": "github"
       }
     },
+    "nixpkgs-unstable": {
+      "locked": {
+        "lastModified": 1657292830,
+        "narHash": "sha256-ldfVSTveWceDCmW6gf3B4kR6vwmz/XS80y5wsLLHFJU=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "334ec8b503c3981e37a04b817a70e8d026ea9e84",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "nur": {
       "locked": {
-        "lastModified": 1626378135,
+        "lastModified": 0,
         "narHash": "sha256-koC6DBYmLCrgXA+AMHVaODf1uHYPmvcFygHfy3eg6vI=",
         "path": "/nix/store/6mfkswqi67m35qwv0vh7kpk8rypbl2rq-source",
-        "rev": "00c2ec8f0bbdf0cfb2135bde55fbae5d6b64aa6d",
         "type": "path"
       },
       "original": {
@@ -580,18 +469,18 @@
     },
     "nvfetcher": {
       "inputs": {
-        "flake-compat": "flake-compat_3",
-        "flake-utils": "flake-utils_5",
+        "flake-compat": "flake-compat_4",
+        "flake-utils": "flake-utils_3",
         "nixpkgs": [
           "nixos"
         ]
       },
       "locked": {
-        "lastModified": 1650169042,
-        "narHash": "sha256-x8469XNOU/ebIh5YCuvjcOAaAptwHjkEl1aTFrevu1o=",
+        "lastModified": 1667620329,
+        "narHash": "sha256-v1Zk7rtEbAGpevBGPZvZBKpwbmw4I+uVwxvd+pBlp3o=",
         "owner": "berberman",
         "repo": "nvfetcher",
-        "rev": "db780dba6923e531b5aedca502a36d3d9627fca9",
+        "rev": "294826951113dcd3aa9abbcacfb1aa5b95a19116",
         "type": "github"
       },
       "original": {
@@ -600,45 +489,16 @@
         "type": "github"
       }
     },
-    "poetry2nix": {
-      "inputs": {
-        "flake-utils": [
-          "bud",
-          "beautysh",
-          "flake-utils"
-        ],
-        "nixpkgs": [
-          "bud",
-          "beautysh",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1633382856,
-        "narHash": "sha256-hYlet806M9xJj4yxf0g5fhDT2IEUVIMAl7sqIeZ8DUM=",
-        "owner": "nix-community",
-        "repo": "poetry2nix",
-        "rev": "705cbfa10e3d9bfed2e59e0256844ae3704dbd7e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "poetry2nix",
-        "type": "github"
-      }
-    },
     "root": {
       "inputs": {
         "agenix": "agenix",
-        "bud": "bud",
         "darwin": "darwin",
         "deploy": "deploy",
         "digga": "digga",
+        "flake-compat": "flake-compat_3",
         "home": "home",
         "latest": "latest_2",
-        "master": "master",
         "naersk": "naersk",
-        "nix-dram": "nix-dram",
         "nixos": "nixos",
         "nixos-generators": "nixos-generators",
         "nixos-hardware": "nixos-hardware",

flake.nix

@@ -8,21 +8,19 @@
   inputs =
     {
       # Track channels with commits tested and built by hydra
-      nixos.url = "github:nixos/nixpkgs/nixos-21.11";
+      nixos.url = "github:nixos/nixpkgs/nixos-22.05";
       latest.url = "github:nixos/nixpkgs/nixos-unstable";
-      master.url = "github:nixos/nixpkgs/master";
 
-      digga.url = "github:divnix/digga";
+      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";
 
-      bud.url = "github:divnix/bud";
-      bud.inputs.nixpkgs.follows = "nixos";
-      bud.inputs.devshell.follows = "digga/devshell";
-
-      home.url = "github:nix-community/home-manager/release-21.11";
+      home.url = "github:nix-community/home-manager/release-22.05";
       home.inputs.nixpkgs.follows = "nixos";
 
       darwin.url = "github:LnL7/nix-darwin";
@@ -43,16 +41,11 @@
       nixos-hardware.url = "github:nixos/nixos-hardware";
 
       nixos-generators.url = "github:nix-community/nixos-generators";
-
-      # PubSolarOS additions
-      nix-dram.url = "github:dramforever/nix-dram";
-      nix-dram.inputs.nixpkgs.follows = "latest";
     };
 
   outputs =
     { self
     , digga
-    , bud
     , nixos
     , home
     , nixos-hardware
@@ -60,29 +53,24 @@
     , agenix
     , nvfetcher
     , deploy
-    , nix-dram
     , ...
     } @ inputs:
     digga.lib.mkFlake
       {
         inherit self inputs;
 
-        channelsConfig = { allowUnfree = true; };
+        channelsConfig = {
+          # allowUnfree = true;
+        };
 
         supportedSystems = [ "x86_64-linux" "aarch64-linux" ];
 
         channels = {
           nixos = {
             imports = [ (digga.lib.importOverlays ./overlays) ];
-            overlays = [
-              nur.overlay
-              agenix.overlay
-              nvfetcher.overlay
-              ./pkgs/default.nix
-            ];
+            overlays = [ ];
           };
           latest = { };
-          master = { };
         };
 
         lib = import ./lib { lib = digga.lib // nixos.lib; };
@@ -94,6 +82,10 @@
               our = self.lib;
             });
           })
+          nur.overlay
+          agenix.overlay
+
+          (import ./pkgs)
         ];
 
         nixos = {
@@ -103,27 +95,38 @@
             imports = [ (digga.lib.importExportableModules ./modules) ];
             modules = [
               { lib.our = self.lib; }
-              digga.nixosModules.bootstrapIso
+              # 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
-              bud.nixosModules.bud
             ];
           };
 
           imports = [ (digga.lib.importHosts ./hosts) ];
           hosts = {
             /* set host specific properties here */
-            PubSolarOS = { };
+            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 = [ core users.pub-solar users.root ];
+              base = [ users.pub-solar users.root ];
               iso = base ++ [ base-user graphical pub-solar-iso ];
-              pubsolaros = [ core full-install base-user users.root ];
+              pubsolaros = [ full-install base-user users.root ];
               anonymous = [ pubsolaros users.pub-solar ];
             };
           };
@@ -148,6 +151,5 @@
         homeConfigurations = digga.lib.mkHomeConfigurations self.nixosConfigurations;
 
         deploy.nodes = digga.lib.mkDeployNodes self.nixosConfigurations { };
-      }
-  ;
+      };
 }

hosts/PubSolarOS.nix

@@ -12,4 +12,12 @@
   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,12 +1,22 @@
-{ profiles, ... }:
+{ 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: `bud build bootstrap bootstrapIso`
-  # reachable on the local link via ssh root@fe80::47%eno1
-  # where 'eno1' is replaced by your own machine's network
-  # interface that has the local link to the target machine
+  # build with: `nix build ".#nixosConfigurations.bootstrap.config.system.build.isoImage"`
   imports = [
     # profiles.networking
-    profiles.core
     profiles.users.root # make sure to configure ssh keys
     profiles.users.pub-solar
     profiles.base-user
@@ -14,8 +24,28 @@
     profiles.pub-solar-iso
   ];
 
-  boot.loader.systemd-boot.enable = true;
+  config = {
+    boot.loader.systemd-boot.enable = true;
 
-  # will be overridden by the bootstrapIso instrumentation
-  fileSystems."/" = { device = "/dev/disk/by-label/nixos"; };
+    # 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?
+  };
 }

lib/compat/default.nix

@@ -1,14 +1,14 @@
 let
-  rev = "e7e5d481a0e15dcd459396e55327749989e04ce0";
+  lock = builtins.fromJSON (builtins.readFile builtins.path { path = ../../flake.lock; name = "lockPath"; });
   flake = (import
     (
       fetchTarball {
-        url = "https://github.com/edolstra/flake-compat/archive/${rev}.tar.gz";
-        sha256 = "0zd3x46fswh5n6faq4x2kkpy6p3c6j593xbdlbsl40ppkclwc80x";
+        url = "https://github.com/edolstra/flake-compat/archive/${lock.nodes.flake-compat.locked.rev}.tar.gz";
+        sha256 = lock.nodes.flake-compat.locked.narHash;
       }
     )
     {
-      src = ../../.;
+      src = builtins.path { path = ../../.; name = "projectRoot"; };
     });
 in
 flake

modules/arduino/default.nix

@@ -0,0 +1,23 @@
+{ lib, config, pkgs, ... }:
+with lib;
+let
+  psCfg = config.pub-solar;
+  cfg = config.pub-solar.devops;
+in
+{
+  options.pub-solar.arduino = {
+    enable = mkEnableOption "Life with home automation";
+  };
+  config = mkIf cfg.enable {
+    users.users = pkgs.lib.setAttrByPath [ psCfg.user.name ] {
+      extraGroups = [ "dialout" ];
+    };
+
+    home-manager = with pkgs; pkgs.lib.setAttrByPath [ "users" psCfg.user.name ] {
+      home.packages = [
+        arduino
+        arduino-cli
+      ];
+    };
+  };
+}

modules/audio/default.nix

@@ -9,10 +9,21 @@ in
   options.pub-solar.audio = {
     enable = mkEnableOption "Life in highs and lows";
     mopidy.enable = mkEnableOption "Life with mopidy";
+    spotify.enable = mkEnableOption "Life in DRM";
+    spotify.username = mkOption {
+      description = "Spotify login username or email";
+      type = types.str;
+      example = "yourname@example.com";
+      default = "";
+    };
     bluetooth.enable = mkEnableOption "Life with bluetooth";
   };
 
   config = mkIf cfg.enable {
+    users.users = pkgs.lib.setAttrByPath [ psCfg.user.name ] {
+      extraGroups = [ "audio" ];
+    };
+
     home-manager = with pkgs; pkgs.lib.setAttrByPath [ "users" psCfg.user.name ] {
       home.packages = [
         # easyeffects, e.g. for microphone noise filtering
@@ -24,9 +35,23 @@ in
         # Needed for pactl cmd, until pw-cli is more mature (vol up/down hotkeys?)
         pulseaudio
         vimpc
-      ];
+      ] ++ (if cfg.spotify.enable then [ pkgs.spotify-tui ] else [ ]);
       xdg.configFile."vimpc/vimpcrc".source = ./.config/vimpc/vimpcrc;
       systemd.user.services.easyeffects = import ./easyeffects.service.nix pkgs;
+
+      services.spotifyd = mkIf cfg.spotify.enable {
+        enable = true;
+        settings = {
+          global = {
+            username = cfg.spotify.username;
+            password_cmd = "DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/1001/bus ${pkgs.libsecret}/bin/secret-tool lookup spotify password";
+            bitrate = 320;
+            volume_normalisation = true;
+            no_audio_cache = false;
+            max_cache_size = 1000000000;
+          };
+        };
+      };
     };
 
     # Enable sound using pipewire-pulse
@@ -43,32 +68,19 @@ in
         };
       };
       config.pipewire-pulse = builtins.fromJSON (builtins.readFile ./pipewire-pulse.conf.json);
+    };
 
-      # Bluetooth configuration for pipewire
-      media-session.config.bluez-monitor.rules = mkIf cfg.bluetooth.enable [
-        {
-          # Matches all cards
-          matches = [{ "device.name" = "~bluez_card.*"; }];
-          actions = {
-            "update-props" = {
-              "bluez5.reconnect-profiles" = [ "hfp_hf" "hsp_hs" "a2dp_sink" ];
-              # mSBC is not expected to work on all headset + adapter combinations.
-              "bluez5.msbc-support" = true;
-            };
-          };
+    # Bluetooth configuration using wireplumber
+    # https://nixos.wiki/wiki/PipeWire#Bluetooth_Configuration
+    environment.etc = mkIf cfg.bluetooth.enable {
+      "wireplumber/bluetooth.lua.d/51-bluez-config.lua".text = ''
+        bluez_monitor.properties = {
+          ["bluez5.enable-sbc-xq"] = true,
+          ["bluez5.enable-msbc"] = true,
+          ["bluez5.enable-hw-volume"] = true,
+          ["bluez5.headset-roles"] = "[ hsp_hs hsp_ag hfp_hf hfp_ag ]"
         }
-        {
-          matches = [
-            # Matches all sources
-            { "node.name" = "~bluez_input.*"; }
-            # Matches all outputs
-            { "node.name" = "~bluez_output.*"; }
-          ];
-          actions = {
-            "node.pause-on-idle" = false;
-          };
-        }
-      ];
+      '';
     };
 
     # Enable bluetooth

modules/audio/mopidy.nix

@@ -1,7 +1,6 @@
 pkgs: {
   enable = true;
   extensionPackages = with pkgs; [
-    mopidy-spotify
     mopidy-mpd
     mopidy-soundcloud
     mopidy-youtube

modules/ci-runner/default.nix

@@ -0,0 +1,41 @@
+{ lib, config, pkgs, self, ... }:
+with lib;
+let
+  psCfg = config.pub-solar;
+  cfg = config.pub-solar.ci-runner;
+in
+{
+  options.pub-solar.ci-runner = {
+    enable = mkEnableOption "Enables a systemd service that runs drone-ci-runner";
+  };
+
+  config = mkIf cfg.enable {
+    systemd.user.services.ci-runner = {
+      enable = true;
+
+      description = "CI runner for the PubSolarOS repository that can run test VM instances with KVM.";
+
+      serviceConfig = {
+        Type = "simple";
+        Restart = "always";
+      };
+
+      path = [
+        pkgs.git
+        pkgs.nix
+        pkgs.libvirt
+      ];
+
+      wantedBy = [ "multi-user.target" ];
+      after = [ "network.target" "libvirtd.service" ];
+
+      script = ''${pkgs.drone-runner-exec}/bin/drone-runner-exec daemon /run/agenix/drone-runner-exec-config'';
+    };
+
+    age.secrets."drone-runner-exec-config" = {
+      file = "${self}/secrets/drone-runner-exec-config";
+      mode = "700";
+      owner = psCfg.user.name;
+    };
+  };
+}

modules/core/boot.nix

@@ -0,0 +1,42 @@
+{ config, pkgs, lib, ... }:
+with lib;
+let
+  cfg = config.pub-solar.core;
+in
+{
+  options.pub-solar.core.iso-options.enable = mkOption {
+    type = types.bool;
+    default = false;
+    description = "Feature flag for iso builds";
+  };
+
+  options.pub-solar.core.disk-encryption-active = mkOption {
+    type = types.bool;
+    default = true;
+    description = "Whether it should be assumed that there is a cryptroot device";
+  };
+
+  config = {
+    boot = {
+      # Enable plymouth for better experience of booting
+      plymouth.enable = mkIf (!cfg.lite) (lib.mkDefault true);
+
+      # Mount / luks device in initrd
+      # Allow fstrim to work on it.
+      # The ! makes this enabled by default
+      initrd = mkIf (!cfg.iso-options.enable && cfg.disk-encryption-active) {
+        luks.devices."cryptroot" = {
+          allowDiscards = true;
+        };
+      };
+
+      loader.systemd-boot.enable = true;
+
+      # Use latest LTS linux kernel by default
+      kernelPackages = pkgs.linuxPackages_5_15;
+
+      # Support ntfs drives
+      supportedFilesystems = [ "ntfs" ];
+    };
+  };
+}

modules/core/default.nix

@@ -0,0 +1,41 @@
+{ config, lib, ... }:
+
+with lib;
+let
+  cfg = config.pub-solar.core;
+in
+{
+  imports = [
+    ./boot.nix
+    ./hibernation.nix
+    ./fonts.nix
+    ./i18n.nix
+    ./networking.nix
+    ./nix.nix
+    ./packages.nix
+    ./services.nix
+  ];
+
+  options.pub-solar.core = {
+    lite = mkOption {
+      description = ''
+        Enable a lite edition of core with less default modules and a reduced package set.
+      '';
+      default = false;
+      type = types.bool;
+    };
+  };
+
+  config = {
+    pub-solar = {
+      audio.enable = mkIf (!cfg.lite) (mkDefault true);
+      crypto.enable = mkIf (!cfg.lite) (mkDefault true);
+      devops.enable = mkIf (!cfg.lite) (mkDefault true);
+
+      terminal-life = {
+        enable = mkDefault true;
+        lite = cfg.lite;
+      };
+    };
+  };
+}

modules/core/fonts.nix

@@ -0,0 +1,12 @@
+{ config, pkgs, lib, ... }:
+
+{
+  fonts = {
+    fonts = with pkgs; [ powerline-fonts dejavu_fonts ];
+    fontconfig.defaultFonts = {
+      monospace = [ "DejaVu Sans Mono for Powerline" ];
+      sansSerif = [ "DejaVu Sans" ];
+    };
+  };
+}
+

modules/core/hibernation.nix

@@ -0,0 +1,33 @@
+{ config, pkgs, lib, ... }:
+with lib;
+let
+  cfg = config.pub-solar.core.hibernation;
+in
+{
+  options.pub-solar.core.hibernation = {
+    enable = mkOption {
+      type = types.bool;
+      default = false;
+      description = "Whether the device can hibernate. This creates a swapfile at /swapfile.";
+    };
+
+    resumeDevice = mkOption {
+      type = types.str;
+      default = "/dev/sda1";
+      description = "The location of the hibernation resume swap file.";
+    };
+
+    resumeOffset = mkOption {
+      type = types.nullOr types.int;
+      default = null;
+      description = "The swap file offset. Can be found by running `filefrag -v $swap_file_location`. See https://wiki.archlinux.org/title/Power_management/Suspend_and_hibernate#Hibernation_into_swap_file";
+    };
+  };
+
+  config = {
+    boot = mkIf cfg.enable {
+      resumeDevice = cfg.resumeDevice;
+      kernelParams = mkIf (cfg.resumeOffset != null) [ "resume_offset=${builtins.toString cfg.resumeOffset}" ];
+    };
+  };
+}

modules/core/networking.nix

@@ -0,0 +1,81 @@
+{ config, pkgs, lib, ... }:
+
+with lib;
+
+let cfg = config.pub-solar.core;
+in
+{
+  options.pub-solar.core = {
+    enableCaddy = mkOption {
+      type = types.bool;
+      default = !cfg.lite;
+    };
+    enableHelp = mkOption {
+      type = types.bool;
+      default = !cfg.lite;
+    };
+
+    binaryCaches = mkOption {
+      type = types.listOf types.str;
+      default = [ ];
+      description = "Binary caches to use.";
+    };
+    publicKeys = mkOption {
+      type = types.listOf types.str;
+      default = [ ];
+      description = "Public keys of binary caches.";
+    };
+  };
+  config = {
+    # disable NetworkManager-wait-online by default
+    systemd.services.NetworkManager-wait-online.enable = lib.mkDefault false;
+
+    networking.networkmanager = {
+      # Enable networkmanager. REMEMBER to add yourself to group in order to use nm related stuff.
+      enable = true;
+      wifi.backend = "iwd";
+    };
+
+    networking.firewall.enable = true;
+
+    # Customized binary caches list (with fallback to official binary cache)
+    nix.binaryCaches = cfg.binaryCaches;
+    nix.binaryCachePublicKeys = cfg.publicKeys;
+
+    # These entries get added to /etc/hosts
+    networking.hosts = {
+      "127.0.0.1" = [ ]
+        ++ lib.optionals cfg.enableCaddy [ "caddy.local" ]
+        ++ lib.optionals config.pub-solar.printing.enable [ "cups.local" ]
+        ++ lib.optionals cfg.enableHelp [ "help.local" ];
+    };
+
+    # Caddy reverse proxy for local services like cups
+    services.caddy = {
+      enable = cfg.enableCaddy;
+      globalConfig = ''
+        default_bind 127.0.0.1
+        auto_https off
+      '';
+      extraConfig = concatStringsSep "\n" [
+        (lib.optionalString
+          config.pub-solar.printing.enable
+          ''
+            cups.local:80 {
+              request_header Host localhost:631
+              reverse_proxy unix//run/cups/cups.sock
+            }
+          '')
+
+        (lib.optionalString
+          cfg.enableHelp
+          ''
+            help.local:80 {
+              root * ${pkgs.psos-docs}/lib/html
+              file_server
+            }
+          '')
+      ];
+    };
+  };
+}

modules/core/nix.nix

@@ -0,0 +1,25 @@
+{ config, pkgs, lib, inputs, ... }:
+
+{
+  nix = {
+    # Use default version alias for nix package
+    package = pkgs.nix;
+    # Improve nix store disk usage
+    autoOptimiseStore = true;
+    gc.automatic = true;
+    optimise.automatic = true;
+    # Prevents impurities in builds
+    useSandbox = true;
+    # give root and @wheel special privileges with nix
+    trustedUsers = [ "root" "@wheel" ];
+    # This is just a representation of the nix default
+    systemFeatures = [ "nixos-test" "benchmark" "big-parallel" "kvm" ];
+    # Generally useful nix option defaults
+    extraOptions = ''
+      min-free = 536870912
+      keep-outputs = true
+      keep-derivations = true
+      fallback = true
+    '';
+  };
+}

modules/core/packages.nix

@@ -0,0 +1,75 @@
+{ config, pkgs, lib, ... }:
+
+with lib;
+let
+  psCfg = config.pub-solar;
+  cfg = config.pub-solar.core;
+in
+{
+  environment = {
+    systemPackages = with pkgs; [
+      # Core unix utility packages
+      coreutils-full
+      dnsutils
+      inetutils
+      progress
+      pciutils
+      usbutils
+
+      wget
+      openssl
+      openssh
+      curl
+      htop
+      lsof
+      psmisc
+      file
+
+      # zippit
+      zip
+      unzip
+
+      # Modern modern utilities
+      p7zip
+      croc
+      jq
+    ]
+
+    ++ lib.optionals (!cfg.lite) [
+      mtr
+
+      gitFull
+      git-lfs
+      git-bug
+
+      xdg-utils
+      sysfsutils
+      renameutils
+      nfs-utils
+      moreutils
+      mailutils
+      keyutils
+      input-utils
+      elfutils
+      binutils
+      dateutils
+      diffutils
+      findutils
+      exfat
+
+      # Nix specific utilities
+      niv
+      manix
+      nix-index
+      nix-tree
+      nixpkgs-review
+      # Build broken, python2.7-PyJWT-2.0.1.drv' failed
+      #nixops
+      psos
+      nvd
+
+      # Fun
+      neofetch
+    ];
+  };
+}

modules/core/services.nix

@@ -0,0 +1,15 @@
+{ config, pkgs, lib, ... }:
+
+{
+  # For rage encryption, all hosts need a ssh key pair
+  services.openssh = {
+    enable = true;
+    # If you don't want the host to have SSH actually opened up to the net,
+    # set `services.openssh.openFirewall` to false in your config.
+    openFirewall = lib.mkDefault true;
+    passwordAuthentication = false;
+  };
+
+  # Service that makes Out of Memory Killer more effective
+  services.earlyoom.enable = true;
+}

modules/graphical/alacritty.nix

@@ -100,10 +100,15 @@
       foreground = "0xe3e1e4";
     };
 
-    # Colors the cursor will use if `custom_cursor_colors` is true
+    # Cursor colors
+    #
+    # Colors which should be used to draw the terminal cursor.
+    #
+    # Allowed values are CellForeground/CellBackground, which reference the
+    # affected cell, or hexadecimal colors like #ff00ff.
     cursor = {
-      text = "0x1a181a";
-      cursor = "0xe3e1e4";
+      text = "CellBackground";
+      cursor = "CellForeground";
     };
 
     # Colors used for the search bar and match highlighting.
@@ -115,14 +120,25 @@
         background = "0x1a181a";
       };
       focused_match = {
-        foreground = "0xe5c463";
-        background = "0xe3e1e4";
+        foreground = "CellBackground";
+        background = "CellForeground";
       };
       #bar =
       #  background = "#c5c8c6";
       #  foreground = "#1d1f21";
     };
 
+    # Selection colors
+    #
+    # Colors which should be used to draw the selection area.
+    #
+    # Allowed values are CellForeground/CellBackground, which reference the
+    # affected cell, or hexadecimal colors like #ff00ff.
+    selection = {
+      text = "0x1a181a";
+      background = "0xf85e84";
+    };
+
     # Normal colors
     normal = {
       black = "0x1a181a";

modules/graphical/default.nix

@@ -5,17 +5,19 @@ let
   cfg = config.pub-solar.graphical;
   yamlFormat = pkgs.formats.yaml { };
   recursiveMerge = attrList:
-    let f = attrPath:
-      zipAttrsWith (n: values:
-        if tail values == [ ]
-        then head values
-        else if all isList values
-        then unique (concatLists values)
-        else if all isAttrs values
-        then f (attrPath ++ [ n ]) values
-        else last values
-      );
-    in f [ ] attrList;
+    let
+      f = attrPath:
+        zipAttrsWith (n: values:
+          if tail values == [ ]
+          then head values
+          else if all isList values
+          then unique (concatLists values)
+          else if all isAttrs values
+          then f (attrPath ++ [ n ]) values
+          else last values
+        );
+    in
+    f [ ] attrList;
 in
 {
   options.pub-solar.graphical = {
@@ -59,7 +61,7 @@ in
       };
     };
 
-    services.getty.autologinUser = mkIf cfg.autologin.enable "${psCfg.user.name}";
+    services.getty.autologinUser = mkIf cfg.autologin.enable (mkForce "${psCfg.user.name}");
 
     qt5 = {
       enable = true;
@@ -77,7 +79,6 @@ in
 
     fonts.enableDefaultFonts = true;
     fonts.fonts = with pkgs; [
-      corefonts
       fira-code
       fira-code-symbols
       google-fonts

modules/paranoia/default.nix

@@ -0,0 +1,52 @@
+{ config, lib, ... }:
+
+with lib;
+let
+  psCfg = config.pub-solar;
+  cfg = config.pub-solar.paranoia;
+in
+{
+  options.pub-solar.paranoia = {
+    enable = mkOption {
+      description = ''
+        Only offer hibernation instead of screen locking and sleeping. This only makes sense
+        if your hard drive is encrypted, and ensures that the contents of your drive are
+        encrypted if you are not actively using the device.
+      '';
+      default = false;
+      type = types.bool;
+    };
+  };
+
+  config = mkIf cfg.enable {
+    pub-solar.core.hibernation.enable = true;
+    services.logind.lidSwitch = "hibernate";
+
+    # 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
+    security.sudo.execWheelOnly = true;
+
+    # Remove the complete default environment of packages like
+    # nano, perl and rsync
+    environment.defaultPackages = lib.mkForce [ ];
+
+    # fileSystems."/".options = [ "noexec" ];
+
+    services.openssh = {
+      kbdInteractiveAuthentication = false;
+      extraConfig = ''
+        AllowTcpForwarding yes
+        X11Forwarding no
+        AllowAgentForwarding no
+        AllowStreamLocalForwarding no
+        AuthenticationMethods publickey
+      '';
+    };
+  };
+}

modules/printing/default.nix

@@ -21,10 +21,6 @@ in
     services.printing.defaultShared = false;
     services.printing.drivers = [
       pkgs.gutenprint
-      pkgs.brgenml1lpr
-      pkgs.brgenml1cupswrapper
-      pkgs.brlaser
-      pkgs.cups-brother-hl3140cw
     ];
     hardware.sane = {
       enable = true;

modules/social/default.nix

@@ -12,7 +12,7 @@ in
   config = mkIf cfg.enable {
     home-manager = with pkgs; pkgs.lib.setAttrByPath [ "users" psCfg.user.name ] {
       home.packages = [
-        ps-signal-desktop
+        signal-desktop
         tdesktop
         element-desktop
         irssi

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

@@ -14,8 +14,9 @@ assign [app_id="telegramdesktop"] $ws4
 # Launcher
 for_window [app_id="launcher" title="Alacritty"] floating enable, border pixel 10, sticky enable
 
+for_window [app_id="pavucontrol"] floating enable, border pixel 10, sticky enable
+
 # Floating menus
-for_window [app_id="pavucontrol"] floating enable
 for_window [app_id="blueman-manager"] floating enable
 
 # Open specific applications in floating mode
@@ -58,10 +59,15 @@ for_window [window_role="task_dialog"] floating enable
 for_window [window_role="Preferences"] floating enable
 for_window [window_type="dialog"] floating enable
 for_window [window_type="menu"] floating enable
-for_window [title="About Mozilla Firefox"] floating enabled
-for_window [title="Password Required - Mozilla Firefox"] floating enabled
-for_window [title="Firefox — Sharing Indicator"] floating enabled
-for_window [title="Extension: (Open in Browser)*"] floating enabled
+for_window [title="About Mozilla Firefox"] floating enable
+for_window [title="Password Required - Mozilla Firefox"] floating enable
+for_window [title="Extension: (Open in Browser)*"] floating enable
+
+# Technical media stuff happens on ws7
+for_window [app_id="screen-recorder" title="Alacritty"] move to workspace $ws7, floating disable
+no_focus   [app_id="screen-recorder"]
+for_window [title="Firefox — Sharing Indicator"] move to workspace $ws7, floating disable
+no_focus   [title="Firefox — Sharing Indicator"]
 
 # qMasterPassword floating menu
 for_window [title="qMasterPassword"] focus

modules/sway/config/config.d/custom-keybindings.conf

@@ -13,41 +13,26 @@ bindsym $mod+Ctrl+m exec pavucontrol
 ################################################################################################
 
 # Quickstart application shortcuts
-bindsym $mod+F1 exec qMasterPassword
+bindsym $mod+F1 exec psos help
+bindsym $mod+Shift+h exec psos help
+
 bindsym $mod+F2 exec firefox
+
 bindsym $mod+F3 exec $term -e vifm
 bindsym $mod+Shift+F3 exec gksu $term -e vifm
+
 bindsym $mod+F4 exec nautilus -w
-bindsym $mod+Shift+F4 exec signal-desktop
-bindsym $mod+F5 exec $term -e 'mocp -C $XDG_CONFIG_DIR/mocp/config'
-bindsym $mod+Shift+m exec mu
-bindsym $mod+Shift+h exec xdg-open /usr/share/doc/manjaro/i3_help.pdf
+bindsym $mod+Shift+F4 exec signal-desktop --use-tray-icon
 
-# Notifications with swaynotificationcenter
-# Toggle control center
-bindsym $mod+Shift+n exec swaync-client -t -sw
+bindsym $mod+Shift+m exec qMasterPassword
 
-# Screenshots
+# Screenshots and screen recordings
 bindsym $mod+Ctrl+p exec grim -g "$(slurp -d -b \#ffffff11)" ~/Pictures/Screenshots/$(date +%Y%m%d_%Hh%Mm%Ss)_grim.png
 bindsym $mod+Shift+p exec grim ~/Pictures/Screenshots/$(date +%Y%m%d_%Hh%Mm%Ss)_grim.png
 bindsym $mod+Ctrl+f exec "( pkill flameshot || true && flameshot & ) && ( sleep 0.5s && flameshot gui )"
 
+bindsym $mod+Ctrl+r exec record-screen
+
 # Launcher
 set $menu exec alacritty --class launcher -e env TERMINAL_COMMAND="alacritty -e" sway-launcher
 bindsym $mod+Space exec $menu
-
-# Set shut down, restart and locking features
-set $mode_system (l)ock, (e)xit, (s)uspend, (h)ibernate, (r)eboot, (Shift+s)hutdown
-bindsym $mod+0 mode "$mode_system"
-mode "$mode_system" {
-    bindsym l exec swaylock-bg, mode "default"
-    bindsym e exec systemctl --user stop graphical-session.target, mode "default"
-    bindsym s exec systemctl suspend, mode "default"
-    bindsym h exec systemctl hibernate, mode "default"
-    bindsym r exec systemctl reboot, mode "default"
-    bindsym Shift+s exec systemctl poweroff, mode "default"
-
-    # exit system mode: "Enter" or "Escape"
-    bindsym Return mode "default"
-    bindsym Escape mode "default"
-}

modules/sway/config/config.d/mode_system.conf.nix

@@ -0,0 +1,28 @@
+{ pkgs, psCfg, ... }: ''
+  # Set shut down, restart and locking features
+'' + (if psCfg.core.hibernation.enable && !psCfg.paranoia.enable then ''
+  set $mode_system (e)xit, (h)ibernate, (l)ock, (s)uspend, (r)eboot, (Shift+s)hutdown
+'' else if psCfg.paranoia.enable then ''
+  set $mode_system (e)xit, (h)ibernate, (r)eboot, (Shift+s)hutdown
+'' else ''
+  set $mode_system (e)xit, (l)ock, (s)uspend, (r)eboot, (Shift+s)hutdown
+'')
++ ''
+  bindsym $mod+0 mode "$mode_system"
+  mode "$mode_system" {
+      bindsym e exec swaymsg exit, mode "default"
+'' + (if psCfg.core.hibernation.enable then ''
+      bindsym h exec systemctl hibernate, mode "default"
+'' else "")
++ (if !psCfg.paranoia.enable then ''
+      bindsym l exec ${pkgs.swaylock-bg}/bin/swaylock-bg, mode "default"
+      bindsym s exec systemctl suspend, mode "default"
+'' else "") + ''
+      bindsym r exec systemctl reboot, mode "default"
+      bindsym Shift+s exec systemctl poweroff, mode "default"
+
+      # exit system mode: "Enter" or "Escape"
+      bindsym Return mode "default"
+      bindsym Escape mode "default"
+  }
+''

modules/sway/config/config.d/systemd.conf

@@ -5,4 +5,4 @@
 # https://github.com/swaywm/sway/wiki/Systemd-integration
 # Also, import the most important environment variables into the D-Bus and systemd
 # user environments (e.g. required for screen sharing and Pinentry prompts):
-exec "systemctl --user import-environment DISPLAY WAYLAND_DISPLAY SWAYSOCK XDG_CURRENT_DESKTOP; systemctl --user start sway-session.target; exec dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK XDG_CURRENT_DESKTOP; systemd-cat --identifier=sway sway"
+exec "systemctl --user import-environment; systemctl --user start sway-session.target; exec dbus-update-activation-environment --systemd $IMPORT_ENVIRONMENT_ENV_LIST DISPLAY WAYLAND_DISPLAY SWAYSOCK XDG_CURRENT_DESKTOP; systemd-cat --identifier=sway sway"

modules/sway/config/config.nix

@@ -50,7 +50,7 @@
       floating_modifier $mod normal
 
       # Reload the configuration file
-      bindsym $mod+Ctrl+r reload
+      bindsym $mod+F5 reload
 
   #
   # Moving around:

modules/sway/default.nix

@@ -2,25 +2,26 @@
 with lib;
 let
   psCfg = config.pub-solar;
-  cfg = config.pub-solar.sway;
 in
 {
   options.pub-solar.sway = {
     enable = mkEnableOption "Life in boxes";
-  };
-  options.pub-solar.sway.terminal = mkOption {
-    type = types.nullOr types.str;
-    default = "alacritty";
-    description = "Choose sway's default terminal";
-  };
-  options.pub-solar.sway.v4l2loopback.enable = mkOption {
-    type = types.bool;
-    default = true;
-    description = "WebCam streaming tool";
+
+    terminal = mkOption {
+      type = types.nullOr types.str;
+      default = "alacritty";
+      description = "Choose sway's default terminal";
+    };
+
+    v4l2loopback.enable = mkOption {
+      type = types.bool;
+      default = true;
+      description = "WebCam streaming tool";
+    };
   };
 
-  config = mkIf cfg.enable (mkMerge [
-    (mkIf (cfg.v4l2loopback.enable) {
+  config = mkIf psCfg.sway.enable (mkMerge [
+    (mkIf (psCfg.sway.v4l2loopback.enable) {
       boot.extraModulePackages = with config.boot.kernelPackages; [ v4l2loopback ];
       boot.kernelModules = [ "v4l2loopback" ];
       boot.extraModprobeConfig = ''
@@ -60,7 +61,6 @@ in
           kanshi
           mako
           slurp
-          swaynotificationcenter
           swayidle
           swaylock
           swaybg
@@ -76,8 +76,8 @@ in
           xsettingsd
           ydotool
 
-          swaylock-bg
           sway-launcher
+          record-screen
           import-gtk-settings
           s
           wcwd
@@ -86,18 +86,19 @@ in
         programs.waybar.enable = true;
         #programs.waybar.systemd.enable = true;
 
-        systemd.user.services.swaynotificationcenter = import ./swaynotificationcenter.service.nix pkgs;
-        systemd.user.services.sway = import ./sway.service.nix pkgs;
-        systemd.user.services.swayidle = import ./swayidle.service.nix pkgs;
-        systemd.user.services.xsettingsd = import ./xsettingsd.service.nix pkgs;
-        systemd.user.services.waybar = import ./waybar.service.nix pkgs;
-        systemd.user.targets.sway-session = import ./sway-session.target.nix pkgs;
+        systemd.user.services.mako = import ./mako.service.nix { inherit pkgs psCfg; };
+        systemd.user.services.sway = import ./sway.service.nix { inherit pkgs psCfg; };
+        systemd.user.services.swayidle = import ./swayidle.service.nix { inherit pkgs psCfg; };
+        systemd.user.services.xsettingsd = import ./xsettingsd.service.nix { inherit pkgs psCfg; };
+        systemd.user.services.waybar = import ./waybar.service.nix { inherit pkgs psCfg; };
+        systemd.user.targets.sway-session = import ./sway-session.target.nix { inherit pkgs psCfg; };
 
         xdg.configFile."sway/config".text = import ./config/config.nix { inherit config pkgs; };
         xdg.configFile."sway/config.d/colorscheme.conf".source = ./config/config.d/colorscheme.conf;
         xdg.configFile."sway/config.d/theme.conf".source = ./config/config.d/theme.conf;
         xdg.configFile."sway/config.d/gaps.conf".source = ./config/config.d/gaps.conf;
         xdg.configFile."sway/config.d/custom-keybindings.conf".source = ./config/config.d/custom-keybindings.conf;
+        xdg.configFile."sway/config.d/mode_system.conf".text = import ./config/config.d/mode_system.conf.nix { inherit pkgs psCfg; };
         xdg.configFile."sway/config.d/applications.conf".source = ./config/config.d/applications.conf;
         xdg.configFile."sway/config.d/systemd.conf".source = ./config/config.d/systemd.conf;
       };

modules/sway/gammastep.service.nix

@@ -1,4 +1,4 @@
-pkgs:
+{ pkgs, ... }:
 {
   Unit = {
     Description = "set color temperature of display according to time of day";

modules/sway/libinput-gestures.service.nix

@@ -1,4 +1,4 @@
-pkgs:
+{ pkgs, ... }:
 {
   Unit = {
     Description = "Actions gestures on your touchpad using libinput";

modules/sway/mako.service.nix

@@ -0,0 +1,19 @@
+{ pkgs, ... }:
+{
+  Unit = {
+    Description = "Lightweight Wayland notification daemon";
+    Documentation = [ "man:mako(1)" ];
+    BindsTo = [ "sway-session.target" ];
+    After = [ "sway-session.target" ];
+    ConditionEnvironment = [ "WAYLAND_DISPLAY" ];
+  };
+  Service = {
+    Type = "dbus";
+    BusName = "org.freedesktop.Notifications";
+    ExecStart = "${pkgs.mako}/bin/mako";
+    ExecReload = "${pkgs.mako}/bin/makoctl reload";
+  };
+  Install = {
+    WantedBy = [ "sway-session.target" ];
+  };
+}

modules/sway/sway-session.target.nix

@@ -1,4 +1,4 @@
-pkgs:
+{ pkgs, ... }:
 {
   Unit = {
     Description = "sway compositor session";

modules/sway/sway.service.nix

@@ -1,4 +1,4 @@
-pkgs:
+{ pkgs, ... }:
 {
   Unit = {
     Description = "sway - SirCmpwn's Wayland window manager";

modules/sway/swayidle.service.nix

@@ -1,4 +1,4 @@
-pkgs:
+{ pkgs, psCfg, ... }:
 {
   Unit = {
     Description = "Idle manager for Wayland";
@@ -9,13 +9,16 @@ pkgs:
   };
   Service = {
     Type = "simple";
-    Environment = "PATH=/run/current-system/sw/bin:${pkgs.sway}/bin:${pkgs.swaylock}/bin:${pkgs.swaylock-bg}/bin";
-    ExecStart = ''${pkgs.swayidle}/bin/swayidle -w \
-      timeout 600 'swaylock-bg' \
-      timeout 900 'swaymsg "output * dpms off"' \
-      resume 'swaymsg "output * dpms on"' \
-      before-sleep 'swaylock-bg'
-    '';
+    Environment = "PATH=/run/current-system/sw/bin:${pkgs.sway}/bin:${pkgs.swaylock-bg}/bin:${pkgs.swayidle}/bin";
+    ExecStart = ''swayidle -w \
+        after-resume 'swaymsg "output * dpms on"' \
+        before-sleep 'swaylock-bg' '' + (if psCfg.paranoia.enable then '' \
+        timeout 120 'swaymsg "output * dpms off"' resume 'swaymsg "output * dpms on"' \
+        timeout 150 'systemctl hibernate'
+      '' else '' \
+        timeout 600 'swaylock-bg' \
+        timeout 900 'swaymsg "output * dpms off"' resume 'swaymsg "output * dpms on"'
+      '');
   };
   Install = {
     WantedBy = [ "sway-session.target" ];

modules/sway/swaynotificationcenter.service.nix

@@ -1,22 +0,0 @@
-pkgs:
-{
-  Unit = {
-    Description = "Swaync notification daemon";
-    Documentation = "https://github.com/ErikReider/SwayNotificationCenter";
-    BindsTo = [ "sway-session.target" ];
-    After = [ "sway-session.target" ];
-    Requisite = [ "graphical-session.target" ];
-    # ConditionEnvironment requires systemd v247 to work correctly
-    ConditionEnvironment = [ "WAYLAND_DISPLAY" ];
-  };
-  Service = {
-    Type = "dbus";
-    BusName = "org.freedesktop.Notifications";
-    ExecStart = "${pkgs.swaynotificationcenter}/bin/swaync";
-    ExecReload = "${pkgs.swaynotificationcenter}/bin/swaync-client --reload-config ; ${pkgs.swaynotificationcenter}/bin/swaync-client --reload-css";
-    Restart = "on-failure";
-  };
-  Install = {
-    WantedBy = [ "sway-session.target" ];
-  };
-}

modules/sway/waybar.service.nix

@@ -1,16 +1,17 @@
-pkgs:
+{ pkgs, ... }:
 {
   Unit = {
     Description = "Highly customizable Wayland bar for Sway and Wlroots based compositors.";
     Documentation = "https://github.com/Alexays/Waybar/wiki/";
     BindsTo = [ "sway-session.target" ];
-    After = [ "graphical-session-pre.target" "network-online.target" ];
+    After = [ "sway-session.target" "network-online.target" ];
     Wants = [ "graphical-session-pre.target" "network-online.target" "blueman-applet.service" ];
+    ConditionEnvironment = [ "WAYLAND_DISPLAY" ];
   };
 
   Service = {
     Type = "dbus";
-    Environment = "PATH=${pkgs.bash}/bin:${pkgs.pavucontrol}/bin:${pkgs.swaynotificationcenter}/bin";
+    Environment = "PATH=${pkgs.bash}/bin:${pkgs.pavucontrol}/bin";
     BusName = "fr.arouillard.waybar";
     ExecStart = "${pkgs.waybar}/bin/waybar";
   };

modules/sway/xsettingsd.service.nix

@@ -1,4 +1,4 @@
-pkgs:
+{ pkgs, ... }:
 {
   Unit = {
     Description = "X Settings Daemon";

modules/sway/ydotool.service.nix

@@ -1,4 +1,4 @@
-pkgs:
+{ pkgs, ... }:
 {
   Unit = {
     Description = "ydotool - Generic command-line automation tool (no X!)";

modules/terminal-life/default.nix

@@ -7,6 +7,14 @@ in
 {
   options.pub-solar.terminal-life = {
     enable = mkEnableOption "Life in black and white";
+
+    lite = mkOption {
+      description = ''
+        Enable a lite edition of terminal-life with less modules and a reduced package set.
+      '';
+      default = false;
+      type = types.bool;
+    };
   };
 
   config = mkIf cfg.enable {
@@ -27,7 +35,6 @@ in
       home.packages = [
         ack
         asciinema
-        ag
         bat
         exa
         fd
@@ -35,6 +42,7 @@ in
         glow
         nnn
         powerline
+        silver-searcher
         vifm
         watson
       ];

modules/terminal-life/nvim/default.nix

@@ -1,49 +1,10 @@
 { config, pkgs, ... }:
 let
   psCfg = config.pub-solar;
+  cfg = config.pub-solar.terminal-life;
   xdg = config.home-manager.users."${psCfg.user.name}".xdg;
 
   preview-file = pkgs.writeShellScriptBin "preview-file" (import ./preview-file.nix pkgs);
-
-  instant-nvim = pkgs.vimUtils.buildVimPlugin {
-    name = "instant";
-    src = pkgs.fetchFromGitHub {
-      owner = "jbyuki";
-      repo = "instant.nvim";
-      rev = "c02d72267b12130609b7ad39b76cf7f4a3bc9554";
-      sha256 = "sha256-7Pr2Au/oGKp5kMXuLsQY4BK5Wny9L1EBdXtyS5EaZPI=";
-    };
-  };
-
-  workspace = pkgs.vimUtils.buildVimPlugin {
-    name = "vim-workspace";
-    src = pkgs.fetchFromGitHub {
-      owner = "thaerkh";
-      repo = "vim-workspace";
-      rev = "c26b473f9b073f24bacecd38477f44c5cd1f5a62";
-      sha256 = "sha256-XV7opLyfkHIDO0+JJaO/x0za0gsHuklrzapTGdLHJmI=";
-    };
-  };
-
-  beautify = pkgs.vimUtils.buildVimPlugin {
-    name = "vim-beautify";
-    src = pkgs.fetchFromGitHub {
-      owner = "zeekay";
-      repo = "vim-beautify";
-      rev = "e0691483927dc5a0c051433602397419f9628623";
-      sha256 = "QPTCl6KaGcAjTS5yVDov9yxmv0fDaFoPLMsrtVIG6GQ=";
-    };
-  };
-
-  apprentice = pkgs.vimUtils.buildVimPlugin {
-    name = "vim-apprentice";
-    src = pkgs.fetchFromGitHub {
-      owner = "romainl";
-      repo = "Apprentice";
-      rev = "ecd41698037f15a58125b349be76dbd2595bfb6d";
-      sha256 = "sha256-9s7Yzn3IEJBjcyUq9NBIQ9wb45Xr7jOkEIoWf0lAYYg=";
-    };
-  };
 in
 {
   enable = true;
@@ -56,7 +17,7 @@ in
   withRuby = true;
   withPython3 = true;
 
-  extraPackages = with pkgs; [
+  extraPackages = with pkgs; lib.mkIf (!cfg.lite) [
     ccls
     gopls
     nodejs
@@ -87,7 +48,7 @@ in
     lsp_extensions-nvim
     nvim-lspconfig
 
-    instant-nvim
+    instant-nvim-nvfetcher
 
     ack-vim
     vim-airline
@@ -98,23 +59,23 @@ in
     syntastic
     vim-gutentags
     vim-vinegar
-    workspace
+    vim-workspace-nvfetcher
 
     sonokai
     vim-hybrid-material
     vim-airline-themes
-    apprentice
+    vim-apprentice-nvfetcher
 
     fugitive
     vim-gitgutter
     vim-rhubarb
-    vimagit
+    vimagit-nvfetcher
 
     fzf-vim
     fzfWrapper
     vim-highlightedyank
 
-    beautify
+    vim-beautify-nvfetcher
     vim-surround
 
     vim-bufkill
@@ -123,12 +84,14 @@ in
     ansible-vim
     emmet-vim
     rust-vim
+    vim-caddyfile-nvfetcher
     vim-go
     vim-javascript
     vim-json
     SchemaStore-nvim
     vim-markdown
     vim-nix
+    vim-nixhash
     vim-ruby
     vim-toml
     vim-vue

modules/terminal-life/nvim/lsp.vim

@@ -79,6 +79,8 @@ lua <<EOF
   -- vscode HTML lsp needs this https://github.com/neovim/nvim-lspconfig/blob/master/doc/server_configurations.md#html
   capabilities.textDocument.completion.completionItem.snippetSupport = true
 
+  local use_denols_for_typescript = not(os.getenv('NVIM_USE_DENOLS') == nil)
+
   for lsp_key, lsp_settings in pairs({
         'bashls', ------------------------------- Bash
         'ccls', --------------------------------- C / C++ / Objective-C
@@ -105,7 +107,18 @@ lua <<EOF
         ['jsonls'] = { -------------------------- JSON
             ['settings'] = {
                 ['json'] = {
-                    ['schemas' ] = require('schemastore').json.schemas()
+                    ['schemas' ] = vim.list_extend(
+                      {
+                        {
+                          ['description'] = 'JSON schema for Caddy v2',
+                          ['fileMatch'] = { '*caddy*.json' },
+                          ['name'] = 'caddy_schema.json',
+                          ['url'] = vim.fn.stdpath('data')..'/json-schemas/caddy_schema.json',
+                        },
+                      },
+                      require('schemastore').json.schemas()
+                    ),
+                    ['validate'] = { ['enable'] = true }
                 }
             }
         },
@@ -115,12 +128,18 @@ lua <<EOF
         'solargraph', --------------------------- Ruby
         'rust_analyzer', ------------------------ Rust
         ['sqlls'] = {
-            ['cmd'] = {"$XDG_DATA_HOME/nvm/versions/node/v12.19.0/bin/sql-language-server", "up", "--method", "stdio"}
+            ['cmd'] = {vim.fn.stdpath('data')..'/nvm/versions/node/v12.19.0/bin/sql-language-server', 'up', '--method', 'stdio'}
         },
         ['terraformls'] = { --------------------- Terraform
-            ['filetypes'] = { "terraform", "hcl", "tf" }
+            ['filetypes'] = { 'terraform', 'hcl', 'tf' }
         },
-        'tsserver', ----------------------------- Typescript / JavaScript
+
+        -- The TS/JS server is chosen depending on an environment variable,
+        -- since denols is nicer for Deno based projects
+        ------------------------ Deno TS/JS
+        ------------------------------------ Typescript / JavaScript
+        (use_denols_for_typescript and 'denols' or 'tsserver'),
+
         'vuels', -------------------------------- Vue
         'svelte', ------------------------------- Svelte
         ['yamlls'] = { -------------------------- YAML
@@ -204,21 +223,26 @@ lua <<EOF
     },
   }
 
--- Configure diagnostics
-vim.diagnostic.config({
-  virtual_text = false,
-  signs = true,
-  underline = true,
-  update_in_insert = false,
-  severity_sort = false,
-})
+  -- https://github.com/neovim/nvim-lspconfig/blob/master/doc/server_configurations.md#denols
+  vim.g.markdown_fenced_languages = {
+    "ts=typescript"
+  }
 
--- Change diagnostic symbols in the sign column (gutter)
-local signs = { Error = " ", Warn = " ", Hint = " ", Info = " " }
-for type, icon in pairs(signs) do
-  local hl = "DiagnosticSign" .. type
-  vim.fn.sign_define(hl, { text = icon, texthl = hl, numhl = hl })
-end
+  -- Configure diagnostics
+  vim.diagnostic.config({
+    virtual_text = false,
+    signs = true,
+    underline = true,
+    update_in_insert = false,
+    severity_sort = false,
+  })
+
+  -- Change diagnostic symbols in the sign column (gutter)
+  local signs = { Error = " ", Warn = " ", Hint = " ", Info = " " }
+  for type, icon in pairs(signs) do
+    local hl = "DiagnosticSign" .. type
+    vim.fn.sign_define(hl, { text = icon, texthl = hl, numhl = hl })
+  end
 EOF
 
 " have a fixed column for the diagnostics to appear in

modules/terminal-life/nvim/plugins.vim

@@ -17,6 +17,9 @@ autocmd FileType go nmap gD :GoDecls<CR>
 " Go formatting
 autocmd FileType go setlocal noexpandtab shiftwidth=4 tabstop=4 softtabstop=4 nolist
 
+" Caddyfile indentation
+autocmd FileType caddyfile setlocal noexpandtab shiftwidth=8 tabstop=8 softtabstop=8 nolist
+
 " vim-go disable text-objects
 let g:go_textobj_enabled = 0
 

modules/terminal-life/zsh/default.nix

@@ -39,21 +39,30 @@ in
     nixos-option = "nixos-option -I nixpkgs=${self}/lib/compat";
     myip = "dig +short myip.opendns.com @208.67.222.222 2>&1";
   };
-  zplug = {
-    enable = true;
-    plugins = [
-      {
-        name = "plugins/z";
-        tags = [ "from:oh-my-zsh" ];
-      }
-      {
-        name = "romkatv/powerlevel10k";
-        tags = [ "as:theme" "depth:1" ];
-      }
-      { name = "zdharma/fast-syntax-highlighting"; }
-      { name = "chisui/zsh-nix-shell"; }
-    ];
-  };
+  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
@@ -87,6 +96,12 @@ in
     precmd () {
       DIR_NAME=$(pwd | sed "s|^$HOME|~|g")
       echo -e -n "\e]2;$DIR_NAME\e\\"
+
+      if [ $(date +%d%m) = '0104' ]; then
+        if [ $? -eq 0 ]; then
+          echo "Success! That was a great command! I can't wait to see what amazing stuff you'll be up to next."
+        fi
+      fi
     }
 
     # If a command is not found, show me where it is

modules/user/default.nix

@@ -23,7 +23,7 @@ in
       };
       publicKeys = mkOption {
         description = "User SSH public keys";
-        type = types.listOf types.path;
+        type = types.listOf types.str;
         default = [ ];
       };
       fullName = mkOption {

modules/virtualisation/scream-pulse.service.nix

@@ -1,19 +0,0 @@
-pkgs:
-{
-  enable = true;
-  wantedBy = [ "multi-user.target" ];
-  unitConfig = {
-    Description = "Scream IVSHMEM pulse reciever";
-    BindsTo = [ "pipewire-pulse.service" ];
-    After = [ "pipewire-pulse.service" ];
-    Wants = [ "pipewire-pulse.service" ];
-  };
-  serviceConfig = {
-    Type = "simple";
-    ExecStartPre = [
-      "${pkgs.coreutils-full}/bin/truncate -s 0 /dev/shm/scream-ivshmem"
-      "${pkgs.coreutils-full}/bin/dd if=/dev/zero of=/dev/shm/scream-ivshmem bs=1M count=2"
-    ];
-    ExecStart = "${pkgs.scream}/bin/scream -m /dev/shm/scream-ivshmem";
-  };
-}

modules/x-os/boot.nix

@@ -1,27 +0,0 @@
-{ config, pkgs, lib, ... }:
-with lib;
-let
-  cfg = config.pub-solar.x-os;
-in
-{
-  options.pub-solar.x-os.iso-options.enable = mkOption {
-    type = types.bool;
-    default = false;
-    description = "Feature flag for iso builds";
-  };
-  config = {
-    # Enable plymouth for better experience of booting
-    boot.plymouth.enable = true;
-
-    # Mount / luks device in initrd
-    # Allow fstrim to work on it.
-    # The ! makes this enabled by default
-    boot.initrd = mkIf (!cfg.iso-options.enable) {
-      luks.devices."cryptroot" = {
-        allowDiscards = true;
-      };
-    };
-
-    boot.loader.systemd-boot.enable = true;
-  };
-}

modules/x-os/default.nix

@@ -1,7 +0,0 @@
-{ ... }: {
-  imports = [
-    ./boot.nix
-    ./i18n.nix
-    ./networking.nix
-  ];
-}

modules/x-os/networking.nix

@@ -1,54 +0,0 @@
-{ config, pkgs, lib, ... }:
-
-with lib;
-
-let cfg = config.pub-solar.x-os;
-in
-{
-  options.pub-solar.x-os = {
-    binaryCaches = mkOption {
-      type = types.listOf types.str;
-      default = [ ];
-      description = "Binary caches to use.";
-    };
-    publicKeys = mkOption {
-      type = types.listOf types.str;
-      default = [ ];
-      description = "Public keys of binary caches.";
-    };
-    iwdConfig = mkOption {
-      type = with types; nullOr (attrsOf (attrsOf (oneOf [ bool int str ])));
-      default = null;
-      description = "Configuratoin of iNet Wireless Daemon.";
-    };
-  };
-  config = {
-    networking.networkmanager = {
-      # Enable networkmanager. REMEMBER to add yourself to group in order to use nm related stuff.
-      enable = true;
-    };
-
-    # Customized binary caches list (with fallback to official binary cache)
-    nix.binaryCaches = cfg.binaryCaches;
-    nix.binaryCachePublicKeys = cfg.publicKeys;
-
-    # These entries get added to /etc/hosts
-    networking.hosts = {
-      "127.0.0.1" = [ "cups.local" ];
-    };
-
-    # Caddy reverse proxy for local services like cups
-    services.caddy = {
-      enable = true;
-      config = ''
-        {
-          auto_https off
-        }
-        cups.local:80
-        bind 127.0.0.1
-        request_header Host localhost:631
-        reverse_proxy unix//run/cups/cups.sock
-      '';
-    };
-  };
-}

overlays/neovim-plugins.nix

@@ -0,0 +1,22 @@
+final: prev: {
+  vimPlugins = prev.vimPlugins // {
+    instant-nvim-nvfetcher = prev.vimUtils.buildVimPluginFrom2Nix {
+      inherit (prev.sources.instant-nvim-nvfetcher) pname version src;
+    };
+    vimagit-nvfetcher = prev.vimUtils.buildVimPluginFrom2Nix {
+      inherit (prev.sources.vimagit-nvfetcher) pname version src;
+    };
+    vim-caddyfile-nvfetcher = prev.vimUtils.buildVimPluginFrom2Nix {
+      inherit (prev.sources.vim-caddyfile-nvfetcher) pname version src;
+    };
+    vim-workspace-nvfetcher = prev.vimUtils.buildVimPluginFrom2Nix {
+      inherit (prev.sources.vim-workspace-nvfetcher) pname version src;
+    };
+    vim-beautify-nvfetcher = prev.vimUtils.buildVimPluginFrom2Nix {
+      inherit (prev.sources.vim-beautify-nvfetcher) pname version src;
+    };
+    vim-apprentice-nvfetcher = prev.vimUtils.buildVimPluginFrom2Nix {
+      inherit (prev.sources.vim-apprentice-nvfetcher) pname version src;
+    };
+  };
+}

overlays/overrides.nix

@@ -8,28 +8,19 @@ channels: final: prev: {
     discord
     element-desktop
     rage
+    nix-index
     nixpkgs-fmt
     qutebrowser
     signal-desktop
     starship
     deploy-rs
+    nix
 
-    nixUnstable
-    neovim-unwrapped
     tdesktop
-    xdg-desktop-portal
-    xdg-desktop-portal-gtk
-    xdg-desktop-portal-wlr
-    obs-studio
-    obs-studio-plugins
-    looking-glass-client
-    nix-direnv
-    vimPlugins
+    arduino
+    arduino-cli
     ;
 
-  inherit (channels.master)
-    swaynotificationcenter
-    ;
 
   haskellPackages = prev.haskellPackages.override
     (old: {

overlays/rnix-lsp.nix

@@ -0,0 +1,11 @@
+final: prev: {
+  rnix-lsp = prev.rnix-lsp.overrideAttrs (oldAttrs: rec {
+    inherit (prev.sources.rnix-lsp-nvfetcher) pname version src;
+
+    cargoDeps = oldAttrs.cargoDeps.overrideAttrs (prev.lib.const {
+      name = "rnix-lsp-vendor.tar.gz";
+      inherit src;
+      outputHash = "sha256-SroynaHaFpvKlMSEagoGQhZcY7A0tE4xTbUXYFcneo8=";
+    });
+  });
+}

pkgs/_sources/generated.nix

@@ -1,16 +1,136 @@
 # This file was generated by nvfetcher, please do not modify it manually.
-{ fetchgit, fetchurl }:
+{ fetchgit, fetchurl, fetchFromGitHub }:
 {
+  F-Sy-H = {
+    pname = "F-Sy-H";
+    version = "b935a87a75560f8173dd78deee6717c59d464e06";
+    src = fetchFromGitHub ({
+      owner = "z-shell";
+      repo = "F-Sy-H";
+      rev = "b935a87a75560f8173dd78deee6717c59d464e06";
+      fetchSubmodules = false;
+      sha256 = "sha256-448OlDnrDkUjvaSLDhXsa9bkgYXzj1Ju8CTpJVjH8LM=";
+    });
+  };
+  instant-nvim-nvfetcher = {
+    pname = "instant-nvim-nvfetcher";
+    version = "294b6d08143b3db8f9db7f606829270149e1a786";
+    src = fetchFromGitHub ({
+      owner = "jbyuki";
+      repo = "instant.nvim";
+      rev = "294b6d08143b3db8f9db7f606829270149e1a786";
+      fetchSubmodules = false;
+      sha256 = "sha256-DXJWji/NR8ZCxe014rD51v3EHJHMhRQeOoI3SsY8mR4=";
+    });
+  };
   manix = {
     pname = "manix";
     version = "d08e7ca185445b929f097f8bfb1243a8ef3e10e4";
-    src = fetchgit {
-      url = "https://github.com/mlvzk/manix";
+    src = fetchFromGitHub ({
+      owner = "mlvzk";
+      repo = "manix";
       rev = "d08e7ca185445b929f097f8bfb1243a8ef3e10e4";
       fetchSubmodules = false;
-      deepClone = false;
-      leaveDotGit = false;
-      sha256 = "1b7xi8c2drbwzfz70czddc4j33s7g1alirv12dwl91hbqxifx8qs";
-    };
+      sha256 = "sha256-GqPuYscLhkR5E2HnSFV4R48hCWvtM3C++3zlJhiK/aw=";
+    });
+  };
+  ohmyzsh = {
+    pname = "ohmyzsh";
+    version = "65a1e4edbe678cdac37ad96ca4bc4f6d77e27adf";
+    src = fetchFromGitHub ({
+      owner = "ohmyzsh";
+      repo = "ohmyzsh";
+      rev = "65a1e4edbe678cdac37ad96ca4bc4f6d77e27adf";
+      fetchSubmodules = false;
+      sha256 = "sha256-qyI7CU0vKhhADZfQtD73GsyAbqdMPhDQ1uA03h4erpw=";
+    });
+  };
+  powerlevel10k = {
+    pname = "powerlevel10k";
+    version = "8091c8a3a8a845c70046684235a01cd500075def";
+    src = fetchFromGitHub ({
+      owner = "romkatv";
+      repo = "powerlevel10k";
+      rev = "8091c8a3a8a845c70046684235a01cd500075def";
+      fetchSubmodules = false;
+      sha256 = "sha256-I0/tktXCbZ3hMYTNvPoWfOEYWRgmHoXsar/jcUB6bpo=";
+    });
+  };
+  rnix-lsp-nvfetcher = {
+    pname = "rnix-lsp-nvfetcher";
+    version = "6925256babec4307479a4080b44f2be38056f210";
+    src = fetchFromGitHub ({
+      owner = "nix-community";
+      repo = "rnix-lsp";
+      rev = "6925256babec4307479a4080b44f2be38056f210";
+      fetchSubmodules = false;
+      sha256 = "sha256-OKLyIXIXhUnRB3Xw+7zI3u6XkwF7Mrbfz1XaasV6i7Q=";
+    });
+  };
+  vim-apprentice-nvfetcher = {
+    pname = "vim-apprentice-nvfetcher";
+    version = "9942d0bb0a5d82f7a24450b00051c1f2cc008659";
+    src = fetchFromGitHub ({
+      owner = "romainl";
+      repo = "Apprentice";
+      rev = "9942d0bb0a5d82f7a24450b00051c1f2cc008659";
+      fetchSubmodules = false;
+      sha256 = "sha256-Xs+vTdnihNbBFPOKsW+NB40pqN9eaadqzc0DIeNoOFo=";
+    });
+  };
+  vim-beautify-nvfetcher = {
+    pname = "vim-beautify-nvfetcher";
+    version = "e0691483927dc5a0c051433602397419f9628623";
+    src = fetchFromGitHub ({
+      owner = "zeekay";
+      repo = "vim-beautify";
+      rev = "e0691483927dc5a0c051433602397419f9628623";
+      fetchSubmodules = false;
+      sha256 = "sha256-QPTCl6KaGcAjTS5yVDov9yxmv0fDaFoPLMsrtVIG6GQ=";
+    });
+  };
+  vim-caddyfile-nvfetcher = {
+    pname = "vim-caddyfile-nvfetcher";
+    version = "24fe0720551883e407cb70ae1d7c03f162d1d5a0";
+    src = fetchFromGitHub ({
+      owner = "isobit";
+      repo = "vim-caddyfile";
+      rev = "24fe0720551883e407cb70ae1d7c03f162d1d5a0";
+      fetchSubmodules = false;
+      sha256 = "sha256-rRYv3vnt31g7hNTxttTD6BWdv5JJ+ko3rPNyDUEOZ9o=";
+    });
+  };
+  vim-workspace-nvfetcher = {
+    pname = "vim-workspace-nvfetcher";
+    version = "c26b473f9b073f24bacecd38477f44c5cd1f5a62";
+    src = fetchFromGitHub ({
+      owner = "thaerkh";
+      repo = "vim-workspace";
+      rev = "c26b473f9b073f24bacecd38477f44c5cd1f5a62";
+      fetchSubmodules = false;
+      sha256 = "sha256-XV7opLyfkHIDO0+JJaO/x0za0gsHuklrzapTGdLHJmI=";
+    });
+  };
+  vimagit-nvfetcher = {
+    pname = "vimagit-nvfetcher";
+    version = "308650ddc1e9a94e49fae0ea04bbc1c45f23d4c4";
+    src = fetchFromGitHub ({
+      owner = "jreybert";
+      repo = "vimagit";
+      rev = "308650ddc1e9a94e49fae0ea04bbc1c45f23d4c4";
+      fetchSubmodules = false;
+      sha256 = "sha256-fhazQQqyFaO0fdoeNI9nBshwTDhKNHH262H/QThtuO0=";
+    });
+  };
+  zsh-nix-shell = {
+    pname = "zsh-nix-shell";
+    version = "af6f8a266ea1875b9a3e86e14796cadbe1cfbf08";
+    src = fetchFromGitHub ({
+      owner = "chisui";
+      repo = "zsh-nix-shell";
+      rev = "af6f8a266ea1875b9a3e86e14796cadbe1cfbf08";
+      fetchSubmodules = false;
+      sha256 = "sha256-BjgMhILEL/qdgfno4LR64LSB8n9pC9R+gG7IQWwgyfQ=";
+    });
   };
 }

pkgs/default.nix

@@ -9,14 +9,16 @@ with final; {
   mopidy-jellyfin = import ./mopidy-jellyfin.nix final;
   mu = writeShellScriptBin "mu" (import ./mu.nix final);
   psos = writeShellScriptBin "psos" (import ./psos.nix final);
+  psos-docs = import ./psos-docs.nix final;
   s = writeShellScriptBin "s" (import ./s.nix final);
   sway-launcher = writeScriptBin "sway-launcher" (import ./sway-launcher.nix final);
   sway-service = writeShellScriptBin "sway-service" (import ./sway-service.nix final);
-  swaylock-bg = writeScriptBin "swaylock-bg" (import ./swaylock-bg.nix final);
+  swaylock-bg = writeShellScriptBin "swaylock-bg" (import ./swaylock-bg.nix final);
   toggle-kbd-layout = writeShellScriptBin "toggle-kbd-layout" (import ./toggle-kbd-layout.nix final);
   uhk-agent = import ./uhk-agent.nix final;
   wcwd = writeShellScriptBin "wcwd" (import ./wcwd.nix final);
+  drone-docker-runner = writeShellScriptBin "drone-docker-runner" (import ./drone-docker-runner.nix final);
+  record-screen = writeShellScriptBin "record-screen" (import ./record-screen.nix final);
 
   # ps-fixes
-  ps-signal-desktop = writeShellScriptBin "signal-desktop" (import ./ps-signal-desktop.nix final);
 }

pkgs/drone-docker-runner.nix

@@ -0,0 +1,32 @@
+self: with self; ''
+  case $1 in
+    start)
+      ${self.docker}/bin/docker run --detach \
+        --volume=/var/run/docker.sock:/var/run/docker.sock \
+        --env=DRONE_RPC_PROTO=$DRONE_RPC_PROTO \
+        --env=DRONE_RPC_HOST=$DRONE_RPC_HOST \
+        --env=DRONE_RPC_SECRET=$(${self.libsecret}/bin/secret-tool lookup drone rpc-secret) \
+        --env=DRONE_RUNNER_CAPACITY=8 \
+        --env=DRONE_RUNNER_NAME=$(${self.inetutils}/bin/hostname) \
+        --publish=3000:3000 \
+        --restart=always \
+        --name=drone-runner \
+        drone/drone-runner-docker:1
+      ;;
+
+    stop)
+      ${self.docker}/bin/docker stop drone-runner
+      ${self.docker}/bin/docker rm drone-runner
+      ;;
+
+    logs)
+      ${self.docker}/bin/docker logs drone-runner
+      ;;
+
+    *)
+      echo "Usage: drone-docker-runner <start|stop|logs>"
+      exit 1;
+      ;;
+  esac
+
+''

pkgs/ps-signal-desktop.nix

@@ -1,9 +0,0 @@
-self: with self;
-let
-  signal-desktop = self.signal-desktop.overrideAttrs (old: {
-    meta.platforms = [ "x86_64-linux" "aarch64-linux" ];
-  });
-in
-''
-  exec ${signal-desktop}/bin/signal-desktop --disable-gpu -- "$@"
-''

pkgs/psos-docs.nix

@@ -0,0 +1,26 @@
+self: with self;
+stdenv.mkDerivation rec {
+  pname = "psos-docs";
+  version = "0.0.1";
+  buildInputs = [
+    mdbook
+    mdbook-pdf
+  ];
+
+  src = ../docs/..; # wut
+
+  phases = [ "buildPhase" "installPhase" ];
+
+  buildPhase = ''
+    cp -r $src/doc ./doc
+    cp $src/README.md ./README.md
+    chmod ug+w -R .
+    ls -la .
+    mdbook build doc
+  '';
+
+  installPhase = ''
+    mkdir -p $out/lib/
+    cp -r doc/book $out/lib/html
+  '';
+}

pkgs/psos.nix

@@ -14,6 +14,10 @@ self: with self; ''
       shift;
       exec nixos-option -I nixpkgs=/etc/nixos/lib/compat $@
       ;;
+    help)
+      shift;
+      exec xdg-open http://help.local/
+      ;;
     *)
       if [[ "$@" != "" ]]; then
         echo "Unknown command: psos $@"

pkgs/record-screen.nix

@@ -0,0 +1,10 @@
+self: with self; ''
+  mkdir -p "$HOME/Videos/Screenrecordings"
+  GEOMETRY="$(slurp -d -b \#ffffff11)"
+  RESOLUTION="$(echo $GEOMETRY | awk '{print $2}')"
+  FILE_LOCATION="$HOME/Videos/Screenrecordings/$(${coreutils}/bin/date +%Y%m%d_%Hh%Mm%Ss)_$RESOLUTION.mp4"
+  echo "Recording $GEOMETRY into $FILE_LOCATION"
+  ${alacritty}/bin/alacritty \
+    --class screen-recorder \
+    -e ${wf-recorder}/bin/wf-recorder -g "$GEOMETRY" -f "$FILE_LOCATION"
+''

pkgs/sources.toml

@@ -2,3 +2,47 @@
 [manix]
 src.git = "https://github.com/mlvzk/manix"
 fetch.github = "mlvzk/manix"
+
+[ohmyzsh]
+src.git = "https://github.com/ohmyzsh/ohmyzsh"
+fetch.github = "ohmyzsh/ohmyzsh"
+
+[powerlevel10k]
+src.git = "https://github.com/romkatv/powerlevel10k"
+fetch.github = "romkatv/powerlevel10k"
+
+[F-Sy-H]
+src.git = "https://github.com/z-shell/F-Sy-H"
+fetch.github = "z-shell/F-Sy-H"
+
+[zsh-nix-shell]
+src.git = "https://github.com/chisui/zsh-nix-shell"
+fetch.github = "chisui/zsh-nix-shell"
+
+[rnix-lsp-nvfetcher]
+src.git = "https://github.com/nix-community/rnix-lsp"
+fetch.github = "nix-community/rnix-lsp"
+
+[vimagit-nvfetcher]
+src.git = "https://github.com/jreybert/vimagit"
+fetch.github = "jreybert/vimagit"
+
+[instant-nvim-nvfetcher]
+src.git = "https://github.com/jbyuki/instant.nvim"
+fetch.github = "jbyuki/instant.nvim"
+
+[vim-caddyfile-nvfetcher]
+src.git = "https://github.com/isobit/vim-caddyfile"
+fetch.github = "isobit/vim-caddyfile"
+
+[vim-workspace-nvfetcher]
+src.git = "https://github.com/thaerkh/vim-workspace"
+fetch.github = "thaerkh/vim-workspace"
+
+[vim-beautify-nvfetcher]
+src.git = "https://github.com/zeekay/vim-beautify"
+fetch.github = "zeekay/vim-beautify"
+
+[vim-apprentice-nvfetcher]
+src.git = "https://github.com/romainl/Apprentice"
+fetch.github = "romainl/Apprentice"

pkgs/sway-launcher.nix

@@ -23,7 +23,7 @@ self: with self; ''
   # search command list
   command_str=$(printf "%s\n" "''${command_history}" "''${command_list}" | \
       sed -E 's/^[0-9]+ (.+)$/\1/' | \
-      fzf --exact --no-extended --print-query --no-sort | \
+      fzf --color=16 --exact --no-extended --print-query --no-sort | \
       tail -n1) || exit 1
 
   if [ "$command_str" = "" ]; then

pkgs/sway-service.nix

@@ -1,6 +1,6 @@
 self: with self; ''
   # first import environment variables from the login manager
-  systemctl --user import-environment
+  systemctl --user import-environment;
   # then start the service
   exec systemctl --wait --user start sway.service
 ''

pkgs/swaylock-bg.nix

@@ -3,18 +3,17 @@ self: with self; ''
   # swaylock
 
   # Make sure we aren't running twice
-  RUNNING=$(ps -A | grep swaylock | wc -l)
-  if [ $RUNNING -ne 0 ]; then
+  RUNNING=$(${procps}/bin/pgrep -c ${swaylock}/bin/swaylock)
+  if [ "$RUNNING" -ne 0 ]; then
     exit 0
   fi
 
-  IMAGE=$XDG_CONFIG_HOME/wallpaper.jpg
+  IMAGE="$XDG_CONFIG_HOME/wallpaper.jpg"
   LOCKARGS=""
 
-  for OUTPUT in `${sway}/bin/swaymsg -t get_outputs | jq -r '.[].name'`
+  for OUTPUT in $(${sway}/bin/swaymsg -t get_outputs | ${jq}/bin/jq -r '.[].name')
   do
       LOCKARGS="''${LOCKARGS} --image ''${OUTPUT}:''${IMAGE}"
-      IMAGES="''${IMAGES} ''${IMAGE}"
   done
   exec ${swaylock}/bin/swaylock $LOCKARGS
 ''

profiles/base-user/.config/swaync/config.json

@@ -1,12 +0,0 @@
-{
-  "positionX": "right",
-  "positionY": "top",
-  "timeout": 10,
-  "timeout-low": 5,
-  "timeout-critical": 0,
-  "notification-window-width": 500,
-  "keyboard-shortcuts": true,
-  "image-visibility": "always",
-  "transition-time": 200,
-  "hide-on-clear": false
-}

profiles/base-user/.config/swaync/style.css

@@ -1,149 +0,0 @@
-/*
- * vim: ft=less
- */
-
-@define-color border-color rgb(7, 7, 7);
-@define-color bg rgb(58, 58, 58);
-@define-color bg-hover rgb(68, 68, 68);
-@define-color bg-focus rgba(68, 68, 68, 0.6);
-@define-color bg-selected rgb(0, 128, 255);
-
-.notification-row {
-  outline: none;
-}
-.notification-row:focus,
-.notification-row:hover {
-  background: @bg-focus;
-}
-
-.notification {
-  border-radius: 10px;
-  margin: 6px 12px;
-  box-shadow: 0px 2px 4px 2px rgba(0, 0, 0, 0.3);
-  padding: 0;
-}
-
-.notification-content {
-  background: transparent;
-  padding: 6px;
-  border-radius: 10px;
-}
-
-.close-button {
-  background: black;
-  color: white;
-  text-shadow: none;
-  padding: 0 2px;
-  box-shadow: 0px 2px 4px 2px rgba(0, 0, 0, 0.3);
-  border-radius: 100%;
-}
-.close-button:hover {
-  background: rgb(30, 30, 30);
-  transition: all 0.15s ease-in-out;
-}
-
-.notification-default-action,
-.notification-action {
-  padding: 4px;
-  margin: 0;
-  box-shadow: none;
-  background: @bg;
-  border: 1px solid @border-color;
-}
-
-.notification-default-action:hover,
-.notification-action:hover {
-  background: @bg-hover;
-}
-
-.notification-default-action {
-  border-radius: 10px;
-}
-
-/* When alternative actions are visible */
-.notification-default-action:not(:only-child) {
-  border-bottom-left-radius: 0px;
-  border-bottom-right-radius: 0px;
-}
-
-.notification-action {
-  border-radius: 0px;
-  border-top: none;
-  border-right: none;
-}
-
-/* add bottom border radius to eliminate clipping */
-.notification-action:first-child {
-  border-bottom-left-radius: 10px;
-}
-.notification-action:last-child {
-  border-bottom-right-radius: 10px;
-  border-right: 1px solid @border-color;
-}
-
-.image {
-}
-
-.body-image {
-  margin-top: 6px;
-  background-color: white;
-  border-radius: 10px;
-}
-
-.summary {
-  color: white;
-  text-shadow: none;
-}
-
-.time {
-  color: white;
-  text-shadow: none;
-}
-
-.body {
-  background: transparent;
-  color: white;
-  text-shadow: none;
-}
-
-.top-action-title {
-  color: white;
-  text-shadow: none;
-}
-
-.control-center-clear-all {
-  color: white;
-  text-shadow: none;
-  background: @bg;
-  border: 1px solid @border-color;
-  box-shadow: none;
-  border-radius: 10px;
-}
-.control-center-clear-all:hover {
-  background: @bg-hover;
-}
-
-.control-center-dnd {
-  border-radius: 10px;
-  background: @bg;
-  border: 1px solid @border-color;
-  box-shadow: none;
-}
-
-.control-center-dnd:checked {
-  background: @bg-selected;
-}
-.control-center-dnd slider {
-  background: @bg-hover;
-}
-
-.control-center {
-  background: rgba(0, 0, 0, 0.7);
-}
-.control-center-list {
-  background: transparent;
-}
-
-.floating-notifications {
-  background: transparent;
-}

profiles/base-user/.config/waybar/config

@@ -5,16 +5,7 @@
   "height": 26, // Waybar height
   "modules-left": ["sway/workspaces", "sway/mode"],
   //"modules-center": ["mpd"],
-  "modules-right": [
-    "sway/language",
-    "custom/notification",
-    "pulseaudio",
-    "network",
-    "idle_inhibitor",
-    "battery",
-    "clock",
-    "tray"
-  ],
+  "modules-right": ["sway/language", "pulseaudio", "network", "idle_inhibitor", "battery", "clock", "tray"],
   "sway/workspaces": {
     "disable-scroll": true
   },
@@ -107,21 +98,5 @@
     },
     "tooltip-format": "MPD (connected)",
     "tooltip-format-disconnected": "MPD (disconnected)"
-  },
-  "custom/notification": {
-    "tooltip": false,
-    "format": " {icon}",
-    "format-icons": {
-      "notification": "<span foreground='red'><sup></sup></span>",
-      "none": "",
-      "dnd-notification": "<span foreground='red'><sup></sup></span>",
-      "dnd-none": ""
-    },
-    "return-type": "json",
-    "exec-if": "which swaync-client",
-    "exec": "swaync-client -swb",
-    "on-click": "swaync-client -t -sw",
-    "on-click-right": "swaync-client -d -sw",
-    "escape": true
-  },
+  }
 }

profiles/base-user/.config/waybar/style.css

@@ -14,6 +14,7 @@ window#waybar {
     color: @base04;
 }
 
+
 #workspaces button {
     font-size: 14px;
     box-shadow: none;
@@ -22,6 +23,7 @@ window#waybar {
     color: @base04;
 }
 
+
 #workspaces button.focused {
     color: #f85e84;
     color: @base07;
@@ -51,29 +53,26 @@ window#waybar {
 #battery.critical {
   color: @base07;
 }
-
 #battery.charging {
     color: @base0B;
 }
-
 #battery.full {
     margin: 0px 0px 0px 0px;
 }
 
+
 #network {
     border-top: 1px solid transparent;
 }
-
 #network.disconnected {
     margin: 0px 0px 0px 0px;
     color: rgba(75, 81, 98, 0);
 }
 
+
 #pulseaudio.muted {
     margin: 0px 0px 0px 0px;
     color: rgba(75, 81, 98, 0);
 }
 
-#custom-notification {
-  font-family: "NotoSansMono Nerd Font";
-}
+

profiles/base-user/.gitignore

@@ -81,10 +81,6 @@
 !/.config/waybar/config
 !/.config/waybar/style.css
 
-!/.config/swaync
-!/.config/swaync/config.json
-!/.config/swaync/style.css
-
 !/.config/mutt
 !/.config/mutt/muttrc
 !/.config/mutt/base16.muttrc

profiles/base-user/default.nix

@@ -16,10 +16,16 @@ in
       # home to /home/username, useDefaultShell to true, and isSystemUser to false.
       isNormalUser = true;
       description = psCfg.user.description;
-      extraGroups = [ "wheel" "docker" "input" "audio" "networkmanager" "lp" "scanner" ];
+      extraGroups = [
+        "wheel"
+        "input"
+        "networkmanager"
+        "lp"
+        "scanner"
+      ];
       initialHashedPassword = if psCfg.user.password != null then psCfg.user.password else "";
       shell = pkgs.zsh;
-      openssh.authorizedKeys.keyFiles = if psCfg.user.publicKeys != null then psCfg.user.publicKeys else [ ];
+      openssh.authorizedKeys.keys = if psCfg.user.publicKeys != null then psCfg.user.publicKeys else [ ];
     };
   };
 }

profiles/base-user/home.nix

@@ -43,8 +43,6 @@ in
     xdg.configFile."vifm/vifmrc".source = ./.config/vifm/vifmrc;
     xdg.configFile."vifm/colors/base16.vifm".source = ./.config/vifm/colors/base16.vifm;
     xdg.configFile."libinput-gestures.conf".source = ./.config/libinput-gestures.conf;
-    xdg.configFile."swaync/config.json".source = ./.config/swaync/config.json;
-    xdg.configFile."swaync/style.css".source = ./.config/swaync/style.css;
     xdg.configFile."waybar/config".source = ./.config/waybar/config;
     xdg.configFile."waybar/style.css".source = ./.config/waybar/style.css;
     xdg.configFile."waybar/colorscheme.css".source = ./.config/waybar/colorscheme.css;
@@ -57,6 +55,10 @@ in
     # Ensure nvim backup directory gets created
     # Workaround for E510: Can't make backup file (add ! to override)
     xdg.dataFile."nvim/backup/.keep".text = "";
+    xdg.dataFile."nvim/json-schemas/.keep".text = "";
+    # Generated with:
+    # docker run -it --name caddy-json-schema registry.greenbaum.cloud/gc/caddy-l4:2.5.2 caddy json-schema -output /srv/caddy_schema.json
+    xdg.dataFile."nvim/json-schemas/caddy_schema.json".source = .local/share/nvim/json-schemas/caddy_schema.json;
     xdg.dataFile."nvim/templates/.keep".text = "";
     xdg.dataFile."shell.nix.tmpl" = {
       text = ''

profiles/base-user/session-variables.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ config, pkgs, lib, ... }:
 let
   psCfg = config.pub-solar;
   wlroots = psCfg.graphical.wayland;
@@ -77,10 +77,22 @@ let
     # TELEMETRY BS
     VUEDX_TELEMETRY = "off";
   };
+
+  envListNames = lib.attrsets.mapAttrsToList (name: value: name) variables;
+
+  # Here we merge an extra variable into the attrset called FULL_ENV_LIST.
+  # It's a list of the variable names defined above.
+  # We can use this to tell `systemctl import-environment` to import the full list above.
+  variablesWithMeta = lib.attrsets.zipAttrsWith (name: values: builtins.head values) [
+    variables
+    { IMPORT_ENVIRONMENT_ENV_LIST = lib.lists.foldl (a: b: a + " " + b) "IMPORT_ENVIRONMENT_ENV_LIST" envListNames; }
+  ];
 in
 {
   home-manager = pkgs.lib.setAttrByPath [ "users" psCfg.user.name ] {
-    home.sessionVariables = variables;
-    systemd.user.sessionVariables = variables;
+    home.sessionVariables = variablesWithMeta;
+    systemd.user.sessionVariables = variablesWithMeta;
   };
+
+  environment.variables = variablesWithMeta;
 }

profiles/core/default.nix

@@ -1,131 +0,0 @@
-{ self, config, lib, pkgs, inputs, ... }:
-let inherit (lib) fileContents;
-in
-{
-  # Sets nrdxp.cachix.org binary cache which just speeds up some builds
-  imports = [ ../cachix ];
-
-  config = {
-    pub-solar.terminal-life.enable = true;
-    pub-solar.audio.enable = true;
-    pub-solar.crypto.enable = true;
-    pub-solar.devops.enable = true;
-
-    # This is just a representation of the nix default
-    nix.systemFeatures = [ "nixos-test" "benchmark" "big-parallel" "kvm" ];
-
-    environment = {
-
-      systemPackages = with pkgs; [
-        # Core unix utility packages
-        coreutils-full
-        progress
-        dnsutils
-        inetutils
-        mtr
-        pciutils
-        usbutils
-        gitFull
-        git-lfs
-        git-bug
-        wget
-        openssl
-        openssh
-        curl
-        htop
-        lsof
-        psmisc
-        xdg-utils
-        sysfsutils
-        renameutils
-        nfs-utils
-        moreutils
-        mailutils
-        keyutils
-        input-utils
-        elfutils
-        binutils
-        dateutils
-        diffutils
-        findutils
-        exfat-utils
-        file
-
-        # zippit
-        zip
-        unzip
-
-        # Modern modern utilities
-        p7zip
-        croc
-        jq
-
-        # Nix specific utilities
-        niv
-        manix
-        nix-index
-        nix-tree
-        nixpkgs-review
-        # Build broken, python2.7-PyJWT-2.0.1.drv' failed
-        #nixops
-        psos
-        nvd
-
-        # Fun
-        neofetch
-      ];
-    };
-
-    fonts = {
-      fonts = with pkgs; [ powerline-fonts dejavu_fonts ];
-
-      fontconfig.defaultFonts = {
-
-        monospace = [ "DejaVu Sans Mono for Powerline" ];
-
-        sansSerif = [ "DejaVu Sans" ];
-
-      };
-    };
-
-    nix = {
-      # use nix-dram, a patched nix command, see: https://github.com/dramforever/nix-dram
-      package = inputs.nix-dram.packages.${pkgs.system}.nix-dram;
-
-      # Improve nix store disk usage
-      autoOptimiseStore = true;
-      gc.automatic = true;
-      optimise.automatic = true;
-
-      # Prevents impurities in builds
-      useSandbox = true;
-
-      # give root and @wheel special privileges with nix
-      trustedUsers = [ "root" "@wheel" ];
-
-      # Generally useful nix option defaults
-      extraOptions = ''
-        min-free = 536870912
-        keep-outputs = true
-        keep-derivations = true
-        fallback = true
-        # used by nix-dram
-        default-flake = flake:nixpkgs
-      '';
-    };
-
-    # For rage encryption, all hosts need a ssh key pair
-    services.openssh = {
-      enable = true;
-      openFirewall = lib.mkDefault false;
-    };
-
-    # Service that makes Out of Memory Killer more effective
-    services.earlyoom.enable = true;
-
-    # Use latest LTS linux kernel by default
-    boot.kernelPackages = pkgs.linuxPackages_5_15;
-
-    boot.supportedFilesystems = [ "ntfs" ];
-  };
-}

profiles/core/starship.toml

@@ -1,95 +0,0 @@
-[aws]
-symbol = " "
-
-[character]
-success_symbol = "[❯](bold purple)"
-vicmd_symbol = "[❮](bold purple)"
-
-[battery]
-full_symbol = ""
-charging_symbol = ""
-discharging_symbol = ""
-
-[conda]
-symbol = " "
-
-[directory]
-style = "cyan"
-read_only = " 🔒"
-
-[docker]
-symbol = " "
-
-[elixir]
-symbol = " "
-
-[elm]
-symbol = " "
-
-[git_branch]
-format = "[$symbol$branch]($style) "
-symbol = " "
-style = "bold dimmed white"
-
-[git_status]
-format = '([「$all_status$ahead_behind」]($style) )'
-conflicted = "⚠️"
-ahead = "⟫${count} "
-behind = "⟪${count}"
-diverged = "🔀 "
-untracked = "📁 "
-stashed = "↪ "
-modified = "𝚫 "
-staged = "✔ "
-renamed = "⇆ "
-deleted = "✘ "
-style = "bold bright-white"
-
-[golang]
-symbol = " "
-
-[haskell]
-symbol = " "
-
-[hg_branch]
-symbol = " "
-
-[java]
-symbol = " "
-
-[julia]
-symbol = " "
-
-[memory_usage]
-symbol = " "
-disabled = false
-
-[nim]
-symbol = " "
-
-[nix_shell]
-format = '[$symbol$state]($style) '
-symbol = " "
-pure_msg = "λ"
-impure_msg = "⎔"
-
-[nodejs]
-symbol = " "
-
-[package]
-symbol = " "
-
-[php]
-symbol = " "
-
-[python]
-symbol = " "
-
-[ruby]
-symbol = " "
-
-[rust]
-symbol = " "
-
-[status]
-disabled = false

profiles/pub-solar-iso/default.nix

@@ -6,6 +6,6 @@ in
   config = {
     pub-solar.graphical.wayland.software-renderer.enable = true;
     pub-solar.sway.terminal = "foot";
-    pub-solar.x-os.iso-options.enable = true;
+    pub-solar.core.iso-options.enable = true;
   };
 }

shell/default.nix

@@ -1,7 +1,6 @@
 { self, inputs, ... }:
 {
   modules = with inputs; [
-    bud.devshellModules.bud
   ];
   exportedModules = [
     ./devos.nix

shell/devos.nix

@@ -1,12 +1,22 @@
-{ pkgs, extraModulesPath, inputs, ... }:
+{ pkgs, extraModulesPath, inputs, lib, ... }:
 let
 
+  inherit (pkgs)
+    agenix
+    cachix
+    editorconfig-checker
+    mdbook
+    nix
+    nixpkgs-fmt
+    nvfetcher
+    ;
+
   hooks = import ./hooks;
 
   pkgWithCategory = category: package: { inherit package category; };
+  devos = pkgWithCategory "devos";
   linter = pkgWithCategory "linter";
   docs = pkgWithCategory "docs";
-  devos = pkgWithCategory "devos";
 
 in
 {
@@ -18,41 +28,26 @@ in
   # override for our own welcome
   devshell.name = pkgs.lib.mkForce "PubSolarOS";
 
-  # tempfix: remove when merged https://github.com/numtide/devshell/pull/123
-  devshell.startup.load_profiles = pkgs.lib.mkForce (pkgs.lib.noDepEntry ''
-    # PATH is devshell's exorbitant privilige:
-    # fence against its pollution
-    _PATH=''${PATH}
-    # Load installed profiles
-    for file in "$DEVSHELL_DIR/etc/profile.d/"*.sh; do
-      # If that folder doesn't exist, bash loves to return the whole glob
-      [[ -f "$file" ]] && source "$file"
-    done
-    # Exert exorbitant privilige and leave no trace
-    export PATH=''${_PATH}
-    unset _PATH
-  '');
-
   commands = with pkgs; [
-    (devos nixUnstable)
+    (devos nix)
     (devos agenix)
     {
       category = "devos";
-      name = pkgs.nvfetcher-bin.pname;
-      help = pkgs.nvfetcher-bin.meta.description;
-      command = "cd $PRJ_ROOT/pkgs; ${pkgs.nvfetcher-bin}/bin/nvfetcher -c ./sources.toml $@";
+      name = pkgs.nvfetcher.pname;
+      help = pkgs.nvfetcher.meta.description;
+      command = "cd $PRJ_ROOT/pkgs; ${pkgs.nvfetcher}/bin/nvfetcher -c ./sources.toml $@";
     }
     (linter nixpkgs-fmt)
     (linter editorconfig-checker)
-    # (docs python3Packages.grip) too many deps
+
     (docs mdbook)
-    (devos inputs.deploy.packages.${pkgs.system}.deploy-rs)
   ]
-  ++ lib.optional
-    (system != "i686-linux")
+  ++ lib.optionals (!pkgs.stdenv.buildPlatform.isi686) [
     (devos cachix)
-  ++ lib.optional
-    (system != "aarch64-darwin")
+  ]
+  ++ lib.optionals (pkgs.stdenv.hostPlatform.isLinux && !pkgs.stdenv.buildPlatform.isDarwin) [
     (devos inputs.nixos-generators.defaultPackage.${pkgs.system})
+    (devos deploy-rs)
+  ]
   ;
 }

shell/hooks/pre-commit.sh

@@ -14,13 +14,16 @@ nix_files=($($diff -- '*.nix'))
 all_files=($($diff))
 
 # Format staged nix files.
-if [[ -n "${nix_files[@]}" ]]; then
+if (( ${#nix_files[@]} != 0 )); then
   nixpkgs-fmt "${nix_files[@]}" \
   && git add "${nix_files[@]}"
 fi
 
 # check editorconfig
-editorconfig-checker -- "${all_files[@]}"
+if (( ${#all_files[@]} != 0 )); then
+  editorconfig-checker -- "${all_files[@]}"
+fi
+
 if [[ $? != '0' ]]; then
   printf "%b\n" \
     "\nCode is not aligned with .editorconfig" \

tests/first-test.nix

@@ -0,0 +1,87 @@
+{ pkgs, lib, ... }:
+{
+  name = "firstTest";
+
+  nodes.test-machine = { suites ? null, ... }: {
+    imports = suites.iso;
+
+    home-manager.users.pub-solar.programs.zsh.shellAliases = {
+      test-x11 = "glinfo | tee /tmp/test-x11.out && touch /tmp/test-x11-exit-ok";
+      test-wayland = "wayland-info | tee /tmp/test-wayland.out && touch /tmp/test-wayland-exit-ok";
+    };
+
+    # source: https://github.com/NixOS/nixpkgs/blob/nixos-unstable/nixos/tests/sway.nix
+    environment = {
+      # For glinfo and wayland-info:
+      systemPackages = with pkgs; [ mesa-demos wayland-utils alacritty ];
+      # Use a fixed SWAYSOCK path (for swaymsg):
+      variables = {
+        "SWAYSOCK" = "/tmp/sway-ipc.sock";
+        # TODO: Investigate if we can get hardware acceleration to work (via
+        # virtio-gpu and Virgil). We currently have to use the Pixman software
+        # renderer since the GLES2 renderer doesn't work inside the VM (even
+        # with WLR_RENDERER_ALLOW_SOFTWARE):
+        # "WLR_RENDERER_ALLOW_SOFTWARE" = "1";
+        "WLR_RENDERER" = "pixman";
+      };
+
+      # To help with OCR:
+      etc."xdg/foot/foot.ini".text = lib.generators.toINI { } {
+        main = {
+          font = "inconsolata:size=14";
+        };
+        colors = rec {
+          foreground = "000000";
+          background = "ffffff";
+          regular2 = foreground;
+        };
+      };
+    };
+
+    fonts.fonts = [ pkgs.inconsolata ];
+
+    # Need to switch to a different GPU driver than the default one (-vga std) so that Sway can launch:
+    virtualisation.qemu.options = [ "-vga none -device virtio-gpu-pci" ];
+    virtualisation.cores = 4;
+    virtualisation.memorySize = 2048;
+  };
+
+  enableOCR = true;
+
+  testScript = ''
+    import shlex
+    def swaymsg(command: str, succeed=True):
+        with machine.nested(f"sending swaymsg {command!r}" + " (allowed to fail)" * (not succeed)):
+          (machine.succeed if succeed else machine.execute)(
+            f"su - pub-solar -c {shlex.quote('swaymsg -- ' + command)}"
+          )
+
+
+    machine.wait_for_unit("multi-user.target")
+
+    # To check the version:
+    print(machine.succeed("sway --version"))
+
+    # Wait for Sway to complete startup:
+    machine.wait_for_file("/run/user/1000/wayland-1")
+    machine.wait_for_file("/tmp/sway-ipc.sock")
+
+    # Start a terminal (foot) on workspace 3:
+    machine.wait_for_text("1")
+    machine.send_key("meta_l-3")
+    machine.sleep(3)
+    machine.send_key("meta_l-ret")
+    machine.sleep(10)
+    machine.send_chars("whoami\n")
+    machine.sleep(3)
+    machine.wait_for_text("pub-solar")
+    machine.send_chars("test-wayland\n")
+    machine.wait_for_file("/tmp/test-wayland-exit-ok")
+    print(machine.succeed("cat /tmp/test-wayland.out"))
+    machine.copy_from_vm("/tmp/test-wayland.out")
+    machine.sleep(3)
+    machine.screenshot("foot_wayland_info")
+    machine.send_key("meta_l-shift-q")
+    machine.wait_until_fails("pgrep foot")
+  '';
+}

tests/second-test.nix

@@ -0,0 +1,14 @@
+{ }:
+{
+  name = "secondTest";
+
+  nodes.test-machine2 = { suites ? null, ... }: {
+    imports = [
+      suites.iso
+    ];
+  };
+
+  testScript = ''
+    machines[0].systemctl("is-system-running --wait")
+  '';
+}