Merge pull request 'Update flake inputs' (#258) from main-update-flake-inputs into main

Reviewed-on: #258
Reviewed-by: b12f <hello@benjaminbaedorf.eu>

.drone.yml

@@ -1,79 +1,74 @@
+---
+kind: pipeline
+type: exec
+name: Check
+node:
+  hosttype: baremetal
+
+steps:
+  - name: "Check"
+    when:
+      event:
+        - pull_request
+    environment:
+      NIX_FLAGS: "--print-build-logs --verbose --accept-flake-config"
+    commands:
+      - 'echo DEBUG: Using NIX_FLAGS: $NIX_FLAGS'
+      - nix $$NIX_FLAGS develop --command nix flake show
+      - nix $$NIX_FLAGS develop --command treefmt --fail-on-change
+      - nix $$NIX_FLAGS develop --command editorconfig-checker
+      - 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 --accept-flake-config"
+    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,31 +76,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:
+  ref:
-    - cron
+    - refs/tags/v*
-
+    - refs/tags/t*
----
-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
 
 ---
 kind: pipeline
@@ -115,41 +94,54 @@ name: Publish ISO
 steps:
   - name: "Build ISO"
     image: docker.nix-community.org/nixpkgs/nix-flakes:latest
+    environment:
+      NIX_FLAGS: "--print-build-logs --verbose --accept-flake-config"
     volumes:
       - name: file-exchange
         path: /var/nix/iso-cache
     commands:
       - |
-        nix --print-build-logs --verbose \
+        nix $$NIX_FLAGS build \
-          build \
+          '.#nixosConfigurations.bootstrap.config.system.build.isoImage'
-            '.#nixosConfigurations.bootstrap.config.system.build.bootstrapIso'
+      - cp $(readlink -f result)/iso/PubSolarOS*.iso /var/nix/iso-cache/
-      - cp $(readlink -f result)/iso/*.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
+    # https://github.com/appleboy/drone-scp/pull/141 got merged, yay
+    image: appleboy/drone-scp:1.6.5-linux-amd64
     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
+        from_secret: iso_web_ssh_key
-      target: /srv/os
+      target: /data/srv/www/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
@@ -157,6 +149,6 @@ volumes:
 
 ---
 kind: signature
-hmac: da951ba8ede88996728acfb47846e01880eb0e3b91f66e47848d6c1cc727c5d9
+hmac: a116f78a0b22188052893bdb46aa40f8de66438826c10ced362ea183d7644d67
 
 ...

.drone/setup_ssh.sh

@@ -1,11 +0,0 @@
-#!/usr/bin/env sh
-
-set -e
-
-# Setup ssh inside container
-mkdir -p ~/.ssh
-echo "$GITEA_SSH_KEY" > ~/.ssh/id_rsa
-echo "[git.b12f.io]:2222 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJ4uaREL7acSSCNAX+voDYl1Kj7JipP62fR5x1UyGP9u" >> ~/.ssh/known_hosts
-echo "Host git.b12f.io" >> ~/.ssh/config
-echo "  Port 2222" >> ~/.ssh/config
-chmod -R 600 ~/.ssh

.drone/upstream-branch.sh

@@ -1,12 +0,0 @@
-#!/usr/bin/env sh
-
-set -e
-set -u
-
-LOCAL="$DRONE_BRANCH"
-[ "$LOCAL" = "main" ] && UPSTREAM=origin/devos || UPSTREAM=origin/main
-
-git fetch --all
-git checkout "$LOCAL"
-git merge "$UPSTREAM"
-git push origin "$LOCAL"

.editorconfig

@@ -15,6 +15,9 @@ end_of_line = unset
 insert_final_newline = unset
 trim_trailing_whitespace = unset
 indent_size = unset
+charset = unset
+indent_style = unset
+indent_size = unset
 
 [{.*,secrets}/**]
 end_of_line = unset

.git-blame-ignore-revs

@@ -0,0 +1,2 @@
+# Formatted code using treefmt and alejandra
+73bf158392a427d188b7aad36244b94506f57a15

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,38 +0,0 @@
----
-name: Bug report
-about: Create a report to help improve
-title: ''
-labels: 'bug'
-assignees: ''
-
----
-
-Your issue may already be reported!
-Please search on the [issue tracker](../) before creating one.
-
-## Expected Behavior
-<!--- What should happen? -->
-<!--- How it should work? -->
-
-## Current Behavior
-<!--- What happens instead of the expected behavior? -->
-
-## Possible Solution
-<!--- Not obligatory, but suggest a fix/reason for the bug, -->
-<!--- or ideas how to implement the addition or change -->
-
-## Steps to Reproduce
-<!--- An unambiguous set of steps to reproduce this bug. -->
-<!--- Linked fork or gist if needed. -->
-1.
-2.
-3.
-4.
-
-## Context
-<!--- How has this issue affected you? What are you trying to accomplish? -->
-<!--- Providing context helps us come up with a solution that is most useful in the real world. -->
-
-## Your Environment
-<!--- Include relevant details about the environment you experienced the bug in. -->
-<!--- If you have run `bud update`, for example, post the flake.lock file. -->

.github/ISSUE_TEMPLATE/community_request.md

@@ -1,22 +0,0 @@
----
-name: Commuity Request
-about: inspire contribution to the `community` branch
-title: ''
-labels: 'community'
-assignees: ''
-
----
-
-Your issue may already be reported!
-Please search on the [issue tracker](../) before creating one.
-
-## Ideas
-<!--- The `community` branch is meant to provide various preconfigured system options, -->
-<!--- useful to all kinds of users. -->
-
-<!--- The point is to engage the community for what it thinks are -->
-<!--- sane defaults for various tools. -->
-
-## Requests
-<!--- Have a tool that you'd like to see a system profile for? -->
-<!--- Feel free to request it here. -->

.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,24 +0,0 @@
----
-name: Feature request
-about: Suggest an idea
-title: ''
-labels: 'enhancement'
-assignees: ''
-
----
-
-Your issue may already be reported!
-Please search on the [issue tracker](../) before creating one.
-
-## Would your feature fix an existing issue?
-<!--- If your idea is related to, or resolves other issues, please mention. -->
-
-## Describe the solution you'd like
-<!--- What you want to happen. -->
-
-## Describe alternatives you've considered
-<!--- Any alternative solutions or features you've considered? -->
-
-## Additional context
-<!--- Is this feature only useful for a particular usecase? -->
-<!--- Please elaborate. -->

.github/ISSUE_TEMPLATE/upstream_notice.md

@@ -1,16 +0,0 @@
----
-name: Upstream notice (Issues or Changes)
-about: Create an upstream notice to help our research
-title: '[ <put the upstream project> ]: <topic>'
-labels: 'upstream'
-assignees: ''
-
----
-
-## Link
-<!-- just place a link to the upstream issue, or PR -->
-
-
-## Context
-<!-- We want to make this as cheap for you as possible.
-Context is not required but helpful -->

.github/workflows/check.yml

@@ -1,29 +0,0 @@
-name: "Check & Cachix"
-on:
-  push:
-    branches:
-      - main
-      - trying
-      - staging
-jobs:
-  check:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2.3.4
-    - uses: cachix/install-nix-action@v13
-      with:
-        install_url: https://github.com/numtide/nix-flakes-installer/releases/download/nix-2.4pre20210415_76980a1/install
-        extra_nix_config: |
-          experimental-features = nix-command flakes
-          system-features = nixos-test benchmark big-parallel kvm recursive-nix
-          substituters = https://nrdxp.cachix.org https://nix-community.cachix.org https://cache.nixos.org
-          trusted-public-keys = nrdxp.cachix.org-1:Fc5PSqY2Jm1TrWfm88l6cvGWwz3s93c6IOifQWnhNW4= nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs= cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=
-    - uses: cachix/cachix-action@v10
-      with:
-        name: nrdxp
-        signingKey: '${{ secrets.CACHIX_SIGNING_KEY }}'
-        authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
-    - run: nix -Lv flake check
-    - run: nix -Lv build ".#nixosConfigurations.NixOS.config.system.build.toplevel"
-    - run: nix -Lv develop -c echo OK
-    - run: nix -Lv develop --command bud --help

.github/workflows/mdbook_docs.yml

@@ -1,27 +0,0 @@
-name: Deploy Docs to GitHub Pages
-
-on:
-  push:
-    branches:
-      - main
-
-jobs:
-  deploy:
-    runs-on: ubuntu-18.04
-    steps:
-      - uses: actions/checkout@v2
-
-      - name: Setup mdBook
-        uses: peaceiris/actions-mdbook@v1
-        with:
-          mdbook-version: 'latest'
-
-      - run: mdbook build doc
-
-      - name: Deploy
-        uses: peaceiris/actions-gh-pages@v3
-        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          publish_branch: gh-pages
-          publish_dir: ./doc/book
-          cname: devos.divnix.com

.github/workflows/release.yml

@@ -1,71 +0,0 @@
-name: Release
-
-on:
-  push:
-    tags:
-      - v*
-
-jobs:
-  changelog:
-    name: Update Changelog
-    runs-on: ubuntu-latest
-    steps:
-      - name: Get version from tag
-        env:
-          GITHUB_REF: ${{ github.ref }}
-        run: |
-          export CURRENT_VERSION=${GITHUB_TAG/refs\/tags\/v/}
-          echo "CURRENT_VERSION=$CURRENT_VERSION" >> $GITHUB_ENV
-      - name: Checkout code
-        uses: actions/checkout@v2
-        with:
-          ref: main
-      - name: Update Changelog
-        uses: heinrichreimer/github-changelog-generator-action@v2.1.1
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          issues: false
-          issuesWoLabels: false
-          pullRequests: true
-          prWoLabels: true
-          addSections: '{"documentation":{"prefix":"**Documentation:**","labels":["documentation"]}}'
-      - uses: stefanzweifel/git-auto-commit-action@v4
-        with:
-          commit_message: Update Changelog for tag ${{ env.CURRENT_VERSION }}
-          file_pattern: CHANGELOG.md
-
-  release_notes:
-    name: Create Release Notes
-    runs-on: ubuntu-latest
-    needs: changelog
-    steps:
-      - name: Get version from tag
-        env:
-          GITHUB_REF: ${{ github.ref }}
-        run: |
-          export CURRENT_VERSION=${GITHUB_TAG/refs\/tags\/v/}
-          echo "CURRENT_VERSION=$CURRENT_VERSION" >> $GITHUB_ENV
-
-      - name: Checkout code
-        uses: actions/checkout@v2
-        with:
-          ref: main
-
-      - name: Get Changelog Entry
-        id: changelog_reader
-        uses: mindsers/changelog-reader-action@v1
-        with:
-          version: ${{ env.CURRENT_VERSION }}
-          path: ./CHANGELOG.md
-
-      - name: Create Release
-        id: create_release
-        uses: actions/create-release@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          tag_name: ${{ github.ref }}
-          release_name: Release ${{ github.ref }}
-          body: ${{ steps.changelog_reader.outputs.log_entry }}
-          draft: false
-          prerelease: false

CHANGELOG.md

@@ -77,7 +77,7 @@
 
 **Fixed bugs:**
 
-- My emacsGcc overlay is not working  [\#146](https://github.com/divnix/devos/issues/146)
+- My emacsGcc overlay is not working [\#146](https://github.com/divnix/devos/issues/146)
 - local flake registry freezes branches [\#142](https://github.com/divnix/devos/issues/142)
 - nixos-option no longer works after collect garbage [\#138](https://github.com/divnix/devos/issues/138)
 - Profiles imports are brittle, causing failure if imported twice [\#136](https://github.com/divnix/devos/issues/136)
@@ -109,6 +109,4 @@
 
 ## [07092020](https://github.com/divnix/devos/tree/07092020) (2020-07-09)
 
-
+\* _This Changelog was automatically generated by [github_changelog_generator](https://github.com/github-changelog-generator/github-changelog-generator)_
-
-\* *This Changelog was automatically generated by [github_changelog_generator](https://github.com/github-changelog-generator/github-changelog-generator)*

CONTRIBUTING.md

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

LICENSE.md

@@ -204,23 +204,23 @@ 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
+- a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
+  it, and giving a relevant date.
--   b) The work must carry prominent notices stating that it is
+- b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under
+  released under this License and any conditions added under
-    section 7. This requirement modifies the requirement in section 4
+  section 7. This requirement modifies the requirement in section 4
-    to "keep intact all notices".
+  to "keep intact all notices".
--   c) You must license the entire work, as a whole, under this
+- c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy. This
+  License to anyone who comes into possession of a copy. This
-    License will therefore apply, along with any applicable section 7
+  License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
+  additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged. This License gives no
+  regardless of how they are packaged. This License gives no
-    permission to license the work in any other way, but it does not
+  permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
+  invalidate such permission if you have separately received it.
--   d) If the work has interactive user interfaces, each must display
+- d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
+  Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
+  interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
+  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,
@@ -239,42 +239,42 @@ 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
+- a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
+  (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
+  Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
+  customarily used for software interchange.
--   b) Convey the object code in, or embodied in, a physical product
+- b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
+  (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
+  written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
+  long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
+  model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
+  copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
+  product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
+  medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
+  more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the Corresponding
+  conveying of source, or (2) access to copy the Corresponding
-    Source from a network server at no charge.
+  Source from a network server at no charge.
--   c) Convey individual copies of the object code with a copy of the
+- c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source. This
+  written offer to provide the Corresponding Source. This
-    alternative is allowed only occasionally and noncommercially, and
+  alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
+  only if you received the object code with such an offer, in accord
-    with subsection 6b.
+  with subsection 6b.
--   d) Convey the object code by offering access from a designated
+- d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
+  place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
+  Corresponding Source in the same way through the same place at no
-    further charge. You need not require recipients to copy the
+  further charge. You need not require recipients to copy the
-    Corresponding Source along with the object code. If the place to
+  Corresponding Source along with the object code. If the place to
-    copy the object code is a network server, the Corresponding Source
+  copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
+  may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
+  that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
+  clear directions next to the object code saying where to find the
-    Corresponding Source. Regardless of what server hosts the
+  Corresponding Source. Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
+  Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
+  available for as long as needed to satisfy these requirements.
--   e) Convey the object code using peer-to-peer transmission,
+- e) Convey the object code using peer-to-peer transmission,
-    provided you inform other peers where the object code and
+  provided you inform other peers where the object code and
-    Corresponding Source of the work are being offered to the general
+  Corresponding Source of the work are being offered to the general
-    public at no charge under subsection 6d.
+  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
@@ -350,23 +350,23 @@ 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
+- a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
+  terms of sections 15 and 16 of this License; or
--   b) Requiring preservation of specified reasonable legal notices or
+- b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
+  author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
+  Notices displayed by works containing it; or
--   c) Prohibiting misrepresentation of the origin of that material,
+- c) Prohibiting misrepresentation of the origin of that material,
-    or requiring that modified versions of such material be marked in
+  or requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
+  reasonable ways as different from the original version; or
--   d) Limiting the use for publicity purposes of names of licensors
+- d) Limiting the use for publicity purposes of names of licensors
-    or authors of the material; or
+  or authors of the material; or
--   e) Declining to grant rights under trademark law for use of some
+- e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
+  trade names, trademarks, or service marks; or
--   f) Requiring indemnification of licensors and authors of that
+- f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions
+  material by anyone who conveys the material (or modified versions
-    of it) with contractual assumptions of liability to the recipient,
+  of it) with contractual assumptions of liability to the recipient,
-    for any liability that these contractual assumptions directly
+  for any liability that these contractual assumptions directly
-    impose on those licensors and authors.
+  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

README.md

@@ -10,37 +10,37 @@ 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_:
 
-* Reproducibility is king, and the future is with declarative and functional
+- 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
+  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
+  reproducible package management (Guix looks good), it has a plethora
-    of packages, a very active and helpful community, and very solid
+  of packages, a very active and helpful community, and very solid
-    software engineering practices.
+  software engineering practices.
-* Because reproducibility is king, we're using nix flakes for locking flake
+- Because reproducibility is king, we're using nix flakes for locking flake
-    dependencies. [Digga](https://github.com/divnix/digga) is our flake
+  dependencies. [Digga](https://github.com/divnix/digga) is our flake
-    utility library, made by the wonderful people of the Divnix community.
+  utility library, made by the wonderful people of the Divnix community.
-* Physical devices are not shared anymore nowadays. Only seldomly will you
+- Physical devices are not shared anymore nowadays. Only seldomly will you
-    find shared devices that need more than one user account. For this
+  find shared devices that need more than one user account. For this
-    reason, only one user (excluding `root`) is assumed.
+  reason, only one user (excluding `root`) is assumed.
-* Keyboard navigation wins where it matters; ergonomics, programmability,
+- Keyboard navigation wins where it matters; ergonomics, programmability,
-    efficiency, and speed. We use a tiling window manager (`sway`) and
+  efficiency, and speed. We use a tiling window manager (`sway`) and
-    prioritize cli-based solutions where sensible. The editor is `neovim`
+  prioritize cli-based solutions where sensible. The editor is `neovim`
-    configured to be just as opiniated as the operating system it is a part
+  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
+  of. For mailing, `neomutt` is the default, but we're more divided on
-    that part.
+  that part.
-* We like new and shiny things, so we've moved to Wayland and pipewire.
+- 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-
+- SICHERHEIT is written in capital letters at pub.solar, so we have first-
-    class disk-encryption support. Currently in the works is a paranoid
+  class disk-encryption support. Currently in the works is a paranoid
-    mode where the device can only hibernate (no more sleep or lockscreen)
+  mode where the device can only hibernate (no more sleep or lockscreen)
-    so your data is locked any time you leave the device.
+  so your data is locked any time you leave the device.
-* Free software is better. If we can avoid it, nonfree software is avoided.
+- 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
+  By default, `allowUnfree` is `false` so we don't ship non-free software
-    in a basic PubSolarOS ISO. However, nothing prevents you from using
+  in a basic PubSolarOS ISO. However, nothing prevents you from using
-    as much non-free software as you like.
+  as much non-free software as you like.
-* Automation is better. The reproducibility of nix feels so much more
+- Automation is better. The reproducibility of nix feels so much more
-    powerful once you're deploying your new configuration from your laptop
+  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).
+  to all your other devices with one command. [We have an automated CI using drone](https://ci.pub.solar/pub-solar/os).
-* Community is important. We just like working on this together, and it
+- Community is important. We just like working on this together, and it
-    feels really good to see our progress at the end of a
+  feels really good to see our progress at the end of a
-    [hakken.irl](https://pub.solar/hakken) session.
+  [hakken.irl](https://pub.solar/hakken) session.
 
 To get started, take a look at the quick start guide in our docs.

default.nix

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

doc/CONTRIBUTING.md

@@ -1,4 +1,5 @@
 # TL;DR;
+
 - **Target Branch**: `main`
 - **Merge Policy**: green check: merge away. yellow circle: have patience. red x: try again.
 - **Docs**: every change set is expected to contain doc updates
@@ -9,5 +10,6 @@
   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 `check-all` from within the devshell on your local machine

doc/SUMMARY.md

@@ -28,4 +28,3 @@
   - [NixOS](./api-reference-nixos.md)
 - [Library Reference]()
 - [Contributing](./CONTRIBUTING.md)
-

doc/api-reference-channels.md

@@ -1,91 +1,76 @@
 # 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*_:
-*_Type_*:
 attribute set of submodules or path convertible to it
 
+_*Default*_
 
-*_Default_*
 ```
 {}
 ```
 
-
-
-
 ## channels.\<name\>.config
+
 nixpkgs config for this channel
 
-
+_*Type*_:
-*_Type_*:
 attribute set or path convertible to it
 
+_*Default*_
 
-*_Default_*
 ```
 {}
 ```
 
-
-
-
 ## channels.\<name\>.input
+
 nixpkgs flake input to use for this channel
 
-
+_*Type*_:
-*_Type_*:
 nix flake
 
+_*Default*_
 
-*_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*_:
-*_Type_*:
 list of valid Nixpkgs overlay or path convertible to its or anything convertible to it or path convertible to it
 
+_*Default*_
 
-*_Default_*
 ```
 []
 ```
 
-
-
-
 ## channels.\<name\>.patches
+
 patches to apply to this channel
 
-
+_*Type*_:
-*_Type_*:
 list of paths
 
+_*Default*_
 
-*_Default_*
 ```
 []
 ```
-
-
-
-

doc/api-reference-devshell.md

@@ -1,72 +1,59 @@
 # 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*_:
-*_Type_*:
 submodule or path convertible to it
 
+_*Default*_
 
-*_Default_*
 ```
 {}
 ```
 
-
-
-
 ## devshell.exportedModules
+
 modules to include in all hosts and export to devshellModules output
 
-
+_*Type*_:
-*_Type_*:
 list of valid module or path convertible to its or anything convertible to it
 
+_*Default*_
 
-*_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*_:
-*_Type_*:
 list of valid modules or anything convertible to it
 
+_*Default*_
 
-*_Default_*
 ```
 []
 ```
 
-
-
-
 ## devshell.modules
+
 modules to include that won't be exported
 meant importing modules from external flakes
 
-
+_*Type*_:
-*_Type_*:
 list of valid modules or anything convertible to it or path convertible to it
 
+_*Default*_
 
-*_Default_*
 ```
 []
 ```
-
-
-
-

doc/api-reference-home.md

@@ -1,119 +1,97 @@
 # Home-Manager API Container
+
 Configure your home manager modules, profiles & suites.
 
-
 ## home
+
 hosts, modules, suites, and profiles for home-manager
 
-
+_*Type*_:
-*_Type_*:
 submodule or path convertible to it
 
+_*Default*_
 
-*_Default_*
 ```
 {}
 ```
 
-
-
-
 ## home.exportedModules
+
 modules to include in all hosts and export to homeModules output
 
-
+_*Type*_:
-*_Type_*:
 list of valid modules or anything convertible to it or path convertible to it
 
+_*Default*_
 
-*_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*_:
-*_Type_*:
 list of valid modules or anything convertible to it
 
+_*Default*_
 
-*_Default_*
 ```
 []
 ```
 
-
-
-
 ## home.importables
+
 Packages of paths to be passed to modules as `specialArgs`.
 
-
+_*Type*_:
-*_Type_*:
 attribute set
 
+_*Default*_
 
-*_Default_*
 ```
 {}
 ```
 
-
-
-
 ## home.importables.suites
+
 collections of profiles
 
-
+_*Type*_:
-*_Type_*:
 null or attribute set of list of paths or anything convertible to its or path convertible to it
 
+_*Default*_
 
-*_Default_*
 ```
 null
 ```
 
-
-
-
 ## home.modules
+
 modules to include that won't be exported
 meant importing modules from external flakes
 
-
+_*Type*_:
-*_Type_*:
 list of valid modules or anything convertible to it or path convertible to it
 
+_*Default*_
 
-*_Default_*
 ```
 []
 ```
 
-
-
-
 ## home.users
+
 HM users that can be deployed portably without a host.
 
-
+_*Type*_:
-*_Type_*:
 attribute set of HM user configs
 
+_*Default*_
 
-*_Default_*
 ```
 {}
 ```
-
-
-
-

doc/api-reference-nixos.md

@@ -1,234 +1,191 @@
 # NixOS API Container
+
 Configure your nixos modules, profiles & suites.
 
-
 ## nixos
+
 hosts, modules, suites, and profiles for NixOS
 
-
+_*Type*_:
-*_Type_*:
 submodule or path convertible to it
 
+_*Default*_
 
-*_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*_:
-*_Type_*:
 submodule
 
+_*Default*_
 
-*_Default_*
 ```
 {}
 ```
 
-
-
-
 ## nixos.hostDefaults.channelName
+
 Channel this host should follow
 
-
+_*Type*_:
-*_Type_*:
 channel defined in `channels`
 
-
-
-
-
-
 ## nixos.hostDefaults.exportedModules
+
 modules to include in all hosts and export to nixosModules output
 
-
+_*Type*_:
-*_Type_*:
 list of valid modules or anything convertible to it or path convertible to it
 
+_*Default*_
 
-*_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*_:
-*_Type_*:
 list of valid modules or anything convertible to it
 
+_*Default*_
 
-*_Default_*
 ```
 []
 ```
 
-
-
-
 ## nixos.hostDefaults.modules
+
 modules to include that won't be exported
 meant importing modules from external flakes
 
-
+_*Type*_:
-*_Type_*:
 list of valid modules or anything convertible to it or path convertible to it
 
+_*Default*_
 
-*_Default_*
 ```
 []
 ```
 
-
-
-
 ## nixos.hostDefaults.system
+
 system for this host
 
-
+_*Type*_:
-*_Type_*:
 null or system defined in `supportedSystems`
 
+_*Default*_
 
-*_Default_*
 ```
 null
 ```
 
-
-
-
 ## nixos.hosts
+
 configurations to include in the nixosConfigurations output
 
-
+_*Type*_:
-*_Type_*:
 attribute set of submodules
 
+_*Default*_
 
-*_Default_*
 ```
 {}
 ```
 
-
-
-
 ## nixos.hosts.\<name\>.channelName
+
 Channel this host should follow
 
-
+_*Type*_:
-*_Type_*:
 null or channel defined in `channels`
 
+_*Default*_
 
-*_Default_*
 ```
 null
 ```
 
-
-
-
 ## nixos.hosts.\<name\>.modules
+
 modules to include
 
-
+_*Type*_:
-*_Type_*:
 list of valid modules or anything convertible to it or path convertible to it
 
+_*Default*_
 
-*_Default_*
 ```
 []
 ```
 
-
-
-
 ## nixos.hosts.\<name\>.system
+
 system for this host
 
-
+_*Type*_:
-*_Type_*:
 null or system defined in `supportedSystems`
 
+_*Default*_
 
-*_Default_*
 ```
 null
 ```
 
-
-
-
 ## nixos.hosts.\<name\>.tests
+
 tests to run
 
-
+_*Type*_:
-*_Type_*:
 list of valid NixOS test or path convertible to its or anything convertible to it
 
+_*Default*_
 
-*_Default_*
 ```
 []
 ```
 
+_*Example*_
 
-*_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*_:
-*_Type_*:
 attribute set
 
+_*Default*_
 
-*_Default_*
 ```
 {}
 ```
 
-
-
-
 ## nixos.importables.suites
+
 collections of profiles
 
-
+_*Type*_:
-*_Type_*:
 null or attribute set of list of paths or anything convertible to its or path convertible to it
 
+_*Default*_
 
-*_Default_*
 ```
 null
 ```
-
-
-
-

doc/api-reference.md

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

doc/book.toml

@@ -1,5 +1,9 @@
 [book]
-authors = ["Timothy DeHerrera"]
+authors = [
+  "Timothy DeHerrera",
+  "Parthiv Seetharaman",
+  "David Arnold",
+]
 language = "en"
 multilingual = false
 src = "."

doc/concepts/hosts.md

@@ -28,10 +28,10 @@ is best saved for [profile modules](./profiles.md).
 This is a good place to import sets of profiles, called [suites](./suites.md),
 that you intend to use on your machine.
 
-
 ## Example
 
 flake.nix:
+
 ```nix
 {
   nixos = {
@@ -47,6 +47,7 @@ flake.nix:
 ```
 
 hosts/librem.nix:
+
 ```nix
 { suites, ... }:
 {

doc/concepts/overrides.md

@@ -1,8 +1,10 @@
 # Overrides
+
 Each NixOS host follows one channel. But many times it is useful to get packages
 or modules from different channels.
 
 ## Packages
+
 You can make use of `overlays/overrides.nix` to override specific packages in the
 default channel to be pulled from other channels. That file is simply an example
 of how any overlay can get `channels` as their first argument.
@@ -10,6 +12,7 @@ of how any overlay can get `channels` as their first argument.
 You can add overlays to any channel to override packages from other channels.
 
 Pulling the manix package from the `latest` channel:
+
 ```nix
 channels: final: prev: {
   __dontExport = true;
@@ -28,6 +31,7 @@ You can also pull modules from other channels. All modules have access to the
 `disabledModules` to remove modules from the current channel.
 
 To pull zsh module from the `latest` channel this code can be placed in any module, whether its your host file, a profile, or a module in ./modules etc:
+
 ```nix
 { latestModulesPath }:
 {
@@ -37,6 +41,7 @@ To pull zsh module from the `latest` channel this code can be placed in any modu
 ```
 
 > ##### _Note:_
+>
 > Sometimes a modules name will change from one branch to another.
 
 [nixpkgs-modules]: https://github.com/NixOS/nixpkgs/tree/master/nixos/modules

doc/concepts/profiles.md

@@ -6,6 +6,7 @@ built into the NixOS module system for a reason: to elegantly provide a clear
 separation of concerns.
 
 ## Creation
+
 Profiles are created with the `rakeLeaves` function which recursively collects
 `.nix` files from within a folder. The recursion stops at folders with a `default.nix`
 in them. You end up with an attribute set with leaves(paths to profiles) or
@@ -14,12 +15,14 @@ nodes(attrsets leading to more nodes or leaves).
 A profile is used for quick modularization of [interelated bits](./profiles.md#subprofiles).
 
 > ##### _Notes:_
-> * For _declaring_ module options, there's the [modules](../outputs/modules.md) directory.
+>
-> * This directory takes inspiration from
+> - For _declaring_ module options, there's the [modules](../outputs/modules.md) directory.
+> - This directory takes inspiration from
 >   [upstream](https://github.com/NixOS/nixpkgs/tree/master/nixos/modules/profiles)
 >   .
 
 ### Nested profiles
+
 Profiles can be nested in attribute sets due to the recursive nature of `rakeLeaves`.
 This can be useful to have a set of profiles created for a specific purpose. It is
 sometimes useful to have a `common` profile that has high level concerns related
@@ -28,6 +31,7 @@ to all its sister profiles.
 ### Example
 
 profiles/develop/common.nix:
+
 ```nix
 {
   imports = [ ./zsh ];
@@ -36,6 +40,7 @@ profiles/develop/common.nix:
 ```
 
 profiles/develop/zsh.nix:
+
 ```nix
 {  ... }:
 {
@@ -45,6 +50,7 @@ profiles/develop/zsh.nix:
 ```
 
 The examples above will end up with a profiles set like this:
+
 ```nix
 {
   develop = {
@@ -55,6 +61,7 @@ The examples above will end up with a profiles set like this:
 ```
 
 ## Conclusion
+
 Profiles are the most important concept in DevOS. They allow us to keep our
 Nix expressions self contained and modular. This way we can maximize reuse
 across hosts while minimizing boilerplate. Remember, anything machine

doc/concepts/suites.md

@@ -1,4 +1,5 @@
 # Suites
+
 Suites provide a mechanism for users to easily combine and name collections of
 profiles.
 
@@ -8,6 +9,7 @@ argument (one that can be use in an `imports` line) to your hosts. All lists def
 in `suites` are flattened and type-checked as paths.
 
 ## Definition
+
 ```nix
 rec {
   workstation = [ profiles.develop profiles.graphical users.nixos ];
@@ -16,7 +18,9 @@ rec {
 ```
 
 ## Usage
+
 `hosts/my-laptop.nix`:
+
 ```nix
 { suites, ... }:
 {

doc/concepts/users.md

@@ -1,5 +1,6 @@
 > ##### _Note:_
-> This  section and its semantics need a conceptiual rework.
+>
+> This section and its semantics need a conceptiual rework.
 > Since recently [portable home configurations][portableuser]
 > that are not bound to any specific host are a thing.
 
@@ -8,11 +9,12 @@
 Users are a special case of [profiles](profiles.md) that define system
 users and [home-manager][home-manager] configurations. For your convenience,
 home manager is wired in by default so all you have to worry about is declaring
-your users. For a fully fleshed out example, check out the developers personal
+your users.
-[branch](https://github.com/divnix/devos/tree/nrd/users/nrd/default.nix).
 
 ## Basic Usage
+
 `users/myuser/default.nix`:
+
 ```nix
 { ... }:
 {
@@ -28,6 +30,7 @@ your users. For a fully fleshed out example, check out the developers personal
 ```
 
 ## Home Manager
+
 Home Manager support follows the same principles as regular nixos configurations,
 it even gets its own namespace in your `flake.nix` as `home`.
 
@@ -37,7 +40,9 @@ User profiles can be collected in a similar fashion as system ones into a `suite
 argument that gets passed to your home-manager users.
 
 ### Example
+
 `flake.nix`
+
 ```nix
 {
   home.users.nixos = { suites, ... }: {
@@ -46,24 +51,14 @@ 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.
 
 This is great for keeping your environment consistent across Unix-like systems,
 including macOS.
 
-### From within the projects devshell:
-```sh
-# builds the pub-solar user defined in the PubSolarOS host
-nix build '.#homeConfigurations."pub-solar@PubSolarOS".activationPackage'
-
-# build and activate
-nix build '.#homeConfigurations."pub-solar@PubSolarOS".activationPackage' && ./result/activate && unlink result
-```
-
-### Manually from outside the project:
 ```sh
 # build
 nix build "github:divnix/devos#homeConfigurations.nixos@NixOS.home.activationPackage"
@@ -73,5 +68,5 @@ nix build "github:divnix/devos#homeConfigurations.nixos@NixOS.home.activationPac
 ```
 
 [home-manager]: https://nix-community.github.io/home-manager
-[modules-list]: https://github.com/divnix/devos/tree/main/users/modules/module-list.nix
+[modules-list]: https://github.com/divnix/digga/tree/main/users/modules/module-list.nix
 [portableuser]: https://digga.divnix.com/api-reference-home.html#homeusers

doc/integrations/cachix.md

@@ -1,4 +1,5 @@
 # Cachix
+
 The system will automatically pull a cachix.nix at the root if one exists.
 This is usually created automatically by a `sudo cachix use`. If you're more
 inclined to keep the root clean, you can drop any generated files in the

doc/integrations/deploy.md

@@ -1,4 +1,5 @@
 # deploy-rs
+
 [Deploy-rs][d-rs] is a tool for managing NixOS remote machines. It was
 chosen for devos after the author experienced some frustrations with the
 stateful nature of nixops' db. It was also designed from scratch to support
@@ -11,6 +12,7 @@ the command line.
 ## Usage
 
 Just add your ssh key to the host:
+
 ```nix
 { ... }:
 {
@@ -21,6 +23,7 @@ Just add your ssh key to the host:
 ```
 
 And the private key to your user:
+
 ```nix
 { ... }:
 {
@@ -39,16 +42,20 @@ And the private key to your user:
 ```
 
 And run the deployment:
+
 ```sh
 deploy '.#hostName' --hostname host.example.com
 ```
 
 > ##### _Note:_
+>
 > Your user will need **passwordless** sudo access
+
 ### Home Manager
 
 Digga's `lib.mkDeployNodes` provides only `system` profile.
 In order to deploy your `home-manager` configuration you should provide additional profile(s) to deploy-rs config:
+
 ```nix
 # Initially, this line looks like this: deploy.nodes = digga.lib.mkDeployNodes self.nixosConfigurations { };
 deploy.nodes = digga.lib.mkDeployNodes self.nixosConfigurations
@@ -72,5 +79,4 @@ Substitute `<HOSTNAME>`, `<HM_PROFILE>` and `<YOUR_USERNAME>` placeholders (omit
 `<ANOTHER_HM_PROFILE>` is there to illustrate deploying multiple `home-manager` configurations. Either substitute those as well,
 or remove them altogether. Don't forget the `profileOrder` variable.
 
-
 [d-rs]: https://github.com/serokell/deploy-rs

doc/integrations/hercules.md

@@ -1,4 +1,5 @@
 # Hercules CI
+
 If you start adding your own packages and configurations, you'll probably have
 at least a few binary artifacts. With hercules we can build every package in
 our configuration automatically, on every commit. Additionally, we can have it
@@ -8,6 +9,7 @@ This will work whether your copy is a fork, or a bare template, as long as your
 repo is hosted on GitHub.
 
 ## Setup
+
 Just head over to [hercules-ci.com](https://hercules-ci.com) to make an account.
 
 Then follow the docs to set up an [agent][agent], if you want to deploy to a
@@ -15,6 +17,7 @@ binary cache (and of course you do), be sure _not_ to skip the
 [binary-caches.json][cache].
 
 ## Ready to Use
+
 The repo is already set up with the proper _default.nix_ file, building all
 declared packages, checks, profiles and shells. So you can see if something
 breaks, and never build the same package twice!
@@ -23,6 +26,7 @@ If you want to get fancy, you could even have hercules
 [deploy your configuration](https://docs.hercules-ci.com/hercules-ci-effects/guide/deploy-a-nixos-machine/)!
 
 > ##### _Note:_
+>
 > Hercules doesn't have access to anything encrypted in the
 > [secrets folder](../../secrets), so none of your secrets will accidentally get
 > pushed to a cache by mistake.

doc/integrations/index.md

@@ -1,4 +1,5 @@
 # Integrations
+
 This section explores some of the optional tools included with devos to provide
 a solution to common concerns such as ci and remote deployment. An effort is
 made to choose tools that treat nix, and where possible flakes, as first class

doc/integrations/nvfetcher.md

@@ -1,4 +1,5 @@
 # nvfetcher
+
 [NvFetcher][nvf] is a workflow companion for updating nix sources.
 
 You can specify an origin source and an update configuration, and
@@ -15,6 +16,7 @@ and commit the results.
 ## Usage
 
 Statically fetching (not tracking) a particular tag from a github repo:
+
 ```toml
 [manix]
 src.manual = "v0.6.3"
@@ -22,6 +24,7 @@ fetch.github = "mlvzk/manix"
 ```
 
 Tracking the latest github _release_ from a github repo:
+
 ```toml
 [manix]
 src.github = "mlvzk/manix" # responsible for tracking
@@ -29,6 +32,7 @@ fetch.github = "mlvzk/manix" # responsible for fetching
 ```
 
 Tracking the latest commit of a git repository and fetch from a git repo:
+
 ```toml
 [manix]
 src.git = "https://github.com/mlvzk/manix.git" # responsible for tracking
@@ -36,6 +40,7 @@ fetch.git = "https://github.com/mlvzk/manix.git" # responsible for fetching
 ```
 
 > ##### _Note:_
+>
 > Please refer to the [NvFetcher Readme][nvf-readme] for more options.
 
 [nvf]: https://github.com/berberman/nvfetcher

doc/outputs/index.md

@@ -1,3 +1,4 @@
 # Layout
+
 Each of the following sections is a directory whose contents are output to the
 outside world via the flake's outputs. Check each chapter for details.

doc/outputs/modules.md

@@ -1,4 +1,5 @@
 # Modules
+
 The modules directory is a replica of nixpkg's NixOS [modules][nixpkgs-modules]
 , and follows the same semantics. This allows for trivial upstreaming into
 nixpkgs proper once your module is sufficiently stable.
@@ -6,18 +7,21 @@ nixpkgs proper once your module is sufficiently stable.
 All modules linked in _module-list.nix_ are automatically exported via
 `nixosModules.<file-basename>`, and imported into all [hosts](../concepts/hosts.md).
 
-
 > ##### _Note:_
+>
 > This is reserved for declaring brand new module options. If you just want to
 > declare a coherent configuration of already existing and related NixOS options
 > , use [profiles](../concepts/profiles.md) instead.
 
 ## Semantics
+
 In case you've never written a module for nixpkgs before, here is a brief
 outline of the process.
 
 ### Declaration
+
 modules/services/service-category/my-service.nix:
+
 ```nix
 { config, lib, ... }:
 let
@@ -37,7 +41,9 @@ in
 ```
 
 ### Import
+
 modules/module-list.nix:
+
 ```nix
 [
   ./services/service-category/my-service.nix
@@ -47,7 +53,9 @@ modules/module-list.nix:
 ## Usage
 
 ### Internal
+
 profiles/profile-category/my-profile.nix:
+
 ```nix
 { ... }:
 {
@@ -56,7 +64,9 @@ profiles/profile-category/my-profile.nix:
 ```
 
 ### External
+
 flake.nix:
+
 ```nix
 {
   # inputs omitted

doc/outputs/overlays.md

@@ -1,4 +1,5 @@
 # Overlays
+
 Writing overlays is a common occurence when using a NixOS system. Therefore,
 we want to keep the process as simple and straightforward as possible.
 
@@ -9,7 +10,9 @@ exported via `overlays.<channel>/<pkgName>` _as well as_
 write it.
 
 ## Example
+
 overlays/kakoune.nix:
+
 ```nix
 final: prev: {
   kakoune = prev.kakoune.override {

doc/outputs/pkgs.md

@@ -1,4 +1,5 @@
 # Packages
+
 Similar to [modules](./modules.md), the pkgs directory mirrors the upstream
 [nixpkgs/pkgs][pkgs], and for the same reason; if you ever want to upstream
 your package, it's as simple as dropping it into the nixpkgs/pkgs directory.
@@ -19,20 +20,24 @@ date.
 This is best understood by the simple example below.
 
 ## Example
+
 It is possible to specify sources separately to keep them up to date semi
 automatically.
 The basic rules are specified in pkgs/sources.toml:
+
 ```toml
 # nvfetcher.toml
 [libinih]
 src.github = "benhoyt/inih"
 fetch.github = "benhoyt/inih"
 ```
+
 After changes to this file as well as to update the packages specified in there run
 nvfetcher (for more details see [nvfetcher](https://github.com/berberman/nvfetcher)).
 
 The pkgs overlay is managed in
 pkgs/default.nix:
+
 ```nix
 final: prev: {
   # keep sources first, this makes sources available to the pkgs
@@ -45,6 +50,7 @@ final: prev: {
 
 Lastly the example package is in
 pkgs/development/libraries/libinih/default.nix:
+
 ```nix
 { stdenv, meson, ninja, lib, sources, ... }:
 stdenv.mkDerivation {
@@ -59,8 +65,8 @@ stdenv.mkDerivation {
 }
 ```
 
-
 ## Migration from flake based approach
+
 Previous to nvfetcher it was possible to manage sources via a pkgs/flake.nix, the main changes from there are that sources where in the attribute "srcs" (now "sources") and the contents of the sources where slightly different.
 In order to switch to the new system, rewrite pkgs/flake.nix to a pkgs/sources.toml file using the documentation of nvfetcher,
 add the line that calls the sources at the beginning of pkgs/default.nix, and
@@ -69,6 +75,7 @@ accomodate the small changes in the packages as can be seen from the example.
 The example package looked like:
 
 pkgs/flake.nix:
+
 ```nix
 {
   description = "Package sources";
@@ -81,6 +88,7 @@ pkgs/flake.nix:
 ```
 
 pkgs/default.nix:
+
 ```nix
 final: prev: {
   # then, call packages with `final.callPackage`
@@ -89,6 +97,7 @@ final: prev: {
 ```
 
 pkgs/development/libraries/libinih/default.nix:
+
 ```nix
 { stdenv, meson, ninja, lib, srcs, ... }:
 let inherit (srcs) libinih; in

doc/secrets.md

@@ -1,9 +1,11 @@
 # Secrets
+
 Secrets are managed using [agenix][agenix]
 so you can keep your flake in a public repository like GitHub without
 exposing your password or other sensitive data.
 
 ## Agenix
+
 Currently, there is [no mechanism][secrets-issue] in nix itself to deploy secrets
 within the nix store because it is world-readable.
 
@@ -17,6 +19,7 @@ matching ssh private key can read the data. The [age module][age module] will ad
 encrypted files to the nix store and decrypt them on activation to `/run/agenix`.
 
 ### Setup
+
 All hosts must have openssh enabled, this is done by default in the core profile.
 
 You need to populate your `secrets/secrets.nix` with the proper ssh public keys.
@@ -24,6 +27,7 @@ Be extra careful to make sure you only add public keys, you should never share a
 private key!!
 
 secrets/secrets.nix:
+
 ```nix
 let
   system = "<system ssh key>";
@@ -37,22 +41,25 @@ this file doesn't exist you likely need to enable openssh and rebuild your syste
 
 Your users ssh public key is probably stored in `~/.ssh/id_ed25519.pub` or
 `~/.ssh/id_rsa.pub`. If you haven't generated a ssh key yet, be sure do so:
+
 ```sh
 ssh-keygen -t ed25519
 ```
 
 > ##### _Note:_
+>
 > The underlying tool used by agenix, rage, doesn't work well with password protected
 > ssh keys. So if you have lots of secrets you might have to type in your password many
 > times.
 
-
 ### Secrets
+
 You will need the `agenix` command to create secrets. DevOS conveniently provides that
 in the devShell, so just run `nix develop` whenever you want to edit secrets. Make sure
 to always run `agenix` while in the `secrets/` folder, so it can pick up your `secrets.nix`.
 
 To create secrets, simply add lines to your `secrets/secrets.nix`:
+
 ```
 let
   ...
@@ -62,21 +69,26 @@ in
   "secret.age".publicKeys = allKeys;
 }
 ```
+
 That would tell agenix to create a `secret.age` file that is encrypted with the `system`
 and `user` ssh public key.
 
 Then go into the `secrets` folder and run:
+
 ```sh
 agenix -e secret.age
 ```
+
 This will create the `secret.age`, if it doesn't already exist, and allow you to edit it.
 
 If you ever change the `publicKeys` entry of any secret make sure to rekey the secrets:
+
 ```sh
 agenix --rekey
 ```
 
 ### Usage
+
 Once you have your secret file encrypted and ready to use, you can utilize the [age module][age module]
 to ensure that your secrets end up in `/run/secrets`.
 
@@ -89,15 +101,14 @@ In any profile that uses a NixOS module that requires a secret you can enable a
 }
 ```
 
-
 Then you can just pass the path `/run/agenix/mysecret` to the module.
 
 You can make use of the many options provided by the age module to customize where and how
 secrets get decrypted. You can learn about them by looking at the
 [age module][age module].
 
-
 > ##### _Note:_
+>
 > You can take a look at the [agenix repository][agenix] for more information
 > about the tool.
 

doc/start/index.md

@@ -1,50 +1,49 @@
 # Quick Start
+
 The only dependency is nix, so make sure you have it [installed][install-nix].
 
 ## Get the Template
-If you currently don't have flakes setup, you can utilize the digga shell to pull the template:
+
+If you currently don't have flakes setup, you can utilize the digga shell to
+pull the template:
+
 ```sh
 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
+git commit
 ```
 
-To drop into a nix-shell, if you don't have flakes setup, use the digga shell to create a `flake.lock`:
+Finally, run `nix-shell` to get to an interactive shell with all the
-```sh
+dependencies, including the unstable nix version required. You can run `menu` to
-nix-shell "https://github.com/divnix/digga/archive/main.tar.gz" \
+confirm that you are using digga (expected output includes [docs], [general
-  --run "nix flake lock"
+commands], [linter], etc.).
-```
-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.
 
-> ##### _Notes:_
+> # _Notes:_
+>
 > - Flakes ignore files that have not been added to git, so be sure to stage new
 >   files before building the system.
 > - You can choose to simply clone the repo with git if you want to follow
 >   upstream changes.
-> - If the `nix-shell -p cachix --run "cachix use nrdxp"` line doesn't work
+> - If the `nix-shell -p cachix --run "cachix use nrdxp"` line doesn't work you
->   you can try with sudo: `sudo nix-shell -p cachix --run "cachix use nrdxp"`
+>   can try with sudo: `sudo nix-shell -p cachix --run "cachix use nrdxp"`
 
-## Next Steps:
+## Next Steps
 
 - [Make installable ISO](./iso.md)
 
-
 [install-nix]: https://nixos.org/manual/nix/stable/#sect-multi-user-installation

doc/tests.md

@@ -6,18 +6,29 @@ configuration, and, optionally, run them in
 [CI](./integrations/hercules.md).
 
 ## Unit Tests
+
 Unit tests can be created from regular derivations, and they can do
 almost anything you can imagine. By convention, it is best to test your
 packages during their [check phase][check]. All packages and their tests will
 be built during CI.
 
 ## Integration Tests
-All your profiles defined in suites will be tested in a NixOS VM.
+
+All your profiles defined in suites can be tested against an individual host.
+Simply use digga's pre-baked `digga.lib.allProfilesTest` like so:
+
+```nix
+{
+  hosts = {
+    Morty.tests = [ allProfilesTest ];
+  };
+}
+```
 
 You can write integration tests for one or more NixOS VMs that can,
 optionally, be networked together, and yes, it's as awesome as it sounds!
 
-Be sure to use the `mkTest` function from digga, `digga.lib.pkgs-lib.mkTest`
+Be sure to use the `mkTest` function from Digga, `digga.lib.mkTest`
 which wraps the official [testing-python][testing-python] function to ensure
 that the system is setup exactly as it is for a bare DevOS system. There are
 already great resources for learning how to use these tests effectively,
@@ -26,7 +37,7 @@ and the examples in [nixpkgs][nixos-tests].
 
 [test-doc]: https://nixos.org/manual/nixos/stable/index.html#sec-nixos-tests
 [test-blog]: https://www.haskellforall.com/2020/11/how-to-use-nixos-for-lightweight.html
-[default]: https://github.com/divnix/devos/tree/main/tests/default.nix
+[default]: https://github.com/divnix/devos/tree/core/tests/default.nix
 [run-test]: https://github.com/NixOS/nixpkgs/blob/6571462647d7316aff8b8597ecdf5922547bf365/lib/debug.nix#L154-L166
 [nixos-tests]: https://github.com/NixOS/nixpkgs/tree/master/nixos/tests
 [testing-python]: https://github.com/NixOS/nixpkgs/tree/master/nixos/lib/testing-python.nix

flake.lock

@@ -2,16 +2,19 @@
   "nodes": {
     "agenix": {
       "inputs": {
+        "darwin": [
+          "darwin"
+        ],
         "nixpkgs": [
           "nixos"
         ]
       },
       "locked": {
-        "lastModified": 1652712410,
+        "lastModified": 1682101079,
-        "narHash": "sha256-hMJ2TqLt0DleEnQFGUHK9sV2aAzJPU8pZeiZoqRozbE=",
+        "narHash": "sha256-MdAhtjrLKnk2uiqun1FWABbKpLH090oeqCSiWemtuck=",
         "owner": "ryantm",
         "repo": "agenix",
-        "rev": "7e5e58b98c3dcbf497543ff6f22591552ebfe65b",
+        "rev": "2994d002dcff5353ca1ac48ec584c7f6589fe447",
         "type": "github"
       },
       "original": {
@@ -20,21 +23,6 @@
         "type": "github"
       }
     },
-    "blank": {
-      "locked": {
-        "lastModified": 1625557891,
-        "narHash": "sha256-O8/MWsPBGhhyPoPLHZAuoZiiHo9q6FLlEeIDEXuj6T4=",
-        "owner": "divnix",
-        "repo": "blank",
-        "rev": "5a5d2684073d9f563072ed07c871d577a6c614a8",
-        "type": "github"
-      },
-      "original": {
-        "owner": "divnix",
-        "repo": "blank",
-        "type": "github"
-      }
-    },
     "darwin": {
       "inputs": {
         "nixpkgs": [
@@ -42,32 +30,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1657835815,
+        "lastModified": 1696360011,
-        "narHash": "sha256-CnZszAYpNKydh6N7+xg+eRtWNVoAAGqc6bg+Lpgq1xc=",
+        "narHash": "sha256-HpPv27qMuPou4acXcZ8Klm7Zt0Elv9dgDvSJaomWb9Y=",
         "owner": "LnL7",
         "repo": "nix-darwin",
-        "rev": "54a24f042f93c79f5679f133faddedec61955cf2",
+        "rev": "8b6ea26d5d2e8359d06278364f41fbc4b903b28a",
-        "type": "github"
-      },
-      "original": {
-        "owner": "LnL7",
-        "repo": "nix-darwin",
-        "type": "github"
-      }
-    },
-    "darwin_2": {
-      "inputs": {
-        "nixpkgs": [
-          "digga",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1651916036,
-        "narHash": "sha256-UuD9keUGm4IuVEV6wdSYbuRm7CwfXE63hVkzKDjVsh4=",
-        "owner": "LnL7",
-        "repo": "nix-darwin",
-        "rev": "2f2bdf658d2b79bada78dc914af99c53cad37cba",
         "type": "github"
       },
       "original": {
@@ -78,18 +45,20 @@
     },
     "deploy": {
       "inputs": {
-        "flake-compat": "flake-compat",
+        "flake-compat": [
+          "flake-compat"
+        ],
         "nixpkgs": [
           "nixos"
         ],
         "utils": "utils"
       },
       "locked": {
-        "lastModified": 1659725433,
+        "lastModified": 1695052866,
-        "narHash": "sha256-1ZxuK67TL29YLw88vQ18Y2Y6iYg8Jb7I6/HVzmNB6nM=",
+        "narHash": "sha256-agn7F9Oww4oU6nPiw+YiYI9Xb4vOOE73w8PAoBRP4AA=",
         "owner": "serokell",
         "repo": "deploy-rs",
-        "rev": "41f15759dd8b638e7b4f299730d94d5aa46ab7eb",
+        "rev": "e3f41832680801d0ee9e2ed33eb63af398b090e9",
         "type": "github"
       },
       "original": {
@@ -107,11 +76,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1655976588,
+        "lastModified": 1671489820,
-        "narHash": "sha256-VreHyH6ITkf/1EX/8h15UqhddJnUleb0HgbC3gMkAEQ=",
+        "narHash": "sha256-qoei5HDJ8psd1YUPD7DhbHdhLIT9L2nadscp4Qk37uk=",
         "owner": "numtide",
         "repo": "devshell",
-        "rev": "899ca4629020592a13a46783587f6e674179d1db",
+        "rev": "5aa3a8039c68b4bf869327446590f4cdf90bb634",
         "type": "github"
       },
       "original": {
@@ -122,18 +91,21 @@
     },
     "digga": {
       "inputs": {
-        "blank": "blank",
+        "darwin": [
-        "darwin": "darwin_2",
+          "darwin"
+        ],
         "deploy": [
           "deploy"
         ],
         "devshell": "devshell",
-        "flake-compat": "flake-compat_2",
+        "flake-compat": [
+          "flake-compat"
+        ],
+        "flake-utils": "flake-utils_2",
         "flake-utils-plus": "flake-utils-plus",
         "home-manager": [
           "home"
         ],
-        "latest": "latest",
         "nixlib": [
           "nixos"
         ],
@@ -143,15 +115,16 @@
         "nixpkgs-unstable": "nixpkgs-unstable"
       },
       "locked": {
-        "lastModified": 1659622306,
+        "lastModified": 1674947971,
-        "narHash": "sha256-Kpfm2PNs+kZU0W7qcugoPATLG8I2P7FJFGTgsf1LJiU=",
+        "narHash": "sha256-6gKqegJHs72jnfFP9g2sihl4fIZgtKgKuqU2rCkIdGY=",
-        "owner": "divnix",
+        "owner": "pub-solar",
         "repo": "digga",
-        "rev": "d1193743a535d7fbbc7f3eda4e51295b10bd4d2c",
+        "rev": "2da608bd8afb48afef82c6b1b6d852a36094a497",
         "type": "github"
       },
       "original": {
-        "owner": "divnix",
+        "owner": "pub-solar",
+        "ref": "fix/bootstrap-iso",
         "repo": "digga",
         "type": "github"
       }
@@ -159,43 +132,11 @@
     "flake-compat": {
       "flake": false,
       "locked": {
-        "lastModified": 1648199409,
+        "lastModified": 1673956053,
-        "narHash": "sha256-JwPKdC2PoVBkG6E+eWw3j6BMR6sL3COpYWfif7RVb8Y=",
+        "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
         "owner": "edolstra",
         "repo": "flake-compat",
-        "rev": "64a525ee38886ab9028e6f61790de0832aa3ef03",
+        "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
-        "type": "github"
-      },
-      "original": {
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "type": "github"
-      }
-    },
-    "flake-compat_2": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1650374568,
-        "narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=",
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "rev": "b4a34015c698c7793d592d66adbab377907a2be8",
-        "type": "github"
-      },
-      "original": {
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "type": "github"
-      }
-    },
-    "flake-compat_3": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1648199409,
-        "narHash": "sha256-JwPKdC2PoVBkG6E+eWw3j6BMR6sL3COpYWfif7RVb8Y=",
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "rev": "64a525ee38886ab9028e6f61790de0832aa3ef03",
         "type": "github"
       },
       "original": {
@@ -221,7 +162,10 @@
     },
     "flake-utils-plus": {
       "inputs": {
-        "flake-utils": "flake-utils_2"
+        "flake-utils": [
+          "digga",
+          "flake-utils"
+        ]
       },
       "locked": {
         "lastModified": 1654029967,
@@ -240,11 +184,11 @@
     },
     "flake-utils_2": {
       "locked": {
-        "lastModified": 1644229661,
+        "lastModified": 1667395993,
-        "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=",
+        "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797",
+        "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
         "type": "github"
       },
       "original": {
@@ -253,18 +197,19 @@
         "type": "github"
       }
     },
-    "flake-utils_3": {
+    "fork": {
       "locked": {
-        "lastModified": 1649676176,
+        "lastModified": 1692960587,
-        "narHash": "sha256-OWKJratjt2RW151VUlJPRALb7OU2S5s+f0vLj4o1bHM=",
+        "narHash": "sha256-39SKGdhn8jKKkdqhULbCvQOpdUPE9NNJpy5HTB++Jvg=",
-        "owner": "numtide",
+        "owner": "teutat3s",
-        "repo": "flake-utils",
+        "repo": "nixpkgs",
-        "rev": "a4b154ebbdc88c8498a5c7b01589addc9e9cb678",
+        "rev": "312709dd70684f52496580e533d58645526b1c90",
         "type": "github"
       },
       "original": {
-        "owner": "numtide",
+        "owner": "teutat3s",
-        "repo": "flake-utils",
+        "ref": "nvfetcher-fix",
+        "repo": "nixpkgs",
         "type": "github"
       }
     },
@@ -275,27 +220,27 @@
         ]
       },
       "locked": {
-        "lastModified": 1656169755,
+        "lastModified": 1695108154,
-        "narHash": "sha256-Nlnm4jeQWEGjYrE6hxi/7HYHjBSZ/E0RtjCYifnNsWk=",
+        "narHash": "sha256-gSg7UTVtls2yO9lKtP0yb66XBHT1Fx5qZSZbGMpSn2c=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "4a3d01fb53f52ac83194081272795aa4612c2381",
+        "rev": "07682fff75d41f18327a871088d20af2710d4744",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
-        "ref": "release-22.05",
+        "ref": "release-23.05",
         "repo": "home-manager",
         "type": "github"
       }
     },
     "latest": {
       "locked": {
-        "lastModified": 1657265485,
+        "lastModified": 1696604326,
-        "narHash": "sha256-PUQ9C7mfi0/BnaAUX2R/PIkoNCb/Jtx9EpnhMBNrO/o=",
+        "narHash": "sha256-YXUNI0kLEcI5g8lqGMb0nh67fY9f2YoJsILafh6zlMo=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "b39924fc7764c08ae3b51beef9a3518c414cdb7d",
+        "rev": "87828a0e03d1418e848d3dd3f3014a632e4a4f64",
         "type": "github"
       },
       "original": {
@@ -305,99 +250,29 @@
         "type": "github"
       }
     },
-    "latest_2": {
-      "locked": {
-        "lastModified": 1660305968,
-        "narHash": "sha256-r0X1pZCSEA6mzt5OuTA7nHuLmvnbkwgpFAh1iLIx4GU=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "c4a0efdd5a728e20791b8d8d2f26f90ac228ee8d",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "naersk": {
-      "inputs": {
-        "nixpkgs": [
-          "nixos"
-        ]
-      },
-      "locked": {
-        "lastModified": 1659610603,
-        "narHash": "sha256-LYgASYSPYo7O71WfeUOaEUzYfzuXm8c8eavJcel+pfI=",
-        "owner": "nmattia",
-        "repo": "naersk",
-        "rev": "c6a45e4277fa58abd524681466d3450f896dc094",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nmattia",
-        "repo": "naersk",
-        "type": "github"
-      }
-    },
-    "nixlib": {
-      "locked": {
-        "lastModified": 1636849918,
-        "narHash": "sha256-nzUK6dPcTmNVrgTAC1EOybSMsrcx+QrVPyqRdyKLkjA=",
-        "owner": "nix-community",
-        "repo": "nixpkgs.lib",
-        "rev": "28a5b0557f14124608db68d3ee1f77e9329e9dd5",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "nixpkgs.lib",
-        "type": "github"
-      }
-    },
     "nixos": {
       "locked": {
-        "lastModified": 1660318005,
+        "lastModified": 1696697597,
-        "narHash": "sha256-g9WCa9lVUmOV6dYRbEPjv/TLOR5hamjeCcKExVGS3OQ=",
+        "narHash": "sha256-q26Qv4DQ+h6IeozF2o1secyQG0jt2VUT3V0K58jr3pg=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "5c211b47aeadcc178c5320afd4e74c7eed5c389f",
+        "rev": "5a237aecb57296f67276ac9ab296a41c23981f56",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
-        "ref": "nixos-22.05",
+        "ref": "nixos-23.05",
         "repo": "nixpkgs",
         "type": "github"
       }
     },
-    "nixos-generators": {
-      "inputs": {
-        "nixlib": "nixlib",
-        "nixpkgs": "nixpkgs"
-      },
-      "locked": {
-        "lastModified": 1657748715,
-        "narHash": "sha256-WecDwDY/hEcDQYzFnccCNa+5Umht0lfjx/d1qGDy/rQ=",
-        "owner": "nix-community",
-        "repo": "nixos-generators",
-        "rev": "3323b944d99b026aebfd8de439e001409dde067d",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "nixos-generators",
-        "type": "github"
-      }
-    },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1660407119,
+        "lastModified": 1696614066,
-        "narHash": "sha256-04lWO0pDbhAXFdL4v2VzzwgxrZ5IefKn+TmZPiPeKxg=",
+        "narHash": "sha256-nAyYhO7TCr1tikacP37O9FnGr2USOsVBD3IgvndUYjM=",
         "owner": "nixos",
         "repo": "nixos-hardware",
-        "rev": "12620020f76b1b5d2b0e6fbbda831ed4f5fe56e1",
+        "rev": "bb2db418b616fea536b1be7f6ee72fb45c11afe0",
         "type": "github"
       },
       "original": {
@@ -406,95 +281,43 @@
         "type": "github"
       }
     },
-    "nixpkgs": {
-      "locked": {
-        "lastModified": 1637186689,
-        "narHash": "sha256-NU7BhgnwA/3ibmCeSzFK6xGi+Bari9mPfn+4cBmyEjw=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "7fad01d9d5a3f82081c00fb57918d64145dc904c",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixpkgs-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1657292830,
+        "lastModified": 1672791794,
-        "narHash": "sha256-ldfVSTveWceDCmW6gf3B4kR6vwmz/XS80y5wsLLHFJU=",
+        "narHash": "sha256-mqGPpGmwap0Wfsf3o2b6qHJW1w2kk/I6cGCGIU+3t6o=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "334ec8b503c3981e37a04b817a70e8d026ea9e84",
+        "rev": "9813adc7f7c0edd738c6bdd8431439688bb0cb3d",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
-        "ref": "nixpkgs-unstable",
+        "ref": "nixos-unstable",
         "repo": "nixpkgs",
         "type": "github"
       }
     },
-    "nur": {
-      "locked": {
-        "lastModified": 0,
-        "narHash": "sha256-koC6DBYmLCrgXA+AMHVaODf1uHYPmvcFygHfy3eg6vI=",
-        "path": "/nix/store/6mfkswqi67m35qwv0vh7kpk8rypbl2rq-source",
-        "type": "path"
-      },
-      "original": {
-        "id": "nur",
-        "type": "indirect"
-      }
-    },
-    "nvfetcher": {
-      "inputs": {
-        "flake-compat": "flake-compat_3",
-        "flake-utils": "flake-utils_3",
-        "nixpkgs": [
-          "nixos"
-        ]
-      },
-      "locked": {
-        "lastModified": 1654975372,
-        "narHash": "sha256-wkNZ16akgKViuZzE/IM+bux4uaJ04KIwUeexH8gBjgw=",
-        "owner": "berberman",
-        "repo": "nvfetcher",
-        "rev": "d4b237c10f14f72f8266b0f658faad822e491e55",
-        "type": "github"
-      },
-      "original": {
-        "owner": "berberman",
-        "repo": "nvfetcher",
-        "type": "github"
-      }
-    },
     "root": {
       "inputs": {
         "agenix": "agenix",
         "darwin": "darwin",
         "deploy": "deploy",
         "digga": "digga",
+        "flake-compat": "flake-compat",
+        "fork": "fork",
         "home": "home",
-        "latest": "latest_2",
+        "latest": "latest",
-        "naersk": "naersk",
         "nixos": "nixos",
-        "nixos-generators": "nixos-generators",
+        "nixos-hardware": "nixos-hardware"
-        "nixos-hardware": "nixos-hardware",
-        "nur": "nur",
-        "nvfetcher": "nvfetcher"
       }
     },
     "utils": {
       "locked": {
-        "lastModified": 1648297722,
+        "lastModified": 1667395993,
-        "narHash": "sha256-W+qlPsiZd8F3XkzXOzAoR+mpFqzm3ekQkJNa+PIh1BQ=",
+        "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "0f8662f1319ad6abf89b3380dd2722369fc51ade",
+        "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
         "type": "github"
       },
       "original": {

flake.nix

@@ -2,139 +2,174 @@
   description = "A highly structured configuration database.";
 
   nixConfig.extra-experimental-features = "nix-command flakes";
-  nixConfig.extra-substituters = "https://nix-dram.cachix.org https://dram.cachix.org  https://nrdxp.cachix.org https://nix-community.cachix.org";
-  nixConfig.extra-trusted-public-keys = "nix-dram.cachix.org-1:CKjZ0L1ZiqH3kzYAZRt8tg8vewAx5yj8Du/+iR8Efpg= dram.cachix.org-1:baoy1SXpwYdKbqdTbfKGTKauDDeDlHhUpC+QuuILEMY= nrdxp.cachix.org-1:Fc5PSqY2Jm1TrWfm88l6cvGWwz3s93c6IOifQWnhNW4= nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=";
 
-  inputs =
+  inputs = {
-    {
+    # Track channels with commits tested and built by hydra
-      # Track channels with commits tested and built by hydra
+    nixos.url = "github:nixos/nixpkgs/nixos-23.05";
-      nixos.url = "github:nixos/nixpkgs/nixos-22.05";
+    latest.url = "github:nixos/nixpkgs/nixos-unstable";
-      latest.url = "github:nixos/nixpkgs/nixos-unstable";
 
-      digga.url = "github:divnix/digga";
+    fork.url = "github:teutat3s/nixpkgs/nvfetcher-fix";
-      digga.inputs.nixpkgs.follows = "nixos";
-      digga.inputs.nixlib.follows = "nixos";
-      digga.inputs.home-manager.follows = "home";
-      digga.inputs.deploy.follows = "deploy";
 
-      home.url = "github:nix-community/home-manager/release-22.05";
+    flake-compat.url = "github:edolstra/flake-compat";
-      home.inputs.nixpkgs.follows = "nixos";
+    flake-compat.flake = false;
 
-      darwin.url = "github:LnL7/nix-darwin";
+    digga.url = "github:pub-solar/digga/fix/bootstrap-iso";
-      darwin.inputs.nixpkgs.follows = "nixos";
+    digga.inputs.nixpkgs.follows = "nixos";
+    digga.inputs.nixlib.follows = "nixos";
+    digga.inputs.home-manager.follows = "home";
+    digga.inputs.deploy.follows = "deploy";
+    digga.inputs.darwin.follows = "darwin";
+    digga.inputs.flake-compat.follows = "flake-compat";
 
-      deploy.url = "github:serokell/deploy-rs";
+    home.url = "github:nix-community/home-manager/release-23.05";
-      deploy.inputs.nixpkgs.follows = "nixos";
+    home.inputs.nixpkgs.follows = "nixos";
 
-      agenix.url = "github:ryantm/agenix";
+    darwin.url = "github:LnL7/nix-darwin";
-      agenix.inputs.nixpkgs.follows = "nixos";
+    darwin.inputs.nixpkgs.follows = "nixos";
 
-      nvfetcher.url = "github:berberman/nvfetcher";
+    deploy.url = "github:serokell/deploy-rs";
-      nvfetcher.inputs.nixpkgs.follows = "nixos";
+    deploy.inputs.nixpkgs.follows = "nixos";
+    deploy.inputs.flake-compat.follows = "flake-compat";
 
-      naersk.url = "github:nmattia/naersk";
+    agenix.url = "github:ryantm/agenix";
-      naersk.inputs.nixpkgs.follows = "nixos";
+    agenix.inputs.nixpkgs.follows = "nixos";
+    agenix.inputs.darwin.follows = "darwin";
 
-      nixos-hardware.url = "github:nixos/nixos-hardware";
+    nixos-hardware.url = "github:nixos/nixos-hardware";
+  };
 
-      nixos-generators.url = "github:nix-community/nixos-generators";
+  outputs = {
-    };
+    self,
-
+    digga,
-  outputs =
+    nixos,
-    { self
+    home,
-    , digga
+    nixos-hardware,
-    , nixos
+    agenix,
-    , home
+    deploy,
-    , nixos-hardware
+    ...
-    , nur
+  } @ inputs:
-    , agenix
-    , nvfetcher
-    , deploy
-    , ...
-    } @ inputs:
     digga.lib.mkFlake
-      {
+    {
-        inherit self inputs;
+      inherit self inputs;
 
-        channelsConfig = {
+      channelsConfig = {
-          # allowUnfree = true;
+        # allowUnfree = true;
-        };
+      };
 
-        supportedSystems = [ "x86_64-linux" "aarch64-linux" ];
+      supportedSystems = ["x86_64-linux" "aarch64-linux" "aarch64-darwin"];
-
-        channels = {
-          nixos = {
-            imports = [ (digga.lib.importOverlays ./overlays) ];
-            overlays = [ ];
-          };
-          latest = { };
-        };
-
-        lib = import ./lib { lib = digga.lib // nixos.lib; };
-
-        sharedOverlays = [
-          (final: prev: {
-            __dontExport = true;
-            lib = prev.lib.extend (lfinal: lprev: {
-              our = self.lib;
-            });
-          })
-          nur.overlay
-          agenix.overlay
-
-          (import ./pkgs)
-        ];
 
+      channels = {
         nixos = {
-          hostDefaults = {
+          imports = [(digga.lib.importOverlays ./overlays)];
-            system = "x86_64-linux";
+          overlays = [
-            channelName = "nixos";
+            (self: super: {
-            imports = [ (digga.lib.importExportableModules ./modules) ];
+              deploy-rs = {
+                inherit (inputs.nixos.legacyPackages.x86_64-linux) deploy-rs;
+                lib = inputs.deploy.lib.x86_64-linux;
+              };
+            })
+          ];
+        };
+        latest = {};
+        fork = {};
+      };
+
+      lib = import ./lib {lib = digga.lib // nixos.lib;};
+
+      sharedOverlays = [
+        (final: prev: {
+          __dontExport = true;
+          lib = prev.lib.extend (lfinal: lprev: {
+            our = self.lib;
+          });
+        })
+        agenix.overlays.default
+
+        (import ./pkgs)
+      ];
+
+      nixos = {
+        hostDefaults = {
+          system = "x86_64-linux";
+          channelName = "nixos";
+          imports = [(digga.lib.importExportableModules ./modules)];
+          modules = [
+            {lib.our = self.lib;}
+            # FIXME: upstream module causes a huge number of unnecessary
+            # dependencies to be pulled in for all systems -- many of them are
+            # graphical. should only be imported as needed.
+            # digga.nixosModules.bootstrapIso
+            digga.nixosModules.nixConfig
+            home.nixosModules.home-manager
+            agenix.nixosModules.age
+          ];
+        };
+
+        imports = [(digga.lib.importHosts ./hosts)];
+        hosts = {
+          # Set host-specific properties here
+          bootstrap = {
             modules = [
-              { lib.our = self.lib; }
               digga.nixosModules.bootstrapIso
-              digga.nixosModules.nixConfig
-              home.nixosModules.home-manager
-              agenix.nixosModules.age
             ];
           };
-
+          PubSolarOS = {
-          imports = [ (digga.lib.importHosts ./hosts) ];
+            tests = [
-          hosts = {
+              #(import ./tests/first-test.nix {
-            /* set host specific properties here */
+              #  pkgs = nixos.legacyPackages.x86_64-linux;
-            PubSolarOS = { };
+              #  lib = nixos.lib;
+              #})
+            ];
           };
