Merge remote-tracking branch 'upstream/main' into config
This commit is contained in:
Bad
commit
564545dc4f
14 changed files with 0 additions and 338 deletions
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 -->
|
|
||||||
28
.github/workflows/check.yml
vendored
28
.github/workflows/check.yml
vendored
|
|
@ -1,28 +0,0 @@
|
||||||
name: "Check & Cachix"
|
|
||||||
on:
|
|
||||||
push:
|
|
||||||
branches:
|
|
||||||
- master
|
|
||||||
- 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
|
|
||||||
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:
|
|
||||||
- master
|
|
||||||
|
|
||||||
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: master
|
|
||||||
- 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: master
|
|
||||||
|
|
||||||
- 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
|
|
||||||
91
README.md
91
README.md
|
|
@ -1,91 +0,0 @@
|
||||||
[](https://nixos.org)
|
|
||||||
[][mit]
|
|
||||||
[][matrix]
|
|
||||||
|
|
||||||
> #### ⚠ 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.
|
|
||||||
|
|
||||||
### Why?
|
|
||||||
Make an awesome template for NixOS users, with consideration for common tools like [home-manager][home-manager],
|
|
||||||
[devshell][devshell], and [more](./doc/integrations).
|
|
||||||
|
|
||||||
### No. Why _flakes_?
|
|
||||||
Flakes are a part of an explicit push to improve [Nix's UX](https://github.com/NixOS/nix/blob/master/doc/manual/src/contributing/cli-guideline.md), and have become an integral part of that effort.
|
|
||||||
|
|
||||||
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.
|
|
||||||
|
|
||||||
## 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
|
|
||||||
* The original [authors][please]
|
|
||||||
|
|
||||||
## 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 spontaniously formed out of "the Nix".
|
|
||||||
It is really just a place where otherwise unrelated people a) get
|
|
||||||
together and b) stuff done.
|
|
||||||
|
|
||||||
It's a place to stop "geeking out in isolation" (or within company boundaries),
|
|
||||||
experiment and 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/master/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
|
|
||||||
|
|
@ -1,10 +0,0 @@
|
||||||
{ pkgs, lib, budUtils, ... }: {
|
|
||||||
bud.cmds = with pkgs; {
|
|
||||||
get = {
|
|
||||||
writer = budUtils.writeBashWithPaths [ nixUnstable git coreutils ];
|
|
||||||
synopsis = "get [DEST]";
|
|
||||||
help = "Copy the desired template to DEST";
|
|
||||||
script = ./get.bash;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
nix flake new -t "github:divnix/devos/master" "${2:-devos}"
|
|
||||||
|
|
@ -73,7 +73,6 @@
|
||||||
nixos = {
|
nixos = {
|
||||||
imports = [ (digga.lib.importOverlays ./overlays) ];
|
imports = [ (digga.lib.importOverlays ./overlays) ];
|
||||||
overlays = [
|
overlays = [
|
||||||
digga.overlays.patchedNix
|
|
||||||
agenix.overlay
|
agenix.overlay
|
||||||
nvfetcher.overlay
|
nvfetcher.overlay
|
||||||
./pkgs/default.nix
|
./pkgs/default.nix
|
||||||
|
|
|
||||||
4
secrets/.gitattributes
vendored
4
secrets/.gitattributes
vendored
|
|
@ -1,4 +0,0 @@
|
||||||
* filter=git-crypt diff=git-crypt
|
|
||||||
.gitattributes !filter !diff
|
|
||||||
secrets.nix !filter !diff
|
|
||||||
README.md !filter !diff
|
|
||||||
|
|
@ -30,10 +30,6 @@ in
|
||||||
unset _PATH
|
unset _PATH
|
||||||
'');
|
'');
|
||||||
|
|
||||||
packages = with pkgs; [
|
|
||||||
git-crypt
|
|
||||||
];
|
|
||||||
|
|
||||||
commands = with pkgs; [
|
commands = with pkgs; [
|
||||||
(devos nixUnstable)
|
(devos nixUnstable)
|
||||||
(devos agenix)
|
(devos agenix)
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,6 @@
|
||||||
home-manager.users = { inherit (hmUsers) nixos; };
|
home-manager.users = { inherit (hmUsers) nixos; };
|
||||||
|
|
||||||
users.users.nixos = {
|
users.users.nixos = {
|
||||||
uid = 1000;
|
|
||||||
password = "nixos";
|
password = "nixos";
|
||||||
description = "default";
|
description = "default";
|
||||||
isNormalUser = true;
|
isNormalUser = true;
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue