Merge branch 'core' into develop

.github/workflows/check.yml

@@ -0,0 +1,28 @@
+name: "Check & Cachix"
+on:
+  push:
+    branches:
+      - core
+      - 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

bors.toml

@@ -1,7 +1,4 @@
-status = [
-  "ci/hercules/evaluation",
-  "ci/hercules/derivations"
-]
+status = [ "check" ]
 
 required_approvals = 1
 

doc/CONTRIBUTING.md

@@ -21,7 +21,7 @@ If you wish to contribute please follow these guidelines:
 
 * The commit message follows the same semantics as [nixpkgs][nixpkgs].
   * You can use a `#` symbol to specify ambiguities. For example,
-  `develop#zsh: <rest of commit message>` would tell me that your updating the
+  `develop#zsh: <rest of commit message>` would tell me that you're updating the
   `zsh` subprofile living under the `develop` profile.
 
 [nixpkgs-fmt]: https://github.com/nix-community/nixpkgs-fmt

doc/integrations/cachix.md

@@ -1,6 +1,6 @@
 # Cachix
 The system will automatically pull a cachix.nix at the root if one exists.
-This is usually created automatically by a `sudo cachix use`. If your 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
 `cachix` directory into the `profiles/cachix` directory without further
 modification.

doc/start/from-nixos.md

@@ -1,7 +1,7 @@
 # From NixOS
 
 ## Generate Configuration
-Assuming your happy with your existing partition layout, you can generate a
+Assuming you're happy with your existing partition layout, you can generate a
 basic NixOS configuration for your system using:
 ```sh
 flk up
@@ -36,7 +36,7 @@ Now might be a good time to read the docs on [suites](../concepts/suites.md) and
 > them directly into a host module of your own making, and commit that instead.
 # Installation
 
-Once your ready to deploy `hosts/my-host.nix`:
+Once you're ready to deploy `hosts/my-host.nix`:
 ```sh
 flk my-host switch
 ```