-          importables = rec {
+        };
-            profiles = digga.lib.rakeLeaves ./profiles // {
+        importables = rec {
+          profiles =
+            digga.lib.rakeLeaves ./profiles
+            // {
               users = digga.lib.rakeLeaves ./users;
             };
-            suites = with profiles; rec {
+          suites = with profiles; rec {
-              base = [ users.pub-solar users.root ];
+            base = [users.pub-solar users.root];
-              iso = base ++ [ base-user graphical pub-solar-iso ];
+            iso = base ++ [base-user graphical pub-solar-iso];
-              pubsolaros = [ full-install base-user users.root ];
+            pubsolaros = [full-install base-user users.root];
-              anonymous = [ pubsolaros users.pub-solar ];
+            anonymous = [pubsolaros users.pub-solar];
-            };
           };
         };
-
-        home = {
-          imports = [ (digga.lib.importExportableModules ./users/modules) ];
-          modules = [ ];
-          importables = rec {
-            profiles = digga.lib.rakeLeaves ./users/profiles;
-            suites = with profiles; rec {
-              base = [ direnv git ];
-            };
-          };
-          users = {
-            pub-solar = { suites, ... }: { imports = suites.base; };
-          }; # digga.lib.importers.rakeLeaves ./users/hm;
-        };
-
-        devshell = ./shell;
-
-        homeConfigurations = digga.lib.mkHomeConfigurations self.nixosConfigurations;
-
-        deploy.nodes = digga.lib.mkDeployNodes self.nixosConfigurations { };
       };
