Merge branch 'bhyve_rc'

ansible/playbook.yaml

@@ -53,7 +53,7 @@
     - javascript
     - launch_keyboard
     - lvfs
-    - restaurant_health_rating
+    # - restaurant_health_rating
     - wasm
     - noise_suppression
 

ansible/roles/base/files/gitconfig_home

@@ -3,34 +3,52 @@
 	name = Tom Alexander
 	signingkey = D3A179C9A53C0EDE
 [push]
-	default = simple
+	default = simple # (default since 2.0)
 [alias]
 	lg = log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit
 	bh = log --oneline --branches=* --remotes=* --graph --decorate
 	amend = commit --amend --no-edit
-	authorcount = shortlog --summary --numbered --all --no-merges
+        authorcount = shortlog --summary --numbered --all --no-merges
 [core]
 	excludesfile = ~/.gitignore_global
 [commit]
 	gpgsign = true
+	verbose = true
 [pull]
 	rebase = true
 [log]
 	date = local
 [init]
 	defaultBranch = main
-
-# Use meld for `git difftool` and `git mergetool`
 [diff]
-	tool = meld
+	tool = meld # Use meld for `git difftool` and `git mergetool`
+	algorithm = histogram
+	colorMoved = plain
+	mnemonicPrefix = true
+	renames = true
 [difftool]
 	prompt = false
 [difftool "meld"]
 	cmd = meld "$LOCAL" "$REMOTE"
 [merge]
 	tool = meld
+	conflictStyle = zdiff3
 [mergetool "meld"]
         # Make the middle pane start with partially-merged contents:
 	cmd = meld "$LOCAL" "$MERGED" "$REMOTE" --output "$MERGED"
         # Make the middle pane start without any merge progress:
 	# cmd = meld "$LOCAL" "$BASE" "$REMOTE" --output "$MERGED"
+[column]
+	ui = auto
+[branch]
+	sort = -committerdate
+[tag]
+	sort = version:refname
+[fetch]
+	prune = true
+	pruneTags = true
+	all = true
+[rebase]
+	autoSquash = true
+	autoStash = true
+	updateRefs = false

ansible/roles/base/files/gitconfig_work

@@ -3,32 +3,36 @@
 	name = Tom Alexander
 	signingkey = D3A179C9A53C0EDE
 [push]
-	default = simple
+	default = simple # (default since 2.0)
 [alias]
 	lg = log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit
 	bh = log --oneline --branches=* --remotes=* --graph --decorate
 	amend = commit --amend --no-edit
-	authorcount = shortlog --summary --numbered --all --no-merges
+        authorcount = shortlog --summary --numbered --all --no-merges
 [core]
 	excludesfile = ~/.gitignore_global
 [commit]
 	gpgsign = true
+	verbose = true
 [pull]
 	rebase = true
 [log]
 	date = local
 [init]
 	defaultBranch = main
-
-# Use meld for `git difftool` and `git mergetool`
 [diff]
-	tool = meld
+	tool = meld # Use meld for `git difftool` and `git mergetool`
+	algorithm = histogram
+	colorMoved = plain
+	mnemonicPrefix = true
+	renames = true
 [difftool]
 	prompt = false
 [difftool "meld"]
 	cmd = meld "$LOCAL" "$REMOTE"
 [merge]
 	tool = meld
+	conflictStyle = zdiff3
 [mergetool "meld"]
         # Make the middle pane start with partially-merged contents:
 	cmd = meld "$LOCAL" "$MERGED" "$REMOTE" --output "$MERGED"
@@ -36,3 +40,19 @@
 	# cmd = meld "$LOCAL" "$BASE" "$REMOTE" --output "$MERGED"
 [includeIf "gitdir:/bridge/"]
 	path = /bridge/git/machine_setup/ansible/roles/base/files/gitconfig_home
+[includeIf "gitdir:/persist/"]
+	path = /bridge/git/machine_setup/ansible/roles/base/files/gitconfig_home
+[column]
+	ui = auto
+[branch]
+	sort = -committerdate
+[tag]
+	sort = version:refname
+[fetch]
+	prune = true
+	pruneTags = true
+	all = true
+[rebase]
+	autoSquash = true
+	autoStash = true
+	updateRefs = false

ansible/roles/bhyve/files/bhyve_netgraph_bridge.bash

@@ -153,6 +153,7 @@ function start_vm {
             -D \
             -c $CPU_CORES \
             -m $MEMORY \
+            -S \
             -H \
             -P \
             -o 'rtc.use_localtime=false' \
@@ -216,7 +217,7 @@ EOF
 mkpeer ${host_interface_name}: bridge ether link0
 name ${host_interface_name}:ether $bridge_name
 EOF
-        ifconfig $(ngctl msg "${host_interface_name}:" getifname | grep Args | cut -d '"' -f 2) name "${host_interface_name}" "$ip_range" up
+        ifconfig "$(ngctl msg "${host_interface_name}:" getifname | grep Args | cut -d '"' -f 2)" name "${host_interface_name}" "$ip_range" up
     fi
 }
 

ansible/roles/bhyve/files/bhyverc.bash

@@ -0,0 +1,455 @@
+#!/usr/bin/env bash
+#
+set -euo pipefail
+IFS=$'\n\t'
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+
+# Share a host directory to the guest via 9pfs.
+#
+# Inside the VM run:
+#   mount -t virtfs -o trans=virtio sharename /some/vm/path
+#   mount -t 9p -o cache=mmap -o msize=512000 sharename /mnt/9p
+#   mount -t 9p -o trans=virtio,cache=mmap,msize=512000 sharename /path/to/mountpoint
+# bhyve_options="-s 28,virtio-9p,sharename=/"
+
+# Enable Sound
+# bhyve_options="-s 16,hda,play=/dev/dsp,rec=/dev/dsp"
+
+# Example usage:
+#
+#   doas bhyverc create-disk zdata/vm/poudriere /vm/poudriere 10
+#   doas bhyverc start poudriere zdata/vm/poudriere /vm/poudriere /vm/iso/FreeBSD-13.2-RELEASE-amd64-bootonly.iso
+#   doas bhyverc start poudriere zdata/vm/poudriere /vm/poudriere
+
+
+: ${VERBOSE:="NO"} # or YES
+if [ "$VERBOSE" = "YES" ]; then
+    set -x
+fi
+
+: ${CPU_CORES:="1"}
+: ${MEMORY:="1G"}
+: ${NETWORK:="NAT"} # or RAW or BOTH
+: ${IP_RANGE:="10.215.1.1/24"} # Ignored for RAW networks
+: ${INTERFACE_NAME:="jail_nat"} # or the external interface like lagg0 for RAW networks
+: ${BRIDGE_NAME:="bridge_$INTERFACE_NAME"} # or bridge_raw for RAW networks
+: ${VNC_ENABLE:="NO"}
+: ${VNC_LISTEN:="127.0.0.1:5900"}
+: ${VNC_WIDTH:="1920"}
+: ${VNC_HEIGHT:="1080"}
+: "${CD:=}"
+
+: ${SHUTDOWN_TIMEOUT:="600"} # 10 minutes
+
+
+
+############## Setup #########################
+
+
+function die {
+    local status_code="$1"
+    shift
+    (>&2 echo "${@}")
+    exit "$status_code"
+}
+
+function log {
+    (>&2 echo "${@}")
+}
+
+############## Program #########################
+
+function main {
+    local cmd
+    cmd=$1
+    shift
+    if [ "$cmd" = "start" ]; then
+        init
+        start "${@}"
+    elif [ "$cmd" = "stop" ]; then
+        init
+        stop "${@}"
+    elif [ "$cmd" = "status" ]; then
+        init
+        status "${@}"
+    elif [ "$cmd" = "console" ]; then
+        init
+        console "${@}"
+    elif [ "$cmd" = "_start_body" ]; then
+        init
+        start_body "${@}"
+    elif [ "$cmd" = "create-disk" ]; then
+        create_disk "${@}"
+    else
+        (>&2 echo "Unknown command: $cmd")
+        exit 1
+    fi
+}
+
+function start {
+    local num_vms="$#"
+    if [ "$num_vms" -eq 0 ]; then
+        log "No VMs specified."
+        return 0
+    fi
+
+    while [ "$#" -gt 0 ]; do
+        local name="$1"
+        shift 1
+        log "Starting VM $name."
+        start_one "$name"
+        [ "$#" -eq 0 ] || sleep 5
+    done
+}
+
+function start_one {
+    local name="$1"
+    local tmux_name="$name"
+    /usr/local/bin/tmux new-session -d -s "$tmux_name" "$0" "_start_body" "$name"
+    # /usr/local/bin/tmux new-session -d -s "$tmux_name" "/usr/bin/env VNC_ENABLE=NO VNC_LISTEN=0.0.0.0:5900 /usr/local/bin/bash /home/talexander/launch_opnsense.bash"
+}
+
+function launch_pidfile {
+    local pidfile="$1"
+    shift 1
+    mkdir -p "$(dirname "$pidfile")"
+    cat > "${pidfile}" <<< "$$"
+    set -x
+    exec "${@}"
+}
+export -f launch_pidfile
+
+function stop {
+    local num_vms="$#"
+    if [ "$num_vms" -eq 0 ]; then
+        log "No VMs specified."
+        return 0
+    fi
+
+    while [ "$#" -gt 0 ]; do
+        local name="$1"
+        shift 1
+        log "Stopping VM $name."
+        stop_one "$name"
+        [ "$#" -eq 0 ] || sleep 5
+    done
+}
+
+function stop_one {
+    local name="$1"
+    local pidfile="/run/bhyverc/${name}/pid"
+
+    if [ ! -e "$pidfile" ]; then
+        log "Pid file $pidfile does not exist."
+        return 0
+    fi
+
+    local bhyve_pid
+    bhyve_pid=$(cat "$pidfile")
+
+    if ps -p "$bhyve_pid" >/dev/null; then
+        # Send ACPI shutdown command
+        log "Sending ACPI shutdown to ${name}:${bhyve_pid}."
+        kill -SIGTERM "$bhyve_pid"
+    fi
+
+    local timeout_start timeout_end
+    timeout_start=$(date +%s)
+    while ps -p "$bhyve_pid" >/dev/null; do
+        timeout_end=$(date +%s)
+        if [ $((timeout_end-timeout_start)) -ge "$SHUTDOWN_TIMEOUT" ]; then
+            log "${name}:${bhyve_pid} took more than $SHUTDOWN_TIMEOUT seconds to shut down. Hard powering down."
+            break
+        fi
+
+        log "Waiting for ${name}:${bhyve_pid} to exit."
+        sleep 2
+    done
+
+    bhyvectl "--vm=$name" --destroy || true
+
+    local timeout_start timeout_end
+    timeout_start=$(date +%s)
+    while ps -p "$bhyve_pid" >/dev/null; do
+        timeout_end=$(date +%s)
+        if [ $((timeout_end-timeout_start)) -ge "$SHUTDOWN_TIMEOUT" ]; then
+            log "${name}:${bhyve_pid} took more than $SHUTDOWN_TIMEOUT seconds to hard power down. Giving up."
+            break
+        fi
+
+        log "Waiting for ${name}:${bhyve_pid} to hard power down."
+        sleep 2
+    done
+
+    rm -f "$pidfile"
+
+    log "Finished stopping $name."
+}
+
+function status {
+    local num_vms="$#"
+
+    if [ "$num_vms" -gt 0 ]; then
+        for name in "$@"; do
+            status_one "$name"
+        done
+    else
+        log "No VMs specified."
+    fi
+}
+
+function status_one {
+    local name="$1"
+    local pidfile="/run/bhyverc/${name}/pid"
+
+    if [ ! -e "$pidfile" ]; then
+        log "$name is not running."
+        return 0
+    fi
+
+    local bhyve_pid
+    bhyve_pid=$(cat "$pidfile")
+
+    if ! ps -p "$bhyve_pid" >/dev/null; then
+        log "$name is not running."
+        return 0
+    fi
+
+    log "$name is running as pid $bhyve_pid."
+}
+
+function console {
+    local num_vms="$#"
+
+    if [ "$num_vms" -gt 0 ]; then
+        for name in "$@"; do
+            log "Attaching to console of VM $name."
+            console_one "$name"
+        done
+    else
+        log "No VMs specified."
+    fi
+}
+
+function console_one {
+    local name="$1"
+    local tmux_name="$name"
+    exec tmux a -t "$tmux_name"
+}
+
+function init {
+    mkdir -p /run/bhyverc
+}
+
+############## Bhyve ###########################
+
+function create_disk {
+    local zfs_path="$1"
+    local mount_path="$2"
+    local gigabytes="$3"
+    zfs create -o "mountpoint=$mount_path" "$zfs_path"
+    cp /usr/local/share/edk2-bhyve/BHYVE_UEFI_VARS.fd "${mount_path}/"
+    tee "${mount_path}/settings" <<EOF
+CPU_CORES="$CPU_CORES"
+MEMORY="$MEMORY"
+NETWORK="$NETWORK"
+IP_RANGE="$IP_RANGE"
+BRIDGE_NAME="$BRIDGE_NAME"
+INTERFACE_NAME="$INTERFACE_NAME"
+EOF
+    zfs create -s "-V${gigabytes}G" -o volmode=dev -o primarycache=metadata -o secondarycache=none "$zfs_path/disk0"
+}
+
+function start_body {
+    local name="$1"
+    local zfs_path="zdata/vm/$name"
+    local mount_path="/vm/$name"
+    local mount_cd="$CD"
+
+    if [ -e "${mount_path}/settings" ]; then
+        source "${mount_path}/settings"
+    fi
+
+    local host_interface_name="$INTERFACE_NAME" # for raw, external interface
+    local bridge_name="$BRIDGE_NAME"
+    local ip_range="$IP_RANGE" # for raw this value does not matter
+
+    local mac_address
+    mac_address=$(calculate_mac_address "$name")
+
+    local additional_args=()
+
+    if [ "$NETWORK" = "NAT" ]; then
+        assert_bridge "$host_interface_name" "$bridge_name" "$ip_range"
+        local bridge_link_name=$(detect_available_link "${bridge_name}")
+        additional_args+=("-s" "2:0,virtio-net,netgraph,path=${bridge_name}:,peerhook=${bridge_link_name},mac=${mac_address}")
+    elif [ "$NETWORK" = "RAW" ]; then
+        assert_raw "$host_interface_name" "$bridge_name"
+        local bridge_link_name=$(detect_available_link "${bridge_name}")
+        additional_args+=("-s" "2:0,virtio-net,netgraph,path=${bridge_name}:,peerhook=${bridge_link_name},mac=${mac_address}")
+    elif [ "$NETWORK" = "BOTH" ]; then
+        assert_bridge "jail_nat" "$bridge_name" "$ip_range"
+        assert_raw "$host_interface_name" "bridge_raw"
+        local bridge_link_name=$(detect_available_link "${bridge_name}")
+        local raw_bridge_link_name=$(detect_available_link "bridge_raw")
+        local raw_mac_address=$(calculate_mac_address "${name}_raw")
+        additional_args+=("-s" "2:0,virtio-net,netgraph,path=${bridge_name}:,peerhook=${bridge_link_name},mac=${mac_address}")
+        additional_args+=("-s" "3:0,virtio-net,netgraph,path=bridge_raw:,peerhook=${raw_bridge_link_name},mac=${raw_mac_address}")
+    else
+        die 1 "Unrecognized NETWORK type $NETWORK"
+    fi
+
+
+    # -H release the CPU when guest issues HLT instruction. Otherwise 100% of core will be consumed.
+         # -s 3,ahci-cd,/vm/.iso/archlinux-2023.04.01-x86_64.iso \
+             # -s 29,fbuf,tcp=0.0.0.0:5900,w=1920,h=1080,wait \
+            # -s 29,fbuf,tcp=0.0.0.0:5900,w=1920,h=1080 \
+
+    # TODO: Look into using nmdm instead of stdio for serial console
+    if [ -n "$mount_cd" ]; then
+        additional_args+=("-s" "5,ahci-cd,$mount_cd")
+    fi
+    if [ "$VNC_ENABLE" = "YES" ]; then
+        additional_args+=("-s" "29,fbuf,tcp=$VNC_LISTEN,w=$VNC_WIDTH,h=$VNC_HEIGHT")
+    fi
+    vms+=("$name")
+    while true; do
+        local pidfile="/run/bhyverc/${name}/pid"
+        trap "set +e; stop_one '${name}'" EXIT
+
+        local launch_cmd=()
+        launch_cmd+=(
+            launch_pidfile "$pidfile"
+            bhyve
+            -D
+            -c "$CPU_CORES"
+            -m "$MEMORY"
+            -S
+            -H
+            -P
+            -o 'rtc.use_localtime=false'
+            -s "0,hostbridge"
+            -s "4,nvme,/dev/zvol/${zfs_path}/disk0"
+            -s "30,xhci,tablet"
+            -s "31,lpc" -l "com1,stdio"
+            -l "bootrom,/usr/local/share/uefi-firmware/BHYVE_UEFI.fd,${mount_path}/BHYVE_UEFI_VARS.fd"
+            "${additional_args[@]}"
+            "$name"
+        )
+        set +e
+        rm -f "$pidfile"
+        (
+            IFS=$' \n\t'
+            set -ex
+            bash -c "${launch_cmd[*]}"
+        )
+        local exit_code=$?
+        log "Exit code ${exit_code}"
+        set -e
+        if [ $exit_code -eq 0 ]; then
+            echo "Rebooting."
+            sleep 5
+        elif [ $exit_code -eq 1 ]; then
+            echo "Powered off."
+            break
+        elif [ $exit_code -eq 2 ]; then
+            echo "Halted."
+            break
+        elif [ $exit_code -eq 3 ]; then
+            echo "Triple fault."
+            break
+        elif [ $exit_code -eq 4 ]; then
+            echo "Exited due to an error."
+            break
+        fi
+    done
+}
+
+function detect_available_link {
+    local bridge_name="$1"
+    local linknum=1
+    while true; do
+        local link_name="link${linknum}"
+        if ! ng_exists "${bridge_name}:${link_name}"; then
+            echo "$link_name"
+            return
+        fi
+        linknum=$((linknum + 1))
+        if [ "$linknum" -gt 90 ]; then
+            (>&2 echo "No available links on bridge $bridge_name")
+            exit 1
+        fi
+    done
+}
+
+function assert_bridge {
+    local host_interface_name="$1"
+    local bridge_name="$2"
+    local ip_range="$3"
+
+    if ! ng_exists "${bridge_name}:"; then
+        ngctl -d -f - <<EOF
+mkpeer . eiface hook ether
+name .:hook $host_interface_name
+EOF
+        ngctl -d -f - <<EOF
+mkpeer ${host_interface_name}: bridge ether link0
+name ${host_interface_name}:ether $bridge_name
+EOF
+        ifconfig "$(ngctl msg "${host_interface_name}:" getifname | grep Args | cut -d '"' -f 2)" name "${host_interface_name}" "$ip_range" up
+    fi
+}
+
+function assert_raw {
+    local extif="$1"
+    local bridge_name="$2"
+
+    kldload -n ng_bridge ng_eiface ng_ether
+
+    if ! ng_exists "${bridge_name}:"; then
+        ngctlcat <<EOF
+# Create a bridge.
+mkpeer $extif: bridge lower link0
+# Assign a name to the bridge.
+name $extif:lower ${bridge_name}
+# Since the host is also using $extif, we need to connect the upper hook also. Otherwise we will lose connectivity.
+connect $extif: ${bridge_name}: upper link1
+
+# Enable promiscuous mode so the host ethernet adapter accepts packets for all addresses
+msg $extif: setpromisc 1
+
+# Do not overwrite source address on packets
+msg $extif: setautosrc 0
+EOF
+    fi
+}
+
+function ng_exists {
+    ngctl status "${1}" >/dev/null 2>&1
+}
+
+function calculate_mac_address {
+    local name="$1"
+    local source
+    source=$(md5 -r -s "$name" | awk '{print $1}')
+    echo "06:${source:0:2}:${source:2:2}:${source:4:2}:${source:6:2}:${source:8:2}"
+}
+
+function find_available_port {
+    local start_port="$1"
+    local port="$start_port"
+    while true; do
+        sockstat -P tcp -p 443
+        port=$((port + 1))
+    done
+}
+
+function ngctlcat {
+    if [ "$VERBOSE" = "YES" ]; then
+        tee /dev/tty | ngctl -d -f -
+    else
+        ngctl -d -f -
+    fi
+}
+
+main "${@}"

