Compare commits
1 commit
main
...
feature/at
Author | SHA1 | Date | |
---|---|---|---|
Benjamin Bädorf | c4f722357a |
207
.drone.yml
207
.drone.yml
|
@ -1,74 +1,79 @@
|
||||||
---
|
|
||||||
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
|
kind: pipeline
|
||||||
type: docker
|
type: docker
|
||||||
name: Notification
|
name: Upstreaming
|
||||||
|
|
||||||
steps:
|
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"
|
- name: "Notify matrix"
|
||||||
image: plugins/matrix
|
image: plugins/matrix
|
||||||
|
when:
|
||||||
|
status:
|
||||||
|
- failure
|
||||||
|
event:
|
||||||
|
- cron
|
||||||
|
cron:
|
||||||
|
- sync-main-with-upstream
|
||||||
|
- sync-b12f-with-main
|
||||||
|
- sync-teutat3s-with-main
|
||||||
settings:
|
settings:
|
||||||
homeserver: https://matrix.pub.solar
|
homeserver: https://matrix.pub.solar
|
||||||
roomid: dfQBqwkhIzrFjMSsxy:pub.solar
|
roomid: dfQBqwkhIzrFjMSsxy:pub.solar
|
||||||
|
@ -76,79 +81,9 @@ steps:
|
||||||
from_secret: matrix_username
|
from_secret: matrix_username
|
||||||
password:
|
password:
|
||||||
from_secret: matrix_password
|
from_secret: matrix_password
|
||||||
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"
|
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)"
|
||||||
|
|
||||||
depends_on:
|
|
||||||
- Tests
|
|
||||||
|
|
||||||
trigger:
|
|
||||||
ref:
|
|
||||||
- refs/tags/v*
|
|
||||||
- refs/tags/t*
|
|
||||||
|
|
||||||
---
|
|
||||||
kind: pipeline
|
|
||||||
type: docker
|
|
||||||
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 $$NIX_FLAGS build \
|
|
||||||
'.#nixosConfigurations.bootstrap.config.system.build.isoImage'
|
|
||||||
- cp $(readlink -f result)/iso/PubSolarOS*.iso /var/nix/iso-cache/
|
|
||||||
- nix shell nixpkgs#findutils
|
|
||||||
- cd /var/nix/iso-cache/
|
|
||||||
- export ISO_NAME=$(find . -name '*.iso' -printf "%f\n")
|
|
||||||
- sha256sum $ISO_NAME > $ISO_NAME.sha256
|
|
||||||
- ln -s $ISO_NAME PubSolarOS-latest.iso
|
|
||||||
- cp $ISO_NAME.sha256 PubSolarOS-latest.iso.sha256
|
|
||||||
- nix run nixpkgs#gnused -- --in-place "s/$ISO_NAME/PubSolarOS-latest.iso/" PubSolarOS-latest.iso.sha256
|
|
||||||
|
|
||||||
- name: "Publish ISO"
|
|
||||||
# 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: iso_web_ssh_host
|
|
||||||
user:
|
|
||||||
from_secret: iso_web_ssh_user
|
|
||||||
port:
|
|
||||||
from_secret: iso_web_ssh_port
|
|
||||||
key:
|
|
||||||
from_secret: iso_web_ssh_key
|
|
||||||
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:
|
|
||||||
- push
|
|
||||||
|
|
||||||
volumes:
|
|
||||||
- name: file-exchange
|
|
||||||
temp: {}
|
|
||||||
|
|
||||||
---
|
---
|
||||||
kind: signature
|
kind: signature
|
||||||
hmac: a116f78a0b22188052893bdb46aa40f8de66438826c10ced362ea183d7644d67
|
hmac: 07d9a95e8f577483d753e9eea76229ffe0c369ecd642bfc364ae183f662d2167
|
||||||
|
|
||||||
...
|
...
|
||||||
|
|
11
.drone/setup_ssh.sh
Executable file
11
.drone/setup_ssh.sh
Executable file
|
@ -0,0 +1,11 @@
|
||||||
|
#!/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
|
12
.drone/upstream-branch.sh
Executable file
12
.drone/upstream-branch.sh
Executable file
|
@ -0,0 +1,12 @@
|
||||||
|
#!/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"
|
|
@ -15,9 +15,6 @@ end_of_line = unset
|
||||||
insert_final_newline = unset
|
insert_final_newline = unset
|
||||||
trim_trailing_whitespace = unset
|
trim_trailing_whitespace = unset
|
||||||
indent_size = unset
|
indent_size = unset
|
||||||
charset = unset
|
|
||||||
indent_style = unset
|
|
||||||
indent_size = unset
|
|
||||||
|
|
||||||
[{.*,secrets}/**]
|
[{.*,secrets}/**]
|
||||||
end_of_line = unset
|
end_of_line = unset
|
||||||
|
|
|
@ -1,2 +0,0 @@
|
||||||
# Formatted code using treefmt and alejandra
|
|
||||||
73bf158392a427d188b7aad36244b94506f57a15
|
|
38
.github/ISSUE_TEMPLATE/bug_report.md
vendored
Normal file
38
.github/ISSUE_TEMPLATE/bug_report.md
vendored
Normal file
|
@ -0,0 +1,38 @@
|
||||||
|
---
|
||||||
|
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. -->
|
22
.github/ISSUE_TEMPLATE/community_request.md
vendored
Normal file
22
.github/ISSUE_TEMPLATE/community_request.md
vendored
Normal file
|
@ -0,0 +1,22 @@
|
||||||
|
---
|
||||||
|
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. -->
|
24
.github/ISSUE_TEMPLATE/feature_request.md
vendored
Normal file
24
.github/ISSUE_TEMPLATE/feature_request.md
vendored
Normal file
|
@ -0,0 +1,24 @@
|
||||||
|
---
|
||||||
|
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. -->
|
16
.github/ISSUE_TEMPLATE/upstream_notice.md
vendored
Normal file
16
.github/ISSUE_TEMPLATE/upstream_notice.md
vendored
Normal file
|
@ -0,0 +1,16 @@
|
||||||
|
---
|
||||||
|
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 -->
|
29
.github/workflows/check.yml
vendored
Normal file
29
.github/workflows/check.yml
vendored
Normal file
|
@ -0,0 +1,29 @@
|
||||||
|
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
|
27
.github/workflows/mdbook_docs.yml
vendored
Normal file
27
.github/workflows/mdbook_docs.yml
vendored
Normal file
|
@ -0,0 +1,27 @@
|
||||||
|
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
|
71
.github/workflows/release.yml
vendored
Normal file
71
.github/workflows/release.yml
vendored
Normal file
|
@ -0,0 +1,71 @@
|
||||||
|
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
|
2
.gitignore
vendored
2
.gitignore
vendored
|
@ -10,4 +10,4 @@ doi
|
||||||
pkgs/_sources/.shake*
|
pkgs/_sources/.shake*
|
||||||
|
|
||||||
tags
|
tags
|
||||||
/owners
|
/owners
|
|
@ -77,7 +77,7 @@
|
||||||
|
|
||||||
**Fixed bugs:**
|
**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)
|
- 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)
|
- 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)
|
- Profiles imports are brittle, causing failure if imported twice [\#136](https://github.com/divnix/devos/issues/136)
|
||||||
|
@ -109,4 +109,6 @@
|
||||||
|
|
||||||
## [07092020](https://github.com/divnix/devos/tree/07092020) (2020-07-09)
|
## [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)*
|
||||||
|
|
|
@ -1,33 +0,0 @@
|
||||||
# Quick branch overview
|
|
||||||
|
|
||||||
We work with several branches in this repo. This document aims to explain how
|
|
||||||
to contribute changes to the existing branches.
|
|
||||||
|
|
||||||
### `main` branch
|
|
||||||
|
|
||||||
- Changes to `modules` and `profiles` should go [the main branch](https://git.pub.solar/pub-solar/os/src/branch/main)
|
|
||||||
- Changes can get accepted via: Pull Request
|
|
||||||
- Branch protected from direct `git push`
|
|
||||||
|
|
||||||
### `infra` branch
|
|
||||||
|
|
||||||
- Changes to the [pub.solar](https://pub.solar) infrastructure should be merged [into this branch](https://git.pub.solar/pub-solar/os/src/branch/infra)
|
|
||||||
- Changes can get accepted via: Pull Request
|
|
||||||
- Branch protected from direct `git push`
|
|
||||||
|
|
||||||
### `momo/main` branch
|
|
||||||
|
|
||||||
- Changes to the [Momo](https://momo.koeln) infrastructure should be merged [into this branch](https://git.pub.solar/pub-solar/os/src/branch/momo/main)
|
|
||||||
- Changes can get accepted via: Pull Request
|
|
||||||
- Deployment of changes is [automatic via CI pipeline](https://git.pub.solar/pub-solar/os/src/commit/43bd7421509f7cc9ba06d7c740f3f536a4a2af76/.drone.yml#L20-L38)
|
|
||||||
- Branch protected from direct `git push`
|
|
||||||
|
|
||||||
### `$USER` branches
|
|
||||||
|
|
||||||
- User's custom hosts and changes can be worked on in these branches
|
|
||||||
- Direct `git push` possible
|
|
||||||
- Examples:
|
|
||||||
- [hensoko](https://git.pub.solar/pub-solar/os/src/branch/hensoko)
|
|
||||||
- [b12f](https://git.pub.solar/pub-solar/os/src/branch/b12f)
|
|
||||||
- [axeman](https://git.pub.solar/pub-solar/os/src/branch/axeman)
|
|
||||||
- [teutat3s](https://git.pub.solar/pub-solar/os/src/branch/teutat3s)
|
|
660
LICENSE.md
660
LICENSE.md
|
@ -1,660 +0,0 @@
|
||||||
### GNU AFFERO GENERAL PUBLIC LICENSE
|
|
||||||
|
|
||||||
Version 3, 19 November 2007
|
|
||||||
|
|
||||||
Copyright (C) 2007 Free Software Foundation, Inc.
|
|
||||||
<https://fsf.org/>
|
|
||||||
|
|
||||||
Everyone is permitted to copy and distribute verbatim copies of this
|
|
||||||
license document, but changing it is not allowed.
|
|
||||||
|
|
||||||
### Preamble
|
|
||||||
|
|
||||||
The GNU Affero General Public License is a free, copyleft license for
|
|
||||||
software and other kinds of works, specifically designed to ensure
|
|
||||||
cooperation with the community in the case of network server software.
|
|
||||||
|
|
||||||
The licenses for most software and other practical works are designed
|
|
||||||
to take away your freedom to share and change the works. By contrast,
|
|
||||||
our General Public Licenses are intended to guarantee your freedom to
|
|
||||||
share and change all versions of a program--to make sure it remains
|
|
||||||
free software for all its users.
|
|
||||||
|
|
||||||
When we speak of free software, we are referring to freedom, not
|
|
||||||
price. Our General Public Licenses are designed to make sure that you
|
|
||||||
have the freedom to distribute copies of free software (and charge for
|
|
||||||
them if you wish), that you receive source code or can get it if you
|
|
||||||
want it, that you can change the software or use pieces of it in new
|
|
||||||
free programs, and that you know you can do these things.
|
|
||||||
|
|
||||||
Developers that use our General Public Licenses protect your rights
|
|
||||||
with two steps: (1) assert copyright on the software, and (2) offer
|
|
||||||
you this License which gives you legal permission to copy, distribute
|
|
||||||
and/or modify the software.
|
|
||||||
|
|
||||||
A secondary benefit of defending all users' freedom is that
|
|
||||||
improvements made in alternate versions of the program, if they
|
|
||||||
receive widespread use, become available for other developers to
|
|
||||||
incorporate. Many developers of free software are heartened and
|
|
||||||
encouraged by the resulting cooperation. However, in the case of
|
|
||||||
software used on network servers, this result may fail to come about.
|
|
||||||
The GNU General Public License permits making a modified version and
|
|
||||||
letting the public access it on a server without ever releasing its
|
|
||||||
source code to the public.
|
|
||||||
|
|
||||||
The GNU Affero General Public License is designed specifically to
|
|
||||||
ensure that, in such cases, the modified source code becomes available
|
|
||||||
to the community. It requires the operator of a network server to
|
|
||||||
provide the source code of the modified version running there to the
|
|
||||||
users of that server. Therefore, public use of a modified version, on
|
|
||||||
a publicly accessible server, gives the public access to the source
|
|
||||||
code of the modified version.
|
|
||||||
|
|
||||||
An older license, called the Affero General Public License and
|
|
||||||
published by Affero, was designed to accomplish similar goals. This is
|
|
||||||
a different license, not a version of the Affero GPL, but Affero has
|
|
||||||
released a new version of the Affero GPL which permits relicensing
|
|
||||||
under this license.
|
|
||||||
|
|
||||||
The precise terms and conditions for copying, distribution and
|
|
||||||
modification follow.
|
|
||||||
|
|
||||||
### TERMS AND CONDITIONS
|
|
||||||
|
|
||||||
#### 0. Definitions.
|
|
||||||
|
|
||||||
"This License" refers to version 3 of the GNU Affero General Public
|
|
||||||
License.
|
|
||||||
|
|
||||||
"Copyright" also means copyright-like laws that apply to other kinds
|
|
||||||
of works, such as semiconductor masks.
|
|
||||||
|
|
||||||
"The Program" refers to any copyrightable work licensed under this
|
|
||||||
License. Each licensee is addressed as "you". "Licensees" and
|
|
||||||
"recipients" may be individuals or organizations.
|
|
||||||
|
|
||||||
To "modify" a work means to copy from or adapt all or part of the work
|
|
||||||
in a fashion requiring copyright permission, other than the making of
|
|
||||||
an exact copy. The resulting work is called a "modified version" of
|
|
||||||
the earlier work or a work "based on" the earlier work.
|
|
||||||
|
|
||||||
A "covered work" means either the unmodified Program or a work based
|
|
||||||
on the Program.
|
|
||||||
|
|
||||||
To "propagate" a work means to do anything with it that, without
|
|
||||||
permission, would make you directly or secondarily liable for
|
|
||||||
infringement under applicable copyright law, except executing it on a
|
|
||||||
computer or modifying a private copy. Propagation includes copying,
|
|
||||||
distribution (with or without modification), making available to the
|
|
||||||
public, and in some countries other activities as well.
|
|
||||||
|
|
||||||
To "convey" a work means any kind of propagation that enables other
|
|
||||||
parties to make or receive copies. Mere interaction with a user
|
|
||||||
through a computer network, with no transfer of a copy, is not
|
|
||||||
conveying.
|
|
||||||
|
|
||||||
An interactive user interface displays "Appropriate Legal Notices" to
|
|
||||||
the extent that it includes a convenient and prominently visible
|
|
||||||
feature that (1) displays an appropriate copyright notice, and (2)
|
|
||||||
tells the user that there is no warranty for the work (except to the
|
|
||||||
extent that warranties are provided), that licensees may convey the
|
|
||||||
work under this License, and how to view a copy of this License. If
|
|
||||||
the interface presents a list of user commands or options, such as a
|
|
||||||
menu, a prominent item in the list meets this criterion.
|
|
||||||
|
|
||||||
#### 1. Source Code.
|
|
||||||
|
|
||||||
The "source code" for a work means the preferred form of the work for
|
|
||||||
making modifications to it. "Object code" means any non-source form of
|
|
||||||
a work.
|
|
||||||
|
|
||||||
A "Standard Interface" means an interface that either is an official
|
|
||||||
standard defined by a recognized standards body, or, in the case of
|
|
||||||
interfaces specified for a particular programming language, one that
|
|
||||||
is widely used among developers working in that language.
|
|
||||||
|
|
||||||
The "System Libraries" of an executable work include anything, other
|
|
||||||
than the work as a whole, that (a) is included in the normal form of
|
|
||||||
packaging a Major Component, but which is not part of that Major
|
|
||||||
Component, and (b) serves only to enable use of the work with that
|
|
||||||
Major Component, or to implement a Standard Interface for which an
|
|
||||||
implementation is available to the public in source code form. A
|
|
||||||
"Major Component", in this context, means a major essential component
|
|
||||||
(kernel, window system, and so on) of the specific operating system
|
|
||||||
(if any) on which the executable work runs, or a compiler used to
|
|
||||||
produce the work, or an object code interpreter used to run it.
|
|
||||||
|
|
||||||
The "Corresponding Source" for a work in object code form means all
|
|
||||||
the source code needed to generate, install, and (for an executable
|
|
||||||
work) run the object code and to modify the work, including scripts to
|
|
||||||
control those activities. However, it does not include the work's
|
|
||||||
System Libraries, or general-purpose tools or generally available free
|
|
||||||
programs which are used unmodified in performing those activities but
|
|
||||||
which are not part of the work. For example, Corresponding Source
|
|
||||||
includes interface definition files associated with source files for
|
|
||||||
the work, and the source code for shared libraries and dynamically
|
|
||||||
linked subprograms that the work is specifically designed to require,
|
|
||||||
such as by intimate data communication or control flow between those
|
|
||||||
subprograms and other parts of the work.
|
|
||||||
|
|
||||||
The Corresponding Source need not include anything that users can
|
|
||||||
regenerate automatically from other parts of the Corresponding Source.
|
|
||||||
|
|
||||||
The Corresponding Source for a work in source code form is that same
|
|
||||||
work.
|
|
||||||
|
|
||||||
#### 2. Basic Permissions.
|
|
||||||
|
|
||||||
All rights granted under this License are granted for the term of
|
|
||||||
copyright on the Program, and are irrevocable provided the stated
|
|
||||||
conditions are met. This License explicitly affirms your unlimited
|
|
||||||
permission to run the unmodified Program. The output from running a
|
|
||||||
covered work is covered by this License only if the output, given its
|
|
||||||
content, constitutes a covered work. This License acknowledges your
|
|
||||||
rights of fair use or other equivalent, as provided by copyright law.
|
|
||||||
|
|
||||||
You may make, run and propagate covered works that you do not convey,
|
|
||||||
without conditions so long as your license otherwise remains in force.
|
|
||||||
You may convey covered works to others for the sole purpose of having
|
|
||||||
them make modifications exclusively for you, or provide you with
|
|
||||||
facilities for running those works, provided that you comply with the
|
|
||||||
terms of this License in conveying all material for which you do not
|
|
||||||
control copyright. Those thus making or running the covered works for
|
|
||||||
you must do so exclusively on your behalf, under your direction and
|
|
||||||
control, on terms that prohibit them from making any copies of your
|
|
||||||
copyrighted material outside their relationship with you.
|
|
||||||
|
|
||||||
Conveying under any other circumstances is permitted solely under the
|
|
||||||
conditions stated below. Sublicensing is not allowed; section 10 makes
|
|
||||||
it unnecessary.
|
|
||||||
|
|
||||||
#### 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
|
|
||||||
|
|
||||||
No covered work shall be deemed part of an effective technological
|
|
||||||
measure under any applicable law fulfilling obligations under article
|
|
||||||
11 of the WIPO copyright treaty adopted on 20 December 1996, or
|
|
||||||
similar laws prohibiting or restricting circumvention of such
|
|
||||||
measures.
|
|
||||||
|
|
||||||
When you convey a covered work, you waive any legal power to forbid
|
|
||||||
circumvention of technological measures to the extent such
|
|
||||||
circumvention is effected by exercising rights under this License with
|
|
||||||
respect to the covered work, and you disclaim any intention to limit
|
|
||||||
operation or modification of the work as a means of enforcing, against
|
|
||||||
the work's users, your or third parties' legal rights to forbid
|
|
||||||
circumvention of technological measures.
|
|
||||||
|
|
||||||
#### 4. Conveying Verbatim Copies.
|
|
||||||
|
|
||||||
You may convey verbatim copies of the Program's source code as you
|
|
||||||
receive it, in any medium, provided that you conspicuously and
|
|
||||||
appropriately publish on each copy an appropriate copyright notice;
|
|
||||||
keep intact all notices stating that this License and any
|
|
||||||
non-permissive terms added in accord with section 7 apply to the code;
|
|
||||||
keep intact all notices of the absence of any warranty; and give all
|
|
||||||
recipients a copy of this License along with the Program.
|
|
||||||
|
|
||||||
You may charge any price or no price for each copy that you convey,
|
|
||||||
and you may offer support or warranty protection for a fee.
|
|
||||||
|
|
||||||
#### 5. Conveying Modified Source Versions.
|
|
||||||
|
|
||||||
You may convey a work based on the Program, or the modifications to
|
|
||||||
produce it from the Program, in the form of source code under the
|
|
||||||
terms of section 4, provided that you also meet all of these
|
|
||||||
conditions:
|
|
||||||
|
|
||||||
- a) The work must carry prominent notices stating that you modified
|
|
||||||
it, and giving a relevant date.
|
|
||||||
- b) The work must carry prominent notices stating that it is
|
|
||||||
released under this License and any conditions added under
|
|
||||||
section 7. This requirement modifies the requirement in section 4
|
|
||||||
to "keep intact all notices".
|
|
||||||
- c) You must license the entire work, as a whole, under this
|
|
||||||
License to anyone who comes into possession of a copy. This
|
|
||||||
License will therefore apply, along with any applicable section 7
|
|
||||||
additional terms, to the whole of the work, and all its parts,
|
|
||||||
regardless of how they are packaged. This License gives no
|
|
||||||
permission to license the work in any other way, but it does not
|
|
||||||
invalidate such permission if you have separately received it.
|
|
||||||
- d) If the work has interactive user interfaces, each must display
|
|
||||||
Appropriate Legal Notices; however, if the Program has interactive
|
|
||||||
interfaces that do not display Appropriate Legal Notices, your
|
|
||||||
work need not make them do so.
|
|
||||||
|
|
||||||
A compilation of a covered work with other separate and independent
|
|
||||||
works, which are not by their nature extensions of the covered work,
|
|
||||||
and which are not combined with it such as to form a larger program,
|
|
||||||
in or on a volume of a storage or distribution medium, is called an
|
|
||||||
"aggregate" if the compilation and its resulting copyright are not
|
|
||||||
used to limit the access or legal rights of the compilation's users
|
|
||||||
beyond what the individual works permit. Inclusion of a covered work
|
|
||||||
in an aggregate does not cause this License to apply to the other
|
|
||||||
parts of the aggregate.
|
|
||||||
|
|
||||||
#### 6. Conveying Non-Source Forms.
|
|
||||||
|
|
||||||
You may convey a covered work in object code form under the terms of
|
|
||||||
sections 4 and 5, provided that you also convey the machine-readable
|
|
||||||
Corresponding Source under the terms of this License, in one of these
|
|
||||||
ways:
|
|
||||||
|
|
||||||
- a) Convey the object code in, or embodied in, a physical product
|
|
||||||
(including a physical distribution medium), accompanied by the
|
|
||||||
Corresponding Source fixed on a durable physical medium
|
|
||||||
customarily used for software interchange.
|
|
||||||
- b) Convey the object code in, or embodied in, a physical product
|
|
||||||
(including a physical distribution medium), accompanied by a
|
|
||||||
written offer, valid for at least three years and valid for as
|
|
||||||
long as you offer spare parts or customer support for that product
|
|
||||||
model, to give anyone who possesses the object code either (1) a
|
|
||||||
copy of the Corresponding Source for all the software in the
|
|
||||||
product that is covered by this License, on a durable physical
|
|
||||||
medium customarily used for software interchange, for a price no
|
|
||||||
more than your reasonable cost of physically performing this
|
|
||||||
conveying of source, or (2) access to copy the Corresponding
|
|
||||||
Source from a network server at no charge.
|
|
||||||
- c) Convey individual copies of the object code with a copy of the
|
|
||||||
written offer to provide the Corresponding Source. This
|
|
||||||
alternative is allowed only occasionally and noncommercially, and
|
|
||||||
only if you received the object code with such an offer, in accord
|
|
||||||
with subsection 6b.
|
|
||||||
- d) Convey the object code by offering access from a designated
|
|
||||||
place (gratis or for a charge), and offer equivalent access to the
|
|
||||||
Corresponding Source in the same way through the same place at no
|
|
||||||
further charge. You need not require recipients to copy the
|
|
||||||
Corresponding Source along with the object code. If the place to
|
|
||||||
copy the object code is a network server, the Corresponding Source
|
|
||||||
may be on a different server (operated by you or a third party)
|
|
||||||
that supports equivalent copying facilities, provided you maintain
|
|
||||||
clear directions next to the object code saying where to find the
|
|
||||||
Corresponding Source. Regardless of what server hosts the
|
|
||||||
Corresponding Source, you remain obligated to ensure that it is
|
|
||||||
available for as long as needed to satisfy these requirements.
|
|
||||||
- e) Convey the object code using peer-to-peer transmission,
|
|
||||||
provided you inform other peers where the object code and
|
|
||||||
Corresponding Source of the work are being offered to the general
|
|
||||||
public at no charge under subsection 6d.
|
|
||||||
|
|
||||||
A separable portion of the object code, whose source code is excluded
|
|
||||||
from the Corresponding Source as a System Library, need not be
|
|
||||||
included in conveying the object code work.
|
|
||||||
|
|
||||||
A "User Product" is either (1) a "consumer product", which means any
|
|
||||||
tangible personal property which is normally used for personal,
|
|
||||||
family, or household purposes, or (2) anything designed or sold for
|
|
||||||
incorporation into a dwelling. In determining whether a product is a
|
|
||||||
consumer product, doubtful cases shall be resolved in favor of
|
|
||||||
coverage. For a particular product received by a particular user,
|
|
||||||
"normally used" refers to a typical or common use of that class of
|
|
||||||
product, regardless of the status of the particular user or of the way
|
|
||||||
in which the particular user actually uses, or expects or is expected
|
|
||||||
to use, the product. A product is a consumer product regardless of
|
|
||||||
whether the product has substantial commercial, industrial or
|
|
||||||
non-consumer uses, unless such uses represent the only significant
|
|
||||||
mode of use of the product.
|
|
||||||
|
|
||||||
"Installation Information" for a User Product means any methods,
|
|
||||||
procedures, authorization keys, or other information required to
|
|
||||||
install and execute modified versions of a covered work in that User
|
|
||||||
Product from a modified version of its Corresponding Source. The
|
|
||||||
information must suffice to ensure that the continued functioning of
|
|
||||||
the modified object code is in no case prevented or interfered with
|
|
||||||
solely because modification has been made.
|
|
||||||
|
|
||||||
If you convey an object code work under this section in, or with, or
|
|
||||||
specifically for use in, a User Product, and the conveying occurs as
|
|
||||||
part of a transaction in which the right of possession and use of the
|
|
||||||
User Product is transferred to the recipient in perpetuity or for a
|
|
||||||
fixed term (regardless of how the transaction is characterized), the
|
|
||||||
Corresponding Source conveyed under this section must be accompanied
|
|
||||||
by the Installation Information. But this requirement does not apply
|
|
||||||
if neither you nor any third party retains the ability to install
|
|
||||||
modified object code on the User Product (for example, the work has
|
|
||||||
been installed in ROM).
|
|
||||||
|
|
||||||
The requirement to provide Installation Information does not include a
|
|
||||||
requirement to continue to provide support service, warranty, or
|
|
||||||
updates for a work that has been modified or installed by the
|
|
||||||
recipient, or for the User Product in which it has been modified or
|
|
||||||
installed. Access to a network may be denied when the modification
|
|
||||||
itself materially and adversely affects the operation of the network
|
|
||||||
or violates the rules and protocols for communication across the
|
|
||||||
network.
|
|
||||||
|
|
||||||
Corresponding Source conveyed, and Installation Information provided,
|
|
||||||
in accord with this section must be in a format that is publicly
|
|
||||||
documented (and with an implementation available to the public in
|
|
||||||
source code form), and must require no special password or key for
|
|
||||||
unpacking, reading or copying.
|
|
||||||
|
|
||||||
#### 7. Additional Terms.
|
|
||||||
|
|
||||||
"Additional permissions" are terms that supplement the terms of this
|
|
||||||
License by making exceptions from one or more of its conditions.
|
|
||||||
Additional permissions that are applicable to the entire Program shall
|
|
||||||
be treated as though they were included in this License, to the extent
|
|
||||||
that they are valid under applicable law. If additional permissions
|
|
||||||
apply only to part of the Program, that part may be used separately
|
|
||||||
under those permissions, but the entire Program remains governed by
|
|
||||||
this License without regard to the additional permissions.
|
|
||||||
|
|
||||||
When you convey a copy of a covered work, you may at your option
|
|
||||||
remove any additional permissions from that copy, or from any part of
|
|
||||||
it. (Additional permissions may be written to require their own
|
|
||||||
removal in certain cases when you modify the work.) You may place
|
|
||||||
additional permissions on material, added by you to a covered work,
|
|
||||||
for which you have or can give appropriate copyright permission.
|
|
||||||
|
|
||||||
Notwithstanding any other provision of this License, for material you
|
|
||||||
add to a covered work, you may (if authorized by the copyright holders
|
|
||||||
of that material) supplement the terms of this License with terms:
|
|
||||||
|
|
||||||
- a) Disclaiming warranty or limiting liability differently from the
|
|
||||||
terms of sections 15 and 16 of this License; or
|
|
||||||
- b) Requiring preservation of specified reasonable legal notices or
|
|
||||||
author attributions in that material or in the Appropriate Legal
|
|
||||||
Notices displayed by works containing it; or
|
|
||||||
- c) Prohibiting misrepresentation of the origin of that material,
|
|
||||||
or requiring that modified versions of such material be marked in
|
|
||||||
reasonable ways as different from the original version; or
|
|
||||||
- d) Limiting the use for publicity purposes of names of licensors
|
|
||||||
or authors of the material; or
|
|
||||||
- e) Declining to grant rights under trademark law for use of some
|
|
||||||
trade names, trademarks, or service marks; or
|
|
||||||
- f) Requiring indemnification of licensors and authors of that
|
|
||||||
material by anyone who conveys the material (or modified versions
|
|
||||||
of it) with contractual assumptions of liability to the recipient,
|
|
||||||
for any liability that these contractual assumptions directly
|
|
||||||
impose on those licensors and authors.
|
|
||||||
|
|
||||||
All other non-permissive additional terms are considered "further
|
|
||||||
restrictions" within the meaning of section 10. If the Program as you
|
|
||||||
received it, or any part of it, contains a notice stating that it is
|
|
||||||
governed by this License along with a term that is a further
|
|
||||||
restriction, you may remove that term. If a license document contains
|
|
||||||
a further restriction but permits relicensing or conveying under this
|
|
||||||
License, you may add to a covered work material governed by the terms
|
|
||||||
of that license document, provided that the further restriction does
|
|
||||||
not survive such relicensing or conveying.
|
|
||||||
|
|
||||||
If you add terms to a covered work in accord with this section, you
|
|
||||||
must place, in the relevant source files, a statement of the
|
|
||||||
additional terms that apply to those files, or a notice indicating
|
|
||||||
where to find the applicable terms.
|
|
||||||
|
|
||||||
Additional terms, permissive or non-permissive, may be stated in the
|
|
||||||
form of a separately written license, or stated as exceptions; the
|
|
||||||
above requirements apply either way.
|
|
||||||
|
|
||||||
#### 8. Termination.
|
|
||||||
|
|
||||||
You may not propagate or modify a covered work except as expressly
|
|
||||||
provided under this License. Any attempt otherwise to propagate or
|
|
||||||
modify it is void, and will automatically terminate your rights under
|
|
||||||
this License (including any patent licenses granted under the third
|
|
||||||
paragraph of section 11).
|
|
||||||
|
|
||||||
However, if you cease all violation of this License, then your license
|
|
||||||
from a particular copyright holder is reinstated (a) provisionally,
|
|
||||||
unless and until the copyright holder explicitly and finally
|
|
||||||
terminates your license, and (b) permanently, if the copyright holder
|
|
||||||
fails to notify you of the violation by some reasonable means prior to
|
|
||||||
60 days after the cessation.
|
|
||||||
|
|
||||||
Moreover, your license from a particular copyright holder is
|
|
||||||
reinstated permanently if the copyright holder notifies you of the
|
|
||||||
violation by some reasonable means, this is the first time you have
|
|
||||||
received notice of violation of this License (for any work) from that
|
|
||||||
copyright holder, and you cure the violation prior to 30 days after
|
|
||||||
your receipt of the notice.
|
|
||||||
|
|
||||||
Termination of your rights under this section does not terminate the
|
|
||||||
licenses of parties who have received copies or rights from you under
|
|
||||||
this License. If your rights have been terminated and not permanently
|
|
||||||
reinstated, you do not qualify to receive new licenses for the same
|
|
||||||
material under section 10.
|
|
||||||
|
|
||||||
#### 9. Acceptance Not Required for Having Copies.
|
|
||||||
|
|
||||||
You are not required to accept this License in order to receive or run
|
|
||||||
a copy of the Program. Ancillary propagation of a covered work
|
|
||||||
occurring solely as a consequence of using peer-to-peer transmission
|
|
||||||
to receive a copy likewise does not require acceptance. However,
|
|
||||||
nothing other than this License grants you permission to propagate or
|
|
||||||
modify any covered work. These actions infringe copyright if you do
|
|
||||||
not accept this License. Therefore, by modifying or propagating a
|
|
||||||
covered work, you indicate your acceptance of this License to do so.
|
|
||||||
|
|
||||||
#### 10. Automatic Licensing of Downstream Recipients.
|
|
||||||
|
|
||||||
Each time you convey a covered work, the recipient automatically
|
|
||||||
receives a license from the original licensors, to run, modify and
|
|
||||||
propagate that work, subject to this License. You are not responsible
|
|
||||||
for enforcing compliance by third parties with this License.
|
|
||||||
|
|
||||||
An "entity transaction" is a transaction transferring control of an
|
|
||||||
organization, or substantially all assets of one, or subdividing an
|
|
||||||
organization, or merging organizations. If propagation of a covered
|
|
||||||
work results from an entity transaction, each party to that
|
|
||||||
transaction who receives a copy of the work also receives whatever
|
|
||||||
licenses to the work the party's predecessor in interest had or could
|
|
||||||
give under the previous paragraph, plus a right to possession of the
|
|
||||||
Corresponding Source of the work from the predecessor in interest, if
|
|
||||||
the predecessor has it or can get it with reasonable efforts.
|
|
||||||
|
|
||||||
You may not impose any further restrictions on the exercise of the
|
|
||||||
rights granted or affirmed under this License. For example, you may
|
|
||||||
not impose a license fee, royalty, or other charge for exercise of
|
|
||||||
rights granted under this License, and you may not initiate litigation
|
|
||||||
(including a cross-claim or counterclaim in a lawsuit) alleging that
|
|
||||||
any patent claim is infringed by making, using, selling, offering for
|
|
||||||
sale, or importing the Program or any portion of it.
|
|
||||||
|
|
||||||
#### 11. Patents.
|
|
||||||
|
|
||||||
A "contributor" is a copyright holder who authorizes use under this
|
|
||||||
License of the Program or a work on which the Program is based. The
|
|
||||||
work thus licensed is called the contributor's "contributor version".
|
|
||||||
|
|
||||||
A contributor's "essential patent claims" are all patent claims owned
|
|
||||||
or controlled by the contributor, whether already acquired or
|
|
||||||
hereafter acquired, that would be infringed by some manner, permitted
|
|
||||||
by this License, of making, using, or selling its contributor version,
|
|
||||||
but do not include claims that would be infringed only as a
|
|
||||||
consequence of further modification of the contributor version. For
|
|
||||||
purposes of this definition, "control" includes the right to grant
|
|
||||||
patent sublicenses in a manner consistent with the requirements of
|
|
||||||
this License.
|
|
||||||
|
|
||||||
Each contributor grants you a non-exclusive, worldwide, royalty-free
|
|
||||||
patent license under the contributor's essential patent claims, to
|
|
||||||
make, use, sell, offer for sale, import and otherwise run, modify and
|
|
||||||
propagate the contents of its contributor version.
|
|
||||||
|
|
||||||
In the following three paragraphs, a "patent license" is any express
|
|
||||||
agreement or commitment, however denominated, not to enforce a patent
|
|
||||||
(such as an express permission to practice a patent or covenant not to
|
|
||||||
sue for patent infringement). To "grant" such a patent license to a
|
|
||||||
party means to make such an agreement or commitment not to enforce a
|
|
||||||
patent against the party.
|
|
||||||
|
|
||||||
If you convey a covered work, knowingly relying on a patent license,
|
|
||||||
and the Corresponding Source of the work is not available for anyone
|
|
||||||
to copy, free of charge and under the terms of this License, through a
|
|
||||||
publicly available network server or other readily accessible means,
|
|
||||||
then you must either (1) cause the Corresponding Source to be so
|
|
||||||
available, or (2) arrange to deprive yourself of the benefit of the
|
|
||||||
patent license for this particular work, or (3) arrange, in a manner
|
|
||||||
consistent with the requirements of this License, to extend the patent
|
|
||||||
license to downstream recipients. "Knowingly relying" means you have
|
|
||||||
actual knowledge that, but for the patent license, your conveying the
|
|
||||||
covered work in a country, or your recipient's use of the covered work
|
|
||||||
in a country, would infringe one or more identifiable patents in that
|
|
||||||
country that you have reason to believe are valid.
|
|
||||||
|
|
||||||
If, pursuant to or in connection with a single transaction or
|
|
||||||
arrangement, you convey, or propagate by procuring conveyance of, a
|
|
||||||
covered work, and grant a patent license to some of the parties
|
|
||||||
receiving the covered work authorizing them to use, propagate, modify
|
|
||||||
or convey a specific copy of the covered work, then the patent license
|
|
||||||
you grant is automatically extended to all recipients of the covered
|
|
||||||
work and works based on it.
|
|
||||||
|
|
||||||
A patent license is "discriminatory" if it does not include within the
|
|
||||||
scope of its coverage, prohibits the exercise of, or is conditioned on
|
|
||||||
the non-exercise of one or more of the rights that are specifically
|
|
||||||
granted under this License. You may not convey a covered work if you
|
|
||||||
are a party to an arrangement with a third party that is in the
|
|
||||||
business of distributing software, under which you make payment to the
|
|
||||||
third party based on the extent of your activity of conveying the
|
|
||||||
work, and under which the third party grants, to any of the parties
|
|
||||||
who would receive the covered work from you, a discriminatory patent
|
|
||||||
license (a) in connection with copies of the covered work conveyed by
|
|
||||||
you (or copies made from those copies), or (b) primarily for and in
|
|
||||||
connection with specific products or compilations that contain the
|
|
||||||
covered work, unless you entered into that arrangement, or that patent
|
|
||||||
license was granted, prior to 28 March 2007.
|
|
||||||
|
|
||||||
Nothing in this License shall be construed as excluding or limiting
|
|
||||||
any implied license or other defenses to infringement that may
|
|
||||||
otherwise be available to you under applicable patent law.
|
|
||||||
|
|
||||||
#### 12. No Surrender of Others' Freedom.
|
|
||||||
|
|
||||||
If conditions are imposed on you (whether by court order, agreement or
|
|
||||||
otherwise) that contradict the conditions of this License, they do not
|
|
||||||
excuse you from the conditions of this License. If you cannot convey a
|
|
||||||
covered work so as to satisfy simultaneously your obligations under
|
|
||||||
this License and any other pertinent obligations, then as a
|
|
||||||
consequence you may not convey it at all. For example, if you agree to
|
|
||||||
terms that obligate you to collect a royalty for further conveying
|
|
||||||
from those to whom you convey the Program, the only way you could
|
|
||||||
satisfy both those terms and this License would be to refrain entirely
|
|
||||||
from conveying the Program.
|
|
||||||
|
|
||||||
#### 13. Remote Network Interaction; Use with the GNU General Public License.
|
|
||||||
|
|
||||||
Notwithstanding any other provision of this License, if you modify the
|
|
||||||
Program, your modified version must prominently offer all users
|
|
||||||
interacting with it remotely through a computer network (if your
|
|
||||||
version supports such interaction) an opportunity to receive the
|
|
||||||
Corresponding Source of your version by providing access to the
|
|
||||||
Corresponding Source from a network server at no charge, through some
|
|
||||||
standard or customary means of facilitating copying of software. This
|
|
||||||
Corresponding Source shall include the Corresponding Source for any
|
|
||||||
work covered by version 3 of the GNU General Public License that is
|
|
||||||
incorporated pursuant to the following paragraph.
|
|
||||||
|
|
||||||
Notwithstanding any other provision of this License, you have
|
|
||||||
permission to link or combine any covered work with a work licensed
|
|
||||||
under version 3 of the GNU General Public License into a single
|
|
||||||
combined work, and to convey the resulting work. The terms of this
|
|
||||||
License will continue to apply to the part which is the covered work,
|
|
||||||
but the work with which it is combined will remain governed by version
|
|
||||||
3 of the GNU General Public License.
|
|
||||||
|
|
||||||
#### 14. Revised Versions of this License.
|
|
||||||
|
|
||||||
The Free Software Foundation may publish revised and/or new versions
|
|
||||||
of the GNU Affero General Public License from time to time. Such new
|
|
||||||
versions will be similar in spirit to the present version, but may
|
|
||||||
differ in detail to address new problems or concerns.
|
|
||||||
|
|
||||||
Each version is given a distinguishing version number. If the Program
|
|
||||||
specifies that a certain numbered version of the GNU Affero General
|
|
||||||
Public License "or any later version" applies to it, you have the
|
|
||||||
option of following the terms and conditions either of that numbered
|
|
||||||
version or of any later version published by the Free Software
|
|
||||||
Foundation. If the Program does not specify a version number of the
|
|
||||||
GNU Affero General Public License, you may choose any version ever
|
|
||||||
published by the Free Software Foundation.
|
|
||||||
|
|
||||||
If the Program specifies that a proxy can decide which future versions
|
|
||||||
of the GNU Affero General Public License can be used, that proxy's
|
|
||||||
public statement of acceptance of a version permanently authorizes you
|
|
||||||
to choose that version for the Program.
|
|
||||||
|
|
||||||
Later license versions may give you additional or different
|
|
||||||
permissions. However, no additional obligations are imposed on any
|
|
||||||
author or copyright holder as a result of your choosing to follow a
|
|
||||||
later version.
|
|
||||||
|
|
||||||
#### 15. Disclaimer of Warranty.
|
|
||||||
|
|
||||||
THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
|
|
||||||
APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
|
|
||||||
HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT
|
|
||||||
WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT
|
|
||||||
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
|
||||||
A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND
|
|
||||||
PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE
|
|
||||||
DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR
|
|
||||||
CORRECTION.
|
|
||||||
|
|
||||||
#### 16. Limitation of Liability.
|
|
||||||
|
|
||||||
IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
|
|
||||||
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR
|
|
||||||
CONVEYS THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
|
|
||||||
INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES
|
|
||||||
ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT
|
|
||||||
NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR
|
|
||||||
LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM
|
|
||||||
TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER
|
|
||||||
PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
|
|
||||||
|
|
||||||
#### 17. Interpretation of Sections 15 and 16.
|
|
||||||
|
|
||||||
If the disclaimer of warranty and limitation of liability provided
|
|
||||||
above cannot be given local legal effect according to their terms,
|
|
||||||
reviewing courts shall apply local law that most closely approximates
|
|
||||||
an absolute waiver of all civil liability in connection with the
|
|
||||||
Program, unless a warranty or assumption of liability accompanies a
|
|
||||||
copy of the Program in return for a fee.
|
|
||||||
|
|
||||||
END OF TERMS AND CONDITIONS
|
|
||||||
|
|
||||||
### How to Apply These Terms to Your New Programs
|
|
||||||
|
|
||||||
If you develop a new program, and you want it to be of the greatest
|
|
||||||
possible use to the public, the best way to achieve this is to make it
|
|
||||||
free software which everyone can redistribute and change under these
|
|
||||||
terms.
|
|
||||||
|
|
||||||
To do so, attach the following notices to the program. It is safest to
|
|
||||||
attach them to the start of each source file to most effectively state
|
|
||||||
the exclusion of warranty; and each file should have at least the
|
|
||||||
"copyright" line and a pointer to where the full notice is found.
|
|
||||||
|
|
||||||
<one line to give the program's name and a brief idea of what it does.>
|
|
||||||
Copyright (C) <year> <name of author>
|
|
||||||
|
|
||||||
This program is free software: you can redistribute it and/or modify
|
|
||||||
it under the terms of the GNU Affero General Public License as
|
|
||||||
published by the Free Software Foundation, either version 3 of the
|
|
||||||
License, or (at your option) any later version.
|
|
||||||
|
|
||||||
This program is distributed in the hope that it will be useful,
|
|
||||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
GNU Affero General Public License for more details.
|
|
||||||
|
|
||||||
You should have received a copy of the GNU Affero General Public License
|
|
||||||
along with this program. If not, see <https://www.gnu.org/licenses/>.
|
|
||||||
|
|
||||||
Also add information on how to contact you by electronic and paper
|
|
||||||
mail.
|
|
||||||
|
|
||||||
If your software can interact with users remotely through a computer
|
|
||||||
network, you should also make sure that it provides a way for users to
|
|
||||||
get its source. For example, if your program is a web application, its
|
|
||||||
interface could display a "Source" link that leads users to an archive
|
|
||||||
of the code. There are many ways you could offer source, and different
|
|
||||||
solutions will be better for different programs; see section 13 for
|
|
||||||
the specific requirements.
|
|
||||||
|
|
||||||
You should also get your employer (if you work as a programmer) or
|
|
||||||
school, if any, to sign a "copyright disclaimer" for the program, if
|
|
||||||
necessary. For more information on this, and how to apply and follow
|
|
||||||
the GNU AGPL, see <https://www.gnu.org/licenses/>.
|
|
131
README.md
131
README.md
|
@ -1,46 +1,95 @@
|
||||||
# PubSolarOS
|
[![NixOS](https://img.shields.io/badge/NixOS-unstable-blue.svg?style=flat&logo=NixOS&logoColor=white)](https://nixos.org)
|
||||||
|
[![MIT License](https://img.shields.io/github/license/divnix/devos)][mit]
|
||||||
|
[![Chat](https://img.shields.io/matrix/devos:nixos.org.svg?label=%23devos%3Anixos.org&logo=matrix&server_fqdn=matrix.org)][matrix]
|
||||||
|
|
||||||
Welcome to PubSolarOS, a very opiniated Linux (NixOS) distribution for the nerdy.
|
> #### ⚠ Advisory ⚠
|
||||||
|
> DevOS requires the [flakes][flakes] feature available via an _experimental_
|
||||||
|
> branch of [nix][nix]. Until nix 2.4 is released, this project
|
||||||
|
> should be considered unstable.
|
||||||
|
|
||||||
We're creating this distribution for our own personal use and fun, but
|
### Why?
|
||||||
take pride in our craft. As of 14.08.22 it's running on 14 physical devices,
|
Make an awesome template for NixOS users, with consideration for common tools like [home-manager][home-manager],
|
||||||
both `x86_64` and `aarch64`.
|
[devshell][devshell], and [more](./doc/integrations).
|
||||||
|
|
||||||
At its core, it's a NixOS installation running our configuration. The UX
|
### No. Why _flakes_?
|
||||||
decisions and the way the project is structured are what make it
|
Flakes are a part of an explicit push to improve [Nix's UX](https://github.com/NixOS/nix/blob/master/doc/manual/src/contributing/cli-guideline.md), and have become an integral part of that effort.
|
||||||
_PubSolarOS_:
|
|
||||||
|
|
||||||
- Reproducibility is king, and the future is with declarative and functional
|
They also make [Nix expressions](https://nixos.org/manual/nix/unstable/expressions/expression-syntax.html) easier to distribute and reuse with convient [flake references](https://github.com/NixOS/nix/blob/master/src/nix/flake.md#flake-references) for building or using packages, modules, and whole systems.
|
||||||
programming. Even if Nix does not turn out to be the end-all-be-all of
|
|
||||||
reproducible package management (Guix looks good), it has a plethora
|
|
||||||
of packages, a very active and helpful community, and very solid
|
|
||||||
software engineering practices.
|
|
||||||
- Because reproducibility is king, we're using nix flakes for locking flake
|
|
||||||
dependencies. [Digga](https://github.com/divnix/digga) is our flake
|
|
||||||
utility library, made by the wonderful people of the Divnix community.
|
|
||||||
- Physical devices are not shared anymore nowadays. Only seldomly will you
|
|
||||||
find shared devices that need more than one user account. For this
|
|
||||||
reason, only one user (excluding `root`) is assumed.
|
|
||||||
- Keyboard navigation wins where it matters; ergonomics, programmability,
|
|
||||||
efficiency, and speed. We use a tiling window manager (`sway`) and
|
|
||||||
prioritize cli-based solutions where sensible. The editor is `neovim`
|
|
||||||
configured to be just as opiniated as the operating system it is a part
|
|
||||||
of. For mailing, `neomutt` is the default, but we're more divided on
|
|
||||||
that part.
|
|
||||||
- We like new and shiny things, so we've moved to Wayland and pipewire.
|
|
||||||
- SICHERHEIT is written in capital letters at pub.solar, so we have first-
|
|
||||||
class disk-encryption support. Currently in the works is a paranoid
|
|
||||||
mode where the device can only hibernate (no more sleep or lockscreen)
|
|
||||||
so your data is locked any time you leave the device.
|
|
||||||
- Free software is better. If we can avoid it, nonfree software is avoided.
|
|
||||||
By default, `allowUnfree` is `false` so we don't ship non-free software
|
|
||||||
in a basic PubSolarOS ISO. However, nothing prevents you from using
|
|
||||||
as much non-free software as you like.
|
|
||||||
- Automation is better. The reproducibility of nix feels so much more
|
|
||||||
powerful once you're deploying your new configuration from your laptop
|
|
||||||
to all your other devices with one command. [We have an automated CI using drone](https://ci.pub.solar/pub-solar/os).
|
|
||||||
- Community is important. We just like working on this together, and it
|
|
||||||
feels really good to see our progress at the end of a
|
|
||||||
[hakken.irl](https://pub.solar/hakken) session.
|
|
||||||
|
|
||||||
To get started, take a look at the quick start guide in our docs.
|
## Getting Started
|
||||||
|
Check out the [guide](https://devos.divnix.com/start) to get up and running.
|
||||||
|
Also, have a look at [_flake.nix_](./flake.nix). If anything is not immediately
|
||||||
|
discoverable via "[`digga`][digga]'s [`mkFlake`][mk-flake],
|
||||||
|
please file a bug report.
|
||||||
|
|
||||||
|
### Status: Beta
|
||||||
|
Although this project has already matured quite a bit, especially through
|
||||||
|
recent outfactoring of [`digga`][digga], a fair amount of api polishing is still
|
||||||
|
expected. There are unstable versions (0._x_._x_) to help users keep track
|
||||||
|
of changes and progress, and a [`develop`](https://github.com/divnix/devos/tree/develop) branch for the brave 😜
|
||||||
|
|
||||||
|
## In the Wild
|
||||||
|
* @Pacman99: [Personal](https://gitlab.com/coffeetables/lower), [Server](https://gitlab.com/coffeetables/myrdd)
|
||||||
|
* [@danielphan2003](https://github.com/danielphan2003/flk) and make sure to also check out [devos-ext-lib][devos-ext-lib]
|
||||||
|
* [PubSolarOS](https://git.sr.ht/~b12f/pub-solar-os)
|
||||||
|
|
||||||
|
## Shoulders
|
||||||
|
This work does not reinvent the wheel. It stands on the [shoulders of the
|
||||||
|
following giants][giants]:
|
||||||
|
|
||||||
|
### :onion: — like the layers of an onion
|
||||||
|
- [`divnix/digga`][digga]
|
||||||
|
- [`gytis-ivaskevicius/flake-utils-plus`][fup]
|
||||||
|
- [`numtide/flake-utils`][fu]
|
||||||
|
|
||||||
|
### :family: — like family
|
||||||
|
- [`numtide/devshell`][devshell]
|
||||||
|
- [`serokell/deploy-rs`][deploy]
|
||||||
|
- [`berberman/nvfetcher`][nvfetcher]
|
||||||
|
- [`NixOS/nixpkgs`][nixpkgs]
|
||||||
|
|
||||||
|
:heart:
|
||||||
|
|
||||||
|
## Inspiration & Art
|
||||||
|
- [hlissner/dotfiles][dotfiles]
|
||||||
|
- [nix-user-chroot](https://github.com/nix-community/nix-user-chroot)
|
||||||
|
- [Nickel](https://github.com/tweag/nickel)
|
||||||
|
- [Awesome Nix](https://github.com/nix-community/awesome-nix)
|
||||||
|
- [devshell](https://github.com/numtide/devshell)
|
||||||
|
|
||||||
|
## Divnix
|
||||||
|
The divnix org is an open space that spontaneously formed out of "the Nix".
|
||||||
|
It is really just a place where otherwise unrelated people work
|
||||||
|
together and get stuff done.
|
||||||
|
|
||||||
|
It's a place to stop "geeking out in isolation" (or within company boundaries).
|
||||||
|
A place to experiment, learn together, and iterate quickly on best practices.
|
||||||
|
That's what it is.
|
||||||
|
|
||||||
|
It might eventually become a non-profit if that's not too complicated or, if those
|
||||||
|
goals are sufficiently upstreamed into "the Nix", dissolved.
|
||||||
|
|
||||||
|
# License
|
||||||
|
DevOS is licensed under the [MIT License][mit].
|
||||||
|
|
||||||
|
[community]: https://github.com/divnix/devos/tree/community
|
||||||
|
[core]: https://github.com/divnix/devos
|
||||||
|
[deploy]: https://github.com/serokell/deploy-rs
|
||||||
|
[devshell]: https://github.com/numtide/devshell
|
||||||
|
[digga]: https://github.com/divnix/digga
|
||||||
|
[dotfiles]: https://github.com/hlissner/dotfiles
|
||||||
|
[flake-doc]: https://github.com/NixOS/nix/blob/master/src/nix/flake.md
|
||||||
|
[flakes]: https://nixos.wiki/wiki/Flakes
|
||||||
|
[fu]: https://github.com/numtide/flake-utils
|
||||||
|
[fup]: https://github.com/gytis-ivaskevicius/flake-utils-plus
|
||||||
|
[giants]: https://en.wikipedia.org/wiki/Standing_on_the_shoulders_of_giants
|
||||||
|
[home-manager]: https://nix-community.github.io/home-manager
|
||||||
|
[mit]: https://mit-license.org
|
||||||
|
[mk-flake]: https://github.com/divnix/digga/tree/main/src/mkFlake
|
||||||
|
[nix]: https://nixos.org/manual/nix/stable
|
||||||
|
[nixos]: https://nixos.org/manual/nixos/stable
|
||||||
|
[nixpkgs]: https://github.com/NixOS/nixpkgs
|
||||||
|
[nvfetcher]: https://github.com/berberman/nvfetcher
|
||||||
|
[please]: https://github.com/nrdxp/devos/tree/nrd
|
||||||
|
[matrix]: https://matrix.to/#/#devos:nixos.org
|
||||||
|
[devos-ext-lib]: https://github.com/divnix/devos-ext-lib
|
||||||
|
|
28
default.nix
28
default.nix
|
@ -5,31 +5,27 @@ let
|
||||||
|
|
||||||
ciSystems = [
|
ciSystems = [
|
||||||
"aarch64-linux"
|
"aarch64-linux"
|
||||||
|
"i686-linux"
|
||||||
"x86_64-linux"
|
"x86_64-linux"
|
||||||
];
|
];
|
||||||
|
|
||||||
filterSystems =
|
filterSystems = lib.filterAttrs
|
||||||
lib.filterAttrs
|
|
||||||
(system: _: lib.elem system ciSystems);
|
(system: _: lib.elem system ciSystems);
|
||||||
|
|
||||||
recurseIntoAttrsRecursive = lib.mapAttrs (
|
recurseIntoAttrsRecursive = lib.mapAttrs (_: v:
|
||||||
_: v:
|
if lib.isAttrs v
|
||||||
if lib.isAttrs v
|
then recurseIntoAttrsRecursive (lib.recurseIntoAttrs v)
|
||||||
then recurseIntoAttrsRecursive (lib.recurseIntoAttrs v)
|
else v
|
||||||
else v
|
|
||||||
);
|
);
|
||||||
|
|
||||||
systemOutputs =
|
systemOutputs = lib.filterAttrs
|
||||||
lib.filterAttrs
|
(name: set: lib.isAttrs set
|
||||||
(
|
&& lib.any
|
||||||
name: set:
|
(system: set ? ${system} && name != "legacyPackages")
|
||||||
lib.isAttrs set
|
ciSystems
|
||||||
&& lib.any
|
|
||||||
(system: set ? ${system} && name != "legacyPackages")
|
|
||||||
ciSystems
|
|
||||||
)
|
)
|
||||||
default.outputs;
|
default.outputs;
|
||||||
|
|
||||||
ciDrvs = lib.mapAttrs (_: system: filterSystems system) systemOutputs;
|
ciDrvs = lib.mapAttrs (_: system: filterSystems system) systemOutputs;
|
||||||
in
|
in
|
||||||
(recurseIntoAttrsRecursive ciDrvs) // {shell = import ./shell.nix;}
|
(recurseIntoAttrsRecursive ciDrvs) // { shell = import ./shell.nix; }
|
||||||
|
|
|
@ -1,15 +1,18 @@
|
||||||
# TL;DR;
|
# Pull Requests
|
||||||
|
|
||||||
|
## TL;DR;
|
||||||
- **Target Branch**: `main`
|
- **Target Branch**: `main`
|
||||||
- **Merge Policy**: green check: merge away. yellow circle: have patience. red x: try again.
|
- **Merge Policy**: [`bors`][bors] is always right (→ `bors try`)
|
||||||
- **Docs**: every change set is expected to contain doc updates
|
- **Docs**: every changeset is expected to contain doc updates
|
||||||
- **Commit Msg**: be a poet! Comprehensive and explanatory commit messages
|
- **Commit Msg**: be a poet! Comprehensive and explanatory commit messages
|
||||||
should cover the motivation and use case in an easily understandable manner
|
should cover the motivation and use case in an easily understandable manner
|
||||||
even when read after a few months.
|
even when read after a few months.
|
||||||
- **Test Driven Development**: please default to test driven development you can
|
- **Test Driven Development**: please default to test driven development where possible.
|
||||||
make use of the `./examples` & `./e2e` and wire test up in the devshell.
|
|
||||||
|
|
||||||
### Within the Devshell (`nix develop`)
|
### Within the Devshell (`nix develop`)
|
||||||
|
|
||||||
- **Hooks**: please `git commit` within the devshell
|
- **Hooks**: please `git commit` within the devshell
|
||||||
- **Fail Early**: please run `check-all` from within the devshell on your local machine
|
- **Fail Early**: please run from within the devshell on your local machine:
|
||||||
|
- `nix flake check`
|
||||||
|
|
||||||
|
[bors]: https://bors.tech
|
||||||
|
|
||||||
|
|
|
@ -3,6 +3,8 @@
|
||||||
- [Introduction](../README.md)
|
- [Introduction](../README.md)
|
||||||
- [Quick Start](./start/index.md)
|
- [Quick Start](./start/index.md)
|
||||||
- [ISO](./start/iso.md)
|
- [ISO](./start/iso.md)
|
||||||
|
- [Bootstrapping](./start/bootstrapping.md)
|
||||||
|
- [From NixOS](./start/from-nixos.md)
|
||||||
- [Key Concepts](./concepts/index.md)
|
- [Key Concepts](./concepts/index.md)
|
||||||
- [Hosts](./concepts/hosts.md)
|
- [Hosts](./concepts/hosts.md)
|
||||||
- [Overrides](./concepts/overrides.md)
|
- [Overrides](./concepts/overrides.md)
|
||||||
|
@ -16,15 +18,11 @@
|
||||||
- [Concerns]()
|
- [Concerns]()
|
||||||
- [Secrets](./secrets.md)
|
- [Secrets](./secrets.md)
|
||||||
- [Tests](./tests.md)
|
- [Tests](./tests.md)
|
||||||
|
- [Helper Script – `bud`](./bud/index.md)
|
||||||
|
- [get](./bud/get.md)
|
||||||
- [Integrations](./integrations/index.md)
|
- [Integrations](./integrations/index.md)
|
||||||
- [Cachix](./integrations/cachix.md)
|
- [Cachix](./integrations/cachix.md)
|
||||||
- [Deploy RS](./integrations/deploy.md)
|
- [Deploy RS](./integrations/deploy.md)
|
||||||
- [NvFetcher](./integrations/nvfetcher.md)
|
- [NvFetcher](./integrations/nvfetcher.md)
|
||||||
- [Hercules CI](./integrations/hercules.md)
|
- [Hercules CI](./integrations/hercules.md)
|
||||||
- [API Reference](./api-reference.md)
|
|
||||||
- [Channels](./api-reference-channels.md)
|
|
||||||
- [Home](./api-reference-home.md)
|
|
||||||
- [Devshell](./api-reference-devshell.md)
|
|
||||||
- [NixOS](./api-reference-nixos.md)
|
|
||||||
- [Library Reference]()
|
|
||||||
- [Contributing](./CONTRIBUTING.md)
|
- [Contributing](./CONTRIBUTING.md)
|
||||||
|
|
|
@ -1,76 +0,0 @@
|
||||||
# Channels API Container
|
|
||||||
|
|
||||||
Configure your channels that you can use throughout your configurations.
|
|
||||||
|
|
||||||
> #### ⚠ Gotcha ⚠
|
|
||||||
>
|
|
||||||
> Devshell & (non-host-specific) Home-Manager `pkgs` instances are rendered off the
|
|
||||||
> `nixos.hostDefaults.channelName` (default) channel.
|
|
||||||
|
|
||||||
## channels
|
|
||||||
|
|
||||||
nixpkgs channels to create
|
|
||||||
|
|
||||||
_*Type*_:
|
|
||||||
attribute set of submodules or path convertible to it
|
|
||||||
|
|
||||||
_*Default*_
|
|
||||||
|
|
||||||
```
|
|
||||||
{}
|
|
||||||
```
|
|
||||||
|
|
||||||
## channels.\<name\>.config
|
|
||||||
|
|
||||||
nixpkgs config for this channel
|
|
||||||
|
|
||||||
_*Type*_:
|
|
||||||
attribute set or path convertible to it
|
|
||||||
|
|
||||||
_*Default*_
|
|
||||||
|
|
||||||
```
|
|
||||||
{}
|
|
||||||
```
|
|
||||||
|
|
||||||
## channels.\<name\>.input
|
|
||||||
|
|
||||||
nixpkgs flake input to use for this channel
|
|
||||||
|
|
||||||
_*Type*_:
|
|
||||||
nix flake
|
|
||||||
|
|
||||||
_*Default*_
|
|
||||||
|
|
||||||
```
|
|
||||||
"self.inputs.<name>"
|
|
||||||
```
|
|
||||||
|
|
||||||
## channels.\<name\>.overlays
|
|
||||||
|
|
||||||
overlays to apply to this channel
|
|
||||||
these will get exported under the 'overlays' flake output
|
|
||||||
as \<channel\>/\<name\> and any overlay pulled from \<inputs\>
|
|
||||||
will be filtered out
|
|
||||||
|
|
||||||
_*Type*_:
|
|
||||||
list of valid Nixpkgs overlay or path convertible to its or anything convertible to it or path convertible to it
|
|
||||||
|
|
||||||
_*Default*_
|
|
||||||
|
|
||||||
```
|
|
||||||
[]
|
|
||||||
```
|
|
||||||
|
|
||||||
## channels.\<name\>.patches
|
|
||||||
|
|
||||||
patches to apply to this channel
|
|
||||||
|
|
||||||
_*Type*_:
|
|
||||||
list of paths
|
|
||||||
|
|
||||||
_*Default*_
|
|
||||||
|
|
||||||
```
|
|
||||||
[]
|
|
||||||
```
|
|
|
@ -1,59 +0,0 @@
|
||||||
# Devshell API Container
|
|
||||||
|
|
||||||
Configure your devshell module collections of your environment.
|
|
||||||
|
|
||||||
## devshell
|
|
||||||
|
|
||||||
Modules to include in your DevOS shell. the `modules` argument
|
|
||||||
will be exported under the `devshellModules` output
|
|
||||||
|
|
||||||
_*Type*_:
|
|
||||||
submodule or path convertible to it
|
|
||||||
|
|
||||||
_*Default*_
|
|
||||||
|
|
||||||
```
|
|
||||||
{}
|
|
||||||
```
|
|
||||||
|
|
||||||
## devshell.exportedModules
|
|
||||||
|
|
||||||
modules to include in all hosts and export to devshellModules output
|
|
||||||
|
|
||||||
_*Type*_:
|
|
||||||
list of valid module or path convertible to its or anything convertible to it
|
|
||||||
|
|
||||||
_*Default*_
|
|
||||||
|
|
||||||
```
|
|
||||||
[]
|
|
||||||
```
|
|
||||||
|
|
||||||
## devshell.externalModules
|
|
||||||
|
|
||||||
The `externalModules` option has been removed.
|
|
||||||
Any modules that should be exported should be defined with the `exportedModules`
|
|
||||||
option and all other modules should just go into the `modules` option.
|
|
||||||
|
|
||||||
_*Type*_:
|
|
||||||
list of valid modules or anything convertible to it
|
|
||||||
|
|
||||||
_*Default*_
|
|
||||||
|
|
||||||
```
|
|
||||||
[]
|
|
||||||
```
|
|
||||||
|
|
||||||
## devshell.modules
|
|
||||||
|
|
||||||
modules to include that won't be exported
|
|
||||||
meant importing modules from external flakes
|
|
||||||
|
|
||||||
_*Type*_:
|
|
||||||
list of valid modules or anything convertible to it or path convertible to it
|
|
||||||
|
|
||||||
_*Default*_
|
|
||||||
|
|
||||||
```
|
|
||||||
[]
|
|
||||||
```
|
|
|
@ -1,97 +0,0 @@
|
||||||
# Home-Manager API Container
|
|
||||||
|
|
||||||
Configure your home manager modules, profiles & suites.
|
|
||||||
|
|
||||||
## home
|
|
||||||
|
|
||||||
hosts, modules, suites, and profiles for home-manager
|
|
||||||
|
|
||||||
_*Type*_:
|
|
||||||
submodule or path convertible to it
|
|
||||||
|
|
||||||
_*Default*_
|
|
||||||
|
|
||||||
```
|
|
||||||
{}
|
|
||||||
```
|
|
||||||
|
|
||||||
## home.exportedModules
|
|
||||||
|
|
||||||
modules to include in all hosts and export to homeModules output
|
|
||||||
|
|
||||||
_*Type*_:
|
|
||||||
list of valid modules or anything convertible to it or path convertible to it
|
|
||||||
|
|
||||||
_*Default*_
|
|
||||||
|
|
||||||
```
|
|
||||||
[]
|
|
||||||
```
|
|
||||||
|
|
||||||
## home.externalModules
|
|
||||||
|
|
||||||
The `externalModules` option has been removed.
|
|
||||||
Any modules that should be exported should be defined with the `exportedModules`
|
|
||||||
option and all other modules should just go into the `modules` option.
|
|
||||||
|
|
||||||
_*Type*_:
|
|
||||||
list of valid modules or anything convertible to it
|
|
||||||
|
|
||||||
_*Default*_
|
|
||||||
|
|
||||||
```
|
|
||||||
[]
|
|
||||||
```
|
|
||||||
|
|
||||||
## home.importables
|
|
||||||
|
|
||||||
Packages of paths to be passed to modules as `specialArgs`.
|
|
||||||
|
|
||||||
_*Type*_:
|
|
||||||
attribute set
|
|
||||||
|
|
||||||
_*Default*_
|
|
||||||
|
|
||||||
```
|
|
||||||
{}
|
|
||||||
```
|
|
||||||
|
|
||||||
## home.importables.suites
|
|
||||||
|
|
||||||
collections of profiles
|
|
||||||
|
|
||||||
_*Type*_:
|
|
||||||
null or attribute set of list of paths or anything convertible to its or path convertible to it
|
|
||||||
|
|
||||||
_*Default*_
|
|
||||||
|
|
||||||
```
|
|
||||||
null
|
|
||||||
```
|
|
||||||
|
|
||||||
## home.modules
|
|
||||||
|
|
||||||
modules to include that won't be exported
|
|
||||||
meant importing modules from external flakes
|
|
||||||
|
|
||||||
_*Type*_:
|
|
||||||
list of valid modules or anything convertible to it or path convertible to it
|
|
||||||
|
|
||||||
_*Default*_
|
|
||||||
|
|
||||||
```
|
|
||||||
[]
|
|
||||||
```
|
|
||||||
|
|
||||||
## home.users
|
|
||||||
|
|
||||||
HM users that can be deployed portably without a host.
|
|
||||||
|
|
||||||
_*Type*_:
|
|
||||||
attribute set of HM user configs
|
|
||||||
|
|
||||||
_*Default*_
|
|
||||||
|
|
||||||
```
|
|
||||||
{}
|
|
||||||
```
|
|
|
@ -1,191 +0,0 @@
|
||||||
# NixOS API Container
|
|
||||||
|
|
||||||
Configure your nixos modules, profiles & suites.
|
|
||||||
|
|
||||||
## nixos
|
|
||||||
|
|
||||||
hosts, modules, suites, and profiles for NixOS
|
|
||||||
|
|
||||||
_*Type*_:
|
|
||||||
submodule or path convertible to it
|
|
||||||
|
|
||||||
_*Default*_
|
|
||||||
|
|
||||||
```
|
|
||||||
{}
|
|
||||||
```
|
|
||||||
|
|
||||||
## nixos.hostDefaults
|
|
||||||
|
|
||||||
Defaults for all hosts.
|
|
||||||
the modules passed under hostDefaults will be exported
|
|
||||||
to the 'nixosModules' flake output.
|
|
||||||
They will also be added to all hosts.
|
|
||||||
|
|
||||||
_*Type*_:
|
|
||||||
submodule
|
|
||||||
|
|
||||||
_*Default*_
|
|
||||||
|
|
||||||
```
|
|
||||||
{}
|
|
||||||
```
|
|
||||||
|
|
||||||
## nixos.hostDefaults.channelName
|
|
||||||
|
|
||||||
Channel this host should follow
|
|
||||||
|
|
||||||
_*Type*_:
|
|
||||||
channel defined in `channels`
|
|
||||||
|
|
||||||
## nixos.hostDefaults.exportedModules
|
|
||||||
|
|
||||||
modules to include in all hosts and export to nixosModules output
|
|
||||||
|
|
||||||
_*Type*_:
|
|
||||||
list of valid modules or anything convertible to it or path convertible to it
|
|
||||||
|
|
||||||
_*Default*_
|
|
||||||
|
|
||||||
```
|
|
||||||
[]
|
|
||||||
```
|
|
||||||
|
|
||||||
## nixos.hostDefaults.externalModules
|
|
||||||
|
|
||||||
The `externalModules` option has been removed.
|
|
||||||
Any modules that should be exported should be defined with the `exportedModules`
|
|
||||||
option and all other modules should just go into the `modules` option.
|
|
||||||
|
|
||||||
_*Type*_:
|
|
||||||
list of valid modules or anything convertible to it
|
|
||||||
|
|
||||||
_*Default*_
|
|
||||||
|
|
||||||
```
|
|
||||||
[]
|
|
||||||
```
|
|
||||||
|
|
||||||
## nixos.hostDefaults.modules
|
|
||||||
|
|
||||||
modules to include that won't be exported
|
|
||||||
meant importing modules from external flakes
|
|
||||||
|
|
||||||
_*Type*_:
|
|
||||||
list of valid modules or anything convertible to it or path convertible to it
|
|
||||||
|
|
||||||
_*Default*_
|
|
||||||
|
|
||||||
```
|
|
||||||
[]
|
|
||||||
```
|
|
||||||
|
|
||||||
## nixos.hostDefaults.system
|
|
||||||
|
|
||||||
system for this host
|
|
||||||
|
|
||||||
_*Type*_:
|
|
||||||
null or system defined in `supportedSystems`
|
|
||||||
|
|
||||||
_*Default*_
|
|
||||||
|
|
||||||
```
|
|
||||||
null
|
|
||||||
```
|
|
||||||
|
|
||||||
## nixos.hosts
|
|
||||||
|
|
||||||
configurations to include in the nixosConfigurations output
|
|
||||||
|
|
||||||
_*Type*_:
|
|
||||||
attribute set of submodules
|
|
||||||
|
|
||||||
_*Default*_
|
|
||||||
|
|
||||||
```
|
|
||||||
{}
|
|
||||||
```
|
|
||||||
|
|
||||||
## nixos.hosts.\<name\>.channelName
|
|
||||||
|
|
||||||
Channel this host should follow
|
|
||||||
|
|
||||||
_*Type*_:
|
|
||||||
null or channel defined in `channels`
|
|
||||||
|
|
||||||
_*Default*_
|
|
||||||
|
|
||||||
```
|
|
||||||
null
|
|
||||||
```
|
|
||||||
|
|
||||||
## nixos.hosts.\<name\>.modules
|
|
||||||
|
|
||||||
modules to include
|
|
||||||
|
|
||||||
_*Type*_:
|
|
||||||
list of valid modules or anything convertible to it or path convertible to it
|
|
||||||
|
|
||||||
_*Default*_
|
|
||||||
|
|
||||||
```
|
|
||||||
[]
|
|
||||||
```
|
|
||||||
|
|
||||||
## nixos.hosts.\<name\>.system
|
|
||||||
|
|
||||||
system for this host
|
|
||||||
|
|
||||||
_*Type*_:
|
|
||||||
null or system defined in `supportedSystems`
|
|
||||||
|
|
||||||
_*Default*_
|
|
||||||
|
|
||||||
```
|
|
||||||
null
|
|
||||||
```
|
|
||||||
|
|
||||||
## nixos.hosts.\<name\>.tests
|
|
||||||
|
|
||||||
tests to run
|
|
||||||
|
|
||||||
_*Type*_:
|
|
||||||
list of valid NixOS test or path convertible to its or anything convertible to it
|
|
||||||
|
|
||||||
_*Default*_
|
|
||||||
|
|
||||||
```
|
|
||||||
[]
|
|
||||||
```
|
|
||||||
|
|
||||||
_*Example*_
|
|
||||||
|
|
||||||
```
|
|
||||||
{"_type":"literalExpression","text":"[\n {\n name = \"testname1\";\n machine = { ... };\n testScript = ''\n # ...\n '';\n }\n ({ corutils, writers, ... }: {\n name = \"testname2\";\n machine = { ... };\n testScript = ''\n # ...\n '';\n })\n ./path/to/test.nix\n];\n"}
|
|
||||||
```
|
|
||||||
|
|
||||||
## nixos.importables
|
|
||||||
|
|
||||||
Packages of paths to be passed to modules as `specialArgs`.
|
|
||||||
|
|
||||||
_*Type*_:
|
|
||||||
attribute set
|
|
||||||
|
|
||||||
_*Default*_
|
|
||||||
|
|
||||||
```
|
|
||||||
{}
|
|
||||||
```
|
|
||||||
|
|
||||||
## nixos.importables.suites
|
|
||||||
|
|
||||||
collections of profiles
|
|
||||||
|
|
||||||
_*Type*_:
|
|
||||||
null or attribute set of list of paths or anything convertible to its or path convertible to it
|
|
||||||
|
|
||||||
_*Default*_
|
|
||||||
|
|
||||||
```
|
|
||||||
null
|
|
||||||
```
|
|
|
@ -1,63 +0,0 @@
|
||||||
# Top Level API
|
|
||||||
|
|
||||||
`digga`'s top level API. API Containers are documented in their respective sub-chapter:
|
|
||||||
|
|
||||||
- [Channels](./api-reference-channels.md)
|
|
||||||
- [Home](./api-reference-home.md)
|
|
||||||
- [Devshell](./api-reference-devshell.md)
|
|
||||||
- [NixOS](./api-reference-nixos.md)
|
|
||||||
- [Darwin](./api-reference-darwin.md)
|
|
||||||
|
|
||||||
## channelsConfig
|
|
||||||
|
|
||||||
nixpkgs config for all channels
|
|
||||||
|
|
||||||
_*Type*_:
|
|
||||||
attribute set or path convertible to it
|
|
||||||
|
|
||||||
_*Default*_
|
|
||||||
|
|
||||||
```
|
|
||||||
{}
|
|
||||||
```
|
|
||||||
|
|
||||||
## inputs
|
|
||||||
|
|
||||||
The flake's inputs
|
|
||||||
|
|
||||||
_*Type*_:
|
|
||||||
attribute set of nix flakes
|
|
||||||
|
|
||||||
## outputsBuilder
|
|
||||||
|
|
||||||
builder for flake system-spaced outputs
|
|
||||||
The builder gets passed an attrset of all channels
|
|
||||||
|
|
||||||
_*Type*_:
|
|
||||||
function that evaluates to a(n) attribute set or path convertible to it
|
|
||||||
|
|
||||||
_*Default*_
|
|
||||||
|
|
||||||
```
|
|
||||||
"channels: { }"
|
|
||||||
```
|
|
||||||
|
|
||||||
## self
|
|
||||||
|
|
||||||
The flake to create the DevOS outputs for
|
|
||||||
|
|
||||||
_*Type*_:
|
|
||||||
nix flake
|
|
||||||
|
|
||||||
## supportedSystems
|
|
||||||
|
|
||||||
The systems supported by this flake
|
|
||||||
|
|
||||||
_*Type*_:
|
|
||||||
list of strings
|
|
||||||
|
|
||||||
_*Default*_
|
|
||||||
|
|
||||||
```
|
|
||||||
["aarch64-linux","aarch64-darwin","x86_64-darwin","x86_64-linux"]
|
|
||||||
```
|
|
|
@ -1,10 +1,6 @@
|
||||||
[book]
|
[book]
|
||||||
authors = [
|
authors = ["Timothy DeHerrera"]
|
||||||
"Timothy DeHerrera",
|
|
||||||
"Parthiv Seetharaman",
|
|
||||||
"David Arnold",
|
|
||||||
]
|
|
||||||
language = "en"
|
language = "en"
|
||||||
multilingual = false
|
multilingual = false
|
||||||
src = "."
|
src = "."
|
||||||
title = "PubSolarOS documentation"
|
title = "devos docs"
|
||||||
|
|
10
doc/bud/get.md
Normal file
10
doc/bud/get.md
Normal file
|
@ -0,0 +1,10 @@
|
||||||
|
# get
|
||||||
|
The `get` subcommand is useful for getting a bare copy of devos without the
|
||||||
|
git history.
|
||||||
|
|
||||||
|
## Usage
|
||||||
|
```sh
|
||||||
|
bud get DEST-DIR
|
||||||
|
```
|
||||||
|
|
||||||
|
If DEST-DIR is ommitted, it defaults to _./devos_.
|
24
doc/bud/index.md
Normal file
24
doc/bud/index.md
Normal file
|
@ -0,0 +1,24 @@
|
||||||
|
# [`bud`][bud] command
|
||||||
|
The template incudes a convenient script for managing your system called [`bud`][bud].
|
||||||
|
|
||||||
|
It is a portable and highly composable system control tool that work anywhere on your host
|
||||||
|
or in the flake's devshell.
|
||||||
|
|
||||||
|
Although it comes with some predefined standard helpers,
|
||||||
|
it is very extensible and you are encouraged to write your own script snippets
|
||||||
|
to ease your workflows. An example is the bud module for a `get` command that
|
||||||
|
comes included with `devos`.
|
||||||
|
|
||||||
|
While writing scripts you can convenientely access smart environment variables
|
||||||
|
that can tell the current architecture, user or host name, among others, regardless
|
||||||
|
wether you invoke `bud` within the devshell or as the system-wide installed `bud`.
|
||||||
|
|
||||||
|
For details, please review the [bud repo][bud].
|
||||||
|
|
||||||
|
## Usage
|
||||||
|
```sh
|
||||||
|
bud help
|
||||||
|
```
|
||||||
|
|
||||||
|
|
||||||
|
[bud]: https://github.com/divnix/bud
|
|
@ -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),
|
This is a good place to import sets of profiles, called [suites](./suites.md),
|
||||||
that you intend to use on your machine.
|
that you intend to use on your machine.
|
||||||
|
|
||||||
|
|
||||||
## Example
|
## Example
|
||||||
|
|
||||||
flake.nix:
|
flake.nix:
|
||||||
|
|
||||||
```nix
|
```nix
|
||||||
{
|
{
|
||||||
nixos = {
|
nixos = {
|
||||||
|
@ -47,7 +47,6 @@ flake.nix:
|
||||||
```
|
```
|
||||||
|
|
||||||
hosts/librem.nix:
|
hosts/librem.nix:
|
||||||
|
|
||||||
```nix
|
```nix
|
||||||
{ suites, ... }:
|
{ suites, ... }:
|
||||||
{
|
{
|
||||||
|
|
|
@ -1,10 +1,8 @@
|
||||||
# Overrides
|
# Overrides
|
||||||
|
|
||||||
Each NixOS host follows one channel. But many times it is useful to get packages
|
Each NixOS host follows one channel. But many times it is useful to get packages
|
||||||
or modules from different channels.
|
or modules from different channels.
|
||||||
|
|
||||||
## Packages
|
## Packages
|
||||||
|
|
||||||
You can make use of `overlays/overrides.nix` to override specific packages in the
|
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
|
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.
|
of how any overlay can get `channels` as their first argument.
|
||||||
|
@ -12,7 +10,6 @@ of how any overlay can get `channels` as their first argument.
|
||||||
You can add overlays to any channel to override packages from other channels.
|
You can add overlays to any channel to override packages from other channels.
|
||||||
|
|
||||||
Pulling the manix package from the `latest` channel:
|
Pulling the manix package from the `latest` channel:
|
||||||
|
|
||||||
```nix
|
```nix
|
||||||
channels: final: prev: {
|
channels: final: prev: {
|
||||||
__dontExport = true;
|
__dontExport = true;
|
||||||
|
@ -26,12 +23,11 @@ overrides and the property is already set for you.
|
||||||
|
|
||||||
## Modules
|
## Modules
|
||||||
|
|
||||||
You can also pull modules from other channels. All modules have access to the
|
You can also pull modules from other channels. All modules have access to the
|
||||||
`modulesPath` for each channel as `<channelName>ModulesPath`. And you can use
|
`modulesPath` for each channel as `<channelName>ModulesPath`. And you can use
|
||||||
`disabledModules` to remove modules from the current channel.
|
`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:
|
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
|
```nix
|
||||||
{ latestModulesPath }:
|
{ latestModulesPath }:
|
||||||
{
|
{
|
||||||
|
@ -41,7 +37,6 @@ To pull zsh module from the `latest` channel this code can be placed in any modu
|
||||||
```
|
```
|
||||||
|
|
||||||
> ##### _Note:_
|
> ##### _Note:_
|
||||||
>
|
|
||||||
> Sometimes a modules name will change from one branch to another.
|
> Sometimes a modules name will change from one branch to another.
|
||||||
|
|
||||||
[nixpkgs-modules]: https://github.com/NixOS/nixpkgs/tree/master/nixos/modules
|
[nixpkgs-modules]: https://github.com/NixOS/nixpkgs/tree/master/nixos/modules
|
||||||
|
|
|
@ -6,23 +6,20 @@ built into the NixOS module system for a reason: to elegantly provide a clear
|
||||||
separation of concerns.
|
separation of concerns.
|
||||||
|
|
||||||
## Creation
|
## Creation
|
||||||
|
|
||||||
Profiles are created with the `rakeLeaves` function which recursively collects
|
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`
|
`.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
|
in them. You end up with an attribute set with leaves(paths to profiles) or
|
||||||
nodes(attrsets leading to more nodes or leaves).
|
nodes(attrsets leading to more nodes or leaves).
|
||||||
|
|
||||||
A profile is used for quick modularization of [interelated bits](./profiles.md#subprofiles).
|
A profile is used for quick modularization of [interelated bits](./profiles.md#subprofiles).
|
||||||
|
|
||||||
> ##### _Notes:_
|
> ##### _Notes:_
|
||||||
>
|
> * For _declaring_ module options, there's the [modules](../outputs/modules.md) directory.
|
||||||
> - For _declaring_ module options, there's the [modules](../outputs/modules.md) directory.
|
> * This directory takes inspiration from
|
||||||
> - This directory takes inspiration from
|
|
||||||
> [upstream](https://github.com/NixOS/nixpkgs/tree/master/nixos/modules/profiles)
|
> [upstream](https://github.com/NixOS/nixpkgs/tree/master/nixos/modules/profiles)
|
||||||
> .
|
> .
|
||||||
|
|
||||||
### Nested profiles
|
### Nested profiles
|
||||||
|
|
||||||
Profiles can be nested in attribute sets due to the recursive nature of `rakeLeaves`.
|
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
|
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
|
sometimes useful to have a `common` profile that has high level concerns related
|
||||||
|
@ -31,7 +28,6 @@ to all its sister profiles.
|
||||||
### Example
|
### Example
|
||||||
|
|
||||||
profiles/develop/common.nix:
|
profiles/develop/common.nix:
|
||||||
|
|
||||||
```nix
|
```nix
|
||||||
{
|
{
|
||||||
imports = [ ./zsh ];
|
imports = [ ./zsh ];
|
||||||
|
@ -40,7 +36,6 @@ profiles/develop/common.nix:
|
||||||
```
|
```
|
||||||
|
|
||||||
profiles/develop/zsh.nix:
|
profiles/develop/zsh.nix:
|
||||||
|
|
||||||
```nix
|
```nix
|
||||||
{ ... }:
|
{ ... }:
|
||||||
{
|
{
|
||||||
|
@ -50,7 +45,6 @@ profiles/develop/zsh.nix:
|
||||||
```
|
```
|
||||||
|
|
||||||
The examples above will end up with a profiles set like this:
|
The examples above will end up with a profiles set like this:
|
||||||
|
|
||||||
```nix
|
```nix
|
||||||
{
|
{
|
||||||
develop = {
|
develop = {
|
||||||
|
@ -61,7 +55,6 @@ The examples above will end up with a profiles set like this:
|
||||||
```
|
```
|
||||||
|
|
||||||
## Conclusion
|
## Conclusion
|
||||||
|
|
||||||
Profiles are the most important concept in DevOS. They allow us to keep our
|
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
|
Nix expressions self contained and modular. This way we can maximize reuse
|
||||||
across hosts while minimizing boilerplate. Remember, anything machine
|
across hosts while minimizing boilerplate. Remember, anything machine
|
||||||
|
|
|
@ -1,5 +1,4 @@
|
||||||
# Suites
|
# Suites
|
||||||
|
|
||||||
Suites provide a mechanism for users to easily combine and name collections of
|
Suites provide a mechanism for users to easily combine and name collections of
|
||||||
profiles.
|
profiles.
|
||||||
|
|
||||||
|
@ -9,7 +8,6 @@ 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.
|
in `suites` are flattened and type-checked as paths.
|
||||||
|
|
||||||
## Definition
|
## Definition
|
||||||
|
|
||||||
```nix
|
```nix
|
||||||
rec {
|
rec {
|
||||||
workstation = [ profiles.develop profiles.graphical users.nixos ];
|
workstation = [ profiles.develop profiles.graphical users.nixos ];
|
||||||
|
@ -18,9 +16,7 @@ rec {
|
||||||
```
|
```
|
||||||
|
|
||||||
## Usage
|
## Usage
|
||||||
|
|
||||||
`hosts/my-laptop.nix`:
|
`hosts/my-laptop.nix`:
|
||||||
|
|
||||||
```nix
|
```nix
|
||||||
{ suites, ... }:
|
{ suites, ... }:
|
||||||
{
|
{
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
> ##### _Note:_
|
> ##### _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]
|
> Since recently [portable home configurations][portableuser]
|
||||||
> that are not bound to any specific host are a thing.
|
> that are not bound to any specific host are a thing.
|
||||||
|
|
||||||
|
@ -9,12 +8,11 @@
|
||||||
Users are a special case of [profiles](profiles.md) that define system
|
Users are a special case of [profiles](profiles.md) that define system
|
||||||
users and [home-manager][home-manager] configurations. For your convenience,
|
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
|
home manager is wired in by default so all you have to worry about is declaring
|
||||||
your users.
|
your users. For a fully fleshed out example, check out the developers personal
|
||||||
|
[branch](https://github.com/divnix/devos/tree/nrd/users/nrd/default.nix).
|
||||||
|
|
||||||
## Basic Usage
|
## Basic Usage
|
||||||
|
|
||||||
`users/myuser/default.nix`:
|
`users/myuser/default.nix`:
|
||||||
|
|
||||||
```nix
|
```nix
|
||||||
{ ... }:
|
{ ... }:
|
||||||
{
|
{
|
||||||
|
@ -30,7 +28,6 @@ your users.
|
||||||
```
|
```
|
||||||
|
|
||||||
## Home Manager
|
## Home Manager
|
||||||
|
|
||||||
Home Manager support follows the same principles as regular nixos configurations,
|
Home Manager support follows the same principles as regular nixos configurations,
|
||||||
it even gets its own namespace in your `flake.nix` as `home`.
|
it even gets its own namespace in your `flake.nix` as `home`.
|
||||||
|
|
||||||
|
@ -40,9 +37,7 @@ User profiles can be collected in a similar fashion as system ones into a `suite
|
||||||
argument that gets passed to your home-manager users.
|
argument that gets passed to your home-manager users.
|
||||||
|
|
||||||
### Example
|
### Example
|
||||||
|
|
||||||
`flake.nix`
|
`flake.nix`
|
||||||
|
|
||||||
```nix
|
```nix
|
||||||
{
|
{
|
||||||
home.users.nixos = { suites, ... }: {
|
home.users.nixos = { suites, ... }: {
|
||||||
|
@ -51,14 +46,25 @@ argument that gets passed to your home-manager users.
|
||||||
}
|
}
|
||||||
```
|
```
|
||||||
|
|
||||||
|
|
||||||
## External Usage
|
## External Usage
|
||||||
|
|
||||||
You can easily use the defined home-manager configurations outside of NixOS
|
You can easily use the defined home-manager configurations outside of NixOS
|
||||||
using the `homeConfigurations` flake output.
|
using the `homeConfigurations` flake output. The [bud](../bud/index.md) helper
|
||||||
|
script makes this even easier.
|
||||||
|
|
||||||
This is great for keeping your environment consistent across Unix-like systems,
|
This is great for keeping your environment consistent across Unix systems,
|
||||||
including macOS.
|
including OSX.
|
||||||
|
|
||||||
|
### From within the projects devshell:
|
||||||
|
```sh
|
||||||
|
# builds the nixos user defined in the NixOS host
|
||||||
|
bud home NixOS nixos
|
||||||
|
|
||||||
|
# build and activate
|
||||||
|
bud home NixOS nixos switch
|
||||||
|
```
|
||||||
|
|
||||||
|
### Manually from outside the project:
|
||||||
```sh
|
```sh
|
||||||
# build
|
# build
|
||||||
nix build "github:divnix/devos#homeConfigurations.nixos@NixOS.home.activationPackage"
|
nix build "github:divnix/devos#homeConfigurations.nixos@NixOS.home.activationPackage"
|
||||||
|
@ -68,5 +74,5 @@ nix build "github:divnix/devos#homeConfigurations.nixos@NixOS.home.activationPac
|
||||||
```
|
```
|
||||||
|
|
||||||
[home-manager]: https://nix-community.github.io/home-manager
|
[home-manager]: https://nix-community.github.io/home-manager
|
||||||
[modules-list]: https://github.com/divnix/digga/tree/main/users/modules/module-list.nix
|
[modules-list]: https://github.com/divnix/devos/tree/main/users/modules/module-list.nix
|
||||||
[portableuser]: https://digga.divnix.com/api-reference-home.html#homeusers
|
[portableuser]: https://digga.divnix.com/api-reference-home.html#homeusers
|
||||||
|
|
|
@ -1,5 +1,4 @@
|
||||||
# Cachix
|
# Cachix
|
||||||
|
|
||||||
The system will automatically pull a cachix.nix at the root if one exists.
|
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
|
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
|
inclined to keep the root clean, you can drop any generated files in the
|
||||||
|
|
|
@ -1,5 +1,4 @@
|
||||||
# deploy-rs
|
# deploy-rs
|
||||||
|
|
||||||
[Deploy-rs][d-rs] is a tool for managing NixOS remote machines. It was
|
[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
|
chosen for devos after the author experienced some frustrations with the
|
||||||
stateful nature of nixops' db. It was also designed from scratch to support
|
stateful nature of nixops' db. It was also designed from scratch to support
|
||||||
|
@ -12,7 +11,6 @@ the command line.
|
||||||
## Usage
|
## Usage
|
||||||
|
|
||||||
Just add your ssh key to the host:
|
Just add your ssh key to the host:
|
||||||
|
|
||||||
```nix
|
```nix
|
||||||
{ ... }:
|
{ ... }:
|
||||||
{
|
{
|
||||||
|
@ -23,7 +21,6 @@ Just add your ssh key to the host:
|
||||||
```
|
```
|
||||||
|
|
||||||
And the private key to your user:
|
And the private key to your user:
|
||||||
|
|
||||||
```nix
|
```nix
|
||||||
{ ... }:
|
{ ... }:
|
||||||
{
|
{
|
||||||
|
@ -42,20 +39,16 @@ And the private key to your user:
|
||||||
```
|
```
|
||||||
|
|
||||||
And run the deployment:
|
And run the deployment:
|
||||||
|
|
||||||
```sh
|
```sh
|
||||||
deploy '.#hostName' --hostname host.example.com
|
deploy '.#hostName' --hostname host.example.com
|
||||||
```
|
```
|
||||||
|
|
||||||
> ##### _Note:_
|
> ##### _Note:_
|
||||||
>
|
|
||||||
> Your user will need **passwordless** sudo access
|
> Your user will need **passwordless** sudo access
|
||||||
|
|
||||||
### Home Manager
|
### Home Manager
|
||||||
|
|
||||||
Digga's `lib.mkDeployNodes` provides only `system` profile.
|
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:
|
In order to deploy your `home-manager` configuration you should provide additional profile(s) to deploy-rs config:
|
||||||
|
|
||||||
```nix
|
```nix
|
||||||
# Initially, this line looks like this: deploy.nodes = digga.lib.mkDeployNodes self.nixosConfigurations { };
|
# Initially, this line looks like this: deploy.nodes = digga.lib.mkDeployNodes self.nixosConfigurations { };
|
||||||
deploy.nodes = digga.lib.mkDeployNodes self.nixosConfigurations
|
deploy.nodes = digga.lib.mkDeployNodes self.nixosConfigurations
|
||||||
|
@ -74,9 +67,10 @@ deploy.nodes = digga.lib.mkDeployNodes self.nixosConfigurations
|
||||||
};
|
};
|
||||||
```
|
```
|
||||||
|
|
||||||
Substitute `<HOSTNAME>`, `<HM_PROFILE>` and `<YOUR_USERNAME>` placeholders (omitting the `<>`).
|
Substitute `<HOSTNAME>`, `<HM_PROFILE>` and `<YOUR_USERNAME>` placeholders (omitting the `<>`).
|
||||||
|
|
||||||
`<ANOTHER_HM_PROFILE>` is there to illustrate deploying multiple `home-manager` configurations. Either substitute those as well,
|
`<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.
|
or remove them altogether. Don't forget the `profileOrder` variable.
|
||||||
|
|
||||||
|
|
||||||
[d-rs]: https://github.com/serokell/deploy-rs
|
[d-rs]: https://github.com/serokell/deploy-rs
|
||||||
|
|
|
@ -1,5 +1,4 @@
|
||||||
# Hercules CI
|
# Hercules CI
|
||||||
|
|
||||||
If you start adding your own packages and configurations, you'll probably have
|
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
|
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
|
our configuration automatically, on every commit. Additionally, we can have it
|
||||||
|
@ -9,7 +8,6 @@ This will work whether your copy is a fork, or a bare template, as long as your
|
||||||
repo is hosted on GitHub.
|
repo is hosted on GitHub.
|
||||||
|
|
||||||
## Setup
|
## Setup
|
||||||
|
|
||||||
Just head over to [hercules-ci.com](https://hercules-ci.com) to make an account.
|
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
|
Then follow the docs to set up an [agent][agent], if you want to deploy to a
|
||||||
|
@ -17,7 +15,6 @@ binary cache (and of course you do), be sure _not_ to skip the
|
||||||
[binary-caches.json][cache].
|
[binary-caches.json][cache].
|
||||||
|
|
||||||
## Ready to Use
|
## Ready to Use
|
||||||
|
|
||||||
The repo is already set up with the proper _default.nix_ file, building all
|
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
|
declared packages, checks, profiles and shells. So you can see if something
|
||||||
breaks, and never build the same package twice!
|
breaks, and never build the same package twice!
|
||||||
|
@ -26,7 +23,6 @@ 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/)!
|
[deploy your configuration](https://docs.hercules-ci.com/hercules-ci-effects/guide/deploy-a-nixos-machine/)!
|
||||||
|
|
||||||
> ##### _Note:_
|
> ##### _Note:_
|
||||||
>
|
|
||||||
> Hercules doesn't have access to anything encrypted in the
|
> Hercules doesn't have access to anything encrypted in the
|
||||||
> [secrets folder](../../secrets), so none of your secrets will accidentally get
|
> [secrets folder](../../secrets), so none of your secrets will accidentally get
|
||||||
> pushed to a cache by mistake.
|
> pushed to a cache by mistake.
|
||||||
|
|
|
@ -1,5 +1,4 @@
|
||||||
# Integrations
|
# Integrations
|
||||||
|
|
||||||
This section explores some of the optional tools included with devos to provide
|
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
|
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
|
made to choose tools that treat nix, and where possible flakes, as first class
|
||||||
|
|
|
@ -1,5 +1,4 @@
|
||||||
# nvfetcher
|
# nvfetcher
|
||||||
|
|
||||||
[NvFetcher][nvf] is a workflow companion for updating nix sources.
|
[NvFetcher][nvf] is a workflow companion for updating nix sources.
|
||||||
|
|
||||||
You can specify an origin source and an update configuration, and
|
You can specify an origin source and an update configuration, and
|
||||||
|
@ -16,7 +15,6 @@ and commit the results.
|
||||||
## Usage
|
## Usage
|
||||||
|
|
||||||
Statically fetching (not tracking) a particular tag from a github repo:
|
Statically fetching (not tracking) a particular tag from a github repo:
|
||||||
|
|
||||||
```toml
|
```toml
|
||||||
[manix]
|
[manix]
|
||||||
src.manual = "v0.6.3"
|
src.manual = "v0.6.3"
|
||||||
|
@ -24,7 +22,6 @@ fetch.github = "mlvzk/manix"
|
||||||
```
|
```
|
||||||
|
|
||||||
Tracking the latest github _release_ from a github repo:
|
Tracking the latest github _release_ from a github repo:
|
||||||
|
|
||||||
```toml
|
```toml
|
||||||
[manix]
|
[manix]
|
||||||
src.github = "mlvzk/manix" # responsible for tracking
|
src.github = "mlvzk/manix" # responsible for tracking
|
||||||
|
@ -32,7 +29,6 @@ fetch.github = "mlvzk/manix" # responsible for fetching
|
||||||
```
|
```
|
||||||
|
|
||||||
Tracking the latest commit of a git repository and fetch from a git repo:
|
Tracking the latest commit of a git repository and fetch from a git repo:
|
||||||
|
|
||||||
```toml
|
```toml
|
||||||
[manix]
|
[manix]
|
||||||
src.git = "https://github.com/mlvzk/manix.git" # responsible for tracking
|
src.git = "https://github.com/mlvzk/manix.git" # responsible for tracking
|
||||||
|
@ -40,7 +36,6 @@ fetch.git = "https://github.com/mlvzk/manix.git" # responsible for fetching
|
||||||
```
|
```
|
||||||
|
|
||||||
> ##### _Note:_
|
> ##### _Note:_
|
||||||
>
|
|
||||||
> Please refer to the [NvFetcher Readme][nvf-readme] for more options.
|
> Please refer to the [NvFetcher Readme][nvf-readme] for more options.
|
||||||
|
|
||||||
[nvf]: https://github.com/berberman/nvfetcher
|
[nvf]: https://github.com/berberman/nvfetcher
|
||||||
|
|
|
@ -1,4 +1,3 @@
|
||||||
# Layout
|
# Layout
|
||||||
|
|
||||||
Each of the following sections is a directory whose contents are output to the
|
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.
|
outside world via the flake's outputs. Check each chapter for details.
|
||||||
|
|
|
@ -1,5 +1,4 @@
|
||||||
# Modules
|
# Modules
|
||||||
|
|
||||||
The modules directory is a replica of nixpkg's NixOS [modules][nixpkgs-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
|
, and follows the same semantics. This allows for trivial upstreaming into
|
||||||
nixpkgs proper once your module is sufficiently stable.
|
nixpkgs proper once your module is sufficiently stable.
|
||||||
|
@ -7,21 +6,18 @@ nixpkgs proper once your module is sufficiently stable.
|
||||||
All modules linked in _module-list.nix_ are automatically exported via
|
All modules linked in _module-list.nix_ are automatically exported via
|
||||||
`nixosModules.<file-basename>`, and imported into all [hosts](../concepts/hosts.md).
|
`nixosModules.<file-basename>`, and imported into all [hosts](../concepts/hosts.md).
|
||||||
|
|
||||||
|
|
||||||
> ##### _Note:_
|
> ##### _Note:_
|
||||||
>
|
|
||||||
> This is reserved for declaring brand new module options. If you just want to
|
> 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
|
> declare a coherent configuration of already existing and related NixOS options
|
||||||
> , use [profiles](../concepts/profiles.md) instead.
|
> , use [profiles](../concepts/profiles.md) instead.
|
||||||
|
|
||||||
## Semantics
|
## Semantics
|
||||||
|
|
||||||
In case you've never written a module for nixpkgs before, here is a brief
|
In case you've never written a module for nixpkgs before, here is a brief
|
||||||
outline of the process.
|
outline of the process.
|
||||||
|
|
||||||
### Declaration
|
### Declaration
|
||||||
|
|
||||||
modules/services/service-category/my-service.nix:
|
modules/services/service-category/my-service.nix:
|
||||||
|
|
||||||
```nix
|
```nix
|
||||||
{ config, lib, ... }:
|
{ config, lib, ... }:
|
||||||
let
|
let
|
||||||
|
@ -41,9 +37,7 @@ in
|
||||||
```
|
```
|
||||||
|
|
||||||
### Import
|
### Import
|
||||||
|
|
||||||
modules/module-list.nix:
|
modules/module-list.nix:
|
||||||
|
|
||||||
```nix
|
```nix
|
||||||
[
|
[
|
||||||
./services/service-category/my-service.nix
|
./services/service-category/my-service.nix
|
||||||
|
@ -53,9 +47,7 @@ modules/module-list.nix:
|
||||||
## Usage
|
## Usage
|
||||||
|
|
||||||
### Internal
|
### Internal
|
||||||
|
|
||||||
profiles/profile-category/my-profile.nix:
|
profiles/profile-category/my-profile.nix:
|
||||||
|
|
||||||
```nix
|
```nix
|
||||||
{ ... }:
|
{ ... }:
|
||||||
{
|
{
|
||||||
|
@ -64,9 +56,7 @@ profiles/profile-category/my-profile.nix:
|
||||||
```
|
```
|
||||||
|
|
||||||
### External
|
### External
|
||||||
|
|
||||||
flake.nix:
|
flake.nix:
|
||||||
|
|
||||||
```nix
|
```nix
|
||||||
{
|
{
|
||||||
# inputs omitted
|
# inputs omitted
|
||||||
|
|
|
@ -1,5 +1,4 @@
|
||||||
# Overlays
|
# Overlays
|
||||||
|
|
||||||
Writing overlays is a common occurence when using a NixOS system. Therefore,
|
Writing overlays is a common occurence when using a NixOS system. Therefore,
|
||||||
we want to keep the process as simple and straightforward as possible.
|
we want to keep the process as simple and straightforward as possible.
|
||||||
|
|
||||||
|
@ -10,9 +9,7 @@ exported via `overlays.<channel>/<pkgName>` _as well as_
|
||||||
write it.
|
write it.
|
||||||
|
|
||||||
## Example
|
## Example
|
||||||
|
|
||||||
overlays/kakoune.nix:
|
overlays/kakoune.nix:
|
||||||
|
|
||||||
```nix
|
```nix
|
||||||
final: prev: {
|
final: prev: {
|
||||||
kakoune = prev.kakoune.override {
|
kakoune = prev.kakoune.override {
|
||||||
|
|
|
@ -1,5 +1,4 @@
|
||||||
# Packages
|
# Packages
|
||||||
|
|
||||||
Similar to [modules](./modules.md), the pkgs directory mirrors the upstream
|
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
|
[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.
|
your package, it's as simple as dropping it into the nixpkgs/pkgs directory.
|
||||||
|
@ -14,30 +13,26 @@ the supported systems listed in the package's `meta.platforms` attribute.
|
||||||
And, as usual, every package in the overlay is also available to any NixOS
|
And, as usual, every package in the overlay is also available to any NixOS
|
||||||
[host](../concepts/hosts.md).
|
[host](../concepts/hosts.md).
|
||||||
|
|
||||||
Another convenient difference is that it is possible to use
|
Another convenient difference is that it is possible to use
|
||||||
[nvfetcher](https://github.com/berberman/nvfetcher) to keep packages up to
|
[nvfetcher](https://github.com/berberman/nvfetcher) to keep packages up to
|
||||||
date.
|
date.
|
||||||
This is best understood by the simple example below.
|
This is best understood by the simple example below.
|
||||||
|
|
||||||
## Example
|
## Example
|
||||||
|
It is possible to specify sources separately to keep them up to date semi
|
||||||
It is possible to specify sources separately to keep them up to date semi
|
|
||||||
automatically.
|
automatically.
|
||||||
The basic rules are specified in pkgs/sources.toml:
|
The basic rules are specified in pkgs/sources.toml:
|
||||||
|
|
||||||
```toml
|
```toml
|
||||||
# nvfetcher.toml
|
# nvfetcher.toml
|
||||||
[libinih]
|
[libinih]
|
||||||
src.github = "benhoyt/inih"
|
src.github = "benhoyt/inih"
|
||||||
fetch.github = "benhoyt/inih"
|
fetch.github = "benhoyt/inih"
|
||||||
```
|
```
|
||||||
|
After changes to this file as well as to update the packages specified in there run
|
||||||
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)).
|
nvfetcher (for more details see [nvfetcher](https://github.com/berberman/nvfetcher)).
|
||||||
|
|
||||||
The pkgs overlay is managed in
|
The pkgs overlay is managed in
|
||||||
pkgs/default.nix:
|
pkgs/default.nix:
|
||||||
|
|
||||||
```nix
|
```nix
|
||||||
final: prev: {
|
final: prev: {
|
||||||
# keep sources first, this makes sources available to the pkgs
|
# keep sources first, this makes sources available to the pkgs
|
||||||
|
@ -50,7 +45,6 @@ final: prev: {
|
||||||
|
|
||||||
Lastly the example package is in
|
Lastly the example package is in
|
||||||
pkgs/development/libraries/libinih/default.nix:
|
pkgs/development/libraries/libinih/default.nix:
|
||||||
|
|
||||||
```nix
|
```nix
|
||||||
{ stdenv, meson, ninja, lib, sources, ... }:
|
{ stdenv, meson, ninja, lib, sources, ... }:
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation {
|
||||||
|
@ -65,17 +59,16 @@ stdenv.mkDerivation {
|
||||||
}
|
}
|
||||||
```
|
```
|
||||||
|
|
||||||
## Migration from flake based approach
|
|
||||||
|
|
||||||
|
## 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.
|
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,
|
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
|
add the line that calls the sources at the beginning of pkgs/default.nix, and
|
||||||
accomodate the small changes in the packages as can be seen from the example.
|
accomodate the small changes in the packages as can be seen from the example.
|
||||||
|
|
||||||
The example package looked like:
|
The example package looked like:
|
||||||
|
|
||||||
pkgs/flake.nix:
|
pkgs/flake.nix:
|
||||||
|
|
||||||
```nix
|
```nix
|
||||||
{
|
{
|
||||||
description = "Package sources";
|
description = "Package sources";
|
||||||
|
@ -88,7 +81,6 @@ pkgs/flake.nix:
|
||||||
```
|
```
|
||||||
|
|
||||||
pkgs/default.nix:
|
pkgs/default.nix:
|
||||||
|
|
||||||
```nix
|
```nix
|
||||||
final: prev: {
|
final: prev: {
|
||||||
# then, call packages with `final.callPackage`
|
# then, call packages with `final.callPackage`
|
||||||
|
@ -97,7 +89,6 @@ final: prev: {
|
||||||
```
|
```
|
||||||
|
|
||||||
pkgs/development/libraries/libinih/default.nix:
|
pkgs/development/libraries/libinih/default.nix:
|
||||||
|
|
||||||
```nix
|
```nix
|
||||||
{ stdenv, meson, ninja, lib, srcs, ... }:
|
{ stdenv, meson, ninja, lib, srcs, ... }:
|
||||||
let inherit (srcs) libinih; in
|
let inherit (srcs) libinih; in
|
||||||
|
|
|
@ -1,11 +1,9 @@
|
||||||
# Secrets
|
# Secrets
|
||||||
|
|
||||||
Secrets are managed using [agenix][agenix]
|
Secrets are managed using [agenix][agenix]
|
||||||
so you can keep your flake in a public repository like GitHub without
|
so you can keep your flake in a public repository like GitHub without
|
||||||
exposing your password or other sensitive data.
|
exposing your password or other sensitive data.
|
||||||
|
|
||||||
## Agenix
|
## Agenix
|
||||||
|
|
||||||
Currently, there is [no mechanism][secrets-issue] in nix itself to deploy secrets
|
Currently, there is [no mechanism][secrets-issue] in nix itself to deploy secrets
|
||||||
within the nix store because it is world-readable.
|
within the nix store because it is world-readable.
|
||||||
|
|
||||||
|
@ -19,7 +17,6 @@ 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`.
|
encrypted files to the nix store and decrypt them on activation to `/run/agenix`.
|
||||||
|
|
||||||
### Setup
|
### Setup
|
||||||
|
|
||||||
All hosts must have openssh enabled, this is done by default in the core profile.
|
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.
|
You need to populate your `secrets/secrets.nix` with the proper ssh public keys.
|
||||||
|
@ -27,7 +24,6 @@ Be extra careful to make sure you only add public keys, you should never share a
|
||||||
private key!!
|
private key!!
|
||||||
|
|
||||||
secrets/secrets.nix:
|
secrets/secrets.nix:
|
||||||
|
|
||||||
```nix
|
```nix
|
||||||
let
|
let
|
||||||
system = "<system ssh key>";
|
system = "<system ssh key>";
|
||||||
|
@ -41,25 +37,22 @@ 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
|
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:
|
`~/.ssh/id_rsa.pub`. If you haven't generated a ssh key yet, be sure do so:
|
||||||
|
|
||||||
```sh
|
```sh
|
||||||
ssh-keygen -t ed25519
|
ssh-keygen -t ed25519
|
||||||
```
|
```
|
||||||
|
|
||||||
> ##### _Note:_
|
> ##### _Note:_
|
||||||
>
|
|
||||||
> The underlying tool used by agenix, rage, doesn't work well with password protected
|
> 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
|
> ssh keys. So if you have lots of secrets you might have to type in your password many
|
||||||
> times.
|
> times.
|
||||||
|
|
||||||
### Secrets
|
|
||||||
|
|
||||||
|
### Secrets
|
||||||
You will need the `agenix` command to create secrets. DevOS conveniently provides that
|
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
|
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 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`:
|
To create secrets, simply add lines to your `secrets/secrets.nix`:
|
||||||
|
|
||||||
```
|
```
|
||||||
let
|
let
|
||||||
...
|
...
|
||||||
|
@ -69,26 +62,21 @@ in
|
||||||
"secret.age".publicKeys = allKeys;
|
"secret.age".publicKeys = allKeys;
|
||||||
}
|
}
|
||||||
```
|
```
|
||||||
|
|
||||||
That would tell agenix to create a `secret.age` file that is encrypted with the `system`
|
That would tell agenix to create a `secret.age` file that is encrypted with the `system`
|
||||||
and `user` ssh public key.
|
and `user` ssh public key.
|
||||||
|
|
||||||
Then go into the `secrets` folder and run:
|
Then go into the `secrets` folder and run:
|
||||||
|
|
||||||
```sh
|
```sh
|
||||||
agenix -e secret.age
|
agenix -e secret.age
|
||||||
```
|
```
|
||||||
|
|
||||||
This will create the `secret.age`, if it doesn't already exist, and allow you to edit it.
|
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:
|
If you ever change the `publicKeys` entry of any secret make sure to rekey the secrets:
|
||||||
|
|
||||||
```sh
|
```sh
|
||||||
agenix --rekey
|
agenix --rekey
|
||||||
```
|
```
|
||||||
|
|
||||||
### Usage
|
### Usage
|
||||||
|
|
||||||
Once you have your secret file encrypted and ready to use, you can utilize the [age module][age module]
|
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`.
|
to ensure that your secrets end up in `/run/secrets`.
|
||||||
|
|
||||||
|
@ -101,14 +89,15 @@ 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.
|
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
|
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
|
secrets get decrypted. You can learn about them by looking at the
|
||||||
[age module][age module].
|
[age module][age module].
|
||||||
|
|
||||||
|
|
||||||
> ##### _Note:_
|
> ##### _Note:_
|
||||||
>
|
|
||||||
> You can take a look at the [agenix repository][agenix] for more information
|
> You can take a look at the [agenix repository][agenix] for more information
|
||||||
> about the tool.
|
> about the tool.
|
||||||
|
|
||||||
|
|
102
doc/start/bootstrapping.md
Normal file
102
doc/start/bootstrapping.md
Normal file
|
@ -0,0 +1,102 @@
|
||||||
|
# Bootstrapping
|
||||||
|
|
||||||
|
This will help you boostrap a bare host with the help of the
|
||||||
|
[bespoke iso](./iso.md) live installer.
|
||||||
|
|
||||||
|
_Note: nothing prevents you from remotely executing the boostrapping
|
||||||
|
process. See below._
|
||||||
|
|
||||||
|
Once your target host has booted into the live iso, you need to partition
|
||||||
|
and format your disk according to the [official manual][manual].
|
||||||
|
|
||||||
|
## Mount partitions
|
||||||
|
|
||||||
|
Then properly mount the formatted partitions at `/mnt`, so that you can
|
||||||
|
install your system to those new partitions.
|
||||||
|
|
||||||
|
Mount `nixos` partition to `/mnt` and — for UEFI — `boot`
|
||||||
|
partition to `/mnt/boot`:
|
||||||
|
|
||||||
|
```console
|
||||||
|
$ mount /dev/disk/by-label/nixos /mnt
|
||||||
|
$ mkdir -p /mnt/boot && mount /dev/disk/by-label/boot /mnt/boot # UEFI only
|
||||||
|
$ swapon /dev/disk/by-label/swap
|
||||||
|
```
|
||||||
|
|
||||||
|
Add some extra space to the store. In the iso, it's running on a tmpfs
|
||||||
|
off your RAM:
|
||||||
|
```console
|
||||||
|
$ mkdir -p /mnt/tmpstore/{work,store}
|
||||||
|
$ mount -t overlay overlay -olowerdir=/nix/store,upperdir=/mnt/tmpstore/store,workdir=/mnt/tmpstore/work /nix/store
|
||||||
|
```
|
||||||
|
|
||||||
|
## Install
|
||||||
|
|
||||||
|
Install off of a copy of devos from the time the iso was built:
|
||||||
|
|
||||||
|
```console
|
||||||
|
$ cd /iso/devos
|
||||||
|
$ nixos-install --flake .#NixOS
|
||||||
|
```
|
||||||
|
|
||||||
|
## Notes of interest
|
||||||
|
|
||||||
|
### Remote access to the live installer
|
||||||
|
|
||||||
|
The iso live installer comes preconfigured with a network configuration
|
||||||
|
which announces it's hostname via [MulticastDNS][mDNS] as `hostname.local`,
|
||||||
|
that is `bootstrap.local` in the [iso example](./iso).
|
||||||
|
|
||||||
|
In the rare case that [MulticastDNS][mDNS] is not availabe or turned off
|
||||||
|
in your network, there is a static link-local IPv6 address configured to
|
||||||
|
`fe80::47`(mnemonic from the letter's position in the english alphabet:
|
||||||
|
`n=14 i=9 x=24; 47 = n+i+x`).
|
||||||
|
|
||||||
|
Provided that you have added your public key to the authorized keys of the
|
||||||
|
`root` user _(hint: [`deploy-rs`](../integrations/deploy.md) needs passwordless
|
||||||
|
sudo access)_:
|
||||||
|
|
||||||
|
```nix
|
||||||
|
{ ... }:
|
||||||
|
{
|
||||||
|
users.users.root.openssh.authorizedKeys.keyFiles = [
|
||||||
|
../secrets/path/to/key.pub
|
||||||
|
];
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
You can then ssh into the live installer through one of the
|
||||||
|
following options:
|
||||||
|
|
||||||
|
```console
|
||||||
|
ssh root@bootstrap.local
|
||||||
|
|
||||||
|
ssh root@fe80::47%eno1 # where eno1 is your network interface on which you are linked to the target
|
||||||
|
```
|
||||||
|
|
||||||
|
_Note: the [static link-local IPv6 address][staticLLA] and [MulticastDNS][mDNS] is only
|
||||||
|
configured on the live installer. If you wish to enable [MulticastDNS][mDNS]
|
||||||
|
for your environment, you ought to configure that in a regular [profile](../concepts/profiles.md)._
|
||||||
|
|
||||||
|
### EUI-64 LLA & Host Identity
|
||||||
|
|
||||||
|
The iso's IPv6 Link Local Address (LLA) is configured with a static 64-bit Extended
|
||||||
|
Unique Identifiers (EUI-64) that is derived from the host interface's Message
|
||||||
|
Authentication Code (MAC) address.
|
||||||
|
|
||||||
|
After a little while (a few seconds), you can remotely discover this unique and host
|
||||||
|
specific address over [NDP][NDP] for example with:
|
||||||
|
|
||||||
|
```console
|
||||||
|
ip -6 neigh show # also shows fe80::47
|
||||||
|
```
|
||||||
|
|
||||||
|
***This LLA is stable for the host, unless you need to swap that particular network card.***
|
||||||
|
Under this reservation, though, you may use this EUI-64 to wire up a specific
|
||||||
|
(cryptographic) host identity.
|
||||||
|
|
||||||
|
|
||||||
|
[manual]: https://nixos.org/manual/nixos/stable/index.html#sec-installation-partitioning
|
||||||
|
[mDNS]: https://en.wikipedia.org/wiki/Multicast_DNS
|
||||||
|
[NDP]: https://en.wikipedia.org/wiki/Neighbor_Discovery_Protocol
|
||||||
|
[staticLLA]: https://tools.ietf.org/html/rfc7404
|
51
doc/start/from-nixos.md
Normal file
51
doc/start/from-nixos.md
Normal file
|
@ -0,0 +1,51 @@
|
||||||
|
# From NixOS
|
||||||
|
|
||||||
|
## Generate Configuration
|
||||||
|
Assuming you're happy with your existing partition layout, you can generate a
|
||||||
|
basic NixOS configuration for your system using:
|
||||||
|
```sh
|
||||||
|
bud up
|
||||||
|
```
|
||||||
|
|
||||||
|
This will make a new file `hosts/up-$(hostname).nix`, which you can edit to
|
||||||
|
your liking.
|
||||||
|
|
||||||
|
You must then add a host to `nixos.hosts` in flake.nix:
|
||||||
|
```nix
|
||||||
|
{
|
||||||
|
nixos.hosts = {
|
||||||
|
modules = hosts/NixOS.nix;
|
||||||
|
};
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
Make sure your `i18n.defaultLocale` and `time.timeZone` are set properly for
|
||||||
|
your region. Keep in mind that `networking.hostName` will be automatically
|
||||||
|
set to the name of your host;
|
||||||
|
|
||||||
|
Now might be a good time to read the docs on [suites](../concepts/suites.md) and
|
||||||
|
[profiles](../concepts/profiles.md) and add or create any that you need.
|
||||||
|
|
||||||
|
> ##### _Note:_
|
||||||
|
> While the `up` sub-command is provided as a convenience to quickly set up and
|
||||||
|
> install a "fresh" NixOS system on current hardware, committing these files is
|
||||||
|
> discouraged.
|
||||||
|
>
|
||||||
|
> They are placed in the git staging area automatically because they would be
|
||||||
|
> invisible to the flake otherwise, but it is best to move what you need from
|
||||||
|
> them directly into a host module of your own making, and commit that instead.
|
||||||
|
# Installation
|
||||||
|
|
||||||
|
Once you're ready to deploy `hosts/my-host.nix`:
|
||||||
|
```sh
|
||||||
|
bud my-host switch
|
||||||
|
```
|
||||||
|
|
||||||
|
|
||||||
|
This calls `nixos-rebuild` with sudo to build and install your configuration.
|
||||||
|
|
||||||
|
> ##### _Notes:_
|
||||||
|
> - Instead of `switch`, you can pass `build`, `test`, `boot`, etc just as with
|
||||||
|
> `nixos-rebuild`.
|
||||||
|
|
||||||
|
|
|
@ -1,49 +1,41 @@
|
||||||
# Quick Start
|
# Quick Start
|
||||||
|
|
||||||
The only dependency is nix, so make sure you have it [installed][install-nix].
|
The only dependency is nix, so make sure you have it [installed][install-nix].
|
||||||
|
|
||||||
## Get the Template
|
## Get the Template
|
||||||
|
Here is a snippet that will get you the template without the git history:
|
||||||
If you currently don't have flakes setup, you can utilize the digga shell to
|
|
||||||
pull the template:
|
|
||||||
|
|
||||||
```sh
|
```sh
|
||||||
nix-shell "https://github.com/divnix/digga/archive/main.tar.gz" \
|
nix-shell -p cachix --run "cachix use nrdxp"
|
||||||
--run "nix flake init -t github:divnix/digga"
|
|
||||||
```
|
|
||||||
|
|
||||||
If you already have flakes support, you can directly pull the template:
|
nix-shell https://github.com/divnix/devos/archive/main.tar.gz -A shell \
|
||||||
|
--run "bud get main"
|
||||||
|
|
||||||
```sh
|
cd devos
|
||||||
nix flake init -t github:divnix/digga
|
|
||||||
```
|
|
||||||
|
|
||||||
Then make sure to create the git repository:
|
nix-shell
|
||||||
|
|
||||||
```sh
|
|
||||||
git init
|
git init
|
||||||
git add .
|
git add .
|
||||||
git commit
|
git commit -m init
|
||||||
```
|
```
|
||||||
|
|
||||||
Finally, run `nix-shell` to get to an interactive shell with all the
|
This will place you in a new folder named `devos` with git initialized, and a
|
||||||
dependencies, including the unstable nix version required. You can run `menu` to
|
nix-shell that provides all the dependencies, including the unstable nix
|
||||||
confirm that you are using digga (expected output includes [docs], [general
|
version required.
|
||||||
commands], [linter], etc.).
|
|
||||||
|
|
||||||
In addition, the [binary cache](../integrations/cachix.md) is added for faster deployment.
|
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
|
> - Flakes ignore files that have not been added to git, so be sure to stage new
|
||||||
> files before building the system.
|
> files before building the system.
|
||||||
> - You can choose to simply clone the repo with git if you want to follow
|
> - You can choose to simply clone the repo with git if you want to follow
|
||||||
> upstream changes.
|
> upstream changes.
|
||||||
> - If the `nix-shell -p cachix --run "cachix use nrdxp"` line doesn't work you
|
> - If the `nix-shell -p cachix --run "cachix use nrdxp"` line doesn't work
|
||||||
> can try with sudo: `sudo nix-shell -p cachix --run "cachix use nrdxp"`
|
> you can try with sudo: `sudo nix-shell -p cachix --run "cachix use nrdxp"`
|
||||||
|
|
||||||
## Next Steps
|
|
||||||
|
|
||||||
|
## Next Steps:
|
||||||
- [Make installable ISO](./iso.md)
|
- [Make installable ISO](./iso.md)
|
||||||
|
- [Bootstrap Host](./bootstrapping.md)
|
||||||
|
- [Already on NixOS](./from-nixos.md)
|
||||||
|
|
||||||
|
|
||||||
[install-nix]: https://nixos.org/manual/nix/stable/#sect-multi-user-installation
|
[install-nix]: https://nixos.org/manual/nix/stable/#sect-multi-user-installation
|
||||||
|
|
|
@ -1,36 +1,22 @@
|
||||||
# Installation Media
|
# ISO
|
||||||
|
|
||||||
This project leverages [nix-community/nixos-generators][nixos-generators] for
|
|
||||||
building machine images. In most cases, you'll probably want to use the
|
|
||||||
`install-iso` format.
|
|
||||||
|
|
||||||
Making an installable ISO for `hosts/bootstrap.nix` is as simple as:
|
|
||||||
|
|
||||||
|
Making and writing an installable iso for `hosts/bootstrap.nix` is as simple as:
|
||||||
```sh
|
```sh
|
||||||
nix run github:nix-community/nixos-generators -- \
|
bud build bootstrap bootstrapIso
|
||||||
--format install-iso \
|
sudo -E $(which bud) burn
|
||||||
--flake '.#bootstrap'
|
|
||||||
```
|
```
|
||||||
|
|
||||||
Then "burn" the ISO to your USB stick (or CD-R if you like!) following the
|
This works for any host.
|
||||||
[instructions in the NixOS manual][burn] (or using your preferred USB burner).
|
|
||||||
|
|
||||||
You can also swap out the `--format` for [any of the others][formats] supported
|
## ISO image nix store & cache
|
||||||
by nixos-generators.
|
|
||||||
|
|
||||||
Continue by following the usual installation instructions in the NixOS manual.
|
The iso image holds the store to the live environment and _also_ acts as a binary cache
|
||||||
|
to the installer. To considerably speed up things, the image already includes all flake
|
||||||
|
`inputs` as well as the `devshell` closures.
|
||||||
|
|
||||||
## ISO Nix Store and Cache
|
While you _could_ provision any machine with a single stick, a custom-made iso for
|
||||||
|
the host you want to install DevOS to, maximises those local cache hits.
|
||||||
|
|
||||||
The ISO image holds the Nix store for the live environment and _also_ acts as a
|
For hosts that don't differ too much, a single usb stick might be ok, whereas when
|
||||||
binary cache to the installer. To considerably speed things up, the image
|
there are bigger differences, a custom-made usb stick will be considerably faster.
|
||||||
already includes all flake `inputs` as well as the `devshell` closures.
|
|
||||||
|
|
||||||
While you _could_ provision any NixOS machine with the same USB stick, an ISO
|
|
||||||
custom-made for your target host will maximise those local cache hits. For hosts
|
|
||||||
that don't differ too much, a single USB stick might be ok, whereas when there
|
|
||||||
are bigger differences, a custom-made USB stick will be considerably faster.
|
|
||||||
|
|
||||||
[nixos-generators]: https://github.com/nix-community/nixos-generators
|
|
||||||
[burn]: https://nixos.org/manual/nixos/stable/index.html#sec-booting-from-usb
|
|
||||||
[formats]: https://github.com/nix-community/nixos-generators/tree/master/formats
|
|
||||||
|
|
17
doc/tests.md
17
doc/tests.md
|
@ -6,29 +6,18 @@ configuration, and, optionally, run them in
|
||||||
[CI](./integrations/hercules.md).
|
[CI](./integrations/hercules.md).
|
||||||
|
|
||||||
## Unit Tests
|
## Unit Tests
|
||||||
|
|
||||||
Unit tests can be created from regular derivations, and they can do
|
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
|
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
|
packages during their [check phase][check]. All packages and their tests will
|
||||||
be built during CI.
|
be built during CI.
|
||||||
|
|
||||||
## Integration Tests
|
## 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,
|
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!
|
optionally, be networked together, and yes, it's as awesome as it sounds!
|
||||||
|
|
||||||
Be sure to use the `mkTest` function from Digga, `digga.lib.mkTest`
|
Be sure to use the `mkTest` function from digga, `digga.lib.pkgs-lib.mkTest`
|
||||||
which wraps the official [testing-python][testing-python] function to ensure
|
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
|
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,
|
already great resources for learning how to use these tests effectively,
|
||||||
|
@ -37,7 +26,7 @@ and the examples in [nixpkgs][nixos-tests].
|
||||||
|
|
||||||
[test-doc]: https://nixos.org/manual/nixos/stable/index.html#sec-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
|
[test-blog]: https://www.haskellforall.com/2020/11/how-to-use-nixos-for-lightweight.html
|
||||||
[default]: https://github.com/divnix/devos/tree/core/tests/default.nix
|
[default]: https://github.com/divnix/devos/tree/main/tests/default.nix
|
||||||
[run-test]: https://github.com/NixOS/nixpkgs/blob/6571462647d7316aff8b8597ecdf5922547bf365/lib/debug.nix#L154-L166
|
[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
|
[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
|
[testing-python]: https://github.com/NixOS/nixpkgs/tree/master/nixos/lib/testing-python.nix
|
||||||
|
|
451
flake.lock
451
flake.lock
|
@ -2,24 +2,81 @@
|
||||||
"nodes": {
|
"nodes": {
|
||||||
"agenix": {
|
"agenix": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"darwin": [
|
"nixpkgs": [
|
||||||
"darwin"
|
"nixos"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1648942457,
|
||||||
|
"narHash": "sha256-i29Z1t3sVfCNfpp+KAfeExvpqHQSbLO1KWylTtfradU=",
|
||||||
|
"owner": "ryantm",
|
||||||
|
"repo": "agenix",
|
||||||
|
"rev": "0d5e59ed645e4c7b60174bc6f6aac6a203dc0b01",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "ryantm",
|
||||||
|
"repo": "agenix",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"beautysh": {
|
||||||
|
"inputs": {
|
||||||
|
"flake-utils": "flake-utils",
|
||||||
|
"nixpkgs": "nixpkgs",
|
||||||
|
"poetry2nix": "poetry2nix"
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1641830469,
|
||||||
|
"narHash": "sha256-uhDmgNP/biOWe4FtOa6c2xZnREH+NP9rdrMm0LccRUk=",
|
||||||
|
"owner": "lovesegfault",
|
||||||
|
"repo": "beautysh",
|
||||||
|
"rev": "e85d9736927c0fcf2abb05cb3a2d8d9b4502a2eb",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "lovesegfault",
|
||||||
|
"repo": "beautysh",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"blank": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1625557891,
|
||||||
|
"narHash": "sha256-O8/MWsPBGhhyPoPLHZAuoZiiHo9q6FLlEeIDEXuj6T4=",
|
||||||
|
"owner": "divnix",
|
||||||
|
"repo": "blank",
|
||||||
|
"rev": "5a5d2684073d9f563072ed07c871d577a6c614a8",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "divnix",
|
||||||
|
"repo": "blank",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"bud": {
|
||||||
|
"inputs": {
|
||||||
|
"beautysh": "beautysh",
|
||||||
|
"devshell": [
|
||||||
|
"digga",
|
||||||
|
"devshell"
|
||||||
],
|
],
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
"nixos"
|
"nixos"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1682101079,
|
"lastModified": 1642035816,
|
||||||
"narHash": "sha256-MdAhtjrLKnk2uiqun1FWABbKpLH090oeqCSiWemtuck=",
|
"narHash": "sha256-1Lq5c1AeUv/1SK08+O704JVfDdD/zodHzA0cv0TIga8=",
|
||||||
"owner": "ryantm",
|
"owner": "divnix",
|
||||||
"repo": "agenix",
|
"repo": "bud",
|
||||||
"rev": "2994d002dcff5353ca1ac48ec584c7f6589fe447",
|
"rev": "a789d710851441ba7e7cd59be378623b1fe05688",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "ryantm",
|
"owner": "divnix",
|
||||||
"repo": "agenix",
|
"repo": "bud",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
@ -30,11 +87,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1696360011,
|
"lastModified": 1650920635,
|
||||||
"narHash": "sha256-HpPv27qMuPou4acXcZ8Klm7Zt0Elv9dgDvSJaomWb9Y=",
|
"narHash": "sha256-csLLku/jHa7oTPAEJCQhFfyGYstD7jmJJV+3MiOyA+E=",
|
||||||
"owner": "LnL7",
|
"owner": "LnL7",
|
||||||
"repo": "nix-darwin",
|
"repo": "nix-darwin",
|
||||||
"rev": "8b6ea26d5d2e8359d06278364f41fbc4b903b28a",
|
"rev": "1a387b8b3e4d65d7e65ae3fd85ac62b7c114c9c8",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -45,20 +102,18 @@
|
||||||
},
|
},
|
||||||
"deploy": {
|
"deploy": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"flake-compat": [
|
"flake-compat": "flake-compat",
|
||||||
"flake-compat"
|
|
||||||
],
|
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
"nixos"
|
"nixos"
|
||||||
],
|
],
|
||||||
"utils": "utils"
|
"utils": "utils"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1695052866,
|
"lastModified": 1648475189,
|
||||||
"narHash": "sha256-agn7F9Oww4oU6nPiw+YiYI9Xb4vOOE73w8PAoBRP4AA=",
|
"narHash": "sha256-gAGAS6IagwoUr1B0ohE3iR6sZ8hP4LSqzYLC8Mq3WGU=",
|
||||||
"owner": "serokell",
|
"owner": "serokell",
|
||||||
"repo": "deploy-rs",
|
"repo": "deploy-rs",
|
||||||
"rev": "e3f41832680801d0ee9e2ed33eb63af398b090e9",
|
"rev": "83e0c78291cd08cb827ba0d553ad9158ae5a95c3",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -68,19 +123,12 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"devshell": {
|
"devshell": {
|
||||||
"inputs": {
|
|
||||||
"flake-utils": "flake-utils",
|
|
||||||
"nixpkgs": [
|
|
||||||
"digga",
|
|
||||||
"nixpkgs"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1671489820,
|
"lastModified": 1637575296,
|
||||||
"narHash": "sha256-qoei5HDJ8psd1YUPD7DhbHdhLIT9L2nadscp4Qk37uk=",
|
"narHash": "sha256-ZY8YR5u8aglZPe27+AJMnPTG6645WuavB+w0xmhTarw=",
|
||||||
"owner": "numtide",
|
"owner": "numtide",
|
||||||
"repo": "devshell",
|
"repo": "devshell",
|
||||||
"rev": "5aa3a8039c68b4bf869327446590f4cdf90bb634",
|
"rev": "0e56ef21ba1a717169953122c7415fa6a8cd2618",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -91,40 +139,34 @@
|
||||||
},
|
},
|
||||||
"digga": {
|
"digga": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"darwin": [
|
"blank": "blank",
|
||||||
"darwin"
|
|
||||||
],
|
|
||||||
"deploy": [
|
"deploy": [
|
||||||
"deploy"
|
"deploy"
|
||||||
],
|
],
|
||||||
"devshell": "devshell",
|
"devshell": "devshell",
|
||||||
"flake-compat": [
|
"flake-compat": "flake-compat_2",
|
||||||
"flake-compat"
|
|
||||||
],
|
|
||||||
"flake-utils": "flake-utils_2",
|
|
||||||
"flake-utils-plus": "flake-utils-plus",
|
"flake-utils-plus": "flake-utils-plus",
|
||||||
"home-manager": [
|
"home-manager": [
|
||||||
"home"
|
"home"
|
||||||
],
|
],
|
||||||
|
"latest": "latest",
|
||||||
"nixlib": [
|
"nixlib": [
|
||||||
"nixos"
|
"nixos"
|
||||||
],
|
],
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
"nixos"
|
"nixos"
|
||||||
],
|
]
|
||||||
"nixpkgs-unstable": "nixpkgs-unstable"
|
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1674947971,
|
"lastModified": 1650465041,
|
||||||
"narHash": "sha256-6gKqegJHs72jnfFP9g2sihl4fIZgtKgKuqU2rCkIdGY=",
|
"narHash": "sha256-rAvwIjzHUBd2wBR0psWe2EtJr7w046TIOXZcSjLD2qg=",
|
||||||
"owner": "pub-solar",
|
"owner": "divnix",
|
||||||
"repo": "digga",
|
"repo": "digga",
|
||||||
"rev": "2da608bd8afb48afef82c6b1b6d852a36094a497",
|
"rev": "d60f27f697d7bb8038f85917030ca706a99eea49",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "pub-solar",
|
"owner": "divnix",
|
||||||
"ref": "fix/bootstrap-iso",
|
|
||||||
"repo": "digga",
|
"repo": "digga",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
|
@ -132,11 +174,43 @@
|
||||||
"flake-compat": {
|
"flake-compat": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1673956053,
|
"lastModified": 1648199409,
|
||||||
"narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
|
"narHash": "sha256-JwPKdC2PoVBkG6E+eWw3j6BMR6sL3COpYWfif7RVb8Y=",
|
||||||
"owner": "edolstra",
|
"owner": "edolstra",
|
||||||
"repo": "flake-compat",
|
"repo": "flake-compat",
|
||||||
"rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
|
"rev": "64a525ee38886ab9028e6f61790de0832aa3ef03",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "edolstra",
|
||||||
|
"repo": "flake-compat",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"flake-compat_2": {
|
||||||
|
"flake": false,
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1641205782,
|
||||||
|
"narHash": "sha256-4jY7RCWUoZ9cKD8co0/4tFARpWB+57+r1bLLvXNJliY=",
|
||||||
|
"owner": "edolstra",
|
||||||
|
"repo": "flake-compat",
|
||||||
|
"rev": "b7547d3eed6f32d06102ead8991ec52ab0a4f1a7",
|
||||||
|
"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"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -147,11 +221,11 @@
|
||||||
},
|
},
|
||||||
"flake-utils": {
|
"flake-utils": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1642700792,
|
"lastModified": 1631561581,
|
||||||
"narHash": "sha256-XqHrk7hFb+zBvRg6Ghl+AZDq03ov6OshJLiSWOoX5es=",
|
"narHash": "sha256-3VQMV5zvxaVLvqqUrNz3iJelLw30mIVSfZmAaauM3dA=",
|
||||||
"owner": "numtide",
|
"owner": "numtide",
|
||||||
"repo": "flake-utils",
|
"repo": "flake-utils",
|
||||||
"rev": "846b2ae0fc4cc943637d3d1def4454213e203cba",
|
"rev": "7e5bf3925f6fbdfaf50a2a7ca0be2879c4261d19",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -162,33 +236,29 @@
|
||||||
},
|
},
|
||||||
"flake-utils-plus": {
|
"flake-utils-plus": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"flake-utils": [
|
"flake-utils": "flake-utils_2"
|
||||||
"digga",
|
|
||||||
"flake-utils"
|
|
||||||
]
|
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1654029967,
|
"lastModified": 1639385028,
|
||||||
"narHash": "sha256-my3GQ3mQIw/1f6GPV1IhUZrcYQSWh0YJAMPNBjhXJDw=",
|
"narHash": "sha256-oqorKz3mwf7UuDJwlbCEYCB2LfcWLL0DkeCWhRIL820=",
|
||||||
"owner": "gytis-ivaskevicius",
|
"owner": "gytis-ivaskevicius",
|
||||||
"repo": "flake-utils-plus",
|
"repo": "flake-utils-plus",
|
||||||
"rev": "6271cf3842ff9c8a9af9e3508c547f86bc77d199",
|
"rev": "be1be083af014720c14f3b574f57b6173b4915d0",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "gytis-ivaskevicius",
|
"owner": "gytis-ivaskevicius",
|
||||||
"ref": "refs/pull/120/head",
|
|
||||||
"repo": "flake-utils-plus",
|
"repo": "flake-utils-plus",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"flake-utils_2": {
|
"flake-utils_2": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1667395993,
|
"lastModified": 1638122382,
|
||||||
"narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
|
"narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=",
|
||||||
"owner": "numtide",
|
"owner": "numtide",
|
||||||
"repo": "flake-utils",
|
"repo": "flake-utils",
|
||||||
"rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
|
"rev": "74f7e4319258e287b0f9cb95426c9853b282730b",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -197,19 +267,33 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"fork": {
|
"flake-utils_3": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1692960587,
|
"lastModified": 1644229661,
|
||||||
"narHash": "sha256-39SKGdhn8jKKkdqhULbCvQOpdUPE9NNJpy5HTB++Jvg=",
|
"narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=",
|
||||||
"owner": "teutat3s",
|
"owner": "numtide",
|
||||||
"repo": "nixpkgs",
|
"repo": "flake-utils",
|
||||||
"rev": "312709dd70684f52496580e533d58645526b1c90",
|
"rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "teutat3s",
|
"owner": "numtide",
|
||||||
"ref": "nvfetcher-fix",
|
"repo": "flake-utils",
|
||||||
"repo": "nixpkgs",
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"flake-utils_4": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1649676176,
|
||||||
|
"narHash": "sha256-OWKJratjt2RW151VUlJPRALb7OU2S5s+f0vLj4o1bHM=",
|
||||||
|
"owner": "numtide",
|
||||||
|
"repo": "flake-utils",
|
||||||
|
"rev": "a4b154ebbdc88c8498a5c7b01589addc9e9cb678",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "numtide",
|
||||||
|
"repo": "flake-utils",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
@ -220,27 +304,27 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1695108154,
|
"lastModified": 1650841545,
|
||||||
"narHash": "sha256-gSg7UTVtls2yO9lKtP0yb66XBHT1Fx5qZSZbGMpSn2c=",
|
"narHash": "sha256-AF3fk+p/mHbdtyrI3kpms+MoMVOdGIBGJ+7LT7WWdaU=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "07682fff75d41f18327a871088d20af2710d4744",
|
"rev": "236c6ec21420e44c38ec76de4fc3335bec1859b5",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"ref": "release-23.05",
|
"ref": "release-21.11",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"latest": {
|
"latest": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1696604326,
|
"lastModified": 1638198142,
|
||||||
"narHash": "sha256-YXUNI0kLEcI5g8lqGMb0nh67fY9f2YoJsILafh6zlMo=",
|
"narHash": "sha256-plU9b8r4St6q4U7VHtG9V7oF8k9fIpfXl/KDaZLuY9k=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "87828a0e03d1418e848d3dd3f3014a632e4a4f64",
|
"rev": "8a308775674e178495767df90c419425474582a1",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -250,29 +334,120 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"latest_2": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1650831523,
|
||||||
|
"narHash": "sha256-6pDZ08SAXsUx5rOP391x+TG39ENP/XA8VMa1tQvgEjc=",
|
||||||
|
"owner": "nixos",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"rev": "87d34a6b8982e901b8e50096b8e79ebc0e66cda0",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "nixos",
|
||||||
|
"ref": "nixos-unstable",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"naersk": {
|
||||||
|
"inputs": {
|
||||||
|
"nixpkgs": [
|
||||||
|
"nixos"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1650265945,
|
||||||
|
"narHash": "sha256-SO8+1db4jTOjnwP++29vVgImLIfETSXyoz0FuLkiikE=",
|
||||||
|
"owner": "nmattia",
|
||||||
|
"repo": "naersk",
|
||||||
|
"rev": "e8f9f8d037774becd82fce2781e1abdb7836d7df",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "nmattia",
|
||||||
|
"repo": "naersk",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"nix-dram": {
|
||||||
|
"inputs": {
|
||||||
|
"flake-utils": "flake-utils_3",
|
||||||
|
"nixpkgs": [
|
||||||
|
"latest"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1649569158,
|
||||||
|
"narHash": "sha256-Wtmiyu/1d+3YGGcRxTnQyEtnJaKKR/Ry0kNbOY48Afs=",
|
||||||
|
"owner": "dramforever",
|
||||||
|
"repo": "nix-dram",
|
||||||
|
"rev": "84c47c0dc93c77f7edfd996f71618d278844c1c4",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "dramforever",
|
||||||
|
"repo": "nix-dram",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"nixlib": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1636849918,
|
||||||
|
"narHash": "sha256-nzUK6dPcTmNVrgTAC1EOybSMsrcx+QrVPyqRdyKLkjA=",
|
||||||
|
"owner": "nix-community",
|
||||||
|
"repo": "nixpkgs.lib",
|
||||||
|
"rev": "28a5b0557f14124608db68d3ee1f77e9329e9dd5",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "nix-community",
|
||||||
|
"repo": "nixpkgs.lib",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"nixos": {
|
"nixos": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1696697597,
|
"lastModified": 1650830814,
|
||||||
"narHash": "sha256-q26Qv4DQ+h6IeozF2o1secyQG0jt2VUT3V0K58jr3pg=",
|
"narHash": "sha256-P7vGsHdS19eHVUJt4BeQA4JfauL2nOpEcnYKIbX76YM=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "5a237aecb57296f67276ac9ab296a41c23981f56",
|
"rev": "c254b8c915ac912ae9ee9dc74eac555ccbf33795",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"ref": "nixos-23.05",
|
"ref": "nixos-21.11",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"nixos-generators": {
|
||||||
|
"inputs": {
|
||||||
|
"nixlib": "nixlib",
|
||||||
|
"nixpkgs": "nixpkgs_2"
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1650388175,
|
||||||
|
"narHash": "sha256-auVEdcVtIIuBnoygUXedJewfmsf/2gSMwCrAcq/QNhM=",
|
||||||
|
"owner": "nix-community",
|
||||||
|
"repo": "nixos-generators",
|
||||||
|
"rev": "b0326ae4f0761b9b482b8472975b3a8e86940ce2",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "nix-community",
|
||||||
|
"repo": "nixos-generators",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"nixos-hardware": {
|
"nixos-hardware": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1696614066,
|
"lastModified": 1650522846,
|
||||||
"narHash": "sha256-nAyYhO7TCr1tikacP37O9FnGr2USOsVBD3IgvndUYjM=",
|
"narHash": "sha256-SxWHXRI3qJwswyXAtzsi6PKVY3KLNNnb072KaJthII8=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixos-hardware",
|
"repo": "nixos-hardware",
|
||||||
"rev": "bb2db418b616fea536b1be7f6ee72fb45c11afe0",
|
"rev": "6b4ebea9093c997c5f275c820e679108de4871ab",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -281,43 +456,125 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs-unstable": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1672791794,
|
"lastModified": 1633971123,
|
||||||
"narHash": "sha256-mqGPpGmwap0Wfsf3o2b6qHJW1w2kk/I6cGCGIU+3t6o=",
|
"narHash": "sha256-WmI4NbH1IPGFWVkuBkKoYgOnxgwSfWDgdZplJlQ93vA=",
|
||||||
"owner": "nixos",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "9813adc7f7c0edd738c6bdd8431439688bb0cb3d",
|
"rev": "e4ef597edfd8a0ba5f12362932fc9b1dd01a0aef",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "nixos",
|
"owner": "NixOS",
|
||||||
"ref": "nixos-unstable",
|
"ref": "nixos-unstable-small",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"nixpkgs_2": {
|
||||||
|
"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"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"nur": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1626378135,
|
||||||
|
"narHash": "sha256-koC6DBYmLCrgXA+AMHVaODf1uHYPmvcFygHfy3eg6vI=",
|
||||||
|
"path": "/nix/store/6mfkswqi67m35qwv0vh7kpk8rypbl2rq-source",
|
||||||
|
"rev": "00c2ec8f0bbdf0cfb2135bde55fbae5d6b64aa6d",
|
||||||
|
"type": "path"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"id": "nur",
|
||||||
|
"type": "indirect"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"nvfetcher": {
|
||||||
|
"inputs": {
|
||||||
|
"flake-compat": "flake-compat_3",
|
||||||
|
"flake-utils": "flake-utils_4",
|
||||||
|
"nixpkgs": [
|
||||||
|
"nixos"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1650169042,
|
||||||
|
"narHash": "sha256-x8469XNOU/ebIh5YCuvjcOAaAptwHjkEl1aTFrevu1o=",
|
||||||
|
"owner": "berberman",
|
||||||
|
"repo": "nvfetcher",
|
||||||
|
"rev": "db780dba6923e531b5aedca502a36d3d9627fca9",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "berberman",
|
||||||
|
"repo": "nvfetcher",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"poetry2nix": {
|
||||||
|
"inputs": {
|
||||||
|
"flake-utils": [
|
||||||
|
"bud",
|
||||||
|
"beautysh",
|
||||||
|
"flake-utils"
|
||||||
|
],
|
||||||
|
"nixpkgs": [
|
||||||
|
"bud",
|
||||||
|
"beautysh",
|
||||||
|
"nixpkgs"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1633382856,
|
||||||
|
"narHash": "sha256-hYlet806M9xJj4yxf0g5fhDT2IEUVIMAl7sqIeZ8DUM=",
|
||||||
|
"owner": "nix-community",
|
||||||
|
"repo": "poetry2nix",
|
||||||
|
"rev": "705cbfa10e3d9bfed2e59e0256844ae3704dbd7e",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "nix-community",
|
||||||
|
"repo": "poetry2nix",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"root": {
|
"root": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"agenix": "agenix",
|
"agenix": "agenix",
|
||||||
|
"bud": "bud",
|
||||||
"darwin": "darwin",
|
"darwin": "darwin",
|
||||||
"deploy": "deploy",
|
"deploy": "deploy",
|
||||||
"digga": "digga",
|
"digga": "digga",
|
||||||
"flake-compat": "flake-compat",
|
|
||||||
"fork": "fork",
|
|
||||||
"home": "home",
|
"home": "home",
|
||||||
"latest": "latest",
|
"latest": "latest_2",
|
||||||
|
"naersk": "naersk",
|
||||||
|
"nix-dram": "nix-dram",
|
||||||
"nixos": "nixos",
|
"nixos": "nixos",
|
||||||
"nixos-hardware": "nixos-hardware"
|
"nixos-generators": "nixos-generators",
|
||||||
|
"nixos-hardware": "nixos-hardware",
|
||||||
|
"nur": "nur",
|
||||||
|
"nvfetcher": "nvfetcher"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"utils": {
|
"utils": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1667395993,
|
"lastModified": 1648297722,
|
||||||
"narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
|
"narHash": "sha256-W+qlPsiZd8F3XkzXOzAoR+mpFqzm3ekQkJNa+PIh1BQ=",
|
||||||
"owner": "numtide",
|
"owner": "numtide",
|
||||||
"repo": "flake-utils",
|
"repo": "flake-utils",
|
||||||
"rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
|
"rev": "0f8662f1319ad6abf89b3380dd2722369fc51ade",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
271
flake.nix
271
flake.nix
|
@ -2,174 +2,147 @@
|
||||||
description = "A highly structured configuration database.";
|
description = "A highly structured configuration database.";
|
||||||
|
|
||||||
nixConfig.extra-experimental-features = "nix-command flakes";
|
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
|
|
||||||
nixos.url = "github:nixos/nixpkgs/nixos-23.05";
|
|
||||||
latest.url = "github:nixos/nixpkgs/nixos-unstable";
|
|
||||||
|
|
||||||
fork.url = "github:teutat3s/nixpkgs/nvfetcher-fix";
|
|
||||||
|
|
||||||
flake-compat.url = "github:edolstra/flake-compat";
|
|
||||||
flake-compat.flake = false;
|
|
||||||
|
|
||||||
digga.url = "github:pub-solar/digga/fix/bootstrap-iso";
|
|
||||||
digga.inputs.nixpkgs.follows = "nixos";
|
|
||||||
digga.inputs.nixlib.follows = "nixos";
|
|
||||||
digga.inputs.home-manager.follows = "home";
|
|
||||||
digga.inputs.deploy.follows = "deploy";
|
|
||||||
digga.inputs.darwin.follows = "darwin";
|
|
||||||
digga.inputs.flake-compat.follows = "flake-compat";
|
|
||||||
|
|
||||||
home.url = "github:nix-community/home-manager/release-23.05";
|
|
||||||
home.inputs.nixpkgs.follows = "nixos";
|
|
||||||
|
|
||||||
darwin.url = "github:LnL7/nix-darwin";
|
|
||||||
darwin.inputs.nixpkgs.follows = "nixos";
|
|
||||||
|
|
||||||
deploy.url = "github:serokell/deploy-rs";
|
|
||||||
deploy.inputs.nixpkgs.follows = "nixos";
|
|
||||||
deploy.inputs.flake-compat.follows = "flake-compat";
|
|
||||||
|
|
||||||
agenix.url = "github:ryantm/agenix";
|
|
||||||
agenix.inputs.nixpkgs.follows = "nixos";
|
|
||||||
agenix.inputs.darwin.follows = "darwin";
|
|
||||||
|
|
||||||
nixos-hardware.url = "github:nixos/nixos-hardware";
|
|
||||||
};
|
|
||||||
|
|
||||||
outputs = {
|
|
||||||
self,
|
|
||||||
digga,
|
|
||||||
nixos,
|
|
||||||
home,
|
|
||||||
nixos-hardware,
|
|
||||||
agenix,
|
|
||||||
deploy,
|
|
||||||
...
|
|
||||||
} @ inputs:
|
|
||||||
digga.lib.mkFlake
|
|
||||||
{
|
{
|
||||||
inherit self inputs;
|
# Track channels with commits tested and built by hydra
|
||||||
|
nixos.url = "github:nixos/nixpkgs/nixos-21.11";
|
||||||
|
latest.url = "github:nixos/nixpkgs/nixos-unstable";
|
||||||
|
|
||||||
channelsConfig = {
|
digga.url = "github:divnix/digga";
|
||||||
# allowUnfree = true;
|
digga.inputs.nixpkgs.follows = "nixos";
|
||||||
};
|
digga.inputs.nixlib.follows = "nixos";
|
||||||
|
digga.inputs.home-manager.follows = "home";
|
||||||
|
digga.inputs.deploy.follows = "deploy";
|
||||||
|
|
||||||
supportedSystems = ["x86_64-linux" "aarch64-linux" "aarch64-darwin"];
|
bud.url = "github:divnix/bud";
|
||||||
|
bud.inputs.nixpkgs.follows = "nixos";
|
||||||
|
bud.inputs.devshell.follows = "digga/devshell";
|
||||||
|
|
||||||
|
home.url = "github:nix-community/home-manager/release-21.11";
|
||||||
|
home.inputs.nixpkgs.follows = "nixos";
|
||||||
|
|
||||||
|
darwin.url = "github:LnL7/nix-darwin";
|
||||||
|
darwin.inputs.nixpkgs.follows = "nixos";
|
||||||
|
|
||||||
|
deploy.url = "github:serokell/deploy-rs";
|
||||||
|
deploy.inputs.nixpkgs.follows = "nixos";
|
||||||
|
|
||||||
|
agenix.url = "github:ryantm/agenix";
|
||||||
|
agenix.inputs.nixpkgs.follows = "nixos";
|
||||||
|
|
||||||
|
nvfetcher.url = "github:berberman/nvfetcher";
|
||||||
|
nvfetcher.inputs.nixpkgs.follows = "nixos";
|
||||||
|
|
||||||
|
naersk.url = "github:nmattia/naersk";
|
||||||
|
naersk.inputs.nixpkgs.follows = "nixos";
|
||||||
|
|
||||||
|
nixos-hardware.url = "github:nixos/nixos-hardware";
|
||||||
|
|
||||||
|
nixos-generators.url = "github:nix-community/nixos-generators";
|
||||||
|
|
||||||
|
# PubSolarOS additions
|
||||||
|
nix-dram.url = "github:dramforever/nix-dram";
|
||||||
|
nix-dram.inputs.nixpkgs.follows = "latest";
|
||||||
|
};
|
||||||
|
|
||||||
|
outputs =
|
||||||
|
{ self
|
||||||
|
, digga
|
||||||
|
, bud
|
||||||
|
, nixos
|
||||||
|
, home
|
||||||
|
, nixos-hardware
|
||||||
|
, nur
|
||||||
|
, agenix
|
||||||
|
, nvfetcher
|
||||||
|
, deploy
|
||||||
|
, nix-dram
|
||||||
|
, ...
|
||||||
|
} @ inputs:
|
||||||
|
digga.lib.mkFlake
|
||||||
|
{
|
||||||
|
inherit self inputs;
|
||||||
|
|
||||||
|
channelsConfig = { allowUnfree = true; };
|
||||||
|
|
||||||
|
channels = {
|
||||||
|
nixos = {
|
||||||
|
imports = [ (digga.lib.importOverlays ./overlays) ];
|
||||||
|
overlays = [
|
||||||
|
nur.overlay
|
||||||
|
agenix.overlay
|
||||||
|
nvfetcher.overlay
|
||||||
|
./pkgs/default.nix
|
||||||
|
];
|
||||||
|
};
|
||||||
|
latest = { };
|
||||||
|
};
|
||||||
|
|
||||||
|
lib = import ./lib { lib = digga.lib // nixos.lib; };
|
||||||
|
|
||||||
|
sharedOverlays = [
|
||||||
|
(final: prev: {
|
||||||
|
__dontExport = true;
|
||||||
|
lib = prev.lib.extend (lfinal: lprev: {
|
||||||
|
our = self.lib;
|
||||||
|
});
|
||||||
|
})
|
||||||
|
];
|
||||||
|
|
||||||
channels = {
|
|
||||||
nixos = {
|
nixos = {
|
||||||
imports = [(digga.lib.importOverlays ./overlays)];
|
hostDefaults = {
|
||||||
overlays = [
|
system = "x86_64-linux";
|
||||||
(self: super: {
|
channelName = "nixos";
|
||||||
deploy-rs = {
|
imports = [ (digga.lib.importExportableModules ./modules) ];
|
||||||
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 = [
|
modules = [
|
||||||
|
{ lib.our = self.lib; }
|
||||||
digga.nixosModules.bootstrapIso
|
digga.nixosModules.bootstrapIso
|
||||||
|
digga.nixosModules.nixConfig
|
||||||
|
home.nixosModules.home-manager
|
||||||
|
agenix.nixosModules.age
|
||||||
|
bud.nixosModules.bud
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
PubSolarOS = {
|
|
||||||
tests = [
|
imports = [ (digga.lib.importHosts ./hosts) ];
|
||||||
#(import ./tests/first-test.nix {
|
hosts = {
|
||||||
# pkgs = nixos.legacyPackages.x86_64-linux;
|
/* set host specific properties here */
|
||||||
# lib = nixos.lib;
|
NixOS = { };
|
||||||
#})
|
|
||||||
];
|
|
||||||
};
|
};
|
||||||
};
|
importables = rec {
|
||||||
importables = rec {
|
profiles = digga.lib.rakeLeaves ./profiles // {
|
||||||
profiles =
|
|
||||||
digga.lib.rakeLeaves ./profiles
|
|
||||||
// {
|
|
||||||
users = digga.lib.rakeLeaves ./users;
|
users = digga.lib.rakeLeaves ./users;
|
||||||
};
|
};
|
||||||
suites = with profiles; rec {
|
suites = with profiles; rec {
|
||||||
base = [users.pub-solar users.root];
|
base = [ core users.nixos users.root ];
|
||||||
iso = base ++ [base-user graphical pub-solar-iso];
|
pubsolaros = [ core base-user users.root ];
|
||||||
pubsolaros = [full-install base-user users.root];
|
anonymous = [ pubsolaros users.nixos ];
|
||||||
anonymous = [pubsolaros users.pub-solar];
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
|
||||||
|
|
||||||
home = {
|
home = {
|
||||||
imports = [(digga.lib.importExportableModules ./users/modules)];
|
imports = [ (digga.lib.importExportableModules ./users/modules) ];
|
||||||
modules = [];
|
modules = [ ];
|
||||||
importables = rec {
|
importables = rec {
|
||||||
profiles = digga.lib.rakeLeaves ./users/profiles;
|
profiles = digga.lib.rakeLeaves ./users/profiles;
|
||||||
suites = with profiles; rec {
|
suites = with profiles; rec {
|
||||||
base = [direnv git];
|
base = [ direnv git ];
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
users = {
|
||||||
|
nixos = { suites, ... }: { imports = suites.base; };
|
||||||
|
}; # digga.lib.importers.rakeLeaves ./users/hm;
|
||||||
};
|
};
|
||||||
users = {
|
|
||||||
pub-solar = {suites, ...}: {
|
|
||||||
imports = suites.base;
|
|
||||||
|
|
||||||
home.stateVersion = "21.03";
|
devshell = ./shell;
|
||||||
};
|
|
||||||
}; # digga.lib.importers.rakeLeaves ./users/hm;
|
|
||||||
};
|
|
||||||
|
|
||||||
devshell = ./shell;
|
homeConfigurations = digga.lib.mkHomeConfigurations self.nixosConfigurations;
|
||||||
|
|
||||||
homeConfigurations = digga.lib.mkHomeConfigurations self.nixosConfigurations;
|
deploy.nodes = digga.lib.mkDeployNodes 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;
|
|
||||||
# };
|
|
||||||
#};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,21 +1,12 @@
|
||||||
{suites, ...}: {
|
{ suites, ... }:
|
||||||
|
{
|
||||||
### root password is empty by default ###
|
### root password is empty by default ###
|
||||||
### default password: pub-solar, optional: add your SSH keys
|
imports = suites.base;
|
||||||
imports =
|
|
||||||
suites.iso;
|
|
||||||
|
|
||||||
boot.loader.systemd-boot.enable = true;
|
boot.loader.systemd-boot.enable = true;
|
||||||
boot.loader.efi.canTouchEfiVariables = true;
|
boot.loader.efi.canTouchEfiVariables = true;
|
||||||
|
|
||||||
networking.networkmanager.enable = 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
|
|
||||||
# on your system were taken. It‘s perfectly fine and recommended to leave
|
|
||||||
# this value at the release version of the first install of this system.
|
|
||||||
# Before changing this value read the documentation for this option
|
|
||||||
# (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
|
|
||||||
system.stateVersion = "22.05"; # Did you read the comment?
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,54 +1,18 @@
|
||||||
|
{ profiles, ... }:
|
||||||
{
|
{
|
||||||
config,
|
# build with: `bud build bootstrap bootstrapIso`
|
||||||
lib,
|
# reachable on the local link via ssh root@fe80::47%eno1
|
||||||
pkgs,
|
# where 'eno1' is replaced by your own machine's network
|
||||||
profiles,
|
# interface that has the local link to the target machine
|
||||||
...
|
|
||||||
}:
|
|
||||||
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 = [
|
imports = [
|
||||||
# profiles.networking
|
# profiles.networking
|
||||||
|
profiles.core
|
||||||
profiles.users.root # make sure to configure ssh keys
|
profiles.users.root # make sure to configure ssh keys
|
||||||
profiles.users.pub-solar
|
profiles.users.nixos
|
||||||
profiles.base-user
|
|
||||||
profiles.graphical
|
|
||||||
profiles.pub-solar-iso
|
|
||||||
];
|
];
|
||||||
|
|
||||||
config = {
|
boot.loader.systemd-boot.enable = true;
|
||||||
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"; };
|
||||||
|
|
||||||
system.nixos.label = "PubSolarOS-" + config.system.nixos.version;
|
|
||||||
|
|
||||||
# mkForce because a similar transformation gets double applied otherwise
|
|
||||||
# https://github.com/divnix/digga/blob/30ffa0b02272dc56c94fd3c7d8a5a0f07ca197bf/modules/bootstrap-iso.nix#L17
|
|
||||||
# https://github.com/NixOS/nixpkgs/blob/aecd4d8349b94f9bd5718c74a5b789f233f67326/nixos/modules/installer/cd-dvd/installation-cd-base.nix#L21-L22
|
|
||||||
isoImage = {
|
|
||||||
isoBaseName = mkForce (getFqdn config);
|
|
||||||
isoName = mkForce "${config.system.nixos.label}-${config.isoImage.isoBaseName}-${pkgs.stdenv.hostPlatform.system}.iso";
|
|
||||||
};
|
|
||||||
|
|
||||||
# This value determines the NixOS release from which the default
|
|
||||||
# settings for stateful data, like file locations and database versions
|
|
||||||
# on your system were taken. It‘s perfectly fine and recommended to leave
|
|
||||||
# this value at the release version of the first install of this system.
|
|
||||||
# Before changing this value read the documentation for this option
|
|
||||||
# (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
|
|
||||||
system.stateVersion = "21.05"; # Did you read the comment?
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,21 +1,14 @@
|
||||||
let
|
let
|
||||||
lock = builtins.fromJSON (builtins.readFile builtins.path {
|
rev = "e7e5d481a0e15dcd459396e55327749989e04ce0";
|
||||||
path = ../../flake.lock;
|
flake = (import
|
||||||
name = "lockPath";
|
|
||||||
});
|
|
||||||
flake =
|
|
||||||
import
|
|
||||||
(
|
(
|
||||||
fetchTarball {
|
fetchTarball {
|
||||||
url = "https://github.com/edolstra/flake-compat/archive/${lock.nodes.flake-compat.locked.rev}.tar.gz";
|
url = "https://github.com/edolstra/flake-compat/archive/${rev}.tar.gz";
|
||||||
sha256 = lock.nodes.flake-compat.locked.narHash;
|
sha256 = "0zd3x46fswh5n6faq4x2kkpy6p3c6j593xbdlbsl40ppkclwc80x";
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
src = builtins.path {
|
src = ../../.;
|
||||||
path = ../../.;
|
});
|
||||||
name = "projectRoot";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
in
|
in
|
||||||
flake
|
flake
|
||||||
|
|
|
@ -1,9 +1,10 @@
|
||||||
{...}: let
|
{ ... }:
|
||||||
|
let
|
||||||
inherit (default.inputs.nixos) lib;
|
inherit (default.inputs.nixos) lib;
|
||||||
|
|
||||||
host = configs.${hostname} or configs.PubSolarOS;
|
host = configs.${hostname} or configs.NixOS;
|
||||||
configs = default.nixosConfigurations;
|
configs = default.nixosConfigurations;
|
||||||
default = (import ../.).defaultNix;
|
default = (import ../.).defaultNix;
|
||||||
hostname = lib.fileContents /etc/hostname;
|
hostname = lib.fileContents /etc/hostname;
|
||||||
in
|
in
|
||||||
host
|
host
|
||||||
|
|
|
@ -1,10 +1,2 @@
|
||||||
{lib}:
|
{ lib }:
|
||||||
lib.makeExtensible (self: let
|
lib.makeExtensible (self: { })
|
||||||
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"
|
|
||||||
})
|
|
||||||
|
|
|
@ -1,27 +0,0 @@
|
||||||
{
|
|
||||||
lib,
|
|
||||||
config,
|
|
||||||
pkgs,
|
|
||||||
...
|
|
||||||
}:
|
|
||||||
with lib; let
|
|
||||||
psCfg = config.pub-solar;
|
|
||||||
cfg = config.pub-solar.devops;
|
|
||||||
in {
|
|
||||||
options.pub-solar.arduino = {
|
|
||||||
enable = mkEnableOption "Life with home automation";
|
|
||||||
};
|
|
||||||
config = mkIf cfg.enable {
|
|
||||||
users.users = pkgs.lib.setAttrByPath [psCfg.user.name] {
|
|
||||||
extraGroups = ["dialout"];
|
|
||||||
};
|
|
||||||
|
|
||||||
home-manager = with pkgs;
|
|
||||||
pkgs.lib.setAttrByPath ["users" psCfg.user.name] {
|
|
||||||
home.packages = [
|
|
||||||
arduino
|
|
||||||
arduino-cli
|
|
||||||
];
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
|
@ -1,120 +1,79 @@
|
||||||
{
|
{ lib, config, pkgs, ... }:
|
||||||
lib,
|
with lib;
|
||||||
config,
|
let
|
||||||
pkgs,
|
|
||||||
...
|
|
||||||
}:
|
|
||||||
with lib; let
|
|
||||||
psCfg = config.pub-solar;
|
psCfg = config.pub-solar;
|
||||||
cfg = config.pub-solar.audio;
|
cfg = config.pub-solar.audio;
|
||||||
xdg = config.home-manager.users."${psCfg.user.name}".xdg;
|
xdg = config.home-manager.users."${psCfg.user.name}".xdg;
|
||||||
in {
|
in
|
||||||
|
{
|
||||||
options.pub-solar.audio = {
|
options.pub-solar.audio = {
|
||||||
enable = mkEnableOption "Life in highs and lows";
|
enable = mkEnableOption "Life in highs and lows";
|
||||||
mopidy.enable = mkEnableOption "Life with mopidy";
|
|
||||||
spotify.enable = mkEnableOption "Life in DRM";
|
|
||||||
spotify.username = mkOption {
|
|
||||||
description = "Spotify login username or email";
|
|
||||||
type = types.str;
|
|
||||||
example = "yourname@example.com";
|
|
||||||
default = "";
|
|
||||||
};
|
|
||||||
bluetooth.enable = mkEnableOption "Life with bluetooth";
|
|
||||||
};
|
};
|
||||||
|
|
||||||
config = mkIf cfg.enable {
|
config = mkIf cfg.enable {
|
||||||
users.users = pkgs.lib.setAttrByPath [psCfg.user.name] {
|
home-manager = with pkgs; pkgs.lib.setAttrByPath [ "users" psCfg.user.name ] {
|
||||||
extraGroups = ["audio"];
|
home.packages = [
|
||||||
|
# easyeffects, e.g. for microphone noise filtering
|
||||||
|
easyeffects
|
||||||
|
mu
|
||||||
|
pavucontrol
|
||||||
|
pa_applet
|
||||||
|
playerctl
|
||||||
|
# Needed for pactl cmd, until pw-cli is more mature (vol up/down hotkeys?)
|
||||||
|
pulseaudio
|
||||||
|
vimpc
|
||||||
|
];
|
||||||
|
xdg.configFile."vimpc/vimpcrc".source = ./.config/vimpc/vimpcrc;
|
||||||
|
systemd.user.services.easyeffects = import ./easyeffects.service.nix pkgs;
|
||||||
};
|
};
|
||||||
|
|
||||||
home-manager = with pkgs;
|
# Enable sound using pipewire-pulse
|
||||||
pkgs.lib.setAttrByPath ["users" psCfg.user.name] {
|
|
||||||
home.packages =
|
|
||||||
[
|
|
||||||
# easyeffects, e.g. for microphone noise filtering
|
|
||||||
easyeffects
|
|
||||||
mu
|
|
||||||
pavucontrol
|
|
||||||
pa_applet
|
|
||||||
playerctl
|
|
||||||
# Needed for pactl cmd, until pw-cli is more mature (vol up/down hotkeys?)
|
|
||||||
pulseaudio
|
|
||||||
vimpc
|
|
||||||
]
|
|
||||||
++ (
|
|
||||||
if cfg.spotify.enable
|
|
||||||
then [pkgs.spotify-tui]
|
|
||||||
else []
|
|
||||||
);
|
|
||||||
xdg.configFile."vimpc/vimpcrc".source = ./.config/vimpc/vimpcrc;
|
|
||||||
systemd.user.services.easyeffects = import ./easyeffects.service.nix pkgs;
|
|
||||||
|
|
||||||
services.spotifyd = mkIf cfg.spotify.enable {
|
|
||||||
enable = true;
|
|
||||||
settings = {
|
|
||||||
global = {
|
|
||||||
username = cfg.spotify.username;
|
|
||||||
password_cmd = "DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/1001/bus ${pkgs.libsecret}/bin/secret-tool lookup spotify password";
|
|
||||||
bitrate = 320;
|
|
||||||
volume_normalisation = true;
|
|
||||||
no_audio_cache = false;
|
|
||||||
max_cache_size = 1000000000;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
# 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 = {
|
services.pipewire = {
|
||||||
enable = true;
|
enable = true;
|
||||||
alsa.enable = true;
|
alsa.enable = true;
|
||||||
alsa.support32Bit = true;
|
alsa.support32Bit = true;
|
||||||
pulse.enable = true;
|
pulse.enable = true;
|
||||||
};
|
|
||||||
|
|
||||||
# Make pulseaudio listen on port 4713 for mopidy, extending the default
|
config.pipewire = {
|
||||||
# config: https://gitlab.freedesktop.org/pipewire/pipewire/-/blob/master/src/daemon/pipewire-pulse.conf.in
|
context.default.clock = {
|
||||||
environment.etc = mkIf cfg.mopidy.enable {
|
allowed-rates = [ 44100 48000 88200 96000 ];
|
||||||
"pipewire/pipewire-pulse.conf.d/99-custom.conf".text = ''
|
rate = 44100;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
config.pipewire-pulse = builtins.fromJSON (builtins.readFile ./pipewire-pulse.conf.json);
|
||||||
|
|
||||||
|
# Bluetooth configuration for pipewire
|
||||||
|
media-session.config.bluez-monitor.rules = [
|
||||||
{
|
{
|
||||||
"context.modules": [
|
# Matches all cards
|
||||||
{
|
matches = [{ "device.name" = "~bluez_card.*"; }];
|
||||||
"name": "libpipewire-module-protocol-pulse",
|
actions = {
|
||||||
"args": {
|
"update-props" = {
|
||||||
"server.address": ["unix:native", "tcp:4713"],
|
"bluez5.reconnect-profiles" = [ "hfp_hf" "hsp_hs" "a2dp_sink" ];
|
||||||
"vm.overrides": {
|
# mSBC is not expected to work on all headset + adapter combinations.
|
||||||
"pulse.min.quantum": "1024/48000"
|
"bluez5.msbc-support" = true;
|
||||||
}
|
};
|
||||||
}
|
};
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
}
|
||||||
'';
|
{
|
||||||
|
matches = [
|
||||||
|
# Matches all sources
|
||||||
|
{ "node.name" = "~bluez_input.*"; }
|
||||||
|
# Matches all outputs
|
||||||
|
{ "node.name" = "~bluez_output.*"; }
|
||||||
|
];
|
||||||
|
actions = {
|
||||||
|
"node.pause-on-idle" = false;
|
||||||
|
};
|
||||||
|
}
|
||||||
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
# Enable bluetooth
|
# Enable bluetooth
|
||||||
hardware.bluetooth = mkIf cfg.bluetooth.enable {
|
hardware.bluetooth.enable = true;
|
||||||
enable = true;
|
services.blueman.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
|
# Enable audio server & client
|
||||||
services.mopidy = mkIf cfg.mopidy.enable ((import ./mopidy.nix) pkgs);
|
services.mopidy = import ./mopidy.nix pkgs;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,4 +1,5 @@
|
||||||
pkgs: {
|
pkgs:
|
||||||
|
{
|
||||||
Service = {
|
Service = {
|
||||||
Type = "dbus";
|
Type = "dbus";
|
||||||
BusName = "com.github.wwmm.easyeffects";
|
BusName = "com.github.wwmm.easyeffects";
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
pkgs: {
|
pkgs: {
|
||||||
enable = true;
|
enable = true;
|
||||||
extensionPackages = with pkgs; [
|
extensionPackages = with pkgs; [
|
||||||
|
mopidy-spotify
|
||||||
mopidy-mpd
|
mopidy-mpd
|
||||||
mopidy-soundcloud
|
mopidy-soundcloud
|
||||||
mopidy-youtube
|
mopidy-youtube
|
||||||
|
|
42
modules/audio/pipewire-pulse.conf.json
Normal file
42
modules/audio/pipewire-pulse.conf.json
Normal file
|
@ -0,0 +1,42 @@
|
||||||
|
{
|
||||||
|
"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": {}
|
||||||
|
}
|
|
@ -1,45 +0,0 @@
|
||||||
{
|
|
||||||
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;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
6
modules/compat/default.nix
Normal file
6
modules/compat/default.nix
Normal file
|
@ -0,0 +1,6 @@
|
||||||
|
{ 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" ];
|
||||||
|
}
|
|
@ -1,45 +0,0 @@
|
||||||
{
|
|
||||||
config,
|
|
||||||
pkgs,
|
|
||||||
lib,
|
|
||||||
...
|
|
||||||
}:
|
|
||||||
with lib; let
|
|
||||||
cfg = config.pub-solar.core;
|
|
||||||
in {
|
|
||||||
options.pub-solar.core.iso-options.enable = mkOption {
|
|
||||||
type = types.bool;
|
|
||||||
default = false;
|
|
||||||
description = "Feature flag for iso builds";
|
|
||||||
};
|
|
||||||
|
|
||||||
options.pub-solar.core.disk-encryption-active = mkOption {
|
|
||||||
type = types.bool;
|
|
||||||
default = true;
|
|
||||||
description = "Whether it should be assumed that there is a cryptroot device";
|
|
||||||
};
|
|
||||||
|
|
||||||
config = {
|
|
||||||
boot = {
|
|
||||||
# Enable plymouth for better experience of booting
|
|
||||||
plymouth.enable = mkIf (!cfg.lite) (lib.mkDefault true);
|
|
||||||
|
|
||||||
# Mount / luks device in initrd
|
|
||||||
# Allow fstrim to work on it.
|
|
||||||
# The ! makes this enabled by default
|
|
||||||
initrd = mkIf (!cfg.iso-options.enable && cfg.disk-encryption-active) {
|
|
||||||
luks.devices."cryptroot" = {
|
|
||||||
allowDiscards = true;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
loader.systemd-boot.enable = lib.mkDefault true;
|
|
||||||
|
|
||||||
# Use latest LTS linux kernel by default
|
|
||||||
kernelPackages = lib.mkDefault pkgs.linuxPackages_6_1;
|
|
||||||
|
|
||||||
# Support ntfs drives
|
|
||||||
supportedFilesystems = ["ntfs"];
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
|
@ -1,42 +0,0 @@
|
||||||
{
|
|
||||||
config,
|
|
||||||
lib,
|
|
||||||
...
|
|
||||||
}:
|
|
||||||
with lib; let
|
|
||||||
cfg = config.pub-solar.core;
|
|
||||||
in {
|
|
||||||
imports = [
|
|
||||||
./boot.nix
|
|
||||||
./hibernation.nix
|
|
||||||
./fonts.nix
|
|
||||||
./i18n.nix
|
|
||||||
./networking.nix
|
|
||||||
./nix.nix
|
|
||||||
./packages.nix
|
|
||||||
./services.nix
|
|
||||||
];
|
|
||||||
|
|
||||||
options.pub-solar.core = {
|
|
||||||
lite = mkOption {
|
|
||||||
description = ''
|
|
||||||
Enable a lite edition of core with less default modules and a reduced package set.
|
|
||||||
'';
|
|
||||||
default = false;
|
|
||||||
type = types.bool;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
config = {
|
|
||||||
pub-solar = {
|
|
||||||
audio.enable = mkIf (!cfg.lite) (mkDefault true);
|
|
||||||
crypto.enable = mkIf (!cfg.lite) (mkDefault true);
|
|
||||||
devops.enable = mkIf (!cfg.lite) (mkDefault true);
|
|
||||||
|
|
||||||
terminal-life = {
|
|
||||||
enable = mkDefault true;
|
|
||||||
lite = cfg.lite;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
|
@ -1,14 +0,0 @@
|
||||||
{
|
|
||||||
config,
|
|
||||||
pkgs,
|
|
||||||
lib,
|
|
||||||
...
|
|
||||||
}: {
|
|
||||||
fonts = {
|
|
||||||
fonts = with pkgs; [powerline-fonts dejavu_fonts];
|
|
||||||
fontconfig.defaultFonts = {
|
|
||||||
monospace = ["DejaVu Sans Mono for Powerline"];
|
|
||||||
sansSerif = ["DejaVu Sans"];
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
|
@ -1,36 +0,0 @@
|
||||||
{
|
|
||||||
config,
|
|
||||||
pkgs,
|
|
||||||
lib,
|
|
||||||
...
|
|
||||||
}:
|
|
||||||
with lib; let
|
|
||||||
cfg = config.pub-solar.core.hibernation;
|
|
||||||
in {
|
|
||||||
options.pub-solar.core.hibernation = {
|
|
||||||
enable = mkOption {
|
|
||||||
type = types.bool;
|
|
||||||
default = false;
|
|
||||||
description = "Whether the device can hibernate. This creates a swapfile at /swapfile.";
|
|
||||||
};
|
|
||||||
|
|
||||||
resumeDevice = mkOption {
|
|
||||||
type = types.nullOr types.str;
|
|
||||||
default = null;
|
|
||||||
description = "The location of the hibernation resume swap file.";
|
|
||||||
};
|
|
||||||
|
|
||||||
resumeOffset = mkOption {
|
|
||||||
type = types.nullOr types.int;
|
|
||||||
default = null;
|
|
||||||
description = "The swap file offset. Can be found by running `filefrag -v $swap_file_location`. See https://wiki.archlinux.org/title/Power_management/Suspend_and_hibernate#Hibernation_into_swap_file";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
config = {
|
|
||||||
boot = mkIf cfg.enable {
|
|
||||||
resumeDevice = mkIf (cfg.resumeDevice != null) cfg.resumeDevice;
|
|
||||||
kernelParams = mkIf (cfg.resumeOffset != null) ["resume_offset=${builtins.toString cfg.resumeOffset}"];
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
|
@ -1,85 +0,0 @@
|
||||||
{
|
|
||||||
config,
|
|
||||||
pkgs,
|
|
||||||
lib,
|
|
||||||
...
|
|
||||||
}:
|
|
||||||
with lib; let
|
|
||||||
cfg = config.pub-solar.core;
|
|
||||||
in {
|
|
||||||
options.pub-solar.core = {
|
|
||||||
enableCaddy = mkOption {
|
|
||||||
type = types.bool;
|
|
||||||
default = !cfg.lite;
|
|
||||||
};
|
|
||||||
enableHelp = mkOption {
|
|
||||||
type = types.bool;
|
|
||||||
default = !cfg.lite;
|
|
||||||
};
|
|
||||||
|
|
||||||
binaryCaches = mkOption {
|
|
||||||
type = types.listOf types.str;
|
|
||||||
default = [];
|
|
||||||
description = "Binary caches to use.";
|
|
||||||
};
|
|
||||||
publicKeys = mkOption {
|
|
||||||
type = types.listOf types.str;
|
|
||||||
default = [];
|
|
||||||
description = "Public keys of binary caches.";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
config = {
|
|
||||||
# disable NetworkManager 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.settings.substituters = cfg.binaryCaches;
|
|
||||||
nix.settings.trusted-public-keys = cfg.publicKeys;
|
|
||||||
|
|
||||||
# These entries get added to /etc/hosts
|
|
||||||
networking.hosts = {
|
|
||||||
"127.0.0.1" =
|
|
||||||
[]
|
|
||||||
++ lib.optionals cfg.enableCaddy ["caddy.local"]
|
|
||||||
++ lib.optionals config.pub-solar.printing.enable ["cups.local"]
|
|
||||||
++ lib.optionals cfg.enableHelp ["help.local"];
|
|
||||||
};
|
|
||||||
|
|
||||||
# Caddy reverse proxy for local services like cups
|
|
||||||
services.caddy = {
|
|
||||||
enable = lib.mkDefault cfg.enableCaddy;
|
|
||||||
globalConfig = lib.mkDefault ''
|
|
||||||
default_bind 127.0.0.1
|
|
||||||
auto_https off
|
|
||||||
'';
|
|
||||||
extraConfig = lib.mkDefault (concatStringsSep "\n" [
|
|
||||||
(lib.optionalString
|
|
||||||
config.pub-solar.printing.enable
|
|
||||||
''
|
|
||||||
cups.local:80 {
|
|
||||||
request_header Host localhost:631
|
|
||||||
reverse_proxy unix//run/cups/cups.sock
|
|
||||||
}
|
|
||||||
'')
|
|
||||||
|
|
||||||
(lib.optionalString
|
|
||||||
cfg.enableHelp
|
|
||||||
''
|
|
||||||
help.local:80 {
|
|
||||||
root * ${pkgs.psos-docs}/lib/html
|
|
||||||
file_server
|
|
||||||
}
|
|
||||||
'')
|
|
||||||
]);
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
|
@ -1,32 +0,0 @@
|
||||||
{
|
|
||||||
config,
|
|
||||||
pkgs,
|
|
||||||
lib,
|
|
||||||
inputs,
|
|
||||||
...
|
|
||||||
}: {
|
|
||||||
nix = {
|
|
||||||
# Use default version alias for nix package
|
|
||||||
package = pkgs.nix;
|
|
||||||
gc.automatic = true;
|
|
||||||
optimise.automatic = true;
|
|
||||||
settings = {
|
|
||||||
# Improve nix store disk usage
|
|
||||||
auto-optimise-store = true;
|
|
||||||
# Prevents impurities in builds
|
|
||||||
sandbox = true;
|
|
||||||
# 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 = lib.mkForce ''
|
|
||||||
experimental-features = flakes nix-command
|
|
||||||
min-free = 536870912
|
|
||||||
keep-outputs = true
|
|
||||||
keep-derivations = true
|
|
||||||
fallback = true
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
}
|
|
|
@ -1,79 +0,0 @@
|
||||||
{
|
|
||||||
config,
|
|
||||||
pkgs,
|
|
||||||
lib,
|
|
||||||
...
|
|
||||||
}:
|
|
||||||
with lib; let
|
|
||||||
psCfg = config.pub-solar;
|
|
||||||
cfg = config.pub-solar.core;
|
|
||||||
in {
|
|
||||||
environment = {
|
|
||||||
systemPackages = with pkgs;
|
|
||||||
[
|
|
||||||
# Core unix utility packages
|
|
||||||
coreutils-full
|
|
||||||
dnsutils
|
|
||||||
inetutils
|
|
||||||
progress
|
|
||||||
pciutils
|
|
||||||
usbutils
|
|
||||||
|
|
||||||
wget
|
|
||||||
openssl
|
|
||||||
openssh
|
|
||||||
curl
|
|
||||||
htop
|
|
||||||
btop
|
|
||||||
lsof
|
|
||||||
psmisc
|
|
||||||
file
|
|
||||||
|
|
||||||
# zippit
|
|
||||||
zip
|
|
||||||
unzip
|
|
||||||
|
|
||||||
# Modern modern utilities
|
|
||||||
p7zip
|
|
||||||
croc
|
|
||||||
jq
|
|
||||||
]
|
|
||||||
++ lib.optionals (!cfg.lite) [
|
|
||||||
mtr
|
|
||||||
|
|
||||||
gitFull
|
|
||||||
git-lfs
|
|
||||||
git-bug
|
|
||||||
|
|
||||||
xdg-utils
|
|
||||||
sysfsutils
|
|
||||||
renameutils
|
|
||||||
nfs-utils
|
|
||||||
moreutils
|
|
||||||
mailutils
|
|
||||||
keyutils
|
|
||||||
input-utils
|
|
||||||
elfutils
|
|
||||||
binutils
|
|
||||||
dateutils
|
|
||||||
diffutils
|
|
||||||
findutils
|
|
||||||
exfat
|
|
||||||
|
|
||||||
# Nix specific utilities
|
|
||||||
alejandra
|
|
||||||
niv
|
|
||||||
manix
|
|
||||||
nix-index
|
|
||||||
nix-tree
|
|
||||||
nixpkgs-review
|
|
||||||
# Build broken, python2.7-PyJWT-2.0.1.drv' failed
|
|
||||||
#nixops
|
|
||||||
psos
|
|
||||||
nvd
|
|
||||||
|
|
||||||
# Fun
|
|
||||||
neofetch
|
|
||||||
];
|
|
||||||
};
|
|
||||||
}
|
|
|
@ -1,18 +0,0 @@
|
||||||
{
|
|
||||||
config,
|
|
||||||
pkgs,
|
|
||||||
lib,
|
|
||||||
...
|
|
||||||
}: {
|
|
||||||
# For rage encryption, all hosts need a ssh key pair
|
|
||||||
services.openssh = {
|
|
||||||
enable = true;
|
|
||||||
# If you don't want the host to have SSH actually opened up to the net,
|
|
||||||
# set `services.openssh.openFirewall` to false in your config.
|
|
||||||
openFirewall = lib.mkDefault true;
|
|
||||||
settings.PasswordAuthentication = lib.mkDefault false;
|
|
||||||
};
|
|
||||||
|
|
||||||
# Service that makes Out of Memory Killer more effective
|
|
||||||
services.earlyoom.enable = true;
|
|
||||||
}
|
|
|
@ -1,45 +1,41 @@
|
||||||
{
|
{ lib, config, pkgs, ... }:
|
||||||
lib,
|
with lib;
|
||||||
config,
|
let
|
||||||
pkgs,
|
|
||||||
...
|
|
||||||
}:
|
|
||||||
with lib; let
|
|
||||||
psCfg = config.pub-solar;
|
psCfg = config.pub-solar;
|
||||||
cfg = config.pub-solar.crypto;
|
cfg = config.pub-solar.crypto;
|
||||||
in {
|
in
|
||||||
|
{
|
||||||
options.pub-solar.crypto = {
|
options.pub-solar.crypto = {
|
||||||
enable = mkEnableOption "Life in private";
|
enable = mkEnableOption "Life in private";
|
||||||
};
|
};
|
||||||
|
|
||||||
config = mkIf cfg.enable {
|
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.pcscd.enable = true;
|
||||||
|
|
||||||
services.gnome.gnome-keyring.enable = true;
|
services.gnome.gnome-keyring.enable = true;
|
||||||
|
|
||||||
home-manager = with pkgs;
|
home-manager = with pkgs; pkgs.lib.setAttrByPath [ "users" psCfg.user.name ] {
|
||||||
pkgs.lib.setAttrByPath ["users" psCfg.user.name] {
|
systemd.user.services.polkit-gnome-authentication-agent = import ./polkit-gnome-authentication-agent.service.nix pkgs;
|
||||||
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 = [
|
||||||
|
gnome3.seahorse
|
||||||
|
keepassxc
|
||||||
|
libsecret
|
||||||
|
qMasterPassword
|
||||||
|
restic
|
||||||
|
];
|
||||||
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,15 +1,16 @@
|
||||||
pkgs: {
|
pkgs:
|
||||||
|
{
|
||||||
Unit = {
|
Unit = {
|
||||||
Description = "Legacy polkit authentication agent for GNOME";
|
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 = {
|
Service = {
|
||||||
Type = "simple";
|
Type = "simple";
|
||||||
ExecStart = "${pkgs.polkit_gnome}/libexec/polkit-gnome-authentication-agent-1";
|
ExecStart = "${pkgs.polkit_gnome}/libexec/polkit-gnome-authentication-agent-1";
|
||||||
};
|
};
|
||||||
Install = {
|
Install = {
|
||||||
WantedBy = ["sway-session.target"];
|
WantedBy = [ "sway-session.target" ];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,30 +1,25 @@
|
||||||
{
|
{ lib, config, pkgs, ... }:
|
||||||
lib,
|
with lib;
|
||||||
config,
|
let
|
||||||
pkgs,
|
|
||||||
...
|
|
||||||
}:
|
|
||||||
with lib; let
|
|
||||||
psCfg = config.pub-solar;
|
psCfg = config.pub-solar;
|
||||||
cfg = config.pub-solar.devops;
|
cfg = config.pub-solar.devops;
|
||||||
in {
|
in
|
||||||
|
{
|
||||||
options.pub-solar.devops = {
|
options.pub-solar.devops = {
|
||||||
enable = mkEnableOption "Life automated";
|
enable = mkEnableOption "Life automated";
|
||||||
};
|
};
|
||||||
|
|
||||||
config = mkIf cfg.enable {
|
config = mkIf cfg.enable {
|
||||||
home-manager = with pkgs;
|
home-manager = with pkgs; pkgs.lib.setAttrByPath [ "users" psCfg.user.name ] {
|
||||||
pkgs.lib.setAttrByPath ["users" psCfg.user.name] {
|
home.packages = [
|
||||||
home.packages = [
|
drone-cli
|
||||||
drone-cli
|
nmap
|
||||||
nmap
|
pgcli
|
||||||
pgcli
|
python38Packages.ansible
|
||||||
ansible
|
restic
|
||||||
ansible-lint
|
shellcheck
|
||||||
restic
|
terraform_0_15
|
||||||
shellcheck
|
];
|
||||||
terraform
|
};
|
||||||
];
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,114 +0,0 @@
|
||||||
{
|
|
||||||
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
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
}
|
|
|
@ -1,24 +1,19 @@
|
||||||
{
|
{ lib, config, pkgs, ... }:
|
||||||
lib,
|
with lib;
|
||||||
config,
|
let
|
||||||
pkgs,
|
|
||||||
...
|
|
||||||
}:
|
|
||||||
with lib; let
|
|
||||||
psCfg = config.pub-solar;
|
psCfg = config.pub-solar;
|
||||||
cfg = config.pub-solar.docker;
|
cfg = config.pub-solar.docker;
|
||||||
in {
|
in
|
||||||
|
{
|
||||||
options.pub-solar.docker = {
|
options.pub-solar.docker = {
|
||||||
enable = mkEnableOption "Life in metal boxes";
|
enable = mkEnableOption "Life in metal boxes";
|
||||||
};
|
};
|
||||||
|
|
||||||
config = mkIf cfg.enable {
|
config = mkIf cfg.enable {
|
||||||
virtualisation.docker.enable = true;
|
virtualisation.docker.enable = true;
|
||||||
virtualisation.docker.package = pkgs.docker_24;
|
users.users = with pkgs; pkgs.lib.setAttrByPath [ psCfg.user.name ] {
|
||||||
users.users = with pkgs;
|
extraGroups = [ "docker" ];
|
||||||
pkgs.lib.setAttrByPath [psCfg.user.name] {
|
};
|
||||||
extraGroups = ["docker"];
|
|
||||||
};
|
|
||||||
|
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
docker-compose
|
docker-compose
|
||||||
|
|
|
@ -1,33 +1,29 @@
|
||||||
{
|
{ lib, config, pkgs, ... }:
|
||||||
lib,
|
with lib;
|
||||||
config,
|
let
|
||||||
pkgs,
|
|
||||||
...
|
|
||||||
}:
|
|
||||||
with lib; let
|
|
||||||
psCfg = config.pub-solar;
|
psCfg = config.pub-solar;
|
||||||
cfg = config.pub-solar.email;
|
cfg = config.pub-solar.email;
|
||||||
in {
|
in
|
||||||
|
{
|
||||||
options.pub-solar.email = {
|
options.pub-solar.email = {
|
||||||
enable = mkEnableOption "Life in headers";
|
enable = mkEnableOption "Life in headers";
|
||||||
};
|
};
|
||||||
|
|
||||||
config = mkIf cfg.enable {
|
config = mkIf cfg.enable {
|
||||||
home-manager = with pkgs;
|
home-manager = with pkgs; pkgs.lib.setAttrByPath [ "users" psCfg.user.name ] {
|
||||||
pkgs.lib.setAttrByPath ["users" psCfg.user.name] {
|
home.packages = [
|
||||||
home.packages = [
|
w3m
|
||||||
w3m
|
urlscan
|
||||||
urlscan
|
neomutt
|
||||||
neomutt
|
offlineimap
|
||||||
offlineimap
|
msmtp
|
||||||
msmtp
|
mailto-mutt
|
||||||
mailto-mutt
|
];
|
||||||
];
|
|
||||||
|
|
||||||
programs.offlineimap = {
|
programs.offlineimap = {
|
||||||
enable = true;
|
enable = true;
|
||||||
pythonFile = builtins.readFile ./offlineimap.py;
|
pythonFile = builtins.readFile ./offlineimap.py;
|
||||||
};
|
|
||||||
};
|
};
|
||||||
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
1
modules/email/offlineimap.nix
Normal file
1
modules/email/offlineimap.nix
Normal file
|
@ -0,0 +1 @@
|
||||||
|
|
|
@ -1,13 +1,10 @@
|
||||||
{
|
{ lib, config, pkgs, ... }:
|
||||||
lib,
|
with lib;
|
||||||
config,
|
let
|
||||||
pkgs,
|
|
||||||
...
|
|
||||||
}:
|
|
||||||
with lib; let
|
|
||||||
psCfg = config.pub-solar;
|
psCfg = config.pub-solar;
|
||||||
cfg = config.pub-solar.gaming;
|
cfg = config.pub-solar.gaming;
|
||||||
in {
|
in
|
||||||
|
{
|
||||||
options.pub-solar.gaming = {
|
options.pub-solar.gaming = {
|
||||||
enable = mkEnableOption "Life in shooters";
|
enable = mkEnableOption "Life in shooters";
|
||||||
};
|
};
|
||||||
|
@ -15,17 +12,16 @@ in {
|
||||||
config = mkIf cfg.enable {
|
config = mkIf cfg.enable {
|
||||||
programs.steam.enable = true;
|
programs.steam.enable = true;
|
||||||
nixpkgs.config.packageOverrides = pkgs: {
|
nixpkgs.config.packageOverrides = pkgs: {
|
||||||
steam = pkgs.steam.override {};
|
steam = pkgs.steam.override { };
|
||||||
};
|
};
|
||||||
|
|
||||||
home-manager = with pkgs;
|
home-manager = with pkgs; pkgs.lib.setAttrByPath [ "users" psCfg.user.name ] {
|
||||||
pkgs.lib.setAttrByPath ["users" psCfg.user.name] {
|
home.packages = [
|
||||||
home.packages = [
|
playonlinux
|
||||||
playonlinux
|
godot
|
||||||
godot
|
obs-studio
|
||||||
obs-studio
|
obs-studio-plugins.wlrobs
|
||||||
obs-studio-plugins.wlrobs
|
];
|
||||||
];
|
};
|
||||||
};
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
1
modules/gaming/steam.nix
Normal file
1
modules/gaming/steam.nix
Normal file
|
@ -0,0 +1 @@
|
||||||
|
|
|
@ -66,97 +66,29 @@
|
||||||
x = 0;
|
x = 0;
|
||||||
y = 0;
|
y = 0;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
use_thin_strokes = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
key_bindings = [
|
key_bindings = [
|
||||||
{
|
{ key = "V"; mods = "Control|Alt"; action = "Paste"; }
|
||||||
key = "V";
|
{ key = "C"; mods = "Control|Alt"; action = "Copy"; }
|
||||||
mods = "Control|Alt";
|
{ key = "Paste"; action = "Paste"; }
|
||||||
action = "Paste";
|
{ key = "Copy"; action = "Copy"; }
|
||||||
}
|
{ key = "Q"; mods = "Command"; action = "Quit"; }
|
||||||
{
|
{ key = "W"; mods = "Command"; action = "Quit"; }
|
||||||
key = "C";
|
{ key = "Insert"; mods = "Shift"; action = "PasteSelection"; }
|
||||||
mods = "Control|Alt";
|
{ key = "Key0"; mods = "Control"; action = "ResetFontSize"; }
|
||||||
action = "Copy";
|
{ key = "Equals"; mods = "Control"; action = "IncreaseFontSize"; }
|
||||||
}
|
{ key = "PageUp"; mods = "Shift"; action = "ScrollPageUp"; }
|
||||||
{
|
{ key = "PageDown"; mods = "Shift"; action = "ScrollPageDown"; }
|
||||||
key = "Paste";
|
{ key = "Minus"; mods = "Control"; action = "DecreaseFontSize"; }
|
||||||
action = "Paste";
|
{ key = "H"; mode = "Vi|~Search"; action = "ScrollToBottom"; }
|
||||||
}
|
{ key = "H"; mode = "Vi|~Search"; action = "ToggleViMode"; }
|
||||||
{
|
{ key = "I"; mode = "Vi|~Search"; action = "Up"; }
|
||||||
key = "Copy";
|
{ key = "K"; mode = "Vi|~Search"; action = "Down"; }
|
||||||
action = "Copy";
|
{ key = "J"; mode = "Vi|~Search"; action = "Left"; }
|
||||||
}
|
{ 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
|
# Base16 Burn 256 - alacritty color config
|
||||||
|
@ -168,15 +100,10 @@
|
||||||
foreground = "0xe3e1e4";
|
foreground = "0xe3e1e4";
|
||||||
};
|
};
|
||||||
|
|
||||||
# Cursor colors
|
# Colors the cursor will use if `custom_cursor_colors` is true
|
||||||
#
|
|
||||||
# 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 = {
|
cursor = {
|
||||||
text = "CellBackground";
|
text = "0x1a181a";
|
||||||
cursor = "CellForeground";
|
cursor = "0xe3e1e4";
|
||||||
};
|
};
|
||||||
|
|
||||||
# Colors used for the search bar and match highlighting.
|
# Colors used for the search bar and match highlighting.
|
||||||
|
@ -188,25 +115,14 @@
|
||||||
background = "0x1a181a";
|
background = "0x1a181a";
|
||||||
};
|
};
|
||||||
focused_match = {
|
focused_match = {
|
||||||
foreground = "CellBackground";
|
foreground = "0xe5c463";
|
||||||
background = "CellForeground";
|
background = "0xe3e1e4";
|
||||||
};
|
};
|
||||||
#bar =
|
#bar =
|
||||||
# background = "#c5c8c6";
|
# background = "#c5c8c6";
|
||||||
# foreground = "#1d1f21";
|
# 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 colors
|
||||||
normal = {
|
normal = {
|
||||||
black = "0x1a181a";
|
black = "0x1a181a";
|
||||||
|
@ -232,30 +148,12 @@
|
||||||
};
|
};
|
||||||
|
|
||||||
indexed_colors = [
|
indexed_colors = [
|
||||||
{
|
{ index = 16; color = "0xdf5923"; }
|
||||||
index = 16;
|
{ index = 17; color = "0xd70000"; }
|
||||||
color = "0xdf5923";
|
{ index = 18; color = "0x2d2a2e"; }
|
||||||
}
|
{ index = 19; color = "0x303030"; }
|
||||||
{
|
{ index = 20; color = "0xd3d1d4"; }
|
||||||
index = 17;
|
{ index = 21; color = "0x303030"; }
|
||||||
color = "0xd70000";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
index = 18;
|
|
||||||
color = "0x2d2a2e";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
index = 19;
|
|
||||||
color = "0x303030";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
index = 20;
|
|
||||||
color = "0xd3d1d4";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
index = 21;
|
|
||||||
color = "0x303030";
|
|
||||||
}
|
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,46 +1,31 @@
|
||||||
{
|
{ lib, config, pkgs, ... }:
|
||||||
lib,
|
with lib;
|
||||||
config,
|
let
|
||||||
pkgs,
|
|
||||||
...
|
|
||||||
}:
|
|
||||||
with lib; let
|
|
||||||
psCfg = config.pub-solar;
|
psCfg = config.pub-solar;
|
||||||
cfg = config.pub-solar.graphical;
|
cfg = config.pub-solar.graphical;
|
||||||
yamlFormat = pkgs.formats.yaml {};
|
yamlFormat = pkgs.formats.yaml { };
|
||||||
recursiveMerge = attrList: let
|
recursiveMerge = attrList:
|
||||||
f = attrPath:
|
let f = attrPath:
|
||||||
zipAttrsWith (
|
zipAttrsWith (n: values:
|
||||||
n: values:
|
if tail values == [ ]
|
||||||
if tail values == []
|
then head values
|
||||||
then head values
|
else if all isList values
|
||||||
else if all isList values
|
then unique (concatLists values)
|
||||||
then unique (concatLists values)
|
else if all isAttrs values
|
||||||
else if all isAttrs values
|
then f (attrPath ++ [ n ]) values
|
||||||
then f (attrPath ++ [n]) values
|
else last values
|
||||||
else last values
|
|
||||||
);
|
);
|
||||||
in
|
in f [ ] attrList;
|
||||||
f [] attrList;
|
in
|
||||||
in {
|
{
|
||||||
options.pub-solar.graphical = {
|
options.pub-solar.graphical = {
|
||||||
enable = mkEnableOption "Life in color";
|
enable = mkEnableOption "Life in color";
|
||||||
alacritty = {
|
alacritty = {
|
||||||
settings = mkOption {
|
settings = mkOption {
|
||||||
type = yamlFormat.type;
|
type = yamlFormat.type;
|
||||||
default = {};
|
default = { };
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
autologin.enable = mkOption {
|
|
||||||
type = types.bool;
|
|
||||||
default = true;
|
|
||||||
description = "Feature flag enabling autologin after boot.";
|
|
||||||
};
|
|
||||||
wayland.software-renderer.enable = mkOption {
|
|
||||||
type = types.bool;
|
|
||||||
default = false;
|
|
||||||
description = "Feature flag enabling wlroots software renderer, useful in VMs";
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
|
|
||||||
config = mkIf cfg.enable {
|
config = mkIf cfg.enable {
|
||||||
|
@ -64,9 +49,9 @@ in {
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
services.getty.autologinUser = mkIf cfg.autologin.enable (mkForce "${psCfg.user.name}");
|
services.getty.autologinUser = "${psCfg.user.name}";
|
||||||
|
|
||||||
qt = {
|
qt5 = {
|
||||||
enable = true;
|
enable = true;
|
||||||
platformTheme = "gtk2";
|
platformTheme = "gtk2";
|
||||||
style = "gtk2";
|
style = "gtk2";
|
||||||
|
@ -74,7 +59,7 @@ in {
|
||||||
|
|
||||||
# Required for running Gnome apps outside the Gnome DE, see https://nixos.wiki/wiki/GNOME#Running_GNOME_programs_outside_of_GNOME
|
# 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;
|
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
|
# Enable Sushi, a quick previewer for nautilus
|
||||||
services.gnome.sushi.enable = true;
|
services.gnome.sushi.enable = true;
|
||||||
# Enable GVfs, a userspace virtual filesystem
|
# Enable GVfs, a userspace virtual filesystem
|
||||||
|
@ -82,6 +67,7 @@ in {
|
||||||
|
|
||||||
fonts.enableDefaultFonts = true;
|
fonts.enableDefaultFonts = true;
|
||||||
fonts.fonts = with pkgs; [
|
fonts.fonts = with pkgs; [
|
||||||
|
corefonts
|
||||||
fira-code
|
fira-code
|
||||||
fira-code-symbols
|
fira-code-symbols
|
||||||
google-fonts
|
google-fonts
|
||||||
|
@ -95,65 +81,62 @@ in {
|
||||||
source-sans-pro
|
source-sans-pro
|
||||||
];
|
];
|
||||||
|
|
||||||
home-manager = with pkgs;
|
home-manager = with pkgs; pkgs.lib.setAttrByPath [ "users" psCfg.user.name ] {
|
||||||
setAttrByPath ["users" psCfg.user.name] {
|
home.packages = [
|
||||||
home.packages = [
|
alacritty
|
||||||
alacritty
|
chromium
|
||||||
foot
|
firefox-wayland
|
||||||
ungoogled-chromium
|
|
||||||
firefox-wayland
|
|
||||||
|
|
||||||
flameshot
|
flameshot
|
||||||
libnotify
|
libnotify
|
||||||
gnome.adwaita-icon-theme
|
gnome3.adwaita-icon-theme
|
||||||
gnome.eog
|
gnome.eog
|
||||||
gnome.nautilus
|
gnome3.nautilus
|
||||||
gnome.yelp
|
|
||||||
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-maia-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;
|
||||||
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,15 +1,16 @@
|
||||||
pkgs: {
|
pkgs:
|
||||||
|
{
|
||||||
Unit = {
|
Unit = {
|
||||||
Description = "Network Manager applet";
|
Description = "Lightweight Wayland notification daemon";
|
||||||
BindsTo = ["sway-session.target"];
|
BindsTo = [ "sway-session.target" ];
|
||||||
After = ["sway-session.target"];
|
After = [ "sway-session.target" ];
|
||||||
# ConditionEnvironment requires systemd v247 to work correctly
|
# ConditionEnvironment requires systemd v247 to work correctly
|
||||||
ConditionEnvironment = ["WAYLAND_DISPLAY"];
|
ConditionEnvironment = [ "WAYLAND_DISPLAY" ];
|
||||||
};
|
};
|
||||||
Service = {
|
Service = {
|
||||||
ExecStart = "${pkgs.networkmanagerapplet}/bin/nm-applet --sm-disable --indicator";
|
ExecStart = "${pkgs.networkmanagerapplet}/bin/nm-applet --sm-disable --indicator";
|
||||||
};
|
};
|
||||||
Install = {
|
Install = {
|
||||||
WantedBy = ["sway-session.target"];
|
WantedBy = [ "sway-session.target" ];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{config, ...}: {
|
{ config, ... }: {
|
||||||
home-manager.sharedModules = [
|
home-manager.sharedModules = [
|
||||||
{
|
{
|
||||||
home.sessionVariables = {
|
home.sessionVariables = {
|
||||||
|
|
|
@ -1,21 +1,17 @@
|
||||||
{
|
{ lib, config, pkgs, ... }:
|
||||||
lib,
|
with lib;
|
||||||
config,
|
let
|
||||||
pkgs,
|
|
||||||
...
|
|
||||||
}:
|
|
||||||
with lib; let
|
|
||||||
psCfg = config.pub-solar;
|
psCfg = config.pub-solar;
|
||||||
cfg = config.pub-solar.nextcloud;
|
cfg = config.pub-solar.nextcloud;
|
||||||
in {
|
in
|
||||||
|
{
|
||||||
options.pub-solar.nextcloud = {
|
options.pub-solar.nextcloud = {
|
||||||
enable = mkEnableOption "Life in sync";
|
enable = mkEnableOption "Life in sync";
|
||||||
};
|
};
|
||||||
|
|
||||||
config = mkIf cfg.enable {
|
config = mkIf cfg.enable {
|
||||||
home-manager = with pkgs;
|
home-manager = with pkgs; pkgs.lib.setAttrByPath [ "users" psCfg.user.name ] {
|
||||||
pkgs.lib.setAttrByPath ["users" psCfg.user.name] {
|
systemd.user.services.nextcloud-client = import ./nextcloud.service.nix pkgs;
|
||||||
systemd.user.services.nextcloud-client = import ./nextcloud.service.nix pkgs;
|
};
|
||||||
};
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,11 +1,12 @@
|
||||||
pkgs: {
|
pkgs:
|
||||||
|
{
|
||||||
Unit = {
|
Unit = {
|
||||||
Description = "Nextcloud Client";
|
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 requires systemd v247 to work correctly
|
||||||
ConditionEnvironment = ["WAYLAND_DISPLAY"];
|
ConditionEnvironment = [ "WAYLAND_DISPLAY" ];
|
||||||
};
|
};
|
||||||
Service = {
|
Service = {
|
||||||
Type = "simple";
|
Type = "simple";
|
||||||
|
@ -15,6 +16,6 @@ pkgs: {
|
||||||
Restart = "on-failure";
|
Restart = "on-failure";
|
||||||
};
|
};
|
||||||
Install = {
|
Install = {
|
||||||
WantedBy = ["sway-session.target"];
|
WantedBy = [ "sway-session.target" ];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,8 +1,4 @@
|
||||||
{
|
{ channel, inputs, ... }: {
|
||||||
channel,
|
|
||||||
inputs,
|
|
||||||
...
|
|
||||||
}: {
|
|
||||||
nix.nixPath = [
|
nix.nixPath = [
|
||||||
"nixpkgs=${channel.input}"
|
"nixpkgs=${channel.input}"
|
||||||
"nixos-config=${../lib/compat/nixos}"
|
"nixos-config=${../lib/compat/nixos}"
|
||||||
|
|
|
@ -1,13 +1,10 @@
|
||||||
{
|
{ lib, config, pkgs, ... }:
|
||||||
lib,
|
with lib;
|
||||||
config,
|
let
|
||||||
pkgs,
|
|
||||||
...
|
|
||||||
}:
|
|
||||||
with lib; let
|
|
||||||
psCfg = config.pub-solar;
|
psCfg = config.pub-solar;
|
||||||
cfg = config.pub-solar.office;
|
cfg = config.pub-solar.office;
|
||||||
in {
|
in
|
||||||
|
{
|
||||||
options.pub-solar.office = {
|
options.pub-solar.office = {
|
||||||
enable = mkEnableOption "Install office programs, also enables printing server";
|
enable = mkEnableOption "Install office programs, also enables printing server";
|
||||||
};
|
};
|
||||||
|
@ -17,16 +14,15 @@ in {
|
||||||
|
|
||||||
# Gnome PDF viewer
|
# Gnome PDF viewer
|
||||||
programs.evince.enable = true;
|
programs.evince.enable = true;
|
||||||
home-manager = with pkgs;
|
home-manager = with pkgs; pkgs.lib.setAttrByPath [ "users" psCfg.user.name ] {
|
||||||
pkgs.lib.setAttrByPath ["users" psCfg.user.name] {
|
home.packages = [
|
||||||
home.packages = [
|
libreoffice-fresh
|
||||||
libreoffice-fresh
|
gnome3.simple-scan
|
||||||
gnome.simple-scan
|
# Tools like pdfunite
|
||||||
# Tools like pdfunite
|
poppler_utils
|
||||||
poppler_utils
|
# tool for annotating PDFs
|
||||||
# tool for annotating PDFs
|
xournalpp
|
||||||
xournalpp
|
];
|
||||||
];
|
};
|
||||||
};
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,53 +0,0 @@
|
||||||
{
|
|
||||||
config,
|
|
||||||
lib,
|
|
||||||
...
|
|
||||||
}:
|
|
||||||
with lib; let
|
|
||||||
psCfg = config.pub-solar;
|
|
||||||
cfg = config.pub-solar.paranoia;
|
|
||||||
in {
|
|
||||||
options.pub-solar.paranoia = {
|
|
||||||
enable = mkOption {
|
|
||||||
description = ''
|
|
||||||
Only offer hibernation instead of screen locking and sleeping. This only makes sense
|
|
||||||
if your hard drive is encrypted, and ensures that the contents of your drive are
|
|
||||||
encrypted if you are not actively using the device.
|
|
||||||
'';
|
|
||||||
default = false;
|
|
||||||
type = types.bool;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
config = mkIf cfg.enable {
|
|
||||||
pub-solar.core.hibernation.enable = true;
|
|
||||||
services.logind.lidSwitch = "hibernate";
|
|
||||||
|
|
||||||
# The options below are directly taken from or inspired by
|
|
||||||
# https://xeiaso.net/blog/paranoid-nixos-2021-07-18
|
|
||||||
|
|
||||||
# Don't set this if you need sftp
|
|
||||||
services.openssh.allowSFTP = false;
|
|
||||||
services.openssh.openFirewall = false; # Lock yourself out
|
|
||||||
|
|
||||||
# Limit the use of sudo to the group wheel
|
|
||||||
security.sudo.execWheelOnly = true;
|
|
||||||
|
|
||||||
# Remove the complete default environment of packages like
|
|
||||||
# nano, perl and rsync
|
|
||||||
environment.defaultPackages = lib.mkForce [];
|
|
||||||
|
|
||||||
# fileSystems."/".options = [ "noexec" ];
|
|
||||||
|
|
||||||
services.openssh = {
|
|
||||||
kbdInteractiveAuthentication = false;
|
|
||||||
extraConfig = ''
|
|
||||||
AllowTcpForwarding yes
|
|
||||||
X11Forwarding no
|
|
||||||
AllowAgentForwarding no
|
|
||||||
AllowStreamLocalForwarding no
|
|
||||||
AuthenticationMethods publickey
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
|
@ -1,13 +1,10 @@
|
||||||
{
|
{ lib, config, pkgs, ... }:
|
||||||
lib,
|
with lib;
|
||||||
config,
|
let
|
||||||
pkgs,
|
|
||||||
...
|
|
||||||
}:
|
|
||||||
with lib; let
|
|
||||||
psCfg = config.pub-solar;
|
psCfg = config.pub-solar;
|
||||||
cfg = config.pub-solar.printing;
|
cfg = config.pub-solar.printing;
|
||||||
in {
|
in
|
||||||
|
{
|
||||||
options.pub-solar.printing = {
|
options.pub-solar.printing = {
|
||||||
enable = mkEnableOption "CUPSSSss";
|
enable = mkEnableOption "CUPSSSss";
|
||||||
};
|
};
|
||||||
|
@ -19,11 +16,15 @@ in {
|
||||||
services.avahi.publish.userServices = true;
|
services.avahi.publish.userServices = true;
|
||||||
services.printing.enable = true;
|
services.printing.enable = true;
|
||||||
services.printing.browsing = 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.defaultShared = false;
|
||||||
services.printing.drivers = [
|
services.printing.drivers = [
|
||||||
pkgs.gutenprint
|
pkgs.gutenprint
|
||||||
|
pkgs.brgenml1lpr
|
||||||
|
pkgs.brgenml1cupswrapper
|
||||||
|
pkgs.brlaser
|
||||||
|
pkgs.cups-brother-hl3140cw
|
||||||
];
|
];
|
||||||
hardware.sane = {
|
hardware.sane = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
|
19
modules/server/default.nix
Normal file
19
modules/server/default.nix
Normal file
|
@ -0,0 +1,19 @@
|
||||||
|
{ lib, config, pkgs, ... }:
|
||||||
|
with lib;
|
||||||
|
let
|
||||||
|
psCfg = config.pub-solar;
|
||||||
|
cfg = config.pub-solar.server;
|
||||||
|
in
|
||||||
|
{
|
||||||
|
options.pub-solar.server = {
|
||||||
|
enable = mkEnableOption "Enable server options like sshd";
|
||||||
|
};
|
||||||
|
|
||||||
|
config = mkIf cfg.enable {
|
||||||
|
services.openssh = {
|
||||||
|
enable = true;
|
||||||
|
permitRootLogin = "no";
|
||||||
|
passwordAuthentication = false;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
|
@ -1,26 +1,22 @@
|
||||||
{
|
{ lib, config, pkgs, ... }:
|
||||||
lib,
|
with lib;
|
||||||
config,
|
let
|
||||||
pkgs,
|
|
||||||
...
|
|
||||||
}:
|
|
||||||
with lib; let
|
|
||||||
psCfg = config.pub-solar;
|
psCfg = config.pub-solar;
|
||||||
cfg = config.pub-solar.social;
|
cfg = config.pub-solar.social;
|
||||||
in {
|
in
|
||||||
|
{
|
||||||
options.pub-solar.social = {
|
options.pub-solar.social = {
|
||||||
enable = mkEnableOption "Life with others";
|
enable = mkEnableOption "Life with others";
|
||||||
};
|
};
|
||||||
|
|
||||||
config = mkIf cfg.enable {
|
config = mkIf cfg.enable {
|
||||||
home-manager = with pkgs;
|
home-manager = with pkgs; pkgs.lib.setAttrByPath [ "users" psCfg.user.name ] {
|
||||||
pkgs.lib.setAttrByPath ["users" psCfg.user.name] {
|
home.packages = [
|
||||||
home.packages = [
|
ps-signal-desktop
|
||||||
signal-desktop
|
tdesktop
|
||||||
tdesktop
|
element-desktop
|
||||||
element-desktop
|
irssi
|
||||||
irssi
|
];
|
||||||
];
|
};
|
||||||
};
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
212
modules/sway/config/config
Normal file
212
modules/sway/config/config
Normal file
|
@ -0,0 +1,212 @@
|
||||||
|
# Default config for sway
|
||||||
|
#
|
||||||
|
# Copy this to ~/.config/sway/config and edit it to your liking.
|
||||||
|
#
|
||||||
|
# Read `man 5 sway` for a complete reference.
|
||||||
|
|
||||||
|
### Variables
|
||||||
|
#
|
||||||
|
# Logo key. Use Mod1 for Alt.
|
||||||
|
set $mod Mod4
|
||||||
|
# Home row direction keys, like vim
|
||||||
|
set $left j
|
||||||
|
set $down k
|
||||||
|
set $up i
|
||||||
|
set $right l
|
||||||
|
# Your preferred terminal emulator
|
||||||
|
set $term alacritty
|
||||||
|
# Your preferred application launcher
|
||||||
|
# Note: pass the final command to swaymsg so that the resulting window can be opened
|
||||||
|
# on the original workspace that the command was run on.
|
||||||
|
#set $menu dmenu_path | dmenu | xargs swaymsg exec bemenu-run --no-overlap
|
||||||
|
|
||||||
|
default_border pixel 1
|
||||||
|
|
||||||
|
### Output configuration
|
||||||
|
#
|
||||||
|
# Default wallpaper (more resolutions are available in @datadir@/backgrounds/sway/)
|
||||||
|
output * bg ~/.config/wallpaper.jpg fill
|
||||||
|
|
||||||
|
### Key bindings
|
||||||
|
#
|
||||||
|
# Basics:
|
||||||
|
#
|
||||||
|
# Start a terminal
|
||||||
|
bindsym $mod+Return exec $term
|
||||||
|
|
||||||
|
# Start a terminal
|
||||||
|
bindsym $mod+Shift+Return exec sh -c '$term --working-directory $(wcwd)'
|
||||||
|
|
||||||
|
# Kill focused window
|
||||||
|
bindsym $mod+Shift+q kill
|
||||||
|
|
||||||
|
# Drag floating windows by holding down $mod and left mouse button.
|
||||||
|
# Resize them with right mouse button + $mod.
|
||||||
|
# Despite the name, also works for non-floating windows.
|
||||||
|
# Change normal to inverse to use left mouse button for resizing and right
|
||||||
|
# mouse button for dragging.
|
||||||
|
floating_modifier $mod normal
|
||||||
|
|
||||||
|
# Reload the configuration file
|
||||||
|
bindsym $mod+Ctrl+r reload
|
||||||
|
|
||||||
|
#
|
||||||
|
# Moving around:
|
||||||
|
#
|
||||||
|
# Move your focus around
|
||||||
|
bindsym $mod+$left focus left
|
||||||
|
bindsym $mod+$down focus down
|
||||||
|
bindsym $mod+$up focus up
|
||||||
|
bindsym $mod+$right focus right
|
||||||
|
# Or use $mod+[up|down|left|right]
|
||||||
|
bindsym $mod+Left focus left
|
||||||
|
bindsym $mod+Down focus down
|
||||||
|
bindsym $mod+Up focus up
|
||||||
|
bindsym $mod+Right focus right
|
||||||
|
|
||||||
|
# Move the focused window with the same, but add Shift
|
||||||
|
bindsym $mod+Shift+$left move left
|
||||||
|
bindsym $mod+Shift+$down move down
|
||||||
|
bindsym $mod+Shift+$up move up
|
||||||
|
bindsym $mod+Shift+$right move right
|
||||||
|
# Ditto, with arrow keys
|
||||||
|
bindsym $mod+Shift+Left move left
|
||||||
|
bindsym $mod+Shift+Down move down
|
||||||
|
bindsym $mod+Shift+Up move up
|
||||||
|
bindsym $mod+Shift+Right move right
|
||||||
|
#
|
||||||
|
# Workspaces:
|
||||||
|
#
|
||||||
|
|
||||||
|
|
||||||
|
# Workspace names
|
||||||
|
# to display names or symbols instead of plain workspace numbers you can use
|
||||||
|
# something like: set $ws1 1:mail
|
||||||
|
# set $ws2 2:
|
||||||
|
set $ws1 1
|
||||||
|
set $ws2 2
|
||||||
|
set $ws3 3
|
||||||
|
set $ws4 4
|
||||||
|
set $ws5 5
|
||||||
|
set $ws6 6
|
||||||
|
set $ws7 7
|
||||||
|
set $ws8 8
|
||||||
|
set $ws9 9
|
||||||
|
|
||||||
|
# Switch to workspace
|
||||||
|
bindsym $mod+1 workspace 1
|
||||||
|
bindsym $mod+2 workspace 2
|
||||||
|
bindsym $mod+3 workspace 3
|
||||||
|
bindsym $mod+4 workspace 4
|
||||||
|
bindsym $mod+5 workspace 5
|
||||||
|
bindsym $mod+6 workspace 6
|
||||||
|
bindsym $mod+7 workspace 7
|
||||||
|
bindsym $mod+8 workspace 8
|
||||||
|
bindsym $mod+9 workspace 9
|
||||||
|
# Move focused container to workspace
|
||||||
|
bindsym $mod+Ctrl+1 move container to workspace $ws1
|
||||||
|
bindsym $mod+Ctrl+2 move container to workspace $ws2
|
||||||
|
bindsym $mod+Ctrl+3 move container to workspace $ws3
|
||||||
|
bindsym $mod+Ctrl+4 move container to workspace $ws4
|
||||||
|
bindsym $mod+Ctrl+5 move container to workspace $ws5
|
||||||
|
bindsym $mod+Ctrl+6 move container to workspace $ws6
|
||||||
|
bindsym $mod+Ctrl+7 move container to workspace $ws7
|
||||||
|
bindsym $mod+Ctrl+8 move container to workspace $ws8
|
||||||
|
bindsym $mod+Ctrl+9 move container to workspace $ws9
|
||||||
|
# Move focused container to workspace and move focus with it
|
||||||
|
bindsym $mod+Shift+1 move container to workspace 1; workspace $ws1
|
||||||
|
bindsym $mod+Shift+2 move container to workspace 2; workspace $ws2
|
||||||
|
bindsym $mod+Shift+3 move container to workspace 3; workspace $ws3
|
||||||
|
bindsym $mod+Shift+4 move container to workspace 4; workspace $ws4
|
||||||
|
bindsym $mod+Shift+5 move container to workspace 5; workspace $ws5
|
||||||
|
bindsym $mod+Shift+6 move container to workspace 6; workspace $ws6
|
||||||
|
bindsym $mod+Shift+7 move container to workspace 7; workspace $ws7
|
||||||
|
bindsym $mod+Shift+8 move container to workspace 8; workspace $ws8
|
||||||
|
bindsym $mod+Shift+9 move container to workspace 9; workspace $ws9
|
||||||
|
# Note: workspaces can have any name you want, not just numbers.
|
||||||
|
# We just use 1-10 as the default.
|
||||||
|
|
||||||
|
#navigate workspaces next / previous
|
||||||
|
bindsym $mod+Ctrl+Right workspace next
|
||||||
|
bindsym $mod+Ctrl+Left workspace prev
|
||||||
|
|
||||||
|
# workspace back and forth (with/without active container)
|
||||||
|
workspace_auto_back_and_forth yes
|
||||||
|
bindsym $mod+b workspace back_and_forth
|
||||||
|
bindsym $mod+Shift+b move container to workspace back_and_forth; workspace back_and_forth
|
||||||
|
|
||||||
|
#
|
||||||
|
# Layout stuff:
|
||||||
|
#
|
||||||
|
# Configure border style <normal|1pixel|pixel xx|none|pixel>
|
||||||
|
default_border pixel 1
|
||||||
|
default_floating_border normal
|
||||||
|
|
||||||
|
# Hide borders
|
||||||
|
hide_edge_borders none
|
||||||
|
|
||||||
|
# Font for window titles. Will also be used by the bar unless a different font
|
||||||
|
# is used in the bar {} block below.
|
||||||
|
font xft:Hack 16
|
||||||
|
|
||||||
|
# You can "split" the current object of your focus with
|
||||||
|
# $mod+b or $mod+v, for horizontal and vertical splits
|
||||||
|
# respectively.
|
||||||
|
bindsym $mod+h splith; exec notify-send 'tile horizontally'
|
||||||
|
bindsym $mod+v splitv; exec notify-send 'tile vertically'
|
||||||
|
|
||||||
|
# Switch the current container between different layout styles
|
||||||
|
bindsym $mod+s layout stacking
|
||||||
|
bindsym $mod+w layout tabbed
|
||||||
|
bindsym $mod+e layout toggle split
|
||||||
|
|
||||||
|
# Make the current focus fullscreen
|
||||||
|
bindsym $mod+f fullscreen
|
||||||
|
|
||||||
|
# Toggle the current focus between tiling and floating mode
|
||||||
|
bindsym $mod+Shift+space floating toggle
|
||||||
|
|
||||||
|
# Swap focus between the tiling area and the floating area
|
||||||
|
bindsym $mod+t focus mode_toggle
|
||||||
|
|
||||||
|
# Move focus to the parent container
|
||||||
|
bindsym $mod+a focus parent
|
||||||
|
bindsym $mod+d focus child
|
||||||
|
#
|
||||||
|
# Scratchpad:
|
||||||
|
#
|
||||||
|
# Sway has a "scratchpad", which is a bag of holding for windows.
|
||||||
|
# You can send windows there and get them back later.
|
||||||
|
|
||||||
|
# Move the currently focused window to the scratchpad
|
||||||
|
bindsym $mod+Shift+minus move scratchpad
|
||||||
|
|
||||||
|
# Show the next scratchpad window or hide the focused scratchpad window.
|
||||||
|
# If there are multiple scratchpad windows, this command cycles through them.
|
||||||
|
bindsym $mod+minus scratchpad show
|
||||||
|
#
|
||||||
|
# Resizing containers:
|
||||||
|
#
|
||||||
|
mode "resize" {
|
||||||
|
# left will shrink the containers width
|
||||||
|
# right will grow the containers width
|
||||||
|
# up will shrink the containers height
|
||||||
|
# down will grow the containers height
|
||||||
|
bindsym $left resize shrink width 10px
|
||||||
|
bindsym $down resize grow height 10px
|
||||||
|
bindsym $up resize shrink height 10px
|
||||||
|
bindsym $right resize grow width 10px
|
||||||
|
|
||||||
|
# Ditto, with arrow keys
|
||||||
|
bindsym Left resize shrink width 10px
|
||||||
|
bindsym Down resize grow height 10px
|
||||||
|
bindsym Up resize shrink height 10px
|
||||||
|
bindsym Right resize grow width 10px
|
||||||
|
|
||||||
|
# Return to default mode
|
||||||
|
bindsym Return mode "default"
|
||||||
|
bindsym Escape mode "default"
|
||||||
|
}
|
||||||
|
bindsym $mod+r mode "resize"
|
||||||
|
|
||||||
|
include ~/.config/sway/config.d/*
|
|
@ -14,9 +14,8 @@ assign [app_id="telegramdesktop"] $ws4
|
||||||
# Launcher
|
# Launcher
|
||||||
for_window [app_id="launcher" title="Alacritty"] floating enable, border pixel 10, sticky enable
|
for_window [app_id="launcher" title="Alacritty"] floating enable, border pixel 10, sticky enable
|
||||||
|
|
||||||
for_window [app_id="pavucontrol"] floating enable, border pixel 10, sticky enable
|
|
||||||
|
|
||||||
# Floating menus
|
# Floating menus
|
||||||
|
for_window [app_id="pavucontrol"] floating enable
|
||||||
for_window [app_id="blueman-manager"] floating enable
|
for_window [app_id="blueman-manager"] floating enable
|
||||||
|
|
||||||
# Open specific applications in floating mode
|
# Open specific applications in floating mode
|
||||||
|
@ -59,15 +58,10 @@ for_window [window_role="task_dialog"] floating enable
|
||||||
for_window [window_role="Preferences"] floating enable
|
for_window [window_role="Preferences"] floating enable
|
||||||
for_window [window_type="dialog"] floating enable
|
for_window [window_type="dialog"] floating enable
|
||||||
for_window [window_type="menu"] floating enable
|
for_window [window_type="menu"] floating enable
|
||||||
for_window [title="About Mozilla Firefox"] floating enable
|
for_window [title="About Mozilla Firefox"] floating enabled
|
||||||
for_window [title="Password Required - Mozilla Firefox"] floating enable
|
for_window [title="Password Required - Mozilla Firefox"] floating enabled
|
||||||
for_window [title="Extension: (Open in Browser)*"] floating enable
|
for_window [title="Firefox — Sharing Indicator"] floating enabled
|
||||||
|
for_window [title="Extension: (Open in Browser)*"] floating enabled
|
||||||
# Technical media stuff happens on ws7
|
|
||||||
for_window [app_id="screen-recorder" title="Alacritty"] move to workspace $ws7, floating disable
|
|
||||||
no_focus [app_id="screen-recorder"]
|
|
||||||
for_window [title="Firefox — Sharing Indicator"] move to workspace $ws7, floating disable
|
|
||||||
no_focus [title="Firefox — Sharing Indicator"]
|
|
||||||
|
|
||||||
# qMasterPassword floating menu
|
# qMasterPassword floating menu
|
||||||
for_window [title="qMasterPassword"] focus
|
for_window [title="qMasterPassword"] focus
|
||||||
|
|
|
@ -13,23 +13,37 @@ bindsym $mod+Ctrl+m exec pavucontrol
|
||||||
################################################################################################
|
################################################################################################
|
||||||
|
|
||||||
# Quickstart application shortcuts
|
# Quickstart application shortcuts
|
||||||
bindsym $mod+F1 exec psos help
|
bindsym $mod+F1 exec qMasterPassword
|
||||||
bindsym $mod+Shift+h exec psos help
|
|
||||||
|
|
||||||
bindsym $mod+F2 exec firefox
|
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+F4 exec nautilus -w
|
||||||
bindsym $mod+Shift+F4 exec signal-desktop --use-tray-icon
|
bindsym $mod+Shift+F4 exec signal-desktop
|
||||||
|
bindsym $mod+F5 exec $term -e 'mocp -C $XDG_CONFIG_DIR/mocp/config'
|
||||||
|
bindsym $mod+Shift+m exec mu
|
||||||
|
bindsym $mod+Shift+h exec xdg-open /usr/share/doc/manjaro/i3_help.pdf
|
||||||
|
|
||||||
bindsym $mod+Shift+m exec qMasterPassword
|
# Screenshofts
|
||||||
|
|
||||||
# Screenshots and screen recordings
|
|
||||||
bindsym $mod+Ctrl+p exec grim -g "$(slurp -d -b \#ffffff11)" ~/Pictures/Screenshots/$(date +%Y%m%d_%Hh%Mm%Ss)_grim.png
|
bindsym $mod+Ctrl+p exec grim -g "$(slurp -d -b \#ffffff11)" ~/Pictures/Screenshots/$(date +%Y%m%d_%Hh%Mm%Ss)_grim.png
|
||||||
bindsym $mod+Shift+p exec grim ~/Pictures/Screenshots/$(date +%Y%m%d_%Hh%Mm%Ss)_grim.png
|
bindsym $mod+Shift+p exec grim ~/Pictures/Screenshots/$(date +%Y%m%d_%Hh%Mm%Ss)_grim.png
|
||||||
bindsym $mod+Ctrl+f exec "( pkill flameshot || true && flameshot & ) && ( sleep 0.5s && flameshot gui )"
|
bindsym $mod+Ctrl+f exec "( pkill flameshot || true && flameshot & ) && ( sleep 0.5s && flameshot gui )"
|
||||||
|
|
||||||
bindsym $mod+Ctrl+r exec record-screen
|
|
||||||
|
|
||||||
# Launcher
|
# Launcher
|
||||||
set $menu exec alacritty --class launcher -e env TERMINAL_COMMAND="alacritty -e" sway-launcher
|
set $menu exec alacritty --class launcher -e env TERMINAL_COMMAND="alacritty -e" sway-launcher
|
||||||
bindsym $mod+Space exec $menu
|
bindsym $mod+Space exec $menu
|
||||||
|
|
||||||
|
# Set shut down, restart and locking features
|
||||||
|
set $mode_system (l)ock, (e)xit, (s)uspend, (h)ibernate, (r)eboot, (Shift+s)hutdown
|
||||||
|
bindsym $mod+0 mode "$mode_system"
|
||||||
|
mode "$mode_system" {
|
||||||
|
bindsym l exec swaylock-bg, mode "default"
|
||||||
|
bindsym e exec swaymsg exit, mode "default"
|
||||||
|
bindsym s exec systemctl suspend, mode "default"
|
||||||
|
bindsym h exec systemctl hibernate, mode "default"
|
||||||
|
bindsym r exec systemctl reboot, mode "default"
|
||||||
|
bindsym Shift+s exec systemctl poweroff, mode "default"
|
||||||
|
|
||||||
|
# exit system mode: "Enter" or "Escape"
|
||||||
|
bindsym Return mode "default"
|
||||||
|
bindsym Escape mode "default"
|
||||||
|
}
|
||||||
|
|
|
@ -1,50 +0,0 @@
|
||||||
{
|
|
||||||
pkgs,
|
|
||||||
psCfg,
|
|
||||||
...
|
|
||||||
}:
|
|
||||||
''
|
|
||||||
# Set shut down, restart and locking features
|
|
||||||
''
|
|
||||||
+ (
|
|
||||||
if psCfg.core.hibernation.enable && !psCfg.paranoia.enable
|
|
||||||
then ''
|
|
||||||
set $mode_system (e)xit, (h)ibernate, (l)ock, (s)uspend, (r)eboot, (Shift+s)hutdown
|
|
||||||
''
|
|
||||||
else if psCfg.paranoia.enable
|
|
||||||
then ''
|
|
||||||
set $mode_system (e)xit, (h)ibernate, (r)eboot, (Shift+s)hutdown
|
|
||||||
''
|
|
||||||
else ''
|
|
||||||
set $mode_system (e)xit, (l)ock, (s)uspend, (r)eboot, (Shift+s)hutdown
|
|
||||||
''
|
|
||||||
)
|
|
||||||
+ ''
|
|
||||||
bindsym $mod+0 mode "$mode_system"
|
|
||||||
mode "$mode_system" {
|
|
||||||
bindsym e exec swaymsg exit, mode "default"
|
|
||||||
''
|
|
||||||
+ (
|
|
||||||
if psCfg.core.hibernation.enable
|
|
||||||
then ''
|
|
||||||
bindsym h exec systemctl hibernate, mode "default"
|
|
||||||
''
|
|
||||||
else ""
|
|
||||||
)
|
|
||||||
+ (
|
|
||||||
if !psCfg.paranoia.enable
|
|
||||||
then ''
|
|
||||||
bindsym l exec ${pkgs.swaylock-bg}/bin/swaylock-bg, mode "default"
|
|
||||||
bindsym s exec systemctl suspend, mode "default"
|
|
||||||
''
|
|
||||||
else ""
|
|
||||||
)
|
|
||||||
+ ''
|
|
||||||
bindsym r exec systemctl reboot, mode "default"
|
|
||||||
bindsym Shift+s exec systemctl poweroff, mode "default"
|
|
||||||
|
|
||||||
# exit system mode: "Enter" or "Escape"
|
|
||||||
bindsym Return mode "default"
|
|
||||||
bindsym Escape mode "default"
|
|
||||||
}
|
|
||||||
''
|
|
|
@ -5,4 +5,4 @@
|
||||||
# https://github.com/swaywm/sway/wiki/Systemd-integration
|
# https://github.com/swaywm/sway/wiki/Systemd-integration
|
||||||
# Also, import the most important environment variables into the D-Bus and systemd
|
# Also, import the most important environment variables into the D-Bus and systemd
|
||||||
# user environments (e.g. required for screen sharing and Pinentry prompts):
|
# user environments (e.g. required for screen sharing and Pinentry prompts):
|
||||||
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"
|
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"
|
||||||
|
|
|
@ -11,6 +11,3 @@ exec_always import-gtk-settings \
|
||||||
gtk-theme:gtk-theme-name \
|
gtk-theme:gtk-theme-name \
|
||||||
icon-theme:gtk-icon-theme-name \
|
icon-theme:gtk-icon-theme-name \
|
||||||
cursor-theme:gtk-cursor-theme-name
|
cursor-theme:gtk-cursor-theme-name
|
||||||
|
|
||||||
# Workaround to fix cursor scaling, see https://github.com/swaywm/sway/issues/4112
|
|
||||||
seat seat0 xcursor_theme Adwaita
|
|
||||||
|
|
|
@ -1,217 +0,0 @@
|
||||||
{
|
|
||||||
config,
|
|
||||||
pkgs,
|
|
||||||
...
|
|
||||||
}: ''
|
|
||||||
# Default config for sway
|
|
||||||
#
|
|
||||||
# Copy this to ~/.config/sway/config and edit it to your liking.
|
|
||||||
#
|
|
||||||
# Read `man 5 sway` for a complete reference.
|
|
||||||
|
|
||||||
### Variables
|
|
||||||
#
|
|
||||||
# Logo key. Use Mod1 for Alt.
|
|
||||||
set $mod Mod4
|
|
||||||
# Home row direction keys, like vim
|
|
||||||
set $left j
|
|
||||||
set $down k
|
|
||||||
set $up i
|
|
||||||
set $right l
|
|
||||||
# Your preferred terminal emulator
|
|
||||||
set $term ${config.pub-solar.sway.terminal}
|
|
||||||
# Your preferred application launcher
|
|
||||||
# Note: pass the final command to swaymsg so that the resulting window can be opened
|
|
||||||
# on the original workspace that the command was run on.
|
|
||||||
#set $menu dmenu_path | dmenu | xargs swaymsg exec bemenu-run --no-overlap
|
|
||||||
|
|
||||||
default_border pixel 1
|
|
||||||
|
|
||||||
### Output configuration
|
|
||||||
#
|
|
||||||
# Default wallpaper (more resolutions are available in @datadir@/backgrounds/sway/)
|
|
||||||
output * bg ~/.config/wallpaper.jpg fill
|
|
||||||
|
|
||||||
### Key bindings
|
|
||||||
#
|
|
||||||
# Basics:
|
|
||||||
#
|
|
||||||
# Start a terminal
|
|
||||||
bindsym $mod+Return exec $term
|
|
||||||
|
|
||||||
# Start a terminal
|
|
||||||
bindsym $mod+Shift+Return exec sh -c '$term --working-directory $(wcwd)'
|
|
||||||
|
|
||||||
# Kill focused window
|
|
||||||
bindsym $mod+Shift+q kill
|
|
||||||
|
|
||||||
# Drag floating windows by holding down $mod and left mouse button.
|
|
||||||
# Resize them with right mouse button + $mod.
|
|
||||||
# Despite the name, also works for non-floating windows.
|
|
||||||
# Change normal to inverse to use left mouse button for resizing and right
|
|
||||||
# mouse button for dragging.
|
|
||||||
floating_modifier $mod normal
|
|
||||||
|
|
||||||
# Reload the configuration file
|
|
||||||
bindsym $mod+F5 reload
|
|
||||||
|
|
||||||
#
|
|
||||||
# Moving around:
|
|
||||||
#
|
|
||||||
# Move your focus around
|
|
||||||
bindsym $mod+$left focus left
|
|
||||||
bindsym $mod+$down focus down
|
|
||||||
bindsym $mod+$up focus up
|
|
||||||
bindsym $mod+$right focus right
|
|
||||||
# Or use $mod+[up|down|left|right]
|
|
||||||
bindsym $mod+Left focus left
|
|
||||||
bindsym $mod+Down focus down
|
|
||||||
bindsym $mod+Up focus up
|
|
||||||
bindsym $mod+Right focus right
|
|
||||||
|
|
||||||
# Move the focused window with the same, but add Shift
|
|
||||||
bindsym $mod+Shift+$left move left
|
|
||||||
bindsym $mod+Shift+$down move down
|
|
||||||
bindsym $mod+Shift+$up move up
|
|
||||||
bindsym $mod+Shift+$right move right
|
|
||||||
# Ditto, with arrow keys
|
|
||||||
bindsym $mod+Shift+Left move left
|
|
||||||
bindsym $mod+Shift+Down move down
|
|
||||||
bindsym $mod+Shift+Up move up
|
|
||||||
bindsym $mod+Shift+Right move right
|
|
||||||
#
|
|
||||||
# Workspaces:
|
|
||||||
#
|
|
||||||
|
|
||||||
|
|
||||||
# Workspace names
|
|
||||||
# to display names or symbols instead of plain workspace numbers you can use
|
|
||||||
# something like: set $ws1 1:mail
|
|
||||||
# set $ws2 2:
|
|
||||||
set $ws1 1
|
|
||||||
set $ws2 2
|
|
||||||
set $ws3 3
|
|
||||||
set $ws4 4
|
|
||||||
set $ws5 5
|
|
||||||
set $ws6 6
|
|
||||||
set $ws7 7
|
|
||||||
set $ws8 8
|
|
||||||
set $ws9 9
|
|
||||||
|
|
||||||
# Switch to workspace
|
|
||||||
bindsym $mod+1 workspace 1
|
|
||||||
bindsym $mod+2 workspace 2
|
|
||||||
bindsym $mod+3 workspace 3
|
|
||||||
bindsym $mod+4 workspace 4
|
|
||||||
bindsym $mod+5 workspace 5
|
|
||||||
bindsym $mod+6 workspace 6
|
|
||||||
bindsym $mod+7 workspace 7
|
|
||||||
bindsym $mod+8 workspace 8
|
|
||||||
bindsym $mod+9 workspace 9
|
|
||||||
# Move focused container to workspace
|
|
||||||
bindsym $mod+Ctrl+1 move container to workspace $ws1
|
|
||||||
bindsym $mod+Ctrl+2 move container to workspace $ws2
|
|
||||||
bindsym $mod+Ctrl+3 move container to workspace $ws3
|
|
||||||
bindsym $mod+Ctrl+4 move container to workspace $ws4
|
|
||||||
bindsym $mod+Ctrl+5 move container to workspace $ws5
|
|
||||||
bindsym $mod+Ctrl+6 move container to workspace $ws6
|
|
||||||
bindsym $mod+Ctrl+7 move container to workspace $ws7
|
|
||||||
bindsym $mod+Ctrl+8 move container to workspace $ws8
|
|
||||||
bindsym $mod+Ctrl+9 move container to workspace $ws9
|
|
||||||
# Move focused container to workspace and move focus with it
|
|
||||||
bindsym $mod+Shift+1 move container to workspace 1; workspace $ws1
|
|
||||||
bindsym $mod+Shift+2 move container to workspace 2; workspace $ws2
|
|
||||||
bindsym $mod+Shift+3 move container to workspace 3; workspace $ws3
|
|
||||||
bindsym $mod+Shift+4 move container to workspace 4; workspace $ws4
|
|
||||||
bindsym $mod+Shift+5 move container to workspace 5; workspace $ws5
|
|
||||||
bindsym $mod+Shift+6 move container to workspace 6; workspace $ws6
|
|
||||||
bindsym $mod+Shift+7 move container to workspace 7; workspace $ws7
|
|
||||||
bindsym $mod+Shift+8 move container to workspace 8; workspace $ws8
|
|
||||||
bindsym $mod+Shift+9 move container to workspace 9; workspace $ws9
|
|
||||||
# Note: workspaces can have any name you want, not just numbers.
|
|
||||||
# We just use 1-10 as the default.
|
|
||||||
|
|
||||||
#navigate workspaces next / previous
|
|
||||||
bindsym $mod+Ctrl+Right workspace next
|
|
||||||
bindsym $mod+Ctrl+Left workspace prev
|
|
||||||
|
|
||||||
# workspace back and forth (with/without active container)
|
|
||||||
workspace_auto_back_and_forth yes
|
|
||||||
bindsym $mod+b workspace back_and_forth
|
|
||||||
bindsym $mod+Shift+b move container to workspace back_and_forth; workspace back_and_forth
|
|
||||||
|
|
||||||
#
|
|
||||||
# Layout stuff:
|
|
||||||
#
|
|
||||||
# Configure border style <normal|1pixel|pixel xx|none|pixel>
|
|
||||||
default_border pixel 1
|
|
||||||
default_floating_border normal
|
|
||||||
|
|
||||||
# Hide borders
|
|
||||||
hide_edge_borders none
|
|
||||||
|
|
||||||
# Font for window titles. Will also be used by the bar unless a different font
|
|
||||||
# is used in the bar {} block below.
|
|
||||||
font xft:Hack 16
|
|
||||||
|
|
||||||
# You can "split" the current object of your focus with
|
|
||||||
# $mod+b or $mod+v, for horizontal and vertical splits
|
|
||||||
# respectively.
|
|
||||||
bindsym $mod+h splith; exec notify-send 'tile horizontally'
|
|
||||||
bindsym $mod+v splitv; exec notify-send 'tile vertically'
|
|
||||||
|
|
||||||
# Switch the current container between different layout styles
|
|
||||||
bindsym $mod+s layout stacking
|
|
||||||
bindsym $mod+w layout tabbed
|
|
||||||
bindsym $mod+e layout toggle split
|
|
||||||
|
|
||||||
# Make the current focus fullscreen
|
|
||||||
bindsym $mod+f fullscreen
|
|
||||||
|
|
||||||
# Toggle the current focus between tiling and floating mode
|
|
||||||
bindsym $mod+Shift+space floating toggle
|
|
||||||
|
|
||||||
# Swap focus between the tiling area and the floating area
|
|
||||||
bindsym $mod+t focus mode_toggle
|
|
||||||
|
|
||||||
# Move focus to the parent container
|
|
||||||
bindsym $mod+a focus parent
|
|
||||||
bindsym $mod+d focus child
|
|
||||||
#
|
|
||||||
# Scratchpad:
|
|
||||||
#
|
|
||||||
# Sway has a "scratchpad", which is a bag of holding for windows.
|
|
||||||
# You can send windows there and get them back later.
|
|
||||||
|
|
||||||
# Move the currently focused window to the scratchpad
|
|
||||||
bindsym $mod+Shift+minus move scratchpad
|
|
||||||
|
|
||||||
# Show the next scratchpad window or hide the focused scratchpad window.
|
|
||||||
# If there are multiple scratchpad windows, this command cycles through them.
|
|
||||||
bindsym $mod+minus scratchpad show
|
|
||||||
#
|
|
||||||
# Resizing containers:
|
|
||||||
#
|
|
||||||
mode "resize" {
|
|
||||||
# left will shrink the containers width
|
|
||||||
# right will grow the containers width
|
|
||||||
# up will shrink the containers height
|
|
||||||
# down will grow the containers height
|
|
||||||
bindsym $left resize shrink width 10px
|
|
||||||
bindsym $down resize grow height 10px
|
|
||||||
bindsym $up resize shrink height 10px
|
|
||||||
bindsym $right resize grow width 10px
|
|
||||||
|
|
||||||
# Ditto, with arrow keys
|
|
||||||
bindsym Left resize shrink width 10px
|
|
||||||
bindsym Down resize grow height 10px
|
|
||||||
bindsym Up resize shrink height 10px
|
|
||||||
bindsym Right resize grow width 10px
|
|
||||||
|
|
||||||
# Return to default mode
|
|
||||||
bindsym Return mode "default"
|
|
||||||
bindsym Escape mode "default"
|
|
||||||
}
|
|
||||||
bindsym $mod+r mode "resize"
|
|
||||||
|
|
||||||
include ~/.config/sway/config.d/*''
|
|
|
@ -1,38 +1,29 @@
|
||||||
{
|
{ lib, config, pkgs, ... }:
|
||||||
lib,
|
with lib;
|
||||||
config,
|
let
|
||||||
pkgs,
|
|
||||||
...
|
|
||||||
}:
|
|
||||||
with lib; let
|
|
||||||
psCfg = config.pub-solar;
|
psCfg = config.pub-solar;
|
||||||
in {
|
cfg = config.pub-solar.sway;
|
||||||
|
in
|
||||||
|
{
|
||||||
options.pub-solar.sway = {
|
options.pub-solar.sway = {
|
||||||
enable = mkEnableOption "Life in boxes";
|
enable = mkEnableOption "Life in boxes";
|
||||||
|
};
|
||||||
terminal = mkOption {
|
options.pub-solar.sway.v4l2loopback.enable = mkOption {
|
||||||
type = types.nullOr types.str;
|
type = types.bool;
|
||||||
default = "alacritty";
|
default = true;
|
||||||
description = "Choose sway's default terminal";
|
description = "WebCam streaming tool";
|
||||||
};
|
|
||||||
|
|
||||||
v4l2loopback.enable = mkOption {
|
|
||||||
type = types.bool;
|
|
||||||
default = true;
|
|
||||||
description = "WebCam streaming tool";
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
|
|
||||||
config = mkIf psCfg.sway.enable (mkMerge [
|
config = mkIf cfg.enable (mkMerge [
|
||||||
(mkIf (psCfg.sway.v4l2loopback.enable) {
|
(mkIf (cfg.v4l2loopback.enable) {
|
||||||
boot.extraModulePackages = with config.boot.kernelPackages; [v4l2loopback];
|
boot.extraModulePackages = with config.boot.kernelPackages; [ v4l2loopback ];
|
||||||
boot.kernelModules = ["v4l2loopback"];
|
boot.kernelModules = [ "v4l2loopback" ];
|
||||||
boot.extraModprobeConfig = ''
|
boot.extraModprobeConfig = ''
|
||||||
options v4l2loopback exclusive_caps=1 devices=3
|
options v4l2loopback exclusive_caps=1 devices=3
|
||||||
'';
|
'';
|
||||||
})
|
})
|
||||||
|
|
||||||
{
|
({
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
linuxPackages.v4l2loopback
|
linuxPackages.v4l2loopback
|
||||||
];
|
];
|
||||||
|
@ -41,70 +32,58 @@ in {
|
||||||
|
|
||||||
xdg.portal = {
|
xdg.portal = {
|
||||||
enable = true;
|
enable = true;
|
||||||
wlr = {
|
extraPortals = with pkgs; [ xdg-desktop-portal-gtk xdg-desktop-portal-wlr ];
|
||||||
enable = true;
|
gtkUsePortal = true;
|
||||||
settings = {
|
|
||||||
screencast = {
|
|
||||||
max_fps = 30;
|
|
||||||
chooser_type = "simple";
|
|
||||||
chooser_cmd = "${pkgs.slurp}/bin/slurp -f %o -or";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
extraPortals = with pkgs; [xdg-desktop-portal-gtk];
|
|
||||||
};
|
};
|
||||||
|
|
||||||
services.pipewire.enable = true;
|
services.pipewire.enable = true;
|
||||||
|
|
||||||
home-manager = with pkgs;
|
home-manager = with pkgs; pkgs.lib.setAttrByPath [ "users" psCfg.user.name ] {
|
||||||
pkgs.lib.setAttrByPath ["users" psCfg.user.name] {
|
home.packages = with pkgs; [
|
||||||
home.packages = with pkgs; [
|
sway
|
||||||
sway
|
grim
|
||||||
grim
|
kanshi
|
||||||
kanshi
|
mako
|
||||||
mako
|
slurp
|
||||||
slurp
|
swayidle
|
||||||
swayidle
|
swaylock
|
||||||
swaylock
|
swaybg
|
||||||
swaybg
|
xwayland
|
||||||
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
|
swaylock-bg
|
||||||
record-screen
|
sway-launcher
|
||||||
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 pkgs;
|
||||||
systemd.user.services.sway = import ./sway.service.nix {inherit pkgs psCfg;};
|
systemd.user.services.swayidle = import ./swayidle.service.nix pkgs;
|
||||||
systemd.user.services.swayidle = import ./swayidle.service.nix {inherit pkgs psCfg;};
|
systemd.user.services.xsettingsd = import ./xsettingsd.service.nix pkgs;
|
||||||
systemd.user.services.xsettingsd = import ./xsettingsd.service.nix {inherit pkgs psCfg;};
|
systemd.user.services.waybar = import ./waybar.service.nix pkgs;
|
||||||
systemd.user.services.waybar = import ./waybar.service.nix {inherit pkgs psCfg;};
|
systemd.user.targets.sway-session = import ./sway-session.target.nix pkgs;
|
||||||
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".source = ./config/config;
|
||||||
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 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;
|
};
|
||||||
};
|
})
|
||||||
}
|
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,17 +1,18 @@
|
||||||
{pkgs, ...}: {
|
pkgs:
|
||||||
|
{
|
||||||
Unit = {
|
Unit = {
|
||||||
Description = "set color temperature of display according to time of day";
|
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 requires systemd v247 to work correctly
|
||||||
ConditionEnvironment = ["WAYLAND_DISPLAY"];
|
ConditionEnvironment = [ "WAYLAND_DISPLAY" ];
|
||||||
};
|
};
|
||||||
Service = {
|
Service = {
|
||||||
Type = "simple";
|
Type = "simple";
|
||||||
ExecStart = "${pkgs.gammastep}/bin/gammastep -l geoclue2 -m wayland -v";
|
ExecStart = "${pkgs.gammastep}/bin/gammastep -l geoclue2 -m wayland -v";
|
||||||
};
|
};
|
||||||
Install = {
|
Install = {
|
||||||
WantedBy = ["sway-session.target"];
|
WantedBy = [ "sway-session.target" ];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue