Merge branch 'main' into teutat3s

.drone.yml

@@ -4,24 +4,39 @@ type: docker
 name: Upstreaming
 
 steps:
-  - name: "Sync 'devos' branch with upstream"
+  - name: "Setup git repos and SSH access"
     image: alpine/git
     when:
       event:
         - cron
       cron:
-        - sync-master-with-upstream
+        - sync-main-with-upstream
+        - sync-b12f-with-main
+        - sync-teutat3s-with-main
     environment:
       GITEA_SSH_KEY:
         from_secret: gitea_ssh_key
     commands:
       - ./.drone/setup_ssh.sh
       - git fetch
-      - git checkout devos
       - 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 merge -X theirs devos/master
+
+  - 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 checkout origin/devos
+      - git merge -X theirs devos/main
       - git push origin devos
 
   - name: "Sync $BRANCH with upstream"
@@ -30,14 +45,14 @@ steps:
       event:
         - cron
       cron:
-        - sync-master-with-upstream
-        - sync-b12f-with-master
-        - sync-teutat3s-with-master
+        - sync-main-with-upstream
+        - sync-b12f-with-main
+        - sync-teutat3s-with-main
     environment:
       GITEA_SSH_KEY:
         from_secret: gitea_ssh_key
     commands:
-      - git checkout origin/master
+      - git checkout origin/main
       - ./.drone/setup_ssh.sh
       - git remote set-url origin git@git.b12f.io:pub-solar/os
       - ./.drone/upstream-branch.sh
@@ -50,16 +65,16 @@ steps:
       event:
         - cron
       cron:
-        - sync-master-with-upstream
-        - sync-b12f-with-master
-        - sync-teutat3s-with-master
+        - 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 master --head devos
+      - tea pulls create --base main --head devos
 
   - name: "Notify matrix"
     image: plugins/matrix
@@ -70,9 +85,9 @@ steps:
       event:
         - cron
       cron:
-        - sync-master-with-upstream
-        - sync-b12f-with-master
-        - sync-teutat3s-with-master
+        - sync-main-with-upstream
+        - sync-b12f-with-main
+        - sync-teutat3s-with-main
     settings:
       homeserver: https://matrix.pub.solar
       roomid: dfQBqwkhIzrFjMSsxy:pub.solar

.drone/upstream-branch.sh

@@ -4,7 +4,7 @@ set -e
 set -u
 
 LOCAL="$DRONE_BRANCH"
-[ "$LOCAL" = "master" ] && UPSTREAM=origin/devos || UPSTREAM=origin/master
+[ "$LOCAL" = "main" ] && UPSTREAM=origin/devos || UPSTREAM=origin/main
 
 git fetch --all
 git checkout "$LOCAL"

.github/ISSUE_TEMPLATE/bug_report.md

@@ -35,4 +35,4 @@ Please search on the [issue tracker](../) before creating one.
 
 ## Your Environment
 <!--- Include relevant details about the environment you experienced the bug in. -->
-<!--- If you have run `flk update`, for example, post the flake.lock file. -->
+<!--- If you have run `bud update`, for example, post the flake.lock file. -->

.github/workflows/check.yml

@@ -2,7 +2,7 @@ name: "Check & Cachix"
 on:
   push:
     branches:
-      - main
+      - master
       - trying
       - staging
 jobs:

.github/workflows/mdbook_docs.yml

@@ -3,7 +3,7 @@ name: Deploy Docs to GitHub Pages
 on:
   push:
     branches:
-      - main
+      - master
 
 jobs:
   deploy:

.github/workflows/release.yml

@@ -19,7 +19,7 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v2
         with:
-          ref: core
+          ref: master
       - name: Update Changelog
         uses: heinrichreimer/github-changelog-generator-action@v2.1.1
         with:
@@ -49,7 +49,7 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v2
         with:
-          ref: core
+          ref: master
 
       - name: Get Changelog Entry
         id: changelog_reader

.gitignore

@@ -2,7 +2,7 @@ result
 .direnv
 doc/index.html
 
-# Result of flk commands
+# Result of bud commands
 vm
 iso
 doi

README.md

