Update course structure

Folding days 3 and 4 into each other

README.org

@@ -33,19 +33,13 @@ system, cross-compilation, and other special niches.
   details, such as understanding dependencies and overriding build
   mechanisms.
 
-+ [[file:courses/day-03-nixpkgs/README.org][Day 3: Nixpkgs]] :: This course is an introduction into /nixpkgs/, a
-  gigantic repository set of over 80,000 packages.  Nixpkgs allows you
-  to re-use packaging code other users have contributed.  As part of
-  this course we cover using nixpkgs tools, as well as how to
-  contribute things you have made back into nixpkgs.
-
-+ [[file:courses/day-04-cross/README.org][Day 4: Cross-compilation]] :: In this course we cover
-  cross-compilation with Nix.  This includes theoretical background on
-  what /cross-compilation/ is, some Nix-specific concepts, and
-  practical examples for packaging embedded (Rust) code, as well as
-  fixing existing cross-compilation errors.
-
-+ [[file:courses/day-05-modules/README.org][Day 5: Module system]] :: Nix is a powerful configuration language.
++ [[file:courses/day-03-advanced/README.org][Day 3: Advanced Concepts]] :: This course covers an introduction into
+  /nixpkgs/, a repository set of over 80,000 packages and many
+  different Nix utilities for creating new packages and modules.
+  Furthermore this course touches on /flakes/ and more advanced
+  concepts such as /cross compilation/.
+
++ [[file:courses/day-05-modules/README.org][Day 4: Module system]] :: Nix is a powerful configuration language.
   If you run NixOS on your system, you may have already used modules!
   This course demystifies their functionality and provides a set of
   examples on how to build your own module abstractions.

courses/day-01-introduction/40-nix-language.org

@@ -1,39 +1,36 @@
 #+Title: The Nix language
 #+SETUPFILE: ../../reveal.setup
 
-** Technical overview
+** What is "Nix"
 
 \\
 
-   + The Nix language is executed by the ~nix-daemon~
-   + ~nix-daemon~ is implemented in C++ and Nix
-   + ~nix-<command>~ is the set of old, deprecated CLIs
-   + ~nix <command>~ is the new, experimental CLI
++ "Nix" the programming language...
++ ...executed by the "Nix Daemon"...
++ ...which interacts with the "Nix" CLIs
 
 ** Technical overview
 
 \\
 
-   + ~nixpkgs~ :: the nix standard library
-   + ~nixpkgs/lib~ :: generators and iterator tools
-   + ~nixpkgs/stdenv~ :: build environment utilities
-   + ~nixpkgs/pkgs~ :: main package tree
-   + ~nixpkgs/pkgs/build-support~ :: various build utilities (like
-     ~fetchFromGitHub~)
++ Language: Nix
++ Daemon: ~nix-daemon~
++ CLIs: ~nix-<command>~ and ~nix <command>~
++ Stdlib: ~nixpkgs~
 
 ** Types 1
 
 \\
 
-   + Attribute set (or "attrset") :: A map of keys and values of
-     arbitrary types.  Key = Value pairs must end with a ~;~.
++ Attribute set (or "attrset") :: A map of keys and values of
+  arbitrary types.  Key = Value pairs must end with a ~;~.
 
-     ~{ a = 13; b = 12; c = 11; hello = true; }~
+  ~{ a = 13; b = 12; c = 11; hello = true; }~
 
-   + Lists :: A list of arbitrary types.  Can contain mixed types.
-     Values are space-separated.
++ Lists :: A list of arbitrary types.  Can contain mixed types.
+  Values are space-separated.
 
-     ~[ 13 12 11 "hello" true ]~
+  ~[ 13 12 11 "hello" true ]~
 
 ** Types 2
 
@@ -60,7 +57,6 @@
    + Paths (~/nix/store~ or ~./my-module~)
    + Null (~null~)
 
-
 ** Quiz: Semantic structure
 
 \\

courses/day-03-advanced/README.org

@@ -0,0 +1,28 @@
+#+Title: Advanced Concepts | Day 3
+#+Author: Katharina Fey
+#+SETUPFILE: ../../html.setup
+
+[[../../README.org][Back to Index]]
+
+Today we will cover a few different advanced concepts around Nix.
+
++ What is ~nixpkgs~ and how does it work?
++ Exploring and understanding Nix ecosystems
++ Source pinning and management
++ Cross compilation with Nix
+
+** Slides
+
+1. [[./70-nixpkgs.org][Nixpkgs]]
+2. [[./80-overlays-and-flakes.org][Overlays]]
+3. [[file:85-flakes.org][Flakes]]
+4. [[./90-development.org][Nix for developers]]
+5. Cross Compilation
+   1. [[./10-what-is.org][What even _is_ cross compilation??]]
+   2. [[./20-basic-usage.org][Basic cross-compilation]]
+   3. [[./30-build-inputs.org][Build inputs and other weirdnesses]]
+
+** Homework
+
+1. [[./71-nixpkgs-exercise.org][Nixpkgs excercises]]
+2. [[file:40-aarch64-example.org][Cross compilation: aarch64]]

