zsh: enable zmb builtin

this is in contrast to e.g. mx-discord-puppet, which i'll be trying soon

.sops.yaml

@@ -0,0 +1,33 @@
+keys:
+  - &user_desko_colin age1tnl4jfgacwkargzeqnhzernw29xx8mkv73xh6ufdyde6q7859slsnzf24x
+  - &user_lappy_colin age1j2pqnl8j0krdzk6npe93s4nnqrzwx978qrc0u570gzlamqpnje9sc8le2g
+  - &user_servo_colin age1z8fauff34cdecr6sjkre260luzxcca05kpcwvhx988d306tpcejsp63znu
+  - &user_moby_colin age1zsrsvd7j6l62fjxpfd2qnhqlk8wk4p8r0dtxpe4sdgnh2474095qdu7xj9
+  - &host_desko age1vnw7lnfpdpjn62l3u5nyv5xt2c965k96p98kc43mcnyzpetrts9q54mc9v
+  - &host_lappy age1w7mectcjku6x3sd8plm8wkn2qfrhv9n6zhzlf329e2r2uycgke8qkf9dyn
+  - &host_servo age1tzlyex2z6t88tg9h82943e39shxhmqeyr7ywhlwpdjmyqsndv3qq27x0rf
+  - &host_moby age18vq5ktwgeaysucvw9t67drqmg5zd5c5k3le34yqxckkfj7wqdqgsd4ejmt
+creation_rules:
+  - path_regex: secrets/universal*
+    key_groups:
+    - age:
+      - *user_desko_colin
+      - *user_lappy_colin
+      - *user_servo_colin
+      - *user_moby_colin
+      - *host_desko
+      - *host_lappy
+      - *host_servo
+      - *host_moby
+  - path_regex: secrets/servo*
+    key_groups:
+    - age:
+      - *user_desko_colin
+      - *user_servo_colin
+      - *host_servo
+  - path_regex: secrets/desko.yaml$
+    key_groups:
+    - age:
+      - *user_desko_colin
+      - *user_lappy_colin
+      - *host_desko

TODO.md

@@ -1,21 +1,16 @@
 # features/tweaks
-- enable sshfs (deskto/lappy)
-- set firefox default search engine
-- iron out video drivers
-
-# cleanup
-- remove helpers from outputs section (use `let .. in`)
+- emoji picker application
+- find a Masto/Pleroma app which works on mobile
+- remove hardcoded uid/gids outside of allocations.nix (used in impermanence code -- replace with username/groupname)
 
 
 # speed up cross compiling
-   https://nixos.wiki/wiki/Cross_Compiling
-   https://nixos.wiki/wiki/NixOS_on_ARM
+- <https://nixos.wiki/wiki/Cross_Compiling>
+- <https://nixos.wiki/wiki/NixOS_on_ARM>
+```nix
    overlays = [{ ... }: {
      nixpkgs.crossSystem.system = "aarch64-linux";
    }];
-
-# better secrets management? read:
-- decrypted at activation time: https://github.com/Mic92/sops-nix
-less promising:
-- https://christine.website/blog/nixos-encrypted-secrets-2021-01-20
-- git-crypt (https://github.com/bobbbay/dotfiles.git)
+```
+- <https://github.com/nix-community/aarch64-build-box>
+	- apply for access to the community arm build box

configuration.nix

@@ -1,25 +0,0 @@
-# Edit this configuration file to define what should be installed on
-# your system.  Help is available in the configuration.nix(5) man page
-# and in the NixOS manual (accessible by running ‘nixos-help’).
-
-# USEFUL COMMANDS:
-#   nix show-config
-#   nix eval --raw <expr>  => print an expression. e.g. nixpkgs.raspberrypifw prints store path to the package
-#   nix-option   ##  query options -- including their SET VALUE; similar to search: https://search.nixos.org/options
-#   nixos-rebuild switch --upgrade   ## pull changes from the nixos channel (e.g. security updates) and rebuild
-
-{ config, pkgs, ... }:
-
-{
-
-  # enable flake support.
-  # the real config root lives in flake.nix
-  nix = {
-    #package = pkgs.nixFlakes;
-    package = pkgs.nixUnstable;
-    extraOptions = ''
-      experimental-features = nix-command flakes
-    '';
-  };
-}
-

flake.lock

@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1654113405,
-        "narHash": "sha256-VpK+0QaWG2JRgB00lw77N9TjkE3ec0iMYIX1TzGpxa4=",
+        "lastModified": 1656169755,
+        "narHash": "sha256-Nlnm4jeQWEGjYrE6hxi/7HYHjBSZ/E0RtjCYifnNsWk=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "ac2287df5a2d6f0a44bbcbd11701dbbf6ec43675",
+        "rev": "4a3d01fb53f52ac83194081272795aa4612c2381",
         "type": "github"
       },
       "original": {
@@ -21,14 +21,29 @@
         "type": "github"
       }
     },
