Merge branch 'core' into api-next

.github/workflows/community_sync.yml

@@ -1,23 +0,0 @@
-name: Sync Community Branch
-
-on:
-  workflow_run:
-    workflows:
-      - "CI - Changelog"
-      - "Release"
-    types:
-      - completed
-    branches:
-      - core
-
-jobs:
-  merge-core-to-community:
-    name: Merge core -> community
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: tukasz/direct-merge-action@master
-        with:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          source-branch: core
-          target-branch: community

.github/workflows/mdbook_docs.yml

@@ -16,12 +16,12 @@ jobs:
         with:
           mdbook-version: 'latest'
 
-      - run: mdbook build
+      - run: mdbook build doc
 
       - name: Deploy
         uses: peaceiris/actions-gh-pages@v3
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           publish_branch: gh-pages
-          publish_dir: ./book
+          publish_dir: ./doc/book
           cname: devos.divnix.com

.gitignore

@@ -2,4 +2,4 @@ result
 up
 hosts/up-*
 .direnv
-book
+doc/index.html

CHANGELOG.md

@@ -0,0 +1,82 @@
+# Changelog
+
+## [v0.9.0](https://github.com/divnix/devos/tree/v0.9.0) (2021-04-19)
+
+**Implemented enhancements:**
+
+- pin inputs into iso live registry [\#190](https://github.com/divnix/devos/issues/190)
+- Pass 'self' to lib [\#169](https://github.com/divnix/devos/issues/169)
+- doc: quickstart "ISO. What next?" [\#167](https://github.com/divnix/devos/issues/167)
+- Integrate Android AOSP putting mobile under control [\#149](https://github.com/divnix/devos/issues/149)
+- Inoculate host identity on first use [\#132](https://github.com/divnix/devos/issues/132)
+- kubenix support [\#130](https://github.com/divnix/devos/issues/130)
+- Improve Home Manager support: profiles/suites, modules, extern, flake outputs [\#119](https://github.com/divnix/devos/issues/119)
+- Local CA \(between hosts\) [\#104](https://github.com/divnix/devos/issues/104)
+- Q5: git annex for machine state [\#68](https://github.com/divnix/devos/issues/68)
+- name space ./pkgs overlays [\#60](https://github.com/divnix/devos/issues/60)
+- remap global keys easily [\#57](https://github.com/divnix/devos/issues/57)
+- make pass state part of this repo's structure [\#56](https://github.com/divnix/devos/issues/56)
+- Incorporate ./shells [\#38](https://github.com/divnix/devos/issues/38)
+- Encrypt with \(r\)age [\#37](https://github.com/divnix/devos/issues/37)
+
+**Fixed bugs:**
+
+- `pathsToImportedAttrs` does not accept directories [\#221](https://github.com/divnix/devos/issues/221)
+- Cachix caches aren't added to the configuration [\#208](https://github.com/divnix/devos/issues/208)
+- Issues with current changelog workflow [\#205](https://github.com/divnix/devos/issues/205)
+- iso: systemd service startup [\#194](https://github.com/divnix/devos/issues/194)
+- Help adding easy-hls-nix to devos [\#174](https://github.com/divnix/devos/issues/174)
+- `flk update` fails because of obsolete flag [\#159](https://github.com/divnix/devos/issues/159)
+- Expected that not all packages are exported? [\#151](https://github.com/divnix/devos/issues/151)
+- Segmentation fault when generating iso [\#150](https://github.com/divnix/devos/issues/150)
+
+**Documentation:**
+
+- doc: split iso [\#193](https://github.com/divnix/devos/issues/193)
+- lib: can depend on pkgs \(a la nixpkgs\#pkgs/pkgs-lib\) [\#147](https://github.com/divnix/devos/pull/147)
+
+**Closed issues:**
+
+- FRRouting router implementation [\#154](https://github.com/divnix/devos/issues/154)
+- ARM aarch64 Support [\#72](https://github.com/divnix/devos/issues/72)
+
+## [v0.8.0](https://github.com/divnix/devos/tree/v0.8.0) (2021-03-02)
+
+**Implemented enhancements:**
+
+- semi automatic update for /pkgs [\#118](https://github.com/divnix/devos/issues/118)
+- Home-manager external modules from flakes [\#106](https://github.com/divnix/devos/issues/106)
+
+**Fixed bugs:**
+
+- 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)
+- 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)
+
+## [0.7.0](https://github.com/divnix/devos/tree/0.7.0) (2021-02-20)
+
+**Implemented enhancements:**
+
+- add zoxide [\#53](https://github.com/divnix/devos/issues/53)
+- Multiarch support? [\#17](https://github.com/divnix/devos/issues/17)
+- initial multiArch support [\#18](https://github.com/divnix/devos/pull/18)
+
+**Fixed bugs:**
+
+- Missing shebang from flk.sh [\#131](https://github.com/divnix/devos/issues/131)
+- Rename Meta Issue [\#128](https://github.com/divnix/devos/issues/128)
+- specialisations break the `system` argument [\#46](https://github.com/divnix/devos/issues/46)
+- Revert "Add extraArgs to lib.nixosSystem call to add system args." [\#47](https://github.com/divnix/devos/pull/47)
+
+**Documentation:**
+
+- update home-manager urls [\#62](https://github.com/divnix/devos/pull/62)
+
+**Closed issues:**
+
+- add github action for cachix build ci [\#59](https://github.com/divnix/devos/issues/59)
+
+
+
+\* *This Changelog was automatically generated by [github_changelog_generator](https://github.com/github-changelog-generator/github-changelog-generator)*

README.md

@@ -28,7 +28,7 @@ are unstable versions (0._x_._x_) to help users keep track of changes and
 progress.
 
 ## Getting Started
-Check out the [guide](https://devos.divnix.com/doc/start) to get up and running.
+Check out the [guide](https://devos.divnix.com/start) to get up and running.
 
 ## In the Wild
 The author maintains his own branch, so you can take inspiration, direction, or
@@ -55,10 +55,10 @@ There are two branches from which to choose: [core][core] and
 several ready-made profiles for discretionary use.
 
 Every package and NixOS profile declared in community is uploaded to
-[cachix](./cachix), so everything provided is available without building
+[cachix](./integrations/cachix.md), so everything provided is available
-anything. This is especially useful for the packages that are
+without building anything. This is especially useful for the packages that are
-[overridden](./overrides) from master, as without the cache, rebuilds are
+[overridden](./concepts/overrides.md) from master, as without the cache,
-quite frequent.
+rebuilds are quite frequent.
 
 ## Inspiration & Art
 - [hlissner/dotfiles][dotfiles]

SUMMARY.md

@@ -1,32 +0,0 @@
-# Summary
-
-- [Introduction](./README.md)
-- [Quick Start](./doc/start/index.md)
-  - [ISO](./doc/start/iso.md)
-  - [Bootstrapping](./doc/start/bootstrapping.md)
-  - [From NixOS](./doc/start/from-nixos.md)
-- [Layout](./doc/layout.md)
-  - [Cachix](./cachix/README.md)
-  - [Extern](./extern/README.md)
-  - [Hosts](./hosts/README.md)
-  - [Lib](./lib/README.md)
-  - [Modules](./modules/README.md)
-  - [Overlays](./overlays/README.md)
-  - [Overrides](./overrides/README.md)
-  - [Packages](./pkgs/README.md)
-  - [Profiles](./profiles/README.md)
-  - [Secrets](./secrets/README.md)
-  - [Suites](./suites/README.md)
-  - [Tests](./tests/README.md)
-  - [Users](./users/README.md)
-- [flk](./doc/flk/index.md)
-  - [up](./doc/flk/up.md)
-  - [update](./doc/flk/update.md)
-  - [get](./doc/flk/get.md)
-  - [iso](./doc/flk/iso.md)
-  - [install](./doc/flk/install.md)
-  - [home](./doc/flk/home.md)
-- [Integrations](doc/integrations/index.md)
-  - [Deploy RS](./doc/integrations/deploy.md)
-  - [Hercules CI](./doc/integrations/hercules.md)
-- [Contributing](./doc/README.md)

cachix/README.md

@@ -1,12 +0,0 @@
-# Cachix
-The cachix directory simple captures the output of `sudo cachix use` for the
-developers personal cache, as well as the nix-community cache. You can easily
-add your own cache, assuming the template lives in /etc/nixos, by simply
-running `sudo cachix use yourcache`.
-
-These caches are only added to the system after a `nixos-rebuild switch`, so it
-is recommended to call `cachix use nrdxp` before the initial deployment, as it
-will save a lot of build time.
-
-In the future, users will be able to skip this step once the ability to define
-the nix.conf within the flake is fully fleshed out upstream.

default.nix

@@ -1,8 +1,31 @@
 let
   inherit (default.inputs.nixos) lib;
 
-  default = (import ./compat).defaultNix;
+  default = (import "${./lib}/compat").defaultNix;
+
+  ciSystems = [
+    "aarch64-linux"
+    "i686-linux"
+    "x86_64-linux"
+  ];
+
+  filterSystems = lib.filterAttrs
+    (system: _: lib.elem system ciSystems);
+
+  recurseIntoAttrsRecursive = lib.mapAttrs (_: v:
+    if lib.isAttrs v
+    then recurseIntoAttrsRecursive (lib.recurseIntoAttrs v)
+    else v
+  );
+
+  systemOutputs = lib.filterAttrs
+    (name: set: lib.isAttrs set
+      && lib.any
+      (system: set ? ${system} && name != "legacyPackages")
+      ciSystems
+    )
+    default.outputs;
+
+  ciDrvs = lib.mapAttrs (_: system: filterSystems system) systemOutputs;
 in
-builtins.mapAttrs (_: v: lib.recurseIntoAttrs v) default.packages // {
+(recurseIntoAttrsRecursive ciDrvs) // { shell = import ./shell.nix; }
-  shell = import ./shell.nix;
-}

doc/SUMMARY.md

@@ -0,0 +1,34 @@
+# Summary
+
+- [Introduction](../README.md)
+- [Quick Start](./start/index.md)
+  - [ISO](./start/iso.md)
+  - [Bootstrapping](./start/bootstrapping.md)
+  - [From NixOS](./start/from-nixos.md)
+- [Key Concepts](./concepts/index.md)
+  - [Extern](./concepts/extern.md)
+  - [Hosts](./concepts/hosts.md)
+  - [Overrides](./concepts/overrides.md)
+  - [Profiles](./concepts/profiles.md)
+  - [Suites](./concepts/suites.md)
+  - [Users](./concepts/users.md)
+- [Outputs](./outputs/index.md)
+  - [Modules](./outputs/modules.md)
+  - [Overlays](./outputs/overlays.md)
+  - [Packages](./outputs/pkgs.md)
+- [Concerns]()
+  - [Lib](./lib.md)
+  - [Secrets](./secrets.md)
+  - [Tests](./tests.md)
+- [Helper Script – `flk`](./flk/index.md)
+  - [up](./flk/up.md)
+  - [update](./flk/update.md)
+  - [get](./flk/get.md)
+  - [iso](./flk/iso.md)
+  - [install](./flk/install.md)
+  - [home](./flk/home.md)
+- [Integrations](./integrations/index.md)
+  - [Cachix](./integrations/cachix.md)
+  - [Deploy RS](./integrations/deploy.md)
+  - [Hercules CI](./integrations/hercules.md)
+- [Contributing](./CONTRIBUTING.md)

doc/concepts/hosts.md

@@ -17,16 +17,16 @@ matching the current systems hostname if one is not specified explicitly.
 
 It is recommended that the host modules only contain configuration information
 specific to a particular piece of hardware. Anything reusable across machines
-is best saved for [profile modules](../profiles).
+is best saved for [profile modules](./profiles.md).
 
-This is a good place to import sets of profiles, called [suites](../suites),
+This is a good place to import sets of profiles, called [suites](./suites.md),
 that you intend to use on your machine.
 
 Additionally, this is the perfect place to import anything you might need from
 the [nixos-hardware][nixos-hardware] repository.
 
 > ##### _Note:_
-> Set `nixpkgs.system` to the architecture of this host, default is "x86_64-linux". 
+> Set `nixpkgs.system` to the architecture of this host, default is "x86_64-linux".
 > Keep in mind that not all packages are available for all architectures.
 
 ## Example

doc/concepts/index.md

@@ -0,0 +1,4 @@
+# Key Concepts
+
+There are few idioms unique to DevOS. This section is dedicated to helping you
+understand them.

doc/concepts/overrides.md

@@ -1,6 +1,6 @@
 # Overrides
-By default, the NixOS systems are based on the latest release. While it is
+By default, the NixOS systems are based on unstable. While it is trivial to
-trivial to change this to nixos-unstable or any other branch of nixpkgs by
+change this to a stable release, or any other branch of nixpkgs by
 changing the flake url, sometimes all we want is a single package from another
 branch.
 
@@ -8,6 +8,7 @@ This is what the overrides are for. By default, they are pulled directly from
 nixpkgs/master, but you can change the `override` flake input url to
 nixos-unstable, or even a specific sha revision.
 
+They are defined in the `extern/overrides.nix` file.
 
 ## Example
 

doc/concepts/profiles.md

@@ -12,17 +12,17 @@ is maintained to help get up to speed on their usage.
 For the sake of consistency, a profile should always be defined in a
 ___default.nix___ containing a [nixos module config][config].
 A profile's directory is used for quick modularization of
-[interelated bits](./#subprofiles).
+[interelated bits](./profiles.md#subprofiles).
 
 > ##### _Notes:_
-> * For _declaring_ module options, there's the [modules](../modules) directory.
+> * For _declaring_ module options, there's the [modules](../outputs/modules.md) directory.
 > * This directory takes inspiration from
 >   [upstream](https://github.com/NixOS/nixpkgs/tree/master/nixos/modules/profiles)
 >   .
 > * Sticking to a simple [spec][spec] has refreshing advantages.
->   [hercules-ci](../doc/integrations/hercules.md) expects all profiles to be
+>   [hercules-ci](../integrations/hercules.md) expects all profiles to be
 >   defined in a ___default.nix___, allowing them to be built automatically when
->   added. Congruently, [suites](../suites) expect ___default.nix___ to avoid
+>   added. Congruently, [suites](suites.md) expect ___default.nix___ to avoid
 >   having to manage their paths manually.
 
 ## Subprofiles
@@ -56,7 +56,7 @@ profiles/develop/zsh/default.nix:
 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
 across hosts while minimizing boilerplate. Remember, anything machine
-specific belongs in your [host](../hosts) files instead.
+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

doc/concepts/suites.md

@@ -6,6 +6,8 @@ profiles. For good examples, check out the suites defined in the community
 In the future, we will use suites as a mechanism for deploying various machine
 types which don't depend on hardware, such as vm's and containers.
 
+They are defined in `profiles/suites.nix`.
+
 ## Definition
 ```nix
 rec {

doc/concepts/users.md

@@ -1,6 +1,6 @@
 # Users
 
-Users are a special case of [profiles](../profiles) 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,
 home manager is wired in by default so all you have to worry about is declaring
 your users. For a fully fleshed out example, check out the developers personal
@@ -24,14 +24,14 @@ your users. For a fully fleshed out example, check out the developers personal
 
 ## Home Manager
 Home Manager support follows the same principles as regular nixos configurations.
-All modules defined in [user modules](./modules/module-list.nix) will be imported to 
+All modules defined in [user modules][modules-list] will be imported to
-Home Manager. All profiles are availabe in [suites](../suites/default.nix) as userProfiles.
+Home Manager. All profiles are availabe in [suites][suites] as userProfiles.
 The `userSuites` output will be available in your Home Manager Configuration as
 the special argument, `suites`.
 
 ## External Usage
 You can easily use the defined home-manager configurations outside of NixOS
-using the `homeConfigurations` flake output. The [flk](../doc/flk) helper 
+using the `homeConfigurations` flake output. The [flk](../flk/index.md) helper
 script makes this even easier.
 
 This is great for keeping your environment consistent across Unix systems,
@@ -56,3 +56,5 @@ nix build "github:divnix/devos#homeConfigurations.nixos@NixOS.home.activationPac
 ```
 
 [home-manager]: https://nix-community.github.io/home-manager
+[suites]: https://github.com/divnix/devos/tree/core/suites/default.nix
+[modules-list]: https://github.com/divnix/devos/tree/core/modules/module-list.nix

doc/flk/home.md

@@ -4,5 +4,5 @@ NixOS, providing an awesome mechanism for keeping your environments
 synchronized, even when using other systems.
 
 ## Usage
-The [users](../../users/index.md#external-usage) page contains a good usage
+The [users](../concepts/users.md#external-usage) page contains a good usage
 example.

doc/flk/update.md

@@ -11,8 +11,8 @@ contains a flake.nix, with an optional arguement to update only a specific
 input in the subflake.
 
 For example, you can update any
-[package sources](../../pkgs#automatic-source-updates) you may have declared
+[package sources](../outputs/pkgs.md#automatic-source-updates) you may have
-in _pkgs/flake.nix_:
+declared in _pkgs/flake.nix_:
 ```sh
 flk update pkgs
 ```

doc/integrations/cachix.md

@@ -0,0 +1,17 @@
+# 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
+inclined to keep the root clean, you can drop any generated files in the
+`cachix` directory into the `profiles/cachix` directory without further
+modification.
+
+For example, to add your own cache, assuming the template lives in /etc/nixos,
+by simply running `sudo cachix use yourcache`. Then, optionally, move
+`cachix/yourcache.nix` to `profiles/cachix/yourcache.nix`
+
+These caches are only added to the system after a `nixos-rebuild switch`, so it
+is recommended to call `cachix use nrdxp` before the initial deployment, as it
+will save a lot of build time.
+
+In the future, users will be able to skip this step once the ability to define
+the nix.conf within the flake is fully fleshed out upstream.

doc/integrations/deploy.md

@@ -4,7 +4,7 @@ chosen for devos after the author experienced some frustrations with the
 stateful nature of nixops' db. It was also designed from scratch to support
 flake based deployments, and so is an excellent tool for the job.
 
-By default, all the [hosts](../../hosts) are also available as deploy-rs nodes,
+By default, all the [hosts](../concepts/hosts.md) are also available as deploy-rs nodes,
 configured with the hostname set to `networking.hostName`; overridable via
 the command line.
 

doc/integrations/hercules.md

@@ -15,7 +15,7 @@ binary cache (and of course you do), be sure _not_ to skip the
 [binary-caches.json][cache].
 
 ## Ready to Use
-The repo is already set up with the proper _nix/ci.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
 breaks, and never build the same package twice!
 

doc/layout.md

@@ -1,4 +0,0 @@
-# Layout
-Each of the following sections is a directory in the root of the project
-serving a singular purpose. Select a chapter to read more about its purpose
-and usage.

doc/outputs/index.md

@@ -0,0 +1,3 @@
+# Layout
+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.

doc/outputs/modules.md

@@ -4,13 +4,13 @@ The modules directory is a replica of nixpkg's NixOS [modules][nixpkgs-modules]
 nixpkgs proper once your module is sufficiently stable.
 
 All modules linked in _module-list.nix_ are automatically exported via
-`nixosModules.<file-basename>`, and imported into all [hosts](../hosts).
+`nixosModules.<file-basename>`, and imported into all [hosts](../concepts/hosts.md).
 
 
 > ##### _Note:_
 > 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
-> , use [profiles](../profiles) instead.
+> , use [profiles](../concepts/profiles.md) instead.
 
 ## Semantics
 In case you've never written a module for nixpkgs before, here is a brief

doc/outputs/overlays.md

@@ -3,7 +3,7 @@ Writing overlays is a common occurence when using a NixOS system. Therefore,
 we want to keep the process as simple and straightforward as possible.
 
 Any _.nix_ files declared in this directory will be assumed to be a valid
-overlay, and will be automatically imported into all [hosts](../hosts), and
+overlay, and will be automatically imported into all [hosts](../concepts/hosts.md), and
 exported via `overlays.<file-basename>` _as well as_
 `packages.<system>.<pkgName>` (for valid systems), so all you have to do is
 write it.

doc/outputs/pkgs.md

@@ -1,5 +1,5 @@
 # Packages
-Similar to [modules](../modules), 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
 your package, it's as simple as dropping it into the nixpkgs/pkgs directory.
 
@@ -12,18 +12,17 @@ And all the packages are exported via `packages.<system>.<pkg-name>`, for all
 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
-[host](../hosts).
+[host](../concepts/hosts.md).
 
 ## Automatic Source Updates
 There is the added, but optional, convenience of declaring your sources in
 _pkgs/flake.nix_ as an input. You can then access them from the `srcs` package.
 This allows updates to be managed automatically by simply
-[updating](../doc/flk/update.md#updating-package-sources) the lock file. No
+[updating](../flk/update.md#updating-package-sources) the lock file. No
 more manually entering sha256 hashes!
 
 As an added bonus, version strings are also generated automatically from either
-the flake ref, or the date and git revision of the source. For examples,
+the flake ref, or the date and git revision of the source.
-definitely checkout the [community branch](../#community-profiles).
 
 ## Example
 pkgs/development/libraries/libinih/default.nix:

doc/start/bootstrapping.md

@@ -1,9 +1,9 @@
 # Bootstrapping
 
-This will help you boostrap a bare host with the help of the 
+This will help you boostrap a bare host with the help of the
-[bespoke iso](./iso) live installer.
+[bespoke iso](./iso.md) live installer.
 
-_Note: nothing prevents you from remotely executing the boostrapping 
+_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 partion
@@ -14,7 +14,7 @@ and format your disk according to the [official manual][manual].
 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` 
+Mount `nixos` partition to `/mnt` and — for UEFI — `boot`
 partition to `/mnt/boot`:
 
 ```console
@@ -25,7 +25,7 @@ $ swapon /dev/$your_swap_partition
 
 ## Install
 
-Install using the `flk` wrapper baked into the iso off of a copy of devos 
+Install using the `flk` wrapper baked into the iso off of a copy of devos
 from the time the iso was built:
 
 ```console
@@ -41,7 +41,7 @@ $ flk install NixOS --impure # use same host as above
 ### 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`, 
+which announces it's hostname via [MulticastDNS][mDNS] as `hostname.local`,
 that is `NixOS.local` in the [iso example](./iso).
 
 In the rare case that [MulticastDNS][mDNS] is not availabe or turned off
@@ -50,7 +50,7 @@ in your network, there is a static link-local IPv6 address configured to
 `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) needs passwordless
+`root` user _(hint: [`deploy-rs`](../integrations/deploy.md) needs passwordless
 sudo access)_:
 
 ```nix
@@ -62,7 +62,7 @@ sudo access)_:
 }
 ```
 
-You can then ssh into the live installer through one of the 
+You can then ssh into the live installer through one of the
 following options:
 
 ```console
@@ -73,7 +73,7 @@ ssh root@fe80::47%eno1  # where eno1 is your network interface on which you are
 
 _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](../../profiles)._
+for your environment, you ought to configure that in a regular [profile](../concepts/profiles.md)._
 
 ### EUI-64 LLA & Host Identity
 
@@ -88,7 +88,7 @@ specific address over [NDP][NDP] for example with:
 ip -6 neigh show # also shows fe80::47
 ```
 
-***This LLA is stable for the host, unless you need to swap that particular network card.*** 
+***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.
 

doc/start/from-nixos.md

@@ -15,8 +15,8 @@ your region. Keep in mind that `networking.hostName` with be automatically
 set to the filename of your hosts file, so `hosts/my-host.nix` will have the
 hostname `my-host`.
 
-Now might be a good time to read the docs on [suites](../../suites) and
+Now might be a good time to read the docs on [suites](../concepts/suites.md) and
-[profiles](../../profiles) and add or create any that you need.
+[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

doc/start/index.md

@@ -22,7 +22,7 @@ This will place you in a new folder named `flk` with git initialized, and a
 nix-shell that provides all the dependencies, including the unstable nix
 version required.
 
-In addition, the [binary cache](../../cachix) is added for faster deployment.
+In addition, the [binary cache](../integrations/cachix.md) is added for faster deployment.
 
 > ##### _Notes:_
 > - You can change `core` to [`community`](../../index.md#community-profiles)

doc/tests.md

@@ -0,0 +1,36 @@
+# Testing
+
+Testing is always an important aspect of any software development project, and
+NixOS offers some incredibly powerful tools to write tests for your
+configuration, and, optionally, run them in
+[CI](./integrations/hercules.md).
+
+## Lib Tests
+You can easily write tests for your own library functions in the
+___tests/lib.nix___ file and they will be run on every `nix flake check` or
+during a CI run.
+
+## Unit Tests
+Unit tests are can be created from regular derivations, and they can do
+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
+be built during CI.
+
+## Integration Tests
+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!
+
+Be sure to use the `mkTest` function, in the [___tests/default.nix___][default]
+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
+already great resources for learning how to use these tests effectively,
+including the official [docs][test-doc], a fantastic [blog post][test-blog],
+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
+[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
+[check]: https://nixos.org/manual/nixpkgs/stable/#ssec-check-phase

flake.lock

@@ -81,7 +81,7 @@
         "utils": "utils_2"
       },
       "locked": {
-        "narHash": "sha256-Mf67M0twCyNmRQxnhH51f6VroHaCwJKvFDMc1Wc7pt8=",
+        "narHash": "sha256-aGpcPxOBIPnwj6uLNtpKefZjEbDkZnMHZ2mH12veHnY=",
         "path": "./lib",
         "type": "path"
       },

flake.nix

@@ -38,9 +38,9 @@
       inherit self inputs nixos;
       hosts = ./hosts;
       packages = import ./pkgs;
-      suites = import ./suites;
+      suites = import ./profiles/suites.nix;
       extern = import ./extern;
-      overrides = import ./overrides;
+      overrides = import ./extern/overrides.nix;
       overlays = ./overlays;
       profiles = ./profiles;
       userProfiles = ./users/profiles;

lib/compat/default.nix

@@ -1,7 +1,7 @@
 let
   inherit (lock.nodes.flake-compat.locked) rev narHash;
 
-  lock = builtins.fromJSON (builtins.readFile ../flake.lock);
+  lock = builtins.fromJSON (builtins.readFile "${../..}/flake.lock");
   flake = (import
     (
       fetchTarball {
@@ -10,7 +10,7 @@ let
       }
     )
     {
-      src = ../.;
+      src = ../../.;
     });
 in
 flake

lib/devos/default.nix

@@ -7,7 +7,7 @@
       config = { allowUnfree = true; };
     };
 
-  profileMap = map (profile: profile.default);
+  profileMap = list: map (profile: profile.default) (lib.flatten list);
 
   mkNodes =  import ./mkNodes.nix { inherit lib; };
 

lib/devos/mkHosts.nix

@@ -39,7 +39,7 @@ let
 
       nix.nixPath = [
         "nixpkgs=${userFlakeNixOS}"
-        "nixos-config=${userFlakeSelf}/compat/nixos"
+        "nixos-config=${userFlakeSelf}/lib/compat/nixos"
         "home-manager=${userFlakeInputs.home}"
       ];
 
@@ -65,7 +65,11 @@ let
     # Everything in `./modules/list.nix`.
     flakeModules = { imports = builtins.attrValues userFlakeSelf.nixosModules ++ extern.modules; };
 
-    cachix = "${userFlakeSelf}/cachix.nix";
+    cachix = let rootCachix = "${userFlakeSelf}/cachix.nix"; in
+      if builtins.pathExists rootCachix
+      then rootCachix
+      else { }
+    ;
   };
 
   specialArgs = extern.specialArgs // { suites = suites.system; };

nix/ci.nix

@@ -1,31 +0,0 @@
-let
-  inherit (default.inputs.nixos) lib;
-
-  default = (import "${../.}/compat").defaultNix;
-
-  ciSystems = [
-    "aarch64-linux"
-    "i686-linux"
-    "x86_64-linux"
-  ];
-
-  filterSystems = lib.filterAttrs
-    (system: _: lib.elem system ciSystems);
-
-  recurseIntoAttrsRecursive = lib.mapAttrs (_: v:
-    if lib.isAttrs v
-    then recurseIntoAttrsRecursive (lib.recurseIntoAttrs v)
-    else v
-  );
-
-  systemOutputs = lib.filterAttrs
-    (name: set: lib.isAttrs set
-      && lib.any
-      (system: set ? ${system} && name != "legacyPackages")
-      ciSystems
-    )
-    default.outputs;
-
-  ciDrvs = lib.mapAttrs (_: system: filterSystems system) systemOutputs;
-in
-recurseIntoAttrsRecursive ciDrvs

profiles/cachix/default.nix

@@ -1,9 +1,8 @@
-# WARN: this file will get overwritten by $ cachix use <name>
 { pkgs, lib, ... }:
 let
-  folder = ./cachix;
+  folder = ./.;
   toImport = name: value: folder + ("/" + name);
-  filterCaches = key: value: value == "regular" && lib.hasSuffix ".nix" key;
+  filterCaches = key: value: value == "regular" && lib.hasSuffix ".nix" key && key != "default.nix";
   imports = lib.mapAttrsToList toImport (lib.filterAttrs filterCaches (builtins.readDir folder));
 in
 {

profiles/core/default.nix

@@ -2,6 +2,7 @@
 let inherit (lib) fileContents;
 in
 {
+  imports = [ ../cachix ];
 
   nix.systemFeatures = [ "nixos-test" "benchmark" "big-parallel" "kvm" ];
 
@@ -75,7 +76,7 @@ in
         '';
 
         # fix nixos-option
-        nixos-option = "nixos-option -I nixpkgs=${toString ../../compat}";
+        nixos-option = "nixos-option -I nixpkgs=${toString ../../lib/compat}";
 
         # sudo
         s = ifSudo "sudo -E ";

shell.nix

@@ -1 +1 @@
-(import ./compat).shellNix
+(import ./lib/compat).shellNix