Merge pull request #476 from divnix/update-inputs-22.05

support nixos 22.05 + remove bud and misleading onboarding docs (via #477)

Author: montchr

doc/SUMMARY.md

@@ -3,8 +3,6 @@
 - [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)
   - [Hosts](./concepts/hosts.md)
   - [Overrides](./concepts/overrides.md)
@@ -18,8 +16,6 @@
 - [Concerns]()
   - [Secrets](./secrets.md)
   - [Tests](./tests.md)
-- [Helper Script – `bud`](./bud/index.md)
-  - [get](./bud/get.md)
 - [Integrations](./integrations/index.md)
   - [Cachix](./integrations/cachix.md)
   - [Deploy RS](./integrations/deploy.md)

doc/bud/get.md

@@ -8,8 +8,7 @@
 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
-[branch](https://github.com/divnix/devos/tree/nrd/users/nrd/default.nix).
+your users.
 
 ## Basic Usage
 `users/myuser/default.nix`:
@@ -49,22 +48,11 @@ 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 [bud](../bud/index.md) helper
-script makes this even easier.
+using the `homeConfigurations` flake output. 
 
-This is great for keeping your environment consistent across Unix systems,
-including OSX.
+This is great for keeping your environment consistent across Unix-like systems,
+including macOS.
 
-### From within the projects devshell:
-```sh
-# builds the nixos user defined in the NixOS host
-bud home NixOS nixos
-
-# build and activate
-bud home NixOS nixos switch
-```
-
-### Manually from outside the project:
 ```sh
 # build
 nix build "github:divnix/devos#[email protected]"
@@ -74,5 +62,5 @@ nix build "github:divnix/devos#[email protected]
 ```
 
 [home-manager]: https://nix-community.github.io/home-manager
-[modules-list]: https://github.com/divnix/devos/tree/main/users/modules/module-list.nix
+[modules-list]: https://github.com/divnix/digga/tree/main/users/modules/module-list.nix
 [portableuser]: https://digga.divnix.com/api-reference-home.html#homeusers

doc/bud/index.md

@@ -43,9 +43,8 @@ In addition, the [binary cache](../integrations/cachix.md) is added for faster d
 >   you can try with sudo: `sudo nix-shell -p cachix --run "cachix use nrdxp"`
 
 ## Next Steps:
+
 - [Make installable ISO](./iso.md)
-- [Bootstrap Host](./bootstrapping.md)
-- [Already on NixOS](./from-nixos.md)
 
 
 [install-nix]: https://nixos.org/manual/nix/stable/#sect-multi-user-installation

doc/concepts/users.md

@@ -1,22 +1,36 @@
-# ISO
+# Installation Media
+
+This project leverages [nix-community/nixos-generators][nixos-generators] for
+building machine images. In most cases, you'll probably want to use the
+`install-iso` format.
+
+Making an installable ISO for `hosts/bootstrap.nix` is as simple as:
 
-Making and writing an installable iso for `hosts/bootstrap.nix` is as simple as:
 ```sh
-bud build bootstrap bootstrapIso
-sudo -E $(which bud) burn
+nix run github:nix-community/nixos-generators -- \
+  --format install-iso \
+  --flake '.#bootstrap'
 ```
 
-This works for any host.
+Then "burn" the ISO to your USB stick (or CD-R if you like!) following the
+[instructions in the NixOS manual][burn] (or using your preferred USB burner).
+
+You can also swap out the `--format` for [any of the others][formats] supported
+by nixos-generators.
 
-## ISO image nix store & cache
+Continue by following the usual installation instructions in the NixOS manual.
 
-The iso image holds the store to the live environment and _also_ acts as a binary cache
-to the installer. To considerably speed up things, the image already includes all flake
-`inputs` as well as the `devshell` closures.
+## ISO Nix Store and Cache
 
-While you _could_ provision any machine with a single stick, a custom-made iso for
-the host you want to install DevOS to, maximises those local cache hits.
+The ISO image holds the Nix store for the live environment and _also_ acts as a
+binary cache to the installer. To considerably speed things up, the image
+already includes all flake `inputs` as well as the `devshell` closures.
 
-For hosts that don't differ too much, a single usb stick might be ok, whereas when
-there are bigger differences, a custom-made usb stick will be considerably faster.
+While you _could_ provision any NixOS machine with the same USB stick, an ISO
+custom-made for your target host will maximise those local cache hits. For hosts
+that don't differ too much, a single USB stick might be ok, whereas when there
+are bigger differences, a custom-made USB stick will be considerably faster.
 
+[nixos-generators]: https://github.com/nix-community/nixos-generators 
+[burn]: https://nixos.org/manual/nixos/stable/index.html#sec-booting-from-usb
+[formats]: https://github.com/nix-community/nixos-generators/tree/master/formats

doc/start/bootstrapping.md

@@ -2,9 +2,4 @@ result
 .direnv
 doc/index.html
 
-# Result of bud commands
-vm
-iso
-doi
-
 pkgs/_sources/.shake*

doc/start/from-nixos.md

@@ -8,27 +8,23 @@
   inputs =
     {
       # Track channels with commits tested and built by hydra
-      nixos.url = "github:nixos/nixpkgs/nixos-21.11";
+      nixos.url = "github:nixos/nixpkgs/nixos-22.05";
       latest.url = "github:nixos/nixpkgs/nixos-unstable";
       # For darwin hosts: it can be helpful to track this darwin-specific stable
       # channel equivalent to the `nixos-*` channels for NixOS. For one, these
       # channels are more likely to provide cached binaries for darwin systems.
       # But, perhaps even more usefully, it provides a place for adding
       # darwin-specific overlays and packages which could otherwise cause build
       # failures on Linux systems.
-      nixpkgs-darwin-stable.url = "github:NixOS/nixpkgs/nixpkgs-21.11-darwin";
+      nixpkgs-darwin-stable.url = "github:NixOS/nixpkgs/nixpkgs-22.05-darwin";
 
       digga.url = "github:divnix/digga";
       digga.inputs.nixpkgs.follows = "nixos";
       digga.inputs.nixlib.follows = "nixos";
       digga.inputs.home-manager.follows = "home";
       digga.inputs.deploy.follows = "deploy";
 
-      bud.url = "github:divnix/bud";
-      bud.inputs.nixpkgs.follows = "nixos";
-      bud.inputs.devshell.follows = "digga/devshell";
-
-      home.url = "github:nix-community/home-manager/release-21.11";
+      home.url = "github:nix-community/home-manager/release-22.05";
       home.inputs.nixpkgs.follows = "nixos";
 
       darwin.url = "github:LnL7/nix-darwin";
@@ -54,7 +50,6 @@
   outputs =
     { self
     , digga
-    , bud
     , nixos
     , home
     , nixos-hardware
@@ -111,7 +106,6 @@
               digga.nixosModules.nixConfig
               home.nixosModules.home-manager
               agenix.nixosModules.age
-              bud.nixosModules.bud
             ];
           };
 

doc/start/index.md

@@ -1,9 +1,5 @@
 { profiles, ... }:
 {
-  # build with: `bud build bootstrap bootstrapIso`
-  # reachable on the local link via ssh root@fe80::47%eno1
-  # where 'eno1' is replaced by your own machine's network
-  # interface that has the local link to the target machine
   imports = [
     # profiles.networking
     profiles.core.nixos
@@ -13,6 +9,6 @@
 
   boot.loader.systemd-boot.enable = true;
 
-  # will be overridden by the bootstrapIso instrumentation
+  # Required, but will be overridden in the resulting installer ISO.
   fileSystems."/" = { device = "/dev/disk/by-label/nixos"; };
 }