+    "impermanence": {
+      "locked": {
+        "lastModified": 1661933071,
+        "narHash": "sha256-RFgfzldpbCvS+H2qwH+EvNejvqs+NhPVD5j1I7HQQPY=",
+        "owner": "nix-community",
+        "repo": "impermanence",
+        "rev": "def994adbdfc28974e87b0e4c949e776207d5557",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "impermanence",
+        "type": "github"
+      }
+    },
     "mobile-nixos": {
       "flake": false,
       "locked": {
-        "lastModified": 1654281294,
-        "narHash": "sha256-hT2/u0jUOD4TFU6YyYt+5Gt+hjIeerLTyZG7ru79aDU=",
+        "lastModified": 1664852186,
+        "narHash": "sha256-t0FhmTf3qRs8ScR8H9Rq7FAxptNELLSpxZG2ALL1HnE=",
         "owner": "nixos",
         "repo": "mobile-nixos",
-        "rev": "d798b0b34240b18a08c22f5c0ee1f59a3ce43c01",
+        "rev": "ca872f1a617674c4045e880aab8a45037e73700b",
         "type": "github"
       },
       "original": {
@@ -39,11 +54,42 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1654275867,
-        "narHash": "sha256-pt14ZE4jVPGvfB2NynGsl34pgXfOqum5YJNpDK4+b9E=",
+        "lastModified": 1665081174,
+        "narHash": "sha256-6hsmzdhdy8Kbvl5e0xZNE83pW3fKQvNiobJkM6KQrgA=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "7a20c208aacf4964c19186dcad51f89165dc7ed0",
+        "rev": "598f83ebeb2235435189cf84d844b8b73e858e0f",
+        "type": "github"
+      },
+      "original": {
+        "id": "nixpkgs",
+        "ref": "nixos-unstable",
+        "type": "indirect"
+      }
+    },
+    "nixpkgs-22_05": {
+      "locked": {
+        "lastModified": 1664201777,
+        "narHash": "sha256-cUW9DqELUNi1jNMwVSbfq4yl5YGyOfeu+UHUUImbby0=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "00f877f4927b6f7d7b75731b5a1e2ae7324eaf14",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "release-22.05",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs-stable": {
+      "locked": {
+        "lastModified": 1665132027,
+        "narHash": "sha256-zoHPqSQSENt96zTk6Mt1AP+dMNqQDshXKQ4I6MfjP80=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "9ecc270f02b09b2f6a76b98488554dd842797357",
         "type": "github"
       },
       "original": {
@@ -52,27 +98,49 @@
         "type": "indirect"
       }
     },
-    "nurpkgs": {
+    "nixpkgs_2": {
       "locked": {
-        "lastModified": 1654367137,
-        "narHash": "sha256-xufB/+qvk/7rh7qrwZbzru1kTu8nsmNWBNQkYbdS84Q=",
-        "owner": "nix-community",
-        "repo": "NUR",
-        "rev": "86ff2d098bce1d623232f4886027a1d61317b195",
+        "lastModified": 1664177230,
+        "narHash": "sha256-eyo88ffm16I0K9cdcePbOsQg4MDjf1EgIdkGTLB/7iA=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "ff9793cfd1a25145a7e591af604675b3d6f68987",
         "type": "github"
       },
       "original": {
-        "owner": "nix-community",
-        "repo": "NUR",
+        "owner": "NixOS",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
         "type": "github"
       }
     },
     "root": {
       "inputs": {
         "home-manager": "home-manager",
+        "impermanence": "impermanence",
         "mobile-nixos": "mobile-nixos",
         "nixpkgs": "nixpkgs",
-        "nurpkgs": "nurpkgs"
+        "nixpkgs-stable": "nixpkgs-stable",
+        "sops-nix": "sops-nix"
+      }
+    },
+    "sops-nix": {
+      "inputs": {
+        "nixpkgs": "nixpkgs_2",
+        "nixpkgs-22_05": "nixpkgs-22_05"
+      },
+      "locked": {
+        "lastModified": 1664204020,
+        "narHash": "sha256-LAey3hr8b9EAt3n304Wt9Vm4uQFd8pSRtLX8leuYFDs=",
+        "owner": "Mic92",
+        "repo": "sops-nix",
+        "rev": "912f9ff41fd9353dec1f783170793699789fe9aa",
+        "type": "github"
+      },
+      "original": {
+        "owner": "Mic92",
+        "repo": "sops-nix",
+        "type": "github"
       }
     }
   },

flake.nix

@@ -1,11 +1,11 @@
 # docs:
-#   https://nixos.wiki/wiki/Flakes
-#   https://serokell.io/blog/practical-nix-flakes
+# - <https://nixos.wiki/wiki/Flakes>
+# - <https://serokell.io/blog/practical-nix-flakes>
 
 {
   inputs = {
-    nixpkgs.url = "nixpkgs/nixos-22.05";
-    # pkgs-telegram.url = "nixpkgs/33775ec9a2173a08e46edf9f46c9febadbf743e8";# 2022/04/18; telegram 3.7.3. fails: nix log /nix/store/y5kv47hnv55qknb6cnmpcyraicay79fx-telegram-desktop-3.7.3.drv: g++: fatal error: cannot execute '/nix/store/njk5sbd21305bhr7gwibxbbvgbx5lxvn-gcc-9.3.0/libexec/gcc/aarch64-unknown-linux-gnu/9.3.0/cc1plus': execv: No such file or directory
+    nixpkgs-stable.url = "nixpkgs/nixos-22.05";
+    nixpkgs.url = "nixpkgs/nixos-unstable";
     mobile-nixos = {
       url = "github:nixos/mobile-nixos";
       flake = false;
@@ -14,103 +14,88 @@
       url = "github:nix-community/home-manager/release-22.05";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    nurpkgs.url = "github:nix-community/NUR";
+    # TODO: set these up to follow our nixpkgs?
+    sops-nix.url = "github:Mic92/sops-nix";
+    impermanence.url = "github:nix-community/impermanence";
   };
 
-  outputs = { self, nixpkgs, mobile-nixos, home-manager, nurpkgs }: {
-    machines.uninsane = self.decl-bootable-machine { name = "uninsane"; system = "aarch64-linux"; };
-    machines.desko = self.decl-bootable-machine { name = "desko"; system = "x86_64-linux"; };
-    machines.lappy = self.decl-bootable-machine { name = "lappy"; system = "x86_64-linux"; };
-
-    machines.moby =
-      let machine = self.decl-machine {
-        name = "moby";
-        system = "aarch64-linux";
-        extraModules = [
-          (import "${mobile-nixos}/lib/configuration.nix" {
-            device = "pine64-pinephone";
-          })
-        ];
-      };
-      in {
-        nixosConfiguration = machine;
-        img = machine.config.mobile.outputs.u-boot.disk-image;
-      };
-
-    nixosConfigurations = builtins.mapAttrs (name: value: value.nixosConfiguration) self.machines;
-    imgs = builtins.mapAttrs (name: value: value.img) self.machines;
-
-    decl-machine = { name, system, extraModules ? [], basePkgs ? nixpkgs }: let
-      patchedPkgs = basePkgs.legacyPackages.${system}.applyPatches {
-        name = "nixpkgs-patched-uninsane";
-        src = basePkgs;
-        patches = [
-          # for mobile: allow phoc to scale to non-integer values
-          ./nixpatches/01-phosh-float-scale.patch
-          # for raspberry pi: allow building u-boot for rpi 4{,00}
-          ./nixpatches/02-rpi4-uboot.patch
-          ./nixpatches/03-whalebird-4.6.0.patch
-          ./nixpatches/04-dart-2.7.0.patch
-        ];
-      };
-      nixosSystem = import (patchedPkgs + "/nixos/lib/eval-config.nix");
-      in (nixosSystem {
-        inherit system;
-        specialArgs = { inherit home-manager; inherit nurpkgs; secrets = import ./secrets/default.nix; };
-        modules = [
-          ./configuration.nix
-          ./machines/${name}
-          (import ./helpers/set-hostname.nix name)
-          (self.overlaysModule system)
-        ] ++ extraModules;
+  outputs = { self, nixpkgs, nixpkgs-stable, mobile-nixos, home-manager, sops-nix, impermanence }:
+  let
+    patchedPkgs = system: nixpkgs.legacyPackages.${system}.applyPatches {
+      name = "nixpkgs-patched-uninsane";
+      src = nixpkgs;
+      patches = import ./nixpatches/list.nix nixpkgs.legacyPackages.${system}.fetchpatch;
+    };
+    # return something which behaves like `pkgs`, for the provided system
+    # `local` = architecture of builder. `target` = architecture of the system beying deployed to
+    nixpkgsFor = local: target: import (patchedPkgs target) { crossSystem = target; localSystem = local; };
+    # evaluate ONLY our overlay, for the provided system
+    customPackagesFor = local: target: import ./pkgs/overlay.nix (nixpkgsFor local target) (nixpkgsFor local target);
+    decl-machine = { name, local, target }:
+    let
+      nixosSystem = import ((patchedPkgs target) + "/nixos/lib/eval-config.nix");
+    in (nixosSystem {
+      # by default the local system is the same as the target, employing emulation when they differ
+      system = target;
+      specialArgs = { inherit mobile-nixos home-manager impermanence; };
+      modules = [
+        ./modules
+        ./machines/${name}
+        (import ./helpers/set-hostname.nix name)
+        home-manager.nixosModule
+        impermanence.nixosModule
+        sops-nix.nixosModules.sops
+        {
+          nixpkgs.config.allowUnfree = true;
+          nixpkgs.overlays = [
+            (import "${mobile-nixos}/overlay/overlay.nix")
+            (import ./pkgs/overlay.nix)
+            (next: prev: rec {
+              # non-emulated packages build *from* local *for* target.
+              # for large packages like the linux kernel which are expensive to build under emulation,
+              # the config can explicitly pull such packages from `pkgs.cross` to do more efficient cross-compilation.
+              cross = (nixpkgsFor local target) // (customPackagesFor local target);
+              stable = import nixpkgs-stable { system = target; };
+              # pinned packages:
+              electrum = stable.electrum;
+            })
+          ];
+        }
+      ];
     });
 
-    # this produces a EFI-bootable .img file (GPT with / and /boot).
-    # after building this, steps are:
-    #   run `btrfs-convert --uuid copy <device>`
-    #   boot, checkout this flake into /etc/nixos AND UPDATE THE UUIDS IT REFERENCES.
-    #   then `nixos-rebuild ...`
-    decl-img = { name, system, extraModules ? [] }: (
-      (self.decl-machine { inherit name; inherit system; extraModules = extraModules ++ [./image.nix]; })
-        .config.system.build.raw
-    );
-
-    decl-bootable-machine = { name, system }: {
-      nixosConfiguration = self.decl-machine { inherit name; inherit system; };
-      img = self.decl-img { inherit name; inherit system; };
-    };
-
-    overlaysModule = system: { config, pkgs, ...}: {
-      nixpkgs.config.allowUnfree = true;
-
-      nixpkgs.overlays = [
-        #mobile-nixos.overlay
-        nurpkgs.overlay
-        (next: prev: {
-          #### customized packages
-          # nixos-unstable pleroma is too far out-of-date for our db
-          pleroma = prev.callPackage ./pkgs/pleroma { };
-          # jackett doesn't allow customization of the bind address: this will probably always be here.
-          jackett = next.callPackage ./pkgs/jackett { pkgs = prev; };
-          # fix abrupt HDD poweroffs as during reboot. patching systemd requires rebuilding nearly every package.
-          # systemd = import ./pkgs/systemd { pkgs = prev; };
-
-          # patch rpi uboot with something that fixes USB HDD boot
-          ubootRaspberryPi4_64bit = next.callPackage ./pkgs/ubootRaspberryPi4_64bit { pkgs = prev; };
-
-          #### TEMPORARY NIXOS-UNSTABLE PACKAGES
-
-          # stable telegram doesn't build, so explicitly use the stable one.
-          # TODO: apply this specifically to the moby build?
-          # tdesktop = pkgs-telegram.legacyPackages.${system}.tdesktop;
-          tdesktop = nixpkgs.legacyPackages.${system}.tdesktop;
-
-          #### TEMPORARY: PACKAGES WAITING TO BE UPSTREAMED
-          whalebird = prev.callPackage ./pkgs/whalebird { };
-          kaiteki = prev.callPackage ./pkgs/kaiteki { };
-        })
-      ];
+    decl-bootable-machine = { name, local, target }: rec {
+      nixosConfiguration = decl-machine { inherit name local target; };
+      # this produces a EFI-bootable .img file (GPT with a /boot partition and a system (/ or /nix) partition).
+      # after building this:
+      #   - flash it to a bootable medium (SD card, flash drive, HDD)
+      #   - resize the root partition (use cfdisk)
+      #   - mount the part
+      #      - chown root:nixbld <part>/nix/store
+      #      - chown root:root -R <part>/nix/store/*
+      #      - chown root:root -R <part>/persist  # if using impermanence
+      #      - populate any important things (persist/, home/colin/.ssh, etc)
+      #   - boot
+      #   - if fs wasn't resized automatically, then `sudo btrfs filesystem resize max /`
+      #   - checkout this flake into /etc/nixos AND UPDATE THE FS UUIDS.
+      #   - `nixos-rebuild --flake './#<machine>' switch`
+      img = nixosConfiguration.config.system.build.img;
     };
+    machines.servo = decl-bootable-machine { name = "servo"; local = "aarch64-linux"; target = "aarch64-linux"; };
+    machines.desko = decl-bootable-machine { name = "desko"; local = "x86_64-linux"; target = "x86_64-linux"; };
+    machines.lappy = decl-bootable-machine { name = "lappy"; local = "x86_64-linux"; target = "x86_64-linux"; };
+    machines.moby = decl-bootable-machine { name = "moby"; local = "aarch64-linux"; target = "aarch64-linux"; };
+    # special cross-compiled variant, to speed up deploys from an x86 box to the arm target
+    # note that these *do* produce different store paths, because the closure for the tools used to cross compile
+    # v.s. emulate differ.
+    # so deploying moby-cross and then moby incurs some rebuilding.
+    machines.moby-cross = decl-bootable-machine { name = "moby"; local = "x86_64-linux"; target = "aarch64-linux"; };
+    machines.rescue = decl-bootable-machine { name = "rescue"; local = "x86_64-linux"; target = "x86_64-linux"; };
+  in {
+    nixosConfigurations = builtins.mapAttrs (name: value: value.nixosConfiguration) machines;
+    imgs = builtins.mapAttrs (name: value: value.img) machines;
+    packages.x86_64-linux = customPackagesFor "x86_64-linux" "x86_64-linux";
+    packages.aarch64-linux = customPackagesFor "aarch64-linux" "aarch64-linux";
   };
 }
 

helpers/gui/gnome.nix

@@ -1,13 +0,0 @@
-{ config, pkgs, lib, ... }:
-
-{
-  # start gnome/gdm on boot
-  services.xserver.enable = true;
-  services.xserver.desktopManager.gnome.enable = true;
-  services.xserver.displayManager.gdm.enable = true;
-
-  # gnome does networking stuff with networkmanager
-  networking.useDHCP = false;
-  networking.networkmanager.enable = true;
-  networking.wireless.enable = lib.mkForce false;
-}

helpers/gui/i3.nix

@@ -1,16 +0,0 @@
-{ pkgs, ... }:
-{
-  environment.pathsToLink = [ "/libexec" ];  # patch for i3blocks to work
-  services.xserver.enable = true;
-  services.xserver.displayManager.defaultSession = "none+i3";
-  services.xserver.windowManager.i3 = {
-    enable = true;
-    extraPackages = with pkgs; [
-      dmenu
-      i3status
-      i3lock
-      i3blocks
-    ];
-  };
-}
-

helpers/gui/phosh.nix

@@ -1,21 +0,0 @@
-{ ... }:
-{
-  # docs: https://github.com/NixOS/nixpkgs/blob/nixos-22.05/nixos/modules/services/x11/desktop-managers/phosh.nix
-  services.xserver.desktopManager.phosh = {
-    enable = true;
-    user = "colin";
-    group = "users";
-    phocConfig = {
-      xwayland = "true";
-      # find default outputs by catting /etc/phosh/phoc.ini
-      outputs.DSI-1 = {
-        scale = 1.5;
-      };
-    };
-  };
-
-  environment.variables = {
-    # Qt apps won't always start unless this env var is set
-    QT_QPA_PLATFORM = "wayland";
-  };
-}

helpers/gui/plasma-mobile.nix

@@ -1,14 +0,0 @@
-{ config, pkgs, lib, ... }:
- 
-{
-  # start plasma-mobile on boot
-  services.xserver.enable = true;
-  services.xserver.desktopManager.plasma5.mobile.enable = true;
-  services.xserver.desktopManager.plasma5.mobile.installRecommendedSoftware = false;  # not all plasma5-mobile packages build for aarch64
-  services.xserver.displayManager.sddm.enable = true;
- 
-  # Plasma does networking stuff with networkmanager, but nix configures the defaults itself
-  # networking.useDHCP = false;
-  # networking.networkmanager.enable = true;
-  # networking.wireless.enable = lib.mkForce false;
-}

helpers/gui/sway.nix

@@ -1,31 +0,0 @@
-{ pkgs, ... }:
- 
-# docs: https://nixos.wiki/wiki/Sway
-{
-  programs.sway = {
-    # we configure sway with home-manager, but this enable gets us e.g. opengl and fonts
-    enable = true;
-  };
-
-  # TODO: should be able to use SDDM to get interactive login
-  services.greetd = {
-    enable = true;
-    settings = rec {
-      initial_session = {
-        command = "${pkgs.sway}/bin/sway";
-        user = "colin";
-      };
-      default_session = initial_session;
-    };
-  };
-
-  # unlike other DEs, sway configures no audio stack
-  # administer with pw-cli, pw-mon, pw-top commands
-  services.pipewire = {
-    enable = true;
-    alsa.enable = true;
-    alsa.support32Bit = true;  # ??
-    pulse.enable = true;
-  };
-}
-

helpers/hardware-x86_64.nix

@@ -1,65 +0,0 @@
-{ config, pkgs, lib, ... }:
-
-{
-  boot.initrd.availableKernelModules = [
-    "xhci_pci" "ahci" "sd_mod" "sdhci_pci"  # nixos-generate-config defaults
-    "usb_storage"   # rpi needed this to boot from usb storage, i think.
-    # "usbhid" "hid-generic"  # hopefully these will fix USB HID auto-sleep ?
-  ];
-  boot.initrd.kernelModules = [ ];
-  boot.initrd.supportedFilesystems = [ "ext4" "btrfs" "ext2" "ext3" "vfat" ];
-  # find more of these with sensors-detect
-  boot.kernelModules = [
-    "coretemp"
-    "kvm-intel"
-    "kvm-amd"  # desktop
-    "amdgpu"   # desktop
-  ];
-  boot.extraModulePackages = [ ];
-  boot.kernelParams = [ "boot.shell_on_fail" ];
-  boot.consoleLogLevel = 7;
-
-  # Use the systemd-boot EFI boot loader.
-  boot.loader.systemd-boot.enable = true;
-  boot.loader.systemd-boot.configurationLimit = 40;  # keep this many generations
-  boot.loader.efi.canTouchEfiVariables = true;
-
-  # enable cross compilation
-  boot.binfmt.emulatedSystems = [ "aarch64-linux" ];
-  # nixpkgs.crossSystem.system = "aarch64-linux";
-
-  powerManagement.cpuFreqGovernor = "powersave";
-  hardware.enableRedistributableFirmware = true;
-  hardware.cpu.amd.updateMicrocode = true;    # desktop
-  hardware.cpu.intel.updateMicrocode = true;  # laptop
-  services.fwupd.enable = true;
-  # powertop will default to putting USB devices -- including HID -- to sleep after TWO SECONDS
-  powerManagement.powertop.enable = false;
-
-  hardware.opengl.extraPackages = [
-    # laptop
-    pkgs.intel-compute-runtime
-    pkgs.intel-media-driver  # new
-    pkgs.libvdpau-va-gl      # new
-    pkgs.vaapiIntel
-    # desktop
-    pkgs.rocm-opencl-icd
-    pkgs.rocm-opencl-runtime
-  ];
-  hardware.opengl.driSupport = true;
-  # For 32 bit applications
-  hardware.opengl.driSupport32Bit = true;
-
-  # TODO colin: does this *do* anything?
-  swapDevices = [ ];
-
-  # services.snapper.configs = {
-  #   root = {
-  #     subvolume = "/";
-  #     extraConfig = {
-  #       ALLOW_USERS = "colin";
-  #     };
-  #   };
-  # };
-  # services.snapper.snapshotInterval = "daily";
-}

helpers/home-manager-gen-colin.nix

@@ -1,532 +0,0 @@
-# docs:
-#   https://rycee.gitlab.io/home-manager/
-#   https://rycee.gitlab.io/home-manager/options.html
-#   man home-configuration.nix
-#
-
-# system is e.g. x86_64-linux
-# gui is "gnome", or null
-{ lib, pkgs, system, gui, extraPackages ? [] }: {
-  home.stateVersion = "21.11";
-  home.username = "colin";
-  home.homeDirectory = "/home/colin";
-  programs.home-manager.enable = true;  # this lets home-manager manage dot-files in user dirs, i think
-
-  # XDG defines things like ~/Desktop, ~/Downloads, etc.
-  # these clutter the home, so i mostly don't use them.
-  xdg.userDirs = {
-    enable = true;
-    createDirectories = false;  # on headless systems, most xdg dirs are noise
-    desktop = "$HOME/.xdg/Desktop";
-    documents = "$HOME/src";
-    download = "$HOME/tmp";
-    music = "$HOME/Music";
-    pictures = "$HOME/Pictures";
-    publicShare = "$HOME/.xdg/Public";
-    templates = "$HOME/.xdg/Templates";
-    videos = "$HOME/Videos";
-  };
-
-  programs.zsh = {
-    enable = true;
-    enableSyntaxHighlighting = true;
-    enableVteIntegration = true;
-    dotDir = ".config/zsh";
-
-    initExtraBeforeCompInit = ''
-      # p10k instant prompt
-      # run p10k configure to configure, but it can't write out its file :-(
-      POWERLEVEL9K_DISABLE_CONFIGURATION_WIZARD=true
-    '';
-
-    # prezto = oh-my-zsh fork; controls prompt, auto-completion, etc.
-    # see: https://github.com/sorin-ionescu/prezto
-    prezto = {
-      enable = true;
-      pmodules = [
-        "environment"
-        "terminal"
-        "editor"
-        "history"
-        "directory"
-        "spectrum"
-        "utility"
-        "completion"
-        "prompt"
-        "git"
-      ];
-      prompt = {
-        theme = "powerlevel10k";
-      };
-    };
-  };
-  programs.kitty.enable = true;
-  programs.git = {
-    enable = true;
-    userName = "colin";
-    userEmail = "colin@uninsane.org";
-  };
-
-  programs.vim = {
-    enable = true;
-    extraConfig = ''
-      " wtf vim project: NOBODY LIKES MOUSE FOR VISUAL MODE
-      set mouse-=a
-      " copy/paste to system clipboard
-      set clipboard=unnamedplus
-      " <tab> completion menu settings
-      set wildmenu
-      set wildmode=longest,list,full
-      " highlight all matching searches (using / and ?)
-      set hlsearch
-      " allow backspace to delete empty lines in insert mode
-      set backspace=indent,eol,start
-      " built-in syntax highlighting
-      syntax enable
-      " show line/col number in bottom right
-      set ruler
-      " highlight trailing space & related syntax errors (does this work?)
-      let c_space_errors=1
-      let python_space_errors=1
-    '';
-  };
-
-  # obtain these by running `dconf dump /` after manually customizing gnome
-  # TODO: fix "is not of type `GVariant value'"
-  # dconf.settings = lib.mkIf (gui == "gnome") {
-  #   gnome = {
-  #     # control alt-tab behavior
-  #     "org/gnome/desktop/wm/keybindings" = {
-  #       switch-applications = [ "<Super>Tab" ];
-  #       switch-applications-backward=[];
-  #       switch-windows=["<Alt>Tab"];
-  #       switch-windows-backward=["<Super><Alt>Tab"];
-  #     };
-  #     # idle power savings
-  #     "org/gnome/settings-deamon/plugins/power" = {
-  #       idle-brigthness = 50;
-  #       sleep-inactive-ac-type = "nothing";
-  #       sleep-inactive-battery-timeout = 5400;  # seconds
-  #     };
-  #     "org/gnome/shell" = {
-  #       favorite-apps = [
-  #         "org.gnome.Nautilus.desktop"
-  #         "firefox.desktop"
-  #         "kitty.desktop"
-  #         # "org.gnome.Terminal.desktop"
-  #       ];
-  #     };
-  #     "org/gnome/desktop/session" = {
-  #       # how long until considering a session idle (triggers e.g. screen blanking)
-  #       idle-delay = 900;
-  #     };
-  #     "org/gnome/desktop/interface" = {
-  #       text-scaling-factor = 1.25;
-  #     };
-  #     "org/gnome/desktop/media-handling" = {
-  #       # don't auto-mount inserted media
-  #       automount = false;
-  #       automount-open = false;
-  #     };
-  #   };
-  # };
-
-  # home.pointerCursor = {
-  #   package = pkgs.vanilla-dmz;
-  #   name = "Vanilla-DMZ";
-  # };
-
-  # taken from https://github.com/srid/nix-config/blob/705a70c094da53aa50cf560179b973529617eb31/nix/home/i3.nix
-  xsession.windowManager.i3 = lib.mkIf (gui == "i3") (
-  let
-    mod = "Mod4";
-  in {
-    enable = true;
-    config = {
-      modifier = mod;
-
-      fonts = {
-        names = [ "DejaVu Sans Mono" ];
-        style = "Bold Semi-Condensed";
-        size = 11.0;
-      };
-
-      # terminal = "kitty";
-      # terminal = "${pkgs.kitty}/bin/kitty";
-
-      keybindings = {
-        "${mod}+Return" = "exec ${pkgs.kitty}/bin/kitty";
-        "${mod}+p" = "exec ${pkgs.dmenu}/bin/dmenu_run";
-        "${mod}+x" = "exec sh -c '${pkgs.maim}/bin/maim -s | xclip -selection clipboard -t image/png'";
-        "${mod}+Shift+x" = "exec sh -c '${pkgs.i3lock}/bin/i3lock -c 222222 & sleep 5 && xset dpms force of'";
-
-        # Focus
-        "${mod}+j" = "focus left";
-        "${mod}+k" = "focus down";
-        "${mod}+l" = "focus up";
-        "${mod}+semicolon" = "focus right";
-
-        # Move
-        "${mod}+Shift+j" = "move left";
-        "${mod}+Shift+k" = "move down";
-        "${mod}+Shift+l" = "move up";
-        "${mod}+Shift+semicolon" = "move right";
-
-        # multi monitor setup
-        # "${mod}+m" = "move workspace to output DP-2";
-        # "${mod}+Shift+m" = "move workspace to output DP-5";
-      };
-
-      # bars = [
-      #   {
-      #     position = "bottom";
-      #     statusCommand = "${pkgs.i3status-rust}/bin/i3status-rs ${./i3status-rust.toml}";
-      #   }
-      # ];
-    };
-  });
-
-  wayland.windowManager.sway = lib.mkIf (gui == "sway") {
-    enable = true;
-    wrapperFeatures.gtk = true;
-    config = rec {
-      terminal = "${pkgs.kitty}/bin/kitty";
-      window.border = 3;  # pixel boundary between windows
-
-      # defaults; required for keybindings decl.
-      modifier = "Mod1";
-      # list of launchers: https://www.reddit.com/r/swaywm/comments/v39hxa/your_favorite_launcher/
-      # menu = "${pkgs.dmenu}/bin/dmenu_path";
-      menu = "${pkgs.fuzzel}/bin/fuzzel";
-      # menu = "${pkgs.albert}/bin/albert";
-      left = "h";
-      down = "j";
-      up = "k";
-      right = "l";
-      keybindings = {
-        "${modifier}+Return" = "exec ${terminal}";
-        "${modifier}+Shift+q" = "kill";
-        "${modifier}+d" = "exec ${menu}";
-
-        "${modifier}+${left}" = "focus left";
-        "${modifier}+${down}" = "focus down";
-        "${modifier}+${up}" = "focus up";
-        "${modifier}+${right}" = "focus right";
-
-        "${modifier}+Left" = "focus left";
-        "${modifier}+Down" = "focus down";
-        "${modifier}+Up" = "focus up";
-        "${modifier}+Right" = "focus right";
-
-        "${modifier}+Shift+${left}" = "move left";
-        "${modifier}+Shift+${down}" = "move down";
-        "${modifier}+Shift+${up}" = "move up";
-        "${modifier}+Shift+${right}" = "move right";
-
-        "${modifier}+Shift+Left" = "move left";
-        "${modifier}+Shift+Down" = "move down";
-        "${modifier}+Shift+Up" = "move up";
-        "${modifier}+Shift+Right" = "move right";
-
-        "${modifier}+b" = "splith";
-        "${modifier}+v" = "splitv";
-        "${modifier}+f" = "fullscreen toggle";
-        "${modifier}+a" = "focus parent";
-
-        "${modifier}+s" = "layout stacking";
-        "${modifier}+w" = "layout tabbed";
-        "${modifier}+e" = "layout toggle split";
-
-        "${modifier}+Shift+space" = "floating toggle";
-        "${modifier}+space" = "focus mode_toggle";
-
-        "${modifier}+1" = "workspace number 1";
-        "${modifier}+2" = "workspace number 2";
-        "${modifier}+3" = "workspace number 3";
-        "${modifier}+4" = "workspace number 4";
-        "${modifier}+5" = "workspace number 5";
-        "${modifier}+6" = "workspace number 6";
-        "${modifier}+7" = "workspace number 7";
-        "${modifier}+8" = "workspace number 8";
-        "${modifier}+9" = "workspace number 9";
-
-        "${modifier}+Shift+1" =
-          "move container to workspace number 1";
-        "${modifier}+Shift+2" =
-          "move container to workspace number 2";
-        "${modifier}+Shift+3" =
-          "move container to workspace number 3";
-        "${modifier}+Shift+4" =
-          "move container to workspace number 4";
-        "${modifier}+Shift+5" =
-          "move container to workspace number 5";
-        "${modifier}+Shift+6" =
-          "move container to workspace number 6";
-        "${modifier}+Shift+7" =
-          "move container to workspace number 7";
-        "${modifier}+Shift+8" =
-          "move container to workspace number 8";
-        "${modifier}+Shift+9" =
-          "move container to workspace number 9";
-
-        "${modifier}+Shift+minus" = "move scratchpad";
-        "${modifier}+minus" = "scratchpad show";
-
-        "${modifier}+Shift+c" = "reload";
-        "${modifier}+Shift+e" =
-          "exec swaynag -t warning -m 'You pressed the exit shortcut. Do you really want to exit sway? This will end your Wayland session.' -b 'Yes, exit sway' 'swaymsg exit'";
-
-        "${modifier}+r" = "mode resize";
-      } // {
-        # media keys
-        XF86MonBrightnessDown = ''exec "${pkgs.brightnessctl}/bin/brightnessctl set 2%-"'';
-        XF86MonBrightnessUp = ''exec "${pkgs.brightnessctl}/bin/brightnessctl set +2%"'';
-
-        XF86AudioRaiseVolume = "exec '${pkgs.pulsemixer}/bin/pulsemixer --change-volume +5'";
-        XF86AudioLowerVolume = "exec '${pkgs.pulsemixer}/bin/pulsemixer --change-volume -5'";
-        XF86AudioMute = "exec '${pkgs.pulsemixer}/bin/pulsemixer --toggle-mute'";
-
-      };
-
-      # mostly defaults:
-      bars = [{
-        mode = "dock";
-        hiddenState = "hide";
-        position = "top";
-        command = "${pkgs.waybar}/bin/waybar";
-        workspaceButtons = true;
-        workspaceNumbers = true;
-        statusCommand = "${pkgs.i3status}/bin/i3status";
-        fonts = {
-          names = [ "monospace" ];
-          size = 8.0;
-        };
-        trayOutput = "primary";
-        colors = {
-          background = "#000000";
-          statusline = "#ffffff";
-          separator = "#666666";
-          focusedWorkspace = {
-            border = "#4c7899";
-            background = "#285577";
-            text = "#ffffff";
-          };
-          activeWorkspace = {
-            border = "#333333";
-            background = "#5f676a";
-            text = "#ffffff";
-          };
-          inactiveWorkspace = {
-            border = "#333333";
-            background = "#222222";
-            text = "#888888";
-          };
-          urgentWorkspace = {
-            border = "#2f343a";
-            background = "#900000";
-            text = "#ffffff";
-          };
-          bindingMode = {
-            border = "#2f343a";
-            background = "#900000";
-            text = "#ffffff";
-          };
-        };
-      }];
-    };
-  };
-
-  programs.waybar = lib.mkIf (gui == "sway") {
-    enable = true;
-    # docs: https://github.com/Alexays/Waybar/wiki/Configuration
-    settings = {
-      mainBar = {
-        layer = "top";
-        height = 40;
-        modules-left = ["sway/workspaces" "sway/mode"];
-        modules-center = ["sway/window"];
-        modules-right = ["custom/mediaplayer" "clock" "cpu" "network"];
-        "sway/window" = {
-          max-length = 50;
-        };
-        # include song artist/title. source: https://www.reddit.com/r/swaywm/comments/ni0vso/waybar_spotify_tracktitle/
-        "custom/mediaplayer" = {
-          exec = pkgs.writeShellScript "waybar-mediaplayer" ''
-            player_status=$(${pkgs.playerctl}/bin/playerctl status 2> /dev/null)
-            if [ "$player_status" = "Playing" ]; then
-              echo "$(${pkgs.playerctl}/bin/playerctl metadata artist) - $(${pkgs.playerctl}/bin/playerctl metadata title)"
-            elif [ "$player_status" = "Paused" ]; then
-              echo " $(${pkgs.playerctl}/bin/playerctl metadata artist) - $(${pkgs.playerctl}/bin/playerctl metadata title)"
-            fi
-          '';
-          interval = 2;
-          format = "{}  ";
-          # return-type = "json";
-          on-click = "${pkgs.playerctl}/bin/playerctl play-pause";
-          on-scroll-up = "${pkgs.playerctl}/bin/playerctl next";
-          on-scroll-down = "${pkgs.playerctl}/bin/playerctl previous";
-        };
-        network = {
-          interval = 1;
-          format-ethernet = "{ifname}: {ipaddr}/{cidr}   up: {bandwidthUpBits} down: {bandwidthDownBits}";
-        };
-        cpu = {
-          format = "{usage}% ";
-          tooltip = false;
-        };
-        clock = {
-          format-alt = "{:%a, %d. %b  %H:%M}";
-        };
-      };
-    };
-    # style = ''
-    #   * {
-    #     border: none;
-    #     border-radius: 0;
-    #     font-family: Source Code Pro;
-    #   }
-    #   window#waybar {
-    #     background: #16191C;
-    #     color: #AAB2BF;
-    #   }
-    #   #workspaces button {
-    #     padding: 0 5px;
-    #   }
-    #   .custom-spotify {
-    #     padding: 0 10px;
-    #     margin: 0 4px;
-    #     background-color: #1DB954;
-    #     color: black;
-    #   }
-    # '';
-  };
-
-
-  programs.firefox = lib.mkIf (gui != null) {
-    enable = true;
-
-    profiles.default = {
-      bookmarks = {
-        fed_uninsane.url = "https://fed.uninsane.org/";
-        delightful.url = "https://delightful.club/";
-        crowdsupply.url = "https://www.crowdsupply.com/";
-        linux_phone_apps.url = "https://linuxphoneapps.org/mobile-compatibility/5/";
-        mempool.url = "https://jochen-hoenicke.de/queue";
-      };
-    };
-
-    # firefox profile support seems to be broken :shrug:
-    # profiles.other = {
-    #   id = 2;
-    # };
-
-    # NB: these must be manually enabled in the Firefox settings on first start
-    # extensions can be found here: https://gitlab.com/rycee/nur-expressions/-/blob/master/pkgs/firefox-addons/addons.json
-    extensions = [
-      pkgs.nur.repos.rycee.firefox-addons.bypass-paywalls-clean
-      pkgs.nur.repos.rycee.firefox-addons.metamask
-      pkgs.nur.repos.rycee.firefox-addons.i-dont-care-about-cookies
-      pkgs.nur.repos.rycee.firefox-addons.sidebery
-      pkgs.nur.repos.rycee.firefox-addons.sponsorblock
-      pkgs.nur.repos.rycee.firefox-addons.ublock-origin
-    ];
-  };
-
-  home.shellAliases = {
-    ":q" = "exit";
-    # common typos
-    "cd.." = "cd ..";
-    "cd../" = "cd ../";
-  };
-
-
-  home.packages = [
-    pkgs.btrfs-progs
-    pkgs.dig
-    pkgs.cryptsetup
-    pkgs.duplicity
-    pkgs.fatresize
-    pkgs.fd
-    pkgs.file
-    pkgs.gnumake
-    pkgs.gptfdisk
-    pkgs.hdparm
-    pkgs.htop
-    pkgs.iftop
-    pkgs.inetutils  # for telnet
-    pkgs.iotop
-    pkgs.iptables
-    pkgs.jq
-    pkgs.killall
-    pkgs.lm_sensors  # for sensors-detect
-    pkgs.lsof
-    pkgs.mix2nix
-    pkgs.netcat
-    pkgs.nixpkgs-review
-    pkgs.nixUnstable  # TODO: still needed on 22.05?
-    # pkgs.nixos-generators
-    # pkgs.nettools
-    pkgs.nmap
-    pkgs.obsidian
-    pkgs.parted
-    pkgs.pciutils
-    # pkgs.ponymix
-    pkgs.powertop
-    pkgs.pulsemixer
-    pkgs.python3
-    pkgs.ripgrep
-    pkgs.smartmontools
-    pkgs.snapper
-    pkgs.socat
-    pkgs.sudo
-    pkgs.usbutils
-    pkgs.wget
-    pkgs.wireguard-tools
-    pkgs.youtube-dl
-    pkgs.zola
-  ]
-  ++ (if gui != null then
-  [
-    # GUI only
-    pkgs.chromium
-    pkgs.clinfo
-    pkgs.element-desktop  # broken on phosh
-    pkgs.evince  # works on phosh
-    pkgs.font-manager
-    pkgs.gimp  # broken on phosh
-    pkgs.gnome.dconf-editor
-    pkgs.gnome.file-roller
-    pkgs.gnome.gnome-maps  # works on phosh
-    pkgs.gnome.nautilus
-    pkgs.gnome-podcasts
-    pkgs.gnome.gnome-terminal  # works on phosh
-    pkgs.inkscape
-    pkgs.kaiteki  # Pleroma client
-    pkgs.libreoffice-fresh  # XXX colin: maybe don't want this on mobile
-    pkgs.mesa-demos
-    pkgs.playerctl
-    pkgs.tdesktop  # broken on phosh
-    pkgs.vlc  # works on phosh
-    pkgs.whalebird # pleroma client. input is broken on phosh
-    pkgs.xterm  # broken on phosh
-  ] else [])
-  ++ (if gui == "sway" then
-  [
-    # TODO: move this to helpers/gui/sway.nix?
-    pkgs.swaylock
-    pkgs.swayidle
-    pkgs.wl-clipboard
-    pkgs.mako # notification daemon
-    # pkgs.dmenu # todo: use wofi?
-    # user stuff
-    # pkgs.pavucontrol
-  ] else [])
-  ++ (if gui != null && system == "x86_64-linux" then
-  [
-    # x86_64 only
-    pkgs.signal-desktop
-    pkgs.spotify
-    pkgs.discord
-  ] else [])
-  ++ extraPackages;
-}

helpers/universal/default.nix

@@ -1,17 +0,0 @@
-{ ... }:
-
-{
-  imports = [
-    ./fs.nix
-    ./home-manager.nix
-    ./nix-cache.nix
-    ./users.nix
-  ];
-
-  time.timeZone = "America/Los_Angeles";
-
-  environment.variables = {
-    EDITOR = "vim";
-  };
-}
-

helpers/universal/fs.nix

@@ -1,25 +0,0 @@
-{ pkgs, ... }:
-
-{
-  fileSystems."/mnt/media-uninsane" = {
-    # device = "sshfs#colin@uninsane.org:/opt/uninsane/media";
-    device = "colin@uninsane.org:/opt/uninsane/media";
-    fsType = "fuse.sshfs";
-    options = [
-      "x-systemd.automount"
-      "_netdev"
-      "user"
-      "idmap=user"
-      "transform_symlinks"
-      "identityfile=/home/colin/.ssh/id_ed25519"
-      "allow_other"
-      "default_permissions"
-      "uid=1000"
-      "gid=1000"
-    ];
-  };
-  environment.systemPackages = [
-    pkgs.sshfs-fuse
-  ];
-}
-

helpers/universal/home-manager.nix

@@ -1,9 +0,0 @@
-{ home-manager, config, pkgs, ... }:
-{
-  imports = [
-    home-manager.nixosModule
-  ];
-
-  home-manager.useGlobalPkgs = true;
-  home-manager.useUserPackages = true;
-}

helpers/universal/nix-cache.nix

@@ -1,16 +0,0 @@
-{ ... }:
-
-{
-  # use our own binary cache
-  nix.settings = {
-    substituters = [
-      "https://nixcache.uninsane.org"
-      "https://nix-community.cachix.org"
-      "https://cache.nixos.org/"
-    ];
-    trusted-public-keys = [
-      "nixcache.uninsane.org:r3WILM6+QrkmsLgqVQcEdibFD7Q/4gyzD9dGT33GP70="
-      "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
-    ];
-  };
-}

helpers/universal/users.nix

@@ -1,53 +0,0 @@
-{ config, pkgs, lib, ... }:
-
-# installer docs: https://github.com/NixOS/nixpkgs/blob/master/nixos/modules/profiles/installation-device.nix
-{
-  # Users are exactly these specified here;
-  # old ones will be deleted (from /etc/passwd, etc) upon upgrade.
-  users.mutableUsers = false;
-
-  # docs: https://nixpkgs-manual-sphinx-markedown-example.netlify.app/generated/options-db.xml.html#users-users
-  users.users.colin = {
-    # sets group to "users" (?)
-    isNormalUser = true;
-    home = "/home/colin";
-    uid = 1000;
-    # XXX colin: this is what the installer has, but is it necessary?
-    # group = "users";
-    extraGroups = [
-      "wheel"
-      "nixbuild"
-      "networkmanager"
-      # phosh/mobile. XXX colin: unsure if necessary
-      "video"
-      "feedbackd"
-      "dialout" # required for modem access
-    ];
-    initialPassword = lib.mkDefault "";
-    shell = pkgs.zsh;
-    # shell = pkgs.bashInteractive;
-    # XXX colin: create ssh key for THIS user by logging in and running:
-    #   ssh-keygen -t ed25519
-    openssh.authorizedKeys.keys = [
-      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGSDe/y0e9PSeUwYlMPjzhW0UhNsGAGsW3lCG3apxrD5 colin@colin.desktop"
-      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIG+MZ/l5d8g5hbxMB9ed1uyvhV85jwNrSVNVxb5ujQjw colin@lappy"
-      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPU5GlsSfbaarMvDA20bxpSZGWviEzXGD8gtrIowc1pX colin@desko"
-      # TODO: should probably only let this authenticate to my server
-      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGCLCA9KbjXaXNNMJJvqbPO5KQQ64JCdG8sg88AfdKzi colin@moby"
-    ];
-  };
-
-  security.sudo = {
-    enable = true;
-    wheelNeedsPassword = false;
-  };
-
-  services.openssh = {
-    enable = true;
-    permitRootLogin = "no";
-    passwordAuthentication = false;
-  };
-
-  # TODO colin: move this somewhere else!
-  programs.vim.defaultEditor = true;
-}

image.nix

@@ -1,21 +0,0 @@
-{ config, lib, pkgs, modulesPath, ... }:
-{
-  fileSystems."/" = {
-    # boot by label instead of unpredictable uuid
-    device = "/dev/disk/by-label/nixos-img";
-    # make-disk-image only supports ext4
-    fsType = "ext4";
-  };
-  # fileSystems."/boot".device = "/dev/vda1";
-  fileSystems."/boot".device = "/dev/disk/by-label/ESP";
-
-  system.build.raw = import "${toString modulesPath}/../lib/make-disk-image.nix" {
-    inherit lib config pkgs;
-    partitionTableType = "efi";
-    label = "nixos-img";
-    fsType = config.fileSystems."/".fsType;
-    diskSize = "auto";
-    format = "raw";
-  };
-}
-

machines/desko/default.nix

@@ -1,25 +1,52 @@
-{ config, pkgs, lib, ... }:
+{ config, pkgs, ... }:
 {
   imports = [
-    ./../../helpers/universal
-    ./../../helpers/hardware-x86_64.nix
-    # ./../../helpers/gui/gnome.nix
-    #./../../helpers/gui/i3.nix
-    ./../../helpers/gui/sway.nix
     ./fs.nix
   ];
 
-  home-manager.users.colin = import ./../../helpers/home-manager-gen-colin.nix {
-    inherit pkgs lib;
-    system = "x86_64-linux";
-    # gui = "gnome";
-    # gui = "i3";
-    gui = "sway";
-    extraPackages = [
-      pkgs.electrum
-    ];
+  sane.gui.sway.enable = true;
+  sane.services.duplicity.enable = true;
+  sane.services.nixserve.enable = true;
+  sane.services.nixserve.sopsFile = ../../secrets/desko.yaml;
+  sane.impermanence.enable = true;
+
+  boot.loader.efi.canTouchEfiVariables = false;
+  sane.image.extraBootFiles = [ pkgs.bootpart-uefi-x86_64 ];
+
+  # needed to use libimobiledevice/ifuse, for iphone sync
+  services.usbmuxd.enable = true;
+  users.users.usbmux.uid = config.sane.allocations.usbmux-uid;
+  users.groups.usbmux.gid = config.sane.allocations.usbmux-gid;
+
+  # default config: https://man.archlinux.org/man/snapper-configs.5
+  # defaults to something like:
+  #   - hourly snapshots
+  #   - auto cleanup; keep the last 10 hourlies, last 10 daylies, last 10 monthlys.
+  services.snapper.configs.nix = {
+    # TODO: for the impermanent setup, we'd prefer to just do /nix/persist,
+    # but that also requires setting up the persist dir as a subvol
+    subvolume = "/nix";
+    # TODO: ALLOW_USERS doesn't seem to work. still need `sudo snapper -c nix list`
+    extraConfig = ''
+      ALLOW_USERS = "colin";
+    '';
   };
 
+  sops.secrets.duplicity_passphrase = {
+    sopsFile = ../../secrets/desko.yaml;
+  };
+
+  programs.steam = {
+    enable = true;
+    # not sure if needed: stole this whole snippet from the wiki
+    remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play
+    dedicatedServer.openFirewall = true; # Open ports in the firewall for Source Dedicated Server
+  };
+  sane.impermanence.home-dirs = [
+    ".steam"
+    ".local/share/Steam"
+  ];
+
   # docs: https://nixos.org/manual/nixos/stable/options.html#opt-system.stateVersion
   system.stateVersion = "21.05";
 }

machines/desko/fs.nix

@@ -1,8 +1,30 @@
-{ config, pkgs, lib, ... }:
+{ ... }:
 
 {
-  fileSystems."/" = lib.mkDefault {
-    device = "/dev/disk/by-uuid/d969ee61-12cf-4490-be07-4440c7be593f";
+  # root is a tmpfs so that we have an ephemeral system ("impermanence" handles the state)
+  fileSystems."/" = {
+    device = "none";
+    fsType = "tmpfs";
+    options = [
+      "mode=755"
+      "size=1G"
+      "defaults"
+    ];
+  };
+  # we need a /tmp for building large nix things.
+  # a cross-compiled kernel, particularly, will easily use 30+GB of tmp
+  fileSystems."/tmp" = {
+    device = "none";
+    fsType = "tmpfs";
+    options = [
+      "mode=777"
+      "size=64G"
+      "defaults"
+    ];
+  };
+  fileSystems."/nix" = {
+    # device = "/dev/disk/by-uuid/985a0a32-da52-4043-9df7-615adec2e4ff";
+    device = "/dev/disk/by-uuid/0ab0770b-7734-4167-88d9-6e4e20bb2a56";
     fsType = "btrfs";
     options = [
       "compress=zstd"
@@ -11,7 +33,8 @@
   };
 
   fileSystems."/boot" = {
-    device = lib.mkDefault "/dev/disk/by-uuid/F826-6192";
+    # device = "/dev/disk/by-uuid/CAA7-E7D2";
+    device = "/dev/disk/by-uuid/41B6-BAEF";
     fsType = "vfat";
   };
 }

machines/lappy/default.nix

@@ -1,18 +1,29 @@
-{ config, pkgs, lib, ... }:
+{ pkgs, ... }:
 {
   imports = [
-    ./../../helpers/universal
-    ./../../helpers/hardware-x86_64.nix
-    ./../../helpers/gui/gnome.nix
     ./fs.nix
   ];
 
-  home-manager.users.colin = import ./../../helpers/home-manager-gen-colin.nix {
-    inherit pkgs lib;
-    system = "x86_64-linux";
-    gui = "gnome";
+  # sane.users.guest.enable = true;
+  sane.gui.sway.enable = true;
+  sane.impermanence.enable = true;
+  sane.nixcache.enable = true;
+  boot.loader.efi.canTouchEfiVariables = false;
+  sane.image.extraBootFiles = [ pkgs.bootpart-uefi-x86_64 ];
+
+  # default config: https://man.archlinux.org/man/snapper-configs.5
+  # defaults to something like:
+  #   - hourly snapshots
+  #   - auto cleanup; keep the last 10 hourlies, last 10 daylies, last 10 monthlys.
+  services.snapper.configs.nix = {
+    # TODO: for the impermanent setup, we'd prefer to just do /nix/persist,
+    # but that also requires setting up the persist dir as a subvol
+    subvolume = "/nix";
   };
 
+  # TODO: only here for debugging
+  # services.ipfs.enable = true;
+
   # docs: https://nixos.org/manual/nixos/stable/options.html#opt-system.stateVersion
   system.stateVersion = "21.05";
 }

machines/lappy/fs.nix

@@ -1,7 +1,27 @@
-{ config, pkgs, lib, ... }:
+{ ... }:
 
 {
-  fileSystems."/" = lib.mkDefault {
+  # root is a tmpfs so that we have an ephemeral system ("impermanence" handles the state)
+  fileSystems."/" = {
+    device = "none";
+    fsType = "tmpfs";
+    options = [
+      "mode=755"
+      "size=1G"
+      "defaults"
+    ];
+  };
+  # we need a /tmp of default size (half RAM) for building large nix things
+  fileSystems."/tmp" = {
+    device = "none";
+    fsType = "tmpfs";
+    options = [
+      "mode=777"
+      "defaults"
+    ];
+  };
+
+  fileSystems."/nix" = {
     device = "/dev/disk/by-uuid/75230e56-2c69-4e41-b03e-68475f119980";
     fsType = "btrfs";
     options = [
@@ -11,7 +31,27 @@
   };
 
   fileSystems."/boot" = {
-    device = lib.mkDefault "/dev/disk/by-uuid/BD79-D6BB";
+    device = "/dev/disk/by-uuid/BD79-D6BB";
     fsType = "vfat";
   };
+
+  # fileSystems."/nix" = {
+  #   device = "/dev/disk/by-uuid/5a7fa69c-9394-8144-a74c-6726048b129f";
+  #   fsType = "btrfs";
+  # };
+
+  # fileSystems."/boot" = {
+  #   device = "/dev/disk/by-uuid/4302-1685";
+  #   fsType = "vfat";
+  # };
+
+  # fileSystems."/" = {
+  #   device = "none";
+  #   fsType = "tmpfs";
+  #   options = [
+  #     "mode=755"
+  #     "size=1G"
+  #     "defaults"
+  #   ];
+  # };
 }

machines/moby/default.nix

@@ -1,49 +1,61 @@
-{ config, pkgs, lib, ... }:
+{ config, pkgs, lib, mobile-nixos, ... }:
 {
   imports = [
-    ./../../helpers/universal
-    ./../../helpers/gui/phosh.nix
-    # ./../../helpers/gui/plasma-mobile.nix
-    # ./../../helpers/gui/gnome.nix
+    ./firmware.nix
+    ./fs.nix
+    ./kernel.nix
   ];
 
+  # cross-compiled documentation is *slow*.
+  # no obvious way to natively compile docs (2022/09/29).
+  # entrypoint is nixos/modules/misc/documentation.nix
+  # doc building happens in nixos/doc/manual/default.nix
+  # TODO: we could *maybe* inject pkgs.buildPackages.xyz = cross.buildPackages.xyz?
+  documentation.nixos.enable = false;
+
   # XXX colin: phosh doesn't work well with passwordless login
   users.users.colin.initialPassword = "147147";
+  services.getty.autologinUser = "root";  # allows for emergency maintenance?
 
-  home-manager.users.colin = import ./../../helpers/home-manager-gen-colin.nix {
-    inherit pkgs lib;
-    system = "aarch64-linux";
-    gui = "phosh";
-    extraPackages = [
-      # for web browsers see: https://forum.pine64.org/showthread.php?tid=13669
-      pkgs.angelfish  # plasma mobile web browser; broken on phosh (poor wayland support)
-      # pkgs.plasma5Packages.index  # file browser
-      pkgs.plasma5Packages.konsole  # terminal
-      # pkgs.plasma5Packages.pix  # picture viewer
-      pkgs.plasma5Packages.kalk  # calculator; broken on phosh
-      # pkgs.plasma5Packages.buho  # (plasma mobile?) note application
-      pkgs.plasma5Packages.kasts  #  podcast app; works on phosh after setting QT envar
-      pkgs.plasma5Packages.koko  # image gallery; broken on phosh
-      pkgs.plasma5Packages.kwave  # media player.
-      # pkgs.plasma5Packages.neochat  #  matrix client. needs qcoro => no aarch64 support
-      # pkgs.plasma5Packages.plasma-dialer  # phone dialer
-      # pkgs.plasma5Packages.plasma-mobile  # the whole shebang?
-      # pkgs.plasma5Packages.plasma-settings
-      pkgs.plasma5Packages.bomber  # arcade game; broken on phosh
-      pkgs.plasma5Packages.kapman  # pacman
-      pkgs.w3m  # text-based web browser; works!
-      pkgs.st  # suckless terminal; broken on phosh
-      # pkgs.alacritty  # terminal; crashes phosh
-    ];
-  };
+  # usability compromises
+  sane.impermanence.home-dirs = [
+    ".librewolf"
+  ];
 
-  # This value determines the NixOS release from which the default
-  # settings for stateful data, like file locations and database versions
-  # on your system were taken. It‘s perfectly fine and recommended to leave
-  # this value at the release version of the first install of this system.
-  # Before changing this value read the documentation for this option
-  # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
-  system.stateVersion = "21.11"; # Did you read the comment?
+  # sane.home-packages.enableGuiPkgs = false;  # XXX faster builds/imaging for debugging
+  sane.home-manager.extraPackages = [
+    pkgs.plasma5Packages.konsole  # terminal
+  ];
+
+  sane.nixcache.enable = true;
+  sane.impermanence.enable = true;
+  sane.gui.phosh.enable = true;
+
+  boot.loader.efi.canTouchEfiVariables = false;
+  # /boot space is at a premium. default was 20.
+  boot.loader.generic-extlinux-compatible.configurationLimit = 10;
+  # mobile.bootloader.enable = false;
+  # mobile.boot.stage-1.enable = false;
+  # boot.initrd.systemd.enable = false;
+  # boot.initrd.services.swraid.enable = false;  # attempt to fix dm_mod stuff
+  # disable proximity sensor.
+  # the filtering/calibration is bad that it causes the screen to go fully dark at times.
+  boot.blacklistedKernelModules = [ "stk3310" ];
+
+  # without this some GUI apps fail: `DRM_IOCTL_MODE_CREATE_DUMB failed: Cannot allocate memory`
+  # this is because they can't allocate enough video ram.
+  # the default CMA seems to be 32M. we could probably get by with as little as 64M, and safely with 128M.
+  # `cat /proc/meminfo` to see CmaTotal/CmaFree if interested in tuning this.
+  boot.kernelParams = [ "cma=256M" ];
+
+  # mobile-nixos' /lib/firmware includes:
+  #   rtl_bt          (bluetooth)
+  #   anx7688-fw.bin  (USB-C -> HDMI bridge)
+  #   ov5640_af.bin   (camera module)
+  # hardware.firmware = [ config.mobile.device.firmware ];
+  hardware.firmware = [ pkgs.rtl8723cs-firmware ];
+
+  system.stateVersion = "21.11";
 
   # defined: https://www.freedesktop.org/software/systemd/man/machine-info.html
   # XXX colin: not sure which, if any, software makes use of this
@@ -53,4 +65,17 @@
 
   # enable rotation sensor
   hardware.sensor.iio.enable = true;
+
+  # from https://gitlab.manjaro.org/manjaro-arm/packages/community/phosh/alsa-ucm-pinephone
+  # mobile-nixos does this same thing, with *slightly different settings*.
+  # i trust manjaro more because the guy maintaining that is actively trying to upstream into alsa-ucm-conf.
+  # an alternative may be to build a custom alsa with the PinePhone config patch applied:
+  # - <https://github.com/alsa-project/alsa-ucm-conf/pull/134>
+  # that would make this be not device-specific
+  environment.variables.ALSA_CONFIG_UCM2 = "${./ucm2}";
+  systemd.services.pulseaudio.environment.ALSA_CONFIG_UCM2 = "${./ucm2}";
+
+  users.groups.feedbackd.gid = config.sane.allocations.feedbackd-gid;
+
+  hardware.opengl.driSupport = true;
 }

machines/moby/firmware.nix

@@ -0,0 +1,12 @@
+{ config, pkgs, ... }:
+{
+  # we need space in the GPT header to place tow-boot.
+  # only actually need 1 MB, but better to over-allocate than under-allocate
+  sane.image.extraGPTPadding = 16 * 1024 * 1024;
+  sane.image.firstPartGap = 0;
+  system.build.img = pkgs.runCommand "nixos_full-disk-image.img" {} ''
+    cp -v ${config.system.build.img-without-firmware}/nixos.img $out
+    chmod +w $out
+    dd if=${pkgs.tow-boot-pinephone}/Tow-Boot.noenv.bin of=$out bs=1024 seek=8 conv=notrunc
+  '';
+}

machines/moby/fs.nix

@@ -0,0 +1,28 @@
+{ ... }:
+
+{
+  # root is a tmpfs so that we have an ephemeral system ("impermanence" handles the state)
+  fileSystems."/" = {
+    device = "none";
+    fsType = "tmpfs";
+    options = [
+      "mode=755"
+      "size=1G"
+      "defaults"
+    ];
+  };
+
+  fileSystems."/nix" = {
+    device = "/dev/disk/by-uuid/1f1271f8-53ce-4081-8a29-60a4a6b5d6f9";
+    fsType = "btrfs";
+    options = [
+      "compress=zstd"
+      "defaults"
+    ];
+  };
+
+  fileSystems."/boot" = {
+    device = "/dev/disk/by-uuid/0299-F1E5";
+    fsType = "vfat";
+  };
+}

machines/moby/kernel.nix

@@ -0,0 +1,143 @@
+{ lib, pkgs, ... }:
+let
+  # use the last commit on the 5.18 branch (5.18.14)
+  # manjaro's changes between kernel patch versions tend to be minimal if any.
+  manjaroBase = "https://gitlab.manjaro.org/manjaro-arm/packages/core/linux/-/raw/25bd828cd47b1c6e09fcbcf394a649b89d2876dd";
+  manjaroPatch = name: sha256: {
+    inherit name;
+    patch = pkgs.fetchpatch {
+      inherit name;
+      url = "${manjaroBase}/${name}?inline=false";
+      inherit sha256;
+    };
+  };
+
+  # the idea for patching off Manjaro's kernel comes from jakewaksbaum:
+  # - https://git.sr.ht/~jakewaksbaum/pi/tree/af20aae5653545d6e67a459b59ee3e1ca8a680b0/item/kernel/default.nix
+  # - he later abandoned this, i think because he's using the Pinephone Pro which received mainline support.
+  manjaroPatches = [
+    (manjaroPatch
+      "1001-arm64-dts-allwinner-add-hdmi-sound-to-pine-devices.patch"
+      "sha256-DApd791A+AxB28Ven/MVAyuyVphdo8KQDx8O7oxVPnc="
+    )
+    # these patches below are critical to enable wifi (RTL8723CS)
+    # - the alternative is a wholly forked kernel by megi/megous:
+    #   - https://xnux.eu/howtos/build-pinephone-kernel.html#toc-how-to-build-megi-s-pinehpone-kernel
+    # - i don't know if these patches are based on megi's or original
+    (manjaroPatch
+      "2001-Bluetooth-Add-new-quirk-for-broken-local-ext-features.patch"
+      "sha256-CExhJuUWivegxPdnzKINEsKrMFx/m/1kOZFmlZ2SEOc="
+    )
+    (manjaroPatch
+      "2002-Bluetooth-btrtl-add-support-for-the-RTL8723CS.patch"
+      "sha256-dDdvOphTcP/Aog93HyH+L9m55laTgtjndPSE4/rnzUA="
+    )
+    (manjaroPatch
+      "2004-arm64-dts-allwinner-enable-bluetooth-pinetab-pinepho.patch"
+      "sha256-o43P3WzXyHK1PF+Kdter4asuyGAEKO6wf5ixcco2kCQ="
+    )
+    # XXX: this one has a Makefile, which hardcodes /sbin/depmod:
+    # - drivers/staging/rtl8723cs/Makefile
+    # - not sure if this is problematic?
+    (manjaroPatch
+      "2005-staging-add-rtl8723cs-driver.patch"
+      "sha256-6ywm3dQQ5JYl60CLKarxlSUukwi4QzqctCj3tVgzFbo="
+    )
+  ];
+
+  # pinephone uses the linux dtb at arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi
+  # - this includes sun50i-a64.dtsi
+  # - and sun50i-a64-cpu-opp.dtsi
+  # - no need to touch the allwinner-h6 stuff: that's the SBC pine product
+  # - i think it's safe to ignore sun9i stuff, but i don't know what it is
+  kernelConfig = with lib.kernel; {
+    # NB: nix adds the CONFIG_ prefix to each of these.
+    # if you add the prefix yourself nix will IGNORE YOUR CONFIG.
+    RTL8723CS = module;
+    BT_HCIUART_3WIRE = yes;
+    BT_HCIUART_RTL = yes;
+    RTL8XXXU_UNTESTED = yes;
+    BT_BNEP_MC_FILTER = yes;
+    BT_BNEP_PROTO_FILTER = yes;
+    BT_HS = yes;
+    BT_LE = yes;
+    # relevant configs inherited from nixos defaults (or above additions):
+    # CONFIG_BT=m
+    # CONFIG_BT_BREDR=y
+    # CONFIG_BT_RFCOMM=m
+    # CONFIG_BT_RFCOMM_TTY=y
+    # CONFIG_BT_BNEP=m
+    # CONFIG_BT_HIDP=m
+    # CONFIG_BT_RTL=m
+    # CONFIG_BT_HCIBTUSB=m
+    # CONFIG_BT_HCIBTUSB_BCM=y
+    # CONFIG_BT_HCIBTUSB_RTL=y
+    # CONFIG_BT_HCIUART=m
+    # CONFIG_BT_HCIUART_SERDEV=y
+    # CONFIG_BT_HCIUART_H4=y
+    # CONFIG_BT_HCIUART_LL=y
+    # CONFIG_RTL_CARDS=m
+    # CONFIG_RTLWIFI=m
+    # CONFIG_RTLWIFI_PCI=m
+    # CONFIG_RTLWIFI_USB=m
+    # CONFIG_RTLWIFI_DEBUG=y
+    # CONFIG_RTL8723_COMMON=m
+    # CONFIG_RTLBTCOEXIST=m
+    # CONFIG_RTL8XXXU=m
+    # CONFIG_RTLLIB=m
+    # consider adding (from mobile-nixos):
+    # maybe: CONFIG_BT_HCIUART_3WIRE=y
+    # maybe: CONFIG_BT_HCIUART_RTL=y
+    # maybe: CONFIG_RTL8XXXU_UNTESTED=y
+    # consider adding (from manjaro):
+    # CONFIG_BT_6LOWPAN=m  (not listed as option in nixos kernel)
+    # these are referenced in the rtl8723 source, but not known to config (and not in mobile-nixos config
+    # maybe: CONFIG_RTL_ODM_WLAN_DRIVER
+    # maybe: CONFIG_RTL_TRIBAND_SUPPORT
+    # maybe: CONFIG_SDIO_HCI
+    # maybe: CONFIG_USB_HCI
+  };
+
+  # create a kernelPatch which overrides nixos' defconfig with extra options
+  patchDefconfig = config: {
+    # defconfig options. this method comes from here:
+    # - https://discourse.nixos.org/t/the-correct-way-to-override-the-latest-kernel-config/533/9
+    name = "sane-moby-defconfig";
+    patch = null;
+    extraStructuredConfig = config;
+  };
+in
+{
+  # use Megi's kernel:
+  # even with the Manjaro patches, stock 5.18 has a few issues on Pinephone:
+  # - no battery charging
+  # - phone rotation sensor is off by 90 degrees
+  # - ambient light sensor causes screen brightness to be shakey
+  # - phosh greeter may not appear after wake from sleep
+  boot.kernelPackages = pkgs.cross.linuxPackagesFor pkgs.cross.linux-megous;
+
+  boot.kernelPatches = [
+    (patchDefconfig (kernelConfig //
+      (with lib.kernel; {
+        # disabling the sun5i_eink driver avoids this compilation error:
+        # CC [M]  drivers/video/fbdev/sun5i-eink-neon.o
+        # aarch64-unknown-linux-gnu-gcc: error: unrecognized command line option '-mfloat-abi=softfp'
+        # aarch64-unknown-linux-gnu-gcc: error: unrecognized command line option '-mfpu=neon'
+        # make[3]: *** [../scripts/Makefile.build:289: drivers/video/fbdev/sun5i-eink-neon.o] Error 1
+        FB_SUN5I_EINK = no;
+      })
+    ))
+  ];
+
+  # alternatively, use nixos' kernel and add the stuff we want:
+  # # cross-compilation optimization:
+  # boot.kernelPackages =
+  #   let p = (import nixpkgs { localSystem = "x86_64-linux"; });
+  #   in p.pkgsCross.aarch64-multiplatform.linuxPackages_5_18;
+  # # non-cross:
+  # # boot.kernelPackages = pkgs.linuxPackages_5_18;
+
+  # boot.kernelPatches = manjaroPatches ++ [
+  #   (patchDefconfig kernelConfig)
+  # ];
+}

machines/moby/ucm2/PinePhone/HiFi.conf

@@ -0,0 +1,148 @@
+SectionVerb {
+	EnableSequence [
+		cset "name='Headphone Playback Switch' off"
+		cset "name='Headphone Source Playback Route' DAC"
+		cset "name='Line In Playback Switch' off"
+		cset "name='Line Out Playback Switch' off"
+		cset "name='Line Out Source Playback Route' Mono Differential"
+		cset "name='Mic1 Playback Switch' off"
+		cset "name='Mic2 Playback Switch' off"
+		cset "name='AIF1 DA0 Playback Volume' 160"
+		cset "name='AIF3 ADC Source Capture Route' None"
+		cset "name='AIF2 DAC Source Playback Route' AIF2"
+		cset "name='DAC Playback Switch' on"
+		cset "name='DAC Playback Volume' 160"
+		cset "name='ADC Digital DAC Playback Switch' off"
+		cset "name='AIF1 Slot 0 Digital DAC Playback Switch' on"
+		cset "name='AIF2 Digital DAC Playback Switch' off"
+		cset "name='DAC Reversed Playback Switch' off"
+		cset "name='Earpiece Playback Switch' off"
+		cset "name='Earpiece Source Playback Route' DACL"
+
+		cset "name='Line In Capture Switch' off"
+		cset "name='Mic1 Capture Switch' off"
+		cset "name='Mic1 Boost Volume' 7"
+		cset "name='Mic2 Capture Switch' off"
+		cset "name='Mic2 Boost Volume' 7"
+		cset "name='Mixer Capture Switch' off"
+		cset "name='Mixer Reversed Capture Switch' off"
+		cset "name='ADC Capture Volume' 160"
+		cset "name='ADC Gain Capture Volume' 7"
+		cset "name='AIF1 AD0 Capture Volume' 160"
+		cset "name='AIF1 Data Digital ADC Capture Switch' on"
+		cset "name='AIF2 ADC Mixer ADC Capture Switch' off"
+		cset "name='AIF2 ADC Mixer AIF1 DA0 Capture Switch' off"
+		cset "name='AIF2 ADC Mixer AIF2 DAC Rev Capture Switch' off"
+		cset "name='AIF2 ADC Mixer AIF1 DA0 Capture Switch' off"
+		cset "name='AIF2 ADC Mixer AIF1 DA0 Capture Switch' off"
+	]
+
+        DisableSequence [
+        ]
+
+	Value {
+	}
+}
+
+SectionDevice."Speaker" {
+	Comment "Internal speaker"
+	EnableSequence [
+		cset "name='AIF1 DA0 Stereo Playback Route' Mix Mono"
+		cset "name='Line Out Playback Switch' on"
+		cset "name='Line Out Playback Volume' 100%"
+	]
+
+	DisableSequence [
+		cset "name='Line Out Playback Switch' off"
+	]
+
+	Value {
+		PlaybackVolume "Line Out Playback Volume"
+		PlaybackSwitch "Line Out Playback Switch"
+		PlaybackChannels 2
+		PlaybackPriority 300
+		PlaybackPCM "hw:${CardId},0"
+	}
+}
+SectionDevice."Earpiece" {
+	Comment "Internal Earpiece"
+	EnableSequence [
+		cset "name='AIF1 DA0 Stereo Playback Route' Mix Mono"
+		cset "name='Earpiece Playback Switch' on"
+		cset "name='Earpiece Playback Volume' 100%"
+	]
+
+	DisableSequence [
+		cset "name='Earpiece Playback Switch' off"
+	]
+
+	Value {
+		PlaybackVolume "Earpiece Playback Volume"
+		PlaybackSwitch "Earpiece Playback Switch"
+		PlaybackChannels 2
+		PlaybackPriority 200
+		PlaybackPCM "hw:${CardId},0"
+	}
+}
+SectionDevice."Mic" {
+	Comment "Internal Microphone"
+	ConflictingDevice [
+		"Headset"
+	]
+	EnableSequence [
+		cset "name='Mic1 Capture Switch' on"
+	]
+	DisableSequence [
+		cset "name='Mic1 Capture Switch' off"
+	]
+	Value {
+		CapturePriority 100
+		CapturePCM "hw:${CardId},0"
+		CaptureChannels 2
+		CaptureMixerElem "ADC"
+		CaptureVolume "ADC Capture Volume"
+		CaptureSwitch "Mic1 Capture Switch"
+	}
+}
+SectionDevice."Headset" {
+	Comment "Headset Microphone"
+	ConflictingDevice [
+		"Mic"
+	]
+	EnableSequence [
+		cset "name='Mic2 Capture Switch' on"
+	]
+	DisableSequence [
+		cset "name='Mic2 Capture Switch' off"
+	]
+	Value {
+		CapturePriority 500
+		CapturePCM "hw:${CardId},0"
+		CaptureChannels 2
+		CaptureMixerElem "ADC"
+		CaptureVolume "ADC Capture Volume"
+		CaptureSwitch "Mic2 Capture Switch"
+		JackControl "Headset Microphone Jack"
+	}
+}
+SectionDevice."Headphones" {
+	Comment "Headphones"
+	EnableSequence [
+		cset "name='AIF1 DA0 Stereo Playback Route' Stereo"
+		cset "name='Headphone Playback Switch' on"
+		cset "name='Headphone Playback Volume' 70%"
+	]
+
+	DisableSequence [
+		cset "name='Headphone Playback Switch' off"
+	]
+
+	Value {
+		PlaybackVolume "Headphone Playback Volume"
+		PlaybackSwitch "Headphone Playback Switch"
+		PlaybackChannels 2
+		PlaybackPriority 500
+		PlaybackPCM "hw:${CardId},0"
+		JackControl "Headphone Jack"
+	}
+}

machines/moby/ucm2/PinePhone/PinePhone.conf

@@ -0,0 +1,11 @@
+Syntax 2
+
+SectionUseCase."HiFi" {
+	File "HiFi.conf"
+	Comment "Default"
+}
+
+SectionUseCase."Voice Call" {
+	File "VoiceCall.conf"
+	Comment "Phone call"
+}

machines/moby/ucm2/PinePhone/VoiceCall.conf

@@ -0,0 +1,153 @@
+SectionVerb {
+	EnableSequence [
+		cset "name='Headphone Playback Switch' off"
+		cset "name='Headphone Source Playback Route' DAC"
+		cset "name='Line In Playback Switch' off"
+		cset "name='Line Out Playback Switch' off"
+		cset "name='Line Out Source Playback Route' Mono Differential"
+		cset "name='Mic1 Playback Switch' off"
+		cset "name='Mic2 Playback Switch' off"
+		cset "name='AIF1 DA0 Playback Volume' 160"
+		cset "name='AIF2 DAC Playback Volume' 160"
+		cset "name='AIF3 ADC Source Capture Route' None"
+		cset "name='AIF2 DAC Source Playback Route' AIF2"
+		cset "name='DAC Playback Switch' on"
+		cset "name='DAC Playback Volume' 160"
+		cset "name='ADC Digital DAC Playback Switch' off"
+		cset "name='AIF1 Slot 0 Digital DAC Playback Switch' on"
+		cset "name='AIF2 Digital DAC Playback Switch' on"
+		cset "name='DAC Reversed Playback Switch' off"
+		cset "name='Earpiece Playback Switch' off"
+		cset "name='Earpiece Source Playback Route' DACL"
+
+		cset "name='Line In Capture Switch' off"
+		cset "name='Mic1 Capture Switch' off"
+		cset "name='Mic1 Boost Volume' 0"
+		cset "name='Mic1 Playback Volume' 7"
+		cset "name='Mic2 Capture Switch' off"
+		cset "name='Mic2 Boost Volume' 0"
+		cset "name='Mic2 Playback Volume' 7"
+		cset "name='Mixer Capture Switch' off"
+		cset "name='Mixer Reversed Capture Switch' off"
+		cset "name='ADC Capture Volume' 160"
+		cset "name='ADC Gain Capture Volume' 7"
+		cset "name='AIF1 AD0 Capture Volume' 160"
+		cset "name='AIF1 Data Digital ADC Capture Switch' on"
+		cset "name='AIF2 ADC Capture Volume' 160"
+		cset "name='AIF2 ADC Mixer ADC Capture Switch' on"
+		cset "name='AIF2 ADC Mixer AIF1 DA0 Capture Switch' off"
+		cset "name='AIF2 ADC Mixer AIF2 DAC Rev Capture Switch' off"
+		cset "name='AIF2 ADC Mixer AIF1 DA0 Capture Switch' off"
+		cset "name='AIF2 ADC Mixer AIF1 DA0 Capture Switch' off"
+	]
+
+        DisableSequence [
+        ]
+
+	Value {
+		PlaybackRate 8000
+	}
+}
+
+SectionDevice."Speaker" {
+	Comment "Internal speaker"
+	EnableSequence [
+		cset "name='AIF1 DA0 Stereo Playback Route' Mix Mono"
+		cset "name='Line Out Playback Switch' on"
+		cset "name='Line Out Playback Volume' 100%"
+	]
+
+	DisableSequence [
+		cset "name='Line Out Playback Switch' off"
+	]
+
+	Value {
+		PlaybackVolume "Line Out Playback Volume"
+		PlaybackSwitch "Line Out Playback Switch"
+		PlaybackChannels 2
+		PlaybackPriority 300
+		PlaybackPCM "hw:${CardId},0"
+	}
+}
+SectionDevice."Earpiece" {
+	Comment "Internal Earpiece"
+	EnableSequence [
+		cset "name='AIF1 DA0 Stereo Playback Route' Mix Mono"
+		cset "name='Earpiece Playback Switch' on"
+		cset "name='Earpiece Playback Volume' 100%"
+	]
+
+	DisableSequence [
+		cset "name='Earpiece Playback Switch' off"
+	]
+
+	Value {
+		PlaybackVolume "Earpiece Playback Volume"
+		PlaybackSwitch "Earpiece Playback Switch"
+		PlaybackChannels 2
+		PlaybackPriority 500
+		PlaybackPCM "hw:${CardId},0"
+	}
+}
+SectionDevice."Mic" {
+	Comment "Internal Microphone"
+	ConflictingDevice [
+		"Headset"
+	]
+	EnableSequence [
+		cset "name='Mic1 Capture Switch' on"
+	]
+	DisableSequence [
+		cset "name='Mic1 Capture Switch' off"
+	]
+	Value {
+		CapturePriority 200
+		CapturePCM "hw:${CardId},0"
+		CaptureMixerElem "ADC"
+		CaptureVolume "ADC Capture Volume"
+		CaptureSwitch "Mic1 Capture Switch"
+		CaptureChannels 2
+	}
+}
+SectionDevice."Headset" {
+	Comment "Headset Microphone"
+	ConflictingDevice [
+		"Mic"
+	]
+	EnableSequence [
+		cset "name='Mic2 Capture Switch' on"
+	]
+	DisableSequence [
+		cset "name='Mic2 Capture Switch' off"
+	]
+	Value {
+		CapturePriority 500
+		CapturePCM "hw:${CardId},0"
+		CaptureChannels 2
+		CaptureMixerElem "ADC"
+		CaptureVolume "ADC Capture Volume"
+		CaptureSwitch "Mic2 Capture Switch"
+		JackControl "Headset Microphone Jack"
+	}
+}
+SectionDevice."Headphones" {
+	Comment "Headphones"
+	EnableSequence [
+		cset "name='AIF1 DA0 Stereo Playback Route' Stereo"
+		cset "name='Headphone Playback Switch' on"
+		cset "name='Headphone Playback Volume' 100%"
+	]
+
+	DisableSequence [
+		cset "name='Headphone Playback Switch' off"
+	]
+
+	Value {
+		PlaybackVolume "Headphone Playback Volume"
+		PlaybackSwitch "Headphone Playback Switch"
+		PlaybackChannels 2
+		PlaybackPriority 500
+		PlaybackPCM "hw:${CardId},0"
+		JackControl "Headphone Jack"
+	}
+}

machines/moby/ucm2/ucm.conf

@@ -0,0 +1,8 @@
+Syntax 3
+
+UseCasePath {
+	legacy {
+		Directory "PinePhone"
+		File "PinePhone.conf"
+	}
+}

machines/rescue/default.nix

@@ -0,0 +1,16 @@
+{ config, pkgs, ... }:
+{
+  imports = [
+    ./fs.nix
+  ];
+
+  boot.loader.generic-extlinux-compatible.enable = true;
+  boot.loader.efi.canTouchEfiVariables = false;
+  sane.image.extraBootFiles = [ pkgs.bootpart-uefi-x86_64 ];
+
+  users.users.dhcpcd.uid = config.sane.allocations.dhcpcd-uid;
+  users.groups.dhcpcd.gid = config.sane.allocations.dhcpcd-gid;
+
+  # docs: https://nixos.org/manual/nixos/stable/options.html#opt-system.stateVersion
+  system.stateVersion = "21.05";
+}

machines/rescue/fs.nix

@@ -0,0 +1,12 @@
+{ ... }:
+
+{
+  fileSystems."/" = {
+    device = "/dev/disk/by-uuid/44445555-6666-7777-8888-999900001111";
+    fsType = "ext4";
+  };
+  fileSystems."/boot" = {
+    device = "/dev/disk/by-uuid/2222-3333";
+    fsType = "vfat";
+  };
+}

machines/servo/default.nix

@@ -0,0 +1,45 @@
+{ pkgs, ... }:
+
+{
+  imports = [
+    ./fs.nix
+    ./hardware.nix
+    ./net.nix
+    ./users.nix
+    ./services
+  ];
+
+  sane.home-manager.enable = true;
+  sane.home-manager.extraPackages = [
+    # for administering matrix
+    pkgs.matrix-synapse
+  ];
+  sane.impermanence.enable = true;
+  sane.services.duplicity.enable = true;
+  sane.services.nixserve.enable = true;
+
+  # TODO: look into the EFI stuff
+  boot.loader.grub.enable = false;
+  boot.loader.generic-extlinux-compatible.enable = true;
+  boot.loader.efi.canTouchEfiVariables = false;
+  sane.image.extraBootFiles = [ pkgs.bootpart-u-boot-rpi-aarch64 ];
+
+  sops.secrets.duplicity_passphrase = {
+    sopsFile = ../../secrets/servo.yaml;
+  };
+
+  # both transmission and ipfs try to set different net defaults.
+  # we just use the most aggressive of the two here:
+  boot.kernel.sysctl = {
+    "net.core.rmem_max" = "4194304";  # 4MB
+  };
+
+  # This value determines the NixOS release from which the default
+  # settings for stateful data, like file locations and database versions
+  # on your system were taken. It‘s perfectly fine and recommended to leave
+  # this value at the release version of the first install of this system.
+  # Before changing this value read the documentation for this option
+  # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
+  system.stateVersion = "21.11"; # Did you read the comment?
+}
+

machines/servo/fs.nix

@@ -0,0 +1,69 @@
+{ ... }:
+
+{
+  # root is a tmpfs so that we have an ephemeral system ("impermanence" handles the state)
+  fileSystems."/" = {
+    device = "none";
+    fsType = "tmpfs";
+    options = [
+      "mode=755"
+      "size=1G"
+      "defaults"
+    ];
+  };
+  # we need a /tmp for building large nix things
+  fileSystems."/tmp" = {
+    device = "none";
+    fsType = "tmpfs";
+    options = [
+      "size=40G"
+      "mode=777"
+      "defaults"
+    ];
+  };
+
+  fileSystems."/nix" = {
+    device = "/dev/disk/by-uuid/aa272cff-0fcc-498e-a4cb-0d95fb60631b";
+    fsType = "btrfs";
+  };
+
+  fileSystems."/boot" = {
+    device = "/dev/disk/by-uuid/31D3-40CB";
+    fsType = "vfat";
+  };
+
+
+  # fileSystems."/var/lib/pleroma" = {
+  #   device = "/opt/pleroma";
+  #   options = [ "bind" ];
+  # };
+
+  # in-memory compressed RAM (seems to be dynamically sized)
+  zramSwap = {
+    enable = true;
+  };
+
+  # btrfs doesn't easily support swapfiles
+  # swapDevices = [
+  #   { device = "/nix/persist/swapfile"; size = 4096; }
+  # ];
+
+  # this can be a partition. create with:
+  #   fdisk <dev>
+  #     n
+  #     <default partno>
+  #     <start>
+  #     <end>
+  #     t
+  #     <partno>
+  #     19  # set part type to Linux swap
+  #     w   # write changes
+  #   mkswap -L swap <part>
+  swapDevices = [
+    {
+      label = "swap";
+      # TODO: randomEncryption.enable = true;
+    }
+  ];
+}
+

machines/servo/hardware.nix

@@ -1,26 +1,17 @@
 # this file originates from ‘nixos-generate-config’
 # but has been heavily modified
-{ config, lib, pkgs, modulesPath, ... }:
+{ pkgs, ... }:
 
 {
-  # enables non-free firmware
-  hardware.enableRedistributableFirmware = true;
-
   # i changed this becuse linux 5.10 didn't have rpi-400 device tree blob.
   # nixos-22.05 linux 5.15 DOES have these now.
   # it should be possible to remove this if desired, but i'm not sure how the rpi-specific kernel differs.
   # see: https://github.com/raspberrypi/linux
   boot.kernelPackages = pkgs.linuxPackages_rpi4;
 
-  # NixOS defaults to grub: we don't want that.
-  boot.loader.grub.enable = false;
   # raspberryPi boot loader creates extlinux.conf.
   #   otherwise, enable the generic-extlinux-compatible loader below.
   # note: THESE ARE MUTUALLY EXCLUSIVE. generic-extlinux-compatible causes uboot to not be built
-  # boot.loader.generic-extlinux-compatible.enable = true;
-  boot.loader.raspberryPi.enable = true;
-  boot.loader.raspberryPi.uboot.enable = true;
-  boot.loader.raspberryPi.version = 4;
 
   boot.initrd.availableKernelModules = [
     "bcm2711_thermal"
@@ -44,16 +35,6 @@
     "xhci_pci_renesas"
   ];
   # boot.initrd.compressor = "gzip";  # defaults to zstd
-  # hack in the `boot.shell_on_fail` arg since it doesn't seem to work otherwise
-  boot.initrd.preFailCommands = "allowShell=1";
-  # default: 4 (warn). 7 is debug
-  boot.consoleLogLevel = 7;
-  # boot.kernelParams = [
-  #   "boot.shell_on_fail"
-  #   # "boot.trace"
-  #   # "systemd.log_level=debug"
-  #   # "systemd.log_target=console"
-  # ];
 
   # ondemand power scaling keeps the cpu at low frequency when idle, and sets to max frequency
   # when load is detected. (v.s. the "performance" default, which always uses the max frequency)

machines/servo/net.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, secrets, ... }:
+{ config, pkgs, ... }:
 
 {
   networking.domain = "uninsane.org";
@@ -18,12 +18,15 @@
     80   # HTTP
     143  # IMAP
     443  # HTTPS
-    465  # SMTPS (maybe not required?)
-    587  # SMTPS/submission (maybe not required?)
+    465  # SMTPS
+    587  # SMTPS/submission
     993  # IMAPS
+    4001 # IPFS
+  ];
+  networking.firewall.allowedUDPPorts = [
+    1900 7359 # DLNA: https://jellyfin.org/docs/general/networking/index.html
+    4001      # IPFS
   ];
-  # DLNA ports: https://jellyfin.org/docs/general/networking/index.html
-  networking.firewall.allowedUDPPorts = [ 1900 7359 ];
 
   # we need to use externally-visible nameservers in order for VPNs to be able to resolve hosts.
   networking.nameservers = [
@@ -35,7 +38,7 @@
   # DOCS: https://nixos.wiki/wiki/WireGuard
   networking.wireguard.enable = true;
   networking.wireguard.interfaces.wg0 = {
-    privateKey = secrets.wireguard.privateKey;
+    privateKeyFile = config.sops.secrets.wg_ovpns_privkey.path;
     # wg is active only in this namespace.
     # run e.g. ip netns exec ovpns <some command like ping/curl/etc, it'll go through wg>
     #   sudo ip netns exec ovpns ping www.google.com
@@ -87,6 +90,10 @@
     };
   };
 
+  sops.secrets."wg_ovpns_privkey" = {
+    sopsFile = ../../secrets/servo.yaml;
+  };
+
   # HURRICANE ELECTRIC CONFIG:
   # networking.sits = {
   #   hurricane = {

machines/servo/services/ddns-he.nix

@@ -0,0 +1,32 @@
+{ config, pkgs, ... }:
+
+{
+  systemd.services.ddns-he = {
+    description = "update dynamic DNS entries for HurricaneElectric";
+    serviceConfig = {
+      EnvironmentFile = config.sops.secrets.ddns_he.path;
+      # TODO: ProtectSystem = "strict";
+      # TODO: ProtectHome = "full";
+      # TODO: PrivateTmp = true;
+    };
+    # HE DDNS API is documented: https://dns.he.net/docs.html
+    script = let
+      crl = "${pkgs.curl}/bin/curl -4";
+    in ''
+      ${crl} "https://he.uninsane.org:$HE_PASSPHRASE@dyn.dns.he.net/nic/update?hostname=he.uninsane.org"
+      ${crl} "https://native.uninsane.org:$HE_PASSPHRASE@dyn.dns.he.net/nic/update?hostname=native.uninsane.org"
+      ${crl} "https://uninsane.org:$HE_PASSPHRASE@dyn.dns.he.net/nic/update?hostname=uninsane.org"
+    '';
+  };
+  systemd.timers.ddns-he = {
+    wantedBy = [ "multi-user.target" ];
+    timerConfig = {
+      OnStartupSec = "2min";
+      OnUnitActiveSec = "10min";
+    };
+  };
+
+  sops.secrets."ddns_he" = {
+    sopsFile = ../../../secrets/servo.yaml;
+  };
+}

machines/servo/services/default.nix

@@ -0,0 +1,17 @@
+{ ... }:
+{
+  imports = [
+    ./ddns-he.nix
+    ./gitea.nix
+    ./ipfs.nix
+    ./jackett.nix
+    ./jellyfin.nix
+    ./matrix
+    ./navidrome.nix
+    ./nginx.nix
+    ./pleroma.nix
+    ./postfix.nix
+    ./postgres.nix
+    ./transmission.nix
+  ];
+}

machines/servo/services/gitea.nix

@@ -1,6 +1,11 @@
 { config, pkgs, lib, ... }:
 
 {
+  sane.impermanence.service-dirs = [
+    # TODO: mode? could be more granular
+    { user = "git"; group = "gitea"; directory = "/var/lib/gitea"; }
+  ];
+  users.groups.gitea.gid = config.sane.allocations.gitea-gid;
   services.gitea.enable = true;
   services.gitea.user = "git";  # default is 'gitea'
   services.gitea.database.type = "postgres";
@@ -8,7 +13,7 @@
   services.gitea.appName = "Perfectly Sane Git";
   services.gitea.domain = "git.uninsane.org";
   services.gitea.rootUrl = "https://git.uninsane.org/";
-  services.gitea.cookieSecure = true;
+  services.gitea.settings.session.COOKIE_SECURE = true;
   # services.gitea.disableRegistration = true;
 
   services.gitea.settings = {
@@ -55,7 +60,7 @@
     };
   };
   # options: "Trace", "Debug", "Info", "Warn", "Error", "Critical"
-  services.gitea.log.level = "Info";
+  services.gitea.settings.log.LEVEL = "Warn";
 
   systemd.services.gitea.serviceConfig = {
     # nix default is AF_UNIX AF_INET AF_INET6.

machines/servo/services/ipfs.nix

@@ -0,0 +1,69 @@
+# admin:
+# - view stats:
+#   - sudo -u ipfs -g ipfs ipfs -c /var/lib/ipfs/ stats bw
+#   - sudo -u ipfs -g ipfs ipfs -c /var/lib/ipfs/ stats dht
+#   - sudo -u ipfs -g ipfs ipfs -c /var/lib/ipfs/ bitswap stat
+# - number of open peer connections:
+#   - sudo -u ipfs -g ipfs ipfs -c /var/lib/ipfs/ swarm peers | wc -l
+
+{ ... }:
+{
+  sane.impermanence.service-dirs = [
+    # TODO: mode? could be more granular
+    { user = "261"; group = "261"; directory = "/var/lib/ipfs"; }
+  ];
+  # services.ipfs.enable = true;
+  services.kubo.localDiscovery = true;
+  services.kubo.swarmAddress = [
+    # "/dns4/ipfs.uninsane.org/tcp/4001"
+    # "/ip4/0.0.0.0/tcp/4001"
+    "/dns4/ipfs.uninsane.org/udp/4001/quic"
+    "/ip4/0.0.0.0/udp/4001/quic"
+  ];
+  services.kubo.extraConfig = {
+    Addresses = {
+      Announce = [
+        # "/dns4/ipfs.uninsane.org/tcp/4001"
+        "/dns4/ipfs.uninsane.org/udp/4001/quic"
+      ];
+    };
+    Gateway = {
+      # the gateway can only be used to serve content already replicated on this host
+      NoFetch = true;
+    };
+    Swarm = {
+      ConnMgr = {
+        # maintain between LowWater and HighWater peer connections
+        # taken from: https://github.com/ipfs/ipfs-desktop/pull/2055
+        # defaults are 600-900: https://github.com/ipfs/kubo/blob/master/docs/config.md#swarmconnmgr
+        LowWater = 20;
+        HighWater = 40;
+        # default is 20s. i guess more grace period = less churn
+        GracePeriod = "1m";
+      };
+      ResourceMgr = {
+        # docs: https://github.com/libp2p/go-libp2p-resource-manager#resource-scopes
+        Enabled = true;
+        Limits = {
+          System = {
+            Conns = 196;
+            ConnsInbound = 128;
+            ConnsOutbound = 128;
+            FD = 512;
+            Memory = 1073741824;  # 1GiB
+            Streams = 1536;
+            StreamsInbound = 1024;
+            StreamsOutbound = 1024;
+          };
+        };
+      };
+      Transports = {
+        Network = {
+          # disable TCP, force QUIC, for lighter resources
+          TCP = false;
+          QUIC = true;
+        };
+      };
+    };
+  };
+}

machines/servo/services/jackett.nix

@@ -1,6 +1,10 @@
-{ config, pkgs, lib, ... }:
+{ ... }:
 
 {
+  sane.impermanence.service-dirs = [
+    # TODO: mode? we only need this to save Indexer creds ==> migrate to config?
+    { user = "root"; group = "root"; directory = "/var/lib/jackett"; }
+  ];
   services.jackett.enable = true;
 
   systemd.services.jackett.after = ["wg0veth.service"];

machines/servo/services/jellyfin.nix

@@ -0,0 +1,14 @@
+{ config, ... }:
+
+{
+  sane.impermanence.service-dirs = [
+    # TODO: mode? could be more granular
+    { user = "jellyfin"; group = "jellyfin"; directory = "/var/lib/jellyfin"; }
+  ];
+
+  # users.users.jellyfin.uid = config.sane.allocations.jellyfin-uid;
+  # users.groups.jellyfin.gid = config.sane.allocations.jellyfin-gid;
+  # TODO: re-enable after migrating media dir to /var/lib/uninsane/media
+  # else it's too spammy
+  # services.jellyfin.enable = true;
+}

machines/servo/services/matrix/default.nix

@@ -0,0 +1,86 @@
+# docs: https://nixos.wiki/wiki/Matrix
+# docs: https://nixos.org/manual/nixos/stable/index.html#module-services-matrix-synapse
+{ config, lib, ... }:
+
+{
+  imports = [
+    # ./discord-appservice.nix
+    ./discord-puppet.nix
+    # ./irc.nix
+  ];
+
+  sane.impermanence.service-dirs = [
+    { user = "matrix-synapse"; group = "matrix-synapse"; directory = "/var/lib/matrix-synapse"; }
+  ];
+  services.matrix-synapse.enable = true;
+  services.matrix-synapse.settings.log_config = ./synapse-log_level.yaml;
+  services.matrix-synapse.settings.server_name = "uninsane.org";
+
+  # services.matrix-synapse.enable_registration_captcha = true;
+  # services.matrix-synapse.enable_registration_without_verification = true;
+  services.matrix-synapse.settings.enable_registration = true;
+  # services.matrix-synapse.registration_shared_secret = "<shared key goes here>";
+
+  # default for listeners is port = 8448, tls = true, x_forwarded = false.
+  # we change this because the server is situated behind nginx.
+  services.matrix-synapse.settings.listeners = [
+    {
+      port = 8008;
+      bind_addresses = [ "127.0.0.1" ];
+      type = "http";
+      tls = false;
+      x_forwarded = true;
+      resources = [
+        {
+          names = [ "client" "federation" ];
+          compress = false;
+        }
+      ];
+    }
+  ];
+
+  services.matrix-synapse.settings.admin_contact = "admin.matrix@uninsane.org";
+  services.matrix-synapse.settings.registrations_require_3pid = [ "email" ];
+
+  services.matrix-synapse.extraConfigFiles = [
+    config.sops.secrets.matrix_synapse_secrets.path
+  ];
+
+  # services.matrix-synapse.extraConfigFiles = [builtins.toFile "matrix-synapse-extra-config" ''
+  #   admin_contact: "admin.matrix@uninsane.org"
+  #   registrations_require_3pid:
+  #     - email
+  #   email:
+  #     smtp_host: "mx.uninsane.org"
+  #     smtp_port: 587
+  #     smtp_user: "matrix-synapse"
+  #     smtp_pass: "${secrets.matrix-synapse.smtp_pass}"
+  #     require_transport_security: true
+  #     enable_tls: true
+  #     notif_from: "%(app)s <notify.matrix@uninsane.org>"
+  #     app_name: "Uninsane Matrix"
+  #     enable_notifs: true
+  #     validation_token_lifetime: 96h
+  #     invite_client_location: "https://web.matrix.uninsane.org"
+  #     subjects:
+  #       email_validation: "[%(server_name)s] Validate your email"
+  # ''];
+
+  # new users may be registered on the CLI:
+  #   register_new_matrix_user -c /nix/store/8n6kcka37jhmi4qpd2r03aj71pkyh21s-homeserver.yaml http://localhost:8008
+  #
+  # or provide an registration token then can use to register through the client.
+  #   docs: https://github.com/matrix-org/synapse/blob/develop/docs/usage/administration/admin_api/registration_tokens.md
+  # first, grab your own user's access token (Help & About section in Element). then:
+  #   curl --header "Authorization: Bearer <my_token>" localhost:8008/_synapse/admin/v1/registration_tokens
+  # create a token with unlimited uses:
+  #   curl -d '{}' --header "Authorization: Bearer <my_token>" localhost:8008/_synapse/admin/v1/registration_tokens/new
+  # create a token with limited uses:
+  #   curl -d '{ "uses_allowed": 1 }' --header "Authorization: Bearer <my_token>" localhost:8008/_synapse/admin/v1/registration_tokens/new
+
+
+  sops.secrets.matrix_synapse_secrets = {
+    sopsFile = ../../../../secrets/servo.yaml;
+    owner = config.users.users.matrix-synapse.name;
+  };
+}

machines/servo/services/matrix/discord-appservice.nix

@@ -0,0 +1,69 @@
+{ config, lib, ... }:
+
+{
+  sane.impermanence.service-dirs = [
+    { user = "matrix-appservice-discord"; group = "matrix-appservice-discord"; directory = "/var/lib/matrix-appservice-discord"; }
+  ];
+
+  sops.secrets.matrix_appservice_discord_env = {
+    sopsFile = ../../../../secrets/servo/matrix_appservice_discord_env.bin;
+    owner = config.users.users.matrix-appservice-discord.name;
+    format = "binary";
+  };
+
+  services.matrix-synapse.settings.app_service_config_files = [
+    # auto-created by discord appservice
+    "/var/lib/matrix-appservice-discord/discord-registration.yaml"
+  ];
+
+  # Discord bridging
+  # docs: https://github.com/matrix-org/matrix-appservice-discord
+  services.matrix-appservice-discord.enable = true;
+  services.matrix-appservice-discord.settings = {
+    bridge = {
+      homeserverUrl = "http://127.0.0.1:8008";
+      domain = "uninsane.org";
+      adminMxid = "admin.matrix@uninsane.org";
+      # self-service bridging is when a Matrix user bridges by DMing @_discord_bot:<HS>
+      # i don't know what the alternative is :?
+      enableSelfServiceBridging = true;
+      presenceInterval = 30000; # milliseconds
+      # allows matrix users to search for Discord channels (somehow?)
+      disablePortalBridging = false;
+      # disableReadReceipts = true;
+      # these are Matrix -> Discord
+      disableJoinLeaveNotifications = true;
+      disableInviteNotifications = true;
+      disableRoomTopicNotifications = true;
+    };
+    # these are marked as required in the yaml schema
+    auth = {
+      # apparently not needed if you provide them as env vars (below).
+      # clientId = "FILLME";
+      # botToken = "FILLME";
+      usePrivilegedIntents = false;
+    };
+    logging = {
+      # silly, verbose, info, http, warn, error, silent
+      console = "verbose";
+    };
+  };
+  # contains what's ordinarily put into auth.clientId, auth.botToken
+  # i.e. `APPSERVICE_DISCORD_AUTH_CLIENT_I_D=...` and `APPSERVICE_DISCORD_AUTH_BOT_TOKEN=...`
+  services.matrix-appservice-discord.environmentFile = config.sops.secrets.matrix_appservice_discord_env.path;
+
+  systemd.services.matrix-appservice-discord.serviceConfig = {
+    # fix up to not use /var/lib/private, but just /var/lib
+    DynamicUser = lib.mkForce false;
+    User = "matrix-appservice-discord";
+    Group = "matrix-appservice-discord";
+  };
+  users.groups.matrix-appservice-discord = {};
+  users.users.matrix-appservice-discord = {
+    description = "User for the Matrix-Discord bridge";
+    group = "matrix-appservice-discord";
+    isSystemUser = true;
+  };
+  users.users.matrix-appservice-discord.uid = 2134;  # TODO: move to allocations
+  users.groups.matrix-appservice-discord.gid = 2134;  # TODO
+}

machines/servo/services/matrix/discord-puppet.nix

@@ -0,0 +1,52 @@
+{ lib, ... }:
+{
+  sane.impermanence.service-dirs = [
+    { user = "matrix-synapse"; group = "matrix-synapse"; directory = "/var/lib/mx-puppet-discord"; }
+  ];
+
+  services.matrix-synapse.settings.app_service_config_files = [
+    # auto-created by mx-puppet-discord service
+    "/var/lib/mx-puppet-discord/discord-registration.yaml"
+  ];
+
+  services.mx-puppet-discord.enable = true;
+  # schema/example: <https://gitlab.com/mx-puppet/discord/mx-puppet-discord/-/blob/main/sample.config.yaml>
+  services.mx-puppet-discord.settings = {
+    bridge = {
+      # port = 8434
+      bindAddress = "127.0.0.1";
+      domain = "uninsane.org";
+      homeserverUrl = "http://127.0.0.1:8008";
+      # displayName = "mx-discord-puppet";  # matrix name for the bot
+      # matrix "groups" were an earlier version of spaces.
+      # maybe the puppet understands this, maybe not?
+      enableGroupSync = false;
+    };
+    presence = {
+      enabled = false;
+      interval = 30000;
+    };
+    provisioning = {
+      # allow these users to control the puppet
+      whitelist = [ "@colin:uninsane\\.org" ];
+    };
+    relay = {
+      whitelist = [ "@colin:uninsane\\.org" ];
+    };
+    selfService = {
+      # who's allowed to use plumbed rooms (idk what that means)
+      whitelist = [ "@colin:uninsane\\.org" ];
+    };
+    logging = {
+      # silly, debug, verbose, info, warn, error
+      console = "debug";
+    };
+  };
+
+  systemd.services.mx-puppet-discord.serviceConfig = {
+    # fix up to not use /var/lib/private, but just /var/lib
+    DynamicUser = lib.mkForce false;
+    User = "matrix-synapse";
+    Group = "matrix-synapse";
+  };
+}

machines/servo/services/matrix/irc.nix

@@ -0,0 +1,97 @@
+{ config, lib, ... }:
+
+{
+  sane.impermanence.service-dirs = [
+    # TODO: mode?
+    # user and group are both "matrix-appservice-irc"
+    { user = "993"; group = "992"; directory = "/var/lib/matrix-appservice-irc"; }
+  ];
+
+  services.matrix-synapse.settings.app_service_config_files = [
+    "/var/lib/matrix-appservice-irc/registration.yml"  # auto-created by irc appservice
+  ];
+
+  # note: Rizon allows only FOUR simultaneous IRC connections per IP: https://wiki.rizon.net/index.php?title=Connection/Session_Limit_Exemptions
+  # Rizon supports CertFP for auth: https://wiki.rizon.net/index.php?title=CertFP
+  services.matrix-appservice-irc.enable = true;
+  services.matrix-appservice-irc.registrationUrl = "http://127.0.0.1:8009";
+  # settings documented here: https://github.com/matrix-org/matrix-appservice-irc/blob/develop/config.sample.yaml
+  services.matrix-appservice-irc.settings = {
+    homeserver = {
+      url = "http://127.0.0.1:8008";
+      dropMatrixMessagesAfterSecs = 300;
+      domain = "uninsane.org";
+      enablePresence = true;
+      bindPort = 9999;
+      bindHost = "127.0.0.1";
+    };
+
+    ircService = {
+      servers = {
+        "irc.rizon.net" = {
+          name = "Rizon";
+          port = 6697;  # SSL port
+          ssl = true;
+          sasl = true;  # appservice doesn't support NickServ identification
+          botConfig = {
+            # bot has no presence in IRC channel; only real Matrix users
+            enabled = false;
+            # nick = "UninsaneDotOrg";
+            nick = "uninsane";
+            username = "uninsane";
+          };
+          dynamicChannels = {
+            enabled = true;
+            aliasTemplate = "#irc_rizon_$CHANNEL";
+          };
+          ircClients = {
+            nickTemplate = "$LOCALPARTsane";
+            # by default, Matrix will convert messages greater than (3) lines into a pastebin-like URL to send to IRC.
+            lineLimit = 20;
+          };
+          matrixClients = {
+            userTemplate = "@irc_rizon_$NICK";  # the :uninsane.org part is appended automatically
+          };
+
+          # this will let this user message the appservice with `!join #<IRCChannel>` and the rest "Just Works"
+          "@colin:uninsane.org" = "admin";
+
+          membershipLists = {
+            enabled = true;
+            global = {
+              ircToMatrix = {
+                initial = true;
+                incremental = true;
+                requireMatrixJoined = false;
+              };
+              matrixToIrc = {
+                initial = true;
+                incremental = true;
+              };
+            };
+          };
+          # sync room description?
+          bridgeInfoState = {
+            enabled = true;
+            initial = true;
+          };
+
+          # hardcoded mappings, for when dynamicChannels fails us. TODO: probably safe to remove these.
+          # mappings = {
+          #   "#chat" = {
+          #     roomIds = [ "!GXJSOTdbtxRboGtDep:uninsane.org" ];
+          #   };
+          #   # BakaBT requires account registration, which i think means my user needs to be added before the appservice user
+          #   "#BakaBT" = {
+          #     roomIds = [ "!feZKttuYuHilqPFSkD:uninsane.org" ];
+          #   };
+          # };
+          # for per-user IRC password:
+          #   invite @irc_rizon_NickServ:uninsane.org to a DM and type `help`  => register
+          #   invite the matrix-appservice-irc user to a DM and type `!help`   => add PW to database
+          # passwordEncryptionKeyPath = "/path/to/privkey";  # appservice will generate its own if unspecified
+        };
+      };
+    };
+  };
+}

machines/servo/services/matrix/synapse-log_level.yaml

@@ -0,0 +1,27 @@
+version: 1
+
+# In systemd's journal, loglevel is implicitly stored, so let's omit it
+# from the message text.
+formatters:
+    journal_fmt:
+        format: '%(name)s: [%(request)s] %(message)s'
+
+filters:
+    context:
+        (): synapse.util.logcontext.LoggingContextFilter
+        request: ""
+
+handlers:
+    journal:
+        class: systemd.journal.JournalHandler
+        formatter: journal_fmt
+        filters: [context]
+        SYSLOG_IDENTIFIER: synapse
+
+# default log level: INFO
+root:
+    level: WARN
+    handlers: [journal]
+
+disable_existing_loggers: False
+

machines/servo/services/navidrome.nix

@@ -0,0 +1,17 @@
+{ ... }:
+
+{
+  sane.impermanence.service-dirs = [
+    { user = "navidrome"; group = "navidrome"; directory = "/var/lib/private/navidrome"; }
+  ];
+  services.navidrome.enable = true;
+  services.navidrome.settings = {
+    # docs: https://www.navidrome.org/docs/usage/configuration-options/
+    Address = "127.0.0.1";
+    Port = 4533;
+    MusicFolder = "/var/lib/uninsane/media/Music";
+    CovertArtPriority = "*.jpg, *.JPG, *.png, *.PNG, embedded";
+    AutoImportPlaylists = false;
+    ScanSchedule = "@every 1h";
+  };
+}

machines/servo/services/nginx.nix

@@ -6,8 +6,11 @@
 
   # web blog/personal site
   services.nginx.virtualHosts."uninsane.org" = {
-    root = "/opt/uninsane/root";
-    addSSL = true;
+    root = "/var/lib/uninsane/root";
+    # a lot of places hardcode https://uninsane.org,
+    # and then when we mix http + non-https, we get CORS violations
+    # and things don't look right. so force SSL.
+    forceSSL = true;
     enableACME = true;
 
     # allow matrix users to discover that @user:uninsane.org is reachable via matrix.uninsane.org
@@ -210,6 +213,29 @@
     };
   };
 
+  services.nginx.virtualHosts."music.uninsane.org" = {
+    forceSSL = true;
+    enableACME = true;
+    locations."/".proxyPass = "http://127.0.0.1:4533";
+  };
+
+  services.nginx.virtualHosts."ipfs.uninsane.org" = {
+    # don't default to ssl upgrades, since this may be dnslink'd from a different domain.
+    # ideally we'd disable ssl entirely, but some places assume it?
+    addSSL = true;
+    enableACME = true;
+
+    default = true;
+
+    locations."/" = {
+      proxyPass = "http://127.0.0.1:8080";
+      extraConfig = ''
+        proxy_set_header Host $host;
+        proxy_set_header X-Ipfs-Gateway-Prefix "";
+      '';
+    };
+  };
+
   # exists only to manage certs for dovecot
   services.nginx.virtualHosts."imap.uninsane.org" = {
     forceSSL = true;
@@ -234,4 +260,12 @@
 
   security.acme.acceptTerms = true;
   security.acme.defaults.email = "admin.acme@uninsane.org";
+
+  users.users.acme.uid = config.sane.allocations.acme-uid;
+  users.groups.acme.gid = config.sane.allocations.acme-gid;
+  sane.impermanence.service-dirs = [
+    # TODO: mode?
+    { user = "acme"; group = "acme"; directory = "/var/lib/acme"; }
+    { user = "colin"; group = "users"; directory = "/var/lib/uninsane"; }
+  ];
 }

machines/servo/services/pleroma.nix

@@ -1,22 +1,27 @@
 # docs: https://github.com/NixOS/nixpkgs/blob/master/nixos/modules/services/networking/pleroma.nix
 #
 # to run it in a oci-container: https://github.com/barrucadu/nixfiles/blob/master/services/pleroma.nix
-{ config, pkgs, lib, secrets, ... }:
+{ config, pkgs, ... }:
 
 {
+  sane.impermanence.service-dirs = [
+    # TODO: mode? could be more granular
+    { user = "pleroma"; group = "pleroma"; directory = "/var/lib/pleroma"; }
+  ];
+  users.users.pleroma.uid = config.sane.allocations.pleroma-uid;
+  users.groups.pleroma.gid = config.sane.allocations.pleroma-gid;
   services.pleroma.enable = true;
-  # TODO: we should write a config file somewhere outside the store... somehow.
-  services.pleroma.secretConfigFile = "/dev/null";
+  services.pleroma.secretConfigFile = config.sops.secrets.pleroma_secrets.path;
   services.pleroma.configs = [
     ''
     import Config
-    
+
     config :pleroma, Pleroma.Web.Endpoint,
       url: [host: "fed.uninsane.org", scheme: "https", port: 443],
-      http: [ip: {127, 0, 0, 1}, port: 4000],
-      secret_key_base: "${secrets.pleroma.secret_key_base}",
-      signing_salt: "${secrets.pleroma.signing_salt}"
-    
+      http: [ip: {127, 0, 0, 1}, port: 4000]
+    #   secret_key_base: "{secrets.pleroma.secret_key_base}",
+    #   signing_salt: "{secrets.pleroma.signing_salt}"
+
     config :pleroma, :instance,
       name: "Perfectly Sane",
       description: "Single-user Pleroma instance",
@@ -42,11 +47,10 @@
       enabled: false,
       redirect_on_failure: true
       #base_url: "https://cache.pleroma.social"
-    
+
     config :pleroma, Pleroma.Repo,
       adapter: Ecto.Adapters.Postgres,
       username: "pleroma",
-      password: "${secrets.pleroma.db_password}",
       database: "pleroma",
       hostname: "localhost",
       pool_size: 10,
@@ -54,15 +58,16 @@
       parameters: [
           plan_cache_mode: "force_custom_plan"
       ]
+    #   password: "{secrets.pleroma.db_password}",
 
     # Configure web push notifications
     config :web_push_encryption, :vapid_details,
-      subject: "mailto:notify.pleroma@uninsane.org",
-      public_key: "${secrets.pleroma.vapid_public_key}",
-      private_key: "${secrets.pleroma.vapid_private_key}"
+      subject: "mailto:notify.pleroma@uninsane.org"
+    #   public_key: "{secrets.pleroma.vapid_public_key}",
+    #   private_key: "{secrets.pleroma.vapid_private_key}"
+
+    # config :joken, default_signer: "{secrets.pleroma.joken_default_signer}"
 
-    config :joken, default_signer: "${secrets.pleroma.joken_default_signer}"
-    
     config :pleroma, :database, rum_enabled: false
     config :pleroma, :instance, static_dir: "/var/lib/pleroma/instance/static"
     config :pleroma, Pleroma.Uploaders.Local, uploads: "/var/lib/pleroma/uploads"
@@ -81,14 +86,14 @@
     # Enable Strict-Transport-Security once SSL is working:
     config :pleroma, :http_security,
       sts: true
-    
+
     # docs: https://docs.pleroma.social/backend/configuration/cheatsheet/#logger
     config :logger,
       backends: [{ExSyslogger, :ex_syslogger}]
-    
+
     config :logger, :ex_syslogger,
-      level: :warn
-    #  level: :debug
+      level: :debug
+    #  level: :warn
 
     # XXX colin: not sure if this actually _does_ anything
     config :pleroma, :emoji,
@@ -124,4 +129,9 @@
   #   PrivateTmp = lib.mkForce false;
   #   CapabilityBoundingSet = lib.mkForce "~";
   # };
+
+  sops.secrets.pleroma_secrets = {
+    sopsFile = ../../../secrets/servo.yaml;
+    owner = config.users.users.pleroma.name;
+  };
 }

machines/servo/services/postfix.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, lib, secrets, ... }:
+{ config, lib, ... }:
 
 let
   submissionOptions = {
@@ -16,6 +16,11 @@ let
   };
 in
 {
+  sane.impermanence.service-dirs = [
+    # TODO: mode? could be more granular
+    { user = "221"; group = "221"; directory = "/var/lib/opendkim"; }
+    { user = "root"; group = "root"; directory = "/var/lib/postfix"; }
+  ];
   services.postfix.enable = true;
   services.postfix.hostname = "mx.uninsane.org";
   services.postfix.origin = "uninsane.org";
@@ -82,10 +87,7 @@ in
   services.dovecot2.enablePAM = false;
   services.dovecot2.extraConfig =
   let
-    passwdFile = builtins.toFile "dovecot-passwd-file" ''
-      colin:${secrets.dovecot.hashedPasswd.colin}:1000:1000::/var/mail/colin/run/current-system/sw/bin/nologin:
-      matrix-synapse:${secrets.dovecot.hashedPasswd.matrix-synapse}:224:224::/var/mail/colin:/run/current-system/sw/bin/nologin:
-      '';
+    passwdFile = config.sops.secrets.dovecot_passwd.path;
   in
     ''
     passdb {
@@ -133,4 +135,11 @@ in
     #   pattern = "/^Subject:.*activate your account/";
     # }
   ];
+
+  sops.secrets.dovecot_passwd = {
+    sopsFile = ../../../secrets/servo.yaml;
+    owner = config.users.users.dovecot2.name;
+    # TODO: debug why mail can't be sent without this being world-readable
+    mode = "0444";
+  };
 }

machines/servo/services/postgres.nix

@@ -1,8 +1,12 @@
-{ config, pkgs, lib, ... }:
+{ ... }:
 
 {
+  sane.impermanence.service-dirs = [
+    # TODO: mode?
+    { user = "71"; group = "71"; directory = "/var/lib/postgresql"; }
+  ];
   services.postgresql.enable = true;
-  services.postgresql.dataDir = "/opt/postgresql/13";
+  # services.postgresql.dataDir = "/opt/postgresql/13";
   # XXX colin: for a proper deploy, we'd want to include something for Pleroma here too.
   # services.postgresql.initialScript = pkgs.writeText "synapse-init.sql" ''
   #   CREATE ROLE "matrix-synapse" WITH LOGIN PASSWORD '<password goes here>';

machines/servo/services/transmission.nix

@@ -1,6 +1,10 @@
-{ config, pkgs, lib, ... }:
+{ ... }:
 
 {
+  sane.impermanence.service-dirs = [
+    # TODO: mode? we need this specifically for the stats tracking in .config/
+    { user = "70"; group = "70"; directory = "/var/lib/transmission"; }
+  ];
   services.transmission.enable = true;
   services.transmission.settings = {
     rpc-bind-address = "0.0.0.0";
@@ -14,6 +18,8 @@
     rpc-whitelist-enabled = false;
 
     # download-dir = "/opt/uninsane/media/";
+    # hopefully, make the downloads world-readable
+    umask = 0;
 
     # force peer connections to be encrypted
     encryption = 2;
@@ -21,9 +27,15 @@
     # units in kBps
     speed-limit-down = 3000;
     speed-limit-down-enabled = true;
-    speed-limit-up = 600;
+    speed-limit-up = 300;
     speed-limit-up-enabled = true;
 
+    # see: https://git.zknt.org/mirror/transmission/commit/cfce6e2e3a9b9d31a9dafedd0bdc8bf2cdb6e876?lang=bg-BG
+    anti-brute-force-enabled = false;
+
+    download-dir = "/var/lib/uninsane/media";
+    incomplete-dir = "/var/lib/uninsane/media/incomplete";
+
   };
   # transmission will by default not allow the world to read its files.
   services.transmission.downloadDirPermissions = "775";
@@ -32,6 +44,7 @@
   systemd.services.transmission.serviceConfig = {
     # run this behind the OVPN static VPN
     NetworkNamespacePath = "/run/netns/ovpns";
+    LogLevelMax = "warning";
   };
 }
 

machines/servo/users.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, lib, ... }:
+{ config, ... }:
 
 # installer docs: https://github.com/NixOS/nixpkgs/blob/master/nixos/modules/profiles/installation-device.nix
 {
@@ -12,6 +12,7 @@
     home = "/var/lib/gitea";
     useDefaultShell = true;
     group = "gitea";
+    uid = config.sane.allocations.git-uid;
     isSystemUser = true;
     # sendmail access (not 100% sure if this is necessary)
     extraGroups = [ "postdrop" ];

machines/uninsane/default.nix

@@ -1,39 +0,0 @@
-{ pkgs, lib, ... }:
-
-{
-  imports = [
-    ./../../helpers/universal
-    ./fs.nix
-    ./hardware.nix
-    ./net.nix
-    ./users.nix
-    ./services/ddns-he.nix
-    ./services/duplicity.nix
-    ./services/gitea.nix
-    ./services/jackett.nix
-    ./services/jellyfin.nix
-    ./services/matrix.nix
-    ./services/nginx.nix
-    ./services/nix-serve.nix
-    ./services/pleroma.nix
-    ./services/postfix.nix
-    ./services/postgres.nix
-    ./services/transmission.nix
-  ];
-
-  home-manager.users.colin = import ../../helpers/home-manager-gen-colin.nix {
-    inherit pkgs lib;
-    system = "aarch64-linux";
-    gui = null;
-    extraPackages = [ pkgs.matrix-synapse ];
-  };
-
-  # This value determines the NixOS release from which the default
-  # settings for stateful data, like file locations and database versions
-  # on your system were taken. It‘s perfectly fine and recommended to leave
-  # this value at the release version of the first install of this system.
-  # Before changing this value read the documentation for this option
-  # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
-  system.stateVersion = "21.11"; # Did you read the comment?
-}
-

machines/uninsane/fs.nix

@@ -1,37 +0,0 @@
-{ config, pkgs, lib, ... }:
-
-{
-  fileSystems."/" = lib.mkDefault {
-    device = "/dev/disk/by-uuid/2be70d38-79f4-41b6-bee2-bce5a25f8f7b";
-    fsType = "ext4";
-  };
-  fileSystems."/boot" = {
-    device = lib.mkDefault "/dev/disk/by-uuid/B318-A67E";
-    fsType = "vfat";
-  };
-
-
-  fileSystems."/var/lib/pleroma" = {
-    device = "/opt/pleroma";
-    options = [ "bind" ];
-  };
-
-  fileSystems."/var/lib/transmission/Downloads" = {
-    device = "/opt/uninsane/media";
-    options = [ "bind" ];
-  };
-  fileSystems."/var/lib/transmission/.incomplete" = {
-    device = "/opt/uninsane/media/incomplete";
-    options = [ "bind" ];
-  };
-
-  # in-memory compressed RAM (seems to be dynamically sized)
-  zramSwap = {
-    enable = true;
-  };
-
-  swapDevices = [
-    { device = "/swapfile"; size = 4096; }
-  ];
-}
-

machines/uninsane/services/ddns-he.nix

@@ -1,20 +0,0 @@
-{ pkgs, secrets, ... }:
-
-{
-  systemd.services.ddns-he = {
-    description = "update dynamic DNS entries for HurricaneElectric";
-    # HE DDNS API is documented: https://dns.he.net/docs.html
-    script = let
-      pass = secrets.ddns-he.password;
-      crl = "${pkgs.curl}/bin/curl -4";
-    in ''
-      ${crl} "https://he.uninsane.org:${pass}@dyn.dns.he.net/nic/update?hostname=he.uninsane.org"
-      ${crl} "https://native.uninsane.org:${pass}@dyn.dns.he.net/nic/update?hostname=native.uninsane.org"
-      ${crl} "https://uninsane.org:${pass}@dyn.dns.he.net/nic/update?hostname=uninsane.org"
-    '';
-  };
-  systemd.timers.ddns-he.timerConfig = {
-    OnStartupSec = "2min";
-    OnUnitActiveSec = "10min";
-  };
-}

machines/uninsane/services/duplicity.nix

@@ -1,36 +0,0 @@
-# docs: https://search.nixos.org/options?channel=21.11&query=duplicity
-{ config, pkgs, lib, secrets, ... }:
-
-{
-  services.duplicity.enable = true;
-  services.duplicity.targetUrl = secrets.duplicity.url;
-  # format: PASSPHRASE=<cleartext>
-  # two sisters
-  services.duplicity.secretFile =
-    builtins.toFile "duplicity_env" "PASSPHRASE=${secrets.duplicity.passphrase}";
-  # NB: manually trigger with `systemctl start duplicity`
-  services.duplicity.frequency = "daily";
-  services.duplicity.exclude = [
-    # impermanent/inconsequential data:
-    "/dev"
-    "/proc"
-    "/run"
-    "/sys"
-    "/tmp"
-    # bind mounted (dupes):
-    "/var/lib/pleroma"
-    "/var/lib/transmission/Downloads"
-    "/var/lib/transmission/.incomplete"
-    # data that's not worth the cost to backup:
-    "/opt/uninsane/media"
-  ];
-
-  services.duplicity.extraFlags = [
-    # without --allow-source-mismatch, duplicity will abort if you change the hostname between backups
-    "--allow-source-mismatch"
-  ];
-
-  # set this for the FIRST backup, then remove it to enable incremental backups
-  #   (that the first backup *isn't* full i think is a defect)
-  # services.duplicity.fullIfOlderThan = "always";
-}

machines/uninsane/services/jellyfin.nix

@@ -1,5 +0,0 @@
-{ config, pkgs, lib, ... }:
-
-{
-  services.jellyfin.enable = true;
-}

machines/uninsane/services/matrix.nix

@@ -1,175 +0,0 @@
-# docs: https://nixos.wiki/wiki/Matrix
-# docs: https://nixos.org/manual/nixos/stable/index.html#module-services-matrix-synapse
-{ config, pkgs, lib, secrets, ... }:
-
-{
-  services.matrix-synapse.enable = true;
-  services.matrix-synapse.settings.server_name = "uninsane.org";
-
-  # services.matrix-synapse.enable_registration_captcha = true;
-  # services.matrix-synapse.enable_registration_without_verification = true;
-  services.matrix-synapse.settings.enable_registration = true;
-  # services.matrix-synapse.registration_shared_secret = "<shared key goes here>";
-
-  # default for listeners is port = 8448, tls = true, x_forwarded = false.
-  # we change this because the server is situated behind nginx.
-  services.matrix-synapse.settings.listeners = [
-    {
-      port = 8008;
-      bind_addresses = [ "127.0.0.1" ];
-      type = "http";
-      tls = false;
-      x_forwarded = true;
-      resources = [
-        {
-          names = [ "client" "federation" ];
-          compress = false;
-        }
-      ];
-    }
-  ];
-
-  # services.matrix-synapse.extraConfig = ''
-  #   registration_requires_token: true
-  #   admin_contact: "admin.matrix@uninsane.org"
-  # '';
-
-  services.matrix-synapse.settings.admin_contact = "admin.matrix@uninsane.org";
-  services.matrix-synapse.settings.registrations_require_3pid = [ "email" ];
-  services.matrix-synapse.settings.email = {
-    smtp_host = "mx.uninsane.org";
-    smtp_port = 587;
-    smtp_user = "matrix-synapse";
-    smtp_pass = secrets.matrix-synapse.smtp_pass;
-    require_transport_security = true;
-    enable_tls = true;
-    notif_from = "%(app)s <notify.matrix@uninsane.org>";
-    app_name = "Uninsane Matrix";
-    enable_notifs = true;
-    validation_token_lifetime = "96h";
-    invite_client_location = "https://web.matrix.uninsane.org";
-    subjects = {
-      email_validation = "[%(server_name)s] Validate your email";
-    };
-  };
-
-  # services.matrix-synapse.extraConfigFiles = [builtins.toFile "matrix-synapse-extra-config" ''
-  #   admin_contact: "admin.matrix@uninsane.org"
-  #   registrations_require_3pid:
-  #     - email
-  #   email:
-  #     smtp_host: "mx.uninsane.org"
-  #     smtp_port: 587
-  #     smtp_user: "matrix-synapse"
-  #     smtp_pass: "${secrets.matrix-synapse.smtp_pass}"
-  #     require_transport_security: true
-  #     enable_tls: true
-  #     notif_from: "%(app)s <notify.matrix@uninsane.org>"
-  #     app_name: "Uninsane Matrix"
-  #     enable_notifs: true
-  #     validation_token_lifetime: 96h
-  #     invite_client_location: "https://web.matrix.uninsane.org"
-  #     subjects:
-  #       email_validation: "[%(server_name)s] Validate your email"
-  # ''];
-  services.matrix-synapse.settings.app_service_config_files = [
-    "/var/lib/matrix-appservice-irc/registration.yml"  # auto-created by irc appservice
-  ];
-
-  # new users may be registered on the CLI:
-  #   register_new_matrix_user -c /nix/store/8n6kcka37jhmi4qpd2r03aj71pkyh21s-homeserver.yaml http://localhost:8008
-  #
-  # or provide an registration token then can use to register through the client.
-  #   docs: https://github.com/matrix-org/synapse/blob/develop/docs/usage/administration/admin_api/registration_tokens.md
-  # first, grab your own user's access token (Help & About section in Element). then:
-  #   curl --header "Authorization: Bearer <my_token>" localhost:8008/_synapse/admin/v1/registration_tokens
-  # create a token with unlimited uses:
-  #   curl -d '{}' --header "Authorization: Bearer <my_token>" localhost:8008/_synapse/admin/v1/registration_tokens/new
-  # create a token with limited uses:
-  #   curl -d '{ "uses_allowed": 1 }' --header "Authorization: Bearer <my_token>" localhost:8008/_synapse/admin/v1/registration_tokens/new
-
-  # IRC bridging
-  # note: Rizon allows only FOUR simultaneous IRC connections per IP: https://wiki.rizon.net/index.php?title=Connection/Session_Limit_Exemptions
-  # Rizon supports CertFP for auth: https://wiki.rizon.net/index.php?title=CertFP
-  # services.matrix-appservice-irc.enable = true;
-  services.matrix-appservice-irc.registrationUrl = "http://127.0.0.1:8009";
-  # settings documented here: https://github.com/matrix-org/matrix-appservice-irc/blob/develop/config.sample.yaml
-  services.matrix-appservice-irc.settings = {
-    homeserver = {
-      url = "http://127.0.0.1:8008";
-      dropMatrixMessagesAfterSecs = 300;
-      domain = "uninsane.org";
-      enablePresence = true;
-      bindPort = 9999;
-      bindHost = "127.0.0.1";
-    };
-
-    ircService = {
-      servers = {
-        "irc.rizon.net" = {
-          name = "Rizon";
-          port = 6697;  # SSL port
-          ssl = true;
-          sasl = true;  # appservice doesn't support NickServ identification
-          botConfig = {
-            # bot has no presence in IRC channel; only real Matrix users
-            enabled = false;
-            # nick = "UninsaneDotOrg";
-            nick = "uninsane";
-            username = "uninsane";
-          };
-          dynamicChannels = {
-            enabled = true;
-            aliasTemplate = "#irc_rizon_$CHANNEL";
-          };
-          ircClients = {
-            nickTemplate = "$LOCALPARTsane";
-            # by default, Matrix will convert messages greater than (3) lines into a pastebin-like URL to send to IRC.
-            lineLimit = 20;
-          };
-          matrixClients = {
-            userTemplate = "@irc_rizon_$NICK";  # the :uninsane.org part is appended automatically
-          };
-
-          # this will let this user message the appservice with `!join #<IRCChannel>` and the rest "Just Works"
-          "@colin:uninsane.org" = "admin";
-
-          membershipLists = {
-            enabled = true;
-            global = {
-              ircToMatrix = {
-                initial = true;
-                incremental = true;
-                requireMatrixJoined = false;
-              };
-              matrixToIrc = {
-                initial = true;
-                incremental = true;
-              };
-            };
-          };
-          # sync room description?
-          bridgeInfoState = {
-            enabled = true;
-            initial = true;
-          };
-
-          # hardcoded mappings, for when dynamicChannels fails us. TODO: probably safe to remove these.
-          # mappings = {
-          #   "#chat" = {
-          #     roomIds = [ "!GXJSOTdbtxRboGtDep:uninsane.org" ];
-          #   };
-          #   # BakaBT requires account registration, which i think means my user needs to be added before the appservice user
-          #   "#BakaBT" = {
-          #     roomIds = [ "!feZKttuYuHilqPFSkD:uninsane.org" ];
-          #   };
-          # };
-          # for per-user IRC password:
-          #   invite @irc_rizon_NickServ:uninsane.org to a DM and type `help`  => register
-          #   invite the matrix-appservice-irc user to a DM and type `!help`   => add PW to database
-          # passwordEncryptionKeyPath = "/path/to/privkey";  # appservice will generate its own if unspecified
-        };
-      };
-    };
-  };
-}

machines/uninsane/services/nix-serve.nix

@@ -1,12 +0,0 @@
-# docs: https://nixos.wiki/wiki/Binary_Cache
-# to copy something to this machine's nix cache, do:
-#   nix copy --to ssh://nixcache.uninsane.org PACKAGE
-{ secrets, ... }:
-
-{
-  services.nix-serve = {
-    enable = true;
-    secretKeyFile = builtins.toFile "nix-serve-priv-key.pem" secrets.nix-serve.cache-priv-key;
-    #  "/var/cache-priv-key.pem";
-  };
-}

modules/default.nix

@@ -0,0 +1,14 @@
+{ ... }:
+
+{
+  imports = [
+    ./gui
+    ./hardware
+    ./image.nix
+    ./impermanence.nix
+    ./nixcache.nix
+    ./services/duplicity.nix
+    ./services/nixserve.nix
+    ./universal
+  ];
+}

modules/gui/default.nix

@@ -0,0 +1,29 @@
+{ lib, config, ... }:
+
+with lib;
+let
+  cfg = config.sane.gui;
+in
+{
+  imports = [
+    ./gnome.nix
+    ./phosh.nix
+    ./plasma-mobile.nix
+    ./sway.nix
+  ];
+
+  options = {
+    # doesn't directly create outputs. consumed by e.g. home-manager.nix module
+    sane.gui.enable = mkOption {
+      default = false;
+      type = types.bool;
+    };
+  };
+
+  config = lib.mkIf cfg.enable {
+    sane.home-packages.enableGuiPkgs = lib.mkDefault true;
+    sane.home-manager.enable = lib.mkDefault true;
+    # all GUIs use network manager?
+    users.users.nm-iodine.uid = config.sane.allocations.nm-iodine-uid;
+  };
+}

modules/gui/gnome.nix

@@ -0,0 +1,68 @@
+{ lib, config, ... }:
+
+with lib;
+let
+  cfg = config.sane.gui.gnome;
+in
+{
+  options = {
+    sane.gui.gnome.enable = mkOption {
+      default = false;
+      type = types.bool;
+    };
+  };
+
+  config = mkIf cfg.enable {
+    sane.gui.enable = true;
+    # start gnome/gdm on boot
+    services.xserver.enable = true;
+    services.xserver.desktopManager.gnome.enable = true;
+    services.xserver.displayManager.gdm.enable = true;
+
+    # gnome does networking stuff with networkmanager
+    networking.useDHCP = false;
+    networking.networkmanager.enable = true;
+    networking.wireless.enable = lib.mkForce false;
+  };
+  # home-mananger.users.colin extras
+  # obtain these by running `dconf dump /` after manually customizing gnome
+  # TODO: fix "is not of type `GVariant value'"
+  # dconf.settings = lib.mkIf (gui == "gnome") {
+  #   gnome = {
+  #     # control alt-tab behavior
+  #     "org/gnome/desktop/wm/keybindings" = {
+  #       switch-applications = [ "<Super>Tab" ];
+  #       switch-applications-backward=[];
+  #       switch-windows=["<Alt>Tab"];
+  #       switch-windows-backward=["<Super><Alt>Tab"];
+  #     };
+  #     # idle power savings
+  #     "org/gnome/settings-deamon/plugins/power" = {
+  #       idle-brigthness = 50;
+  #       sleep-inactive-ac-type = "nothing";
+  #       sleep-inactive-battery-timeout = 5400;  # seconds
+  #     };
+  #     "org/gnome/shell" = {
+  #       favorite-apps = [
+  #         "org.gnome.Nautilus.desktop"
+  #         "firefox.desktop"
+  #         "kitty.desktop"
+  #         # "org.gnome.Terminal.desktop"
+  #       ];
+  #     };
+  #     "org/gnome/desktop/session" = {
+  #       # how long until considering a session idle (triggers e.g. screen blanking)
+  #       idle-delay = 900;
+  #     };
+  #     "org/gnome/desktop/interface" = {
+  #       text-scaling-factor = 1.25;
+  #     };
+  #     "org/gnome/desktop/media-handling" = {
+  #       # don't auto-mount inserted media
+  #       automount = false;
+  #       automount-open = false;
+  #     };
+  #   };
+  # };
+
+}

modules/gui/phosh.nix

@@ -0,0 +1,69 @@
+{ lib, config, pkgs, ... }:
+
+with lib;
+let
+  cfg = config.sane.gui.phosh;
+in
+{
+  options = {
+    sane.gui.phosh.enable = mkOption {
+      default = false;
+      type = types.bool;
+    };
+  };
+
+  config = mkIf cfg.enable {
+    sane.gui.enable = true;
+
+    users.users.avahi.uid = config.sane.allocations.avahi-uid;
+    users.users.colord.uid = config.sane.allocations.colord-uid;
+    users.users.geoclue.uid = config.sane.allocations.geoclue-uid;
+    users.users.rtkit.uid = config.sane.allocations.rtkit-uid;
+    users.groups.avahi.gid = config.sane.allocations.avahi-gid;
+    users.groups.colord.gid = config.sane.allocations.colord-gid;
+    users.groups.geoclue.gid = config.sane.allocations.geoclue-gid;
+    users.groups.rtkit.gid = config.sane.allocations.rtkit-gid;
+
+    # docs: https://github.com/NixOS/nixpkgs/blob/nixos-22.05/nixos/modules/services/x11/desktop-managers/phosh.nix
+    services.xserver.desktopManager.phosh = {
+      enable = true;
+      user = "colin";
+      group = "users";
+      phocConfig = {
+        # xwayland = "true";
+        # find default outputs by catting /etc/phosh/phoc.ini
+        outputs.DSI-1 = {
+          scale = 1.5;
+        };
+      };
+    };
+
+    # XXX: phosh enables networkmanager by default; can probably disable these lines
+    networking.useDHCP = false;
+    networking.networkmanager.enable = true;
+    networking.wireless.enable = lib.mkForce false;
+
+    # XXX: not clear if these are actually needed?
+    hardware.bluetooth.enable = true;
+    services.blueman.enable = true;
+
+    hardware.opengl.enable = true;
+    hardware.opengl.driSupport = true;
+
+    environment.variables = {
+      # Qt apps won't always start unless this env var is set
+      QT_QPA_PLATFORM = "wayland";
+      # electron apps (e.g. Element) should use the wayland backend
+      # toggle this to have electron apps (e.g. Element) use the wayland backend.
+      # phocConfig.xwayland should be disabled if you do this
+      NIXOS_OZONE_WL = "1";
+    };
+
+    sane.home-manager.extraPackages = with pkgs; [
+      phosh-mobile-settings
+
+      # TODO: see about removing this if the in-built gnome-settings bluetooth manager can work
+      gnome.gnome-bluetooth
+    ];
+  };
+}

modules/gui/plasma-mobile.nix

@@ -0,0 +1,28 @@
+{ lib, config, ... }:
+ 
+with lib;
+let
+  cfg = config.sane.gui.plasma-mobile;
+in
+{
+  options = {
+    sane.gui.plasma-mobile.enable = mkOption {
+      default = false;
+      type = types.bool;
+    };
+  };
+
+  config = mkIf cfg.enable {
+    sane.gui.enable = true;
+    # start plasma-mobile on boot
+    services.xserver.enable = true;
+    services.xserver.desktopManager.plasma5.mobile.enable = true;
+    services.xserver.desktopManager.plasma5.mobile.installRecommendedSoftware = false;  # not all plasma5-mobile packages build for aarch64
+    services.xserver.displayManager.sddm.enable = true;
+   
+    # Plasma does networking stuff with networkmanager, but nix configures the defaults itself
+    # networking.useDHCP = false;
+    # networking.networkmanager.enable = true;
+    # networking.wireless.enable = lib.mkForce false;
+  };
+}

modules/gui/sway.nix

@@ -0,0 +1,587 @@
+{ pkgs, lib, config, ... }:
+ 
+# docs: https://nixos.wiki/wiki/Sway
+with lib;
+let
+  cfg = config.sane.gui.sway;
+in
+{
+  options = {
+    sane.gui.sway.enable = mkOption {
+      default = false;
+      type = types.bool;
+    };
+  };
+  config = mkIf cfg.enable {
+    sane.gui.enable = true;
+    users.users.greeter.uid = config.sane.allocations.greeter-uid;
+    users.groups.greeter.gid = config.sane.allocations.greeter-gid;
+    programs.sway = {
+      # we configure sway with home-manager, but this enable gets us e.g. opengl and fonts
+      enable = true;
+    };
+
+    # TODO: should be able to use SDDM to get interactive login
+    services.greetd = {
+      enable = true;
+      settings = rec {
+        initial_session = {
+          command = "${pkgs.sway}/bin/sway";
+          user = "colin";
+        };
+        default_session = initial_session;
+      };
+    };
+
+    # some programs (e.g. fractal) **require** a "Secret Service Provider"
+    services.gnome.gnome-keyring.enable = true;
+
+    # unlike other DEs, sway configures no audio stack
+    # administer with pw-cli, pw-mon, pw-top commands
+    services.pipewire = {
+      enable = true;
+      alsa.enable = true;
+      alsa.support32Bit = true;  # ??
+      pulse.enable = true;
+    };
+
+    hardware.bluetooth.enable = true;
+    services.blueman.enable = true;
+
+    networking.useDHCP = false;
+    networking.networkmanager.enable = true;
+    networking.wireless.enable = lib.mkForce false;
+
+    sane.home-manager.windowManager.sway = {
+      enable = true;
+      wrapperFeatures.gtk = true;
+      config = rec {
+        terminal = "${pkgs.kitty}/bin/kitty";
+        window = {
+          border = 3; # pixel boundary between windows
+          hideEdgeBorders = "smart"; # don't show border if only window on workspace
+        };
+        output = {
+          ### DESKTOP
+          "Samsung Electric Company S22C300 0x00007F35" = { pos = "0,0"; res = "1920x1080"; };
+          "Goldstar Company Ltd LG ULTRAWIDE 0x00004E94" = { pos = "1920,0"; res = "3440x1440"; };
+
+          ### LAPTOP
+          # shen TV
+          "Pioneer Electronic Corporation VSX-524 0x00000101" = { pos = "0,0"; res = "1920x1080"; };
+          # internal display
+          "Unknown 0x0637 0x00000000" = { pos = "1920,0"; res = "1920x1080"; };
+        };
+
+        # defaults; required for keybindings decl.
+        modifier = "Mod1";
+        # list of launchers: https://www.reddit.com/r/swaywm/comments/v39hxa/your_favorite_launcher/
+        # menu = "${pkgs.dmenu}/bin/dmenu_path";
+        menu = "${pkgs.fuzzel}/bin/fuzzel";
+        # menu = "${pkgs.albert}/bin/albert";
+        left = "h";
+        down = "j";
+        up = "k";
+        right = "l";
+        # XKB key names: https://wiki.linuxquestions.org/wiki/List_of_Keysyms_Recognised_by_Xmodmap
+        keybindings = {
+          "${modifier}+Return" = "exec ${terminal}";
+          "${modifier}+Shift+q" = "kill";
+          "${modifier}+d" = "exec ${menu}";
+
+          "${modifier}+${left}" = "focus left";
+          "${modifier}+${down}" = "focus down";
+          "${modifier}+${up}" = "focus up";
+          "${modifier}+${right}" = "focus right";
+
+          "${modifier}+Left" = "focus left";
+          "${modifier}+Down" = "focus down";
+          "${modifier}+Up" = "focus up";
+          "${modifier}+Right" = "focus right";
+
+          "${modifier}+Shift+${left}" = "move left";
+          "${modifier}+Shift+${down}" = "move down";
+          "${modifier}+Shift+${up}" = "move up";
+          "${modifier}+Shift+${right}" = "move right";
+
+          "${modifier}+Shift+Left" = "move left";
+          "${modifier}+Shift+Down" = "move down";
+          "${modifier}+Shift+Up" = "move up";
+          "${modifier}+Shift+Right" = "move right";
+
+          "${modifier}+b" = "splith";
+          "${modifier}+v" = "splitv";
+          "${modifier}+f" = "fullscreen toggle";
+          "${modifier}+a" = "focus parent";
+
+          "${modifier}+s" = "layout stacking";
+          "${modifier}+w" = "layout tabbed";
+          "${modifier}+e" = "layout toggle split";
+
+          "${modifier}+Shift+space" = "floating toggle";
+          "${modifier}+space" = "focus mode_toggle";
+
+          "${modifier}+1" = "workspace number 1";
+          "${modifier}+2" = "workspace number 2";
+          "${modifier}+3" = "workspace number 3";
+          "${modifier}+4" = "workspace number 4";
+          "${modifier}+5" = "workspace number 5";
+          "${modifier}+6" = "workspace number 6";
+          "${modifier}+7" = "workspace number 7";
+          "${modifier}+8" = "workspace number 8";
+          "${modifier}+9" = "workspace number 9";
+
+          "${modifier}+Shift+1" =
+            "move container to workspace number 1";
+          "${modifier}+Shift+2" =
+            "move container to workspace number 2";
+          "${modifier}+Shift+3" =
+            "move container to workspace number 3";
+          "${modifier}+Shift+4" =
+            "move container to workspace number 4";
+          "${modifier}+Shift+5" =
+            "move container to workspace number 5";
+          "${modifier}+Shift+6" =
+            "move container to workspace number 6";
+          "${modifier}+Shift+7" =
+            "move container to workspace number 7";
+          "${modifier}+Shift+8" =
+            "move container to workspace number 8";
+          "${modifier}+Shift+9" =
+            "move container to workspace number 9";
+
+          "${modifier}+Shift+minus" = "move scratchpad";
+          "${modifier}+minus" = "scratchpad show";
+
+          "${modifier}+Shift+c" = "reload";
+          "${modifier}+Shift+e" =
+            "exec swaynag -t warning -m 'You pressed the exit shortcut. Do you really want to exit sway? This will end your Wayland session.' -b 'Yes, exit sway' 'swaymsg exit'";
+
+          "${modifier}+r" = "mode resize";
+        } // {
+          # media keys
+          XF86MonBrightnessDown = ''exec "${pkgs.brightnessctl}/bin/brightnessctl set 2%-"'';
+          XF86MonBrightnessUp = ''exec "${pkgs.brightnessctl}/bin/brightnessctl set +2%"'';
+
+          XF86AudioRaiseVolume = "exec '${pkgs.pulsemixer}/bin/pulsemixer --change-volume +5'";
+          XF86AudioLowerVolume = "exec '${pkgs.pulsemixer}/bin/pulsemixer --change-volume -5'";
+          XF86AudioMute = "exec '${pkgs.pulsemixer}/bin/pulsemixer --toggle-mute'";
+
+          "${modifier}+Page_Up" = "exec '${pkgs.pulsemixer}/bin/pulsemixer --change-volume +5'";
+          "${modifier}+Page_Down" = "exec '${pkgs.pulsemixer}/bin/pulsemixer --change-volume -5'";
+
+          "${modifier}+Print" = "exec '${pkgs.sway-contrib.grimshot}/bin/grimshot copy area'";
+        };
+
+        # mostly defaults:
+        bars = [{
+          mode = "dock";
+          hiddenState = "hide";
+          position = "top";
+          command = "${pkgs.waybar}/bin/waybar";
+          workspaceButtons = true;
+          workspaceNumbers = true;
+          statusCommand = "${pkgs.i3status}/bin/i3status";
+          fonts = {
+            # names = [ "monospace" "Noto Color Emoji" ];
+            # size = 8.0;
+            # names = [ "Font Awesome 6 Free" "DejaVu Sans" "Hack" ];
+            # names = with config.fonts.fontconfig.defaultFonts; (emoji ++ monospace ++ serif ++ sansSerif);
+            names = with config.fonts.fontconfig.defaultFonts; (monospace ++ emoji);
+            size = 24.0;
+          };
+          trayOutput = "primary";
+          colors = {
+            background = "#000000";
+            statusline = "#ffffff";
+            separator = "#666666";
+            focusedWorkspace = {
+              border = "#4c7899";
+              background = "#285577";
+              text = "#ffffff";
+            };
+            activeWorkspace = {
+              border = "#333333";
+              background = "#5f676a";
+              text = "#ffffff";
+            };
+            inactiveWorkspace = {
+              border = "#333333";
+              background = "#222222";
+              text = "#888888";
+            };
+            urgentWorkspace = {
+              border = "#2f343a";
+              background = "#900000";
+              text = "#ffffff";
+            };
+            bindingMode = {
+              border = "#2f343a";
+              background = "#900000";
+              text = "#ffffff";
+            };
+          };
+        }];
+      };
+    };
+
+    sane.home-manager.programs.waybar = {
+      enable = true;
+      # docs: https://github.com/Alexays/Waybar/wiki/Configuration
+      # format specifiers: https://fmt.dev/latest/syntax.html#syntax
+      settings = {
+        mainBar = {
+          layer = "top";
+          height = 40;
+          modules-left = ["sway/workspaces" "sway/mode"];
+          modules-center = ["sway/window"];
+          modules-right = ["custom/mediaplayer" "clock" "battery" "cpu" "network"];
+          "sway/window" = {
+            max-length = 50;
+          };
+          # include song artist/title. source: https://www.reddit.com/r/swaywm/comments/ni0vso/waybar_spotify_tracktitle/
+          "custom/mediaplayer" = {
+            exec = pkgs.writeShellScript "waybar-mediaplayer" ''
+              player_status=$(${pkgs.playerctl}/bin/playerctl status 2> /dev/null)
+              if [ "$player_status" = "Playing" ]; then
+                echo "$(${pkgs.playerctl}/bin/playerctl metadata artist) - $(${pkgs.playerctl}/bin/playerctl metadata title)"
+              elif [ "$player_status" = "Paused" ]; then
+                echo " $(${pkgs.playerctl}/bin/playerctl metadata artist) - $(${pkgs.playerctl}/bin/playerctl metadata title)"
+              fi
+            '';
+            interval = 2;
+            format = "{}  ";
+            # return-type = "json";
+            on-click = "${pkgs.playerctl}/bin/playerctl play-pause";
+            on-scroll-up = "${pkgs.playerctl}/bin/playerctl next";
+            on-scroll-down = "${pkgs.playerctl}/bin/playerctl previous";
+          };
+          network = {
+            # docs: https://github.com/Alexays/Waybar/blob/master/man/waybar-network.5.scd
+            interval = 2;
+            max-length = 40;
+            # custom :> format specifier explained here: https://github.com/Alexays/Waybar/pull/472
+            format-ethernet = "  {bandwidthUpBits:>}▲ {bandwidthDownBits:>}▼";
+            tooltip-format-ethernet = "{ifname} {bandwidthUpBits:>}▲ {bandwidthDownBits:>}▼";
+
+            format-wifi = "{ifname} ({signalStrength}%) {bandwidthUpBits:>}▲ {bandwidthDownBits:>}▼";
+            tooltip-format-wifi = "{essid} ({signalStrength}%) {bandwidthUpBits:>}▲ {bandwidthDownBits:>}▼";
+
+            format-disconnected = "";
+          };
+          cpu = {
+            format = " {usage:2}%";
+            tooltip = false;
+          };
+          battery = {
+            states = {
+              good = 95;
+              warning = 30;
+              critical = 10;
+            };
+            format = "{icon} {capacity}%";
+            format-icons = [
+              ""
+              ""
+              ""
+              ""
+              ""
+            ];
+          };
+          clock = {
+            format-alt = "{:%a, %d. %b  %H:%M}";
+          };
+        };
+      };
+      # style docs: https://github.com/Alexays/Waybar/wiki/Styling
+      style = ''
+        * {
+          font-family: monospace;
+        }
+
+        /* defaults below: https://github.com/Alexays/Waybar/blob/master/resources/style.css */
+        window#waybar {
+          background-color: rgba(43, 48, 59, 0.5);
+          border-bottom: 3px solid rgba(100, 114, 125, 0.5);
+          color: #ffffff;
+          transition-property: background-color;
+          transition-duration: .5s;
+        }
+
+        window#waybar.hidden {
+          opacity: 0.2;
+        }
+
+        /*
+        window#waybar.empty {
+          background-color: transparent;
+        }
+        window#waybar.solo {
+          background-color: #FFFFFF;
+        }
+        */
+
+        window#waybar.termite {
+          background-color: #3F3F3F;
+        }
+
+        window#waybar.chromium {
+          background-color: #000000;
+          border: none;
+        }
+
+        #workspaces button {
+          padding: 0 5px;
+          background-color: transparent;
+          color: #ffffff;
+          /* Use box-shadow instead of border so the text isn't offset */
+          box-shadow: inset 0 -3px transparent;
+          /* Avoid rounded borders under each workspace name */
+          border: none;
+          border-radius: 0;
+        }
+
+        /* https://github.com/Alexays/Waybar/wiki/FAQ#the-workspace-buttons-have-a-strange-hover-effect */
+        #workspaces button:hover {
+          background: rgba(0, 0, 0, 0.2);
+          box-shadow: inset 0 -3px #ffffff;
+        }
+
+        #workspaces button.focused {
+          background-color: #64727D;
+          box-shadow: inset 0 -3px #ffffff;
+        }
+
+        #workspaces button.urgent {
+          background-color: #eb4d4b;
+        }
+
+        #mode {
+          background-color: #64727D;
+          border-bottom: 3px solid #ffffff;
+        }
+
+        #clock,
+        #battery,
+        #cpu,
+        #memory,
+        #disk,
+        #temperature,
+        #backlight,
+        #network,
+        #pulseaudio,
+        #custom-media,
+        #tray,
+        #mode,
+        #idle_inhibitor,
+        #mpd {
+          padding: 0 10px;
+          color: #ffffff;
+        }
+
+        #window,
+        #workspaces {
+          margin: 0 4px;
+        }
+
+        /* If workspaces is the leftmost module, omit left margin */
+        .modules-left > widget:first-child > #workspaces {
+          margin-left: 0;
+        }
+
+        /* If workspaces is the rightmost module, omit right margin */
+        .modules-right > widget:last-child > #workspaces {
+          margin-right: 0;
+        }
+
+        #clock {
+          background-color: #64727D;
+        }
+
+        #battery {
+          background-color: #ffffff;
+          color: #000000;
+        }
+
+        #battery.charging, #battery.plugged {
+          color: #ffffff;
+          background-color: #26A65B;
+        }
+
+        @keyframes blink {
+          to {
+            background-color: #ffffff;
+            color: #000000;
+          }
+        }
+
+        #battery.critical:not(.charging) {
+          background-color: #f53c3c;
+          color: #ffffff;
+          animation-name: blink;
+          animation-duration: 0.5s;
+          animation-timing-function: linear;
+          animation-iteration-count: infinite;
+          animation-direction: alternate;
+        }
+
+        label:focus {
+          background-color: #000000;
+        }
+
+        #cpu {
+          background-color: #2ecc71;
+          color: #000000;
+        }
+
+        #memory {
+          background-color: #9b59b6;
+        }
+
+        #disk {
+          background-color: #964B00;
+        }
+
+        #backlight {
+          background-color: #90b1b1;
+        }
+
+        #network {
+          background-color: #2980b9;
+        }
+
+        #network.disconnected {
+          background-color: #f53c3c;
+        }
+
+        #pulseaudio {
+          background-color: #f1c40f;
+          color: #000000;
+        }
+
+        #pulseaudio.muted {
+          background-color: #90b1b1;
+          color: #2a5c45;
+        }
+
+        #custom-media {
+          background-color: #66cc99;
+          color: #2a5c45;
+          min-width: 100px;
+        }
+
+        #custom-media.custom-spotify {
+          background-color: #66cc99;
+        }
+
+        #custom-media.custom-vlc {
+          background-color: #ffa000;
+        }
+
+        #temperature {
+          background-color: #f0932b;
+        }
+
+        #temperature.critical {
+          background-color: #eb4d4b;
+        }
+
+        #tray {
+          background-color: #2980b9;
+        }
+
+        #tray > .passive {
+          -gtk-icon-effect: dim;
+        }
+
+        #tray > .needs-attention {
+          -gtk-icon-effect: highlight;
+          background-color: #eb4d4b;
+        }
+
+        #idle_inhibitor {
+          background-color: #2d3436;
+        }
+
+        #idle_inhibitor.activated {
+          background-color: #ecf0f1;
+          color: #2d3436;
+        }
+
+        #mpd {
+          background-color: #66cc99;
+          color: #2a5c45;
+        }
+
+        #mpd.disconnected {
+          background-color: #f53c3c;
+        }
+
+        #mpd.stopped {
+          background-color: #90b1b1;
+        }
+
+        #mpd.paused {
+          background-color: #51a37a;
+        }
+
+        #language {
+          background: #00b093;
+          color: #740864;
+          padding: 0 5px;
+          margin: 0 5px;
+          min-width: 16px;
+        }
+
+        #keyboard-state {
+          background: #97e1ad;
+          color: #000000;
+          padding: 0 0px;
+          margin: 0 5px;
+          min-width: 16px;
+        }
+
+        #keyboard-state > label {
+          padding: 0 5px;
+        }
+
+        #keyboard-state > label.locked {
+          background: rgba(0, 0, 0, 0.2);
+        }
+      '';
+      # style = ''
+      #   * {
+      #     border: none;
+      #     border-radius: 0;
+      #     font-family: Source Code Pro;
+      #   }
+      #   window#waybar {
+      #     background: #16191C;
+      #     color: #AAB2BF;
+      #   }
+      #   #workspaces button {
+      #     padding: 0 5px;
+      #   }
+      #   .custom-spotify {
+      #     padding: 0 10px;
+      #     margin: 0 4px;
+      #     background-color: #1DB954;
+      #     color: black;
+      #   }
+      # '';
+    };
+    sane.home-manager.extraPackages = with pkgs; [
+      swaylock
+      swayidle
+      wl-clipboard
+      mako # notification daemon
+      xdg-utils  # for xdg-open
+      # user stuff
+      # pavucontrol
+      sway-contrib.grimshot
+      gnome.gnome-bluetooth
+      gnome.gnome-control-center
+    ];
+  };
+}
+