+
+      home = {
+        imports = [(digga.lib.importExportableModules ./users/modules)];
+        modules = [];
+        importables = rec {
+          profiles = digga.lib.rakeLeaves ./users/profiles;
+          suites = with profiles; rec {
+            base = [direnv git];
+          };
+        };
+        users = {
+          pub-solar = {suites, ...}: {
+            imports = suites.base;
+
+            home.stateVersion = "21.03";
+          };
+        }; # digga.lib.importers.rakeLeaves ./users/hm;
+      };
+
+      devshell = ./shell;
+
+      homeConfigurations = digga.lib.mkHomeConfigurations self.nixosConfigurations;
+
+      deploy.nodes = digga.lib.mkDeployNodes self.nixosConfigurations {
+        #example = {
+        #  hostname = "example.com:22";
+        #  sshUser = "bartender";
+        #  fastConnect = true;
+        #  profilesOrder = ["system" "direnv"];
+        #  profiles.direnv = {
+        #    user = "bartender";
+        #    path = self.pkgs.x86_64-linux.nixos.deploy-rs.lib.x86_64-linux.activate.home-manager self.homeConfigurationsPortable.x86_64-linux.bartender;
+        #  };
+        #};
+      };
+    };
 }

hosts/PubSolarOS.nix

@@ -1,17 +1,15 @@
-{ suites, ... }:
+{suites, ...}: {
-{
   ### root password is empty by default ###
   ### default password: pub-solar, optional: add your SSH keys
   imports =
-    suites.iso
+    suites.iso;
-  ;
 
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;
 
   networking.networkmanager.enable = true;
 
-  fileSystems."/" = { device = "/dev/disk/by-label/nixos"; };
+  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

hosts/bootstrap.nix

@@ -1,9 +1,23 @@
-{ profiles, ... }:
 {
-  # build with: `nix build '.#nixosConfigurations.bootstrap.config.system.build.bootstrapIso'`
+  config,
-  # reachable on the local link via ssh root@fe80::47%eno1
+  lib,
-  # where 'eno1' is replaced by your own machine's network
+  pkgs,
-  # interface that has the local link to the target machine
+  profiles,
+  ...
+}:
+with lib; let
+  # Gets hostname of host to be bundled inside iso
+  # Copied from https://github.com/divnix/digga/blob/30ffa0b02272dc56c94fd3c7d8a5a0f07ca197bf/modules/bootstrap-iso.nix#L3-L11
+  getFqdn = config: let
+    net = config.networking;
+    fqdn =
+      if (net ? domain) && (net.domain != null)
+      then "${net.hostName}.${net.domain}"
+      else net.hostName;
+  in
+    fqdn;
+in {
+  # build with: `nix build ".#nixosConfigurations.bootstrap.config.system.build.isoImage"`
   imports = [
     # profiles.networking
     profiles.users.root # make sure to configure ssh keys
@@ -13,16 +27,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
+    # will be overridden by the bootstrapIso instrumentation
-  fileSystems."/" = { device = "/dev/disk/by-label/nixos"; };
+    fileSystems."/" = {device = "/dev/disk/by-label/nixos";};
 
-  # This value determines the NixOS release from which the default
+    system.nixos.label = "PubSolarOS-" + config.system.nixos.version;
-  # settings for stateful data, like file locations and database versions
+
-  # on your system were taken. It‘s perfectly fine and recommended to leave
+    # mkForce because a similar transformation gets double applied otherwise
-  # this value at the release version of the first install of this system.
+    # https://github.com/divnix/digga/blob/30ffa0b02272dc56c94fd3c7d8a5a0f07ca197bf/modules/bootstrap-iso.nix#L17
-  # Before changing this value read the documentation for this option
+    # https://github.com/NixOS/nixpkgs/blob/aecd4d8349b94f9bd5718c74a5b789f233f67326/nixos/modules/installer/cd-dvd/installation-cd-base.nix#L21-L22
-  # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
+    isoImage = {
-  system.stateVersion = "21.05"; # Did you read the comment?
+      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,21 @@
 let
-  rev = "e7e5d481a0e15dcd459396e55327749989e04ce0";
+  lock = builtins.fromJSON (builtins.readFile builtins.path {
-  flake = (import
+    path = ../../flake.lock;
+    name = "lockPath";
+  });
+  flake =
+    import
     (
       fetchTarball {
-        url = "https://github.com/edolstra/flake-compat/archive/${rev}.tar.gz";
+        url = "https://github.com/edolstra/flake-compat/archive/${lock.nodes.flake-compat.locked.rev}.tar.gz";
-        sha256 = "0zd3x46fswh5n6faq4x2kkpy6p3c6j593xbdlbsl40ppkclwc80x";
+        sha256 = lock.nodes.flake-compat.locked.narHash;
       }
     )
     {
-      src = ../../.;
+      src = builtins.path {
-    });
+        path = ../../.;
+        name = "projectRoot";
+      };
+    };
 in
-flake
+  flake

lib/compat/nixos/default.nix

@@ -1,5 +1,4 @@
-{ ... }:
+{...}: let
-let
   inherit (default.inputs.nixos) lib;
 
   host = configs.${hostname} or configs.PubSolarOS;
@@ -7,4 +6,4 @@ let
   default = (import ../.).defaultNix;
   hostname = lib.fileContents /etc/hostname;
 in
-host
+  host

lib/default.nix

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

modules/arduino/default.nix

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

modules/audio/default.nix

@@ -1,11 +1,14 @@
-{ lib, config, pkgs, ... }:
+{
-with lib;
+  lib,
-let
+  config,
+  pkgs,
+  ...
+}:
+with lib; let
   psCfg = config.pub-solar;
   cfg = config.pub-solar.audio;
   xdg = config.home-manager.users."${psCfg.user.name}".xdg;
-in
+in {
-{
   options.pub-solar.audio = {
     enable = mkEnableOption "Life in highs and lows";
     mopidy.enable = mkEnableOption "Life with mopidy";
@@ -20,71 +23,95 @@ in
   };
 
   config = mkIf cfg.enable {
-    users.users = pkgs.lib.setAttrByPath [ psCfg.user.name ] {
+    users.users = pkgs.lib.setAttrByPath [psCfg.user.name] {
-      extraGroups = [ "audio" ];
+      extraGroups = ["audio"];
     };
 
-    home-manager = with pkgs; pkgs.lib.setAttrByPath [ "users" psCfg.user.name ] {
+    home-manager = with pkgs;
-      home.packages = [
+      pkgs.lib.setAttrByPath ["users" psCfg.user.name] {
-        # easyeffects, e.g. for microphone noise filtering
+        home.packages =
-        easyeffects
+          [
-        mu
+            # easyeffects, e.g. for microphone noise filtering
-        pavucontrol
+            easyeffects
-        pa_applet
+            mu
-        playerctl
+            pavucontrol
-        # Needed for pactl cmd, until pw-cli is more mature (vol up/down hotkeys?)
+            pa_applet
-        pulseaudio
+            playerctl
-        vimpc
+            # Needed for pactl cmd, until pw-cli is more mature (vol up/down hotkeys?)
-      ] ++ (if cfg.spotify.enable then [ pkgs.spotify-tui ] else [ ]);
+            pulseaudio
-      xdg.configFile."vimpc/vimpcrc".source = ./.config/vimpc/vimpcrc;
+            vimpc
-      systemd.user.services.easyeffects = import ./easyeffects.service.nix pkgs;
+          ]
+          ++ (
+            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 {
+        services.spotifyd = mkIf cfg.spotify.enable {
-        enable = true;
+          enable = true;
-        settings = {
+          settings = {
-          global = {
+            global = {
-            username = cfg.spotify.username;
+              username = cfg.spotify.username;
-            password_cmd = "DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/1001/bus ${pkgs.libsecret}/bin/secret-tool lookup spotify password";
+              password_cmd = "DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/1001/bus ${pkgs.libsecret}/bin/secret-tool lookup spotify password";
-            bitrate = 320;
+              bitrate = 320;
-            volume_normalisation = true;
+              volume_normalisation = true;
-            no_audio_cache = false;
+              no_audio_cache = false;
-            max_cache_size = 1000000000;
+              max_cache_size = 1000000000;
+            };
           };
         };
       };
-    };
 
-    # Enable sound using pipewire-pulse
+    # rtkit is optional but recommended
+    security.rtkit.enable = true;
+    # Enable sound using pipewire-pulse, default config:
+    # https://gitlab.freedesktop.org/pipewire/pipewire/-/blob/master/src/daemon/pipewire.conf.in
     services.pipewire = {
       enable = true;
       alsa.enable = true;
       alsa.support32Bit = true;
       pulse.enable = true;
-
-      config.pipewire = {
-        context.default.clock = {
-          allowed-rates = [ 44100 48000 88200 96000 ];
-          rate = 44100;
-        };
-      };
-      config.pipewire-pulse = builtins.fromJSON (builtins.readFile ./pipewire-pulse.conf.json);
     };
 
-    # Bluetooth configuration using wireplumber
+    # Make pulseaudio listen on port 4713 for mopidy, extending the default
-    # https://nixos.wiki/wiki/PipeWire#Bluetooth_Configuration
+    # config: https://gitlab.freedesktop.org/pipewire/pipewire/-/blob/master/src/daemon/pipewire-pulse.conf.in
-    environment.etc = mkIf cfg.bluetooth.enable {
+    environment.etc = mkIf cfg.mopidy.enable {
-      "wireplumber/bluetooth.lua.d/51-bluez-config.lua".text = ''
+      "pipewire/pipewire-pulse.conf.d/99-custom.conf".text = ''
-        bluez_monitor.properties = {
+        {
-          ["bluez5.enable-sbc-xq"] = true,
+          "context.modules": [
-          ["bluez5.enable-msbc"] = true,
+            {
-          ["bluez5.enable-hw-volume"] = true,
+              "name": "libpipewire-module-protocol-pulse",
-          ["bluez5.headset-roles"] = "[ hsp_hs hsp_ag hfp_hf hfp_ag ]"
+              "args": {
+                "server.address": ["unix:native", "tcp:4713"],
+                "vm.overrides": {
+                  "pulse.min.quantum": "1024/48000"
+                }
+              }
+            }
+          ]
         }
       '';
     };
 
     # Enable bluetooth
-    hardware.bluetooth.enable = mkIf cfg.bluetooth.enable true;
+    hardware.bluetooth = mkIf cfg.bluetooth.enable {
+      enable = true;
+      # Disable bluetooth on startup to save battery
+      powerOnBoot = false;
+      # Disable useless SIM Access Profile plugin
+      disabledPlugins = [
+        "sap"
+      ];
+      settings = {
+        General = {
+          # Enables experimental features and interfaces.
+          # Makes BlueZ Battery Provider available
+          Experimental = true;
+        };
+      };
+    };
     services.blueman.enable = mkIf cfg.bluetooth.enable true;
 
     # Enable audio server & client

modules/audio/easyeffects.service.nix

@@ -1,5 +1,4 @@
-pkgs:
+pkgs: {
-{
   Service = {
     Type = "dbus";
     BusName = "com.github.wwmm.easyeffects";

modules/audio/pipewire-pulse.conf.json

@@ -1,42 +0,0 @@
-{
-  "context.properties": {},
-  "context.spa-libs": {
-    "audio.convert.*": "audioconvert/libspa-audioconvert",
-    "support.*": "support/libspa-support"
-  },
-  "context.modules": [
-    {
-      "name": "libpipewire-module-rtkit",
-      "args": {},
-      "flags": [
-        "ifexists",
-        "nofail"
-      ]
-    },
-    {
-      "name": "libpipewire-module-protocol-native"
-    },
-    {
-      "name": "libpipewire-module-client-node"
-    },
-    {
-      "name": "libpipewire-module-adapter"
-    },
-    {
-      "name": "libpipewire-module-metadata"
-    },
-    {
-      "name": "libpipewire-module-protocol-pulse",
-      "args": {
-        "server.address": [
-          "unix:native",
-          "tcp:4713"
-        ],
-        "vm.overrides": {
-          "pulse.min.quantum": "1024/48000"
-        }
-      }
-    }
-  ],
-  "stream.properties": {}
-}

modules/ci-runner/default.nix

@@ -0,0 +1,45 @@
+{
+  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/compat/default.nix

@@ -1,6 +0,0 @@
-{ config, pkgs, lib, ... }: with lib; {
-  # Both things below are for
-  # https://github.com/NixOS/nixpkgs/issues/124215
-  documentation.info.enable = lib.mkForce false;
-  nix.sandboxPaths = [ "/bin/sh=${pkgs.bash}/bin/sh" ];
-}

modules/core/boot.nix

@@ -1,9 +1,12 @@
-{ config, pkgs, lib, ... }:
-with lib;
-let
-  cfg = config.pub-solar.core;
-in
 {
+  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;
@@ -19,7 +22,7 @@ in
   config = {
     boot = {
       # Enable plymouth for better experience of booting
-      plymouth.enable = true;
+      plymouth.enable = mkIf (!cfg.lite) (lib.mkDefault true);
 
       # Mount / luks device in initrd
       # Allow fstrim to work on it.
@@ -30,13 +33,13 @@ in
         };
       };
 
-      loader.systemd-boot.enable = true;
+      loader.systemd-boot.enable = lib.mkDefault true;
 
       # Use latest LTS linux kernel by default
-      kernelPackages = pkgs.linuxPackages_5_15;
+      kernelPackages = lib.mkDefault pkgs.linuxPackages_6_1;
 
       # Support ntfs drives
-      supportedFilesystems = [ "ntfs" ];
+      supportedFilesystems = ["ntfs"];
     };
   };
 }

modules/core/default.nix

@@ -1,11 +1,11 @@
-{ config, lib, ... }:
-
-with lib;
-let
-  psCfg = config.pub-solar;
-  cfg = config.pub-solar.core;
-in
 {
+  config,
+  lib,
+  ...
+}:
+with lib; let
+  cfg = config.pub-solar.core;
+in {
   imports = [
     ./boot.nix
     ./hibernation.nix
@@ -29,12 +29,12 @@ in
 
   config = {
     pub-solar = {
-      audio.enable = lib.mkIf (!cfg.lite) true;
+      audio.enable = mkIf (!cfg.lite) (mkDefault true);
-      crypto.enable = lib.mkIf (!cfg.lite) true;
+      crypto.enable = mkIf (!cfg.lite) (mkDefault true);
-      devops.enable = lib.mkIf (!cfg.lite) true;
+      devops.enable = mkIf (!cfg.lite) (mkDefault true);
 
       terminal-life = {
-        enable = true;
+        enable = mkDefault true;
         lite = cfg.lite;
       };
     };

modules/core/fonts.nix

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

modules/core/hibernation.nix

@@ -1,9 +1,12 @@
-{ config, pkgs, lib, ... }:
-with lib;
-let
-  cfg = config.pub-solar.core.hibernation;
-in
 {
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+with lib; let
+  cfg = config.pub-solar.core.hibernation;
+in {
   options.pub-solar.core.hibernation = {
     enable = mkOption {
       type = types.bool;
@@ -12,8 +15,8 @@ in
     };
 
     resumeDevice = mkOption {
-      type = types.str;
+      type = types.nullOr types.str;
-      default = "/swapfile";
+      default = null;
       description = "The location of the hibernation resume swap file.";
     };
 
@@ -26,13 +29,8 @@ in
 
   config = {
     boot = mkIf cfg.enable {
-      resumeDevice = cfg.resumeDevice;
+      resumeDevice = mkIf (cfg.resumeDevice != null) cfg.resumeDevice;
-      kernelParams = [
+      kernelParams = mkIf (cfg.resumeOffset != null) ["resume_offset=${builtins.toString cfg.resumeOffset}"];
-        "resume=${cfg.resumeDevice}"
-      ] ++ (
-        if (cfg.resumeOffset == null && cfg.enable) then builtins.abort "config.pub-solar.resumeOffset has to be set if config.pub-solar.enable is true."
-        else [ "resume_offset=${cfg.resumeOffset}" ]
-      );
     };
   };
 }

modules/core/i18n.nix

@@ -1,6 +1,10 @@
-{ config, pkgs, lib, ... }:
-with lib;
 {
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+with lib; {
   config = {
     # Set your time zone.
     time.timeZone = "Europe/Berlin";

modules/core/networking.nix

@@ -1,60 +1,85 @@
-{ config, pkgs, lib, ... }:
-
-with lib;
-
-let cfg = config.pub-solar.core;
-in
 {
+  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 = [ ];
+      default = [];
       description = "Binary caches to use.";
     };
     publicKeys = mkOption {
       type = types.listOf types.str;
-      default = [ ];
+      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 = {
+    # disable NetworkManager and systemd-networkd -wait-online by default
+    systemd.services.NetworkManager-wait-online.enable = lib.mkDefault false;
+    systemd.services.systemd-networkd-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.settings.substituters = cfg.binaryCaches;
-    nix.binaryCachePublicKeys = cfg.publicKeys;
+    nix.settings.trusted-public-keys = cfg.publicKeys;
 
     # These entries get added to /etc/hosts
     networking.hosts = {
-      "127.0.0.1" = [ "cups.local" "help.local" "caddy.local" ];
+      "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 = true;
+      enable = lib.mkDefault cfg.enableCaddy;
-      globalConfig = ''
+      globalConfig = lib.mkDefault ''
         default_bind 127.0.0.1
         auto_https off
       '';
-      extraConfig = ''
+      extraConfig = lib.mkDefault (concatStringsSep "\n" [
-        cups.local:80 {
+        (lib.optionalString
-          request_header Host localhost:631
+          config.pub-solar.printing.enable
-          reverse_proxy unix//run/cups/cups.sock
+          ''
-        }
+            cups.local:80 {
+              request_header Host localhost:631
+              reverse_proxy unix//run/cups/cups.sock
+            }
+          '')
 
-        help.local:80 {
+        (lib.optionalString
-          root * ${pkgs.psos-docs}/lib/html
+          cfg.enableHelp
-          file_server
+          ''
-        }
+            help.local:80 {
-      '';
+              root * ${pkgs.psos-docs}/lib/html
+              file_server
+            }
+          '')
+      ]);
     };
   };
 }

modules/core/nix.nix

@@ -1,19 +1,28 @@
-{ config, pkgs, lib, inputs, ... }:
-
 {
+  config,
+  pkgs,
+  lib,
+  inputs,
+  ...
+}: {
   nix = {
-    # Improve nix store disk usage
+    # Use default version alias for nix package
-    autoOptimiseStore = true;
+    package = pkgs.nix;
     gc.automatic = true;
     optimise.automatic = true;
-    # Prevents impurities in builds
+    settings = {
-    useSandbox = true;
+      # Improve nix store disk usage
-    # give root and @wheel special privileges with nix
+      auto-optimise-store = true;
-    trustedUsers = [ "root" "@wheel" ];
+      # Prevents impurities in builds
-    # This is just a representation of the nix default
+      sandbox = true;
-    systemFeatures = [ "nixos-test" "benchmark" "big-parallel" "kvm" ];
+      # Give root and @wheel special privileges with nix
+      trusted-users = ["root" "@wheel"];
+      # Allow only group wheel to connect to the nix daemon
+      allowed-users = ["@wheel"];
+    };
     # Generally useful nix option defaults
-    extraOptions = ''
+    extraOptions = lib.mkForce ''
+      experimental-features = flakes nix-command
       min-free = 536870912
       keep-outputs = true
       keep-derivations = true

modules/core/packages.nix

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

@@ -1,10 +1,16 @@
-{ config, pkgs, lib, ... }:
-
 {
+  config,
+  pkgs,
+  lib,
+  ...
+}: {
   # For rage encryption, all hosts need a ssh key pair
   services.openssh = {
     enable = true;
-    openFirewall = lib.mkDefault false;
+    # 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;
+    settings.PasswordAuthentication = lib.mkDefault false;
   };
 
   # Service that makes Out of Memory Killer more effective

modules/crypto/default.nix

@@ -1,41 +1,45 @@
-{ lib, config, pkgs, ... }:
+{
-with lib;
+  lib,
-let
+  config,
+  pkgs,
+  ...
+}:
+with lib; let
   psCfg = config.pub-solar;
   cfg = config.pub-solar.crypto;
-in
+in {
-{
   options.pub-solar.crypto = {
     enable = mkEnableOption "Life in private";
   };
 
   config = mkIf cfg.enable {
-    services.udev.packages = [ pkgs.yubikey-personalization ];
+    services.udev.packages = [pkgs.yubikey-personalization];
-    services.dbus.packages = [ pkgs.gcr ];
+    services.dbus.packages = [pkgs.gcr];
     services.pcscd.enable = true;
 
     services.gnome.gnome-keyring.enable = true;
 
-    home-manager = with pkgs; pkgs.lib.setAttrByPath [ "users" psCfg.user.name ] {
+    home-manager = with pkgs;
-      systemd.user.services.polkit-gnome-authentication-agent = import ./polkit-gnome-authentication-agent.service.nix pkgs;
+      pkgs.lib.setAttrByPath ["users" psCfg.user.name] {
+        systemd.user.services.polkit-gnome-authentication-agent = import ./polkit-gnome-authentication-agent.service.nix pkgs;
 
-      services.gpg-agent = {
+        services.gpg-agent = {
-        enable = true;
+          enable = true;
-        pinentryFlavor = "gnome3";
+          pinentryFlavor = "gnome3";
-        verbose = true;
+          verbose = true;
+        };
+
+        programs.gpg = {
+          enable = true;
+        };
+
+        home.packages = [
+          gnome.seahorse
+          keepassxc
+          libsecret
+          qMasterPassword
+          restic
+        ];
       };
-
-      programs.gpg = {
-        enable = true;
-      };
-
-      home.packages = [
-        gnome.seahorse
-        keepassxc
-        libsecret
-        qMasterPassword
-        restic
-      ];
-    };
   };
 }

modules/crypto/polkit-gnome-authentication-agent.service.nix

@@ -1,16 +1,15 @@
-pkgs:
+pkgs: {
-{
   Unit = {
     Description = "Legacy polkit authentication agent for GNOME";
-    Documentation = [ "https://gitlab.freedesktop.org/polkit/polkit/" ];
+    Documentation = ["https://gitlab.freedesktop.org/polkit/polkit/"];
-    BindsTo = [ "sway-session.target" ];
+    BindsTo = ["sway-session.target"];
-    After = [ "sway-session.target" ];
+    After = ["sway-session.target"];
   };
   Service = {
     Type = "simple";
     ExecStart = "${pkgs.polkit_gnome}/libexec/polkit-gnome-authentication-agent-1";
   };
   Install = {
-    WantedBy = [ "sway-session.target" ];
+    WantedBy = ["sway-session.target"];
   };
 }

modules/devops/default.nix

@@ -1,26 +1,30 @@
-{ lib, config, pkgs, ... }:
+{
-with lib;
+  lib,
-let
+  config,
+  pkgs,
+  ...
+}:
+with lib; let
   psCfg = config.pub-solar;
   cfg = config.pub-solar.devops;
-in
+in {
-{
   options.pub-solar.devops = {
     enable = mkEnableOption "Life automated";
   };
 
   config = mkIf cfg.enable {
-    home-manager = with pkgs; pkgs.lib.setAttrByPath [ "users" psCfg.user.name ] {
+    home-manager = with pkgs;
-      home.packages = [
+      pkgs.lib.setAttrByPath ["users" psCfg.user.name] {
-        drone-cli
+        home.packages = [
-        nmap
+          drone-cli
-        pgcli
+          nmap
-        ansible
+          pgcli
-        ansible-lint
+          ansible
-        restic
+          ansible-lint
-        shellcheck
+          restic
-        terraform_0_15
+          shellcheck
-      ];
+          terraform
-    };
+        ];
+      };
   };
 }

modules/docker-ci-runner/default.nix

@@ -0,0 +1,114 @@
+{
+  lib,
+  config,
+  pkgs,
+  self,
+  ...
+}:
+with lib; let
+  bootstrap = pkgs.writeScript "bootstrap.sh" ''
+    #!/usr/bin/env bash
+
+    set -e
+
+    apt update
+    apt install --yes curl git sudo xz-utils
+
+    adduser --system --uid 999 build
+    chown build /nix
+
+    sudo -u build curl -L https://nixos.org/nix/install > install
+    sudo -u build sh install
+
+    echo "export PATH=/nix/var/nix/profiles/per-user/build/profile/bin:''$PATH" >> /etc/profile
+
+    mkdir /etc/nix
+    echo 'experimental-features = nix-command flakes' >> /etc/nix/nix.conf
+
+    export nix_user_config_file="/home/build/.local/share/nix/trusted-settings.json"
+    mkdir -p $(dirname \\$nix_user_config_file)
+    echo '{"extra-experimental-features":{"nix-command flakes":true}}' > \\$nix_user_config_file
+    chown -R build /home/build/
+
+    curl -L https://github.com/drone-runners/drone-runner-exec/releases/latest/download/drone_runner_exec_linux_amd64.tar.gz | tar xz
+    sudo install -t /usr/local/bin drone-runner-exec
+
+    if [ ! -f /run/vars ]; then
+      exit 1
+    fi
+
+    cp -a /run/vars /run/runtime-vars
+    env | grep "DRONE" >> /run/runtime-vars
+
+    su - -s /bin/bash build sh -c "/usr/local/bin/drone-runner-exec daemon /run/runtime-vars"
+  '';
+  psCfg = config.pub-solar;
+  cfg = config.pub-solar.docker-ci-runner;
+in {
+  options.pub-solar.docker-ci-runner = {
+    enable = lib.mkEnableOption "Enables a docker container running a drone exec runner as unprivileged user.";
+
+    enableKvm = lib.mkOption {
+      description = ''
+        Enable kvm support.
+      '';
+      default = true;
+      type = types.bool;
+    };
+
+    nixCacheLocation = lib.mkOption {
+      description = ''
+        Location of nix cache that is shared between builds
+      '';
+      default = "/var/lib/docker-ci-runner";
+      type = types.path;
+    };
+
+    runnerEnvironment = lib.mkOption {
+      description = ''
+        Additional environment vars added to the vars file on container runtime
+      '';
+      default = {};
+    };
+
+    runnerVarsFile = lib.mkOption {
+      description = ''
+        Location of vars file passed to drone runner
+      '';
+      type = types.path;
+    };
+  };
+
+  config = lib.mkIf cfg.enable {
+    virtualisation = {
+      docker = {
+        enable = true; # sadly podman is not supported rightnow
+      };
+
+      oci-containers = {
+        backend = "docker";
+        containers."drone-exec-runner" = {
+          image = "debian";
+          autoStart = true;
+          entrypoint = "bash";
+          cmd = ["/bootstrap.sh"];
+
+          volumes = [
+            "${cfg.runnerVarsFile}:/run/vars"
+            "${cfg.nixCacheLocation}:/nix"
+            "${bootstrap}:/bootstrap.sh"
+          ];
+
+          environment = cfg.runnerEnvironment;
+
+          extraOptions = lib.mkIf cfg.enableKvm ["--device=/dev/kvm"];
+        };
+      };
+    };
+    # Fix container not stopping correctly and holding the system 120s upon
+    # shutdown / reboot
+    systemd.services.docker-drone-exec-runner.preStop = ''
+      docker stop drone-exec-runner
+    '';
+  };
+}

modules/docker/default.nix

@@ -1,19 +1,24 @@
-{ lib, config, pkgs, ... }:
+{
-with lib;
+  lib,
-let
+  config,
+  pkgs,
+  ...
+}:
+with lib; let
   psCfg = config.pub-solar;
   cfg = config.pub-solar.docker;
-in
+in {
-{
   options.pub-solar.docker = {
     enable = mkEnableOption "Life in metal boxes";
   };
 
   config = mkIf cfg.enable {
     virtualisation.docker.enable = true;
-    users.users = with pkgs; pkgs.lib.setAttrByPath [ psCfg.user.name ] {
+    virtualisation.docker.package = pkgs.docker_24;
-      extraGroups = [ "docker" ];
+    users.users = with pkgs;
-    };
+      pkgs.lib.setAttrByPath [psCfg.user.name] {
+        extraGroups = ["docker"];
+      };
 
     environment.systemPackages = with pkgs; [
       docker-compose

modules/email/default.nix

@@ -1,29 +1,33 @@
-{ lib, config, pkgs, ... }:
+{
-with lib;
+  lib,
-let
+  config,
+  pkgs,
+  ...
+}:
+with lib; let
   psCfg = config.pub-solar;
   cfg = config.pub-solar.email;
-in
+in {
-{
   options.pub-solar.email = {
     enable = mkEnableOption "Life in headers";
   };
 
   config = mkIf cfg.enable {
-    home-manager = with pkgs; pkgs.lib.setAttrByPath [ "users" psCfg.user.name ] {
+    home-manager = with pkgs;
-      home.packages = [
+      pkgs.lib.setAttrByPath ["users" psCfg.user.name] {
-        w3m
+        home.packages = [
-        urlscan
+          w3m
-        neomutt
+          urlscan
-        offlineimap
+          neomutt
-        msmtp
+          offlineimap
-        mailto-mutt
+          msmtp
-      ];
+          mailto-mutt
+        ];
 
-      programs.offlineimap = {
+        programs.offlineimap = {
-        enable = true;
+          enable = true;
-        pythonFile = builtins.readFile ./offlineimap.py;
+          pythonFile = builtins.readFile ./offlineimap.py;
+        };
       };
-    };
   };
 }

modules/email/offlineimap.nix

@@ -1 +0,0 @@
-

modules/gaming/default.nix

@@ -1,10 +1,13 @@
-{ lib, config, pkgs, ... }:
+{
-with lib;
+  lib,
-let
+  config,
+  pkgs,
+  ...
+}:
+with lib; let
   psCfg = config.pub-solar;
   cfg = config.pub-solar.gaming;
-in
+in {
-{
   options.pub-solar.gaming = {
     enable = mkEnableOption "Life in shooters";
   };
@@ -12,16 +15,17 @@ in
   config = mkIf cfg.enable {
     programs.steam.enable = true;
     nixpkgs.config.packageOverrides = pkgs: {
-      steam = pkgs.steam.override { };
+      steam = pkgs.steam.override {};
     };
 
-    home-manager = with pkgs; pkgs.lib.setAttrByPath [ "users" psCfg.user.name ] {
+    home-manager = with pkgs;
-      home.packages = [
+      pkgs.lib.setAttrByPath ["users" psCfg.user.name] {
-        playonlinux
+        home.packages = [
-        godot
+          playonlinux
-        obs-studio
+          godot
-        obs-studio-plugins.wlrobs
+          obs-studio
-      ];
+          obs-studio-plugins.wlrobs
-    };
+        ];
+      };
   };
 }

modules/gaming/steam.nix

@@ -1 +0,0 @@
-

modules/graphical/alacritty.nix

@@ -66,29 +66,97 @@
       x = 0;
       y = 0;
     };
-
-    use_thin_strokes = true;
   };
 
   key_bindings = [
-    { key = "V"; mods = "Control|Alt"; action = "Paste"; }
+    {
-    { key = "C"; mods = "Control|Alt"; action = "Copy"; }
+      key = "V";
-    { key = "Paste"; action = "Paste"; }
+      mods = "Control|Alt";
-    { key = "Copy"; action = "Copy"; }
+      action = "Paste";
-    { key = "Q"; mods = "Command"; action = "Quit"; }
+    }
-    { key = "W"; mods = "Command"; action = "Quit"; }
+    {
-    { key = "Insert"; mods = "Shift"; action = "PasteSelection"; }
+      key = "C";
-    { key = "Key0"; mods = "Control"; action = "ResetFontSize"; }
+      mods = "Control|Alt";
-    { key = "Equals"; mods = "Control"; action = "IncreaseFontSize"; }
+      action = "Copy";
-    { key = "PageUp"; mods = "Shift"; action = "ScrollPageUp"; }
+    }
-    { key = "PageDown"; mods = "Shift"; action = "ScrollPageDown"; }
+    {
-    { key = "Minus"; mods = "Control"; action = "DecreaseFontSize"; }
+      key = "Paste";
-    { key = "H"; mode = "Vi|~Search"; action = "ScrollToBottom"; }
+      action = "Paste";
-    { key = "H"; mode = "Vi|~Search"; action = "ToggleViMode"; }
+    }
-    { key = "I"; mode = "Vi|~Search"; action = "Up"; }
+    {
-    { key = "K"; mode = "Vi|~Search"; action = "Down"; }
+      key = "Copy";
-    { key = "J"; mode = "Vi|~Search"; action = "Left"; }
+      action = "Copy";
-    { key = "L"; mode = "Vi|~Search"; action = "Right"; }
+    }
+    {
+      key = "Q";
+      mods = "Command";
+      action = "Quit";
+    }
+    {
+      key = "W";
+      mods = "Command";
+      action = "Quit";
+    }
+    {
+      key = "Insert";
+      mods = "Shift";
+      action = "PasteSelection";
+    }
+    {
+      key = "Key0";
+      mods = "Control";
+      action = "ResetFontSize";
+    }
+    {
+      key = "Equals";
+      mods = "Control";
+      action = "IncreaseFontSize";
+    }
+    {
+      key = "PageUp";
+      mods = "Shift";
+      action = "ScrollPageUp";
+    }
+    {
+      key = "PageDown";
+      mods = "Shift";
+      action = "ScrollPageDown";
+    }
+    {
+      key = "Minus";
+      mods = "Control";
+      action = "DecreaseFontSize";
+    }
+    {
+      key = "H";
+      mode = "Vi|~Search";
+      action = "ScrollToBottom";
+    }
+    {
+      key = "H";
+      mode = "Vi|~Search";
+      action = "ToggleViMode";
+    }
+    {
+      key = "I";
+      mode = "Vi|~Search";
+      action = "Up";
+    }
+    {
+      key = "K";
+      mode = "Vi|~Search";
+      action = "Down";
+    }
+    {
+      key = "J";
+      mode = "Vi|~Search";
+      action = "Left";
+    }
+    {
+      key = "L";
+      mode = "Vi|~Search";
+      action = "Right";
+    }
   ];
 
   # Base16 Burn 256 - alacritty color config
@@ -100,10 +168,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";
+      text = "CellBackground";
-      cursor = "0xe3e1e4";
+      cursor = "CellForeground";
     };
 
     # Colors used for the search bar and match highlighting.
@@ -115,14 +188,25 @@
         background = "0x1a181a";
       };
       focused_match = {
-        foreground = "0xe5c463";
+        foreground = "CellBackground";
-        background = "0xe3e1e4";
+        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";
@@ -148,12 +232,30 @@
     };
 
     indexed_colors = [
-      { index = 16; color = "0xdf5923"; }
+      {
-      { index = 17; color = "0xd70000"; }
+        index = 16;
-      { index = 18; color = "0x2d2a2e"; }
+        color = "0xdf5923";
-      { index = 19; color = "0x303030"; }
+      }
-      { index = 20; color = "0xd3d1d4"; }
+      {
-      { index = 21; color = "0x303030"; }
+        index = 17;
+        color = "0xd70000";
+      }
+      {
+        index = 18;
+        color = "0x2d2a2e";
+      }
+      {
+        index = 19;
+        color = "0x303030";
+      }
+      {
+        index = 20;
+        color = "0xd3d1d4";
+      }
+      {
+        index = 21;
+        color = "0x303030";
+      }
     ];
   };
 }

modules/graphical/default.nix

@@ -1,31 +1,34 @@
-{ lib, config, pkgs, ... }:
+{
-with lib;
+  lib,
-let
+  config,
+  pkgs,
+  ...
+}:
+with lib; let
   psCfg = config.pub-solar;
   cfg = config.pub-solar.graphical;
-  yamlFormat = pkgs.formats.yaml { };
+  yamlFormat = pkgs.formats.yaml {};
-  recursiveMerge = attrList:
+  recursiveMerge = attrList: let
-    let
+    f = attrPath:
-      f = attrPath:
+      zipAttrsWith (
-        zipAttrsWith (n: values:
+        n: values:
-          if tail 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
+          then f (attrPath ++ [n]) values
           else last values
-        );
+      );
-    in
+  in
-    f [ ] attrList;
+    f [] attrList;
-in
+in {
-{
   options.pub-solar.graphical = {
     enable = mkEnableOption "Life in color";
     alacritty = {
       settings = mkOption {
         type = yamlFormat.type;
-        default = { };
+        default = {};
       };
     };
     autologin.enable = mkOption {
@@ -61,9 +64,9 @@ in
       };
     };
 
-    services.getty.autologinUser = mkIf cfg.autologin.enable "${psCfg.user.name}";
+    services.getty.autologinUser = mkIf cfg.autologin.enable (mkForce "${psCfg.user.name}");
 
-    qt5 = {
+    qt = {
       enable = true;
       platformTheme = "gtk2";
       style = "gtk2";
@@ -71,7 +74,7 @@ in
 
     # Required for running Gnome apps outside the Gnome DE, see https://nixos.wiki/wiki/GNOME#Running_GNOME_programs_outside_of_GNOME
     programs.dconf.enable = true;
-    services.udev.packages = with pkgs; [ gnome3.gnome-settings-daemon ];
+    services.udev.packages = with pkgs; [gnome3.gnome-settings-daemon];
     # Enable Sushi, a quick previewer for nautilus
     services.gnome.sushi.enable = true;
     # Enable GVfs, a userspace virtual filesystem
@@ -92,65 +95,65 @@ in
       source-sans-pro
     ];
 
-    home-manager = with pkgs; setAttrByPath [ "users" psCfg.user.name ] {
+    home-manager = with pkgs;
-      home.packages = [
+      setAttrByPath ["users" psCfg.user.name] {
-        alacritty
+        home.packages = [
-        foot
+          alacritty
-        chromium
+          foot
-        firefox-wayland
+          ungoogled-chromium
+          firefox-wayland
 
-        flameshot
+          flameshot
-        libnotify
+          libnotify
-        gnome.adwaita-icon-theme
+          gnome.adwaita-icon-theme
-        gnome.eog
+          gnome.eog
-        gnome.nautilus
+          gnome.nautilus
-        gnome.yelp
+          gnome.yelp
-        hicolor-icon-theme
+          hicolor-icon-theme
 
-        wine
+          wine
 
-        toggle-kbd-layout
+          toggle-kbd-layout
 
-        wcwd
+          wcwd
 
-        vlc
+          vlc
 
-        gimp
+          gimp
-      ];
+        ];
 
-      xdg.configFile."alacritty/alacritty.yml" = {
+        xdg.configFile."alacritty/alacritty.yml" = {
-        source = yamlFormat.generate "alacritty.yml" (recursiveMerge [ (import ./alacritty.nix) cfg.alacritty.settings ]);
+          source = yamlFormat.generate "alacritty.yml" (recursiveMerge [(import ./alacritty.nix) cfg.alacritty.settings]);
+        };
+
+        gtk = {
+          enable = true;
+          font.name = "Lato";
+          iconTheme = {
+            package = pkgs.papirus-icon-theme;
+            name = "Papirus-Adapta-Nokto-Maia";
+          };
+          theme = {
+            package = pkgs.matcha-gtk-theme;
+            name = "Matcha-dark-aliz";
+          };
+
+          gtk3.extraConfig = {
+            gtk-xft-antialias = "1";
+            gtk-xft-hinting = "1";
+            gtk-xft-hintstyle = "hintfull";
+            gtk-xft-rgba = "rgb";
+            gtk-application-prefer-dark-theme = "true";
+          };
+        };
+
+        # Fix KeepassXC rendering issue
+        # https://github.com/void-linux/void-packages/issues/23517
+        systemd.user.sessionVariables.QT_AUTO_SCREEN_SCALE_FACTOR = "0";
+
+        xresources.extraConfig = builtins.readFile ./.Xdefaults;
+
+        systemd.user.services.network-manager-applet = import ./network-manager-applet.service.nix pkgs;
       };
-
-      gtk = {
-        enable = true;
-        font.name = "Lato";
-        iconTheme = {
-          package = pkgs.papirus-icon-theme;
-          name = "Papirus-Adapta-Nokto-Maia";
-        };
-        theme = {
-          package = pkgs.matcha-gtk-theme;
-          name = "Matcha-dark-aliz";
-        };
-
-        gtk3.extraConfig = {
-          gtk-xft-antialias = "1";
-          gtk-xft-hinting = "1";
-          gtk-xft-hintstyle = "hintfull";
-          gtk-xft-rgba = "rgb";
-          gtk-application-prefer-dark-theme = "true";
-        };
-
-      };
-
-      # Fix KeepassXC rendering issue
-      # https://github.com/void-linux/void-packages/issues/23517
-      systemd.user.sessionVariables.QT_AUTO_SCREEN_SCALE_FACTOR = "0";
-
-      xresources.extraConfig = builtins.readFile ./.Xdefaults;
-
-      systemd.user.services.network-manager-applet = import ./network-manager-applet.service.nix pkgs;
-    };
   };
 }

modules/graphical/network-manager-applet.service.nix

@@ -1,16 +1,15 @@
-pkgs:
+pkgs: {
-{
   Unit = {
-    Description = "Lightweight Wayland notification daemon";
+    Description = "Network Manager applet";
-    BindsTo = [ "sway-session.target" ];
+    BindsTo = ["sway-session.target"];
-    After = [ "sway-session.target" ];
+    After = ["sway-session.target"];
     # ConditionEnvironment requires systemd v247 to work correctly
-    ConditionEnvironment = [ "WAYLAND_DISPLAY" ];
+    ConditionEnvironment = ["WAYLAND_DISPLAY"];
   };
   Service = {
     ExecStart = "${pkgs.networkmanagerapplet}/bin/nm-applet --sm-disable --indicator";
   };
   Install = {
-    WantedBy = [ "sway-session.target" ];
+    WantedBy = ["sway-session.target"];
   };
 }

modules/hm-system-defaults.nix

@@ -1,4 +1,4 @@
-{ config, ... }: {
+{config, ...}: {
   home-manager.sharedModules = [
     {
       home.sessionVariables = {

modules/nextcloud/default.nix

@@ -1,17 +1,21 @@
-{ lib, config, pkgs, ... }:
+{
-with lib;
+  lib,
-let
+  config,
+  pkgs,
+  ...
+}:
+with lib; let
   psCfg = config.pub-solar;
   cfg = config.pub-solar.nextcloud;
-in
+in {
-{
   options.pub-solar.nextcloud = {
     enable = mkEnableOption "Life in sync";
   };
 
   config = mkIf cfg.enable {
-    home-manager = with pkgs; pkgs.lib.setAttrByPath [ "users" psCfg.user.name ] {
+    home-manager = with pkgs;
-      systemd.user.services.nextcloud-client = import ./nextcloud.service.nix pkgs;
+      pkgs.lib.setAttrByPath ["users" psCfg.user.name] {
-    };
+        systemd.user.services.nextcloud-client = import ./nextcloud.service.nix pkgs;
+      };
   };
 }

modules/nextcloud/nextcloud.service.nix

@@ -1,12 +1,11 @@
-pkgs:
+pkgs: {
-{
   Unit = {
     Description = "Nextcloud Client";
-    BindsTo = [ "sway-session.target" ];
+    BindsTo = ["sway-session.target"];
-    Wants = [ "graphical-session-pre.target" ];
+    Wants = ["graphical-session-pre.target"];
-    After = [ "graphical-session-pre.target" ];
+    After = ["graphical-session-pre.target"];
     # ConditionEnvironment requires systemd v247 to work correctly
-    ConditionEnvironment = [ "WAYLAND_DISPLAY" ];
+    ConditionEnvironment = ["WAYLAND_DISPLAY"];
   };
   Service = {
     Type = "simple";
@@ -16,6 +15,6 @@ pkgs:
     Restart = "on-failure";
   };
   Install = {
-    WantedBy = [ "sway-session.target" ];
+    WantedBy = ["sway-session.target"];
   };
 }

modules/nix-path.nix

@@ -1,4 +1,8 @@
-{ channel, inputs, ... }: {
+{
+  channel,
+  inputs,
+  ...
+}: {
   nix.nixPath = [
     "nixpkgs=${channel.input}"
     "nixos-config=${../lib/compat/nixos}"

modules/office/default.nix

@@ -1,10 +1,13 @@
-{ lib, config, pkgs, ... }:
+{
-with lib;
+  lib,
-let
+  config,
+  pkgs,
+  ...
+}:
+with lib; let
   psCfg = config.pub-solar;
   cfg = config.pub-solar.office;
-in
+in {
-{
   options.pub-solar.office = {
     enable = mkEnableOption "Install office programs, also enables printing server";
   };
@@ -14,15 +17,16 @@ in
 
     # Gnome PDF viewer
     programs.evince.enable = true;
-    home-manager = with pkgs; pkgs.lib.setAttrByPath [ "users" psCfg.user.name ] {
+    home-manager = with pkgs;
-      home.packages = [
+      pkgs.lib.setAttrByPath ["users" psCfg.user.name] {
-        libreoffice-fresh
+        home.packages = [
-        gnome.simple-scan
+          libreoffice-fresh
-        # Tools like pdfunite
+          gnome.simple-scan
-        poppler_utils
+          # Tools like pdfunite
-        # tool for annotating PDFs
+          poppler_utils
-        xournalpp
+          # tool for annotating PDFs
-      ];
+          xournalpp
-    };
+        ];
+      };
   };
 }

modules/paranoia/default.nix

@@ -1,11 +1,12 @@
-{ config, lib, ... }:
+{
-
+  config,
-with lib;
+  lib,
-let
+  ...
+}:
+with lib; let
   psCfg = config.pub-solar;
   cfg = config.pub-solar.paranoia;
-in
+in {
-{
   options.pub-solar.paranoia = {
     enable = mkOption {
       description = ''
@@ -20,5 +21,33 @@ in
 
   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

@@ -1,10 +1,13 @@
-{ lib, config, pkgs, ... }:
+{
-with lib;
+  lib,
-let
+  config,
+  pkgs,
+  ...
+}:
+with lib; let
   psCfg = config.pub-solar;
   cfg = config.pub-solar.printing;
-in
+in {
-{
   options.pub-solar.printing = {
     enable = mkEnableOption "CUPSSSss";
   };
@@ -16,8 +19,8 @@ in
     services.avahi.publish.userServices = true;
     services.printing.enable = true;
     services.printing.browsing = true;
-    services.printing.listenAddresses = [ "localhost:631" ];
+    services.printing.listenAddresses = ["localhost:631"];
-    services.printing.allowFrom = [ "all" ];
+    services.printing.allowFrom = ["all"];
     services.printing.defaultShared = false;
     services.printing.drivers = [
       pkgs.gutenprint

modules/social/default.nix

@@ -1,22 +1,26 @@
-{ lib, config, pkgs, ... }:
+{
-with lib;
+  lib,
-let
+  config,
+  pkgs,
+  ...
+}:
+with lib; let
   psCfg = config.pub-solar;
   cfg = config.pub-solar.social;
-in
+in {
-{
   options.pub-solar.social = {
     enable = mkEnableOption "Life with others";
   };
 
   config = mkIf cfg.enable {
-    home-manager = with pkgs; pkgs.lib.setAttrByPath [ "users" psCfg.user.name ] {
+    home-manager = with pkgs;
-      home.packages = [
+      pkgs.lib.setAttrByPath ["users" psCfg.user.name] {
-        signal-desktop
+        home.packages = [
-        tdesktop
+          signal-desktop
-        element-desktop
+          tdesktop
-        irssi
+          element-desktop
-      ];
+          irssi
-    };
+        ];
+      };
   };
 }

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

@@ -18,9 +18,6 @@ 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 --use-tray-icon
 

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

@@ -1,16 +1,45 @@
-{ psCfg, ... }: ''
+{
+  pkgs,
+  psCfg,
+  ...
+}:
+''
   # Set shut down, restart and locking features
-  set $mode_system (e)xit, (h)ibernate, (r)eboot, (Shift+s)hutdown
+''
++ (
+  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.core.hibernation.enable
-+ (if !psCfg.paranoia.enable then ''
+  then ''
-  bindsym l exec swaylock-bg, mode "default"
+    bindsym h exec systemctl hibernate, mode "default"
-  bindsym s exec systemctl suspend, mode "default"
+  ''
-'' else "") + ''
+  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"
 

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

@@ -1,5 +1,8 @@
-{ config, pkgs, ... }:
+{
-''
+  config,
+  pkgs,
+  ...
+}: ''
   # Default config for sway
   #
   # Copy this to ~/.config/sway/config and edit it to your liking.

modules/sway/default.nix

@@ -1,9 +1,12 @@
-{ lib, config, pkgs, ... }:
-with lib;
-let
-  psCfg = config.pub-solar;
-in
 {
+  lib,
+  config,
+  pkgs,
+  ...
+}:
+with lib; let
+  psCfg = config.pub-solar;
+in {
   options.pub-solar.sway = {
     enable = mkEnableOption "Life in boxes";
 
@@ -22,14 +25,14 @@ in
 
   config = mkIf psCfg.sway.enable (mkMerge [
     (mkIf (psCfg.sway.v4l2loopback.enable) {
-      boot.extraModulePackages = with config.boot.kernelPackages; [ v4l2loopback ];
+      boot.extraModulePackages = with config.boot.kernelPackages; [v4l2loopback];
-      boot.kernelModules = [ "v4l2loopback" ];
+      boot.kernelModules = ["v4l2loopback"];
       boot.extraModprobeConfig = ''
         options v4l2loopback exclusive_caps=1 devices=3
       '';
     })
 
-    ({
+    {
       environment.systemPackages = with pkgs; [
         linuxPackages.v4l2loopback
       ];
@@ -48,60 +51,60 @@ in
             };
           };
         };
-        extraPortals = with pkgs; [ xdg-desktop-portal-gtk ];
+        extraPortals = with pkgs; [xdg-desktop-portal-gtk];
-        gtkUsePortal = true;
       };
 
       services.pipewire.enable = true;
 
-      home-manager = with pkgs; pkgs.lib.setAttrByPath [ "users" psCfg.user.name ] {
+      home-manager = with pkgs;
-        home.packages = with pkgs; [
+        pkgs.lib.setAttrByPath ["users" psCfg.user.name] {
-          sway
+          home.packages = with pkgs; [
-          grim
+            sway
-          kanshi
+            grim
-          mako
+            kanshi
-          slurp
+            mako
-          swayidle
+            slurp
-          swaylock
+            swayidle
-          swaybg
+            swaylock
-          xwayland
+            swaybg
+            xwayland
 
-          libappindicator-gtk3
+            libappindicator-gtk3
 
-          wl-clipboard
+            wl-clipboard
-          wf-recorder
+            wf-recorder
-          brightnessctl
+            brightnessctl
-          gammastep
+            gammastep
-          geoclue2
+            geoclue2
-          xsettingsd
+            xsettingsd
-          ydotool
+            ydotool
 
-          sway-launcher
+            sway-launcher
-          record-screen
+            record-screen
-          import-gtk-settings
+            import-gtk-settings
-          s
+            s
-          wcwd
+            wcwd
-        ];
+          ];
 
-        programs.waybar.enable = true;
+          programs.waybar.enable = true;
-        #programs.waybar.systemd.enable = true;
+          #programs.waybar.systemd.enable = true;
 
-        systemd.user.services.mako = import ./mako.service.nix { inherit pkgs psCfg; };
+          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.sway = import ./sway.service.nix {inherit pkgs psCfg;};
-        systemd.user.services.swayidle = import ./swayidle.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.xsettingsd = import ./xsettingsd.service.nix {inherit pkgs psCfg;};
-        systemd.user.services.waybar = import ./waybar.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; };
+          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".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/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/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/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/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 psCfg; };
+          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/applications.conf".source = ./config/config.d/applications.conf;
-        xdg.configFile."sway/config.d/systemd.conf".source = ./config/config.d/systemd.conf;
+          xdg.configFile."sway/config.d/systemd.conf".source = ./config/config.d/systemd.conf;
-      };
+        };
-    })
+    }
   ]);
 }

modules/sway/gammastep.service.nix

@@ -1,18 +1,17 @@
-{ pkgs, ... }:
+{pkgs, ...}: {
-{
   Unit = {
     Description = "set color temperature of display according to time of day";
-    Documentation = [ "man:gammastep(1)" ];
+    Documentation = ["man:gammastep(1)"];
-    BindsTo = [ "sway-session.target" ];
+    BindsTo = ["sway-session.target"];
-    After = [ "sway-session.target" ];
+    After = ["sway-session.target"];
     # ConditionEnvironment requires systemd v247 to work correctly
-    ConditionEnvironment = [ "WAYLAND_DISPLAY" ];
+    ConditionEnvironment = ["WAYLAND_DISPLAY"];
   };
   Service = {
     Type = "simple";
     ExecStart = "${pkgs.gammastep}/bin/gammastep -l geoclue2 -m wayland -v";
   };
   Install = {
-    WantedBy = [ "sway-session.target" ];
+    WantedBy = ["sway-session.target"];
   };
 }

modules/sway/libinput-gestures.service.nix

@@ -1,10 +1,9 @@
-{ pkgs, ... }:
+{pkgs, ...}: {
-{
   Unit = {
     Description = "Actions gestures on your touchpad using libinput";
-    Documentation = [ "https://github.com/bulletmark/libinput-gestures" ];
+    Documentation = ["https://github.com/bulletmark/libinput-gestures"];
-    BindsTo = [ "sway-session.target" ];
+    BindsTo = ["sway-session.target"];
-    After = [ "sway-session.target" ];
+    After = ["sway-session.target"];
   };
   Service = {
     Type = "simple";
@@ -14,6 +13,6 @@
     TimeoutStopSec = "10";
   };
   Install = {
-    WantedBy = [ "sway-session.target" ];
+    WantedBy = ["sway-session.target"];
   };
 }

modules/sway/mako.service.nix

@@ -1,12 +1,10 @@
-{ pkgs, ... }:
+{pkgs, ...}: {
-{
   Unit = {
     Description = "Lightweight Wayland notification daemon";
-    Documentation = [ "man:mako(1)" ];
+    Documentation = ["man:mako(1)"];
-    BindsTo = [ "sway-session.target" ];
+    BindsTo = ["sway-session.target"];
-    After = [ "sway-session.target" ];
+    After = ["sway-session.target"];
-    # ConditionEnvironment requires systemd v247 to work correctly
+    ConditionEnvironment = ["WAYLAND_DISPLAY"];
-    ConditionEnvironment = [ "WAYLAND_DISPLAY" ];
   };
   Service = {
     Type = "dbus";
@@ -15,6 +13,6 @@
     ExecReload = "${pkgs.mako}/bin/makoctl reload";
   };
   Install = {
-    WantedBy = [ "sway-session.target" ];
+    WantedBy = ["sway-session.target"];
   };
 }

modules/sway/sway-session.target.nix

@@ -1,10 +1,9 @@
-{ pkgs, ... }:
+{pkgs, ...}: {
-{
   Unit = {
     Description = "sway compositor session";
-    Documentation = [ "man:systemd.special(7)" ];
+    Documentation = ["man:systemd.special(7)"];
-    BindsTo = [ "graphical-session.target" ];
+    BindsTo = ["graphical-session.target"];
-    Wants = [ "graphical-session-pre.target" ];
+    Wants = ["graphical-session-pre.target"];
-    After = [ "graphical-session-pre.target" ];
+    After = ["graphical-session-pre.target"];
   };
 }

modules/sway/sway.service.nix

@@ -1,18 +1,17 @@
-{ pkgs, ... }:
+{pkgs, ...}: {
-{
   Unit = {
     Description = "sway - SirCmpwn's Wayland window manager";
-    Documentation = [ "man:sway(5)" ];
+    Documentation = ["man:sway(5)"];
-    BindsTo = [ "graphical-session.target" ];
+    BindsTo = ["graphical-session.target"];
-    Wants = [ "graphical-session-pre.target" ];
+    Wants = ["graphical-session-pre.target"];
-    After = [ "graphical-session-pre.target" ];
+    After = ["graphical-session-pre.target"];
   };
   Service = {
     Type = "simple";
+    ExecStartPre = "${pkgs.systemd}/bin/systemctl --user unset-environment WAYLAND_DISPLAY DISPLAY";
     ExecStart = "${pkgs.sway}/bin/sway";
     Restart = "on-failure";
     RestartSec = "1";
     TimeoutStopSec = "10";
-    ExecStopPost = "${pkgs.systemd}/bin/systemctl --user unset-environment SWAYSOCK DISPLAY I3SOCK WAYLAND_DISPLAY";
   };
 }

modules/sway/swayidle.service.nix

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

modules/sway/waybar.service.nix

@@ -1,11 +1,11 @@
-{ 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" ];
+    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" ];
+    Wants = ["graphical-session-pre.target" "network-online.target" "blueman-applet.service"];
+    ConditionEnvironment = ["WAYLAND_DISPLAY"];
   };
 
   Service = {
@@ -16,6 +16,6 @@
   };
 
   Install = {
-    WantedBy = [ "sway-session.target" ];
+    WantedBy = ["sway-session.target"];
   };
 }

modules/sway/xsettingsd.service.nix

@@ -1,12 +1,11 @@
-{ pkgs, ... }:
+{pkgs, ...}: {
-{
   Unit = {
     Description = "X Settings Daemon";
-    Documentation = [ "https://github.com/derat/xsettingsd/wiki/Installation" ];
+    Documentation = ["https://github.com/derat/xsettingsd/wiki/Installation"];
-    BindsTo = [ "sway-session.target" ];
+    BindsTo = ["sway-session.target"];
-    After = [ "sway-session.target" ];
+    After = ["sway-session.target"];
     # ConditionEnvironment requires systemd v247 to work correctly
-    ConditionEnvironment = [ "WAYLAND_DISPLAY" ];
+    ConditionEnvironment = ["WAYLAND_DISPLAY"];
   };
   Service = {
     Type = "simple";
@@ -14,6 +13,6 @@
     ExecStop = "/run/current-system/sw/bin/env pkill xsettingsd";
   };
   Install = {
-    WantedBy = [ "sway-session.target" ];
+    WantedBy = ["sway-session.target"];
   };
 }

modules/sway/ydotool.service.nix

@@ -1,10 +1,9 @@
-{ pkgs, ... }:
+{pkgs, ...}: {
-{
   Unit = {
     Description = "ydotool - Generic command-line automation tool (no X!)";
-    Documentation = [ "https://github.com/ReimuNotMoe/ydotool" ];
+    Documentation = ["https://github.com/ReimuNotMoe/ydotool"];
-    BindsTo = [ "sway-session.target" ];
+    BindsTo = ["sway-session.target"];
-    After = [ "sway-session.target" ];
+    After = ["sway-session.target"];
   };
   Service = {
     Type = "simple";
@@ -14,6 +13,6 @@
     TimeoutStopSec = "10";
   };
   Install = {
-    WantedBy = [ "sway-session.target" ];
+    WantedBy = ["sway-session.target"];
   };
 }

modules/terminal-life/bash/default.nix

@@ -0,0 +1,112 @@
+{
+  config,
+  pkgs,
+  self,
+  ...
+}: let
+  psCfg = config.pub-solar;
+  xdg = config.home-manager.users."${psCfg.user.name}".xdg;
+in {
+  enable = true;
+
+  historyControl = ["ignorespace"];
+
+  # Run when initializing a login shell
+  profileExtra = ''
+    [ "$(tty)" = "/dev/tty1" ] && exec ${pkgs.sway-service}/bin/sway-service
+  '';
+
+  # Run when initializing an interactive shell
+  initExtra = ''
+    # Show current directory at the top in Alacritty
+    PROMPT_COMMAND='echo -e -n "\e]2;$(basename "$PWD" | sed "s/${psCfg.user.name}/~/")\e\\"'
+
+    # If a command is not found, show me where it is
+    source ${pkgs.nix-index}/etc/profile.d/command-not-found.sh
+
+    # Helps you navigate directories faster
+    # https://github.com/gsamokovarov/jump
+    eval "$(${pkgs.jump}/bin/jump shell --bind=z)"
+
+    eval "$(${pkgs.direnv}/bin/direnv hook bash)"
+
+    bind 'set show-all-if-ambiguous on'
+
+    # Syntax highlighting, auto suggestions, vim modes, etc.
+    # https://github.com/akinomyoga/ble.sh/wiki/Manual-A1-Installation#user-content-nixpkgs
+    source "$(blesh-share)"/ble.sh --attach=none
+    # ctrl + space to accept autocomplete suggestion
+    ble-bind -m 'auto_complete' -f 'C-@' 'auto_complete/insert-on-end'
+    # Meta (Alt) + Backspace to delete a word
+    ble-bind -m 'vi_imap' -f 'M-C-?' 'kill-backward-cword'
+    # Meta (Alt) + p to jump one word backwards
+    ble-bind -m 'vi_imap' -f M-p '@nomarked backward-uword'
+    ble-bind -m 'vi_imap' -f M-left '@nomarked backward-uword'
+    # Meta (Alt) + n to jump one word forwards
+    ble-bind -m 'vi_imap' -f M-n '@nomarked forward-uword'
+    ble-bind -m 'vi_imap' -f M-right '@nomarked forward-uword'
+    # Arrow up and Ctrl + p searches history for entered input
+    ble-bind -m 'vi_imap' -f up 'history-search-backward hide-status:immediate-accept:empty=emulate-readline:point=end'
+    ble-bind -m 'vi_imap' -f C-p 'history-search-backward hide-status:immediate-accept:empty=emulate-readline:point=end'
+    # Arrow down and Ctrl + n searches history for entered input
+    ble-bind -m 'vi_imap' -f down 'history-search-forward hide-status:immediate-accept:empty=emulate-readline:point=end'
+    ble-bind -m 'vi_imap' -f C-n 'history-search-forward hide-status:immediate-accept:empty=emulate-readline:point=end'
+
+    ble-face region_insert='fg=black,bg=navy'
+
+    function my/complete-load-hook {
+      bleopt complete_auto_delay=250
+    }
+    blehook/eval-after-load complete my/complete-load-hook
+
+    bleopt exec_elapsed_mark=
+    bleopt exec_errexit_mark=
+    bleopt filename_ls_colors="$LS_COLORS"
+
+    bleopt complete_menu_style=desc
+
+    # Bash vim mode keybindings
+    if [[ $- == *i* ]]; then # in interactive session
+      set -o vi
+
+      ble-bind -m vi_imap -f 'ENTER' 'vi_imap/complete'
+      ble-bind -m vi_imap -f 'TAB' 'vi_imap/complete'
+
+      ble-bind -m vi_imap -f 'j j' 'vi_imap/normal-mode'
+      ble-bind -m vi_imap -f 'ESC' 'vi_imap/normal-mode'
+
+      ble-bind -m vi_nmap -f 'h' 'vi_nmap/insert-mode'
+      ble-bind -m vi_nmap -f 'i' 'vi-command/backward-line'
+      ble-bind -m vi_nmap -f 'j' 'vi-command/backward-char'
+      ble-bind -m vi_nmap -f 'k' 'vi-command/forward-line'
+      ble-bind -m vi_nmap -f 'l' 'vi-command/forward-char'
+
+      ble-bind -m vi_imap -f 'C-c' discard-line
+    fi
+
+    # end of .bashrc
+    # Somehow we need to ensure starship starts later than ble.sh
+    # (possible packaging issue?)
+    # https://github.com/akinomyoga/ble.sh/issues/333
+    eval "$(${pkgs.starship}/bin/starship init bash)"
+
+    [[ ''${BLE_VERSION-} ]] && ble-attach
+  '';
+
+  shellAliases = {
+    nano = "nvim";
+    vi = "nvim";
+    vim = "nvim";
+    mutt = "neomutt";
+    ls = "exa";
+    la = "exa --group-directories-first -lag";
+    wget = "wget --hsts-file=$XDG_CACHE_HOME/wget-hsts";
+    irssi = "irssi --config=$XDG_CONFIG_HOME/irssi/config --home=$XDG_DATA_HOME/irssi";
+    drone = "DRONE_TOKEN=$(secret-tool lookup drone token) drone";
+    no = "manix \"\" | grep '^# ' | sed 's/^# \(.*\) (.*/\1/;s/ (.*//;s/^# //' | fzf --preview=\"manix '{}'\" | xargs manix";
+    # fix nixos-option
+    nixos-option = "nixos-option -I nixpkgs=${self}/lib/compat";
+    myip = "dig +short myip.opendns.com @208.67.222.222 2>&1";
+    nnn = "nnn -d -e -H -r";
+  };
+}

modules/terminal-life/default.nix

@@ -1,10 +1,14 @@
-{ lib, config, pkgs, self, ... }:
+{
-with lib;
+  lib,
-let
+  config,
+  pkgs,
+  self,
+  ...
+}:
+with lib; let
   psCfg = config.pub-solar;
   cfg = config.pub-solar.terminal-life;
-in
+in {
-{
   options.pub-solar.terminal-life = {
     enable = mkEnableOption "Life in black and white";
 
@@ -20,36 +24,55 @@ in
   config = mkIf cfg.enable {
     programs.command-not-found.enable = false;
 
-    # Needed to get zsh completion for system packages (e.g. systemd).
-    environment.pathsToLink = [ "/share/zsh" ];
-
-    environment.shells = with pkgs; [
-      zsh
-    ];
-
     environment.systemPackages = with pkgs; [
       screen
     ];
 
-    home-manager = with pkgs; pkgs.lib.setAttrByPath [ "users" psCfg.user.name ] {
+    # Starship is a fast and featureful shell prompt
-      home.packages = [
+    # starship.toml has sane defaults that can be changed there
-        ack
+    programs.starship = {
-        asciinema
+      enable = true;
-        bat
+      settings = import ./starship.toml.nix;
-        exa
-        fd
-        gh
-        glow
-        nnn
-        powerline
-        silver-searcher
-        vifm
-        watson
-      ];
-
-      programs.neovim = import ./nvim { inherit config; inherit pkgs; };
-      programs.fzf = import ./fzf { inherit config; inherit pkgs; };
-      programs.zsh = import ./zsh { inherit config; inherit pkgs; inherit self; };
     };
+
+    home-manager = with pkgs;
+      pkgs.lib.setAttrByPath ["users" psCfg.user.name] {
+        home.packages = [
+          ack
+          asciinema
+          bat
+          blesh
+          exa
+          fd
+          gh
+          glow
+          jump
+          (nnn.overrideAttrs (o: {
+            patches =
+              (o.patches or [])
+              ++ [
+                ./nnn/0001-feat-use-wasd-keybindings-for-jkli.patch
+              ];
+          }))
+          powerline
+          silver-searcher
+          watson
+        ];
+
+        programs.bash = import ./bash {
+          inherit config;
+          inherit pkgs;
+          inherit self;
+        };
+        programs.fzf = import ./fzf {
+          inherit config;
+          inherit pkgs;
+        };
+        programs.neovim = import ./nvim {
+          inherit config;
+          inherit pkgs;
+          inherit lib;
+        };
+      };
   };
 }