ansible/roles/bhyve/files/bhyverc.sh

@@ -0,0 +1,37 @@
+#!/bin/sh
+#
+# REQUIRE: LOGIN FILESYSTEMS
+# PROVIDE: bhyverc
+# KEYWORD: shutdown
+
+. /etc/rc.subr
+name=bhyverc
+rcvar=${name}_enable
+start_cmd="${name}_start"
+stop_cmd="${name}_stop"
+status_cmd="${name}_status"
+console_cmd="${name}_console"
+extra_commands="console"
+load_rc_config $name
+
+bhyverc_start() {
+    export PATH="$PATH:/usr/local/bin"
+    exec /usr/local/bin/bhyverc start "${@}"
+}
+
+bhyverc_status() {
+    export PATH="$PATH:/usr/local/bin"
+    exec /usr/local/bin/bhyverc status "${@}"
+}
+
+bhyverc_stop() {
+    export PATH="$PATH:/usr/local/bin"
+    exec /usr/local/bin/bhyverc stop "${@}"
+}
+
+bhyverc_console() {
+    export PATH="$PATH:/usr/local/bin"
+    exec /usr/local/bin/bhyverc console "${@}"
+}
+
+run_rc_command "$@"

ansible/roles/bhyve/tasks/freebsd.yaml

@@ -22,6 +22,25 @@
   loop:
     - src: bhyve_netgraph_bridge.bash
       dest: /usr/local/bin/bhyve_netgraph_bridge
+    - src: bhyverc.bash
+      dest: /usr/local/bin/bhyverc
+
+- name: Install rc script
+  copy:
+    src: "files/{{ item.src }}"
+    dest: "/usr/local/etc/rc.d/{{ item.dest|default(item.src) }}"
+    owner: root
+    group: wheel
+    mode: 0755
+  loop:
+    - src: bhyverc.sh
+      dest: bhyverc
+
+- name: Enable bhyverc
+  community.general.sysrc:
+    name: bhyverc_enable
+    value: "YES"
+    path: /etc/rc.conf.d/bhyverc
 
 - name: Create zfs dataset
   zfs:

ansible/roles/chromium/files/chromium-flags.conf

@@ -1,2 +1,2 @@
 --ozone-platform-hint=auto
---enable-features=VaapiVideoDecoder,VaapiIgnoreDriverChecks,Vulkan,DefaultANGLEVulkan,VulkanFromANGLE
+--enable-features=VaapiVideoDecoder,VaapiIgnoreDriverChecks,Vulkan,DefaultANGLEVulkan,VulkanFromANGLE,AcceleratedVideoEncoder

ansible/roles/emacs/files/elisp/base-extensions.el

@@ -51,17 +51,27 @@
 ;; Persist history over Emacs restarts. Vertico sorts by history position.
 (use-package savehist
   ;; This is an emacs built-in but we're pulling the latest version
+  :pin gnu
   :config
   (savehist-mode))
 
 (use-package which-key
+  :pin gnu
   :diminish
   :config
   (which-key-mode))
 
 (use-package windmove
-  :config
+  ;; This is an emacs built-in but we're pulling the latest version
-  (windmove-default-keybindings))
+  :pin gnu
+  :bind
+  (
+   ("S-<up>" . windmove-up)
+   ("S-<right>" . windmove-right)
+   ("S-<down>" . windmove-down)
+   ("S-<left>" . windmove-left)
+   )
+  )
 
 (setq tramp-default-method "ssh")
 

ansible/roles/emacs/files/elisp/base.el

@@ -63,6 +63,9 @@
  show-trailing-whitespace t
  ;; Remove the line when killing it with ctrl-k
  kill-whole-line t
+
+ ;; Show the current project in the mode line
+ project-mode-line t
  )
 
 ;; (setq-default fringes-outside-margins t)

ansible/roles/emacs/files/elisp/lang-nix.el