courses/day-04-modules/15-home-manager.org

@@ -0,0 +1,16 @@
+#+Title: home-manager
+#+SETUPFILE: ../../reveal.setup
+
+
+** Collection of userspace modules
+
+** 
+
+** home-manager
+
+\\
+
+   + https://github.com/nix-community/home-manager
+   + ~nix-channel --add https://github.com/nix-community/home-manager/archive/master.tar.gz home-manager~
+   + ~nix-channel --add https://github.com/nix-community/home-manager/archive/release-22.05.tar.gz home-manager~
+   + ~nix-shell '<home-manager>' -A install~

courses/day-05-modules/70-exercise-modules.org → courses/day-04-modules/70-exercise-modules.org

@@ -1,15 +1,6 @@
 #+Title: Building a module abstraction
 #+SETUPFILE: ../../reveal.setup
 
-** home-manager
-
-\\
-
-   + https://github.com/nix-community/home-manager
-   + ~nix-channel --add https://github.com/nix-community/home-manager/archive/master.tar.gz home-manager~
-   + ~nix-channel --add https://github.com/nix-community/home-manager/archive/release-22.05.tar.gz home-manager~
-   + ~nix-shell '<home-manager>' -A install~
-
 ** A lot of modules generate configuration
 
 \\

courses/day-05-modules/README.org → courses/day-04-modules/README.org

@@ -1,4 +1,4 @@
-#+Title: Module system | Day 5
+#+Title: Module system | Day 4
 #+Author: Katharina Fey
 #+SETUPFILE: ../../html.setup
 
@@ -15,9 +15,10 @@ Today we will cover the following subjects:
 ** Slides
 
 1. [[./10-module-basics.org][Module basics]]
-2. [[./20-using-modules.org][Using modules]]
-4. [[./40-module-anatomy.org][Module anatomy]]
-5. [[./60-advanced-types.org][Advanced types]]
+2. [[./15-home-manager.org][home-manager]]
+4. [[./20-using-modules.org][Using modules]]
+5. [[./40-module-anatomy.org][Module anatomy]]
+6. [[./60-advanced-types.org][Advanced types]]
 
 ** Homework
 

courses/day-04-modules/examples/solutions/cow-server.nix

@@ -0,0 +1,22 @@
+{ pkgs, ... }:
+let
+  cowFile = pkgs.runCommand "cowfile-gen" {} ''
+    mkdir $out
+    echo "Hello" | ${pkgs.cowsay}/bin/cowsay > $out/cow.txt
+  '';
+in
+{
+  imports = [ ./gen-config.nix ];
+
+  fileSystems."/" = {
+    device = "zpool/root";
+    fsType = "ext4";
+  };
+
+  services.my-config-generator.default = {
+    type = "something";
+  };
+
+  boot.loader.grub.device = "/dev/fake";
+
+}

courses/day-04-modules/examples/solutions/gen-config.nix

@@ -0,0 +1,25 @@
+{ lib, config, ... }:
+with lib;
+let cg = config.services.my-config-generator;
+in
+{
+  options.services.my-config-generator = {
+    enable = mkEnableOption "Enable config generator";
+
+    etcName = mkOption { type = types.path; };
+
+    default = {
+      type = types.listOf (submodule {
+        options = {
+          type = lib.mkOption { type = lib.str; };
+        };
+      });
+    };
+
+    config = lib.mkIf cg.enable {
+      environment.etc."${cg.etcName}".text = lib.generators.toJSON {
+        default = "${cg.default}";
+      };
+    };
+  };
+}

examples/cow-server.nix

@@ -1,23 +1,20 @@
-{ pkgs, ... }:
+{ config, pkgs, ... }:
 let
   cowFile = pkgs.runCommand "cowfile-gen" {} ''
     mkdir $out
     echo "Hello" | ${pkgs.cowsay}/bin/cowsay > $out/cow.txt
   '';
 in
 {
-  networking.firewall.allowedTCPPorts = [ 80 ];
-
-  services.nginx = {
-    enable = true;
-    virtualHosts."main" = {
-      default = true;
-      locations."/" = {
-        root = cowFile;
-      };
-    };
+  fileSystems."/" = {
+    device = "zpool/root";
+    fsType = "ext4";
   };
 
-  users.users.root.password = "aoesunth";
+  boot.loader.grub.device = "/dev/fake";
+
+  environment.etc."foo".text = "bar";
+
+  users.users.root.password = "1234";
   users.mutableUsers = false;
 }