modules/hardware/all.nix

@@ -0,0 +1,40 @@
+{ lib, pkgs, ... }:
+
+{
+  boot.initrd.supportedFilesystems = [ "ext4" "btrfs" "ext2" "ext3" "vfat" ];
+  # useful emergency utils
+  boot.initrd.extraUtilsCommands = ''
+    copy_bin_and_libs ${pkgs.btrfs-progs}/bin/btrfstune
+  '';
+  boot.kernelParams = [ "boot.shell_on_fail" ];
+  # other kernelParams:
+  #   "boot.trace"
+  #   "systemd.log_level=debug"
+  #   "systemd.log_target=console"
+
+  # hack in the `boot.shell_on_fail` arg since that doesn't always seem to work.
+  boot.initrd.preFailCommands = "allowShell=1";
+
+  # default: 4 (warn). 7 is debug
+  boot.consoleLogLevel = 7;
+
+  boot.loader.grub.enable = lib.mkDefault false;
+  boot.loader.generic-extlinux-compatible.enable = lib.mkDefault true;
+
+  # non-free firmware
+  hardware.enableRedistributableFirmware = true;
+  services.fwupd.enable = true;
+
+  # powertop will default to putting USB devices -- including HID -- to sleep after TWO SECONDS
+  powerManagement.powertop.enable = false;
+
+  # services.snapper.configs = {
+  #   root = {
+  #     subvolume = "/";
+  #     extraConfig = {
+  #       ALLOW_USERS = "colin";
+  #     };
+  #   };
+  # };
+  # services.snapper.snapshotInterval = "daily";
+}