@@ -7,15 +7,15 @@
   :commands nix-mode
   :hook (
          (nix-mode . (lambda ()
-                             ;; (eglot-ensure)
+                       (eglot-ensure)
-                             ;; (defclass my/eglot-nix (eglot-lsp-server) ()
+                       (defclass my/eglot-nix (eglot-lsp-server) ()
-                             ;;   :documentation
+                         :documentation
-                             ;;   "Own eglot server class.")
+                         "Own eglot server class.")
 
-                             ;; (add-to-list 'eglot-server-programs
+                       (add-to-list 'eglot-server-programs
-                             ;;              '(nix-mode . (my/eglot-nix "nixd")))
+                                    '(nix-mode . (my/eglot-nix "nixd")))
-                             ;; (add-hook 'before-save-hook 'eglot-format-buffer nil 'local)
+                       (add-hook 'before-save-hook 'eglot-format-buffer nil 'local)
-                             ))
+                       ))
          )
   )
 

ansible/roles/emacs/files/elisp/lang-org.el

@@ -1,16 +1,23 @@
 (use-package org
   :ensure nil
   :commands org-mode
-  :bind (
+  :bind (:map org-mode-map
          ("C-c l" . org-store-link)
          ("C-c a" . org-agenda)
-         ("C--" . org-timestamp-down)
+         ("S-<up>" . org-shiftup)
-         ("C-=" . org-timestamp-up)
+         ("S-<right>" . org-shiftright)
+         ("S-<down>" . org-shiftdown)
+         ("S-<left>" . org-shiftleft)
          )
   :hook (
          (org-mode . (lambda ()
                        (org-indent-mode +1)
-                        ))
+                       ))
+         ;; Make windmove work in Org mode:
+         (org-shiftup-final . windmove-up)
+         (org-shiftleft-final . windmove-left)
+         (org-shiftdown-final . windmove-down)
+         (org-shiftright-final . windmove-right)
          )
   :config
   (require 'org-tempo)
@@ -38,6 +45,8 @@
 
   ;; TODO: There is an option to set the compiler, could be better than manually doing this here https://orgmode.org/manual/LaTeX_002fPDF-export-commands.html
   ;; (setq org-latex-compiler "lualatex")
+  ;; TODO: nixos latex page recommends this line, figure out what it does / why its needed:
+  ;; (setq org-preview-latex-default-process 'dvisvgm)
   (setq org-latex-pdf-process
         '("lualatex -shell-escape -interaction nonstopmode -output-directory %o %f"
           "lualatex -shell-escape -interaction nonstopmode -output-directory %o %f"

ansible/roles/emacs/files/elisp/util-tree-sitter.el

@@ -4,6 +4,8 @@
   :commands (treesit-install-language-grammar treesit-ready-p)
   :init
   (setq treesit-language-source-alist '())
+  :custom
+  (treesit-max-buffer-size 209715200) ;; 200MiB
   :config
   ;; Default to the max level of detail in treesitter highlighting. This
   ;; can be overridden in each language's use-package call with:

ansible/roles/emacs/files/init.el

@@ -38,4 +38,6 @@
 
 (require 'lang-nix)
 
+(require 'lang-cmake)
+
 (load-directory autoload-directory)

ansible/roles/firefox/tasks/linux.yaml

@@ -3,4 +3,5 @@
     name:
       - libfido2
       - firefox-developer-edition
+      - speech-dispatcher # For TTS
     state: present

ansible/roles/firewall/files/mrmanager_pf.conf

@@ -47,6 +47,9 @@ rdr pass proto {tcp, udp} from $jail_nat_v4 to ($ext_if) port 65099 tag REDIRINT
 rdr pass proto {tcp, udp} from $not_jail_nat_v4 to ($ext_if) port 53 -> 10.215.1.211 port 53
 rdr pass proto {tcp, udp} from $jail_nat_v4 to ($ext_if) port 53 tag REDIRINTERNAL -> 10.215.1.211 port 53
 
+rdr pass proto {tcp, udp} from $not_jail_nat_v4 to ($ext_if) port 65122 -> 10.215.1.219 port 22
+rdr pass proto {tcp, udp} from $jail_nat_v4 to ($ext_if) port 65122 tag REDIRINTERNAL -> 10.215.1.219 port 22
+
 nat pass tagged REDIRINTERNAL -> (jail_nat)
 nat pass tagged REDIREXTERNAL -> ($ext_if)
 

ansible/roles/framework_laptop/files/screen_brightness_tmpfiles.conf

@@ -1,2 +1,2 @@
 # Set screen brightness. Ever since enabling adaptive brightness management, my brightness ends up sinking lower on re-boots (I suspect it is saving the actual brightness rather than the set brightness). This forces the brightness back to the level I prefer.
-w- /sys/class/backlight/amdgpu_bl0/brightness - - - - 85
+w- /sys/class/backlight/amdgpu_bl0/brightness - - - - 21845

ansible/roles/framework_laptop/tasks/linux.yaml

@@ -34,7 +34,7 @@
 
 - name: Configure kernel command line
   zfs:
-    name: "zroot/linux"
+    name: "zroot/linux/archwork/be"
     state: present
     extra_zfs_properties:
       # amdgpu.abmlevel=3 :: Automatically reduce screen brightness but tweak colors to compensate for power reduction.

ansible/roles/jail/templates/new_jail.bash.j2

@@ -26,7 +26,7 @@ function by_src {
 }
 
 function by_bin {
-    DESTRELEASE=13.2-RELEASE
+    DESTRELEASE=14.1-RELEASE
     DESTARCH=`uname -m`
     SOURCEURL=http://ftp.freebsd.org/pub/FreeBSD/releases/$DESTARCH/$DESTRELEASE/
     for component in base ports; do fetch $SOURCEURL/$component.txz -o - | tar -xf - -C "$DESTDIR" ; done

ansible/roles/jail_nat_dhcp/files/kea-dhcp4.conf

@@ -94,7 +94,18 @@
                         // momlaptop - hard-coded in rc.conf, reproduced here to reserve ip
                         "hw-address": "06:85:69:c5:6a:d6",
                         "ip-address": "10.215.1.218"
+                    },
+                    {
+                        // hydra
+                        "hw-address": "06:84:36:68:03:77",
+                        "ip-address": "10.215.1.219"
+                    },
+                    {
+                        // certificate - hard-coded in rc.conf, reproduced here to reserve ip
+                        "hw-address": "06:7b:e0:08:16:5d",
+                        "ip-address": "10.215.1.220"
                     }
+
                 ]
             }
         ],

ansible/roles/kanshi/files/config_kanshi

@@ -1,3 +1,11 @@
+profile office {
+	output eDP-1 disable
+	output "Dell Inc. DELL C2722DE 6PH6T83" enable
+}
+profile office2 {
+	output eDP-1 disable
+	output "BOE 0x0BCA Unknown" enable
+}
 profile docked {
 	output eDP-1 disable
 	output "Dell Inc. DELL U3014 P1V6N35M329L" enable

ansible/roles/package_manager/files/pacman.conf

@@ -81,12 +81,6 @@ Include = /etc/pacman.d/mirrorlist
 [extra]
 Include = /etc/pacman.d/mirrorlist
 
-#[community-testing]
-#Include = /etc/pacman.d/mirrorlist
-
-[community]
-Include = /etc/pacman.d/mirrorlist
-
 # If you want to run 32 bit applications on your x86_64 system,
 # enable the multilib repositories as required here.
 

ansible/roles/public_dns/files/master.db

@@ -23,6 +23,9 @@ $ORIGIN fizz.buzz.
 ; Allows receivers to know you send your mail via Fastmail, and other servers
 IN TXT v=spf1 include:spf.messagingengine.com ?all
 
+; Tell receivers what to do with fake email
+_dmarc IN TXT "v=DMARC1; p=none; rua=mailto:postmaster@fizz.buzz;"
+
 ns1     IN A     74.80.180.138
 ns2     IN A     74.80.180.138
 

ansible/roles/sftp/tasks/common.yaml

@@ -64,23 +64,6 @@
 #     force: true
 #   diff: false
 
-- name: Create directories
-  file:
-    name: "{{ item }}"
-    state: directory
-    mode: 0700
-    owner: nochainstounlock
-    group: nochainstounlock
-  loop:
-    - /home/nochainstounlock/.ssh
-
-- name: Set authorized keys
-  authorized_key:
-    user: nochainstounlock
-    key: |
-      ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMrjXsXjtxEm47XnRZfo67kJULoc0NBLrB0lPYFiS2Ar kodi@neelix
-    exclusive: true
-
 - import_tasks: tasks/freebsd.yaml
   when: 'os_flavor == "freebsd"'
 

ansible/roles/sshd/files/keys/yubikey.pub

@@ -1 +1 @@
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAID0+4zi26M3eYWnIrciR54kOlGxzfgCXG+o4ea1zpzrk openpgp:0x7FF123C8
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGu+k5lrirokdW5zVdRVBOqEOAvAPlIkG/MdJNc9g5ky cardno:000611194908

ansible/roles/sway/files/config

@@ -23,6 +23,7 @@ set $menu wofi --show drun --gtk-dark
 
 # Do not show a title bar on windows
 default_border pixel 2
+hide_edge_borders smart_no_gaps
 
 bindsym $mod+grave exec $term
 

ansible/roles/sway/files/start_screen_share.bash

@@ -5,6 +5,6 @@ set -euo pipefail
 IFS=$'\n\t'
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
-makoctl set-mode do-not-disturb
+makoctl mode -s do-not-disturb
 
 swaymsg output "'Dell Inc. DELL U3014 P1V6N35M329L'" scale 2

ansible/roles/sway/files/stop_screen_share.bash

@@ -5,6 +5,6 @@ set -euo pipefail
 IFS=$'\n\t'
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
-makoctl set-mode default
+makoctl mode -s default
 
 swaymsg output "'Dell Inc. DELL U3014 P1V6N35M329L'" scale 1

ansible/roles/vscode/files/settings.json

@@ -18,6 +18,7 @@
   "workbench.editor.showTabs": "none",
   "workbench.activityBar.location": "hidden",
   "window.menuBarVisibility": "toggle",
+  "window.commandCenter": false,
   "explorer.autoReveal": false,
   "[python]": {
     "editor.defaultFormatter": "ms-python.black-formatter",
@@ -31,11 +32,24 @@
     "editor.defaultFormatter": "hashicorp.terraform",
     "editor.formatOnSave": true
   },
+  "[typescript]": {
+    "editor.defaultFormatter": "esbenp.prettier-vscode",
+    "editor.formatOnSave": true
+  },
+  "[typescriptreact]": {
+    "editor.defaultFormatter": "esbenp.prettier-vscode",
+    "editor.formatOnSave": true
+  },
+  "javascript.autoClosingTags": false,
+  "typescript.autoClosingTags": false,
   "black-formatter.importStrategy": "fromEnvironment",
   "workbench.statusBar.visible": false,
   "git.openRepositoryInParentFolders": "never",
   "files.autoSave": "afterDelay",
   "editor.rulers": [
     100
-  ]
+  ],
+  "workbench.secondarySideBar.defaultVisibility": "hidden",
+  "editor.autoClosingBrackets": "never",
+  "editor.autoSurround": "never"
 }

ansible/roles/zfs/tasks/linux.yaml

@@ -27,7 +27,8 @@
   args:
     creates: "/var/cache/pacman/custom/{{ item }}-*.pkg.tar.*"
   loop:
-    - zfs-dkms-git
+    # - zfs-dkms-git
+    - zfs-dkms
     - zfs-utils
 
 - name: Update cache
@@ -40,7 +41,8 @@
 - name: Install packages
   package:
     name:
-      - zfs-dkms-git
+      # - zfs-dkms-git
+      - zfs-dkms
       - zfs-utils
     state: present
 

nix/configuration/.gitignore

@@ -1 +0,0 @@
-result

nix/configuration/configuration.nix

@@ -1,293 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-
-let
-  alias_nix_pin_revision = pkgs.writeShellScriptBin "nix-pin-revision" ''
-    # Usage: nix-pin-revision nixpkgs 'github:NixOS/nixpkgs/00c21e4c93d963c50d4c0c89bfa84ed6e0694df2'
-    exec nix flake lock --override-input "''${@}"
-  '';
-in
-{
-  imports = [
-    ./roles/2ship2harkinian
-    ./roles/alacritty
-    ./roles/amd_s2idle
-    ./roles/android
-    ./roles/ansible
-    ./roles/ares
-    ./roles/base
-    ./roles/bluetooth
-    ./roles/boot
-    ./roles/build_in_ram
-    ./roles/chromecast
-    ./roles/chromium
-    ./roles/d2
-    ./roles/direnv
-    ./roles/disko
-    ./roles/distributed_build
-    ./roles/doas
-    ./roles/docker
-    ./roles/dont_use_substituters
-    ./roles/ecc
-    ./roles/emacs
-    ./roles/emulate_isa
-    ./roles/esim
-    ./roles/firefox
-    ./roles/firewall
-    ./roles/flux
-    ./roles/fonts
-    ./roles/gcloud
-    ./roles/git
-    ./roles/global_options
-    ./roles/gnome_keyring
-    ./roles/gnuplot
-    ./roles/gpg
-    ./roles/graphics
-    ./roles/graphviz
-    ./roles/hydra
-    ./roles/image_based_appliance
-    ./roles/iso
-    ./roles/iso_mount
-    ./roles/jujutsu
-    ./roles/kanshi
-    ./roles/kernel
-    ./roles/kodi
-    ./roles/kubernetes
-    ./roles/latex
-    ./roles/launch_keyboard
-    ./roles/lvfs
-    ./roles/media
-    ./roles/memtest86
-    ./roles/minimal_base
-    ./roles/network
-    ./roles/nix_index
-    ./roles/nix_repl
-    ./roles/nix_worker
-    ./roles/nixdev
-    ./roles/nvme
-    ./roles/openpgp_card_tools
-    ./roles/optimized_build
-    ./roles/pcsx2
-    ./roles/podman
-    ./roles/postgresql_client
-    ./roles/python
-    ./roles/qemu
-    ./roles/recovery
-    ./roles/reset
-    ./roles/rpcs3
-    ./roles/rust
-    ./roles/sequoia
-    ./roles/shadps4
-    ./roles/shikane
-    ./roles/shipwright
-    ./roles/sm64ex
-    ./roles/sops
-    ./roles/sound
-    ./roles/spaghettikart
-    ./roles/ssh
-    ./roles/sshd
-    ./roles/steam
-    ./roles/steam_run_free
-    ./roles/sway
-    ./roles/tekton
-    ./roles/terraform
-    ./roles/thunderbolt
-    ./roles/user
-    ./roles/uutils
-    ./roles/vnc_client
-    ./roles/vscode
-    ./roles/wasm
-    ./roles/waybar
-    ./roles/webcam
-    ./roles/wine
-    ./roles/wireguard
-    ./roles/yubikey
-    ./roles/zfs
-    ./roles/zrepl
-    ./roles/zsh
-    ./util/install_files
-    ./util/unfree_polyfill
-  ];
-
-  config = {
-    nix.settings.experimental-features = [
-      "nix-command"
-      "flakes"
-      "ca-derivations"
-      # "blake3-hashes"
-      # "git-hashing"
-    ];
-    nix.settings.trusted-users = [ "@wheel" ];
-    nix.settings.connect-timeout = 5;
-    nix.settings.min-free = 128000000;
-    nix.settings.max-free = 1000000000;
-    nix.settings.fallback = true;
-    nix.settings.warn-dirty = false;
-    nix.settings.fsync-metadata = true;
-    # Ensure store paths are durably written to disk before registering the paths so a crash mid-build does not leave us in a corrupted state.
-    nix.settings.fsync-store-paths = true;
-
-    hardware.enableRedistributableFirmware = true;
-
-    # Keep outputs so we can build offline.
-    nix.settings.keep-outputs = true;
-    nix.settings.keep-derivations = true;
-
-    # Automatic garbage collection
-    nix.gc = lib.mkIf (!config.me.buildingPortable) {
-      # Runs nix-collect-garbage --delete-older-than 5d
-      # automatic = true;
-      automatic = false;
-      persistent = true;
-      dates = "monthly";
-      # randomizedDelaySec = "14m";
-      options = "--delete-older-than 30d";
-    };
-    nix.settings.auto-optimise-store = !config.me.buildingPortable;
-
-    environment.systemPackages = [
-      alias_nix_pin_revision
-    ];
-
-    environment.persistence."/persist" = lib.mkIf (config.me.mountPersistence) {
-      hideMounts = true;
-      directories = [
-        "/var/lib/nixos" # Contains user information (uids/gids)
-        "/var/lib/systemd" # Systemd state directory for random seed, persistent timers, core dumps, persist hardware state like backlight and rfkill
-        "/var/log/journal" # Logs, alternatively set `services.journald.storage = "volatile";` to write to /run/log/journal
-      ];
-      files = [
-        "/etc/machine-id" # Systemd unique machine id "otherwise, the system journal may fail to list earlier boots, etc"
-      ];
-    };
-
-    # Write a list of the currently installed packages to /etc/current-system-packages
-    # environment.etc."current-system-packages".text =
-    #   let
-    #     packages = builtins.map (p: "${p.name}") config.environment.systemPackages;
-    #     sortedUnique = builtins.sort builtins.lessThan (lib.unique packages);
-    #     formatted = builtins.concatStringsSep "\n" sortedUnique;
-    #   in
-    #   formatted;
-
-    # nixpkgs.overlays = [
-    #   (final: prev: {
-    #     foot = throw "foo";
-    #   })
-    # ];
-
-    nixpkgs.overlays =
-      let
-        disableTests = (
-          # Example: (disableTests "coreutils")
-          package_name:
-          (final: prev: {
-            "${package_name}" = prev."${package_name}".overrideAttrs (old: {
-              doCheck = false;
-              doInstallCheck = false;
-            });
-          })
-        );
-        disableTestsPython = (
-          # Example: (disableTestsPython "scipy")
-          package_name:
-          (final: prev: {
-            pythonPackagesExtensions = prev.pythonPackagesExtensions ++ [
-              (python-final: python-prev: {
-                "${package_name}" = python-prev."${package_name}".overridePythonAttrs (oldAttrs: {
-                  doCheck = false;
-                });
-              })
-            ];
-          })
-        );
-        disableOptimizations = (
-          # Example: (disableOptimizations "coreutils")
-          package_name:
-          (final: prev: {
-            "${package_name}" = final.unoptimized."${package_name}";
-          })
-        );
-        disableOptimizationsScope = (
-          # Example: (disableOptimizationsScope "kdePackages" "qtbase")
-          scope: package_name:
-          (final: prev: {
-            "${scope}" = prev."${scope}".overrideScope (
-              scopeFinal: scopePrev: {
-                "${package_name}" = final.unoptimized."${scope}"."${package_name}";
-              }
-            );
-          })
-        );
-        disableOptimizationsPython3 = (
-          # Example: (disableOptimizationsPython3 "scipy")
-          package_name:
-          (final: prev: {
-            python3Packages = prev.python3Packages.override {
-              overrides = python-final: python-prev: {
-                "${package_name}" = final.unoptimized.python3.pkgs."${package_name}";
-              };
-            };
-          })
-        );
-      in
-      [
-        (disableTests "deno") # Tests use too much disk space
-        (disableOptimizations "libtpms")
-        (disableOptimizationsPython3 "scipy")
-        (disableOptimizations "assimp")
-        (disableOptimizations "gsl")
-        (final: prev: {
-          rpcs3 = prev.rpcs3.override {
-            glew = (final.glew.override { enableEGL = false; });
-          };
-        })
-        (final: prev: {
-          fwupd = prev.fwupd.overrideAttrs (
-            finalAttrs: prevAttrs: {
-              version = "2.1.5";
-              src = final.fetchFromGitHub {
-                owner = "fwupd";
-                repo = "fwupd";
-                tag = finalAttrs.version;
-                hash = "sha256-DzQ+N99ZmFRqZc2rN6PSqmoIMXUyrE8Kkn+KnT/AWPc=";
-              };
-            }
-          );
-        })
-
-        # Works but probably sets python2's scipy to be python3:
-        #
-        # (final: prev: {
-        #   pythonPackagesExtensions = prev.pythonPackagesExtensions ++ [
-        #     (python-final: python-prev: {
-        #       scipy = final.unoptimized.python3Packages.scipy;
-        #     })
-        #   ];
-        # })
-      ];
-
-    # This option defines the first version of NixOS you have installed on this particular machine,
-    # and is used to maintain compatibility with application data (e.g. databases) created on older NixOS versions.
-    #
-    # Most users should NEVER change this value after the initial install, for any reason,
-    # even if you've upgraded your system to a new NixOS release.
-    #
-    # This value does NOT affect the Nixpkgs version your packages and OS are pulled from,
-    # so changing it will NOT upgrade your system - see https://nixos.org/manual/nixos/stable/#sec-upgrading for how
-    # to actually do that.
-    #
-    # This value being lower than the current NixOS release does NOT mean your system is
-    # out of date, out of support, or vulnerable.
-    #
-    # Do NOT change this value unless you have manually inspected all the changes it would make to your configuration,
-    # and migrated your data accordingly.
-    #
-    # For more information, see `man configuration.nix` or https://nixos.org/manual/nixos/stable/options#opt-system.stateVersion .
-    system.stateVersion = "24.11"; # Did you read the comment?
-  };
-}

nix/configuration/flake.lock

@@ -1,273 +0,0 @@
-{
-  "nodes": {
-    "crane": {
-      "locked": {
-        "lastModified": 1731098351,
-        "narHash": "sha256-HQkYvKvaLQqNa10KEFGgWHfMAbWBfFp+4cAgkut+NNE=",
-        "owner": "ipetkov",
-        "repo": "crane",
-        "rev": "ef80ead953c1b28316cc3f8613904edc2eb90c28",
-        "type": "github"
-      },
-      "original": {
-        "owner": "ipetkov",
-        "repo": "crane",
-        "type": "github"
-      }
-    },
-    "disko": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1780894562,
-        "narHash": "sha256-c3430xwxwhHipl3jigUGMMBfpaMylDqytW/kdmB3ZGs=",
-        "owner": "nix-community",
-        "repo": "disko",
-        "rev": "24fed06cac83bcc44ac8efbb57cab1a82fa0bedc",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "disko",
-        "type": "github"
-      }
-    },
-    "flake-compat": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1696426674,
-        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
-        "type": "github"
-      },
-      "original": {
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "type": "github"
-      }
-    },
-    "flake-parts": {
-      "inputs": {
-        "nixpkgs-lib": [
-          "lanzaboote",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1730504689,
-        "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=",
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "rev": "506278e768c2a08bec68eb62932193e341f55c90",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "type": "github"
-      }
-    },
-    "gitignore": {
-      "inputs": {
-        "nixpkgs": [
-          "lanzaboote",
-          "pre-commit-hooks-nix",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1709087332,
-        "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
-        "owner": "hercules-ci",
-        "repo": "gitignore.nix",
-        "rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hercules-ci",
-        "repo": "gitignore.nix",
-        "type": "github"
-      }
-    },
-    "home-manager": {
-      "inputs": {
-        "nixpkgs": [
-          "impermanence",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1768598210,
-        "narHash": "sha256-kkgA32s/f4jaa4UG+2f8C225Qvclxnqs76mf8zvTVPg=",
-        "owner": "nix-community",
-        "repo": "home-manager",
-        "rev": "c47b2cc64a629f8e075de52e4742de688f930dc6",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "home-manager",
-        "type": "github"
-      }
-    },
-    "impermanence": {
-      "inputs": {
-        "home-manager": "home-manager",
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1769548169,
-        "narHash": "sha256-03+JxvzmfwRu+5JafM0DLbxgHttOQZkUtDWBmeUkN8Y=",
-        "owner": "nix-community",
-        "repo": "impermanence",
-        "rev": "7b1d382faf603b6d264f58627330f9faa5cba149",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "impermanence",
-        "type": "github"
-      }
-    },
-    "lanzaboote": {
-      "inputs": {
-        "crane": "crane",
-        "flake-compat": "flake-compat",
-        "flake-parts": "flake-parts",
-        "nixpkgs": [
-          "nixpkgs"
-        ],
-        "pre-commit-hooks-nix": "pre-commit-hooks-nix",
-        "rust-overlay": "rust-overlay"
-      },
-      "locked": {
-        "lastModified": 1737639419,
-        "narHash": "sha256-AEEDktApTEZ5PZXNDkry2YV2k6t0dTgLPEmAZbnigXU=",
-        "owner": "nix-community",
-        "repo": "lanzaboote",
-        "rev": "a65905a09e2c43ff63be8c0e86a93712361f871e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "ref": "v0.4.2",
-        "repo": "lanzaboote",
-        "type": "github"
-      }
-    },
-    "nixpkgs": {
-      "locked": {
-        "lastModified": 1780749050,
-        "narHash": "sha256-3av0pIjlOWQ6rDbNOmpUSvbNnJkGORQKKjb4LtCZsIY=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "a799d3e3886da994fa307f817a6bc705ae538eeb",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs-google": {
-      "locked": {
-        "lastModified": 1779893571,
-        "narHash": "sha256-wiwMyVCtmjRjlFCe2zaumCE6LRV9GzzN0ZH25NQkbAU=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "45f6cfaa4605b706c870e75bd74bdb5e97eee11e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "45f6cfaa4605b706c870e75bd74bdb5e97eee11e",
-        "type": "github"
-      }
-    },
-    "nixpkgs-stable": {
-      "locked": {
-        "lastModified": 1730741070,
-        "narHash": "sha256-edm8WG19kWozJ/GqyYx2VjW99EdhjKwbY3ZwdlPAAlo=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "d063c1dd113c91ab27959ba540c0d9753409edf3",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-24.05",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "pre-commit-hooks-nix": {
-      "inputs": {
-        "flake-compat": [
-          "lanzaboote",
-          "flake-compat"
-        ],
-        "gitignore": "gitignore",
-        "nixpkgs": [
-          "lanzaboote",
-          "nixpkgs"
-        ],
-        "nixpkgs-stable": "nixpkgs-stable"
-      },
-      "locked": {
-        "lastModified": 1731363552,
-        "narHash": "sha256-vFta1uHnD29VUY4HJOO/D6p6rxyObnf+InnSMT4jlMU=",
-        "owner": "cachix",
-        "repo": "pre-commit-hooks.nix",
-        "rev": "cd1af27aa85026ac759d5d3fccf650abe7e1bbf0",
-        "type": "github"
-      },
-      "original": {
-        "owner": "cachix",
-        "repo": "pre-commit-hooks.nix",
-        "type": "github"
-      }
-    },
-    "root": {
-      "inputs": {
-        "disko": "disko",
-        "impermanence": "impermanence",
-        "lanzaboote": "lanzaboote",
-        "nixpkgs": "nixpkgs",
-        "nixpkgs-google": "nixpkgs-google"
-      }
-    },
-    "rust-overlay": {
-      "inputs": {
-        "nixpkgs": [
-          "lanzaboote",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1731897198,
-        "narHash": "sha256-Ou7vLETSKwmE/HRQz4cImXXJBr/k9gp4J4z/PF8LzTE=",
-        "owner": "oxalica",
-        "repo": "rust-overlay",
-        "rev": "0be641045af6d8666c11c2c40e45ffc9667839b5",
-        "type": "github"
-      },
-      "original": {
-        "owner": "oxalica",
-        "repo": "rust-overlay",
-        "type": "github"
-      }
-    }
-  },
-  "root": "root",
-  "version": 7
-}

nix/configuration/flake.nix

@@ -1,135 +0,0 @@
-# TODO maybe use `nix eval --raw .#odo.iso.outPath`
-
-#
-# Install on a new machine:
-#
-# Set
-#   me.disko.enable = true;
-#   me.disko.offline.enable = true;
-#
-# Run
-#   doas disko --mode destroy,format,mount hosts/recovery/disk-config.nix
-#   doas nixos-install --substituters "http://10.0.2.2:8080?trusted=1 https://cache.nixos.org/" --flake ".#recovery"
-
-{
-  description = "My system configuration";
-
-  inputs = {
-    impermanence = {
-      url = "github:nix-community/impermanence";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
-    nixpkgs-google.url = "github:NixOS/nixpkgs/45f6cfaa4605b706c870e75bd74bdb5e97eee11e";
-    lanzaboote = {
-      url = "github:nix-community/lanzaboote/v0.4.2";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-    disko = {
-      url = "github:nix-community/disko";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-  };
-
-  outputs =
-    {
-      self,
-      nixpkgs,
-      nixpkgs-google,
-      disko,
-      impermanence,
-      lanzaboote,
-      ...
-    }:
-    let
-      forAllSystems = nixpkgs.lib.genAttrs nixpkgs.lib.systems.flakeExposed;
-      nodes = {
-        odo = {
-          system = "x86_64-linux";
-        };
-        odowork = {
-          system = "x86_64-linux";
-        };
-        quark = {
-          system = "x86_64-linux";
-        };
-        recovery = {
-          system = "x86_64-linux";
-        };
-        i_only_boot_zfs = {
-          system = "x86_64-linux";
-        };
-        hydra = {
-          system = "x86_64-linux";
-        };
-        family_disks = {
-          system = "x86_64-linux";
-        };
-      };
-      nixosConfigs = builtins.mapAttrs (
-        hostname: nodeConfig: format:
-        nixpkgs.lib.nixosSystem {
-          specialArgs = {
-            inherit self;
-
-            this_nixos_config = self.nixosConfigurations."${hostname}";
-
-            all_nixos_configs = self.nixosConfigurations;
-          };
-          modules = [
-            impermanence.nixosModules.impermanence
-            lanzaboote.nixosModules.lanzaboote
-            disko.nixosModules.disko
-            ./configuration.nix
-            (./. + "/hosts/${hostname}")
-            (./. + "/formats/${format}.nix")
-            {
-              config = {
-                nixpkgs.hostPlatform.system = nodeConfig.system;
-                nixpkgs.overlays = [
-                  (final: prev: {
-                    # stable = nixpkgs-stable.legacyPackages."${prev.stdenv.hostPlatform.system}";
-                    unoptimized = import nixpkgs {
-                      system = prev.stdenv.hostPlatform.system;
-                      hostPlatform.gcc.arch = "default";
-                      hostPlatform.gcc.tune = "default";
-                    };
-                    google = import nixpkgs-google {
-                      system = prev.stdenv.hostPlatform.system;
-                    };
-                  })
-                ];
-              };
-            }
-          ];
-        }
-      ) nodes;
-      installerConfig =
-        hostname: nodeConfig:
-        nixpkgs.lib.nixosSystem {
-          specialArgs = {
-            targetSystem = self.nixosConfigurations."${hostname}";
-          };
-          modules = [
-            ./formats/installer.nix
-            ({ nixpkgs.hostPlatform.system = nodeConfig.system; })
-          ];
-        };
-    in
-    {
-      nixosConfigurations = (builtins.mapAttrs (name: value: value "toplevel") nixosConfigs);
-    }
-    // {
-      packages = (
-        forAllSystems (
-          system:
-          (builtins.mapAttrs (hostname: nodeConfig: {
-            iso = (nixosConfigs."${hostname}" "iso").config.system.build.isoImage;
-            vm_iso = (nixosConfigs."${hostname}" "vm_iso").config.system.build.isoImage;
-            sd = (nixosConfigs."${hostname}" "sd").config.system.build.sdImage;
-            installer = (installerConfig hostname nodes."${hostname}").config.system.build.isoImage;
-          }) (nixpkgs.lib.attrsets.filterAttrs (hostname: nodeConfig: nodeConfig.system == system) nodes))
-        )
-      );
-    };
-}

nix/configuration/formats/installer.nix

@@ -1,74 +0,0 @@
-{
-  config,
-  pkgs,
-  lib,
-  modulesPath,
-  targetSystem,
-  ...
-}:
-let
-  installer = pkgs.writeShellApplication {
-    name = "installer";
-    runtimeInputs = with pkgs; [
-      # clevis
-      dosfstools
-      e2fsprogs
-      gawk
-      nixos-install-tools
-      util-linux
-      config.nix.package
-    ];
-    text = ''
-      set -euo pipefail
-
-      ${targetSystem.config.system.build.diskoScript}
-
-      nixos-install --no-channel-copy --no-root-password --option substituters "" --system ${targetSystem.config.system.build.toplevel}
-    '';
-  };
-  installerFailsafe = pkgs.writeShellScript "failsafe" ''
-    ${lib.getExe installer} || echo "ERROR: Installation failure!"
-    sleep 3600
-  '';
-in
-{
-  imports = [
-    (modulesPath + "/installer/cd-dvd/iso-image.nix")
-    (modulesPath + "/profiles/all-hardware.nix")
-  ];
-
-  boot.kernelPackages = pkgs.linuxPackagesFor pkgs.linux_6_18;
-  # boot.kernelPackages = pkgs.linuxPackagesFor pkgs.linux;
-  boot.zfs.package = pkgs.zfs_unstable;
-  boot.kernelParams = [
-    "quiet"
-    "systemd.unit=getty.target"
-  ];
-  boot.supportedFilesystems.zfs = true;
-  boot.initrd.systemd.enable = true;
-
-  networking.hostId = "04581ecf";
-
-  isoImage.makeEfiBootable = true;
-  isoImage.makeUsbBootable = true;
-  isoImage.squashfsCompression = "zstd -Xcompression-level 15";
-
-  environment.systemPackages = [
-    installer
-  ];
-
-  systemd.services."getty@tty1" = {
-    overrideStrategy = "asDropin";
-    serviceConfig = {
-      ExecStart = [
-        ""
-        installerFailsafe
-      ];
-      Restart = "no";
-      StandardInput = "null";
-    };
-  };
-
-  # system.stateVersion = lib.mkDefault lib.trivial.release;
-  system.stateVersion = "24.11";
-}

nix/configuration/formats/iso.nix

@@ -1,36 +0,0 @@
-{
-  config,
-  lib,
-  modulesPath,
-  pkgs,
-  ...
-}:
-
-{
-  imports = [
-    (modulesPath + "/installer/cd-dvd/iso-image.nix")
-  ];
-
-  config = {
-    isoImage.makeEfiBootable = true;
-    isoImage.makeUsbBootable = true;
-
-    networking.dhcpcd.enable = true;
-    networking.useDHCP = true;
-
-    me.buildingPortable = true;
-    me.disko.enable = true;
-    me.disko.offline.enable = true;
-    me.mountPersistence = lib.mkForce false;
-    # me.optimizations.enable = lib.mkForce false;
-
-    # Not doing image_based_appliance because this might be an install ISO, in which case we'd need nix to do the install.
-    # me.image_based_appliance.enable = true;
-
-    # TODO: Should I use this instead of doing a mkIf for the disk config?
-    # disko.enableConfig = false;
-
-    # Faster image generation for testing/development.
-    isoImage.squashfsCompression = "zstd -Xcompression-level 15";
-  };
-}

nix/configuration/formats/sd.nix

@@ -1,32 +0,0 @@
-{
-  modulesPath,
-  ...
-}:
-
-{
-  imports = [
-    (modulesPath + "/installer/sd-card/sd-image.nix")
-  ];
-
-  config = {
-    isoImage.makeEfiBootable = true;
-    isoImage.makeUsbBootable = true;
-
-    boot.loader.grub.enable = false;
-    boot.loader.generic-extlinux-compatible.enable = true;
-
-    # TODO: image based appliance?
-
-    # TODO: Maybe this?
-    # fileSystems = {
-    #   "/" = {
-    #     device = "/dev/disk/by-label/NIXOS_SD";
-    #     fsType = "ext4";
-    #     options = [
-    #       "noatime"
-    #       "norelatime"
-    #     ];
-    #   };
-    # };
-  };
-}

nix/configuration/formats/toplevel.nix

@@ -1 +0,0 @@
-{ }

nix/configuration/formats/vm_iso.nix

@@ -1,22 +0,0 @@
-{
-  lib,
-  modulesPath,
-  ...
-}:
-
-{
-  imports = [
-    (modulesPath + "/installer/cd-dvd/iso-image.nix")
-    (modulesPath + "/profiles/qemu-guest.nix") # VirtIO kernel modules
-  ];
-
-  config = {
-    isoImage.makeEfiBootable = true;
-    isoImage.makeUsbBootable = true;
-
-    networking.dhcpcd.enable = true;
-    networking.useDHCP = true;
-
-    me.image_based_appliance.enable = true;
-  };
-}

nix/configuration/hosts/family_disks/DEPLOY_BOOT

@@ -1,13 +0,0 @@
-#!/usr/bin/env bash
-#
-set -euo pipefail
-IFS=$'\n\t'
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-
-: "${JOBS:="1"}"
-
-TARGET=family_disks
-
-for f in /persist/manual/manual_add_to_store/*; do nix-store --add-fixed sha256 "$f"; done
-
-nixos-rebuild boot --flake "$DIR/../../#family_disks" --target-host "$TARGET" --build-host "$TARGET" --sudo --max-jobs "$JOBS" --repair --log-format internal-json -v "${@}" |& nom --json

nix/configuration/hosts/family_disks/DEPLOY_SWITCH

@@ -1,13 +0,0 @@
-#!/usr/bin/env bash
-#
-set -euo pipefail
-IFS=$'\n\t'
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-
-: "${JOBS:="1"}"
-
-TARGET=family_disks
-
-for f in /persist/manual/manual_add_to_store/*; do nix-store --add-fixed sha256 "$f"; done
-
-nixos-rebuild switch --flake "$DIR/../../#family_disks" --target-host "$TARGET" --build-host "$TARGET" --sudo --max-jobs "$JOBS" --repair --log-format internal-json -v "${@}" |& nom --json

nix/configuration/hosts/family_disks/ISO

@@ -1,10 +0,0 @@
-#!/usr/bin/env bash
-#
-set -euo pipefail
-IFS=$'\n\t'
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-
-: "${JOBS:="1"}"
-
-for f in /persist/manual/manual_add_to_store/*; do nix-store --add-fixed sha256 "$f"; done
-nix build --extra-experimental-features nix-command --extra-experimental-features flakes "$DIR/../..#family_disks.iso" --repair --max-jobs "$JOBS" --log-format internal-json -v "${@}" |& nom --json

nix/configuration/hosts/family_disks/SELF_BOOT

@@ -1,10 +0,0 @@
-#!/usr/bin/env bash
-#
-set -euo pipefail
-IFS=$'\n\t'
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-
-: "${JOBS:="1"}"
-
-for f in /persist/manual/manual_add_to_store/*; do nix-store --add-fixed sha256 "$f"; done
-nixos-rebuild boot --show-trace --sudo --max-jobs "$JOBS" --flake "$DIR/../../#family_disks" --repair --log-format internal-json -v "${@}" |& nom --json

nix/configuration/hosts/family_disks/SELF_BUILD

@@ -1,12 +0,0 @@
-#!/usr/bin/env bash
-#
-set -euo pipefail
-IFS=$'\n\t'
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-
-: "${JOBS:="1"}"
-: "${NOM:="true"}"
-
-for f in /persist/manual/manual_add_to_store/*; do nix-store --add-fixed sha256 "$f"; done
-
-nixos-rebuild build --show-trace --sudo --max-jobs "$JOBS" --flake "$DIR/../../#family_disks" --repair --log-format internal-json -v "${@}" |& nom --json

nix/configuration/hosts/family_disks/SELF_SWITCH

@@ -1,10 +0,0 @@
-#!/usr/bin/env bash
-#
-set -euo pipefail
-IFS=$'\n\t'
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-
-: "${JOBS:="1"}"
-
-for f in /persist/manual/manual_add_to_store/*; do nix-store --add-fixed sha256 "$f"; done
-nixos-rebuild switch --show-trace --sudo --max-jobs "$JOBS" --flake "$DIR/../../#family_disks" --repair --log-format internal-json -v "${@}" |& nom --json

nix/configuration/hosts/family_disks/default.nix

@@ -1,75 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-{
-  imports = [
-    ./hardware-configuration.nix
-    ./wrapped-disk-config.nix
-    ./distributed_build.nix
-    ./power_management.nix
-  ];
-
-  config = {
-    # Generate with `head -c4 /dev/urandom | od -A none -t x4`
-    networking.hostId = "908cbf04";
-
-    networking.hostName = "family_disks"; # Define your hostname.
-
-    time.timeZone = "America/New_York";
-    i18n.defaultLocale = "en_US.UTF-8";
-
-    me.boot.enable = true;
-    me.boot.secure = false;
-    me.mountPersistence = true;
-
-    # Toggle to start writing the extlinux config which will be used by zfsbootmenu
-    boot.loader.generic-extlinux-compatible.enable = true;
-    boot.loader.systemd-boot.enable = lib.mkForce false;
-
-    me.rollback.dataset = [
-      "zroot/linux/nix/root@blank"
-      "zroot/linux/nix/home@blank"
-    ];
-
-    me.optimizations = {
-      enable = true;
-      arch = "skylake";
-      # build_arch = "x86-64-v3";
-      system_features = [
-        "gccarch-znver4"
-        "gccarch-skylake"
-        "gccarch-kabylake"
-        # "gccarch-alderlake" missing WAITPKG
-        "gccarch-x86-64-v3"
-        "gccarch-x86-64-v4"
-        "benchmark"
-        "big-parallel"
-        "kvm"
-        "nixos-test"
-      ];
-    };
-
-    # Early KMS
-    # boot.initrd.kernelModules = [ "amdgpu" ];
-
-    # Mount tmpfs at /tmp
-    boot.tmp.useTmpfs = true;
-
-    # Enable light sensor
-    # hardware.sensor.iio.enable = lib.mkDefault true;
-
-    # Enable TRIM
-    # services.fstrim.enable = lib.mkDefault true;
-
-    # Only run nix builders at idle priority for a more responsive system. Do not set on servers, just end-user devices.
-    nix.daemonCPUSchedPolicy = "idle";
-
-    me.build_in_ram.enable = true;
-    me.dont_use_substituters.enable = true;
-    me.minimal_base.enable = true;
-    me.recovery.enable = true;
-  };
-}

nix/configuration/hosts/family_disks/disk-config.nix

@@ -1,155 +0,0 @@
-# Manual Step:
-#   Check if drive supports 4kn: nvme id-ns -H /dev/nvme0n1
-#   Format the drive to 4kn: nvme format --lbaf=1 /dev/nvme0n1
-
-{
-  disko.devices = {
-    disk = {
-      main = {
-        type = "disk";
-        device = "/dev/nvme0n1";
-        content = {
-          type = "gpt";
-          partitions = {
-            ESP = {
-              size = "1G";
-              type = "EF00";
-              content = {
-                type = "filesystem";
-                format = "vfat";
-                mountpoint = "/efi";
-                mountOptions = [
-                  "umask=0077"
-                  "noatime"
-                  "discard"
-                ];
-              };
-            };
-            zfs = {
-              size = "100%";
-              content = {
-                type = "zfs";
-                pool = "zroot";
-              };
-            };
-          };
-        };
-      };
-    };
-    zpool = {
-      zroot = {
-        type = "zpool";
-        # mode = "mirror";
-        # Workaround: cannot import 'zroot': I/O error in disko tests
-        options.cachefile = "none";
-        options = {
-          ashift = "12";
-          compatibility = "openzfs-2.2-freebsd";
-          autotrim = "on";
-        };
-        rootFsOptions = {
-          acltype = "posixacl";
-          atime = "off";
-          relatime = "off";
-          xattr = "sa";
-          mountpoint = "none";
-          compression = "lz4";
-          canmount = "off";
-          utf8only = "on";
-          dnodesize = "auto";
-          normalization = "formD";
-        };
-
-        datasets = {
-          "linux/nix" = {
-            type = "zfs_fs";
-            options.mountpoint = "none";
-            options = {
-              # encryption = "aes-256-gcm";
-              # keyformat = "passphrase";
-              # # keylocation = "file:///tmp/secret.key";
-            };
-          };
-          "linux/nix/root" = {
-            type = "zfs_fs";
-            options.mountpoint = "legacy";
-            mountpoint = "/";
-            postCreateHook = "zfs list -t snapshot -H -o name | grep -E '^zroot/linux/nix/root@blank$' || zfs snapshot zroot/linux/nix/root@blank";
-          };
-          "linux/nix/boot" = {
-            type = "zfs_fs";
-            options = {
-              mountpoint = "legacy";
-              "org.zfsbootmenu:active" = "on";
-            };
-            mountpoint = "/boot";
-            postCreateHook = "zfs list -t snapshot -H -o name | grep -E '^zroot/linux/nix/boot@blank$' || zfs snapshot zroot/linux/nix/boot@blank";
-          };
-          "linux/nix/nix" = {
-            type = "zfs_fs";
-            options.mountpoint = "legacy";
-            mountpoint = "/nix";
-            postCreateHook = "zfs list -t snapshot -H -o name | grep -E '^zroot/linux/nix/nix@blank$' || zfs snapshot zroot/linux/nix/nix@blank";
-            options = {
-              # recordsize = "16MiB";
-              # compression = "zstd-19";
-            };
-          };
-          "linux/nix/home" = {
-            type = "zfs_fs";
-            options.mountpoint = "legacy";
-            mountpoint = "/home";
-            postCreateHook = "zfs list -t snapshot -H -o name | grep -E '^zroot/linux/nix/home@blank$' || zfs snapshot zroot/linux/nix/home@blank";
-          };
-          "linux/nix/persist" = {
-            type = "zfs_fs";
-            options.mountpoint = "legacy";
-            mountpoint = "/persist";
-            postCreateHook = "zfs list -t snapshot -H -o name | grep -E '^zroot/linux/nix/persist@blank$' || zfs snapshot zroot/linux/nix/persist@blank";
-          };
-          "linux/nix/state" = {
-            type = "zfs_fs";
-            options.mountpoint = "legacy";
-            mountpoint = "/state";
-            postCreateHook = "zfs list -t snapshot -H -o name | grep -E '^zroot/linux/nix/state@blank$' || zfs snapshot zroot/linux/nix/state@blank";
-          };
-        };
-      };
-    };
-  };
-
-  # Make sure all persistent volumes are marked as neededForBoot
-  #
-  # Also mounts /home so it is mounted before the user home directories are created.
-  fileSystems."/persist".neededForBoot = true;
-  fileSystems."/state".neededForBoot = true;
-  fileSystems."/home".neededForBoot = true;
-
-  fileSystems."/".options = [
-    "noatime"
-    "norelatime"
-  ];
-  fileSystems."/boot".options = [
-    "noatime"
-    "norelatime"
-  ];
-  fileSystems."/nix".options = [
-    "noatime"
-    "norelatime"
-  ];
-  fileSystems."/persist".options = [
-    "noatime"
-    "norelatime"
-  ];
-  fileSystems."/state".options = [
-    "noatime"
-    "norelatime"
-  ];
-  fileSystems."/home".options = [
-    "noatime"
-    "norelatime"
-  ];
-
-  # Only attempt to decrypt the main pool. Otherwise it attempts to decrypt pools that aren't even used.
-  boot.zfs.requestEncryptionCredentials = [ "zroot/linux/nix" ];
-}

nix/configuration/hosts/family_disks/distributed_build.nix

@@ -1,19 +0,0 @@
-{
-  imports = [ ];
-
-  config = {
-    me.distributed_build.enable = true;
-    me.distributed_build.machines.quark = {
-      enable = false;
-      additional_config = {
-        speedFactor = 2;
-      };
-    };
-    me.distributed_build.machines.hydra = {
-      enable = true;
-      additional_config = {
-        speedFactor = 2;
-      };
-    };
-  };
-}

nix/configuration/hosts/family_disks/hardware-configuration.nix

@@ -1,33 +0,0 @@
-{
-  config,
-  lib,
-  modulesPath,
-  ...
-}:
-
-{
-  imports = [
-    (modulesPath + "/installer/scan/not-detected.nix")
-  ];
-
-  config = {
-    boot.initrd.availableKernelModules = [
-      "nvme"
-      "xhci_pci"
-      "thunderbolt"
-    ];
-    boot.initrd.kernelModules = [ ];
-    boot.kernelModules = [ ];
-    boot.extraModulePackages = [ ];
-
-    # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
-    # (the default) this is the recommended approach. When using systemd-networkd it's
-    # still possible to use this option, but it's recommended to use it in conjunction
-    # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
-    # networking.useDHCP = lib.mkDefault true;
-    # networking.interfaces.eno1.useDHCP = lib.mkDefault true;
-    # networking.interfaces.wlp58s0.useDHCP = lib.mkDefault true;
-
-    hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
-  };
-}

nix/configuration/hosts/family_disks/power_management.nix

@@ -1,75 +0,0 @@
-{
-  pkgs,
-  ...
-}:
-
-{
-  imports = [ ];
-
-  config = {
-    environment.systemPackages = with pkgs; [
-      powertop
-    ];
-
-    # amdgpu.abmlevel=3 :: Automatically reduce screen brightness but tweak colors to compensate for power reduction.
-    # pcie_aspm=force pcie_aspm.policy=powersupersave :: Enable PCIe active state power management for power reduction.
-    # nowatchdog :: Disable watchdog for power savings (related to disable_sp5100_watchdog above).
-    # amd_pstate=passive :: Fully automated hardware pstate control.
-    # amd_pstate=active :: Same as passive except we can set the energy performance preference (EPP) to suggest how much we prefer performance or energy efficiency.
-    # amd_pstate=guided :: Same as passive except we can set upper and lower frequency bounds.
-    # amdgpu.dcdebugmask=0x10 :: Allegedly disables Panel Replay from https://community.frame.work/t/tracking-freezing-arch-linux-amd/39495/32
-    boot.kernelParams = [
-      "amdgpu.abmlevel=2"
-      "pcie_aspm=force"
-      # "pcie_aspm.policy=powersupersave"
-      "nowatchdog"
-      # I don't see a measurable benefit from these two:
-      # "cpufreq.default_governor=powersave"
-      # "initcall_blacklist=cpufreq_gov_userspace_init"
-    ];
-
-    systemd.tmpfiles.rules = [
-      "w- /sys/firmware/acpi/platform_profile - - - - low-power"
-      "w- /sys/devices/system/cpu/cpufreq/policy0/energy_performance_preference - - - - power"
-      "w- /sys/devices/system/cpu/cpufreq/policy1/energy_performance_preference - - - - power"
-      "w- /sys/devices/system/cpu/cpufreq/policy2/energy_performance_preference - - - - power"
-      "w- /sys/devices/system/cpu/cpufreq/policy3/energy_performance_preference - - - - power"
-      "w- /sys/devices/system/cpu/cpufreq/policy4/energy_performance_preference - - - - power"
-      "w- /sys/devices/system/cpu/cpufreq/policy5/energy_performance_preference - - - - power"
-      "w- /sys/devices/system/cpu/cpufreq/policy6/energy_performance_preference - - - - power"
-      "w- /sys/devices/system/cpu/cpufreq/policy7/energy_performance_preference - - - - power"
-      "w- /sys/devices/system/cpu/cpufreq/policy8/energy_performance_preference - - - - power"
-      "w- /sys/devices/system/cpu/cpufreq/policy9/energy_performance_preference - - - - power"
-      "w- /sys/devices/system/cpu/cpufreq/policy10/energy_performance_preference - - - - power"
-      "w- /sys/devices/system/cpu/cpufreq/policy11/energy_performance_preference - - - - power"
-      "w- /sys/devices/system/cpu/cpufreq/policy12/energy_performance_preference - - - - power"
-      "w- /sys/devices/system/cpu/cpufreq/policy13/energy_performance_preference - - - - power"
-      "w- /sys/devices/system/cpu/cpufreq/policy14/energy_performance_preference - - - - power"
-      "w- /sys/devices/system/cpu/cpufreq/policy15/energy_performance_preference - - - - power"
-      "w- /sys/devices/system/cpu/cpu0/cpufreq/boost - - - - 0"
-      "w- /sys/devices/system/cpu/cpu1/cpufreq/boost - - - - 0"
-      "w- /sys/devices/system/cpu/cpu2/cpufreq/boost - - - - 0"
-      "w- /sys/devices/system/cpu/cpu3/cpufreq/boost - - - - 0"
-      "w- /sys/devices/system/cpu/cpu4/cpufreq/boost - - - - 0"
-      "w- /sys/devices/system/cpu/cpu5/cpufreq/boost - - - - 0"
-      "w- /sys/devices/system/cpu/cpu6/cpufreq/boost - - - - 0"
-      "w- /sys/devices/system/cpu/cpu7/cpufreq/boost - - - - 0"
-      "w- /sys/devices/system/cpu/cpu8/cpufreq/boost - - - - 0"
-      "w- /sys/devices/system/cpu/cpu9/cpufreq/boost - - - - 0"
-      "w- /sys/devices/system/cpu/cpu10/cpufreq/boost - - - - 0"
-      "w- /sys/devices/system/cpu/cpu11/cpufreq/boost - - - - 0"
-      "w- /sys/devices/system/cpu/cpu12/cpufreq/boost - - - - 0"
-      "w- /sys/devices/system/cpu/cpu13/cpufreq/boost - - - - 0"
-      "w- /sys/devices/system/cpu/cpu14/cpufreq/boost - - - - 0"
-      "w- /sys/devices/system/cpu/cpu15/cpufreq/boost - - - - 0"
-    ];
-
-    boot.extraModprobeConfig = ''
-      # Disable the hardware watchdog inside AMD 700 chipset series for power savings.
-      blacklist sp5100_tco
-
-      # Sound power-saving was causing chat notifications to be inaudible.
-      # options snd_hda_intel power_save=1
-    '';
-  };
-}

nix/configuration/hosts/family_disks/wrapped-disk-config.nix

@@ -1,7 +0,0 @@
-{
-  config,
-  lib,
-  ...
-}:
-
-lib.mkIf (!config.me.buildingPortable) (import ./disk-config.nix)

nix/configuration/hosts/hydra/DEPLOY_BOOT

@@ -1,13 +0,0 @@
-#!/usr/bin/env bash
-#
-set -euo pipefail
-IFS=$'\n\t'
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-
-: "${JOBS:="1"}"
-
-TARGET=hydra
-
-for f in /persist/manual/manual_add_to_store/*; do nix-store --add-fixed sha256 "$f"; done
-
-nixos-rebuild boot --flake "$DIR/../../#hydra" --target-host "$TARGET" --build-host "$TARGET" --sudo --max-jobs "$JOBS" --repair --log-format internal-json -v "${@}" |& nom --json

nix/configuration/hosts/hydra/DEPLOY_SWITCH

@@ -1,13 +0,0 @@
-#!/usr/bin/env bash
-#
-set -euo pipefail
-IFS=$'\n\t'
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-
-: "${JOBS:="1"}"
-
-TARGET=hydra
-
-for f in /persist/manual/manual_add_to_store/*; do nix-store --add-fixed sha256 "$f"; done
-
-nixos-rebuild switch --flake "$DIR/../../#hydra" --target-host "$TARGET" --build-host "$TARGET" --sudo --max-jobs "$JOBS" --repair --log-format internal-json -v "${@}" |& nom --json

nix/configuration/hosts/hydra/ISO

@@ -1,10 +0,0 @@
-#!/usr/bin/env bash
-#
-set -euo pipefail
-IFS=$'\n\t'
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-
-: "${JOBS:="1"}"
-
-for f in /persist/manual/manual_add_to_store/*; do nix-store --add-fixed sha256 "$f"; done
-nix build --extra-experimental-features nix-command --extra-experimental-features flakes "$DIR/../..#hydra.iso" --max-jobs "$JOBS" --repair --log-format internal-json -v "${@}" |& nom --json

nix/configuration/hosts/hydra/SELF_BOOT

@@ -1,10 +0,0 @@
-#!/usr/bin/env bash
-#
-set -euo pipefail
-IFS=$'\n\t'
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-
-: "${JOBS:="1"}"
-
-for f in /persist/manual/manual_add_to_store/*; do nix-store --add-fixed sha256 "$f"; done
-nixos-rebuild boot --show-trace --sudo --max-jobs "$JOBS" --flake "$DIR/../../#hydra" --repair --log-format internal-json -v "${@}" |& nom --json

nix/configuration/hosts/hydra/SELF_BUILD

@@ -1,10 +0,0 @@
-#!/usr/bin/env bash
-#
-set -euo pipefail
-IFS=$'\n\t'
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-
-: "${JOBS:="1"}"
-
-for f in /persist/manual/manual_add_to_store/*; do nix-store --add-fixed sha256 "$f"; done
-nixos-rebuild build --show-trace --sudo --max-jobs "$JOBS" --flake "$DIR/../../#hydra" --repair --log-format internal-json -v "${@}" |& nom --json

nix/configuration/hosts/hydra/SELF_SWITCH

@@ -1,10 +0,0 @@
-#!/usr/bin/env bash
-#
-set -euo pipefail
-IFS=$'\n\t'
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-
-: "${JOBS:="1"}"
-
-for f in /persist/manual/manual_add_to_store/*; do nix-store --add-fixed sha256 "$f"; done
-nixos-rebuild switch --show-trace --sudo --max-jobs "$JOBS" --flake "$DIR/../../#hydra" --repair --log-format internal-json -v "${@}" |& nom --json

nix/configuration/hosts/hydra/VM_ISO

@@ -1,10 +0,0 @@
-#!/usr/bin/env bash
-#
-set -euo pipefail
-IFS=$'\n\t'
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-
-: "${JOBS:="1"}"
-
-for f in /persist/manual/manual_add_to_store/*; do nix-store --add-fixed sha256 "$f"; done
-nix build --extra-experimental-features nix-command --extra-experimental-features flakes "$DIR/../..#hydra.vm_iso" --max-jobs "$JOBS" --repair --log-format internal-json -v "${@}" |& nom --json

nix/configuration/hosts/hydra/default.nix

@@ -1,138 +0,0 @@
-# MANUAL: On client machines generate signing keys:
-#   nix-store --generate-binary-cache-key some-name /persist/manual/nix/nix-cache-key.sec /persist/manual/nix/nix-cache-key.pub
-#
-# Trust other machines and add the substituters:
-#   nix.binaryCachePublicKeys = [ "some-name:AzNW1MOlkNEsUAXS1jIFZ1QCFKXjV+Y/LrF37quAZ1A=" ];
-#   nix.binaryCaches = [ "https://test.example/nix-cache" ];
-
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-{
-  imports = [
-    ./hardware-configuration.nix
-    ./vm_disk.nix
-  ];
-
-  config = {
-    networking =
-      let
-        interface = "enp0s2";
-      in
-      {
-        # Generate with `head -c4 /dev/urandom | od -A none -t x4`
-        hostId = "6fbf418b";
-
-        hostName = "hydra"; # Define your hostname.
-
-        interfaces = {
-          "${interface}" = {
-            ipv4.addresses = [
-              {
-                address = "10.215.1.219";
-                prefixLength = 24;
-              }
-            ];
-
-            ipv6.addresses = [
-              {
-                address = "2620:11f:7001:7:ffff:ffff:0ad7:01db";
-                prefixLength = 64;
-              }
-            ];
-          };
-        };
-        defaultGateway = "10.215.1.1";
-        defaultGateway6 = {
-          # address = "2620:11f:7001:7::1";
-          address = "2620:11f:7001:7:ffff:ffff:0ad7:0101";
-          inherit interface;
-        };
-
-        dhcpcd.enable = lib.mkForce false;
-        useDHCP = lib.mkForce false;
-      };
-
-    time.timeZone = "America/New_York";
-    i18n.defaultLocale = "en_US.UTF-8";
-
-    me.boot.enable = true;
-    me.boot.secure = false;
-    me.mountPersistence = true;
-    boot.loader.timeout = lib.mkForce 0; # We can always generate a new ISO if we need to access other boot options.
-
-    me.optimizations = {
-      enable = true;
-      arch = "znver4";
-      # build_arch = "x86-64-v3";
-      system_features = [
-        "gccarch-znver4"
-        "gccarch-skylake"
-        "gccarch-kabylake"
-        # "gccarch-alderlake" missing WAITPKG
-        "gccarch-x86-64-v3"
-        "gccarch-x86-64-v4"
-        "benchmark"
-        "big-parallel"
-        "kvm"
-        "nixos-test"
-      ];
-    };
-
-    # Mount tmpfs at /tmp
-    boot.tmp.useTmpfs = true;
-
-    # Enable TRIM
-    # services.fstrim.enable = lib.mkDefault true;
-
-    # nix.optimise.automatic = true;
-    # nix.optimise.dates = [ "03:45" ];
-    # nix.optimise.persistent = true;
-
-    me.image_based_appliance.enable = lib.mkForce false;
-
-    environment.systemPackages = with pkgs; [
-      htop
-      git # for building on hydra
-      tmux # for building on hydra
-      nix-output-monitor # for building on hydra
-    ];
-
-    # nix.sshServe.enable = true;
-    # nix.sshServe.keys = [ "ssh-dss AAAAB3NzaC1k... bob@example.org" ];
-
-    # Override garbage collection to keep things longer
-    # Automatic garbage collection
-    nix.gc = lib.mkForce {
-      automatic = true;
-      persistent = true;
-      dates = "weekly";
-      # randomizedDelaySec = "14m";
-      options = "--delete-older-than 60d";
-    };
-
-    # The default limit of files is 1024 which is too low for some nix builds.
-    #
-    # Check with `ulimit -n`
-    security.pam.loginLimits = [
-      {
-        domain = "*";
-        item = "nofile";
-        type = "-";
-        value = "8192";
-      }
-    ];
-
-    # systemd.user.extraConfig = "DefaultLimitNOFILE=8192";
-    # systemd.services."user@11400".serviceConfig.LimitNOFILE = "8192";
-
-    me.build_in_ram.enable = true;
-    me.dont_use_substituters.enable = true;
-    me.hydra.enable = true;
-    me.minimal_base.enable = true;
-    me.nix_worker.enable = true;
-  };
-}

nix/configuration/hosts/hydra/hardware-configuration.nix

@@ -1,31 +0,0 @@
-{
-  config,
-  lib,
-  modulesPath,
-  ...
-}:
-
-{
-  imports = [
-    (modulesPath + "/installer/scan/not-detected.nix")
-  ];
-
-  config = {
-    boot.initrd.availableKernelModules = [
-      "nvme"
-      "xhci_pci"
-      "thunderbolt"
-    ];
-    boot.initrd.kernelModules = [ ];
-    boot.kernelModules = [ ];
-    boot.extraModulePackages = [ ];
-
-    # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
-    # (the default) this is the recommended approach. When using systemd-networkd it's
-    # still possible to use this option, but it's recommended to use it in conjunction
-    # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
-    # networking.useDHCP = lib.mkDefault true;
-    # networking.interfaces.eno1.useDHCP = lib.mkDefault true;
-    # networking.interfaces.wlp58s0.useDHCP = lib.mkDefault true;
-  };
-}

nix/configuration/hosts/hydra/vm_disk.nix

@@ -1,95 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-
-{
-  imports = [ ];
-
-  config = {
-    # environment.systemPackages = with pkgs; [
-    #   e2fsprogs # mkfs.ext4
-    #   gptfdisk # cgdisk
-    # ];
-
-    # Mount the local disk
-    fileSystems = lib.mkIf config.me.mountPersistence {
-      "/.disk" = lib.mkForce {
-        device = "/dev/nvme0n1p1";
-        fsType = "ext4";
-        options = [
-          "noatime"
-          "discard"
-        ];
-        neededForBoot = true;
-      };
-
-      # "/.persist" = lib.mkForce {
-      #   device = "bind9p";
-      #   fsType = "9p";
-      #   options = [
-      #     "noatime"
-      #     "trans=virtio"
-      #     "version=9p2000.L"
-      #     "cache=mmap"
-      #     "msize=512000"
-      #     "uname=root"
-      #     "dfltuid=0"
-      #     "dfltgid=0"
-      #     "nodevmap"
-      #     # "noauto"
-      #     # "x-systemd.automount"
-      #   ];
-      #   neededForBoot = true;
-      # };
-
-      "/persist" = {
-        fsType = "none";
-        device = "/.disk/persist";
-        options = [
-          "bind"
-          "rw"
-        ];
-        depends = [
-          "/.disk/persist"
-        ];
-        neededForBoot = true;
-      };
-
-      "/state" = {
-        fsType = "none";
-        device = "/.disk/state";
-        options = [
-          "bind"
-          "rw"
-        ];
-        depends = [
-          "/.disk/state"
-        ];
-        neededForBoot = true;
-      };
-
-      # "/nix/store" = lib.mkForce {
-      #   overlay = {
-      #     lowerdir = [ "/nix/.ro-store" ];
-      #     upperdir = "/.disk/persist/store";
-      #     workdir = "/.disk/state/work";
-      #   };
-      #   # fsType = "overlay";
-      #   # device = "overlay";
-      #   # options = [
-      #   #   "lowerdir=/nix/.ro-store"
-      #   #   "upperdir=/.disk/persist/store"
-      #   #   "workdir=/.disk/state/work"
-      #   # ];
-      #   depends = [
-      #     "/nix/.ro-store"
-      #     "/.disk/persist/store"
-      #     "/.disk/state/work"
-      #   ];
-      # };
-    };
-  };
-}

nix/configuration/hosts/i_only_boot_zfs/DEPLOY_BOOT

@@ -1,13 +0,0 @@
-#!/usr/bin/env bash
-#
-set -euo pipefail
-IFS=$'\n\t'
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-
-: "${JOBS:="1"}"
-
-TARGET=i_only_boot_zfs
-
-for f in /persist/manual/manual_add_to_store/*; do nix-store --add-fixed sha256 "$f"; done
-
-nixos-rebuild boot --flake "$DIR/../../#i_only_boot_zfs" --target-host "$TARGET" --build-host "$TARGET" --sudo --max-jobs "$JOBS" --repair --log-format internal-json -v "${@}" |& nom --json

nix/configuration/hosts/i_only_boot_zfs/DEPLOY_SWITCH

@@ -1,13 +0,0 @@
-#!/usr/bin/env bash
-#
-set -euo pipefail
-IFS=$'\n\t'
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-
-: "${JOBS:="1"}"
-
-TARGET=i_only_boot_zfs
-
-for f in /persist/manual/manual_add_to_store/*; do nix-store --add-fixed sha256 "$f"; done
-
-nixos-rebuild switch --flake "$DIR/../../#i_only_boot_zfs" --target-host "$TARGET" --build-host "$TARGET" --sudo --max-jobs "$JOBS" --repair --log-format internal-json -v "${@}" |& nom --json

nix/configuration/hosts/i_only_boot_zfs/ISO

@@ -1,10 +0,0 @@
-#!/usr/bin/env bash
-#
-set -euo pipefail
-IFS=$'\n\t'
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-
-: "${JOBS:="1"}"
-
-for f in /persist/manual/manual_add_to_store/*; do nix-store --add-fixed sha256 "$f"; done
-nix build --extra-experimental-features nix-command --extra-experimental-features flakes "$DIR/../..#i_only_boot_zfs.iso" --repair --max-jobs "$JOBS" --log-format internal-json -v "${@}" |& nom --json

nix/configuration/hosts/i_only_boot_zfs/SELF_BOOT

@@ -1,10 +0,0 @@
-#!/usr/bin/env bash
-#
-set -euo pipefail
-IFS=$'\n\t'
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-
-: "${JOBS:="1"}"
-
-for f in /persist/manual/manual_add_to_store/*; do nix-store --add-fixed sha256 "$f"; done
-nixos-rebuild boot --show-trace --sudo --max-jobs "$JOBS" --flake "$DIR/../../#i_only_boot_zfs" --repair --log-format internal-json -v "${@}" |& nom --json

nix/configuration/hosts/i_only_boot_zfs/SELF_BUILD

@@ -1,10 +0,0 @@
-#!/usr/bin/env bash
-#
-set -euo pipefail
-IFS=$'\n\t'
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-
-: "${JOBS:="1"}"
-
-for f in /persist/manual/manual_add_to_store/*; do nix-store --add-fixed sha256 "$f"; done
-nixos-rebuild build --show-trace --sudo --max-jobs "$JOBS" --flake "$DIR/../../#i_only_boot_zfs" --repair --log-format internal-json -v "${@}" |& nom --json

nix/configuration/hosts/i_only_boot_zfs/SELF_SWITCH

@@ -1,10 +0,0 @@
-#!/usr/bin/env bash
-#
-set -euo pipefail
-IFS=$'\n\t'
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-
-: "${JOBS:="1"}"
-
-for f in /persist/manual/manual_add_to_store/*; do nix-store --add-fixed sha256 "$f"; done
-nixos-rebuild switch --show-trace --sudo --max-jobs "$JOBS" --flake "$DIR/../../#i_only_boot_zfs" --repair --log-format internal-json -v "${@}" |& nom --json

nix/configuration/hosts/i_only_boot_zfs/default.nix

@@ -1,63 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-{
-  imports = [
-    ./hardware-configuration.nix
-    ./wrapped-disk-config.nix
-    ./distributed_build.nix
-    ./power_management.nix
-  ];
-
-  config = {
-    # Generate with `head -c4 /dev/urandom | od -A none -t x4`
-    networking.hostId = "6a05d86e";
-
-    networking.hostName = "i_only_boot_zfs"; # Define your hostname.
-
-    time.timeZone = "America/New_York";
-    i18n.defaultLocale = "en_US.UTF-8";
-
-    me.boot.enable = true;
-    me.boot.secure = false;
-    me.mountPersistence = true;
-
-    # Toggle to start writing the extlinux config which will be used by zfsbootmenu
-    # boot.loader.generic-extlinux-compatible.enable = true;
-    # boot.loader.systemd-boot.enable = lib.mkForce false;
-
-    me.optimizations = {
-      # enable = true;
-      # arch = "kabylake";
-      # build_arch = "x86-64-v3";
-      system_features = [
-        # "gccarch-kabylake"
-        "gccarch-x86-64-v3"
-        "benchmark"
-        "big-parallel"
-        "kvm"
-        "nixos-test"
-      ];
-    };
-
-    # Early KMS
-    # boot.initrd.kernelModules = [ "amdgpu" ];
-
-    # Mount tmpfs at /tmp
-    boot.tmp.useTmpfs = true;
-
-    # Enable TRIM
-    # services.fstrim.enable = lib.mkDefault true;
-
-    # Even when installed, we want to dhcp because this is for a VM.
-    networking.dhcpcd.enable = true;
-    networking.useDHCP = true;
-
-    me.build_in_ram.enable = true;
-    me.dont_use_substituters.enable = true;
-    me.minimal_base.enable = true;
-  };
-}

nix/configuration/hosts/i_only_boot_zfs/disk-config.nix

@@ -1,155 +0,0 @@
-# Manual Step:
-#   Check if drive supports 4kn: nvme id-ns -H /dev/nvme0n1
-#   Format the drive to 4kn: nvme format --lbaf=1 /dev/nvme0n1
-
-{
-  disko.devices = {
-    disk = {
-      main = {
-        type = "disk";
-        device = "/dev/nvme0n1";
-        content = {
-          type = "gpt";
-          partitions = {
-            ESP = {
-              size = "1G";
-              type = "EF00";
-              content = {
-                type = "filesystem";
-                format = "vfat";
-                mountpoint = "/efi";
-                mountOptions = [
-                  "umask=0077"
-                  "noatime"
-                  "discard"
-                ];
-              };
-            };
-            zfs = {
-              size = "100%";
-              content = {
-                type = "zfs";
-                pool = "zroot";
-              };
-            };
-          };
-        };
-      };
-    };
-    zpool = {
-      zroot = {
-        type = "zpool";
-        # mode = "mirror";
-        # Workaround: cannot import 'zroot': I/O error in disko tests
-        options.cachefile = "none";
-        options = {
-          ashift = "12";
-          compatibility = "openzfs-2.2-freebsd";
-          autotrim = "on";
-        };
-        rootFsOptions = {
-          acltype = "posixacl";
-          atime = "off";
-          relatime = "off";
-          xattr = "sa";
-          mountpoint = "none";
-          compression = "lz4";
-          canmount = "off";
-          utf8only = "on";
-          dnodesize = "auto";
-          normalization = "formD";
-        };
-
-        datasets = {
-          "linux/nix" = {
-            type = "zfs_fs";
-            options.mountpoint = "none";
-            options = {
-              # encryption = "aes-256-gcm";
-              # keyformat = "passphrase";
-              # keylocation = "file:///tmp/secret.key";
-            };
-          };
-          "linux/nix/root" = {
-            type = "zfs_fs";
-            options.mountpoint = "legacy";
-            mountpoint = "/";
-            postCreateHook = "zfs list -t snapshot -H -o name | grep -E '^zroot/linux/nix/root@blank$' || zfs snapshot zroot/linux/nix/root@blank";
-          };
-          "linux/nix/boot" = {
-            type = "zfs_fs";
-            options = {
-              mountpoint = "legacy";
-              "org.zfsbootmenu:active" = "on";
-            };
-            mountpoint = "/boot";
-            postCreateHook = "zfs list -t snapshot -H -o name | grep -E '^zroot/linux/nix/boot@blank$' || zfs snapshot zroot/linux/nix/boot@blank";
-          };
-          "linux/nix/nix" = {
-            type = "zfs_fs";
-            options.mountpoint = "legacy";
-            mountpoint = "/nix";
-            postCreateHook = "zfs list -t snapshot -H -o name | grep -E '^zroot/linux/nix/nix@blank$' || zfs snapshot zroot/linux/nix/nix@blank";
-            options = {
-              recordsize = "16MiB";
-              compression = "zstd-19";
-            };
-          };
-          "linux/nix/home" = {
-            type = "zfs_fs";
-            options.mountpoint = "legacy";
-            mountpoint = "/home";
-            postCreateHook = "zfs list -t snapshot -H -o name | grep -E '^zroot/linux/nix/home@blank$' || zfs snapshot zroot/linux/nix/home@blank";
-          };
-          "linux/nix/persist" = {
-            type = "zfs_fs";
-            options.mountpoint = "legacy";
-            mountpoint = "/persist";
-            postCreateHook = "zfs list -t snapshot -H -o name | grep -E '^zroot/linux/nix/persist@blank$' || zfs snapshot zroot/linux/nix/persist@blank";
-          };
-          "linux/nix/state" = {
-            type = "zfs_fs";
-            options.mountpoint = "legacy";
-            mountpoint = "/state";
-            postCreateHook = "zfs list -t snapshot -H -o name | grep -E '^zroot/linux/nix/state@blank$' || zfs snapshot zroot/linux/nix/state@blank";
-          };
-        };
-      };
-    };
-  };
-
-  # Make sure all persistent volumes are marked as neededForBoot
-  #
-  # Also mounts /home so it is mounted before the user home directories are created.
-  fileSystems."/persist".neededForBoot = true;
-  fileSystems."/state".neededForBoot = true;
-  fileSystems."/home".neededForBoot = true;
-
-  fileSystems."/".options = [
-    "noatime"
-    "norelatime"
-  ];
-  fileSystems."/boot".options = [
-    "noatime"
-    "norelatime"
-  ];
-  fileSystems."/nix".options = [
-    "noatime"
-    "norelatime"
-  ];
-  fileSystems."/persist".options = [
-    "noatime"
-    "norelatime"
-  ];
-  fileSystems."/state".options = [
-    "noatime"
-    "norelatime"
-  ];
-  fileSystems."/home".options = [
-    "noatime"
-    "norelatime"
-  ];
-
-  # Only attempt to decrypt the main pool. Otherwise it attempts to decrypt pools that aren't even used.
-  # boot.zfs.requestEncryptionCredentials = [ "zroot/linux/nix" ];
-}

nix/configuration/hosts/i_only_boot_zfs/distributed_build.nix

@@ -1,13 +0,0 @@
-{
-  imports = [ ];
-
-  config = {
-    me.distributed_build.enable = true;
-    me.distributed_build.machines.quark = {
-      enable = true;
-      additional_config = {
-        speedFactor = 2;
-      };
-    };
-  };
-}

nix/configuration/hosts/i_only_boot_zfs/hardware-configuration.nix

@@ -1,33 +0,0 @@
-{
-  config,
-  lib,
-  modulesPath,
-  ...
-}:
-
-{
-  imports = [
-    (modulesPath + "/installer/scan/not-detected.nix")
-  ];
-
-  config = {
-    boot.initrd.availableKernelModules = [
-      "nvme"
-      "xhci_pci"
-      "thunderbolt"
-    ];
-    boot.initrd.kernelModules = [ ];
-    boot.kernelModules = [ ];
-    boot.extraModulePackages = [ ];
-
-    # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
-    # (the default) this is the recommended approach. When using systemd-networkd it's
-    # still possible to use this option, but it's recommended to use it in conjunction
-    # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
-    # networking.useDHCP = lib.mkDefault true;
-    # networking.interfaces.eno1.useDHCP = lib.mkDefault true;
-    # networking.interfaces.wlp58s0.useDHCP = lib.mkDefault true;
-
-    hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
-  };
-}

nix/configuration/hosts/i_only_boot_zfs/power_management.nix

@@ -1,63 +0,0 @@
-{
-  pkgs,
-  ...
-}:
-
-{
-  imports = [ ];
-
-  config = {
-    environment.systemPackages = with pkgs; [
-      powertop
-    ];
-
-    # pcie_aspm=force pcie_aspm.policy=powersupersave :: Enable PCIe active state power management for power reduction.
-    # nowatchdog :: Disable watchdog for power savings (related to disable_sp5100_watchdog above).
-    boot.kernelParams = [
-      "pcie_aspm=force"
-      # "pcie_aspm.policy=powersupersave"
-      "nowatchdog"
-    ];
-
-    systemd.tmpfiles.rules = [
-      "w- /sys/firmware/acpi/platform_profile - - - - low-power"
-      "w- /sys/devices/system/cpu/cpufreq/policy0/energy_performance_preference - - - - power"
-      "w- /sys/devices/system/cpu/cpufreq/policy1/energy_performance_preference - - - - power"
-      "w- /sys/devices/system/cpu/cpufreq/policy2/energy_performance_preference - - - - power"
-      "w- /sys/devices/system/cpu/cpufreq/policy3/energy_performance_preference - - - - power"
-      "w- /sys/devices/system/cpu/cpufreq/policy4/energy_performance_preference - - - - power"
-      "w- /sys/devices/system/cpu/cpufreq/policy5/energy_performance_preference - - - - power"
-      "w- /sys/devices/system/cpu/cpufreq/policy6/energy_performance_preference - - - - power"
-      "w- /sys/devices/system/cpu/cpufreq/policy7/energy_performance_preference - - - - power"
-      "w- /sys/devices/system/cpu/cpufreq/policy8/energy_performance_preference - - - - power"
-      "w- /sys/devices/system/cpu/cpufreq/policy9/energy_performance_preference - - - - power"
-      "w- /sys/devices/system/cpu/cpufreq/policy10/energy_performance_preference - - - - power"
-      "w- /sys/devices/system/cpu/cpufreq/policy11/energy_performance_preference - - - - power"
-      "w- /sys/devices/system/cpu/cpufreq/policy12/energy_performance_preference - - - - power"
-      "w- /sys/devices/system/cpu/cpufreq/policy13/energy_performance_preference - - - - power"
-      "w- /sys/devices/system/cpu/cpufreq/policy14/energy_performance_preference - - - - power"
-      "w- /sys/devices/system/cpu/cpufreq/policy15/energy_performance_preference - - - - power"
-      "w- /sys/devices/system/cpu/cpu0/cpufreq/boost - - - - 0"
-      "w- /sys/devices/system/cpu/cpu1/cpufreq/boost - - - - 0"
-      "w- /sys/devices/system/cpu/cpu2/cpufreq/boost - - - - 0"
-      "w- /sys/devices/system/cpu/cpu3/cpufreq/boost - - - - 0"
-      "w- /sys/devices/system/cpu/cpu4/cpufreq/boost - - - - 0"
-      "w- /sys/devices/system/cpu/cpu5/cpufreq/boost - - - - 0"
-      "w- /sys/devices/system/cpu/cpu6/cpufreq/boost - - - - 0"
-      "w- /sys/devices/system/cpu/cpu7/cpufreq/boost - - - - 0"
-      "w- /sys/devices/system/cpu/cpu8/cpufreq/boost - - - - 0"
-      "w- /sys/devices/system/cpu/cpu9/cpufreq/boost - - - - 0"
-      "w- /sys/devices/system/cpu/cpu10/cpufreq/boost - - - - 0"
-      "w- /sys/devices/system/cpu/cpu11/cpufreq/boost - - - - 0"
-      "w- /sys/devices/system/cpu/cpu12/cpufreq/boost - - - - 0"
-      "w- /sys/devices/system/cpu/cpu13/cpufreq/boost - - - - 0"
-      "w- /sys/devices/system/cpu/cpu14/cpufreq/boost - - - - 0"
-      "w- /sys/devices/system/cpu/cpu15/cpufreq/boost - - - - 0"
-    ];
-
-    boot.extraModprobeConfig = ''
-      # Sound power-saving was causing chat notifications to be inaudible.
-      # options snd_hda_intel power_save=1
-    '';
-  };
-}

nix/configuration/hosts/i_only_boot_zfs/wrapped-disk-config.nix

@@ -1,7 +0,0 @@
-{
-  config,
-  lib,
-  ...
-}:
-
-lib.mkIf (!config.me.buildingPortable) (import ./disk-config.nix)

nix/configuration/hosts/neelix/DEPLOY_BOOT

@@ -1,17 +0,0 @@
-#!/usr/bin/env bash
-#
-set -euo pipefail
-IFS=$'\n\t'
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-
-: "${JOBS:="1"}"
-
-#TARGET=10.216.1.14
-# TARGET=192.168.211.250
-TARGET=neelix
-
-for f in /persist/manual/manual_add_to_store/*; do nix-store --add-fixed sha256 "$f"; done
-
-nixos-rebuild boot --flake "$DIR/../../#neelix" --target-host "$TARGET" --build-host "$TARGET" --sudo --max-jobs "$JOBS" --repair --log-format internal-json -v "${@}" |& nom --json
-
-# rsync -av --progress --delete --exclude=.git "$DIR/../../../configuration" "talexander@${TARGET}:/persist/manual/" && ssh talexander@${TARGET} 'cd /persist/manual/configuration && nix flake update zsh-histdb && nix flake update ansible-sshjail && doas nice -n 19 nixos-rebuild boot --flake /persist/manual/configuration#neelix'

nix/configuration/hosts/neelix/DEPLOY_SWITCH

@@ -1,17 +0,0 @@
-#!/usr/bin/env bash
-#
-set -euo pipefail
-IFS=$'\n\t'
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-
-: "${JOBS:="1"}"
-
-#TARGET=10.216.1.14
-# TARGET=192.168.211.250
-TARGET=neelix
-
-for f in /persist/manual/manual_add_to_store/*; do nix-store --add-fixed sha256 "$f"; done
-
-nixos-rebuild switch --flake "$DIR/../../#neelix" --target-host "$TARGET" --build-host "$TARGET" --sudo --max-jobs "$JOBS" --repair --log-format internal-json -v "${@}" |& nom --json
-
-# rsync -av --progress --delete --exclude=.git "$DIR/../../../configuration" "talexander@${TARGET}:/persist/manual/" && ssh talexander@${TARGET} 'cd /persist/manual/configuration && nix flake update zsh-histdb && nix flake update ansible-sshjail && doas nice -n 19 nixos-rebuild switch --flake /persist/manual/configuration#neelix'

nix/configuration/hosts/neelix/default.nix

@@ -1,66 +0,0 @@
-{ config, pkgs, ... }:
-{
-  imports = [
-    ./hardware-configuration.nix
-    ./disk-config.nix
-    ./power_management.nix
-  ];
-
-  config = {
-    # Generate with `head -c4 /dev/urandom | od -A none -t x4`
-    networking.hostId = "bca9d0a5";
-
-    networking.hostName = "neelix"; # Define your hostname.
-
-    time.timeZone = "America/New_York";
-    i18n.defaultLocale = "en_US.UTF-8";
-
-    me.boot.secure = false;
-    me.mountPersistence = true;
-
-    me.optimizations = {
-      enable = false;
-      arch = "alderlake";
-      system_features = [
-        "gccarch-alderlake"
-        "gccarch-x86-64-v3"
-        "gccarch-x86-64-v4"
-        "benchmark"
-        "big-parallel"
-        "kvm"
-        "nixos-test"
-      ];
-    };
-
-    # Early KMS
-    boot.initrd.kernelModules = [ "i915" ];
-
-    # Mount tmpfs at /tmp
-    # boot.tmp.useTmpfs = true;
-
-    me.base.enable = true;
-    me.bluetooth.enable = true;
-    me.boot.enable = true;
-    me.doas.enable = true;
-    me.emacs_flavor = "plainmacs";
-    me.firewall.enable = true;
-    me.font.enable = true;
-    me.git.enable = true;
-    me.graphical = true;
-    me.graphics_card_type = "intel";
-    me.kodi.enable = true;
-    me.lvfs.enable = true;
-    me.memtest.enable = true;
-    me.network.enable = true;
-    me.nvme.enable = true;
-    me.sound.enable = true;
-    me.ssh.enable = true;
-    me.sshd.enable = true;
-    me.user.enable = true;
-    me.wireguard.activated = [ "wgh" ];
-    me.wireguard.deactivated = [ "wgf" ];
-    me.zfs.enable = true;
-    me.zrepl.enable = true;
-    me.zsh.enable = true;
-  };
-}

nix/configuration/hosts/neelix/disk-config.nix

@@ -1,140 +0,0 @@
-# Manual Step:
-#   Check if drive supports 4kn: nvme id-ns -H /dev/nvme0n1
-#   Format the drive to 4kn: nvme format --lbaf=1 /dev/nvme0n1
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-
-lib.mkIf (!config.me.buildingIso) {
-  disko.devices = {
-    disk = {
-      main = {
-        type = "disk";
-        device = "/dev/nvme0n1";
-        content = {
-          type = "gpt";
-          partitions = {
-            ESP = {
-              size = "1G";
-              type = "EF00";
-              content = {
-                type = "filesystem";
-                format = "vfat";
-                mountpoint = "/boot";
-                mountOptions = [
-                  "umask=0077"
-                  "noatime"
-                  "discard"
-                ];
-              };
-            };
-            zfs = {
-              size = "100%";
-              content = {
-                type = "zfs";
-                pool = "zroot";
-              };
-            };
-          };
-        };
-      };
-    };
-    zpool = {
-      zroot = {
-        type = "zpool";
-        # mode = "mirror";
-        # Workaround: cannot import 'zroot': I/O error in disko tests
-        options.cachefile = "none";
-        options = {
-          ashift = "12";
-          compatibility = "openzfs-2.2-freebsd";
-          autotrim = "on";
-        };
-        rootFsOptions = {
-          acltype = "posixacl";
-          atime = "off";
-          relatime = "off";
-          xattr = "sa";
-          mountpoint = "none";
-          compression = "lz4";
-          canmount = "off";
-          utf8only = "on";
-          dnodesize = "auto";
-          normalization = "formD";
-        };
-
-        datasets = {
-          "linux/nix" = {
-            type = "zfs_fs";
-            options.mountpoint = "none";
-          };
-          "linux/nix/root" = {
-            type = "zfs_fs";
-            options.mountpoint = "legacy";
-            mountpoint = "/";
-            postCreateHook = "zfs list -t snapshot -H -o name | grep -E '^zroot/linux/nix/root@blank$' || zfs snapshot zroot/linux/nix/root@blank";
-          };
-          "linux/nix/nix" = {
-            type = "zfs_fs";
-            options.mountpoint = "legacy";
-            mountpoint = "/nix";
-            postCreateHook = "zfs list -t snapshot -H -o name | grep -E '^zroot/linux/nix/nix@blank$' || zfs snapshot zroot/linux/nix/nix@blank";
-            options = {
-              recordsize = "1MiB";
-              compression = "lz4";
-            };
-          };
-          "linux/nix/home" = {
-            type = "zfs_fs";
-            options.mountpoint = "legacy";
-            mountpoint = "/home";
-            postCreateHook = "zfs list -t snapshot -H -o name | grep -E '^zroot/linux/nix/home@blank$' || zfs snapshot zroot/linux/nix/home@blank";
-          };
-          "linux/nix/persist" = {
-            type = "zfs_fs";
-            options.mountpoint = "legacy";
-            mountpoint = "/persist";
-            postCreateHook = "zfs list -t snapshot -H -o name | grep -E '^zroot/linux/nix/persist@blank$' || zfs snapshot zroot/linux/nix/persist@blank";
-          };
-          "linux/nix/state" = {
-            type = "zfs_fs";
-            options.mountpoint = "legacy";
-            mountpoint = "/state";
-            postCreateHook = "zfs list -t snapshot -H -o name | grep -E '^zroot/linux/nix/state@blank$' || zfs snapshot zroot/linux/nix/state@blank";
-          };
-        };
-      };
-    };
-  };
-
-  # Make sure all persistent volumes are marked as neededForBoot
-  #
-  # Also mounts /home so it is mounted before the user home directories are created.
-  fileSystems."/persist".neededForBoot = true;
-  fileSystems."/state".neededForBoot = true;
-  fileSystems."/home".neededForBoot = true;
-
-  fileSystems."/".options = [
-    "noatime"
-    "norelatime"
-  ];
-  fileSystems."/nix".options = [
-    "noatime"
-    "norelatime"
-  ];
-  fileSystems."/persist".options = [
-    "noatime"
-    "norelatime"
-  ];
-  fileSystems."/state".options = [
-    "noatime"
-    "norelatime"
-  ];
-  fileSystems."/home".options = [
-    "noatime"
-    "norelatime"
-  ];
-}

nix/configuration/hosts/neelix/hardware-configuration.nix

@@ -1,36 +0,0 @@
-{
-  config,
-  lib,
-  modulesPath,
-  ...
-}:
-
-{
-  imports = [
-    (modulesPath + "/installer/scan/not-detected.nix")
-  ];
-
-  config = {
-    boot.initrd.availableKernelModules = [
-      "xhci_pci"
-      "nvme"
-      "usbhid"
-      "usb_storage"
-      "sd_mod"
-      "sdhci_pci"
-    ];
-    boot.initrd.kernelModules = [ ];
-    boot.kernelModules = [ ];
-    boot.extraModulePackages = [ ];
-
-    # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
-    # (the default) this is the recommended approach. When using systemd-networkd it's
-    # still possible to use this option, but it's recommended to use it in conjunction
-    # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
-    # networking.useDHCP = lib.mkDefault true;
-    # networking.interfaces.eno1.useDHCP = lib.mkDefault true;
-    # networking.interfaces.wlp58s0.useDHCP = lib.mkDefault true;
-
-    hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
-  };
-}

nix/configuration/hosts/neelix/power_management.nix

@@ -1,35 +0,0 @@
-{
-  pkgs,
-  ...
-}:
-
-{
-  imports = [ ];
-
-  config = {
-    environment.systemPackages = with pkgs; [
-      powertop
-    ];
-
-    # pcie_aspm=force pcie_aspm.policy=powersupersave :: Enable PCIe active state power management for power reduction.
-    # nowatchdog :: Disable watchdog for power savings (related to disable_sp5100_watchdog above).
-    boot.kernelParams = [
-      "pcie_aspm=force"
-      # "pcie_aspm.policy=powersupersave"
-      "nowatchdog"
-    ];
-
-    # default performance balance_performance balance_power power
-    # defaults to balance_performance
-    # systemd.tmpfiles.rules = [
-    #   "w- /sys/devices/system/cpu/cpufreq/policy0/energy_performance_preference - - - - power"
-    #   "w- /sys/devices/system/cpu/cpufreq/policy1/energy_performance_preference - - - - power"
-    #   "w- /sys/devices/system/cpu/cpufreq/policy2/energy_performance_preference - - - - power"
-    #   "w- /sys/devices/system/cpu/cpufreq/policy3/energy_performance_preference - - - - power"
-    # ];
-
-    boot.extraModprobeConfig = ''
-      options snd_hda_intel power_save=1
-    '';
-  };
-}

nix/configuration/hosts/odo/DEPLOY_BOOT

@@ -1,13 +0,0 @@
-#!/usr/bin/env bash
-#
-set -euo pipefail
-IFS=$'\n\t'
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-
-: "${JOBS:="1"}"
-
-TARGET=odo
-
-for f in /persist/manual/manual_add_to_store/*; do nix-store --add-fixed sha256 "$f"; done
-
-nixos-rebuild boot --flake "$DIR/../../#odo" --target-host "$TARGET" --build-host "$TARGET" --sudo --max-jobs "$JOBS" --repair --log-format internal-json -v "${@}" |& nom --json

nix/configuration/hosts/odo/DEPLOY_SWITCH

@@ -1,13 +0,0 @@
-#!/usr/bin/env bash
-#
-set -euo pipefail
-IFS=$'\n\t'
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-
-: "${JOBS:="1"}"
-
-TARGET=odo
-
-for f in /persist/manual/manual_add_to_store/*; do nix-store --add-fixed sha256 "$f"; done
-
-nixos-rebuild switch --flake "$DIR/../../#odo" --target-host "$TARGET" --build-host "$TARGET" --sudo --max-jobs "$JOBS" --repair --log-format internal-json -v "${@}" |& nom --json

nix/configuration/hosts/odo/ISO

@@ -1,10 +0,0 @@
-#!/usr/bin/env bash
-#
-set -euo pipefail
-IFS=$'\n\t'
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-
-: "${JOBS:="1"}"
-
-for f in /persist/manual/manual_add_to_store/*; do nix-store --add-fixed sha256 "$f"; done
-nix build --extra-experimental-features nix-command --extra-experimental-features flakes "$DIR/../..#odo.iso" --max-jobs "$JOBS" --repair --log-format internal-json -v "${@}" |& nom --json

nix/configuration/hosts/odo/SELF_BOOT

@@ -1,10 +0,0 @@
-#!/usr/bin/env bash
-#
-set -euo pipefail
-IFS=$'\n\t'
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-
-: "${JOBS:="1"}"
-
-for f in /persist/manual/manual_add_to_store/*; do nix-store --add-fixed sha256 "$f"; done
-nixos-rebuild boot --show-trace --sudo --max-jobs "$JOBS" --flake "$DIR/../../#odo" --repair --log-format internal-json -v "${@}" |& nom --json

nix/configuration/hosts/odo/SELF_BUILD

@@ -1,11 +0,0 @@
-#!/usr/bin/env bash
-#
-set -euo pipefail
-IFS=$'\n\t'
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-
-: "${JOBS:="1"}"
-
-for f in /persist/manual/manual_add_to_store/*; do nix-store --add-fixed sha256 "$f"; done
-
-nixos-rebuild build --show-trace --sudo --max-jobs "$JOBS" --flake "$DIR/../../#odo" --repair --log-format internal-json -v "${@}" |& nom --json

nix/configuration/hosts/odo/SELF_SWITCH

@@ -1,10 +0,0 @@
-#!/usr/bin/env bash
-#
-set -euo pipefail
-IFS=$'\n\t'
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-
-: "${JOBS:="1"}"
-
-for f in /persist/manual/manual_add_to_store/*; do nix-store --add-fixed sha256 "$f"; done
-nixos-rebuild switch --show-trace --sudo --max-jobs "$JOBS" --flake "$DIR/../../#odo" --repair --log-format internal-json -v "${@}" |& nom --json

nix/configuration/hosts/odo/default.nix

@@ -1,171 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-{
-  imports = [
-    ./hardware-configuration.nix
-    ./wrapped-disk-config.nix
-    ./distributed_build.nix
-    ./power_management.nix
-    ./screen_brightness.nix
-    ./wifi.nix
-    ./framework_module.nix
-  ];
-
-  config = {
-    # Generate with `head -c4 /dev/urandom | od -A none -t x4`
-    networking.hostId = "908cbf04";
-
-    networking.hostName = "odo"; # Define your hostname.
-
-    time.timeZone = "America/New_York";
-    i18n.defaultLocale = "en_US.UTF-8";
-
-    me.boot.enable = true;
-    me.boot.secure = false;
-    me.mountPersistence = true;
-
-    # Toggle to start writing the extlinux config which will be used by zfsbootmenu
-    boot.loader.generic-extlinux-compatible.enable = true;
-    boot.loader.systemd-boot.enable = lib.mkForce false;
-
-    me.rollback.dataset = [
-      "zroot/linux/nix/root@blank"
-      "zroot/linux/nix/home@blank"
-    ];
-
-    me.optimizations = {
-      enable = true;
-      arch = "znver4";
-      # build_arch = "x86-64-v3";
-      system_features = [
-        "gccarch-znver4"
-        "gccarch-skylake"
-        "gccarch-kabylake"
-        # "gccarch-alderlake" missing WAITPKG
-        "gccarch-x86-64-v3"
-        "gccarch-x86-64-v4"
-        "benchmark"
-        "big-parallel"
-        "kvm"
-        "nixos-test"
-      ];
-    };
-
-    # Early KMS
-    boot.initrd.kernelModules = [ "amdgpu" ];
-
-    # Mount tmpfs at /tmp
-    boot.tmp.useTmpfs = true;
-
-    environment.systemPackages = with pkgs; [
-      fw-ectool
-      framework-tool
-    ];
-
-    # Enable light sensor
-    # hardware.sensor.iio.enable = lib.mkDefault true;
-
-    # Enable TRIM
-    # services.fstrim.enable = lib.mkDefault true;
-
-    # Only run nix builders at idle priority for a more responsive system. Do not set on servers, just end-user devices.
-    nix.daemonCPUSchedPolicy = "idle";
-
-    me.alacritty.enable = true;
-    me.amd_s2idle.enable = true;
-    me.android.enable = true;
-    me.ansible.enable = true;
-    me.ares.enable = true;
-    me.base.enable = true;
-    me.bluetooth.enable = true;
-    me.build_in_ram.enable = true;
-    me.chromecast.enable = true;
-    me.chromium.enable = true;
-    me.d2.enable = true;
-    me.direnv.enable = true;
-    me.doas.enable = true;
-    me.docker.enable = false;
-    me.dont_use_substituters.enable = true;
-    me.ecc.enable = false;
-    me.emacs_flavor = "full";
-    me.emulate_isa.enable = true;
-    me.esim.enable = true;
-    me.firefox.enable = true;
-    me.firewall.enable = true;
-    me.flux.enable = true;
-    me.font.enable = true;
-    me.gcloud.enable = true;
-    me.git.config = ../../roles/git/files/gitconfig_home;
-    me.git.enable = true;
-    me.gnuplot.enable = true;
-    me.gpg.enable = true;
-    me.graphical = true;
-    me.graphics_card_type = "amd";
-    me.graphviz.enable = true;
-    me.iso_mount.enable = true;
-    me.jujutsu.config = ../../roles/jujutsu/files/jujutsu_config_home.toml;
-    me.jujutsu.enable = true;
-    me.kanshi.enable = false;
-    me.kernel.enable = true;
-    me.kubernetes.enable = true;
-    me.latex.enable = true;
-    me.launch_keyboard.enable = true;
-    me.lvfs.enable = true;
-    me.media.enable = true;
-    me.memtest.enable = true;
-    me.network.enable = true;
-    me.nix_index.enable = true;
-    me.nix_repl.enable = true;
-    me.nixdev.enable = true;
-    me.nvme.enable = true;
-    me.openpgp_card_tools.enable = true;
-    me.pcsx2.enable = true;
-    me.podman.enable = true;
-    me.postgresql_client.enable = true;
-    me.python.enable = true;
-    me.qemu.enable = true;
-    me.recovery.enable = true;
-    me.rpcs3.enable = true;
-    me.rust.enable = true;
-    me.sequoia.enable = true;
-    me.shadps4.enable = false;
-    me.shikane.enable = true;
-    me.sops.enable = true;
-    me.sound.enable = true;
-    me.spaghettikart.enable = true;
-    me.ssh.enable = true;
-    me.sshd.enable = true;
-    me.steam.enable = true;
-    me.steam_run_free.enable = true;
-    me.sway.enable = true;
-    me.tekton.enable = true;
-    me.terraform.enable = true;
-    me.thunderbolt.enable = true;
-    me.user.enable = true;
-    me.uutils.enable = false;
-    me.vnc_client.enable = true;
-    me.vscode.enable = true;
-    me.wasm.enable = true;
-    me.waybar.enable = true;
-    me.webcam.enable = true;
-    me.wine.enable = false;
-    me.wireguard.activated = [
-      "drmario"
-      "wgh"
-      "colo"
-    ];
-    me.wireguard.deactivated = [ "wgf" ];
-    me.yubikey.enable = true;
-    me.zfs.enable = true;
-    me.zrepl.enable = true;
-    me.zsh.enable = true;
-
-    me.sm64ex.enable = true;
-    me.shipwright.enable = false;
-    me.ship2harkinian.enable = true;
-  };
-}

nix/configuration/hosts/odo/disk-config.nix

@@ -1,155 +0,0 @@
-# Manual Step:
-#   Check if drive supports 4kn: nvme id-ns -H /dev/nvme0n1
-#   Format the drive to 4kn: nvme format --lbaf=1 /dev/nvme0n1
-
-{
-  disko.devices = {
-    disk = {
-      main = {
-        type = "disk";
-        device = "/dev/nvme0n1";
-        content = {
-          type = "gpt";
-          partitions = {
-            ESP = {
-              size = "1G";
-              type = "EF00";
-              content = {
-                type = "filesystem";
-                format = "vfat";
-                mountpoint = "/efi";
-                mountOptions = [
-                  "umask=0077"
-                  "noatime"
-                  "discard"
-                ];
-              };
-            };
-            zfs = {
-              size = "100%";
-              content = {
-                type = "zfs";
-                pool = "zroot";
-              };
-            };
-          };
-        };
-      };
-    };
-    zpool = {
-      zroot = {
-        type = "zpool";
-        # mode = "mirror";
-        # Workaround: cannot import 'zroot': I/O error in disko tests
-        options.cachefile = "none";
-        options = {
-          ashift = "12";
-          compatibility = "openzfs-2.2-freebsd";
-          autotrim = "on";
-        };
-        rootFsOptions = {
-          acltype = "posixacl";
-          atime = "off";
-          relatime = "off";
-          xattr = "sa";
-          mountpoint = "none";
-          compression = "lz4";
-          canmount = "off";
-          utf8only = "on";
-          dnodesize = "auto";
-          normalization = "formD";
-        };
-
-        datasets = {
-          "linux/nix" = {
-            type = "zfs_fs";
-            options.mountpoint = "none";
-            options = {
-              encryption = "aes-256-gcm";
-              keyformat = "passphrase";
-              # keylocation = "file:///tmp/secret.key";
-            };
-          };
-          "linux/nix/root" = {
-            type = "zfs_fs";
-            options.mountpoint = "legacy";
-            mountpoint = "/";
-            postCreateHook = "zfs list -t snapshot -H -o name | grep -E '^zroot/linux/nix/root@blank$' || zfs snapshot zroot/linux/nix/root@blank";
-          };
-          "linux/nix/boot" = {
-            type = "zfs_fs";
-            options = {
-              mountpoint = "legacy";
-              "org.zfsbootmenu:active" = "on";
-            };
-            mountpoint = "/boot";
-            postCreateHook = "zfs list -t snapshot -H -o name | grep -E '^zroot/linux/nix/boot@blank$' || zfs snapshot zroot/linux/nix/boot@blank";
-          };
-          "linux/nix/nix" = {
-            type = "zfs_fs";
-            options.mountpoint = "legacy";
-            mountpoint = "/nix";
-            postCreateHook = "zfs list -t snapshot -H -o name | grep -E '^zroot/linux/nix/nix@blank$' || zfs snapshot zroot/linux/nix/nix@blank";
-            options = {
-              recordsize = "16MiB";
-              compression = "zstd-19";
-            };
-          };
-          "linux/nix/home" = {
-            type = "zfs_fs";
-            options.mountpoint = "legacy";
-            mountpoint = "/home";
-            postCreateHook = "zfs list -t snapshot -H -o name | grep -E '^zroot/linux/nix/home@blank$' || zfs snapshot zroot/linux/nix/home@blank";
-          };
-          "linux/nix/persist" = {
-            type = "zfs_fs";
-            options.mountpoint = "legacy";
-            mountpoint = "/persist";
-            postCreateHook = "zfs list -t snapshot -H -o name | grep -E '^zroot/linux/nix/persist@blank$' || zfs snapshot zroot/linux/nix/persist@blank";
-          };
-          "linux/nix/state" = {
-            type = "zfs_fs";
-            options.mountpoint = "legacy";
-            mountpoint = "/state";
-            postCreateHook = "zfs list -t snapshot -H -o name | grep -E '^zroot/linux/nix/state@blank$' || zfs snapshot zroot/linux/nix/state@blank";
-          };
-        };
-      };
-    };
-  };
-
-  # Make sure all persistent volumes are marked as neededForBoot
-  #
-  # Also mounts /home so it is mounted before the user home directories are created.
-  fileSystems."/persist".neededForBoot = true;
-  fileSystems."/state".neededForBoot = true;
-  fileSystems."/home".neededForBoot = true;
-
-  fileSystems."/".options = [
-    "noatime"
-    "norelatime"
-  ];
-  fileSystems."/boot".options = [
-    "noatime"
-    "norelatime"
-  ];
-  fileSystems."/nix".options = [
-    "noatime"
-    "norelatime"
-  ];
-  fileSystems."/persist".options = [
-    "noatime"
-    "norelatime"
-  ];
-  fileSystems."/state".options = [
-    "noatime"
-    "norelatime"
-  ];
-  fileSystems."/home".options = [
-    "noatime"
-    "norelatime"
-  ];
-
-  # Only attempt to decrypt the main pool. Otherwise it attempts to decrypt pools that aren't even used.
-  boot.zfs.requestEncryptionCredentials = [ "zroot/linux/nix" ];
-}

nix/configuration/hosts/odo/distributed_build.nix

@@ -1,19 +0,0 @@
-{
-  imports = [ ];
-
-  config = {
-    me.distributed_build.enable = true;
-    me.distributed_build.machines.quark = {
-      enable = false;
-      additional_config = {
-        speedFactor = 2;
-      };
-    };
-    me.distributed_build.machines.hydra = {
-      enable = true;
-      additional_config = {
-        speedFactor = 2;
-      };
-    };
-  };
-}

nix/configuration/hosts/odo/framework_module.nix

@@ -1,19 +0,0 @@
-{
-  config,
-  ...
-}:
-
-{
-  imports = [ ];
-
-  config = {
-    boot.extraModulePackages = with config.boot.kernelPackages; [
-      framework-laptop-kmod
-    ];
-    # https://github.com/DHowett/framework-laptop-kmod?tab=readme-ov-file#usage
-    boot.kernelModules = [
-      "cros_ec"
-      "cros_ec_lpcs"
-    ];
-  };
-}

nix/configuration/hosts/odo/hardware-configuration.nix

@@ -1,33 +0,0 @@
-{
-  config,
-  lib,
-  modulesPath,
-  ...
-}:
-
-{
-  imports = [
-    (modulesPath + "/installer/scan/not-detected.nix")
-  ];
-
-  config = {
-    boot.initrd.availableKernelModules = [
-      "nvme"
-      "xhci_pci"
-      "thunderbolt"
-    ];
-    boot.initrd.kernelModules = [ ];
-    boot.kernelModules = [ ];
-    boot.extraModulePackages = [ ];
-
-    # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
-    # (the default) this is the recommended approach. When using systemd-networkd it's
-    # still possible to use this option, but it's recommended to use it in conjunction
-    # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
-    # networking.useDHCP = lib.mkDefault true;
-    # networking.interfaces.eno1.useDHCP = lib.mkDefault true;
-    # networking.interfaces.wlp58s0.useDHCP = lib.mkDefault true;
-
-    hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
-  };
-}

nix/configuration/hosts/odo/power_management.nix

@@ -1,75 +0,0 @@
-{
-  pkgs,
-  ...
-}:
-
-{
-  imports = [ ];
-
-  config = {
-    environment.systemPackages = with pkgs; [
-      powertop
-    ];
-
-    # amdgpu.abmlevel=3 :: Automatically reduce screen brightness but tweak colors to compensate for power reduction.
-    # pcie_aspm=force pcie_aspm.policy=powersupersave :: Enable PCIe active state power management for power reduction.
-    # nowatchdog :: Disable watchdog for power savings (related to disable_sp5100_watchdog above).
-    # amd_pstate=passive :: Fully automated hardware pstate control.
-    # amd_pstate=active :: Same as passive except we can set the energy performance preference (EPP) to suggest how much we prefer performance or energy efficiency.
-    # amd_pstate=guided :: Same as passive except we can set upper and lower frequency bounds.
-    # amdgpu.dcdebugmask=0x10 :: Allegedly disables Panel Replay from https://community.frame.work/t/tracking-freezing-arch-linux-amd/39495/32
-    boot.kernelParams = [
-      "amdgpu.abmlevel=2"
-      "pcie_aspm=force"
-      # "pcie_aspm.policy=powersupersave"
-      "nowatchdog"
-      # I don't see a measurable benefit from these two:
-      # "cpufreq.default_governor=powersave"
-      # "initcall_blacklist=cpufreq_gov_userspace_init"
-    ];
-
-    systemd.tmpfiles.rules = [
-      "w- /sys/firmware/acpi/platform_profile - - - - low-power"
-      "w- /sys/devices/system/cpu/cpufreq/policy0/energy_performance_preference - - - - power"
-      "w- /sys/devices/system/cpu/cpufreq/policy1/energy_performance_preference - - - - power"
-      "w- /sys/devices/system/cpu/cpufreq/policy2/energy_performance_preference - - - - power"
-      "w- /sys/devices/system/cpu/cpufreq/policy3/energy_performance_preference - - - - power"
-      "w- /sys/devices/system/cpu/cpufreq/policy4/energy_performance_preference - - - - power"
-      "w- /sys/devices/system/cpu/cpufreq/policy5/energy_performance_preference - - - - power"
-      "w- /sys/devices/system/cpu/cpufreq/policy6/energy_performance_preference - - - - power"
-      "w- /sys/devices/system/cpu/cpufreq/policy7/energy_performance_preference - - - - power"
-      "w- /sys/devices/system/cpu/cpufreq/policy8/energy_performance_preference - - - - power"
-      "w- /sys/devices/system/cpu/cpufreq/policy9/energy_performance_preference - - - - power"
-      "w- /sys/devices/system/cpu/cpufreq/policy10/energy_performance_preference - - - - power"
-      "w- /sys/devices/system/cpu/cpufreq/policy11/energy_performance_preference - - - - power"
-      "w- /sys/devices/system/cpu/cpufreq/policy12/energy_performance_preference - - - - power"
-      "w- /sys/devices/system/cpu/cpufreq/policy13/energy_performance_preference - - - - power"
-      "w- /sys/devices/system/cpu/cpufreq/policy14/energy_performance_preference - - - - power"
-      "w- /sys/devices/system/cpu/cpufreq/policy15/energy_performance_preference - - - - power"
-      "w- /sys/devices/system/cpu/cpu0/cpufreq/boost - - - - 0"
-      "w- /sys/devices/system/cpu/cpu1/cpufreq/boost - - - - 0"
-      "w- /sys/devices/system/cpu/cpu2/cpufreq/boost - - - - 0"
-      "w- /sys/devices/system/cpu/cpu3/cpufreq/boost - - - - 0"
-      "w- /sys/devices/system/cpu/cpu4/cpufreq/boost - - - - 0"
-      "w- /sys/devices/system/cpu/cpu5/cpufreq/boost - - - - 0"
-      "w- /sys/devices/system/cpu/cpu6/cpufreq/boost - - - - 0"
-      "w- /sys/devices/system/cpu/cpu7/cpufreq/boost - - - - 0"
-      "w- /sys/devices/system/cpu/cpu8/cpufreq/boost - - - - 0"
-      "w- /sys/devices/system/cpu/cpu9/cpufreq/boost - - - - 0"
-      "w- /sys/devices/system/cpu/cpu10/cpufreq/boost - - - - 0"
-      "w- /sys/devices/system/cpu/cpu11/cpufreq/boost - - - - 0"
-      "w- /sys/devices/system/cpu/cpu12/cpufreq/boost - - - - 0"
-      "w- /sys/devices/system/cpu/cpu13/cpufreq/boost - - - - 0"
-      "w- /sys/devices/system/cpu/cpu14/cpufreq/boost - - - - 0"
-      "w- /sys/devices/system/cpu/cpu15/cpufreq/boost - - - - 0"
-    ];
-
-    boot.extraModprobeConfig = ''
-      # Disable the hardware watchdog inside AMD 700 chipset series for power savings.
-      blacklist sp5100_tco
-
-      # Sound power-saving was causing chat notifications to be inaudible.
-      # options snd_hda_intel power_save=1
-    '';
-  };
-}

nix/configuration/hosts/odo/screen_brightness.nix

@@ -1,9 +0,0 @@
-{
-  imports = [ ];
-
-  config = {
-    systemd.tmpfiles.rules = [
-      "w- /sys/class/backlight/amdgpu_bl1/brightness - - - - 32767"
-    ];
-  };
-}

nix/configuration/hosts/odo/wifi.nix

@@ -1,10 +0,0 @@
-{
-  imports = [ ];
-
-  config = {
-    # Enable debug logging for ath12k wifi card.
-    boot.kernelParams = [
-      "ath12k.debug_mask=0xffffffff"
-    ];
-  };
-}

nix/configuration/hosts/odo/wrapped-disk-config.nix

@@ -1,7 +0,0 @@
-{
-  config,
-  lib,
-  ...
-}:
-
-lib.mkIf (!config.me.buildingPortable) (import ./disk-config.nix)

nix/configuration/hosts/odowork/DEPLOY_BOOT

@@ -1,11 +0,0 @@
-#!/usr/bin/env bash
-#
-set -euo pipefail
-IFS=$'\n\t'
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-
-: "${JOBS:="1"}"
-
-TARGET=odowork
-
-nixos-rebuild boot --flake "$DIR/../../#odowork" --target-host "$TARGET" --build-host "$TARGET" --sudo --max-jobs "$JOBS" --repair --log-format internal-json -v "${@}" |& nom --json

nix/configuration/hosts/odowork/DEPLOY_SWITCH

@@ -1,11 +0,0 @@
-#!/usr/bin/env bash
-#
-set -euo pipefail
-IFS=$'\n\t'
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-
-: "${JOBS:="1"}"
-
-TARGET=odowork
-
-nixos-rebuild switch --flake "$DIR/../../#odowork" --target-host "$TARGET" --build-host "$TARGET" --sudo --max-jobs "$JOBS" --repair --log-format internal-json -v "${@}" |& nom --json

nix/configuration/hosts/odowork/INSTALLER

@@ -1,9 +0,0 @@
-#!/usr/bin/env bash
-#
-set -euo pipefail
-IFS=$'\n\t'
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-
-: "${JOBS:="1"}"
-
-nix build --extra-experimental-features nix-command --extra-experimental-features flakes "$DIR/../..#odowork.installer" --repair --max-jobs "$JOBS" --log-format internal-json -v "${@}" |& nom --json

nix/configuration/hosts/odowork/ISO

@@ -1,9 +0,0 @@
-#!/usr/bin/env bash
-#
-set -euo pipefail
-IFS=$'\n\t'
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-
-: "${JOBS:="1"}"
-
-nix build --extra-experimental-features nix-command --extra-experimental-features flakes "$DIR/../..#odowork.iso" --max-jobs "$JOBS" --repair --log-format internal-json -v "${@}" |& nom --json

nix/configuration/hosts/odowork/SELF_BOOT

@@ -1,9 +0,0 @@
-#!/usr/bin/env bash
-#
-set -euo pipefail
-IFS=$'\n\t'
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-
-: "${JOBS:="1"}"
-
-nixos-rebuild boot --show-trace --sudo --max-jobs "$JOBS" --flake "$DIR/../../#odowork" --repair --log-format internal-json -v "${@}" |& nom --json