momo/main: merge main branch #219
|
@ -1,11 +0,0 @@
|
||||||
#!/usr/bin/env sh
|
|
||||||
|
|
||||||
set -e
|
|
||||||
|
|
||||||
# Setup ssh inside container
|
|
||||||
mkdir -p ~/.ssh
|
|
||||||
echo "$GITEA_SSH_KEY" > ~/.ssh/id_rsa
|
|
||||||
echo "[git.b12f.io]:2222 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJ4uaREL7acSSCNAX+voDYl1Kj7JipP62fR5x1UyGP9u" >> ~/.ssh/known_hosts
|
|
||||||
echo "Host git.b12f.io" >> ~/.ssh/config
|
|
||||||
echo " Port 2222" >> ~/.ssh/config
|
|
||||||
chmod -R 600 ~/.ssh
|
|
|
@ -1,12 +0,0 @@
|
||||||
#!/usr/bin/env sh
|
|
||||||
|
|
||||||
set -e
|
|
||||||
set -u
|
|
||||||
|
|
||||||
LOCAL="$DRONE_BRANCH"
|
|
||||||
[ "$LOCAL" = "main" ] && UPSTREAM=origin/devos || UPSTREAM=origin/main
|
|
||||||
|
|
||||||
git fetch --all
|
|
||||||
git checkout "$LOCAL"
|
|
||||||
git merge "$UPSTREAM"
|
|
||||||
git push origin "$LOCAL"
|
|
38
.github/ISSUE_TEMPLATE/bug_report.md
vendored
38
.github/ISSUE_TEMPLATE/bug_report.md
vendored
|
@ -1,38 +0,0 @@
|
||||||
---
|
|
||||||
name: Bug report
|
|
||||||
about: Create a report to help improve
|
|
||||||
title: ''
|
|
||||||
labels: 'bug'
|
|
||||||
assignees: ''
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
Your issue may already be reported!
|
|
||||||
Please search on the [issue tracker](../) before creating one.
|
|
||||||
|
|
||||||
## Expected Behavior
|
|
||||||
<!--- What should happen? -->
|
|
||||||
<!--- How it should work? -->
|
|
||||||
|
|
||||||
## Current Behavior
|
|
||||||
<!--- What happens instead of the expected behavior? -->
|
|
||||||
|
|
||||||
## Possible Solution
|
|
||||||
<!--- Not obligatory, but suggest a fix/reason for the bug, -->
|
|
||||||
<!--- or ideas how to implement the addition or change -->
|
|
||||||
|
|
||||||
## Steps to Reproduce
|
|
||||||
<!--- An unambiguous set of steps to reproduce this bug. -->
|
|
||||||
<!--- Linked fork or gist if needed. -->
|
|
||||||
1.
|
|
||||||
2.
|
|
||||||
3.
|
|
||||||
4.
|
|
||||||
|
|
||||||
## Context
|
|
||||||
<!--- How has this issue affected you? What are you trying to accomplish? -->
|
|
||||||
<!--- Providing context helps us come up with a solution that is most useful in the real world. -->
|
|
||||||
|
|
||||||
## Your Environment
|
|
||||||
<!--- Include relevant details about the environment you experienced the bug in. -->
|
|
||||||
<!--- If you have run `bud update`, for example, post the flake.lock file. -->
|
|
22
.github/ISSUE_TEMPLATE/community_request.md
vendored
22
.github/ISSUE_TEMPLATE/community_request.md
vendored
|
@ -1,22 +0,0 @@
|
||||||
---
|
|
||||||
name: Commuity Request
|
|
||||||
about: inspire contribution to the `community` branch
|
|
||||||
title: ''
|
|
||||||
labels: 'community'
|
|
||||||
assignees: ''
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
Your issue may already be reported!
|
|
||||||
Please search on the [issue tracker](../) before creating one.
|
|
||||||
|
|
||||||
## Ideas
|
|
||||||
<!--- The `community` branch is meant to provide various preconfigured system options, -->
|
|
||||||
<!--- useful to all kinds of users. -->
|
|
||||||
|
|
||||||
<!--- The point is to engage the community for what it thinks are -->
|
|
||||||
<!--- sane defaults for various tools. -->
|
|
||||||
|
|
||||||
## Requests
|
|
||||||
<!--- Have a tool that you'd like to see a system profile for? -->
|
|
||||||
<!--- Feel free to request it here. -->
|
|
24
.github/ISSUE_TEMPLATE/feature_request.md
vendored
24
.github/ISSUE_TEMPLATE/feature_request.md
vendored
|
@ -1,24 +0,0 @@
|
||||||
---
|
|
||||||
name: Feature request
|
|
||||||
about: Suggest an idea
|
|
||||||
title: ''
|
|
||||||
labels: 'enhancement'
|
|
||||||
assignees: ''
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
Your issue may already be reported!
|
|
||||||
Please search on the [issue tracker](../) before creating one.
|
|
||||||
|
|
||||||
## Would your feature fix an existing issue?
|
|
||||||
<!--- If your idea is related to, or resolves other issues, please mention. -->
|
|
||||||
|
|
||||||
## Describe the solution you'd like
|
|
||||||
<!--- What you want to happen. -->
|
|
||||||
|
|
||||||
## Describe alternatives you've considered
|
|
||||||
<!--- Any alternative solutions or features you've considered? -->
|
|
||||||
|
|
||||||
## Additional context
|
|
||||||
<!--- Is this feature only useful for a particular usecase? -->
|
|
||||||
<!--- Please elaborate. -->
|
|
16
.github/ISSUE_TEMPLATE/upstream_notice.md
vendored
16
.github/ISSUE_TEMPLATE/upstream_notice.md
vendored
|
@ -1,16 +0,0 @@
|
||||||
---
|
|
||||||
name: Upstream notice (Issues or Changes)
|
|
||||||
about: Create an upstream notice to help our research
|
|
||||||
title: '[ <put the upstream project> ]: <topic>'
|
|
||||||
labels: 'upstream'
|
|
||||||
assignees: ''
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Link
|
|
||||||
<!-- just place a link to the upstream issue, or PR -->
|
|
||||||
|
|
||||||
|
|
||||||
## Context
|
|
||||||
<!-- We want to make this as cheap for you as possible.
|
|
||||||
Context is not required but helpful -->
|
|
29
.github/workflows/check.yml
vendored
29
.github/workflows/check.yml
vendored
|
@ -1,29 +0,0 @@
|
||||||
name: "Check & Cachix"
|
|
||||||
on:
|
|
||||||
push:
|
|
||||||
branches:
|
|
||||||
- main
|
|
||||||
- trying
|
|
||||||
- staging
|
|
||||||
jobs:
|
|
||||||
check:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v2.3.4
|
|
||||||
- uses: cachix/install-nix-action@v13
|
|
||||||
with:
|
|
||||||
install_url: https://github.com/numtide/nix-flakes-installer/releases/download/nix-2.4pre20210415_76980a1/install
|
|
||||||
extra_nix_config: |
|
|
||||||
experimental-features = nix-command flakes
|
|
||||||
system-features = nixos-test benchmark big-parallel kvm recursive-nix
|
|
||||||
substituters = https://nrdxp.cachix.org https://nix-community.cachix.org https://cache.nixos.org
|
|
||||||
trusted-public-keys = nrdxp.cachix.org-1:Fc5PSqY2Jm1TrWfm88l6cvGWwz3s93c6IOifQWnhNW4= nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs= cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=
|
|
||||||
- uses: cachix/cachix-action@v10
|
|
||||||
with:
|
|
||||||
name: nrdxp
|
|
||||||
signingKey: '${{ secrets.CACHIX_SIGNING_KEY }}'
|
|
||||||
authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
|
|
||||||
- run: nix -Lv flake check
|
|
||||||
- run: nix -Lv build ".#nixosConfigurations.NixOS.config.system.build.toplevel"
|
|
||||||
- run: nix -Lv develop -c echo OK
|
|
||||||
- run: nix -Lv develop --command bud --help
|
|
27
.github/workflows/mdbook_docs.yml
vendored
27
.github/workflows/mdbook_docs.yml
vendored
|
@ -1,27 +0,0 @@
|
||||||
name: Deploy Docs to GitHub Pages
|
|
||||||
|
|
||||||
on:
|
|
||||||
push:
|
|
||||||
branches:
|
|
||||||
- main
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
deploy:
|
|
||||||
runs-on: ubuntu-18.04
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v2
|
|
||||||
|
|
||||||
- name: Setup mdBook
|
|
||||||
uses: peaceiris/actions-mdbook@v1
|
|
||||||
with:
|
|
||||||
mdbook-version: 'latest'
|
|
||||||
|
|
||||||
- run: mdbook build doc
|
|
||||||
|
|
||||||
- name: Deploy
|
|
||||||
uses: peaceiris/actions-gh-pages@v3
|
|
||||||
with:
|
|
||||||
github_token: ${{ secrets.GITHUB_TOKEN }}
|
|
||||||
publish_branch: gh-pages
|
|
||||||
publish_dir: ./doc/book
|
|
||||||
cname: devos.divnix.com
|
|
71
.github/workflows/release.yml
vendored
71
.github/workflows/release.yml
vendored
|
@ -1,71 +0,0 @@
|
||||||
name: Release
|
|
||||||
|
|
||||||
on:
|
|
||||||
push:
|
|
||||||
tags:
|
|
||||||
- v*
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
changelog:
|
|
||||||
name: Update Changelog
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
steps:
|
|
||||||
- name: Get version from tag
|
|
||||||
env:
|
|
||||||
GITHUB_REF: ${{ github.ref }}
|
|
||||||
run: |
|
|
||||||
export CURRENT_VERSION=${GITHUB_TAG/refs\/tags\/v/}
|
|
||||||
echo "CURRENT_VERSION=$CURRENT_VERSION" >> $GITHUB_ENV
|
|
||||||
- name: Checkout code
|
|
||||||
uses: actions/checkout@v2
|
|
||||||
with:
|
|
||||||
ref: main
|
|
||||||
- name: Update Changelog
|
|
||||||
uses: heinrichreimer/github-changelog-generator-action@v2.1.1
|
|
||||||
with:
|
|
||||||
token: ${{ secrets.GITHUB_TOKEN }}
|
|
||||||
issues: false
|
|
||||||
issuesWoLabels: false
|
|
||||||
pullRequests: true
|
|
||||||
prWoLabels: true
|
|
||||||
addSections: '{"documentation":{"prefix":"**Documentation:**","labels":["documentation"]}}'
|
|
||||||
- uses: stefanzweifel/git-auto-commit-action@v4
|
|
||||||
with:
|
|
||||||
commit_message: Update Changelog for tag ${{ env.CURRENT_VERSION }}
|
|
||||||
file_pattern: CHANGELOG.md
|
|
||||||
|
|
||||||
release_notes:
|
|
||||||
name: Create Release Notes
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
needs: changelog
|
|
||||||
steps:
|
|
||||||
- name: Get version from tag
|
|
||||||
env:
|
|
||||||
GITHUB_REF: ${{ github.ref }}
|
|
||||||
run: |
|
|
||||||
export CURRENT_VERSION=${GITHUB_TAG/refs\/tags\/v/}
|
|
||||||
echo "CURRENT_VERSION=$CURRENT_VERSION" >> $GITHUB_ENV
|
|
||||||
|
|
||||||
- name: Checkout code
|
|
||||||
uses: actions/checkout@v2
|
|
||||||
with:
|
|
||||||
ref: main
|
|
||||||
|
|
||||||
- name: Get Changelog Entry
|
|
||||||
id: changelog_reader
|
|
||||||
uses: mindsers/changelog-reader-action@v1
|
|
||||||
with:
|
|
||||||
version: ${{ env.CURRENT_VERSION }}
|
|
||||||
path: ./CHANGELOG.md
|
|
||||||
|
|
||||||
- name: Create Release
|
|
||||||
id: create_release
|
|
||||||
uses: actions/create-release@v1
|
|
||||||
env:
|
|
||||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
|
||||||
with:
|
|
||||||
tag_name: ${{ github.ref }}
|
|
||||||
release_name: Release ${{ github.ref }}
|
|
||||||
body: ${{ steps.changelog_reader.outputs.log_entry }}
|
|
||||||
draft: false
|
|
||||||
prerelease: false
|
|
|
@ -2,8 +2,6 @@
|
||||||
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
|
# Track channels with commits tested and built by hydra
|
||||||
|
@ -99,9 +97,7 @@
|
||||||
|
|
||||||
imports = [(digga.lib.importHosts ./hosts)];
|
imports = [(digga.lib.importHosts ./hosts)];
|
||||||
hosts = {
|
hosts = {
|
||||||
/*
|
# Set host-specific properties here
|
||||||
set host specific properties here
|
|
||||||
*/
|
|
||||||
bootstrap = {
|
bootstrap = {
|
||||||
modules = [
|
modules = [
|
||||||
digga.nixosModules.bootstrapIso
|
digga.nixosModules.bootstrapIso
|
||||||
|
|
|
@ -21,7 +21,8 @@
|
||||||
allowed-users = ["@wheel"];
|
allowed-users = ["@wheel"];
|
||||||
};
|
};
|
||||||
# Generally useful nix option defaults
|
# Generally useful nix option defaults
|
||||||
extraOptions = ''
|
extraOptions = lib.mkForce ''
|
||||||
|
experimental-features = flakes nix-command
|
||||||
min-free = 536870912
|
min-free = 536870912
|
||||||
keep-outputs = true
|
keep-outputs = true
|
||||||
keep-derivations = true
|
keep-derivations = true
|
||||||
|
|
|
@ -23,7 +23,7 @@ let
|
||||||
|
|
||||||
export nix_user_config_file="/home/build/.local/share/nix/trusted-settings.json"
|
export nix_user_config_file="/home/build/.local/share/nix/trusted-settings.json"
|
||||||
mkdir -p $(dirname \\$nix_user_config_file)
|
mkdir -p $(dirname \\$nix_user_config_file)
|
||||||
echo '{"extra-experimental-features":{"nix-command flakes":true},"extra-substituters":{"https://nix-dram.cachix.org https://dram.cachix.org https://nrdxp.cachix.org https://nix-community.cachix.org":true},"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=":true}}' > \\$nix_user_config_file
|
echo '{"extra-experimental-features":{"nix-command flakes":true}}' > \\$nix_user_config_file
|
||||||
chown -R build /home/build/
|
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
|
curl -L https://github.com/drone-runners/drone-runner-exec/releases/latest/download/drone_runner_exec_linux_amd64.tar.gz | tar xz
|
||||||
|
|
|
@ -1,13 +0,0 @@
|
||||||
{
|
|
||||||
pkgs,
|
|
||||||
lib,
|
|
||||||
...
|
|
||||||
}: let
|
|
||||||
folder = ./.;
|
|
||||||
toImport = name: value: folder + ("/" + name);
|
|
||||||
filterCaches = key: value: value == "regular" && lib.hasSuffix ".nix" key && key != "default.nix";
|
|
||||||
imports = lib.mapAttrsToList toImport (lib.filterAttrs filterCaches (builtins.readDir folder));
|
|
||||||
in {
|
|
||||||
inherit imports;
|
|
||||||
nix.settings.substituters = ["https://cache.nixos.org/"];
|
|
||||||
}
|
|
|
@ -1,10 +0,0 @@
|
||||||
{
|
|
||||||
nix.settings = {
|
|
||||||
substituters = [
|
|
||||||
"https://nix-community.cachix.org"
|
|
||||||
];
|
|
||||||
trusted-public-keys = [
|
|
||||||
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
|
|
||||||
];
|
|
||||||
};
|
|
||||||
}
|
|
|
@ -1,10 +0,0 @@
|
||||||
{
|
|
||||||
nix.settings = {
|
|
||||||
substituters = [
|
|
||||||
"https://nrdxp.cachix.org"
|
|
||||||
];
|
|
||||||
trusted-public-keys = [
|
|
||||||
"nrdxp.cachix.org-1:Fc5PSqY2Jm1TrWfm88l6cvGWwz3s93c6IOifQWnhNW4="
|
|
||||||
];
|
|
||||||
};
|
|
||||||
}
|
|
|
@ -7,8 +7,6 @@
|
||||||
}: let
|
}: let
|
||||||
inherit (lib) fileContents;
|
inherit (lib) fileContents;
|
||||||
in {
|
in {
|
||||||
imports = [../cachix];
|
|
||||||
|
|
||||||
config = {
|
config = {
|
||||||
pub-solar.audio.mopidy.enable = true;
|
pub-solar.audio.mopidy.enable = true;
|
||||||
pub-solar.audio.bluetooth.enable = true;
|
pub-solar.audio.bluetooth.enable = true;
|
||||||
|
|
|
@ -7,7 +7,6 @@
|
||||||
}: let
|
}: let
|
||||||
inherit (lib) fileContents;
|
inherit (lib) fileContents;
|
||||||
in {
|
in {
|
||||||
imports = [../cachix];
|
|
||||||
config = {
|
config = {
|
||||||
pub-solar.graphical.wayland.software-renderer.enable = true;
|
pub-solar.graphical.wayland.software-renderer.enable = true;
|
||||||
pub-solar.sway.terminal = "foot";
|
pub-solar.sway.terminal = "foot";
|
||||||
|
|
Loading…
Reference in a new issue