modules/hardware/default.nix

@@ -0,0 +1,8 @@
+{ ... }:
+
+{
+  imports = [
+    ./all.nix
+    ./x86_64.nix
+  ];
+}

modules/hardware/x86_64.nix

@@ -0,0 +1,26 @@
+{ lib, pkgs, ... }:
+
+with lib;
+{
+  config = mkIf (pkgs.system == "x86_64-linux") { 
+    boot.initrd.availableKernelModules = [
+      "xhci_pci" "ahci" "sd_mod" "sdhci_pci"  # nixos-generate-config defaults
+      "usb_storage"   # rpi needed this to boot from usb storage, i think.
+      "nvme"  # to boot from nvme devices
+      # efi_pstore evivars
+    ];
+
+    # enable cross compilation
+    boot.binfmt.emulatedSystems = [ "aarch64-linux" ];
+    # nixpkgs.config.allowUnsupportedSystem = true;
+    # nixpkgs.crossSystem.system = "aarch64-linux";
+
+    powerManagement.cpuFreqGovernor = "powersave";
+    hardware.cpu.amd.updateMicrocode = true;    # desktop
+    hardware.cpu.intel.updateMicrocode = true;  # laptop
+
+    hardware.opengl.driSupport = true;
+    # For 32 bit applications
+    hardware.opengl.driSupport32Bit = true;
+  };
+}