@@ -18,7 +18,7 @@ They also make [Nix expressions](https://nixos.org/manual/nix/unstable/expressio
 
 ## Getting Started
 Check out the [guide](https://devos.divnix.com/start) to get up and running.
-Also, have a look at [_flake.nix_][toc]. If anything is not immediately 
+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.
 
@@ -88,3 +88,4 @@ DevOS is licensed under the [MIT License][mit].
 [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

bud/get.bash

@@ -1 +1 @@
-nix flake new -t "github:divnix/devos/core" "${2:-devos}"
+nix flake new -t "github:divnix/devos/master" "${2:-devos}"

doc/CONTRIBUTING.md

@@ -1,8 +1,8 @@
 # Pull Requests
 
 ## TL;DR;
-- **Target Branch**: `main`
-- **Merge Policy**: [`bors`][bors] is alwyas right (→ `bors try`)
+- **Target Branch**: `master`
+- **Merge Policy**: [`bors`][bors] is always right (→ `bors try`)
 - **Docs**: every changeset is expected to contain doc updates
 - **Commit Msg**: be a poet! Comprehensive and explanatory commit messages 
   should cover the motivation and use case in an easily understandable manner

doc/concepts/profiles.md

@@ -63,5 +63,5 @@ specific belongs in your [host](hosts.md) files instead.
 [definition]: https://nixos.org/manual/nixos/stable/index.html#sec-option-definitions
 [declaration]: https://nixos.org/manual/nixos/stable/index.html#sec-option-declarations
 [options]: https://nixos.org/manual/nixos/stable/index.html#sec-writing-modules
-[spec]: https://github.com/divnix/devos/tree/core/lib/devos/mkProfileAttrs.nix
+[spec]: https://github.com/divnix/devos/tree/master/lib/devos/mkProfileAttrs.nix
 [config]: https://nixos.wiki/wiki/Module#structure

doc/concepts/users.md

@@ -48,7 +48,7 @@ argument that gets passed to your home-manager users.
 
 ## External Usage
 You can easily use the defined home-manager configurations outside of NixOS
-using the `homeConfigurations` flake output. The [flk](../flk/index.md) helper
+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 systems,
@@ -57,10 +57,10 @@ including OSX.
 ### From within the projects devshell:
 ```sh
 # builds the nixos user defined in the NixOS host
-flk home NixOS nixos
+bud home NixOS nixos
 
 # build and activate
-flk home NixOS nixos switch
+bud home NixOS nixos switch
 ```
 
 ### Manually from outside the project:
@@ -73,5 +73,5 @@ nix build "github:divnix/devos#homeConfigurations.nixos@NixOS.home.activationPac
 ```
 
 [home-manager]: https://nix-community.github.io/home-manager
-[modules-list]: https://github.com/divnix/devos/tree/core/users/modules/module-list.nix
+[modules-list]: https://github.com/divnix/devos/tree/master/users/modules/module-list.nix
 [portableuser]: https://digga.divnix.com/api-reference-home.html#homeusers

doc/integrations/deploy.md

@@ -40,7 +40,7 @@ And the private key to your user:
 
 And run the deployment:
 ```sh
-deploy "flk#hostName" --hostname host.example.com
+deploy '.#hostName' --hostname host.example.com
 ```
 
 > ##### _Note:_

doc/integrations/nvfetcher.md

@@ -40,4 +40,4 @@ fetch.git = "https://github.com/mlvzk/manix.git" # responsible for fetching
 
 [nvf]: https://github.com/berberman/nvfetcher
 [nvf-readme]: https://github.com/berberman/nvfetcher#readme
-[sources.toml]: https://github.com/divnix/devos/tree/core/pkgs/sources.toml
+[sources.toml]: https://github.com/divnix/devos/tree/master/pkgs/sources.toml

doc/start/from-nixos.md

@@ -4,7 +4,7 @@
 Assuming you're happy with your existing partition layout, you can generate a
 basic NixOS configuration for your system using:
 ```sh
-flk up
+bud up
 ```
 
 This will make a new file `hosts/up-$(hostname).nix`, which you can edit to
@@ -38,7 +38,7 @@ Now might be a good time to read the docs on [suites](../concepts/suites.md) and
 
 Once you're ready to deploy `hosts/my-host.nix`:
 ```sh
-flk my-host switch
+bud my-host switch
 ```
 
 

doc/start/index.md

@@ -6,10 +6,10 @@ Here is a snippet that will get you the template without the git history:
 ```sh
 nix-shell -p cachix --run "cachix use nrdxp"
 
-nix-shell https://github.com/divnix/devos/archive/core.tar.gz -A shell \
-  --run "flk get core"
+nix-shell https://github.com/divnix/devos/archive/master.tar.gz -A shell \
+  --run "bud get master"
 
-cd flk
+cd devos
 
 nix-shell
 
@@ -18,7 +18,7 @@ git add .
 git commit -m init
 ```
 
-This will place you in a new folder named `flk` with git initialized, and a
+This will place you in a new folder named `devos` with git initialized, and a
 nix-shell that provides all the dependencies, including the unstable nix
 version required.
 

doc/tests.md

@@ -26,7 +26,7 @@ and the examples in [nixpkgs][nixos-tests].
 
 [test-doc]: https://nixos.org/manual/nixos/stable/index.html#sec-nixos-tests
 [test-blog]: https://www.haskellforall.com/2020/11/how-to-use-nixos-for-lightweight.html
-[default]: https://github.com/divnix/devos/tree/core/tests/default.nix
+[default]: https://github.com/divnix/devos/tree/master/tests/default.nix
 [run-test]: https://github.com/NixOS/nixpkgs/blob/6571462647d7316aff8b8597ecdf5922547bf365/lib/debug.nix#L154-L166
 [nixos-tests]: https://github.com/NixOS/nixpkgs/tree/master/nixos/tests
 [testing-python]: https://github.com/NixOS/nixpkgs/tree/master/nixos/lib/testing-python.nix

profiles/core/default.nix

@@ -109,6 +109,8 @@ in
         keep-outputs = true
         keep-derivations = true
         fallback = true
+        # used by nix-dram
+        default-flake = flake:nixpkgs
       '';
     };