modules/image.nix

@@ -0,0 +1,132 @@
+{ config, lib, pkgs, mobile-nixos, utils, ... }:
+
+with lib;
+let
+  cfg = config.sane.image;
+in
+{
+  options = {
+    # packages whose contents should be copied directly into the /boot partition.
+    # e.g. EFI loaders, u-boot bootloader, etc.
+    sane.image.extraBootFiles = mkOption {
+      default = [];
+      type = types.listOf types.package;
+    };
+    # extra (empty) directories to create in the rootfs.
+    # for example, /var/log might be required by the boot process, so ensure it exists.
+    sane.image.extraDirectories = mkOption {
+      default = [];
+      type = types.listOf types.str;
+    };
+
+    # the GPT header is fixed to Logical Block Address 1,
+    # but we can actually put the partition entries anywhere.
+    # this option reserves so many bytes after LBA 1 but *before* the partition entries.
+    # this is not universally supported, but is an easy hack to claim space near the start
+    # of the disk for other purposes (e.g. firmware blobs)
+    sane.image.extraGPTPadding = mkOption {
+      default = 0;
+      # NB: rpi doesn't like non-zero values for this.
+      # at the same time, spinning disks REALLY need partitions to be aligned to 4KiB boundaries.
+      # maybe there's some imageBuilder.fileSystem type which represents empty space?
+      # default = 2014 * 512;  # standard is to start part0 at sector 2048  (versus 34 if no padding)
+      type = types.int;
+    };
+    # optional space (in bytes) to leave unallocated after the GPT structure and before the first partition.
+    sane.image.firstPartGap = mkOption {
+      # align the first part to 16 MiB.
+      # do this by inserting a gap of 16 MiB - gptHeaderSize
+      # and then multiply by 1MiB and subtract 1 because mobile-nixos
+      # has a bug which will divide this by 1 MiB (and round up)
+      default = (16 * 1024 * 1024 - 34 * 512) * 1024 * 1024 - 1;
+      type = types.nullOr types.int;
+    };
+    sane.image.bootPartSize = mkOption {
+      default = 512 * 1024 * 1024;
+      type = types.int;
+    };
+  };
+  config = let
+    # return true if super starts with sub
+    startsWith = super: sub: (
+      (builtins.substring 0 (builtins.stringLength sub) super) == sub
+    );
+    # return the (string) path to get from `stem` to `path`
+    # or errors if not a sub-path
+    relPath = stem: path: (
+      builtins.head (builtins.match "^${stem}(.+)" path)
+    );
+
+    fileSystems = config.fileSystems;
+    bootFs = fileSystems."/boot";
+    nixFs = fileSystems."/nix/store" or fileSystems."/nix" or fileSystems."/";
+    # resolves to e.g. "nix/store", "/store" or ""
+    storeRelPath = relPath nixFs.mountPoint "/nix/store";
+
+    uuidFromFs = fs: builtins.head (builtins.match "/dev/disk/by-uuid/(.+)" fs.device);
+    vfatUuidFromFs = fs: builtins.replaceStrings ["-"] [""] (uuidFromFs fs);
+
+    fsBuilderMapBoot = {
+      "vfat" = pkgs.imageBuilder.fileSystem.makeESP;
+    };
+    fsBuilderMapNix = {
+      "ext4" = pkgs.imageBuilder.fileSystem.makeExt4;
+      "btrfs" = pkgs.imageBuilder.fileSystem.makeBtrfs;
+    };
+  in {
+    system.build.img-without-firmware = with pkgs; imageBuilder.diskImage.makeGPT {
+      name = "nixos";
+      diskID = vfatUuidFromFs bootFs;
+      # leave some space for firmware
+      # TODO: we'd prefer to turn this into a protected firmware partition, rather than reserving space in the GPT header itself
+      # Tow-Boot manages to do that; not sure how.
+      headerHole = cfg.extraGPTPadding;
+      partitions = [
+        (pkgs.imageBuilder.gap cfg.firstPartGap)
+        (fsBuilderMapBoot."${bootFs.fsType}" {
+          # fs properties
+          name = "ESP";
+          partitionID = vfatUuidFromFs bootFs;
+          # partition properties
+          partitionLabel = "EFI System";
+          partitionUUID = "44444444-4444-4444-4444-4444${vfatUuidFromFs bootFs}";
+          size = cfg.bootPartSize;
+
+          populateCommands = let
+            extras = builtins.toString (builtins.map (d: "cp -R ${d}/* ./") cfg.extraBootFiles);
+          in ''
+            echo "running installBootLoader"
+            ${config.system.build.installBootLoader} ${config.system.build.toplevel} -d .
+            echo "ran installBootLoader"
+            ${extras}
+            echo "copied extraBootFiles"
+          '';
+        })
+        (fsBuilderMapNix."${nixFs.fsType}" {
+          # fs properties
+          name = "NIXOS_SYSTEM";
+          partitionID = uuidFromFs nixFs;
+          # partition properties
+          partitionLabel = "Linux filesystem";
+          partitionUUID = uuidFromFs nixFs;
+          populateCommands =
+          let
+            closureInfo = buildPackages.closureInfo { rootPaths = config.system.build.toplevel; };
+            extraRelPaths = builtins.toString (builtins.map (p: "./" + builtins.toString(relPath nixFs.mountPoint p)) cfg.extraDirectories);
+          in
+          ''
+            mkdir -p ./${storeRelPath} ${extraRelPaths}
+            echo "Copying system closure..."
+            while IFS= read -r path; do
+              echo "  Copying $path"
+              cp -prf "$path" ./${storeRelPath}
+            done < "${closureInfo}/store-paths"
+            echo "Done copying system closure..."
+            cp -v ${closureInfo}/registration ./nix-path-registration
+          '';
+        })
+      ];
+    };
+    system.build.img = lib.mkDefault config.system.build.img-without-firmware;
+  };
+}

modules/impermanence.nix

@@ -0,0 +1,129 @@
+# borrows from:
+#   https://xeiaso.net/blog/paranoid-nixos-2021-07-18
+#   https://elis.nu/blog/2020/05/nixos-tmpfs-as-root/
+#   https://github.com/nix-community/impermanence
+{ lib, config, impermanence, ... }:
+
+with lib;
+let
+  cfg = config.sane.impermanence;
+in
+{
+  options = {
+    sane.impermanence.enable = mkOption {
+      default = false;
+      type = types.bool;
+    };
+    sane.impermanence.home-files = mkOption {
+      default = [];
+      type = types.listOf types.str;
+    };
+    sane.impermanence.home-dirs = mkOption {
+      default = [];
+      type = types.listOf (types.either types.str (types.attrsOf types.str));
+    };
+    sane.impermanence.service-dirs = mkOption {
+      default = [];
+      type = types.listOf (types.either types.str (types.attrsOf types.str));
+    };
+  };
+
+  config = let
+    map-dir = defaults: dir: if isString dir then
+        map-dir defaults { directory = "${defaults.directory}${dir}"; }
+      else
+        defaults // dir
+      ;
+    map-dirs = defaults: dirs: builtins.map (map-dir defaults) dirs;
+
+    map-home-dirs = map-dirs { user = "colin"; group = "users"; mode = "0755"; directory = "/home/colin/"; };
+    map-sys-dirs = map-dirs { user = "root"; group = "root"; mode = "0755"; directory = ""; };
+    map-service-dirs = map-dirs { user = "root"; group = "root"; mode = "0755"; directory = ""; };
+
+    map-home-files = files: builtins.map (f: {
+      parentDirectory = {
+        user = "colin";
+        group = "users";
+        mode = "0755";
+      };
+      file = "/home/colin/${f}";
+    }) files;
+  in mkIf cfg.enable {
+    sane.image.extraDirectories = [ "/nix/persist/var/log" ];
+    environment.persistence."/nix/persist" = {
+      directories = (map-home-dirs ([
+        # cache is probably too big to fit on the tmpfs
+        # TODO: we could bind-mount it to something which gets cleared per boot, though.
+        ".cache"
+        ".cargo"
+        ".rustup"
+        ".ssh"
+        ".local/share/keyrings"
+        # intentionally omitted:
+        # ".config"  # managed by home-manager
+        # ".local"   # nothing useful in here
+      ] ++ cfg.home-dirs)) ++ (map-sys-dirs [
+        # TODO: this `0700` here clobbers the perms for /persist/etc, breaking boot on freshly-deployed devices
+        # { mode = "0700"; directory = "/etc/NetworkManager/system-connections"; }
+        # "/etc/nixos"
+        # "/etc/ssh"  # persist only the specific files we want, instead
+        "/var/log"
+        "/var/backup"  # for e.g. postgres dumps
+      ]) ++ (map-service-dirs ([
+        # "/var/lib/AccountsService"   # not sure what this is, but it's empty
+        "/var/lib/alsa"                # preserve output levels, default devices
+        # "/var/lib/blueman"           # files aren't human readable
+        "/var/lib/bluetooth"           # preserve bluetooth handshakes
+        "/var/lib/colord"              # preserve color calibrations (?)
+        # "/var/lib/dhclient"          # empty on lappy; dunno about desko
+        # "/var/lib/fwupd"             # not sure why this would need persistent state
+        # "/var/lib/geoclue"           # empty on lappy
+        # "/var/lib/lockdown"          # empty on desko; might store secrets after iOS handshake?
+        # "/var/lib/logrotate.status"  # seems redundant with what's in /var/log?
+        "/var/lib/machines"            # maybe not needed, but would be painful to add a VM and forget.
+        # "/var/lib/misc"              # empty on lappy
+        # "/var/lib/NetworkManager"    # looks to be mostly impermanent state?
+        # "/var/lib/NetworkManager-fortisslvpn" # empty on lappy
+        # "/var/lib/nixos"             # has some uid/gid maps, but we enforce these to be deterministic.
+        # "/var/lib/PackageKit"        # wtf is this?
+        # "/var/lib/power-profiles-daemon"  # redundant with nixos declarations
+        # "/var/lib/private"           # empty on lappy
+        # "/var/lib/systemd"           # nothing obviously necessary
+        # "/var/lib/udisks2"           # empty on lappy
+        # "/var/lib/upower"            # historic charge data. unnecessary, but maybe used somewhere?
+        #
+        # servo additions:
+        # "/var/lib/dhparams"          # https://github.com/NixOS/nixpkgs/blob/master/nixos/modules/security/dhparams.nix
+        # "/var/lib/dovecot"
+        # "/var/lib/duplicity"
+      ] ++ cfg.service-dirs));
+      files = [
+        "/etc/machine-id"
+        "/etc/ssh/ssh_host_ed25519_key"
+        "/etc/ssh/ssh_host_ed25519_key.pub"
+        "/etc/ssh/ssh_host_rsa_key"
+        "/etc/ssh/ssh_host_rsa_key.pub"
+        "/home/colin/.zsh_history"
+        # # XXX these only need persistence because i have mutableUsers = true, i think
+        # "/etc/group"
+        # "/etc/passwd"
+        # "/etc/shadow"
+      ] ++ map-home-files cfg.home-files;
+    };
+
+    systemd.services.sane-sops = {
+      # TODO: it would be better if we could inject the right dependency into setupSecrets instead of patching like this.
+      # /run/current-system/activate contains the precise ordering logic.
+      # it's largely unaware of systemd.
+      # maybe we could insert some activation script which simply waits for /etc/ssh to appear?
+      description = "sops relies on /etc/ssh being available, so re-run its activation AFTER fs-local";
+      script = ''
+      ${config.system.activationScripts.setupSecrets.text}
+      ${config.system.activationScripts.linkIwdKeys.text}
+      '';
+      after = [ "fs-local.target" ];
+      wantedBy = [ "multi-user.target" ];
+    };
+  };
+}
+

modules/nixcache.nix

@@ -0,0 +1,31 @@
+{ lib, config, ... }:
+
+with lib;
+let
+  cfg = config.sane.nixcache;
+in
+{
+  options = {
+    sane.nixcache.enable = mkOption {
+      default = false;
+      type = types.bool;
+    };
+  };
+
+  config = mkIf cfg.enable {
+    # use our own binary cache
+    nix.settings = {
+      substituters = [
+        "https://nixcache.uninsane.org"
+        "http://desko:5000"
+        "https://nix-community.cachix.org"
+        "https://cache.nixos.org/"
+      ];
+      trusted-public-keys = [
+        "nixcache.uninsane.org:r3WILM6+QrkmsLgqVQcEdibFD7Q/4gyzD9dGT33GP70="
+        "desko:Q7mjjqoBMgNQ5P0e63sLur65A+D4f3Sv4QiycDIKxiI="
+        "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
+      ];
+    };
+  };
+}

modules/services/duplicity.nix

@@ -0,0 +1,74 @@
+# docs: https://search.nixos.org/options?channel=21.11&query=duplicity
+{ config, lib, ... }:
+
+with lib;
+let
+  cfg = config.sane.services.duplicity;
+in
+{
+  options = {
+    sane.services.duplicity.enable = mkOption {
+      default = false;
+      type = types.bool;
+    };
+  };
+
+  config = mkIf cfg.enable {
+    # we need this mostly because of the size of duplicity's cache
+    sane.impermanence.service-dirs = [ "/var/lib/duplicity" ];
+
+    services.duplicity.enable = true;
+    services.duplicity.targetUrl = ''"$DUPLICITY_URL"'';
+    services.duplicity.escapeUrl = false;
+    # format: PASSPHRASE=<cleartext> \n DUPLICITY_URL=b2://...
+    # two sisters
+    # PASSPHRASE: remote backups will be encrypted using this passphrase (using gpg)
+    # DUPLICITY_URL: b2://$key_id:$app_key@$bucket
+    # create key with: backblaze-b2 create-key --bucket uninsane-host-duplicity uninsane-host-duplicity-safe listBuckets,listFiles,readBuckets,readFiles,writeFiles
+    #   ^ run this until you get a key with no forward slashes :upside_down:
+    #   web-created keys are allowed to delete files, which you probably don't want for an incremental backup program
+    #   you need to create a new application key from the web in order to first get a key which can create new keys (use env vars in the above command)
+    # TODO: s/duplicity_passphrase/duplicity_env/
+    services.duplicity.secretFile = config.sops.secrets.duplicity_passphrase.path;
+    # NB: manually trigger with `systemctl start duplicity`
+    services.duplicity.frequency = "daily";
+    # TODO: this needs updating to handle impermanence changes
+    services.duplicity.exclude = [
+      # impermanent/inconsequential data:
+      "/dev"
+      "/proc"
+      "/run"
+      "/sys"
+      "/tmp"
+      # bind mounted (dupes):
+      "/var/lib"
+      # other mounts
+      "/mnt"
+      # data that's not worth the cost to backup:
+      "/nix/persist/var/lib/uninsane/media"
+      "/nix/persist/home/colin/tmp"
+      "/nix/persist/home/colin/Videos"
+      "/home/colin/tmp"
+      "/home/colin/Videos"
+    ];
+
+    services.duplicity.extraFlags = [
+      # without --allow-source-mismatch, duplicity will abort if you change the hostname between backups
+      "--allow-source-mismatch"
+    ];
+
+    # set this for the FIRST backup, then remove it to enable incremental backups
+    #   (that the first backup *isn't* full i think is a defect)
+    # services.duplicity.fullIfOlderThan = "always";
+
+    systemd.services.duplicity.serviceConfig = {
+      # rate-limit the read bandwidth in an effort to thereby prevent net upload saturation
+      # this could perhaps be done better by adding a duplicity config option to replace the binary with `trickle`
+      IOReadBandwidthMax = [
+        "/dev/sda1 5M"
+        "/dev/nvme0n1 5M"
+        "/dev/mmc0 5M"
+      ];
+    };
+  };
+}

modules/services/nixserve.nix

@@ -0,0 +1,33 @@
+# docs: https://nixos.wiki/wiki/Binary_Cache
+# to copy something to this machine's nix cache, do:
+#   nix copy --to ssh://nixcache.uninsane.org PACKAGE
+{ config, lib, ... }:
+
+with lib;
+let
+  cfg = config.sane.services.nixserve;
+in
+{
+  options = {
+    sane.services.nixserve.enable = mkOption {
+      default = false;
+      type = types.bool;
+    };
+    sane.services.nixserve.sopsFile = mkOption {
+      default = ../../secrets/servo.yaml;
+      type = types.path;
+    };
+  };
+
+  config = mkIf cfg.enable {
+    services.nix-serve = {
+      enable = true;
+      secretKeyFile = config.sops.secrets.nix_serve_privkey.path;
+      openFirewall = true;  # not needed for servo; only desko
+    };
+
+    sops.secrets.nix_serve_privkey = {
+      sopsFile = cfg.sopsFile;
+    };
+  };
+}

modules/universal/allocations.nix

@@ -0,0 +1,58 @@
+{ lib, ... }:
+
+with lib;
+let
+  mkId = id: mkOption {
+    default = id;
+    type = types.int;
+  };
+in
+{
+  options = {
+    # legacy servo users, some are inconvenient to migrate
+    sane.allocations.dhcpcd-gid = mkId 991;
+    sane.allocations.dhcpcd-uid = mkId 992;
+    sane.allocations.gitea-gid = mkId 993;
+    sane.allocations.git-uid = mkId 994;
+    sane.allocations.jellyfin-gid = mkId 994;
+    sane.allocations.pleroma-gid = mkId 995;
+    sane.allocations.jellyfin-uid = mkId 996;
+    sane.allocations.acme-gid = mkId 996;
+    sane.allocations.pleroma-uid = mkId 997;
+    sane.allocations.acme-uid = mkId 998;
+    sane.allocations.greeter-uid = mkId 999;
+    sane.allocations.greeter-gid = mkId 999;
+
+    sane.allocations.colin-uid = mkId 1000;
+    sane.allocations.guest-uid = mkId 1100;
+
+    # found on all machines
+    sane.allocations.sshd-uid = mkId 2001;  # 997
+    sane.allocations.sshd-gid = mkId 2001;  # 997
+    sane.allocations.polkituser-gid = mkId 2002;  # 998
+    sane.allocations.systemd-coredump-gid = mkId 2003;  # 996
+    sane.allocations.nscd-uid = mkId 2004;
+    sane.allocations.nscd-gid = mkId 2004;
+    sane.allocations.systemd-oom-uid = mkId 2005;
+    sane.allocations.systemd-oom-gid = mkId 2005;
+
+    # found on graphical machines
+    sane.allocations.nm-iodine-uid = mkId 2101;  # desko/moby/lappy
+
+    # found on desko machine
+    sane.allocations.usbmux-uid = mkId 2204;
+    sane.allocations.usbmux-gid = mkId 2204;
+
+
+    # originally found on moby machine
+    sane.allocations.avahi-uid = mkId 2304;
+    sane.allocations.avahi-gid = mkId 2304;
+    sane.allocations.colord-uid = mkId 2305;
+    sane.allocations.colord-gid = mkId 2305;
+    sane.allocations.geoclue-uid = mkId 2306;
+    sane.allocations.geoclue-gid = mkId 2306;
+    sane.allocations.rtkit-uid = mkId 2307;
+    sane.allocations.rtkit-gid = mkId 2307;
+    sane.allocations.feedbackd-gid = mkId 2308;
+  };
+}

modules/universal/default.nix

@@ -0,0 +1,33 @@
+{ pkgs, ... }:
+
+{
+  imports = [
+    ./allocations.nix
+    ./env
+    ./fs.nix
+    ./net.nix
+    ./secrets.nix
+    ./users.nix
+    ./vpn.nix
+  ];
+
+  time.timeZone = "America/Los_Angeles";
+
+  fonts = {
+    enableDefaultFonts = true;
+    fonts = with pkgs; [ font-awesome twitter-color-emoji hack-font ];
+    fontconfig.enable = true;
+    fontconfig.defaultFonts = {
+      emoji = [ "Font Awesome 6 Free" "Twitter Color Emoji" ];
+      monospace = [ "Hack" ];
+      serif = [ "DejaVu Serif" ];
+      sansSerif = [ "DejaVu Sans" ];
+    };
+  };
+
+  # allow `nix flake ...` command
+  nix.extraOptions = ''
+    experimental-features = nix-command flakes
+  '';
+}
+

modules/universal/env/default.nix

@@ -0,0 +1,24 @@
+{ ... }:
+
+{
+  imports = [
+    ./feeds.nix
+    ./home-manager.nix
+    ./home-packages.nix
+    ./system-packages.nix
+  ];
+
+  # programs.vim.defaultEditor = true;
+  environment.variables = {
+    EDITOR = "vim";
+    # git claims it should use EDITOR, but it doesn't!
+    GIT_EDITOR = "vim";
+    # TODO: these should be moved to `home.sessionVariables` (home-manager)
+    # Electron apps should use native wayland backend:
+    #   https://nixos.wiki/wiki/Slack#Wayland
+    # Discord under sway crashes with this.
+    # NIXOS_OZONE_WL = "1";
+    # LIBGL_ALWAYS_SOFTWARE = "1";
+  };
+}
+

modules/universal/env/feeds.nix

@@ -0,0 +1,41 @@
+{ lib, ... }:
+
+with lib;
+{
+  options = {
+    sane.feeds.podcastUrls = mkOption {
+      type = types.listOf types.str;
+      default = [
+        "https://lexfridman.com/feed/podcast/"
+        ## Astral Codex Ten
+        "http://feeds.libsyn.com/108018/rss"
+        ## Econ Talk
+        "https://feeds.simplecast.com/wgl4xEgL"
+        ## Cory Doctorow
+        "https://feeds.feedburner.com/doctorow_podcast"
+        "https://congressionaldish.libsyn.com/rss"
+        ## Civboot
+        "https://anchor.fm/s/34c7232c/podcast/rss"
+        "https://feeds.feedburner.com/80000HoursPodcast"
+        "https://allinchamathjason.libsyn.com/rss"
+        "https://acquired.libsyn.com/rss"
+        "https://rss.acast.com/deconstructed"
+        ## The Daily
+        "https://feeds.simplecast.com/54nAGcIl"
+        "https://rss.acast.com/intercepted-with-jeremy-scahill"
+        "https://podcast.posttv.com/itunes/post-reports.xml"
+        ## Eric Weinstein
+        "https://rss.art19.com/the-portal"
+        "https://feeds.megaphone.fm/darknetdiaries"
+        "http://feeds.wnyc.org/radiolab"
+        "https://wakingup.libsyn.com/rss"
+        ## 99% Invisible
+        "https://feeds.simplecast.com/BqbsxVfO"
+        "https://rss.acast.com/ft-tech-tonic"
+        "https://feeds.feedburner.com/dancarlin/history?format=xml"
+        ## 60 minutes (NB: this features more than *just* audio?)
+        "https://www.cbsnews.com/latest/rss/60-minutes"
+      ];
+    };
+  };
+}

modules/universal/env/home-manager.nix

@@ -0,0 +1,567 @@
+# docs:
+#   https://rycee.gitlab.io/home-manager/
+#   https://rycee.gitlab.io/home-manager/options.html
+#   man home-configuration.nix
+#
+
+{ lib, config, pkgs, ... }:
+
+with lib;
+let
+  cfg = config.sane.home-manager;
+  vim-swap-dir = ".cache/vim-swap";
+  # extract package from `extraPackages`
+  pkglist = pkgspec: builtins.map (e: e.pkg or e) pkgspec;
+  # extract `dir` from `extraPackages`
+  dirlist = pkgspec: builtins.concatLists (builtins.map (e: if e ? "dir" then [ e.dir ] else []) pkgspec);
+  # extract `persist-files` from `extraPackages`
+  persistfileslist = pkgspec: builtins.concatLists (builtins.map (e: if e ? "persist-files" then e.persist-files else []) pkgspec);
+  # TODO: dirlist and persistfileslist should be folded
+in
+{
+  options = {
+    sane.home-manager.enable = mkOption {
+      default = false;
+      type = types.bool;
+    };
+
+    # packages to deploy to the user's home
+    sane.home-manager.extraPackages = mkOption {
+      default = [ ];
+      # each entry can be either a package, or attrs:
+      #   { pkg = package; dir = optional string;
+      type = types.listOf (types.either types.package types.attrs);
+    };
+
+    # attributes to copy directly to home-manager's `wayland.windowManager` option
+    sane.home-manager.windowManager = mkOption {
+      default = {};
+      type = types.attrs;
+    };
+
+    # extra attributes to include in home-manager's `programs` option
+    sane.home-manager.programs = mkOption {
+      default = {};
+      type = types.attrs;
+    };
+  };
+
+  config = lib.mkIf cfg.enable {
+    sops.secrets."aerc_accounts" = {
+      owner = config.users.users.colin.name;
+      sopsFile = ../../../secrets/universal/aerc_accounts.conf;
+      format = "binary";
+    };
+    sops.secrets."sublime_music_config" = {
+      owner = config.users.users.colin.name;
+      sopsFile = ../../../secrets/universal/sublime_music_config.json.bin;
+      format = "binary";
+    };
+
+    sane.impermanence.home-dirs = [
+      "archive"
+      "dev"
+      "records"
+      "ref"
+      "tmp"
+      "use"
+      "Music"
+      "Pictures"
+      "Videos"
+      vim-swap-dir
+    ] ++ (dirlist cfg.extraPackages);
+    sane.impermanence.home-files = persistfileslist cfg.extraPackages;
+
+    home-manager.useGlobalPkgs = true;
+    home-manager.useUserPackages = true;
+
+    # XXX this weird rename + closure is to get home-manager's `config.lib.file` to exist.
+    # see: https://github.com/nix-community/home-manager/issues/589#issuecomment-950474105
+    home-manager.users.colin = let sysconfig = config; in { config, ... }: {
+
+      # run `home-manager-help` to access manpages
+      # or `man home-configuration.nix`
+      manual.html.enable = true;
+
+      home.packages = pkglist cfg.extraPackages;
+      wayland.windowManager = cfg.windowManager;
+
+      home.stateVersion = "21.11";
+      home.username = "colin";
+      home.homeDirectory = "/home/colin";
+
+      home.activation = {
+        initKeyring = {
+          after = ["writeBoundary"];
+          before = [];
+          data = "${../../../scripts/init-keyring}";
+        };
+      };
+
+      # XDG defines things like ~/Desktop, ~/Downloads, etc.
+      # these clutter the home, so i mostly don't use them.
+      xdg.userDirs = {
+        enable = true;
+        createDirectories = false;  # on headless systems, most xdg dirs are noise
+        desktop = "$HOME/.xdg/Desktop";
+        documents = "$HOME/dev";
+        download = "$HOME/tmp";
+        music = "$HOME/Music";
+        pictures = "$HOME/Pictures";
+        publicShare = "$HOME/.xdg/Public";
+        templates = "$HOME/.xdg/Templates";
+        videos = "$HOME/Videos";
+      };
+
+      # the xdg mime type for a file can be found with:
+      # - `xdg-mime query filetype path/to/thing.ext`
+      xdg.mimeApps.enable = true;
+      xdg.mimeApps.defaultApplications = {
+        # HTML
+        "text/html" = [ "librewolf.desktop" ];
+        "x-scheme-handler/http" = [ "librewolf.desktop" ];
+        "x-scheme-handler/https" = [ "librewolf.desktop" ];
+        "x-scheme-handler/about" = [ "librewolf.desktop" ];
+        "x-scheme-handler/unknown" = [ "librewolf.desktop" ];
+        # RICH-TEXT DOCUMENTS
+        "application/pdf" = [ "org.gnome.Evince.desktop" ];
+        "text/markdown" = [ "obsidian.desktop" ];
+        # IMAGES
+        "image/heif" = [ "org.gnome.gThumb.desktop" ];  # apple codec
+        "image/png" = [ "org.gnome.gThumb.desktop" ];
+        "image/jpeg" = [ "org.gnome.gThumb.desktop" ];
+        # VIDEO
+        "video/mp4" = [ "vlc.desktop" ];
+        "video/quicktime" = [ "vlc.desktop" ];
+        "video/x-matroska" = [ "vlc.desktop" ];
+        # AUDIO
+        "audio/flag" = [ "vlc.desktop" ];
+        "audio/mpeg" = [ "vlc.desktop" ];
+        "audio/x-vorbis+ogg" = [ "vlc.desktop" ];
+      };
+
+      # convenience
+      home.file."knowledge".source = config.lib.file.mkOutOfStoreSymlink "/home/colin/dev/knowledge";
+      home.file."nixos".source = config.lib.file.mkOutOfStoreSymlink "/home/colin/dev/nixos";
+      home.file."Videos/servo".source = config.lib.file.mkOutOfStoreSymlink "/mnt/servo-media/Videos";
+      home.file."Videos/servo-incomplete".source = config.lib.file.mkOutOfStoreSymlink "/mnt/servo-media/incomplete";
+      home.file."Music/servo".source = config.lib.file.mkOutOfStoreSymlink "/mnt/servo-media/Music";
+
+      # nb markdown/personal knowledge manager
+      home.file.".nb/knowledge".source = config.lib.file.mkOutOfStoreSymlink "/home/colin/dev/knowledge";
+      home.file.".nb/.current".text = "knowledge";
+      home.file.".nbrc".text = ''
+        # manage with `nb settings`
+        export NB_AUTO_SYNC=0
+      '';
+
+      # uBlock filter list configuration.
+      # specifically, enable the GDPR cookie prompt blocker.
+      # data.toOverwrite.filterLists is additive (i.e. it supplements the default filters)
+      # this configuration method is documented here:
+      # - <https://github.com/gorhill/uBlock/issues/2986#issuecomment-364035002>
+      # the specific attribute path is found via scraping ublock code here:
+      # - <https://github.com/gorhill/uBlock/blob/master/src/js/storage.js>
+      # - <https://github.com/gorhill/uBlock/blob/master/assets/assets.json>
+      home.file.".librewolf/managed-storage/uBlock0@raymondhill.net.json".text = ''
+        {
+         "name": "uBlock0@raymondhill.net",
+         "description": "ignored",
+         "type": "storage",
+         "data": {
+            "toOverwrite": "{\"filterLists\": [\"fanboy-cookiemonster\"]}"
+         }
+        }
+      '';
+
+      # aerc TUI mail client
+      xdg.configFile."aerc/accounts.conf".source =
+        config.lib.file.mkOutOfStoreSymlink sysconfig.sops.secrets.aerc_accounts.path;
+
+      # make Discord usable even when client is "outdated"
+      xdg.configFile."discord/settings.json".text = ''
+      {
+        "SKIP_HOST_UPDATE": true
+      }
+      '';
+
+      # sublime music player
+      xdg.configFile."sublime-music/config.json".source =
+        config.lib.file.mkOutOfStoreSymlink sysconfig.sops.secrets.sublime_music_config.path;
+
+      xdg.configFile."vlc/vlcrc".text =
+      let
+        podcastUrls = lib.strings.concatStringsSep "|" sysconfig.sane.feeds.podcastUrls;
+      in ''
+      [podcast]
+      podcast-urls=${podcastUrls}
+      [core]
+      metadata-network-access=0
+      [qt]
+      qt-privacy-ask=0
+      '';
+      xdg.configFile."gpodderFeeds.opml".text =
+      let
+        entries = builtins.toString (builtins.map
+          (url: ''\n    <outline xmlUrl="${url}" type="rss"/>'')
+          sysconfig.sane.feeds.podcastUrls
+        );
+      in ''
+        <?xml version="1.0" encoding="utf-8"?>
+        <opml version="2.0">
+          <body>${entries}
+          </body>
+        </opml>
+      '';
+
+      # gnome feeds RSS viewer
+      xdg.configFile."org.gabmus.gfeeds.json".text = builtins.toJSON {
+        feeds = {
+          # AGGREGATORS (> 1 post/day)
+          "https://www.lesswrong.com/feed.xml" = { tags = [ "hourly" "rat" ]; };
+          "http://www.econlib.org/index.xml" = { tags = [ "hourly" "pol" ]; };
+          # AGGREGATORS (< 1 post/day)
+          "https://palladiummag.com/feed" = { tags = [ "weekly" "uncat" ]; };
+          "https://profectusmag.com/feed" = { tags = [ "weekly" "uncat" ]; };
+
+          "https://semiaccurate.com/feed" = { tags = [ "weekly" "tech" ]; };
+          "https://linuxphoneapps.org/blog/atom.xml" = { tags = [ "infrequent" "tech" ]; };
+          "https://spectrum.ieee.org/rss" = { tags = [ "weekly" "tech" ]; };
+
+          ## No Moods, Ads or Cutesy Fucking Icons
+          "https://www.rifters.com/crawl/?feed=rss2" = { tags = [ "weekly" "uncat" ]; };
+
+          # DEVELOPERS
+          "https://mg.lol/blog/rss/" = { tags = [ "infrequent" "tech" ]; };
+          ## Ken Shirriff
+          "https://www.righto.com/feeds/posts/default" = { tags = [ "infrequent" "tech" ]; };
+          ## Vitalik Buterin
+          "https://vitalik.ca/feed.xml" = { tags = [ "infrequent" "tech" ]; };
+          ## ian (Sanctuary)
+          "https://sagacioussuricata.com/feed.xml" = { tags = [ "infrequent" "tech" ]; };
+          ## Bunnie Juang
+          "https://www.bunniestudios.com/blog/?feed=rss2" = { tags = [ "infrequent" "tech" ]; };
+          "https://blog.danieljanus.pl/atom.xml" = { tags = [ "infrequent" "tech" ]; };
+          "https://ianthehenry.com/feed.xml" = { tags = [ "infrequent" "tech" ]; };
+          "https://bitbashing.io/feed.xml" = { tags = [ "infrequent" "tech" ]; };
+          "https://idiomdrottning.org/feed.xml" = { tags = [ "daily" "uncat" ]; };
+
+          # (TECH; POL) COMMENTATORS
+          "http://benjaminrosshoffman.com/feed" = { tags = [ "weekly" "pol" ]; };
+          ## Ben Thompson
+          "https://www.stratechery.com/rss" = { tags = [ "weekly" "pol" ]; };
+          ## Balaji
+          "https://balajis.com/rss" = { tags = [ "weekly" "pol" ]; };
+          "https://www.ben-evans.com/benedictevans/rss.xml" = { tags = [ "weekly" "pol" ]; };
+          "https://www.lynalden.com/feed" = { tags = [ "infrequent" "pol" ]; };
+          "https://austinvernon.site/rss.xml" = { tags = [ "infrequent" "tech" ]; };
+          "https://oversharing.substack.com/feed" = { tags = [ "daily" "pol" ]; };
+          ## David Rosenthal
+          "https://blog.dshr.org/rss.xml" = { tags = [ "weekly" "pol" ]; };
+          ## Matt Levine
+          "https://www.bloomberg.com/opinion/authors/ARbTQlRLRjE/matthew-s-levine.rss" = { tags = [ "weekly" "pol" ]; };
+
+          # RATIONALITY/PHILOSOPHY/ETC
+          "https://samkriss.substack.com/feed" = { tags = [ "infrequent" "uncat" ]; };  # ... satire? phil?
+          "https://unintendedconsequenc.es/feed" = { tags = [ "infrequent" "rat" ]; };
+
+          "https://applieddivinitystudies.com/atom.xml" = { tags = [ "weekly" "rat" ]; };
+          "https://slimemoldtimemold.com/feed.xml" = { tags = [ "weekly" "rat" ]; };
+
+          "https://www.richardcarrier.info/feed" = { tags = [ "weekly" "rat" ]; };
+          "https://www.gwern.net/feed.xml" = { tags = [ "infrequent" "uncat" ]; };
+
+          ## Jason Crawford
+          "https://rootsofprogress.org/feed.xml" = { tags = [ "weekly" "rat" ]; };
+          ## Robin Hanson
+          "https://www.overcomingbias.com/feed" = { tags = [ "daily" "rat" ]; };
+          ## Scott Alexander
+          "https://astralcodexten.substack.com/feed.xml" = { tags = [ "daily" "rat" ]; };
+          ## Paul Christiano
+          "https://sideways-view.com/feed" = { tags = [ "infrequent" "rat" ]; };
+          ## Sean Carroll
+          "https://www.preposterousuniverse.com/rss" = { tags = [ "infrequent" "rat" ]; };
+
+          # COMICS
+          "https://www.smbc-comics.com/comic/rss" = { tags = [ "daily" "visual" ]; };
+          "https://xkcd.com/atom.xml" = { tags = [ "daily" "visual" ]; };
+          "http://dilbert.com/feed" = { tags = ["daily" "visual" ]; };
+
+          # ART
+          "https://miniature-calendar.com/feed" = { tags = [ "daily" "visual" ]; };
+
+          # CODE
+          "https://github.com/Kaiteki-Fedi/Kaiteki/commits/master.atom" = { tags = [ "infrequent" "tech" ]; };
+        };
+        dark_reader = false;
+        new_first = true;
+        # windowsize = {
+        #   width = 350;
+        #   height = 650;
+        # };
+        max_article_age_days = 90;
+        enable_js = false;
+        max_refresh_threads = 3;
+        # saved_items = {};
+        # read_items = [];
+        show_read_items = true;
+        full_article_title = true;
+        # views: "webview", "reader", "rsscont"
+        default_view = "rsscont";
+        open_links_externally = true;
+        full_feed_name = false;
+        refresh_on_startup = true;
+        tags = [
+          # hourly => aggregator
+          # daily => prolifiq writer
+          # weekly => i can keep up with most -- but maybe not all -- of their content
+          # infrequent => i can read everything in this category
+          "hourly" "daily" "weekly" "infrequent"
+          # rat[ionality] gets used interchangably with philosophy, here.
+          # pol[itical] gets used for social commentary and economics as well.
+          # visual gets used for comics/art
+          "uncat" "rat" "tech" "pol" "visual"
+        ];
+        open_youtube_externally = false;
+        media_player = "vlc";  # default: mpv
+      };
+
+      programs = {
+        home-manager.enable = true;  # this lets home-manager manage dot-files in user dirs, i think
+
+        zsh = {
+          enable = true;
+          enableSyntaxHighlighting = true;
+          enableVteIntegration = true;
+          dotDir = ".config/zsh";
+
+          initExtraBeforeCompInit = ''
+            # p10k instant prompt
+            # run p10k configure to configure, but it can't write out its file :-(
+            POWERLEVEL9K_DISABLE_CONFIGURATION_WIZARD=true
+          '';
+          initExtra = ''
+            # zmv is a way to do rich moves/renames, with pattern matching/substitution.
+            # see for an example: <https://filipe.kiss.ink/zmv-zsh-rename/>
+            autoload -Uz zmv
+          '';
+
+          # prezto = oh-my-zsh fork; controls prompt, auto-completion, etc.
+          # see: https://github.com/sorin-ionescu/prezto
+          prezto = {
+            enable = true;
+            pmodules = [
+              "environment"
+              "terminal"
+              "editor"
+              "history"
+              "directory"
+              "spectrum"
+              "utility"
+              "completion"
+              "prompt"
+              "git"
+            ];
+            prompt = {
+              theme = "powerlevel10k";
+            };
+          };
+        };
+        kitty = {
+          enable = true;
+          # docs: https://sw.kovidgoyal.net/kitty/conf/
+          settings = {
+            # disable terminal bell (when e.g. you backspace too many times)
+            enable_audio_bell = false;
+          };
+          keybindings = {
+            "ctrl+n" = "new_os_window_with_cwd";
+          };
+          # docs: https://github.com/kovidgoyal/kitty-themes
+          # theme = "1984 Light";  # dislike: awful, harsh blues/teals
+          # theme = "Adventure Time";  # dislike: harsh (dark)
+          # theme = "Atom One Light";  # GOOD: light theme. all color combos readable. not a huge fan of the blue.
+          # theme = "Belafonte Day";  # dislike: too low contrast for text colors
+          # theme = "Belafonte Night";  # better: dark theme that's easy on the eyes. all combos readable. low contrast.
+          # theme = "Catppuccin";  # dislike: a bit pale/low-contrast (dark)
+          # theme = "Desert";  # mediocre: colors are harsh
+          # theme = "Earthsong";  # BEST: dark theme. readable, good contrast. unique, but decent colors.
+          # theme = "Espresso Libre";  # better: dark theme. readable, but meh colors
+          # theme = "Forest Night";  # decent: very pastel. it's workable, but unconventional and muted/flat.
+          # theme = "Gruvbox Material Light Hard";  # mediocre light theme.
+          # theme = "kanagawabones";  # better: dark theme. colors are too background-y
+          # theme = "Kaolin Dark";  # dislike: too dark
+          # theme = "Kaolin Breeze";  # mediocre: not-too-harsh light theme, but some parts are poor contrast
+          # theme = "Later This Evening";  # mediocre: not-too-harsh dark theme, but cursor is poor contrast
+          # theme = "Material"; # decent: light theme, few colors.
+          # theme = "Mayukai";  # decent: not-too-harsh dark theme. the teal is a bit straining
+          # theme = "Nord";  # mediocre: pale background, low contrast
+          # theme = "One Half Light";  # better: not-too-harsh light theme. contrast could be better
+          theme = "PaperColor Dark";  # BEST: dark theme, very readable still the colors are background-y
+          # theme = "Parasio Dark";  # dislike: too low contrast
+          # theme = "Pencil Light";  # better: not-too-harsh light theme. decent contrast.
+          # theme = "Pnevma";  # dislike: too low contrast
+          # theme = "Piatto Light";  # better: readable light theme. pleasing colors. powerline prompt is hard to read.
+          # theme = "Rosé Pine Dawn";  # GOOD: light theme. all color combinations are readable. it is very mild -- may need to manually tweak contrast. tasteful colors
+          # theme = "Rosé Pine Moon";  # GOOD: dark theme. tasteful colors. but background is a bit intense
+          # theme = "Sea Shells";  # mediocre. not all color combos are readable
+          # theme = "Solarized Light";  # mediocre: not-too-harsh light theme; GREAT background; but some colors are low contrast
+          # theme = "Solarized Dark Higher Contrast";  # better: dark theme, decent colors
+          # theme = "Sourcerer";  # mediocre: ugly colors
+          # theme = "Space Gray";  # mediocre: too muted
+          # theme = "Space Gray Eighties";  # better: all readable, decent colors
+          # theme = "Spacemacs";  # mediocre: too muted
+          # theme = "Spring";  # mediocre: readable light theme, but the teal is ugly.
+          # theme = "Srcery";  # better: highly readable. colors are ehhh
+          # theme = "Substrata";  # decent: nice colors, but a bit flat.
+          # theme = "Sundried";  # mediocre: the solar text makes me squint
+          # theme = "Symfonic";  # mediocre: the dark purple has low contrast to the black bg.
+          # theme = "Tango Light";  # dislike: teal is too grating
+          # theme = "Tokyo Night Day";  # medicore: too muted
+          # theme = "Tokyo Night";  # better: tasteful. a bit flat
+          # theme = "Tomorrow";  # GOOD: all color combinations are readable. contrast is slightly better than Rose. on the blander side
+          # theme = "Treehouse";  # dislike: the orange is harsh on my eyes.
+          # theme = "Urple";  # dislike: weird palette
+          # theme = "Warm Neon";  # decent: not-too-harsh dark theme. the green is a bit unattractive
+          # theme = "Wild Cherry";  # GOOD: dark theme: nice colors. a bit flat
+          # theme = "Xcodedark";  # dislike: bad palette
+          # theme = "citylights";  # decent: dark theme. some parts have just a bit low contrast
+          # theme = "neobones_light"; # better light theme. the background is maybe too muted
+          # theme = "vimbones";
+          # theme = "zenbones_dark";  # mediocre: readable, but meh colors
+          # theme = "zenbones_light";  # decent: light theme. all colors are readable. contrast is passable but not excellent. highlight color is BAD
+          # theme = "zenwritten_dark";  # mediocre: looks same as zenbones_dark
+          # extraConfig = "";
+        };
+        git = {
+          enable = true;
+          userName = "colin";
+          userEmail = "colin@uninsane.org";
+        };
+
+        neovim = {
+          # neovim: https://github.com/neovim/neovim
+          enable = true;
+          viAlias = true;
+          vimAlias = true;
+          plugins = with pkgs.vimPlugins; [
+            # docs: surround-nvim: https://github.com/ur4ltz/surround.nvim/
+            # docs: vim-surround: https://github.com/tpope/vim-surround
+            vim-surround
+            # docs: fzf-vim (fuzzy finder): https://github.com/junegunn/fzf.vim
+            fzf-vim
+            # docs: https://github.com/KeitaNakamura/tex-conceal.vim/
+            ({
+              plugin = tex-conceal-vim;
+              type = "viml";
+              config = ''
+                " present prettier fractions
+                let g:tex_conceal_frac=1
+              '';
+            })
+            ({
+              plugin = vim-SyntaxRange;
+              type = "viml";
+              config = ''
+                " enable markdown-style codeblock highlighting for tex code
+                autocmd BufEnter * call SyntaxRange#Include('```tex', '```', 'tex', 'NonText')
+                " autocmd Syntax tex set conceallevel=2
+              '';
+            })
+            # nabla renders inline math in any document, but it's buggy.
+            #   https://github.com/jbyuki/nabla.nvim
+            # ({
+            #   plugin = pkgs.nabla;
+            #   type = "lua";
+            #   config = ''
+            #     require'nabla'.enable_virt()
+            #   '';
+            # })
+            # treesitter syntax highlighting: https://nixos.wiki/wiki/Tree_sitters
+            # docs: https://github.com/nvim-treesitter/nvim-treesitter
+            # config taken from: https://github.com/i077/system/blob/master/modules/home/neovim/default.nix
+            # this is required for tree-sitter to even highlight
+            ({
+              plugin = (nvim-treesitter.withPlugins (_: pkgs.tree-sitter.allGrammars));
+              type = "lua";
+              config = ''
+                require'nvim-treesitter.configs'.setup {
+                  highlight = {
+                    enable = true,
+                    -- disable treesitter on Rust so that we can use SyntaxRange
+                    -- and leverage TeX rendering in rust projects
+                    disable = { "rust", "tex", "latex" },
+                    -- disable = { "tex", "latex" },
+                    -- true to also use builtin vim syntax highlighting when treesitter fails
+                    additional_vim_regex_highlighting = false
+                  },
+                  incremental_selection = {
+                    enable = true,
+                    keymaps = {
+                      init_selection = "gnn",
+                      node_incremental = "grn",
+                      mcope_incremental = "grc",
+                      node_decremental = "grm"
+                    }
+                  },
+                  indent = {
+                    enable = true,
+                    disable = {}
+                  }
+                }
+
+                vim.o.foldmethod = 'expr'
+                vim.o.foldexpr = 'nvim_treesitter#foldexpr()'
+              '';
+            })
+          ];
+          extraConfig = ''
+            " copy/paste to system clipboard
+            set clipboard=unnamedplus
+
+            " screw tabs; always expand them into spaces
+            set expandtab
+
+            " at least don't open files with sections folded by default
+            set nofoldenable
+
+            " allow text substitutions for certain glyphs.
+            " higher number = more aggressive substitution (0, 1, 2, 3)
+            " i only make use of this for tex, but it's unclear how to
+            " apply that *just* to tex and retain the SyntaxRange stuff.
+            set conceallevel=2
+
+            " horizontal rule under the active line
+            " set cursorline
+
+            " highlight trailing space & related syntax errors (doesn't seem to work??)
+            " let c_space_errors=1
+            " let python_space_errors=1
+
+            " enable highlighting of leading/trailing spaces,
+            " and especially tabs
+            " source: https://www.reddit.com/r/neovim/comments/chlmfk/highlight_trailing_whitespaces_in_neovim/
+            set list
+            set listchars=tab:▷\·,trail:·,extends:◣,precedes:◢,nbsp:○
+          '';
+        };
+
+        # XXX: although home-manager calls this option `firefox`, we can use other browsers and it still mostly works.
+        firefox = lib.mkIf (sysconfig.sane.gui.enable) {
+          enable = true;
+          package = import ./web-browser.nix pkgs;
+        };
+
+        # "command not found" will cause the command to be searched in nixpkgs
+        nix-index.enable = true;
+      } // cfg.programs;
+
+      home.shellAliases = {
+        ":q" = "exit";
+        # common typos
+        "cd.." = "cd ..";
+        "cd../" = "cd ../";
+      };
+    };
+  };
+}

modules/universal/env/home-packages.nix

@@ -0,0 +1,169 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+with pkgs;
+let
+  cfg = config.sane.home-packages;
+  universalPkgs = [
+    backblaze-b2
+    duplicity
+    gnupg
+    ifuse
+    ipfs
+    libimobiledevice
+    libsecret  # for managing user keyrings
+    lm_sensors  # for sensors-detect
+    lshw
+    ffmpeg
+    nb
+    networkmanager
+    nixpkgs-review
+    # nixos-generators
+    # nettools
+    nmon
+    oathToolkit  # for oathtool
+    # ponymix
+    pulsemixer
+    python3
+    # python3Packages.eyeD3  # music tagging
+    rmlint
+    sane-scripts
+    sequoia
+    snapper
+    sops
+    speedtest-cli
+    sqlite  # to debug sqlite3 databases
+    ssh-to-age
+    sudo
+    # tageditor  # music tagging
+    unar
+    visidata
+    w3m
+    wireguard-tools
+    # youtube-dl
+    yt-dlp
+  ];
+
+  guiPkgs = [
+    # GUI only
+    aerc  # email client
+    audacity
+    chromium
+    clinfo
+    electrum
+
+    # creds/session keys, etc
+    { pkg = element-desktop; dir = ".config/Element"; }
+
+    emote  # TODO: package [smile](https://github.com/mijorus/smile) for probably a better mobile experience.
+    evince  # works on phosh
+
+    # { pkg = fluffychat-moby; dir = ".local/share/chat.fluffy.fluffychat"; }  # TODO: ship normal fluffychat on non-moby?
+
+    foliate
+    font-manager
+    fractal-next
+    gimp  # broken on phosh
+    gnome.cheese
+    gnome.dconf-editor
+    gnome-feeds  # RSS reader (with claimed mobile support)
+    gnome.file-roller
+    gnome.gnome-disk-utility
+    gnome.gnome-maps  # works on phosh
+    gnome.nautilus
+    gnome-podcasts
+    gnome.gnome-system-monitor
+    gnome.gnome-terminal  # works on phosh
+    gnome.gnome-weather
+
+    { pkg = gpodder-configured; dir = "gPodder/Downloads"; }
+
+    gthumb
+    inkscape
+
+    kid3  # audio tagging
+    krita
+    libreoffice-fresh  # XXX colin: maybe don't want this on mobile
+    lollypop
+    mesa-demos
+    networkmanagerapplet
+
+    # settings (electron app). TODO: can i manage these settings with home-manager?
+    { pkg = obsidian; dir = ".config/obsidian"; }
+
+    pavucontrol
+    picard  # music tagging
+    playerctl
+    soundconverter
+    # sublime music persists any downloaded albums here.
+    # it doesn't obey a conventional ~/Music/{Artist}/{Album}/{Track} notation, so no symlinking
+    # config (e.g. server connection details) is persisted in ~/.config/sublime-music/config.json
+    #   possible to pass config as a CLI arg (sublime-music -c config.json)
+    { pkg = sublime-music; dir = ".local/share/sublime-music"; }
+    tdesktop  # broken on phosh
+
+    # vlc remembers play position in ~/.config/vlc/vlc-qt-interface.conf
+    { pkg = vlc; persist-files = [ ".config/vlc/vlc-qt-interface.conf" ]; }
+
+    whalebird # pleroma client. input is broken on phosh
+    xdg-utils  # for xdg-open
+    xterm  # broken on phosh
+  ]
+  ++ (if pkgs.system == "x86_64-linux" then
+  [
+    # x86_64 only
+
+    # creds, but also 200 MB of node modules, etc
+    (let discord = (pkgs.discord.override {
+      # XXX 2022-07-31: fix to allow links to open in default web-browser:
+      #   https://github.com/NixOS/nixpkgs/issues/78961
+      nss = pkgs.nss_latest;
+    }); in { pkg = discord; dir = ".config/discord"; })
+
+    kaiteki  # Pleroma client
+    gnome.zenity # for kaiteki (it will use qarma, kdialog, or zenity)
+
+    logseq
+    losslesscut-bin
+    makemkv
+
+    # actual monero blockchain (not wallet/etc; safe to delete, just slow to regenerate)
+    { pkg = monero-gui; dir = ".bitmonero"; }
+
+    # creds, media
+    { pkg = signal-desktop; dir = ".config/Signal"; }
+
+    # creds. TODO: can i manage this with home-manager?
+    { pkg = spotify; dir = ".config/spotify"; }
+
+    # hardenedMalloc solves a crash at startup
+    (tor-browser-bundle-bin.override { useHardenedMalloc = false; })
+
+    # zcash coins. safe to delete, just slow to regenerate (10-60 minutes)
+    { pkg = zecwallet-lite; dir = ".zcash"; }
+  ] else []);
+
+  # useful devtools:
+  # bison
+  # dtc
+  # flex
+  # gcc
+  # gcc-arm-embedded
+  # gcc_multi
+  # gnumake
+  # mix2nix
+  # rustup
+  # swig
+in
+{
+  options = {
+    sane.home-packages.enableGuiPkgs = mkOption {
+      default = false;
+      type = types.bool;
+    };
+  };
+  config = {
+    sane.home-manager.extraPackages = universalPkgs
+      ++ (if cfg.enableGuiPkgs then guiPkgs else []);
+  };
+}

modules/universal/env/system-packages.nix

@@ -0,0 +1,38 @@
+{ pkgs, ... }:
+{
+  # general-purpose utilities that we want any user to be able to access
+  #   (specifically: root, in case of rescue)
+  environment.systemPackages = with pkgs; [
+    btrfs-progs
+    cryptsetup
+    dig
+    efibootmgr
+    fatresize
+    fd
+    file
+    gptfdisk
+    hdparm
+    htop
+    iftop
+    inetutils  # for telnet
+    iotop
+    iptables
+    jq
+    killall
+    lsof
+    netcat
+    nethogs
+    nmap
+    openssl
+    parted
+    pciutils
+    powertop
+    ripgrep
+    screen
+    smartmontools
+    socat
+    usbutils
+    wget
+  ];
+}
+

modules/universal/env/web-browser.nix

@@ -0,0 +1,55 @@
+pkgs:
+
+# common settings to toggle (at runtime, in about:config):
+#   > security.ssl.require_safe_negotiation
+
+# librewolf is a forked firefox which patches firefox to allow more things
+# (like default search engines) to be configurable at runtime.
+# many of the settings below won't have effect without those patches.
+# see: https://gitlab.com/librewolf-community/settings/-/blob/master/distribution/policies.json
+pkgs.wrapFirefox pkgs.librewolf-unwrapped {
+  # inherit the default librewolf.cfg
+  # it can be further customized via ~/.librewolf/librewolf.overrides.cfg
+  inherit (pkgs.librewolf-unwrapped) extraPrefsFiles;
+  libName = "librewolf";
+  extraPolicies = {
+    NoDefaultBookmarks = true;
+    SearchEngines = {
+      Default = "DuckDuckGo";
+    };
+    AppUpdateURL = "https://localhost";
+    DisableAppUpdate = true;
+    OverrideFirstRunPage = "";
+    OverridePostUpdatePage = "";
+    DisableSystemAddonUpdate = true;
+    DisableFirefoxStudies = true;
+    DisableTelemetry = true;
+    DisableFeedbackCommands = true;
+    DisablePocket = true;
+    DisableSetDesktopBackground = false;
+    Extensions = {
+      Install = [
+        "https://addons.mozilla.org/firefox/downloads/latest/ublock-origin/latest.xpi"
+        "https://addons.mozilla.org/firefox/downloads/latest/sponsorblock/latest.xpi"
+        "https://addons.mozilla.org/firefox/downloads/latest/bypass-paywalls-clean/latest.xpi"
+        "https://addons.mozilla.org/firefox/downloads/latest/sidebery/latest.xpi"
+        "https://addons.mozilla.org/firefox/downloads/latest/ether-metamask/latest.xpi"
+      ];
+      # remove many default search providers
+      Uninstall = [
+        "google@search.mozilla.org"
+        "bing@search.mozilla.org"
+        "amazondotcom@search.mozilla.org"
+        "ebay@search.mozilla.org"
+        "twitter@search.mozilla.org"
+      ];
+    };
+    # XXX doesn't seem to have any effect...
+    # docs: https://github.com/mozilla/policy-templates#homepage
+    # Homepage = {
+    #   HomepageURL = "https://uninsane.org/";
+    #   StartPage = "homepage";
+    # };
+    # NewTabPage = true;
+  };
+}

modules/universal/fs.nix

@@ -0,0 +1,68 @@
+{ pkgs, ... }:
+
+let sshOpts = rec {
+  fsType = "fuse.sshfs";
+  optionsBase = [
+    "x-systemd.automount"
+    "_netdev"
+    "user"
+    "identityfile=/home/colin/.ssh/id_ed25519"
+    "allow_other"
+    "default_permissions"
+  ];
+  optionsColin = optionsBase ++ [
+    "transform_symlinks"
+    "idmap=user"
+    "uid=1000"
+    "gid=100"
+  ];
+
+  optionsRoot = optionsBase ++ [
+    # we don't transform_symlinks because that breaks the validity of remote /nix stores
+    "sftp_server=/run/wrappers/bin/sudo\\040${pkgs.openssh}/libexec/sftp-server"
+  ];
+};
+in
+{
+  fileSystems."/mnt/servo-media-wan" = {
+    device = "colin@uninsane.org:/var/lib/uninsane/media";
+    inherit (sshOpts) fsType;
+    options = sshOpts.optionsColin;
+    noCheck = true;
+  };
+  fileSystems."/mnt/servo-media-lan" = {
+    device = "colin@servo:/var/lib/uninsane/media";
+    inherit (sshOpts) fsType;
+    options = sshOpts.optionsColin;
+    noCheck = true;
+  };
+  fileSystems."/mnt/servo-root-wan" = {
+    device = "colin@uninsane.org:/";
+    inherit (sshOpts) fsType;
+    options = sshOpts.optionsRoot;
+    noCheck = true;
+  };
+  fileSystems."/mnt/servo-root-lan" = {
+    device = "colin@servo:/";
+    inherit (sshOpts) fsType;
+    options = sshOpts.optionsRoot;
+    noCheck = true;
+  };
+  fileSystems."/mnt/desko-home" = {
+    device = "colin@desko:/home/colin";
+    inherit (sshOpts) fsType;
+    options = sshOpts.optionsColin;
+    noCheck = true;
+  };
+  fileSystems."/mnt/desko-root" = {
+    device = "colin@desko:/";
+    inherit (sshOpts) fsType;
+    options = sshOpts.optionsRoot;
+    noCheck = true;
+  };
+
+  environment.systemPackages = [
+    pkgs.sshfs-fuse
+  ];
+}
+

modules/universal/net.nix

@@ -0,0 +1,69 @@
+{ config, lib, pkgs, ... }:
+
+{
+  # if using router's DNS, these mappings will already exist.
+  # if using a different DNS provider (which servo does), then we need to explicity provide them.
+  # ugly hack. would be better to get servo to somehow use the router's DNS
+  networking.hosts = {
+    "192.168.0.5" = [ "servo" ];
+    "192.168.0.20" = [ "lappy" ];
+    "192.168.0.22" = [ "desko" ];
+    "192.168.0.48" = [ "moby" ];
+  };
+
+  # the default backend is "wpa_supplicant".
+  # wpa_supplicant reliably picks weak APs to connect to.
+  # see: <https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/issues/474>
+  # iwd is an alternative that shouldn't have this problem
+  # docs:
+  # - <https://nixos.wiki/wiki/Iwd>
+  # - <https://iwd.wiki.kernel.org/networkmanager>
+  # use `iwctl` to control
+  networking.wireless.iwd.enable = true;
+  networking.networkmanager.wifi.backend = "iwd";
+
+  system.activationScripts.linkIwdKeys = let
+    unwrapped = ../../scripts/install-iwd;
+    install-iwd = pkgs.writeShellApplication {
+      name = "install-iwd";
+      runtimeInputs = with pkgs; [ coreutils gnused ];
+      text = ''${unwrapped} "$@"'';
+    };
+  in (lib.stringAfter
+    [ "setupSecrets" ]
+    ''
+    mkdir -p /var/lib/iwd
+    ${install-iwd}/bin/install-iwd /run/secrets/iwd /var/lib/iwd
+    ''
+  );
+
+  # TODO: use a glob, or a list, or something?
+  sops.secrets."iwd/community-university.psk" = {
+    sopsFile = ../../secrets/universal/net/community-university.psk.bin;
+    format = "binary";
+  };
+  sops.secrets."iwd/friend-libertarian-dod.psk" = {
+    sopsFile = ../../secrets/universal/net/friend-libertarian-dod.psk.bin;
+    format = "binary";
+  };
+  sops.secrets."iwd/friend-rationalist-empathist.psk" = {
+    sopsFile = ../../secrets/universal/net/friend-rationalist-empathist.psk.bin;
+    format = "binary";
+  };
+  sops.secrets."iwd/home-bedroom.psk" = {
+    sopsFile = ../../secrets/universal/net/home-bedroom.psk.bin;
+    format = "binary";
+  };
+  sops.secrets."iwd/home-shared-24G.psk" = {
+    sopsFile = ../../secrets/universal/net/home-shared-24G.psk.bin;
+    format = "binary";
+  };
+  sops.secrets."iwd/home-shared.psk" = {
+    sopsFile = ../../secrets/universal/net/home-shared.psk.bin;
+    format = "binary";
+  };
+  sops.secrets."iwd/iphone" = {
+    sopsFile = ../../secrets/universal/net/iphone.psk.bin;
+    format = "binary";
+  };
+}

modules/universal/secrets.nix

@@ -0,0 +1,53 @@
+{ config, ... }:
+
+{
+  # SOPS configuration:
+  #   docs: https://github.com/Mic92/sops-nix
+  #
+  # for each new user you want to edit sops files:
+  # create a private age key from ssh key:
+  #   $ mkdir -p ~/.config/sops/age; ssh-to-age -private-key -i ~/.ssh/id_ed25519 > ~/.config/sops/age/keys.txt; chmod 600 ~/.config/sops/age/keys.txt
+  #   if the private key was password protected, then first decrypt it:
+  #     $ cp ~/.ssh/id_ed25519 /tmp/id_ed25519
+  #     $ ssh-keygen -p -N "" -f /tmp/id_ed25519
+  #
+  # for each user you want to decrypt secrets:
+  #   $ cat ~/.ssh/id_ed25519.pub | ssh-to-age
+  #   add the result to .sops.yaml
+  #   since we specify ssh pubkeys in the nix config, you can just grep for `ssh-ed25519` here and use those instead
+  #
+  # for each machine you want to decrypt secrets:
+  #   $ cat /etc/ssh/ssh_host_ed25519_key.pub | ssh-to-age
+  #   add the result to .sops.yaml
+  #   $ sops updatekeys secrets/example.yaml
+  #
+  # to create a new secret:
+  #   $ sops secrets/example.yaml
+  #   control access below (sops.secret.<x>.owner = ...)
+  #
+  # to read a secret:
+  #   $ cat /run/secrets/example_key
+
+  # sops.age.sshKeyPaths = [ "/home/colin/.ssh/id_ed25519_dec" ];
+  # This will add secrets.yaml to the nix store
+  # You can avoid this by adding a string to the full path instead, i.e.
+  # sops.defaultSopsFile = "/root/.sops/secrets/example.yaml";
+  sops.defaultSopsFile = ./../../secrets/universal.yaml;
+  # This will automatically import SSH keys as age keys
+  sops.age.sshKeyPaths = [
+    "/etc/ssh/ssh_host_ed25519_key"
+    # "/home/colin/.ssh/id_ed25519_dec"
+  ];
+  # This is using an age key that is expected to already be in the filesystem
+  # sops.age.keyFile = "/home/colin/.ssh/age.pub";
+  # sops.age.keyFile = "/var/lib/sops-nix/key.txt";
+  # This will generate a new key if the key specified above does not exist
+  # sops.age.generateKey = true;
+  # This is the actual specification of the secrets.
+  # sops.secrets.example_key = {
+  #   owner = config.users.users.colin.name;
+  # };
+  # sops.secrets."myservice/my_subdir/my_secret" = {};
+}
+
+

modules/universal/users.nix

@@ -0,0 +1,122 @@
+{ config, pkgs, lib, ... }:
+
+# installer docs: https://github.com/NixOS/nixpkgs/blob/master/nixos/modules/profiles/installation-device.nix
+with lib;
+let
+  cfg = config.sane.users;
+  # see nixpkgs/nixos/modules/services/networking/dhcpcd.nix
+  hasDHCP = config.networking.dhcpcd.enable &&
+    (config.networking.useDHCP || any (i: i.useDHCP == true) (attrValues config.networking.interfaces));
+
+in
+{
+  options = {
+    sane.users.guest.enable = mkOption {
+      default = false;
+      type = types.bool;
+    };
+  };
+
+  config = {
+    # Users are exactly these specified here;
+    # old ones will be deleted (from /etc/passwd, etc) upon upgrade.
+    users.mutableUsers = false;
+
+    # docs: https://nixpkgs-manual-sphinx-markedown-example.netlify.app/generated/options-db.xml.html#users-users
+    users.users.colin = {
+      # sets group to "users" (?)
+      isNormalUser = true;
+      home = "/home/colin";
+      uid = config.sane.allocations.colin-uid;
+      # i don't get exactly what this is, but nixos defaults to this non-deterministically
+      # in /var/lib/nixos/auto-subuid-map and i don't want that.
+      subUidRanges = [
+        { startUid=100000; count=1; }
+      ];
+      group = "users";
+      extraGroups = [
+        "wheel"
+        "nixbuild"
+        "networkmanager"
+        # phosh/mobile. XXX colin: unsure if necessary
+        "video"
+        "feedbackd"
+        "dialout" # required for modem access
+      ];
+      initialPassword = lib.mkDefault "";
+      shell = pkgs.zsh;
+      # shell = pkgs.bashInteractive;
+      # XXX colin: create ssh key for THIS user by logging in and running:
+      #   ssh-keygen -t ed25519
+      openssh.authorizedKeys.keys = [
+        "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDpmFdNSVPRol5hkbbCivRhyeENzb9HVyf9KutGLP2Zu colin@lappy"
+        "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPU5GlsSfbaarMvDA20bxpSZGWviEzXGD8gtrIowc1pX colin@desko"
+        "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPS1qFzKurAdB9blkWomq8gI1g0T3sTs9LsmFOj5VtqX colin@servo"
+        # moby doesn't need to login to any other devices yet
+        # "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICrR+gePnl0nV/vy7I5BzrGeyVL+9eOuXHU1yNE3uCwU colin@moby"
+      ];
+    };
+
+    sane.impermanence.service-dirs = mkIf cfg.guest.enable [
+      { user = "guest"; group = "users"; directory = "/home/guest"; }
+    ];
+    users.users.guest = mkIf cfg.guest.enable {
+      isNormalUser = true;
+      home = "/home/guest";
+      uid = config.sane.allocations.guest-uid;
+      subUidRanges = [
+        { startUid=200000; count=1; }
+      ];
+      group = "users";
+      initialPassword = lib.mkDefault "";
+      shell = pkgs.zsh;
+      openssh.authorizedKeys.keys = [
+        # TODO: insert pubkeys that should be allowed in
+      ];
+    };
+
+    users.users.dhcpcd = mkIf hasDHCP {
+      uid = config.sane.allocations.dhcpcd-uid;
+    };
+    users.groups.dhcpcd = mkIf hasDHCP {
+      gid = config.sane.allocations.dhcpcd-gid;
+    };
+
+    security.sudo = {
+      enable = true;
+      wheelNeedsPassword = false;
+    };
+
+    services.openssh = {
+      enable = true;
+      permitRootLogin = "no";
+      passwordAuthentication = false;
+    };
+
+    # affix some UIDs which were historically auto-generated
+    users.users.sshd.uid = config.sane.allocations.sshd-uid;
+    users.groups.polkituser.gid = config.sane.allocations.polkituser-gid;
+    users.groups.sshd.gid = config.sane.allocations.sshd-gid;
+    users.groups.systemd-coredump.gid = config.sane.allocations.systemd-coredump-gid;
+    users.users.nscd.uid = config.sane.allocations.nscd-uid;
+    users.groups.nscd.gid = config.sane.allocations.nscd-gid;
+    users.users.systemd-oom.uid = config.sane.allocations.systemd-oom-uid;
+    users.groups.systemd-oom.gid = config.sane.allocations.systemd-oom-gid;
+
+    # guarantee determinism in uid/gid generation for users:
+    assertions = let
+      uidAssertions = builtins.attrValues (builtins.mapAttrs (name: user: {
+        assertion = user.uid != null;
+        message = "non-deterministic uid detected for: ${name}";
+      }) config.users.users);
+      gidAssertions = builtins.attrValues (builtins.mapAttrs (name: group: {
+        assertion = group.gid != null;
+        message = "non-deterministic gid detected for: ${name}";
+      }) config.users.groups);
+      autoSubAssertions = builtins.attrValues (builtins.mapAttrs (name: user: {
+        assertion = !user.autoSubUidGidRange;
+        message = "non-deterministic subUids/Guids detected for: ${name}";
+      }) config.users.users);
+    in uidAssertions ++ gidAssertions ++ autoSubAssertions;
+  };
+}

modules/universal/vpn.nix

@@ -0,0 +1,58 @@
+{ config, ... }:
+
+{
+  networking.wg-quick.interfaces.ovpnd-us = {
+    address = [
+      "172.27.237.218/32"
+      "fd00:0000:1337:cafe:1111:1111:ab00:4c8f/128"
+    ];
+    dns = [
+      "46.227.67.134"
+      "192.165.9.158"
+    ];
+    peers = [
+      {
+        allowedIPs = [
+          "0.0.0.0/0"
+          "::/0"
+        ];
+        endpoint = "vpn31.prd.losangeles.ovpn.com:9929";
+        publicKey = "VW6bEWMOlOneta1bf6YFE25N/oMGh1E1UFBCfyggd0k=";
+      }
+    ];
+    privateKeyFile = config.sops.secrets.wg_ovpnd_us_privkey.path;
+    # to start: `systemctl start wg-quick-ovpnd-us`
+    autostart = false;
+  };
+
+  networking.wg-quick.interfaces.ovpnd-ukr = {
+    address = [
+      "172.18.180.159/32"
+      "fd00:0000:1337:cafe:1111:1111:ec5c:add3/128"
+    ];
+    dns = [
+      "46.227.67.134"
+      "192.165.9.158"
+    ];
+    peers = [
+      {
+        allowedIPs = [
+          "0.0.0.0/0"
+          "::/0"
+        ];
+        endpoint = "vpn96.prd.kyiv.ovpn.com:9929";
+        publicKey = "CjZcXDxaaKpW8b5As1EcNbI6+42A6BjWahwXDCwfVFg=";
+      }
+    ];
+    privateKeyFile = config.sops.secrets.wg_ovpnd_ukr_privkey.path;
+    # to start: `systemctl start wg-quick-ovpnd-ukr`
+    autostart = false;
+  };
+
+  sops.secrets."wg_ovpnd_us_privkey" = {
+    sopsFile = ../../secrets/universal.yaml;
+  };
+  sops.secrets."wg_ovpnd_ukr_privkey" = {
+    sopsFile = ../../secrets/universal.yaml;
+  };
+}

nixpatches/01-phosh-float-scale.patch

@@ -1,19 +0,0 @@
-diff --git a/nixos/modules/services/x11/desktop-managers/phosh.nix b/nixos/modules/services/x11/desktop-managers/phosh.nix
-index 4bf78fa16e7..13f7b3fbef2 100644
---- a/nixos/modules/services/x11/desktop-managers/phosh.nix
-+++ b/nixos/modules/services/x11/desktop-managers/phosh.nix
-@@ -78,7 +78,13 @@ let
-         description = ''
-           Display scaling factor.
-         '';
--        type = types.nullOr types.ints.unsigned;
-+        type = types.nullOr (
-+          types.addCheck
-+          (types.either types.int types.float)
-+          (x : x > 0)
-+        ) // {
-+          description = "null or positive integer or float";
-+        };
-         default = null;
-         example = 2;
-       };

nixpatches/03-whalebird-4.6.0.patch

@@ -1,18 +0,0 @@
-diff --git a/pkgs/applications/misc/whalebird/default.nix b/pkgs/applications/misc/whalebird/default.nix
-index 9b8a7f0a348..0f60f74c91b 100644
---- a/pkgs/applications/misc/whalebird/default.nix
-+++ b/pkgs/applications/misc/whalebird/default.nix
-@@ -3,11 +3,11 @@
- 
- stdenv.mkDerivation rec {
-   pname = "whalebird";
--  version = "4.5.4";
-+  version = "4.6.0";
- 
-   src = fetchurl {
-     url = "https://github.com/h3poteto/whalebird-desktop/releases/download/${version}/Whalebird-${version}-linux-x64.deb";
--    sha256 = "048c2hpnlzjli8r1lcm7hd32qfsq4p9vkimrgc049yw9f15ndjpr";
-+    sha256 = "d8042eb21e4320771782a1835a591252894ad657eec46248c807d5a772e1938e";
-   };
- 
-   nativeBuildInputs = [

nixpatches/04-dart-2.7.0.patch

@@ -36,19 +36,19 @@ index 9eba6773448..f51aeb8b624 100644
      patches = getPatches ./patches;
    };
 diff --git a/pkgs/development/compilers/flutter/flutter.nix b/pkgs/development/compilers/flutter/flutter.nix
-index 43538ede339..26f50f731c2 100644
+index 43538ede339..ece25c14b55 100644
 --- a/pkgs/development/compilers/flutter/flutter.nix
 +++ b/pkgs/development/compilers/flutter/flutter.nix
-@@ -48,6 +48,7 @@ let
-     '';
+@@ -56,12 +56,15 @@ let
+       export STAMP_PATH="$FLUTTER_ROOT/bin/cache/flutter_tools.stamp"
  
-     buildPhase = ''
-+      set -ex
-       export FLUTTER_ROOT="$(pwd)"
-       export FLUTTER_TOOLS_DIR="$FLUTTER_ROOT/packages/flutter_tools"
-       export SCRIPT_PATH="$FLUTTER_TOOLS_DIR/bin/flutter_tools.dart"
-@@ -61,7 +62,7 @@ let
+       export DART_SDK_PATH="${dart}"
++      export DART="${dart}/bin/dart"
+ 
+       HOME=../.. # required for pub upgrade --offline, ~/.pub-cache
                   # path is relative otherwise it's replaced by /build/flutter
++      # mkdir -p "$HOME/.cache"
++      # ln -sf "$FLUTTER_ROOT" "$HOME/.cache/flutter"
  
        pushd "$FLUTTER_TOOLS_DIR"
 -      ${dart}/bin/pub get --offline
@@ -56,3 +56,247 @@ index 43538ede339..26f50f731c2 100644
        popd
  
        local revision="$(cd "$FLUTTER_ROOT"; git rev-parse HEAD)"
+diff --git a/pkgs/development/compilers/flutter/patches/git-dir.patch b/pkgs/development/compilers/flutter/patches/git-dir.patch
+new file mode 100644
+index 00000000000..0c736f945ea
+--- /dev/null
++++ b/pkgs/development/compilers/flutter/patches/git-dir.patch
+@@ -0,0 +1,102 @@
++diff --git a/dev/bots/prepare_package.dart b/dev/bots/prepare_package.dart
++index 468a91a954..5def6897ce 100644
++--- a/dev/bots/prepare_package.dart
+++++ b/dev/bots/prepare_package.dart
++@@ -525,7 +525,7 @@ class ArchiveCreator {
++ 
++   Future<String> _runGit(List<String> args, {Directory? workingDirectory}) {
++     return _processRunner.runProcess(
++-      <String>['git', ...args],
+++      <String>['git', '--git-dir', '.git', ...args],
++       workingDirectory: workingDirectory ?? flutterRoot,
++     );
++   }
++diff --git a/packages/flutter_tools/lib/src/commands/downgrade.dart b/packages/flutter_tools/lib/src/commands/downgrade.dart
++index bb0eb428a9..4a2a48bb5e 100644
++--- a/packages/flutter_tools/lib/src/commands/downgrade.dart
+++++ b/packages/flutter_tools/lib/src/commands/downgrade.dart
++@@ -118,7 +118,7 @@ class DowngradeCommand extends FlutterCommand {
++     // Detect unknown versions.
++     final ProcessUtils processUtils = _processUtils!;
++     final RunResult parseResult = await processUtils.run(<String>[
++-      'git', 'describe', '--tags', lastFlutterVersion,
+++      'git', '--git-dir', '.git', 'describe', '--tags', lastFlutterVersion,
++     ], workingDirectory: workingDirectory);
++     if (parseResult.exitCode != 0) {
++       throwToolExit('Failed to parse version for downgrade:\n${parseResult.stderr}');
++@@ -191,7 +191,7 @@ class DowngradeCommand extends FlutterCommand {
++         continue;
++       }
++       final RunResult parseResult = await _processUtils!.run(<String>[
++-        'git', 'describe', '--tags', sha,
+++        'git', '--git-dir', '.git', 'describe', '--tags', sha,
++       ], workingDirectory: workingDirectory);
++       if (parseResult.exitCode == 0) {
++         buffer.writeln('Channel "${getNameForChannel(channel)}" was previously on: ${parseResult.stdout}.');
++diff --git a/packages/flutter_tools/lib/src/version.dart b/packages/flutter_tools/lib/src/version.dart
++index f2068a6ca2..99b161689e 100644
++--- a/packages/flutter_tools/lib/src/version.dart
+++++ b/packages/flutter_tools/lib/src/version.dart
++@@ -106,7 +106,7 @@ class FlutterVersion {
++     String? channel = _channel;
++     if (channel == null) {
++       final String gitChannel = _runGit(
++-        'git rev-parse --abbrev-ref --symbolic @{u}',
+++        'git --git-dir .git rev-parse --abbrev-ref --symbolic @{u}',
++         globals.processUtils,
++         _workingDirectory,
++       );
++@@ -114,7 +114,7 @@ class FlutterVersion {
++       if (slash != -1) {
++         final String remote = gitChannel.substring(0, slash);
++         _repositoryUrl = _runGit(
++-          'git ls-remote --get-url $remote',
+++          'git --git-dir .git ls-remote --get-url $remote',
++           globals.processUtils,
++           _workingDirectory,
++         );
++@@ -326,7 +326,7 @@ class FlutterVersion {
++   /// the branch name will be returned as `'[user-branch]'`.
++   String getBranchName({ bool redactUnknownBranches = false }) {
++     _branch ??= () {
++-      final String branch = _runGit('git rev-parse --abbrev-ref HEAD', globals.processUtils);
+++      final String branch = _runGit('git --git-dir .git rev-parse --abbrev-ref HEAD', globals.processUtils);
++       return branch == 'HEAD' ? channel : branch;
++     }();
++     if (redactUnknownBranches || _branch!.isEmpty) {
++@@ -359,7 +359,7 @@ class FlutterVersion {
++   /// wrapper that does that.
++   @visibleForTesting
++   static List<String> gitLog(List<String> args) {
++-    return <String>['git', '-c', 'log.showSignature=false', 'log'] + args;
+++    return <String>['git', '-c', 'log.showSignature=false', '--git-dir', '.git', 'log'] + args;
++   }
++ 
++   /// Gets the release date of the latest available Flutter version.
++@@ -730,7 +730,7 @@ class GitTagVersion {
++ 
++   static GitTagVersion determine(ProcessUtils processUtils, {String? workingDirectory, bool fetchTags = false, String gitRef = 'HEAD'}) {
++     if (fetchTags) {
++-      final String channel = _runGit('git rev-parse --abbrev-ref HEAD', processUtils, workingDirectory);
+++      final String channel = _runGit('git --git-dir .git rev-parse --abbrev-ref HEAD', processUtils, workingDirectory);
++       if (channel == 'dev' || channel == 'beta' || channel == 'stable') {
++         globals.printTrace('Skipping request to fetchTags - on well known channel $channel.');
++       } else {
++@@ -739,7 +739,7 @@ class GitTagVersion {
++     }
++     // find all tags attached to the given [gitRef]
++     final List<String> tags = _runGit(
++-      'git tag --points-at $gitRef', processUtils, workingDirectory).trim().split('\n');
+++      'git --git-dir .git tag --points-at $gitRef', processUtils, workingDirectory).trim().split('\n');
++ 
++     // Check first for a stable tag
++     final RegExp stableTagPattern = RegExp(r'^\d+\.\d+\.\d+$');
++@@ -760,7 +760,7 @@ class GitTagVersion {
++     // recent tag and number of commits past.
++     return parse(
++       _runGit(
++-        'git describe --match *.*.* --long --tags $gitRef',
+++        'git --git-dir .git describe --match *.*.* --long --tags $gitRef',
++         processUtils,
++         workingDirectory,
++       )
+diff --git a/pkgs/development/compilers/flutter/patches/revert-frontend_server_cache.patch b/pkgs/development/compilers/flutter/patches/revert-frontend_server_cache.patch
+new file mode 100644
+index 00000000000..f68029eb7a1
+--- /dev/null
++++ b/pkgs/development/compilers/flutter/patches/revert-frontend_server_cache.patch
+@@ -0,0 +1,130 @@
++diff --git a/packages/flutter_tools/lib/src/artifacts.dart b/packages/flutter_tools/lib/src/artifacts.dart
++index 2aac9686e8..32c4b98b88 100644
++--- a/packages/flutter_tools/lib/src/artifacts.dart
+++++ b/packages/flutter_tools/lib/src/artifacts.dart
++@@ -346,10 +346,10 @@ class CachedArtifacts implements Artifacts {
++   ) {
++     switch (artifact) {
++       case HostArtifact.engineDartSdkPath:
++-        final String path = _dartSdkPath(_cache);
+++        final String path = _dartSdkPath(_fileSystem);
++         return _fileSystem.directory(path);
++       case HostArtifact.engineDartBinary:
++-        final String path = _fileSystem.path.join(_dartSdkPath(_cache), 'bin', _hostArtifactToFileName(artifact, _platform.isWindows));
+++        final String path = _fileSystem.path.join(_dartSdkPath(_fileSystem), 'bin', _hostArtifactToFileName(artifact, _platform.isWindows));
++         return _fileSystem.file(path);
++       case HostArtifact.flutterWebSdk:
++         final String path = _getFlutterWebSdkPath();
++@@ -398,7 +398,7 @@ class CachedArtifacts implements Artifacts {
++       case HostArtifact.dart2jsSnapshot:
++       case HostArtifact.dartdevcSnapshot:
++       case HostArtifact.kernelWorkerSnapshot:
++-        final String path = _fileSystem.path.join(_dartSdkPath(_cache), 'bin', 'snapshots', _hostArtifactToFileName(artifact, _platform.isWindows));
+++        final String path = _fileSystem.path.join(_dartSdkPath(_fileSystem), 'bin', 'snapshots', _hostArtifactToFileName(artifact, _platform.isWindows));
++         return _fileSystem.file(path);
++       case HostArtifact.iosDeploy:
++         final String artifactFileName = _hostArtifactToFileName(artifact, _platform.isWindows);
++@@ -461,11 +461,13 @@ class CachedArtifacts implements Artifacts {
++   String _getAndroidArtifactPath(Artifact artifact, TargetPlatform platform, BuildMode mode) {
++     final String engineDir = _getEngineArtifactsPath(platform, mode)!;
++     switch (artifact) {
+++      case Artifact.frontendServerSnapshotForEngineDartSdk:
+++        assert(mode != BuildMode.debug, 'Artifact $artifact only available in non-debug mode.');
+++        return _fileSystem.path.join(engineDir, _artifactToFileName(artifact));
++       case Artifact.genSnapshot:
++         assert(mode != BuildMode.debug, 'Artifact $artifact only available in non-debug mode.');
++         final String hostPlatform = getNameForHostPlatform(getCurrentHostPlatform());
++         return _fileSystem.path.join(engineDir, hostPlatform, _artifactToFileName(artifact));
++-      case Artifact.frontendServerSnapshotForEngineDartSdk:
++       case Artifact.constFinder:
++       case Artifact.flutterFramework:
++       case Artifact.flutterMacOSFramework:
++@@ -497,13 +499,13 @@ class CachedArtifacts implements Artifacts {
++     switch (artifact) {
++       case Artifact.genSnapshot:
++       case Artifact.flutterXcframework:
+++      case Artifact.frontendServerSnapshotForEngineDartSdk:
++         final String artifactFileName = _artifactToFileName(artifact)!;
++         final String engineDir = _getEngineArtifactsPath(platform, mode)!;
++         return _fileSystem.path.join(engineDir, artifactFileName);
++       case Artifact.flutterFramework:
++         final String engineDir = _getEngineArtifactsPath(platform, mode)!;
++         return _getIosEngineArtifactPath(engineDir, environmentType, _fileSystem);
++-      case Artifact.frontendServerSnapshotForEngineDartSdk:
++       case Artifact.constFinder:
++       case Artifact.flutterMacOSFramework:
++       case Artifact.flutterMacOSPodspec:
++@@ -594,14 +596,10 @@ class CachedArtifacts implements Artifacts {
++         // For script snapshots any gen_snapshot binary will do. Returning gen_snapshot for
++         // android_arm in profile mode because it is available on all supported host platforms.
++         return _getAndroidArtifactPath(artifact, TargetPlatform.android_arm, BuildMode.profile);
++-      case Artifact.frontendServerSnapshotForEngineDartSdk:
++-        return _fileSystem.path.join(
++-          _dartSdkPath(_cache), 'bin', 'snapshots',
++-          _artifactToFileName(artifact),
++-        );
++       case Artifact.flutterTester:
++       case Artifact.vmSnapshotData:
++       case Artifact.isolateSnapshotData:
+++      case Artifact.frontendServerSnapshotForEngineDartSdk:
++       case Artifact.icuData:
++         final String engineArtifactsPath = _cache.getArtifactDirectory('engine').path;
++         final String platformDirName = _enginePlatformDirectoryName(platform);
++@@ -797,7 +795,7 @@ class CachedLocalEngineArtifacts implements LocalEngineArtifacts {
++         final String path = _fileSystem.path.join(_hostEngineOutPath, 'dart-sdk', 'bin', 'snapshots', _hostArtifactToFileName(artifact, _platform.isWindows));
++         return _fileSystem.file(path);
++       case HostArtifact.dartdevcSnapshot:
++-        final String path = _fileSystem.path.join(_dartSdkPath(_cache), 'bin', 'snapshots', _hostArtifactToFileName(artifact, _platform.isWindows));
+++        final String path = _fileSystem.path.join(_dartSdkPath(_fileSystem), 'bin', 'snapshots', _hostArtifactToFileName(artifact, _platform.isWindows));
++         return _fileSystem.file(path);
++       case HostArtifact.kernelWorkerSnapshot:
++         final String path = _fileSystem.path.join(_hostEngineOutPath, 'dart-sdk', 'bin', 'snapshots', _hostArtifactToFileName(artifact, _platform.isWindows));
++@@ -922,9 +920,7 @@ class CachedLocalEngineArtifacts implements LocalEngineArtifacts {
++       case Artifact.windowsUwpCppClientWrapper:
++         return _fileSystem.path.join(_hostEngineOutPath, artifactFileName);
++       case Artifact.frontendServerSnapshotForEngineDartSdk:
++-        return _fileSystem.path.join(
++-          _hostEngineOutPath, 'dart-sdk', 'bin', 'snapshots', artifactFileName,
++-        );
+++        return _fileSystem.path.join(_hostEngineOutPath, 'gen', artifactFileName);
++       case Artifact.uwptool:
++         return _fileSystem.path.join(_hostEngineOutPath, artifactFileName);
++     }
++@@ -1034,8 +1030,8 @@ class OverrideArtifacts implements Artifacts {
++ }
++ 
++ /// Locate the Dart SDK.
++-String _dartSdkPath(Cache cache) {
++-  return cache.getRoot().childDirectory('dart-sdk').path;
+++String _dartSdkPath(FileSystem fileSystem) {
+++  return fileSystem.path.join(Cache.flutterRoot!, 'bin', 'cache', 'dart-sdk');
++ }
++ 
++ class _TestArtifacts implements Artifacts {
++diff --git a/packages/flutter_tools/test/general.shard/artifacts_test.dart b/packages/flutter_tools/test/general.shard/artifacts_test.dart
++index d906511a15..adfdd4bb42 100644
++--- a/packages/flutter_tools/test/general.shard/artifacts_test.dart
+++++ b/packages/flutter_tools/test/general.shard/artifacts_test.dart
++@@ -153,10 +153,6 @@ void main() {
++         artifacts.getArtifactPath(Artifact.windowsUwpDesktopPath, platform: TargetPlatform.windows_uwp_x64, mode: BuildMode.release),
++         fileSystem.path.join('root', 'bin', 'cache', 'artifacts', 'engine', 'windows-uwp-x64-release'),
++       );
++-      expect(
++-        artifacts.getArtifactPath(Artifact.frontendServerSnapshotForEngineDartSdk),
++-        fileSystem.path.join('root', 'bin', 'cache', 'dart-sdk', 'bin', 'snapshots', 'frontend_server.dart.snapshot')
++-      );
++     });
++ 
++     testWithoutContext('precompiled web artifact paths are correct', () {
++@@ -322,11 +318,6 @@ void main() {
++         artifacts.getHostArtifact(HostArtifact.engineDartSdkPath).path,
++         fileSystem.path.join('/out', 'host_debug_unopt', 'dart-sdk'),
++       );
++-      expect(
++-        artifacts.getArtifactPath(Artifact.frontendServerSnapshotForEngineDartSdk),
++-        fileSystem.path.join('/out', 'host_debug_unopt', 'dart-sdk', 'bin',
++-          'snapshots', 'frontend_server.dart.snapshot')
++-      );
++     });
++ 
++     testWithoutContext('getEngineType', () {

nixpatches/07-duplicity-rich-url.patch

@@ -0,0 +1,43 @@
+diff --git a/nixos/modules/services/backup/duplicity.nix b/nixos/modules/services/backup/duplicity.nix
+index 6949fa8b995..33d772ffa37 100644
+--- a/nixos/modules/services/backup/duplicity.nix
++++ b/nixos/modules/services/backup/duplicity.nix
+@@ -54,6 +54,17 @@ in
+       '';
+     };
+ 
++    escapeUrl = mkOption {
++      type = types.bool;
++      example = false;
++      default = true;
++      description = ''
++        Whether to escape the targetUrl when passing it to Duplicity as a CLI
++        argument. One might disable this in order to make use of shell
++        expressions such as environment variables.
++      '';
++    };
++
+     secretFile = mkOption {
+       type = types.nullOr types.path;
+       default = null;
+@@ -148,7 +159,7 @@ in
+ 
+         script =
+           let
+-            target = escapeShellArg cfg.targetUrl;
++            target = if cfg.escapeUrl then (escapeShellArg cfg.targetUrl) else cfg.targetUrl;
+             extra = escapeShellArgs ([ "--archive-dir" stateDirectory ] ++ cfg.extraFlags);
+             dup = "${pkgs.duplicity}/bin/duplicity";
+           in
+@@ -158,9 +169,8 @@ in
+             ${lib.optionalString (cfg.cleanup.maxAge != null) "${dup} remove-older-than ${lib.escapeShellArg cfg.cleanup.maxAge} ${target} --force ${extra}"}
+             ${lib.optionalString (cfg.cleanup.maxFull != null) "${dup} remove-all-but-n-full ${toString cfg.cleanup.maxFull} ${target} --force ${extra}"}
+             ${lib.optionalString (cfg.cleanup.maxIncr != null) "${dup} remove-all-inc-of-but-n-full ${toString cfg.cleanup.maxIncr} ${target} --force ${extra}"}
+-            exec ${dup} ${if cfg.fullIfOlderThan == "always" then "full" else "incr"} ${lib.escapeShellArgs (
+-              [ cfg.root cfg.targetUrl ]
+-              ++ concatMap (p: [ "--include" p ]) cfg.include
++            exec ${dup} ${if cfg.fullIfOlderThan == "always" then "full" else "incr"} ${lib.escapeShellArg cfg.root} ${target} ${lib.escapeShellArgs (
++              concatMap (p: [ "--include" p ]) cfg.include
+               ++ concatMap (p: [ "--exclude" p ]) cfg.exclude
+               ++ (lib.optionals (cfg.fullIfOlderThan != "never" && cfg.fullIfOlderThan != "always") [ "--full-if-older-than" cfg.fullIfOlderThan ])
+               )} ${extra}

nixpatches/10-flutter-arm64.patch

@@ -0,0 +1,40 @@
+diff --git a/pkgs/applications/networking/instant-messengers/fluffychat/default.nix b/pkgs/applications/networking/instant-messengers/fluffychat/default.nix
+index 565c44f72e9..f20a3d4e9be 100644
+--- a/pkgs/applications/networking/instant-messengers/fluffychat/default.nix
++++ b/pkgs/applications/networking/instant-messengers/fluffychat/default.nix
+@@ -4,13 +4,19 @@
+ , olm
+ , imagemagick
+ , makeDesktopItem
++, stdenv
+ }:
+ 
++let vendorHashes = {
++  x86_64-linux = "sha256-p5EJP2zSvWyRV1uyTHw0EpFsEwAGtX5B9WVjpLmnVew=";
++  aarch64-linux = "sha256-Ps0HmDI6BFxHrLRq3KWNk4hw0qneq5hqB/Mp99f+hO4=";
++};
++in
+ flutter.mkFlutterApp rec {
+   pname = "fluffychat";
+   version = "1.6.1";
+ 
+-  vendorHash = "sha256-SelMRETFYZgTStV90gRoKhazu1NPbcSMO9mYebSQskQ=";
++  vendorHash = vendorHashes."${stdenv.hostPlatform.system}" or (throw "unsupported system: ${stdenv.hostPlatform.system}");
+ 
+   src = fetchFromGitLab {
+     owner = "famedly";
+diff --git a/pkgs/development/compilers/flutter/default.nix b/pkgs/development/compilers/flutter/default.nix
+index 9eba6773448..e9d352169b2 100644
+--- a/pkgs/development/compilers/flutter/default.nix
++++ b/pkgs/development/compilers/flutter/default.nix
+@@ -19,6 +19,10 @@ let
+         url = "${dartSourceBase}/stable/release/${dartVersion}/sdk/dartsdk-linux-x64-release.zip";
+         sha256 = "sha256-PMY6DCFQC8XrlnFzOEPcwgBAs5/cAvNd78969Z+I1Fk=";
+       };
++      "${dartVersion}-aarch64-linux" = fetchurl {
++        url = "${dartSourceBase}/stable/release/${dartVersion}/sdk/dartsdk-linux-arm64-release.zip";
++        sha256 = "sha256-BIK6kUx+m+/GfR/wBXv8rjVNbP6w1HFvH/RGIwiaJog=";
++      };
+     };
+   };
+ in {

nixpatches/11-flutter-3.3.3-189338.patch

@@ -0,0 +1,646 @@
+diff --git a/pkgs/applications/networking/instant-messengers/fluffychat/default.nix b/pkgs/applications/networking/instant-messengers/fluffychat/default.nix
+index d50e7118cc1..22bbeb212f0 100644
+--- a/pkgs/applications/networking/instant-messengers/fluffychat/default.nix
++++ b/pkgs/applications/networking/instant-messengers/fluffychat/default.nix
+@@ -1,16 +1,16 @@
+ { lib
+ , fetchFromGitLab
+-, flutter
++, flutter2
+ , olm
+ , imagemagick
+ , makeDesktopItem
+ }:
+ 
+-flutter.mkFlutterApp rec {
++flutter2.mkFlutterApp rec {
+   pname = "fluffychat";
+   version = "1.2.0";
+ 
+-  vendorHash = "sha256-co+bnsVIyg42JpM9FimfGEjrd6A99GlBeow1Dgv7NBI=";
++  vendorHash = "sha256-1PDX023WXRmRe/b1L+6Du91BvGwYNp3YATqYSQdPrRY=";
+ 
+   src = fetchFromGitLab {
+     owner = "famedly";
+diff --git a/pkgs/development/compilers/flutter/default.nix b/pkgs/development/compilers/flutter/default.nix
+index 4529d2adc1a..02188335129 100644
+--- a/pkgs/development/compilers/flutter/default.nix
++++ b/pkgs/development/compilers/flutter/default.nix
+@@ -4,34 +4,40 @@ let
+   getPatches = dir:
+     let files = builtins.attrNames (builtins.readDir dir);
+     in map (f: dir + ("/" + f)) files;
+-  version = "3.0.4";
+-  channel = "stable";
+-  filename = "flutter_linux_${version}-${channel}.tar.xz";
+-
+-  # Decouples flutter derivation from dart derivation,
+-  # use specific dart version to not need to bump dart derivation when bumping flutter.
+-  dartVersion = "2.17.5";
+-  dartSourceBase = "https://storage.googleapis.com/dart-archive/channels";
+-  dartForFlutter = dart.override {
+-    version = dartVersion;
+-    sources = {
+-      "${dartVersion}-x86_64-linux" = fetchurl {
+-        url = "${dartSourceBase}/stable/release/${dartVersion}/sdk/dartsdk-linux-x64-release.zip";
+-        sha256 = "sha256-AFJGeiPsjUZSO+DykmOIFETg2jIohg62tp3ghZrKJFk=";
++  flutterDrv = { version, pname, dartVersion, hash, dartHash, patches }: mkFlutter {
++    inherit version pname patches;
++    dart = dart.override {
++      version = dartVersion;
++      sources = {
++        "${dartVersion}-x86_64-linux" = fetchurl {
++          url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${dartVersion}/sdk/dartsdk-linux-x64-release.zip";
++          sha256 = dartHash;
++        };
+       };
+     };
++    src = fetchurl {
++      url = "https://storage.googleapis.com/flutter_infra_release/releases/stable/linux/flutter_linux_${version}-stable.tar.xz";
++      sha256 = hash;
++    };
+   };
+ in
+ {
+   inherit mkFlutter;
+-  stable = mkFlutter rec {
+-    inherit version;
+-    dart = dartForFlutter;
++  stable = flutterDrv {
+     pname = "flutter";
+-    src = fetchurl {
+-      url = "https://storage.googleapis.com/flutter_infra_release/releases/${channel}/linux/${filename}";
+-      sha256 = "sha256-vh3QjLGFBN321DUET9XhYqSkILjEj+ZqAALu/mxY+go=";
+-    };
+-    patches = getPatches ./patches;
++    version = "3.3.3";
++    dartVersion = "2.18.2";
++    hash = "sha256-MTZeWQUp4/TcPzYIT6eqIKSPUPvn2Mp/thOQzNgpTXg=";
++    dartHash = "sha256-C3+YjecXLvSmJrLwi9H7TgD9Np0AArRWx3EdBrfQpTU";
++    patches = getPatches ./patches/flutter3;
++  };
++
++  v2 = flutterDrv {
++    pname = "flutter";
++    version = "2.10.5";
++    dartVersion = "2.16.2";
++    hash = "sha256-DTZwxlMUYk8NS1SaWUJolXjD+JnRW73Ps5CdRHDGnt0=";
++    dartHash = "sha256-egrYd7B4XhkBiHPIFE2zopxKtQ58GqlogAKA/UeiXnI=";
++    patches = getPatches ./patches/flutter2;
+   };
+ }
+diff --git a/pkgs/development/compilers/flutter/flutter.nix b/pkgs/development/compilers/flutter/flutter.nix
+index 28a78c3e306..f2c861356ab 100644
+--- a/pkgs/development/compilers/flutter/flutter.nix
++++ b/pkgs/development/compilers/flutter/flutter.nix
+@@ -65,7 +65,7 @@ let
+       popd
+ 
+       local revision="$(cd "$FLUTTER_ROOT"; git rev-parse HEAD)"
+-      ${dart}/bin/dart --snapshot="$SNAPSHOT_PATH" --packages="$FLUTTER_TOOLS_DIR/.packages" "$SCRIPT_PATH"
++      ${dart}/bin/dart --snapshot="$SNAPSHOT_PATH" --packages="$FLUTTER_TOOLS_DIR/.dart_tool/package_config.json" "$SCRIPT_PATH"
+       echo "$revision" > "$STAMP_PATH"
+       echo -n "${version}" > version
+ 
+diff --git a/pkgs/development/compilers/flutter/patches/disable-auto-update.patch b/pkgs/development/compilers/flutter/patches/flutter2/disable-auto-update.patch
+similarity index 100%
+rename from pkgs/development/compilers/flutter/patches/disable-auto-update.patch
+rename to pkgs/development/compilers/flutter/patches/flutter2/disable-auto-update.patch
+diff --git a/pkgs/development/compilers/flutter/patches/flutter2/git-dir.patch b/pkgs/development/compilers/flutter/patches/flutter2/git-dir.patch
+new file mode 100644
+index 00000000000..0136ef93106
+--- /dev/null
++++ b/pkgs/development/compilers/flutter/patches/flutter2/git-dir.patch
+@@ -0,0 +1,80 @@
++diff --git a/dev/bots/prepare_package.dart b/dev/bots/prepare_package.dart
++index 468a91a954..5def6897ce 100644
++--- a/dev/bots/prepare_package.dart
+++++ b/dev/bots/prepare_package.dart
++@@ -525,7 +525,7 @@ class ArchiveCreator {
++ 
++   Future<String> _runGit(List<String> args, {Directory? workingDirectory}) {
++     return _processRunner.runProcess(
++-      <String>['git', ...args],
+++      <String>['git', '--git-dir', '.git', ...args],
++       workingDirectory: workingDirectory ?? flutterRoot,
++     );
++   }
++diff --git a/packages/flutter_tools/lib/src/version.dart b/packages/flutter_tools/lib/src/version.dart
++index f2068a6ca2..99b161689e 100644
++--- a/packages/flutter_tools/lib/src/version.dart
+++++ b/packages/flutter_tools/lib/src/version.dart
++@@ -106,7 +106,7 @@ class FlutterVersion {
++     String? channel = _channel;
++     if (channel == null) {
++       final String gitChannel = _runGit(
++-        'git rev-parse --abbrev-ref --symbolic @{u}',
+++        'git --git-dir .git rev-parse --abbrev-ref --symbolic @{u}',
++         globals.processUtils,
++         _workingDirectory,
++       );
++@@ -114,7 +114,7 @@ class FlutterVersion {
++       if (slash != -1) {
++         final String remote = gitChannel.substring(0, slash);
++         _repositoryUrl = _runGit(
++-          'git ls-remote --get-url $remote',
+++          'git --git-dir .git ls-remote --get-url $remote',
++           globals.processUtils,
++           _workingDirectory,
++         );
++@@ -326,7 +326,7 @@ class FlutterVersion {
++   /// the branch name will be returned as `'[user-branch]'`.
++   String getBranchName({ bool redactUnknownBranches = false }) {
++     _branch ??= () {
++-      final String branch = _runGit('git rev-parse --abbrev-ref HEAD', globals.processUtils);
+++      final String branch = _runGit('git --git-dir .git rev-parse --abbrev-ref HEAD', globals.processUtils);
++       return branch == 'HEAD' ? channel : branch;
++     }();
++     if (redactUnknownBranches || _branch!.isEmpty) {
++@@ -359,7 +359,7 @@ class FlutterVersion {
++   /// wrapper that does that.
++   @visibleForTesting
++   static List<String> gitLog(List<String> args) {
++-    return <String>['git', '-c', 'log.showSignature=false', 'log'] + args;
+++    return <String>['git', '-c', 'log.showSignature=false', '--git-dir', '.git', 'log'] + args;
++   }
++ 
++   /// Gets the release date of the latest available Flutter version.
++@@ -730,7 +730,7 @@ class GitTagVersion {
++ 
++   static GitTagVersion determine(ProcessUtils processUtils, {String? workingDirectory, bool fetchTags = false, String gitRef = 'HEAD'}) {
++     if (fetchTags) {
++-      final String channel = _runGit('git rev-parse --abbrev-ref HEAD', processUtils, workingDirectory);
+++      final String channel = _runGit('git --git-dir .git rev-parse --abbrev-ref HEAD', processUtils, workingDirectory);
++       if (channel == 'dev' || channel == 'beta' || channel == 'stable') {
++         globals.printTrace('Skipping request to fetchTags - on well known channel $channel.');
++       } else {
++@@ -739,7 +739,7 @@ class GitTagVersion {
++     }
++     // find all tags attached to the given [gitRef]
++     final List<String> tags = _runGit(
++-      'git tag --points-at $gitRef', processUtils, workingDirectory).trim().split('\n');
+++      'git --git-dir .git tag --points-at $gitRef', processUtils, workingDirectory).trim().split('\n');
++ 
++     // Check first for a stable tag
++     final RegExp stableTagPattern = RegExp(r'^\d+\.\d+\.\d+$');
++@@ -760,7 +760,7 @@ class GitTagVersion {
++     // recent tag and number of commits past.
++     return parse(
++       _runGit(
++-        'git describe --match *.*.* --long --tags $gitRef',
+++        'git --git-dir .git describe --match *.*.* --long --tags $gitRef',
++         processUtils,
++         workingDirectory,
++       )
+diff --git a/pkgs/development/compilers/flutter/patches/flutter2/move-cache.patch b/pkgs/development/compilers/flutter/patches/flutter2/move-cache.patch
+new file mode 100644
+index 00000000000..a81d2def242
+--- /dev/null
++++ b/pkgs/development/compilers/flutter/patches/flutter2/move-cache.patch
+@@ -0,0 +1,72 @@
++diff --git a/packages/flutter_tools/lib/src/asset.dart b/packages/flutter_tools/lib/src/asset.dart
++index ed42baea29..12941f733a 100644
++--- a/packages/flutter_tools/lib/src/asset.dart
+++++ b/packages/flutter_tools/lib/src/asset.dart
++@@ -11,11 +11,11 @@ import 'base/file_system.dart';
++ import 'base/logger.dart';
++ import 'base/platform.dart';
++ import 'build_info.dart';
++-import 'cache.dart';
++ import 'convert.dart';
++ import 'dart/package_map.dart';
++ import 'devfs.dart';
++ import 'flutter_manifest.dart';
+++import 'globals.dart' as globals;
++ import 'license_collector.dart';
++ import 'project.dart';
++ 
++@@ -504,7 +504,7 @@ class ManifestAssetBundle implements AssetBundle {
++         }
++         final Uri entryUri = _fileSystem.path.toUri(asset);
++         result.add(_Asset(
++-          baseDir: _fileSystem.path.join(Cache.flutterRoot!, 'bin', 'cache', 'artifacts', 'material_fonts'),
+++          baseDir: _fileSystem.path.join(globals.fsUtils.homeDirPath!, '.cache', 'flutter', 'artifacts', 'material_fonts'),
++           relativeUri: Uri(path: entryUri.pathSegments.last),
++           entryUri: entryUri,
++           package: null,
++diff --git a/packages/flutter_tools/lib/src/cache.dart b/packages/flutter_tools/lib/src/cache.dart
++index defc86cc20..7fdf14d112 100644
++--- a/packages/flutter_tools/lib/src/cache.dart
+++++ b/packages/flutter_tools/lib/src/cache.dart
++@@ -22,6 +22,7 @@ import 'base/user_messages.dart';
++ import 'build_info.dart';
++ import 'convert.dart';
++ import 'features.dart';
+++import 'globals.dart' as globals;
++ 
++ const String kFlutterRootEnvironmentVariableName = 'FLUTTER_ROOT'; // should point to //flutter/ (root of flutter/flutter repo)
++ const String kFlutterEngineEnvironmentVariableName = 'FLUTTER_ENGINE'; // should point to //engine/src/ (root of flutter/engine repo)
++@@ -322,8 +323,13 @@ class Cache {
++       return;
++     }
++     assert(_lock == null);
+++    final Directory dir = _fileSystem.directory(_fileSystem.path.join(globals.fsUtils.homeDirPath!, '.cache', 'flutter'));
+++    if (!dir.existsSync()) {
+++      dir.createSync(recursive: true);
+++      globals.os.chmod(dir, '755');
+++    }
++     final File lockFile =
++-      _fileSystem.file(_fileSystem.path.join(flutterRoot!, 'bin', 'cache', 'lockfile'));
+++      _fileSystem.file(_fileSystem.path.join(globals.fsUtils.homeDirPath!, '.cache', 'flutter', 'lockfile'));
++     try {
++       _lock = lockFile.openSync(mode: FileMode.write);
++     } on FileSystemException catch (e) {
++@@ -382,8 +388,7 @@ class Cache {
++ 
++   String get devToolsVersion {
++     if (_devToolsVersion == null) {
++-      const String devToolsDirPath = 'dart-sdk/bin/resources/devtools';
++-      final Directory devToolsDir = getCacheDir(devToolsDirPath, shouldCreate: false);
+++      final Directory devToolsDir = _fileSystem.directory(_fileSystem.path.join(flutterRoot!, 'bin/cache/dart-sdk/bin/resources/devtools'));
++       if (!devToolsDir.existsSync()) {
++         throw Exception('Could not find directory at ${devToolsDir.path}');
++       }
++@@ -536,7 +541,7 @@ class Cache {
++     if (_rootOverride != null) {
++       return _fileSystem.directory(_fileSystem.path.join(_rootOverride!.path, 'bin', 'cache'));
++     } else {
++-      return _fileSystem.directory(_fileSystem.path.join(flutterRoot!, 'bin', 'cache'));
+++      return _fileSystem.directory(_fileSystem.path.join(globals.fsUtils.homeDirPath!, '.cache', 'flutter'));
++     }
++   }
++ 
+diff --git a/pkgs/development/compilers/flutter/patches/flutter3/disable-auto-update.patch b/pkgs/development/compilers/flutter/patches/flutter3/disable-auto-update.patch
+new file mode 100644
+index 00000000000..21b676a2af3
+--- /dev/null
++++ b/pkgs/development/compilers/flutter/patches/flutter3/disable-auto-update.patch
+@@ -0,0 +1,36 @@
++diff --git a/bin/internal/shared.sh b/bin/internal/shared.sh
++index ab746724e9..1087983c87 100644
++--- a/bin/internal/shared.sh
+++++ b/bin/internal/shared.sh
++@@ -215,8 +215,6 @@ function shared::execute() {
++     exit 1
++   fi
++ 
++-  upgrade_flutter 7< "$PROG_NAME"
++-
++   BIN_NAME="$(basename "$PROG_NAME")"
++   case "$BIN_NAME" in
++     flutter*)
++diff --git a/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart b/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart
++index 738fef987d..03a152e64f 100644
++--- a/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart
+++++ b/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart
++@@ -241,7 +241,6 @@ class FlutterCommandRunner extends CommandRunner<void> {
++           globals.flutterUsage.suppressAnalytics = true;
++         }
++ 
++-        globals.flutterVersion.ensureVersionFile();
++         final bool machineFlag = topLevelResults['machine'] as bool? ?? false;
++         final bool ci = await globals.botDetector.isRunningOnBot;
++         final bool redirectedCompletion = !globals.stdio.hasTerminal &&
++@@ -250,10 +249,6 @@ class FlutterCommandRunner extends CommandRunner<void> {
++         final bool versionCheckFlag = topLevelResults['version-check'] as bool? ?? false;
++         final bool explicitVersionCheckPassed = topLevelResults.wasParsed('version-check') && versionCheckFlag;
++ 
++-        if (topLevelResults.command?.name != 'upgrade' &&
++-            (explicitVersionCheckPassed || (versionCheckFlag && !isMachine))) {
++-          await globals.flutterVersion.checkFlutterVersionFreshness();
++-        }
++ 
++         // See if the user specified a specific device.
++         globals.deviceManager?.specifiedDeviceId = topLevelResults['device-id'] as String?;
+diff --git a/pkgs/development/compilers/flutter/patches/git-dir.patch b/pkgs/development/compilers/flutter/patches/flutter3/git-dir.patch
+similarity index 86%
+rename from pkgs/development/compilers/flutter/patches/git-dir.patch
+rename to pkgs/development/compilers/flutter/patches/flutter3/git-dir.patch
+index 0c736f945ea..42ad756f8ea 100644
+--- a/pkgs/development/compilers/flutter/patches/git-dir.patch
++++ b/pkgs/development/compilers/flutter/patches/flutter3/git-dir.patch
+@@ -1,8 +1,8 @@
+ diff --git a/dev/bots/prepare_package.dart b/dev/bots/prepare_package.dart
+-index 468a91a954..5def6897ce 100644
++index 8e4cb81340..2c20940423 100644
+ --- a/dev/bots/prepare_package.dart
+ +++ b/dev/bots/prepare_package.dart
+-@@ -525,7 +525,7 @@ class ArchiveCreator {
++@@ -526,7 +526,7 @@ class ArchiveCreator {
+  
+    Future<String> _runGit(List<String> args, {Directory? workingDirectory}) {
+      return _processRunner.runProcess(
+@@ -12,7 +12,7 @@ index 468a91a954..5def6897ce 100644
+      );
+    }
+ diff --git a/packages/flutter_tools/lib/src/commands/downgrade.dart b/packages/flutter_tools/lib/src/commands/downgrade.dart
+-index bb0eb428a9..4a2a48bb5e 100644
++index 666c190067..b6c3761f6f 100644
+ --- a/packages/flutter_tools/lib/src/commands/downgrade.dart
+ +++ b/packages/flutter_tools/lib/src/commands/downgrade.dart
+ @@ -118,7 +118,7 @@ class DowngradeCommand extends FlutterCommand {
+@@ -34,19 +34,19 @@ index bb0eb428a9..4a2a48bb5e 100644
+        if (parseResult.exitCode == 0) {
+          buffer.writeln('Channel "${getNameForChannel(channel)}" was previously on: ${parseResult.stdout}.');
+ diff --git a/packages/flutter_tools/lib/src/version.dart b/packages/flutter_tools/lib/src/version.dart
+-index f2068a6ca2..99b161689e 100644
++index dc47f17057..8068e2d1f5 100644
+ --- a/packages/flutter_tools/lib/src/version.dart
+ +++ b/packages/flutter_tools/lib/src/version.dart
+-@@ -106,7 +106,7 @@ class FlutterVersion {
++@@ -111,7 +111,7 @@ class FlutterVersion {
+      String? channel = _channel;
+      if (channel == null) {
+        final String gitChannel = _runGit(
+--        'git rev-parse --abbrev-ref --symbolic @{u}',
+-+        'git --git-dir .git rev-parse --abbrev-ref --symbolic @{u}',
++-        'git rev-parse --abbrev-ref --symbolic $kGitTrackingUpstream',
+++        'git --git-dir .git rev-parse --abbrev-ref --symbolic $kGitTrackingUpstream',
+          globals.processUtils,
+          _workingDirectory,
+        );
+-@@ -114,7 +114,7 @@ class FlutterVersion {
++@@ -119,7 +119,7 @@ class FlutterVersion {
+        if (slash != -1) {
+          final String remote = gitChannel.substring(0, slash);
+          _repositoryUrl = _runGit(
+@@ -55,7 +55,7 @@ index f2068a6ca2..99b161689e 100644
+            globals.processUtils,
+            _workingDirectory,
+          );
+-@@ -326,7 +326,7 @@ class FlutterVersion {
++@@ -298,7 +298,7 @@ class FlutterVersion {
+    /// the branch name will be returned as `'[user-branch]'`.
+    String getBranchName({ bool redactUnknownBranches = false }) {
+      _branch ??= () {
+@@ -64,7 +64,7 @@ index f2068a6ca2..99b161689e 100644
+        return branch == 'HEAD' ? channel : branch;
+      }();
+      if (redactUnknownBranches || _branch!.isEmpty) {
+-@@ -359,7 +359,7 @@ class FlutterVersion {
++@@ -331,7 +331,7 @@ class FlutterVersion {
+    /// wrapper that does that.
+    @visibleForTesting
+    static List<String> gitLog(List<String> args) {
+@@ -73,16 +73,16 @@ index f2068a6ca2..99b161689e 100644
+    }
+  
+    /// Gets the release date of the latest available Flutter version.
+-@@ -730,7 +730,7 @@ class GitTagVersion {
+- 
+-   static GitTagVersion determine(ProcessUtils processUtils, {String? workingDirectory, bool fetchTags = false, String gitRef = 'HEAD'}) {
++@@ -708,7 +708,7 @@ class GitTagVersion {
++     String gitRef = 'HEAD'
++   }) {
+      if (fetchTags) {
+ -      final String channel = _runGit('git rev-parse --abbrev-ref HEAD', processUtils, workingDirectory);
+ +      final String channel = _runGit('git --git-dir .git rev-parse --abbrev-ref HEAD', processUtils, workingDirectory);
+        if (channel == 'dev' || channel == 'beta' || channel == 'stable') {
+          globals.printTrace('Skipping request to fetchTags - on well known channel $channel.');
+        } else {
+-@@ -739,7 +739,7 @@ class GitTagVersion {
++@@ -718,7 +718,7 @@ class GitTagVersion {
+      }
+      // find all tags attached to the given [gitRef]
+      final List<String> tags = _runGit(
+@@ -91,7 +91,7 @@ index f2068a6ca2..99b161689e 100644
+  
+      // Check first for a stable tag
+      final RegExp stableTagPattern = RegExp(r'^\d+\.\d+\.\d+$');
+-@@ -760,7 +760,7 @@ class GitTagVersion {
++@@ -739,7 +739,7 @@ class GitTagVersion {
+      // recent tag and number of commits past.
+      return parse(
+        _runGit(
+diff --git a/pkgs/development/compilers/flutter/patches/move-cache.patch b/pkgs/development/compilers/flutter/patches/flutter3/move-cache.patch
+similarity index 83%
+rename from pkgs/development/compilers/flutter/patches/move-cache.patch
+rename to pkgs/development/compilers/flutter/patches/flutter3/move-cache.patch
+index 5cb7c71e9bd..008c5959e5b 100644
+--- a/pkgs/development/compilers/flutter/patches/move-cache.patch
++++ b/pkgs/development/compilers/flutter/patches/flutter3/move-cache.patch
+@@ -1,13 +1,9 @@
++diff --git a/packages/flutter_tools/lib/src/artifacts.dart b/packages/flutter_tools/lib/src/artifacts.dart
+ diff --git a/packages/flutter_tools/lib/src/asset.dart b/packages/flutter_tools/lib/src/asset.dart
+-index ed42baea29..12941f733a 100644
++index 9dd7272fbe..642c8e48e4 100644
+ --- a/packages/flutter_tools/lib/src/asset.dart
+ +++ b/packages/flutter_tools/lib/src/asset.dart
+-@@ -11,11 +11,11 @@ import 'base/file_system.dart';
+- import 'base/logger.dart';
+- import 'base/platform.dart';
+- import 'build_info.dart';
+--import 'cache.dart';
+- import 'convert.dart';
++@@ -16,6 +16,7 @@ import 'convert.dart';
+  import 'dart/package_map.dart';
+  import 'devfs.dart';
+  import 'flutter_manifest.dart';
+@@ -15,17 +11,18 @@ index ed42baea29..12941f733a 100644
+  import 'license_collector.dart';
+  import 'project.dart';
+  
+-@@ -504,7 +504,7 @@ class ManifestAssetBundle implements AssetBundle {
+-         }
++@@ -530,8 +531,7 @@ class ManifestAssetBundle implements AssetBundle {
+          final Uri entryUri = _fileSystem.path.toUri(asset);
+          result.add(_Asset(
+--          baseDir: _fileSystem.path.join(Cache.flutterRoot!, 'bin', 'cache', 'artifacts', 'material_fonts'),
+-+          baseDir: _fileSystem.path.join(globals.fsUtils.homeDirPath!, '.cache', 'flutter', 'artifacts', 'material_fonts'),
++           baseDir: _fileSystem.path.join(
++-            Cache.flutterRoot!,
++-            'bin', 'cache', 'artifacts', 'material_fonts',
+++            globals.fsUtils.homeDirPath!, '.cache', 'flutter', 'artifacts', 'material_fonts',
++           ),
+            relativeUri: Uri(path: entryUri.pathSegments.last),
+            entryUri: entryUri,
+-           package: null,
+ diff --git a/packages/flutter_tools/lib/src/cache.dart b/packages/flutter_tools/lib/src/cache.dart
+-index defc86cc20..7fdf14d112 100644
++index dd80b1e46e..8e54517765 100644
+ --- a/packages/flutter_tools/lib/src/cache.dart
+ +++ b/packages/flutter_tools/lib/src/cache.dart
+ @@ -22,6 +22,7 @@ import 'base/user_messages.dart';
+@@ -36,7 +33,7 @@ index defc86cc20..7fdf14d112 100644
+  
+  const String kFlutterRootEnvironmentVariableName = 'FLUTTER_ROOT'; // should point to //flutter/ (root of flutter/flutter repo)
+  const String kFlutterEngineEnvironmentVariableName = 'FLUTTER_ENGINE'; // should point to //engine/src/ (root of flutter/engine repo)
+-@@ -322,8 +323,13 @@ class Cache {
++@@ -318,8 +319,13 @@ class Cache {
+        return;
+      }
+      assert(_lock == null);
+@@ -51,7 +48,7 @@ index defc86cc20..7fdf14d112 100644
+      try {
+        _lock = lockFile.openSync(mode: FileMode.write);
+      } on FileSystemException catch (e) {
+-@@ -382,8 +388,7 @@ class Cache {
++@@ -378,8 +384,7 @@ class Cache {
+  
+    String get devToolsVersion {
+      if (_devToolsVersion == null) {
+@@ -61,7 +58,7 @@ index defc86cc20..7fdf14d112 100644
+        if (!devToolsDir.existsSync()) {
+          throw Exception('Could not find directory at ${devToolsDir.path}');
+        }
+-@@ -536,7 +541,7 @@ class Cache {
++@@ -532,7 +537,7 @@ class Cache {
+      if (_rootOverride != null) {
+        return _fileSystem.directory(_fileSystem.path.join(_rootOverride!.path, 'bin', 'cache'));
+      } else {
+@@ -70,8 +67,7 @@ index defc86cc20..7fdf14d112 100644
+      }
+    }
+  
+-diff --git a/packages/flutter_tools/lib/src/artifacts.dart b/packages/flutter_tools/lib/src/artifacts.dart
+-index 2aac9686e8..32c4b98b88 100644
++index c539d67156..4e0a64f7a9 100644
+ --- a/packages/flutter_tools/lib/src/artifacts.dart
+ +++ b/packages/flutter_tools/lib/src/artifacts.dart
+ @@ -346,10 +346,10 @@ class CachedArtifacts implements Artifacts {
+@@ -82,8 +78,8 @@ index 2aac9686e8..32c4b98b88 100644
+ +        final String path = _dartSdkPath(_fileSystem);
+          return _fileSystem.directory(path);
+        case HostArtifact.engineDartBinary:
+--        final String path = _fileSystem.path.join(_dartSdkPath(_cache), 'bin', _hostArtifactToFileName(artifact, _platform.isWindows));
+-+        final String path = _fileSystem.path.join(_dartSdkPath(_fileSystem), 'bin', _hostArtifactToFileName(artifact, _platform.isWindows));
++-        final String path = _fileSystem.path.join(_dartSdkPath(_cache), 'bin', _hostArtifactToFileName(artifact, _platform));
+++        final String path = _fileSystem.path.join(_dartSdkPath(_fileSystem), 'bin', _hostArtifactToFileName(artifact, _platform));
+          return _fileSystem.file(path);
+        case HostArtifact.flutterWebSdk:
+          final String path = _getFlutterWebSdkPath();
+@@ -91,12 +87,12 @@ index 2aac9686e8..32c4b98b88 100644
+        case HostArtifact.dart2jsSnapshot:
+        case HostArtifact.dartdevcSnapshot:
+        case HostArtifact.kernelWorkerSnapshot:
+--        final String path = _fileSystem.path.join(_dartSdkPath(_cache), 'bin', 'snapshots', _hostArtifactToFileName(artifact, _platform.isWindows));
+-+        final String path = _fileSystem.path.join(_dartSdkPath(_fileSystem), 'bin', 'snapshots', _hostArtifactToFileName(artifact, _platform.isWindows));
++-        final String path = _fileSystem.path.join(_dartSdkPath(_cache), 'bin', 'snapshots', _hostArtifactToFileName(artifact, _platform));
+++        final String path = _fileSystem.path.join(_dartSdkPath(_fileSystem), 'bin', 'snapshots', _hostArtifactToFileName(artifact, _platform));
+          return _fileSystem.file(path);
+        case HostArtifact.iosDeploy:
+-         final String artifactFileName = _hostArtifactToFileName(artifact, _platform.isWindows);
+-@@ -461,11 +461,13 @@ class CachedArtifacts implements Artifacts {
++         final String artifactFileName = _hostArtifactToFileName(artifact, _platform);
++@@ -465,11 +465,13 @@ class CachedArtifacts implements Artifacts {
+    String _getAndroidArtifactPath(Artifact artifact, TargetPlatform platform, BuildMode mode) {
+      final String engineDir = _getEngineArtifactsPath(platform, mode)!;
+      switch (artifact) {
+@@ -125,8 +121,8 @@ index 2aac9686e8..32c4b98b88 100644
+ -      case Artifact.frontendServerSnapshotForEngineDartSdk:
+        case Artifact.constFinder:
+        case Artifact.flutterMacOSFramework:
+-       case Artifact.flutterMacOSPodspec:
+-@@ -594,14 +596,10 @@ class CachedArtifacts implements Artifacts {
++       case Artifact.flutterPatchedSdkPath:
++@@ -586,14 +588,10 @@ class CachedArtifacts implements Artifacts {
+          // For script snapshots any gen_snapshot binary will do. Returning gen_snapshot for
+          // android_arm in profile mode because it is available on all supported host platforms.
+          return _getAndroidArtifactPath(artifact, TargetPlatform.android_arm, BuildMode.profile);
+@@ -142,27 +138,27 @@ index 2aac9686e8..32c4b98b88 100644
+        case Artifact.icuData:
+          final String engineArtifactsPath = _cache.getArtifactDirectory('engine').path;
+          final String platformDirName = _enginePlatformDirectoryName(platform);
+-@@ -797,7 +795,7 @@ class CachedLocalEngineArtifacts implements LocalEngineArtifacts {
+-         final String path = _fileSystem.path.join(_hostEngineOutPath, 'dart-sdk', 'bin', 'snapshots', _hostArtifactToFileName(artifact, _platform.isWindows));
++@@ -776,7 +774,7 @@ class CachedLocalEngineArtifacts implements LocalEngineArtifacts {
++         final String path = _fileSystem.path.join(_hostEngineOutPath, 'dart-sdk', 'bin', 'snapshots', _hostArtifactToFileName(artifact, _platform));
+          return _fileSystem.file(path);
+        case HostArtifact.dartdevcSnapshot:
+--        final String path = _fileSystem.path.join(_dartSdkPath(_cache), 'bin', 'snapshots', _hostArtifactToFileName(artifact, _platform.isWindows));
+-+        final String path = _fileSystem.path.join(_dartSdkPath(_fileSystem), 'bin', 'snapshots', _hostArtifactToFileName(artifact, _platform.isWindows));
++-        final String path = _fileSystem.path.join(_dartSdkPath(_cache), 'bin', 'snapshots', _hostArtifactToFileName(artifact, _platform));
+++        final String path = _fileSystem.path.join(_dartSdkPath(_fileSystem), 'bin', 'snapshots', _hostArtifactToFileName(artifact, _platform));
+          return _fileSystem.file(path);
+        case HostArtifact.kernelWorkerSnapshot:
+-         final String path = _fileSystem.path.join(_hostEngineOutPath, 'dart-sdk', 'bin', 'snapshots', _hostArtifactToFileName(artifact, _platform.isWindows));
+-@@ -922,9 +920,7 @@ class CachedLocalEngineArtifacts implements LocalEngineArtifacts {
+-       case Artifact.windowsUwpCppClientWrapper:
++         final String path = _fileSystem.path.join(_hostEngineOutPath, 'dart-sdk', 'bin', 'snapshots', _hostArtifactToFileName(artifact, _platform));
++@@ -901,9 +899,7 @@ class CachedLocalEngineArtifacts implements LocalEngineArtifacts {
++       case Artifact.windowsCppClientWrapper:
+          return _fileSystem.path.join(_hostEngineOutPath, artifactFileName);
+        case Artifact.frontendServerSnapshotForEngineDartSdk:
+ -        return _fileSystem.path.join(
+ -          _hostEngineOutPath, 'dart-sdk', 'bin', 'snapshots', artifactFileName,
+ -        );
+ +        return _fileSystem.path.join(_hostEngineOutPath, 'gen', artifactFileName);
+-       case Artifact.uwptool:
+-         return _fileSystem.path.join(_hostEngineOutPath, artifactFileName);
+      }
+-@@ -1034,8 +1030,8 @@ class OverrideArtifacts implements Artifacts {
++   }
++ 
++@@ -1011,8 +1007,8 @@ class OverrideArtifacts implements Artifacts {
+  }
+  
+  /// Locate the Dart SDK.
+@@ -174,12 +170,12 @@ index 2aac9686e8..32c4b98b88 100644
+  
+  class _TestArtifacts implements Artifacts {
+ diff --git a/packages/flutter_tools/test/general.shard/artifacts_test.dart b/packages/flutter_tools/test/general.shard/artifacts_test.dart
+-index d906511a15..adfdd4bb42 100644
++index aed3eb9285..81b8362648 100644
+ --- a/packages/flutter_tools/test/general.shard/artifacts_test.dart
+ +++ b/packages/flutter_tools/test/general.shard/artifacts_test.dart
+-@@ -153,10 +153,6 @@ void main() {
+-         artifacts.getArtifactPath(Artifact.windowsUwpDesktopPath, platform: TargetPlatform.windows_uwp_x64, mode: BuildMode.release),
+-         fileSystem.path.join('root', 'bin', 'cache', 'artifacts', 'engine', 'windows-uwp-x64-release'),
++@@ -141,10 +141,6 @@ void main() {
++         artifacts.getArtifactPath(Artifact.flutterTester, platform: TargetPlatform.linux_arm64),
++         fileSystem.path.join('root', 'bin', 'cache', 'artifacts', 'engine', 'linux-arm64', 'flutter_tester'),
+        );
+ -      expect(
+ -        artifacts.getArtifactPath(Artifact.frontendServerSnapshotForEngineDartSdk),
+@@ -188,7 +184,7 @@ index d906511a15..adfdd4bb42 100644
+      });
+  
+      testWithoutContext('precompiled web artifact paths are correct', () {
+-@@ -322,11 +318,6 @@ void main() {
++@@ -310,11 +306,6 @@ void main() {
+          artifacts.getHostArtifact(HostArtifact.engineDartSdkPath).path,
+          fileSystem.path.join('/out', 'host_debug_unopt', 'dart-sdk'),
+        );
+@@ -197,6 +193,6 @@ index d906511a15..adfdd4bb42 100644
+ -        fileSystem.path.join('/out', 'host_debug_unopt', 'dart-sdk', 'bin',
+ -          'snapshots', 'frontend_server.dart.snapshot')
+ -      );
+-     });
+- 
+-     testWithoutContext('getEngineType', () {
++       expect(
++         artifacts.getHostArtifact(HostArtifact.impellerc).path,
++         fileSystem.path.join('/out', 'host_debug_unopt', 'impellerc'),
+diff --git a/pkgs/os-specific/linux/firmware/firmware-updater/default.nix b/pkgs/os-specific/linux/firmware/firmware-updater/default.nix
+index fb9d3a9a36c..cc906b763e8 100644
+--- a/pkgs/os-specific/linux/firmware/firmware-updater/default.nix
++++ b/pkgs/os-specific/linux/firmware/firmware-updater/default.nix
+@@ -1,13 +1,13 @@
+ { lib
+-, flutter
++, flutter2
+ , fetchFromGitHub
+ }:
+ 
+-flutter.mkFlutterApp {
++flutter2.mkFlutterApp {
+   pname = "firmware-updater";
+   version = "unstable";
+ 
+-  vendorHash = "sha256-3wVA9BLCnMijC0gOmskz+Hv7NQIGu/jhBDbWjmoq1Tc=";
++  vendorHash = "sha256-7uOiebGBcX61oUyNCi1h9KldTRTrCfYaHUQSH4J5OoQ=";
+ 
+   src = fetchFromGitHub {
+     owner = "canonical";
+diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
+index 4f25d9b20d8..c282471c464 100644
+--- a/pkgs/top-level/all-packages.nix
++++ b/pkgs/top-level/all-packages.nix
+@@ -13448,6 +13448,7 @@ with pkgs;
+   flutterPackages =
+     recurseIntoAttrs (callPackage ../development/compilers/flutter { });
+   flutter = flutterPackages.stable;
++  flutter2 = flutterPackages.v2;
+ 
+   fnm = callPackage ../development/tools/fnm {
+     inherit (darwin.apple_sdk.frameworks) DiskArbitration Foundation Security;

nixpatches/list.nix

@@ -0,0 +1,46 @@
+fetchpatch: [
+  # Flutter: 3.0.4 -> 3.3.3, flutter.dart: 2.17.5 -> 2.18.2
+  # merged 2022/10/07
+  # (fetchpatch {
+  #   url = "https://github.com/NixOS/nixpkgs/pull/189338.diff";
+  #   sha256 = "sha256-HRkOIBcOnSXyTKkYxnMgZou8MHU/5eNhxxARdUq9UWg=";
+  #   # url = "https://git.uninsane.org/colin/nixpkgs/commit/889c3a8cbc91c0d10b34ab7825fa1f6d1d31668a.diff";
+  #   # sha256 = "sha256-qVWLpNoW3HVSWRtXS1BcSusKOq0CAMfY0BVU9MxPm98=";
+  # })
+  #
+  # XXX this is a cherry-pick of all the commits in PR 189338 (as appears in tree).
+  # the diff yielded by Github is apparently not the same somehow (maybe because the branches being merged had diverged too much?)
+  ./11-flutter-3.3.3-189338.patch
+
+  # phosh-mobile-settings: init at 0.21.1
+  (fetchpatch {
+    url = "http://git.uninsane.org/colin/nixpkgs/commit/0c1a7e8504291eb0076bbee3f8ebf693f4641112.diff";
+    # url = "https://github.com/NixOS/nixpkgs/pull/193845.diff";
+    sha256 = "sha256-OczjlQcG7sTM/V9Y9VL/qdwaWPKfjAJsh3czqqhRQig=";
+  })
+
+  # kaiteki: init at 2022-09-03
+  (fetchpatch {
+    url = "https://git.uninsane.org/colin/nixpkgs/commit/e2c7f5f4870fcb0e5405e9001b39a64c516852d4.diff";
+    # url = "https://github.com/NixOS/nixpkgs/pull/193169.diff";
+    sha256 = "sha256-UWnfS+stVpUZ3Sfaym9XtVBlwvHWJVMaW7cYIcf3M5Q=";
+  })
+
+  # Fix mk flutter app
+  # closed (not merged). updates fluffychat 1.2.0 -> 1.6.1, but unstable hashing
+  # (fetchpatch {
+  #   url = "https://github.com/NixOS/nixpkgs/pull/186839.diff";
+  #   sha256 = "sha256-NdIfie+eTy4V1vgqiiRPtWdnxZ5ZHsvCMfkEDUv9SC8=";
+  # })
+
+  # for raspberry pi: allow building u-boot for rpi 4{,00}
+  # TODO: remove after upstreamed: https://github.com/NixOS/nixpkgs/pull/176018
+  #   (it's a dupe of https://github.com/NixOS/nixpkgs/pull/112677 )
+  ./02-rpi4-uboot.patch
+
+  # TODO: upstream
+  ./07-duplicity-rich-url.patch
+
+  # enable aarch64 support for flutter's dart package
+  # ./10-flutter-arm64.patch
+]

pkgs/bootpart-tow-boot-rpi-aarch64/config.txt

@@ -0,0 +1,13 @@
+[pi3]
+kernel=Tow-Boot.noenv.rpi3.bin
+
+[pi4]
+kernel=Tow-Boot.noenv.rpi4.bin
+enable_gic=1
+armstub=armstub8-gic.bin
+disable_overscan=1
+
+[all]
+arm_64bit=1
+enable_uart=1
+avoid_warnings=1

pkgs/bootpart-tow-boot-rpi-aarch64/default.nix

@@ -0,0 +1,37 @@
+{ stdenv, pkgs }:
+
+stdenv.mkDerivation rec {
+  pname = "bootpart-tow-boot-rpi-aarch64";
+  version = "1";
+
+  buildInputs = with pkgs; [ 
+    tow-boot-rpi4  # for Tow-Boot.*.bin
+    raspberrypifw  # for bootcode.bin, *.dat, *.elf, *.dtb
+    raspberrypi-armstubs  # for armstub*
+
+  ];
+
+  src = ./config.txt;
+
+  dontUnpack = true;
+
+  installPhase = with pkgs; ''
+    mkdir "$out"
+    cp ${tow-boot-rpi4}/Tow-Boot.noenv.*.bin "$out"/
+    cp -R ${raspberrypifw}/share/raspberrypi/boot/*.dtb "$out"/
+    cp -R ${raspberrypifw}/share/raspberrypi/boot/*.bin "$out"/
+    cp -R ${raspberrypifw}/share/raspberrypi/boot/*.dat "$out"/
+    cp -R ${raspberrypifw}/share/raspberrypi/boot/*.img "$out"/
+    cp -R ${raspberrypifw}/share/raspberrypi/boot/*.elf "$out"/
+    cp -R ${raspberrypifw}/share/raspberrypi/boot/overlays "$out"/
+    cp ${raspberrypi-armstubs}/* "$out"/
+    cp ${src} "$out"/config.txt
+  '';
+
+
+  meta = {
+    description = "unmanaged files to place in /boot on a raspberry pi system";
+    platforms = [ "aarch64-linux" ];
+  };
+}
+

pkgs/bootpart-u-boot-rpi-aarch64/config.txt

@@ -0,0 +1,10 @@
+[pi4]
+kernel=u-boot.bin
+enable_gic=1
+armstub=armstub8-gic.bin
+disable_overscan=1
+
+[all]
+arm_64bit=1
+enable_uart=1
+avoid_warnings=1

pkgs/bootpart-u-boot-rpi-aarch64/default.nix

@@ -0,0 +1,39 @@
+{ stdenv, pkgs }:
+
+stdenv.mkDerivation rec {
+  pname = "bootpart-u-boot-rpi-aarch64";
+  version = "1";
+
+  buildInputs = with pkgs; [ 
+    ubootRaspberryPi4_64bit
+    raspberrypifw  # for bootcode.bin, *.dat, *.elf, *.dtb
+    raspberrypi-armstubs  # for armstub*
+
+  ];
+
+  src = ./config.txt;
+
+  dontUnpack = true;
+
+  installPhase = with pkgs; ''
+    mkdir "$out"
+    cp ${ubootRaspberryPi4_64bit}/u-boot.bin "$out"/
+    cp ${ubootRaspberryPi4_64bit}/*.dtb "$out"/
+    # NB: raspberrypifw dtb's are meant for the kernel, not for u-boot
+    # cp -R ${raspberrypifw}/share/raspberrypi/boot/*.dtb "$out"/
+    cp -R ${raspberrypifw}/share/raspberrypi/boot/*.bin "$out"/
+    cp -R ${raspberrypifw}/share/raspberrypi/boot/*.dat "$out"/
+    cp -R ${raspberrypifw}/share/raspberrypi/boot/*.img "$out"/
+    cp -R ${raspberrypifw}/share/raspberrypi/boot/*.elf "$out"/
+    cp -R ${raspberrypifw}/share/raspberrypi/boot/overlays "$out"/
+    cp ${raspberrypi-armstubs}/* "$out"/
+    cp ${src} "$out"/config.txt
+  '';
+
+
+  meta = {
+    description = "unmanaged files to place in /boot on a raspberry pi system";
+    platforms = [ "aarch64-linux" ];
+  };
+}
+

pkgs/bootpart-uefi-x86_64/default.nix

@@ -0,0 +1,37 @@
+{ stdenv, pkgs }:
+
+stdenv.mkDerivation rec {
+  pname = "bootpart-uefi-x86_64";
+  version = "1";
+
+  buildInputs = [ pkgs.syslinux ];
+
+  dontUnpack = true;
+
+  installPhase = with pkgs; ''
+    # populate the EFI directory with syslinux, and configure it to read that extlinux.conf file managed by nixos
+    mkdir -p "$out/EFI/syslinux"  "$out/EFI/BOOT"  "$out/syslinux"
+    cp -R "${syslinux}/share/syslinux/efi64"/* "$out/EFI/syslinux"
+    echo "DEFAULT trampoline" > "$out/EFI/syslinux/syslinux.cfg"
+    echo "LABEL trampoline" >> "$out/EFI/syslinux/syslinux.cfg"
+    echo "  SAY trampoline into generic extlinux.conf" >> "$out/EFI/syslinux/syslinux.cfg"
+    echo "  CONFIG ../../syslinux/syslinux.cfg ../../syslinux" >> "$out/EFI/syslinux/syslinux.cfg"
+
+    # we create this "trampoline" layer so that we can setup the UI directive
+    # and enable a menu before loading the real, nixos-managed extlinux.conf
+    cp "${syslinux}/share/syslinux/efi64/menu.c32" "$out/syslinux/menu.c32"
+    echo "UI menu.c32" > "$out/syslinux/syslinux.cfg"
+    echo "INCLUDE ../extlinux/extlinux.conf" >> "$out/syslinux/syslinux.cfg"
+    
+    # create the EFI/BOOT/BOOTX64.EFI default entry
+    cp "$out/EFI/syslinux"/* "$out/EFI/BOOT"
+    mv "$out/EFI/BOOT/syslinux.efi" "$out/EFI/BOOT/BOOTX64.EFI"
+  '';
+
+
+  meta = {
+    description = "unmanaged files to place in /boot on a x86-64 extlinux system";
+    platforms = [ "x86_64-linux" ];
+  };
+}
+