Add uStreamer service to skycam

Flake lock file updates:

• Updated input 'disko':
    'github:nix-community/disko/7e1b215a0a96efb306ad6440bf706d2b307dc267' (2024-08-01)
  → 'github:nix-community/disko/0257e44f4ad472b54f19a6dd1615aee7fa48ed49' (2024-08-05)
• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/05405724efa137a0b899cce5ab4dde463b4fd30b' (2024-08-01)
  → 'github:NixOS/nixpkgs/8b5b6723aca5a51edf075936439d9cd3947b7b2c' (2024-08-04)
• Updated input 'nixpkgs-unstable':
    'github:NixOS/nixpkgs/9f918d616c5321ad374ae6cb5ea89c9e04bf3e58' (2024-07-31)
  → 'github:NixOS/nixpkgs/d04953086551086b44b6f3c6b7eeb26294f207da' (2024-08-02)
• Updated input 'nixvim':
    'github:nix-community/nixvim/76f309d00fb5a6eeb59c13e9b36b4cf86a209d7f' (2024-08-01)
  → 'github:nix-community/nixvim/4e6974c619bd280789ef3697a73fcf7c20f70819' (2024-08-03)
• Updated input 'nixvim/flake-parts':
    'github:hercules-ci/flake-parts/9227223f6d922fee3c7b190b2cc238a99527bbb7' (2024-07-03)
  → 'github:hercules-ci/flake-parts/8471fe90ad337a8074e957b69ca4d0089218391d' (2024-08-01)
• Updated input 'nixvim/nix-darwin':
    'github:lnl7/nix-darwin/b47af8628624856ad6853168298f1f96364d92d6' (2024-08-01)
  → 'github:lnl7/nix-darwin/f7142b8024d6b70c66fd646e1d099d3aa5bfec49' (2024-08-02)
• Updated input 'plasma-manager':
    'github:nix-community/plasma-manager/b17a2666bcf400cf245528d143597d1480e298f8' (2024-08-03)
  → 'github:nix-community/plasma-manager/61d9342fb471cd3c45a047406428fba7b6fb49ad' (2024-08-04)

flake.lock

@@ -8,11 +8,11 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1720546205,
+        "lastModified": 1722339003,
-        "narHash": "sha256-boCXsjYVxDviyzoEyAk624600f3ZBo/DKtUdvMTpbGY=",
+        "narHash": "sha256-ZeS51uJI30ehNkcZ4uKqT4ZDARPyqrHADSKAwv5vVCU=",
         "owner": "ryantm",
         "repo": "agenix",
-        "rev": "de96bd907d5fbc3b14fc33ad37d1b9a3cb15edc6",
+        "rev": "3f1dae074a12feb7327b4bf43cbac0d124488bb7",
         "type": "github"
       },
       "original": {
@@ -81,18 +81,17 @@
     },
     "devshell": {
       "inputs": {
-        "flake-utils": "flake-utils",
         "nixpkgs": [
           "nixvim",
           "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1717408969,
+        "lastModified": 1722113426,
-        "narHash": "sha256-Q0OEFqe35fZbbRPPRdrjTUUChKVhhWXz3T9ZSKmaoVY=",
+        "narHash": "sha256-Yo/3loq572A8Su6aY5GP56knpuKYRvM2a1meP9oJZCw=",
         "owner": "numtide",
         "repo": "devshell",
-        "rev": "1ebbe68d57457c8cae98145410b164b5477761f4",
+        "rev": "67cce7359e4cd3c45296fb4aaf6a19e2a9c757ae",
         "type": "github"
       },
       "original": {
@@ -108,11 +107,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1721417620,
+        "lastModified": 1722821805,
-        "narHash": "sha256-6q9b1h8fI3hXg2DG6/vrKWCeG8c5Wj2Kvv22RCgedzg=",
+        "narHash": "sha256-FGrUPUD+LMDwJsYyNSxNIzFMldtCm8wXiQuyL2PHSrM=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "bec6e3cde912b8acb915fecdc509eda7c973fb42",
+        "rev": "0257e44f4ad472b54f19a6dd1615aee7fa48ed49",
         "type": "github"
       },
       "original": {
@@ -207,11 +206,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1719994518,
+        "lastModified": 1722555600,
-        "narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=",
+        "narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7",
+        "rev": "8471fe90ad337a8074e957b69ca4d0089218391d",
         "type": "github"
       },
       "original": {
@@ -220,24 +219,6 @@
         "type": "github"
       }
     },
-    "flake-utils": {
-      "inputs": {
-        "systems": "systems_4"
-      },
-      "locked": {
-        "lastModified": 1701680307,
-        "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "4022d587cbbfd70fe950c1e2083a02621806a725",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
     "git-hooks": {
       "inputs": {
         "flake-compat": "flake-compat_4",
@@ -252,11 +233,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1721038330,
+        "lastModified": 1721042469,
-        "narHash": "sha256-DyIGJ+DEnKeGd346YJCwjmp9hXwiYq8wqGtikgbDqSc=",
+        "narHash": "sha256-6FPUl7HVtvRHCCBQne7Ylp4p+dpP3P/OYuzjztZ4s70=",
         "owner": "cachix",
         "repo": "git-hooks.nix",
-        "rev": "622291c026190caf13cb26f5136616b1ff0a07aa",
+        "rev": "f451c19376071a90d8c58ab1a953c6e9840527fd",
         "type": "github"
       },
       "original": {
@@ -384,6 +365,40 @@
         "type": "github"
       }
     },
+    "libcamera-src": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1718617480,
+        "narHash": "sha256-qqEMJzMotybf1nJp1dsz3zc910Qj0TmqCm1CwuSb1VY=",
+        "owner": "raspberrypi",
+        "repo": "libcamera",
+        "rev": "6ddd79b5bdbedc1f61007aed35391f1559f9e29a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "raspberrypi",
+        "repo": "libcamera",
+        "rev": "6ddd79b5bdbedc1f61007aed35391f1559f9e29a",
+        "type": "github"
+      }
+    },
+    "libpisp-src": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1718613892,
+        "narHash": "sha256-V/d4RrXoq8HNc8r/Kr1gH3E7YTZzfIdgbaJtq/Xi7uQ=",
+        "owner": "raspberrypi",
+        "repo": "libpisp",
+        "rev": "b567f04556801ca350331ed21a1ae3eef4675c23",
+        "type": "github"
+      },
+      "original": {
+        "owner": "raspberrypi",
+        "ref": "v1.0.6",
+        "repo": "libpisp",
+        "type": "github"
+      }
+    },
     "nix-darwin": {
       "inputs": {
         "nixpkgs": [
@@ -392,11 +407,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1720845312,
+        "lastModified": 1722609272,
-        "narHash": "sha256-yPhAsJTpyoIPQZJGC8Fw8W2lAXyhLoTn+HP20bmfkfk=",
+        "narHash": "sha256-Kkb+ULEHVmk07AX+OhwyofFxBDpw+2WvsXguUS2m6e4=",
         "owner": "lnl7",
         "repo": "nix-darwin",
-        "rev": "5ce8503cf402cf76b203eba4b7e402bea8e44abc",
+        "rev": "f7142b8024d6b70c66fd646e1d099d3aa5bfec49",
         "type": "github"
       },
       "original": {
@@ -407,11 +422,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1721413321,
+        "lastModified": 1722332872,
-        "narHash": "sha256-0GdiQScDceUrVGbxYpV819LHesK3szHOhJ09e6sgES4=",
+        "narHash": "sha256-2xLM4sc5QBfi0U/AANJAW21Bj4ZX479MHPMPkB+eKBU=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "ab165a8a6cd12781d76fe9cbccb9e975d0fb634f",
+        "rev": "14c333162ba53c02853add87a0000cbd7aa230c2",
         "type": "github"
       },
       "original": {
@@ -478,11 +493,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1721379653,
+        "lastModified": 1722630782,
-        "narHash": "sha256-8MUgifkJ7lkZs3u99UDZMB4kbOxvMEXQZ31FO3SopZ0=",
+        "narHash": "sha256-hMyG9/WlUi0Ho9VkRrrez7SeNlDzLxalm9FwY7n/Noo=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "1d9c2c9b3e71b9ee663d11c5d298727dace8d374",
+        "rev": "d04953086551086b44b6f3c6b7eeb26294f207da",
         "type": "github"
       },
       "original": {
@@ -509,11 +524,11 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1721409541,
+        "lastModified": 1722791413,
-        "narHash": "sha256-b6PLr0Ty7JPDBtJtjnYzlBf02bbH9alWMAgispMkTwk=",
+        "narHash": "sha256-rCTrlCWvHzMCNcKxPE3Z/mMK2gDZ+BvvpEVyRM4tKmU=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "0c53b6b8c2a3e46c68e04417e247bba660689c9d",
+        "rev": "8b5b6723aca5a51edf075936439d9cd3947b7b2c",
         "type": "github"
       },
       "original": {
@@ -522,6 +537,22 @@
         "type": "indirect"
       }
     },
+    "nixpkgs_4": {
+      "locked": {
+        "lastModified": 1722651103,
+        "narHash": "sha256-IRiJA0NVAoyaZeKZluwfb2DoTpBAj+FLI0KfybBeDU0=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "a633d89c6dc9a2a8aae11813a62d7c58b2c0cc51",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-24.05",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "nixvim": {
       "inputs": {
         "devshell": "devshell",
@@ -536,11 +567,11 @@
         "treefmt-nix": "treefmt-nix"
       },
       "locked": {
-        "lastModified": 1721045803,
+        "lastModified": 1722688115,
-        "narHash": "sha256-dQGvOK+t45unF7DTp5bfO37hY0NkDUw6X3MH5CCTEAs=",
+        "narHash": "sha256-Ubk5KzAp2Z4Dzmi81aGgabvy41QXjZMwNikDYm7+jS0=",
         "owner": "nix-community",
         "repo": "nixvim",
-        "rev": "eef2f4c6b190d92e296e47e5fe10e7ced65fd959",
+        "rev": "4e6974c619bd280789ef3697a73fcf7c20f70819",
         "type": "github"
       },
       "original": {
@@ -560,11 +591,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1720992717,
+        "lastModified": 1722804745,
-        "narHash": "sha256-8j1bZVfKT1vJ0e+U7NYRNBG+DdBj5C/tpwe5krxT4/4=",
+        "narHash": "sha256-l6N3QaiDqN2QmHDAxjczQPLPCTv+Kp7PsrtJBltmhTo=",
         "owner": "nix-community",
         "repo": "plasma-manager",
-        "rev": "460b48dc3dcd05df568e27cbb90581d23baec8dc",
+        "rev": "61d9342fb471cd3c45a047406428fba7b6fb49ad",
         "type": "github"
       },
       "original": {
@@ -573,6 +604,33 @@
         "type": "github"
       }
     },
+    "raspberry-pi-nix": {
+      "inputs": {
+        "libcamera-src": "libcamera-src",
+        "libpisp-src": "libpisp-src",
+        "nixpkgs": "nixpkgs_4",
+        "rpi-bluez-firmware-src": "rpi-bluez-firmware-src",
+        "rpi-firmware-nonfree-src": "rpi-firmware-nonfree-src",
+        "rpi-firmware-src": "rpi-firmware-src",
+        "rpi-linux-6_10_0-rc5-src": "rpi-linux-6_10_0-rc5-src",
+        "rpi-linux-6_6_31-src": "rpi-linux-6_6_31-src",
+        "rpicam-apps-src": "rpicam-apps-src",
+        "u-boot-src": "u-boot-src"
+      },
+      "locked": {
+        "lastModified": 1722525809,
+        "narHash": "sha256-LTCbMSKbSHvKubfXolss39UeTKDIoP9wWTyXV/tDPHU=",
+        "owner": "nix-community",
+        "repo": "raspberry-pi-nix",
+        "rev": "35bb455fdeb495043a94433f67e05fa88980cdad",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "raspberry-pi-nix",
+        "type": "github"
+      }
+    },
     "root": {
       "inputs": {
         "agenix": "agenix",
@@ -588,18 +646,121 @@
         "nixpkgs-unstable": "nixpkgs-unstable",
         "nixvim": "nixvim",
         "plasma-manager": "plasma-manager",
+        "raspberry-pi-nix": "raspberry-pi-nix",
         "secrets": "secrets",
         "thunderbird-gnome-theme": "thunderbird-gnome-theme"
       }
     },
+    "rpi-bluez-firmware-src": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1708969706,
+        "narHash": "sha256-KakKnOBeWxh0exu44beZ7cbr5ni4RA9vkWYb9sGMb8Q=",
+        "owner": "RPi-Distro",
+        "repo": "bluez-firmware",
+        "rev": "78d6a07730e2d20c035899521ab67726dc028e1c",
+        "type": "github"
+      },
+      "original": {
+        "owner": "RPi-Distro",
+        "ref": "bookworm",
+        "repo": "bluez-firmware",
+        "type": "github"
+      }
+    },
+    "rpi-firmware-nonfree-src": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1708967191,
+        "narHash": "sha256-BGq0+cr+xBRwQM/LqiQuRWuZpQsKM5jfcrNCqWMuVzM=",
+        "owner": "RPi-Distro",
+        "repo": "firmware-nonfree",
+        "rev": "223ccf3a3ddb11b3ea829749fbbba4d65b380897",
+        "type": "github"
+      },
+      "original": {
+        "owner": "RPi-Distro",
+        "ref": "bookworm",
+        "repo": "firmware-nonfree",
+        "type": "github"
+      }
+    },
+    "rpi-firmware-src": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1716978780,
+        "narHash": "sha256-KsCo7ZG6vKstxRyFljZtbQvnDSqiAPdUza32xTY/tlA=",
+        "owner": "raspberrypi",
+        "repo": "firmware",
+        "rev": "3590de0c181d433af368a95f15bc480bdaff8b47",
+        "type": "github"
+      },
+      "original": {
+        "owner": "raspberrypi",
+        "ref": "1.20240529",
+        "repo": "firmware",
+        "type": "github"
+      }
+    },
+    "rpi-linux-6_10_0-rc5-src": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1719265450,
+        "narHash": "sha256-xd/Pz/uZFYW9hJIFKryWDE9Aks6f2EIvEDCmfk0C70c=",
+        "owner": "raspberrypi",
+        "repo": "linux",
+        "rev": "f61d3aca8045e70d64b55f7b98f083738f639ad2",
+        "type": "github"
+      },
+      "original": {
+        "owner": "raspberrypi",
+        "ref": "rpi-6.10.y",
+        "repo": "linux",
+        "type": "github"
+      }
+    },
+    "rpi-linux-6_6_31-src": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1716545726,
+        "narHash": "sha256-UWUTeCpEN7dlFSQjog6S3HyEWCCnaqiUqV5KxCjYink=",
+        "owner": "raspberrypi",
+        "repo": "linux",
+        "rev": "c1432b4bae5b6582f4d32ba381459f33c34d1424",
+        "type": "github"
+      },
+      "original": {
+        "owner": "raspberrypi",
+        "ref": "stable_20240529",
+        "repo": "linux",
+        "type": "github"
+      }
+    },
+    "rpicam-apps-src": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1717081637,
+        "narHash": "sha256-s4zJh6r3VhiquO54KWZ78dVCH1BmlphY9zEB9BidNyo=",
+        "owner": "raspberrypi",
+        "repo": "rpicam-apps",
+        "rev": "49344f2a8d1817558d4e6463032fcf11be618b38",
+        "type": "github"
+      },
+      "original": {
+        "owner": "raspberrypi",
+        "ref": "v1.5.0",
+        "repo": "rpicam-apps",
+        "type": "github"
+      }
+    },
     "secrets": {
       "flake": false,
       "locked": {
-        "lastModified": 1720459643,
+        "lastModified": 1722712220,
-        "narHash": "sha256-X71/NplPXPe9pCvrd9ELpnYBEYtju4+x3LA7S5I1GXM=",
+        "narHash": "sha256-gEmbk/DROfVZ+v/BAZHDloHzS0KdqIzxtW7z9g2eH4Y=",
         "ref": "refs/heads/master",
-        "rev": "f8d68b934f4380ecbc6365b4ef7f7c632833d1aa",
+        "rev": "dfe0e95be5ef539bf28602ff47beeea26cc4d1b8",
-        "revCount": 21,
+        "revCount": 22,
         "type": "git",
         "url": "ssh://git@git.vimium.com/jordan/nix-secrets.git"
       },
@@ -653,29 +814,14 @@
         "type": "github"
       }
     },
-    "systems_4": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
     "thunderbird-gnome-theme": {
       "flake": false,
       "locked": {
-        "lastModified": 1721309490,
+        "lastModified": 1721874544,
-        "narHash": "sha256-Xheela/OazoNH9YjP9IgC3hzxQdnPHRQMeH9yW7xl2c=",
+        "narHash": "sha256-BHW9jlx92CsHY84FT0ce5Vxl0KFheLhNn2vndcIf7no=",
         "owner": "rafaelmardojai",
         "repo": "thunderbird-gnome-theme",
-        "rev": "1c89a500dd35b7746ef1fde104a1baf809c2b59a",
+        "rev": "628fcccb7788e3e0ad34f67114f563c87ac8c1dc",
         "type": "github"
       },
       "original": {
@@ -692,11 +838,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1720930114,
+        "lastModified": 1722330636,
-        "narHash": "sha256-VZK73b5hG5bSeAn97TTcnPjXUXtV7j/AtS4KN8ggCS0=",
+        "narHash": "sha256-uru7JzOa33YlSRwf9sfXpJG+UAV+bnBEYMjrzKrQZFw=",
         "owner": "numtide",
         "repo": "treefmt-nix",
-        "rev": "b92afa1501ac73f1d745526adc4f89b527595f14",
+        "rev": "768acdb06968e53aa1ee8de207fd955335c754b7",
         "type": "github"
       },
       "original": {
@@ -705,6 +851,19 @@
         "type": "github"
       }
     },
+    "u-boot-src": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1712055538,
+        "narHash": "sha256-IlaDdjKq/Pq2orzcU959h93WXRZfvKBGDO/MFw9mZMg=",
+        "type": "tarball",
+        "url": "https://ftp.denx.de/pub/u-boot/u-boot-2024.04.tar.bz2"
+      },
+      "original": {
+        "type": "tarball",
+        "url": "https://ftp.denx.de/pub/u-boot/u-boot-2024.04.tar.bz2"
+      }
+    },
     "utils": {
       "inputs": {
         "systems": "systems_2"

flake.nix

@@ -41,6 +41,9 @@
       inputs.nixpkgs.follows = "nixpkgs";
       inputs.home-manager.follows = "home-manager";
     };
+    raspberry-pi-nix = {
+      url = "github:nix-community/raspberry-pi-nix";
+    };
     secrets = {
       url = "git+ssh://git@git.vimium.com/jordan/nix-secrets.git";
       flake = false;
@@ -53,14 +56,24 @@
 
   outputs = inputs @ { self, nixpkgs, nixpkgs-unstable, agenix, deploy-rs, disko, home-manager, nixos-hardware, nixos-mailserver, ... }:
     let
+      inherit (nixpkgs) lib;
+      forEachSystem = lib.genAttrs [
+        "x86_64-linux"
+        "aarch64-linux"
+      ];
       mkPkgsForSystem = system: inputs.nixpkgs;
+      customPkgs = forEachSystem (system:
+        lib.packagesFromDirectoryRecursive {
+          callPackage = nixpkgs.legacyPackages.${system}.callPackage;
+          directory = ./pkgs;
+        });
       overlays = [
         agenix.overlays.default
         (import ./overlays/gnome.nix)
+        (import ./overlays/libcamera.nix)
         (
           final: prev: {
             unstable = import inputs.nixpkgs-unstable { system = final.system; };
-            custom = self.packages { system = final.system; };
           }
         )
       ];
@@ -95,6 +108,12 @@
         };
     in
     {
+      legacyPackages = forEachSystem (system:
+        lib.packagesFromDirectoryRecursive {
+          callPackage = nixpkgs.legacyPackages.${system}.callPackage;
+          directory = ./pkgs;
+        });
+
       nixosConfigurations = {
         atlas = mkNixosSystem { system = "x86_64-linux"; name = "atlas"; };
         eos = mkNixosSystem { system = "x86_64-linux"; name = "eos"; };
@@ -104,6 +123,7 @@
         mail = mkNixosSystem { system = "x86_64-linux"; name = "mail"; };
         odyssey = mkNixosSystem { system = "x86_64-linux"; name = "odyssey"; };
         pi = mkNixosSystem { system = "aarch64-linux"; name = "pi"; extraModules = [ nixos-hardware.nixosModules.raspberry-pi-4 ]; };
+        skycam = mkNixosSystem { system = "aarch64-linux"; name = "skycam"; extraModules = [ inputs.raspberry-pi-nix.nixosModules.raspberry-pi ]; };
         vps1 = mkNixosSystem { system = "x86_64-linux"; name = "vps1"; };
       };
 
@@ -134,14 +154,22 @@
               path = deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.vps1;
             };
           };
-          # pi = {
+          pi = {
-          #   hostname = "10.0.1.191";
+            hostname = "10.0.1.191";
-          #
+
-          #   profiles.system = {
+            profiles.system = {
-          #     user = "root";
+              user = "root";
-          #     path = deploy-rs.lib.aarch64-linux.activate.nixos self.nixosConfigurations.pi;
+              path = deploy-rs.lib.aarch64-linux.activate.nixos self.nixosConfigurations.pi;
-          #   };
+            };
-          # };
+          };
+          skycam = {
+            hostname = "10.0.1.146";
+
+            profiles.system = {
+              user = "root";
+              path = deploy-rs.lib.aarch64-linux.activate.nixos self.nixosConfigurations.skycam;
+            };
+          };
         };
       };
 

hosts/common.nix

@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ config, pkgs, ... }:
 
 {
   time.timeZone = "Europe/London";
@@ -42,6 +42,16 @@
     extraOptions = ''
       experimental-features = nix-command flakes
     '';
+    buildMachines = [
+      {
+        hostName = "10.0.1.79";
+        sshUser = "builder";
+        system = "aarch64-linux";
+        maxJobs = 6;
+        speedFactor = 1;
+      }
+    ];
+    distributedBuilds = true;
     settings = {
       connect-timeout = 5;
       log-lines = 25;
@@ -52,10 +62,12 @@
       auto-optimise-store = true;
       substituters = [
         "http://odyssey.mesh.vimium.net"
+        "https://nix-community.cachix.org"
         "https://cache.nixos.org"
       ];
       trusted-public-keys = [
         "odyssey.mesh.vimium.net:ZhQhjscPWjoN4rlZwoMELznEiBnZ9O26iyGA27ibilQ="
+        "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
       ];
     };
     gc = {

hosts/desktop.nix

@@ -59,7 +59,7 @@
     fd
     ffmpeg
     iotop
-    unstable.nix-du
+    # unstable.nix-du
     # unstable.nix-melt
     unstable.nix-tree
     unstable.nix-visualize

hosts/skycam/README.md

@@ -0,0 +1,22 @@
+# Skycam
+
+## Overview
+Raspberry Pi 4-based webcam
+
+## Specs
+* SoC - Broadcom BCM2711
+* CPU - ARM Cortex-A72 @ 1.8 GHz
+* Memory - 8 GB LPDDR4
+
+### Disks
+Device | Partitions _(filesystem, usage)_
+--- | ---
+SD card | `/dev/mmcblk0` (ext4, NixOS Root)
+
+### Networks
+- DHCP on `10.0.1.0/24` subnet.
+- Tailscale on `100.64.0.0/10` subnet. FQDN: `skycam.mesh.vimium.net`.
+
+## Devices and connections
+- Camera Module 3 with wide-angle lens
+

hosts/skycam/default.nix

@@ -0,0 +1,63 @@
+{ config, lib, pkgs, ... }:
+
+{
+  imports = [
+    ./hardware-configuration.nix
+    ../server.nix
+  ];
+
+  raspberry-pi-nix = {
+    board = "bcm2711";
+    libcamera-overlay.enable = false;
+  };
+
+  networking = {
+    hostId = "731d1660";
+    firewall = {
+      enable = true;
+      allowedTCPPorts = [ 8080 ];
+      allowedUDPPorts = [ 8080 ];
+    };
+  };
+
+  users.users.root = {
+    openssh.authorizedKeys.keys = [
+      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILVHTjsyMIV4THNw6yz0OxAxGnC+41gX72UrPqTzR+OS jordan@vimium.com"
+    ];
+  };
+
+  services.openssh.settings.PermitRootLogin = lib.mkForce "prohibit-password";
+
+  systemd.services.ustreamer = {
+    enable = true;
+    description = "uStreamer service";
+    unitConfig = {
+      Type = "simple";
+      ConditionPathExists = "/sys/bus/i2c/drivers/imx708/10-001a/video4linux";
+    };
+    serviceConfig = {
+      ExecStart = ''${pkgs.libcamera}/bin/libcamerify ${pkgs.unstable.ustreamer}/bin/ustreamer \
+        --host=0.0.0.0 \
+        --resolution=4608x2592
+      '';
+      DynamicUser = "yes";
+      SupplementaryGroups = [ "video" "i2c" ];
+      Restart = "always";
+      RestartSec = 10;
+    };
+    wantedBy = [ "network-online.target" ];
+    confinement.mode = "chroot-only";
+  };
+
+  environment.systemPackages = with pkgs; [
+    git
+    neovim
+    libcamera
+    libraspberrypi
+    raspberrypi-eeprom
+    v4l-utils
+    unstable.ustreamer
+  ];
+
+  system.stateVersion = "24.05";
+}

hosts/skycam/hardware-configuration.nix

@@ -0,0 +1,12 @@
+{ config, lib, modulesPath, ... }:
+
+{
+  fileSystems = {
+    "/" = {
+      device = "/dev/disk/by-label/NIXOS_SD";
+      fsType = "ext4";
+      options = [ "noatime" ];
+    };
+  };
+}
+

modules/desktop/browsers/firefox.nix

@@ -154,7 +154,7 @@ in {
           "dom.battery.enabled" = false;
           "dom.vr.enabled" = false;
           "media.navigator.enabled" = false;
-          "dom.webaudio.enabled" = false;
+          # "dom.webaudio.enabled" = false;
 
           ## Isolation
           "privacy.firstparty.isolate" = true;

modules/desktop/gnome.nix

@@ -101,6 +101,7 @@ in {
           # "smart-auto-move@khimaros.com"
           "space-bar@luchrioh"
           # "tiling-assistant@leleat-on-github"
+          "tilingshell@ferrarodomenico.com"
           "Vitals@CoreCoding.com"
           "windowIsReady_Remover@nunofarruca@gmail.com"
           # "worksets@blipk.xyz"
@@ -177,6 +178,11 @@ in {
         screen-left-gap = 8;
         window-gap = 8;
       };
+      "org/gnome/shell/extensions/tilingshell" = {
+        inner-gaps = 16;
+        outer-gaps = 8;
+        enable-blur-snap-assistant = true;
+      };
       "org/gnome/Console" = {
         font-scale = 1.4;
         use-system-font = false;
@@ -268,7 +274,7 @@ in {
       gnomeExtensions.smart-auto-move
       gnomeExtensions.space-bar
       gnomeExtensions.tiling-assistant
-      # gnomeExtensions.tiling-shell
+      gnomeExtensions.tiling-shell
       gnomeExtensions.todotxt
       gnomeExtensions.vitals
       gnomeExtensions.window-is-ready-remover

modules/options.nix

@@ -36,7 +36,7 @@ with lib;
       in {
         inherit name;
         isNormalUser = true;
-        extraGroups = [ "networkmanager" "wheel" "lxd" ];
+        extraGroups = [ "networkmanager" "wheel" "lxd" "video" ];
         description = "Jordan Holt";
         useDefaultShell = true;
         openssh.authorizedKeys.keys = [

modules/services/borgmatic/default.nix

@@ -1,33 +1,31 @@
 { config, lib, pkgs, inputs, ... }:
 
-with lib;
-
 let
   cfg = config.modules.services.borgmatic;
   hostname = config.networking.hostName;
 in {
   options.modules.services.borgmatic = {
-    enable = mkOption {
+    enable = lib.mkOption {
       default = false;
       example = true;
-      description = mdDoc "Enable backups on this host with `borgmatic`";
+      description = lib.mdDoc "Enable backups on this host with `borgmatic`";
     };
-    directories = mkOption {
+    directories = lib.mkOption {
-      type = types.listOf types.str;
+      type = lib.types.listOf lib.types.str;
       default = [];
       example = [
         "/home/jordan/Documents"
       ];
-      description = mdDoc "List of directories to backup";
+      description = lib.mdDoc "List of directories to backup";
     };
-    repoPath = mkOption {
+    repoPath = lib.mkOption {
-      type = types.str;
+      type = lib.types.str;
       example = "ssh://example@example.repo.borgbase.com/./repo";
-      description = mdDoc "Destination borg repository for backup";
+      description = lib.mdDoc "Destination borg repository for backup";
     };
   };
 
-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
     age.secrets."passwords/services/borg/${hostname}-passphrase" = {
       file = "${inputs.secrets}/passwords/services/borg/${hostname}-passphrase.age";
     };
@@ -47,6 +45,16 @@ in {
       };
     };
 
+    services.postgresql.ensureUsers = [
+      {
+        name = "root";
+        ensureClauses.superuser = true;
+      }
+    ];
+
+    # Add `pg_dumpall` to unit environment
+    systemd.services.borgmatic.path = [ config.services.postgresql.package ];
+
     # Without this override, `cat` is unavailable for `encryption_passcommand`
     systemd.services.borgmatic.confinement.fullUnit = true;
   };

modules/services/gitea/default.nix

@@ -1,18 +1,17 @@
 { config, lib, pkgs, inputs, ... }:
 
-with lib;
-
 let
   cfg = config.modules.services.gitea;
 in {
   options.modules.services.gitea = {
-    enable = mkOption {
+    enable = lib.mkEnableOption "gitea";
-      default = false;
+    domain = lib.mkOption {
-      example = true;
+      type = lib.types.string;
+      default = "git.vimium.com";
     };
   };
 
-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
     users = {
       users.git = {
         isSystemUser = true;
@@ -31,7 +30,7 @@ in {
         };
       };
       virtualHosts = {
-        "git.vimium.com" = {
+        "${cfg.domain}" = {
           forceSSL = true;
           enableACME = true;
           locations."/".proxyPass = "http://gitea";
@@ -69,15 +68,15 @@ in {
           OFFLINE_MODE = true;
           PROTOCOL = "http+unix";
           SSH_USER = "git";
-          SSH_DOMAIN = "git.vimium.com";
+          SSH_DOMAIN = "${cfg.domain}";
           SSH_PORT = lib.head config.services.openssh.ports;
-          ROOT_URL = "https://git.vimium.com/";
+          ROOT_URL = "https://${cfg.domain}/";
         };
         service.DISABLE_REGISTRATION = true;
         session.COOKIE_SECURE = true;
         log = {
           ROOT_PATH = "${stateDir}/log";
-          DISABLE_ROUTER_LOG = true;
+          "logger.router.MODE" = "";
         };
         ui = {
           THEMES = "gitea,arc-green,github,github-auto,github-dark";

modules/shell/zsh/default.nix

@@ -21,7 +21,7 @@ in {
 
     user.packages = with pkgs; [
       fd
-      fzf
+      unstable.fzf
       jq
       nix-zsh-completions
       nnn

overlays/0001-Always-installed.patch

@@ -0,0 +1,32 @@
+From ff76624c4407c6132cd4068e6ce065a7b429351f Mon Sep 17 00:00:00 2001
+From: Jordan Holt <jordan@vimium.com>
+Date: Sun, 4 Aug 2024 15:46:04 +0100
+Subject: [PATCH] Always installed
+
+---
+ src/libcamera/source_paths.cpp | 9 ---------
+ 1 file changed, 9 deletions(-)
+
+diff --git a/src/libcamera/source_paths.cpp b/src/libcamera/source_paths.cpp
+index 1af5386a..3fc7d044 100644
+--- a/src/libcamera/source_paths.cpp
++++ b/src/libcamera/source_paths.cpp
+@@ -39,15 +39,6 @@ namespace {
+  */
+ bool isLibcameraInstalled()
+ {
+-	/*
+-	 * DT_RUNPATH (DT_RPATH when the linker uses old dtags) is removed on
+-	 * install.
+-	 */
+-	for (const ElfW(Dyn) *dyn = _DYNAMIC; dyn->d_tag != DT_NULL; ++dyn) {
+-		if (dyn->d_tag == DT_RUNPATH || dyn->d_tag == DT_RPATH)
+-			return false;
+-	}
+-
+ 	return true;
+ }
+ 
+-- 
+2.44.1
+

overlays/0001-Remove-relative-config-lookups.patch

@@ -0,0 +1,142 @@
+From 57128bb78f56cadf9e2dcca5ba4d710c3bd478a7 Mon Sep 17 00:00:00 2001
+From: Jordan Holt <jordan@vimium.com>
+Date: Mon, 5 Aug 2024 21:53:09 +0100
+Subject: [PATCH] Remove relative config lookups
+
+---
+ src/libcamera/ipa_manager.cpp      | 16 ----------
+ src/libcamera/ipa_proxy.cpp        | 48 ++----------------------------
+ src/libcamera/pipeline_handler.cpp | 21 ++-----------
+ 3 files changed, 4 insertions(+), 81 deletions(-)
+
+diff --git a/src/libcamera/ipa_manager.cpp b/src/libcamera/ipa_manager.cpp
+index f4e0b633..6d5bbd05 100644
+--- a/src/libcamera/ipa_manager.cpp
++++ b/src/libcamera/ipa_manager.cpp
+@@ -131,22 +131,6 @@ IPAManager::IPAManager()
+ 				<< "No IPA found in '" << modulePaths << "'";
+ 	}
+ 
+-	/*
+-	 * When libcamera is used before it is installed, load IPAs from the
+-	 * same build directory as the libcamera library itself.
+-	 */
+-	std::string root = utils::libcameraBuildPath();
+-	if (!root.empty()) {
+-		std::string ipaBuildPath = root + "src/ipa";
+-		constexpr int maxDepth = 2;
+-
+-		LOG(IPAManager, Info)
+-			<< "libcamera is not installed. Adding '"
+-			<< ipaBuildPath << "' to the IPA search path";
+-
+-		ipaCount += addDir(ipaBuildPath.c_str(), maxDepth);
+-	}
+-
+ 	/* Finally try to load IPAs from the installed system path. */
+ 	ipaCount += addDir(IPA_MODULE_DIR);
+ 
+diff --git a/src/libcamera/ipa_proxy.cpp b/src/libcamera/ipa_proxy.cpp
+index 69975d8f..cd9284a3 100644
+--- a/src/libcamera/ipa_proxy.cpp
++++ b/src/libcamera/ipa_proxy.cpp
+@@ -122,33 +122,11 @@ std::string IPAProxy::configurationFile(const std::string &name,
+ 		}
+ 	}
+ 
+-	std::string root = utils::libcameraSourcePath();
+-	if (!root.empty()) {
+-		/*
+-		 * When libcamera is used before it is installed, load
+-		 * configuration files from the source directory. The
+-		 * configuration files are then located in the 'data'
+-		 * subdirectory of the corresponding IPA module.
+-		 */
+-		std::string ipaConfDir = root + "src/ipa/" + ipaName + "/data";
+-
+-		LOG(IPAProxy, Info)
+-			<< "libcamera is not installed. Loading IPA configuration from '"
+-			<< ipaConfDir << "'";
+-
+-		std::string confPath = ipaConfDir + "/" + name;
++	for (const auto &dir : utils::split(IPA_CONFIG_DIR, ":")) {
++		std::string confPath = dir + "/" + ipaName + "/" + name;
+ 		ret = stat(confPath.c_str(), &statbuf);
+ 		if (ret == 0 && (statbuf.st_mode & S_IFMT) == S_IFREG)
+ 			return confPath;
+-
+-	} else {
+-		/* Else look in the system locations. */
+-		for (const auto &dir : utils::split(IPA_CONFIG_DIR, ":")) {
+-			std::string confPath = dir + "/" + ipaName + "/" + name;
+-			ret = stat(confPath.c_str(), &statbuf);
+-			if (ret == 0 && (statbuf.st_mode & S_IFMT) == S_IFREG)
+-				return confPath;
+-		}
+ 	}
+ 
+ 	if (fallbackName.empty()) {
+@@ -197,28 +175,6 @@ std::string IPAProxy::resolvePath(const std::string &file) const
+ 		}
+ 	}
+ 
+-	/*
+-	 * When libcamera is used before it is installed, load proxy workers
+-	 * from the same build directory as the libcamera directory itself.
+-	 * This requires identifying the path of the libcamera.so, and
+-	 * referencing a relative path for the proxy workers from that point.
+-	 */
+-	std::string root = utils::libcameraBuildPath();
+-	if (!root.empty()) {
+-		std::string ipaProxyDir = root + "src/libcamera/proxy/worker";
+-
+-		LOG(IPAProxy, Info)
+-			<< "libcamera is not installed. Loading proxy workers from '"
+-			<< ipaProxyDir << "'";
+-
+-		std::string proxyPath = ipaProxyDir + proxyFile;
+-		if (!access(proxyPath.c_str(), X_OK))
+-			return proxyPath;
+-
+-		return std::string();
+-	}
+-
+-	/* Else try finding the exec target from the install directory. */
+ 	std::string proxyPath = std::string(IPA_PROXY_DIR) + proxyFile;
+ 	if (!access(proxyPath.c_str(), X_OK))
+ 		return proxyPath;
+diff --git a/src/libcamera/pipeline_handler.cpp b/src/libcamera/pipeline_handler.cpp
+index 5ea2ca78..fd8555ca 100644
+--- a/src/libcamera/pipeline_handler.cpp
++++ b/src/libcamera/pipeline_handler.cpp
+@@ -561,25 +561,8 @@ std::string PipelineHandler::configurationFile(const std::string &subdir,
+ 	struct stat statbuf;
+ 	int ret;
+ 
+-	std::string root = utils::libcameraSourcePath();
+-	if (!root.empty()) {
+-		/*
+-		 * When libcamera is used before it is installed, load
+-		 * configuration files from the source directory. The
+-		 * configuration files are then located in the 'data'
+-		 * subdirectory of the corresponding pipeline handler.
+-		 */
+-		std::string confDir = root + "src/libcamera/pipeline/";
+-		confPath = confDir + subdir + "/data/" + name;
+-
+-		LOG(Pipeline, Info)
+-			<< "libcamera is not installed. Loading platform configuration file from '"
+-			<< confPath << "'";
+-	} else {
+-		/* Else look in the system locations. */
+-		confPath = std::string(LIBCAMERA_DATA_DIR)
+-				+ "/pipeline/" + subdir + '/' + name;
+-	}
++	confPath = std::string(LIBCAMERA_DATA_DIR)
++			+ "/pipeline/" + subdir + '/' + name;
+ 
+ 	ret = stat(confPath.c_str(), &statbuf);
+ 	if (ret == 0 && (statbuf.st_mode & S_IFMT) == S_IFREG)
+-- 
+2.44.1
+

overlays/default.nix

@@ -0,0 +1,35 @@
+final: prev:
+
+/*
+  Generate an overlay from `pkgs` by handling the `callPackage` behaviour
+  ourselves, making exceptions for namespaced package sets. We cannot reuse
+  the definitions from `self.legacyPackages.${prev.system}`, as that would
+  evaluate nixpkgs twice here (prev.system does not exist then).
+*/
+
+let
+  lib = prev.lib;
+
+  pkgs = lib.packagesFromDirectoryRecursive {
+    callPackage = path: overrides: path;
+    directory = ../pkgs;
+  };
+in
+  lib.mapAttrs
+    (name: value:
+      if lib.isAttrs value then
+        if lib.hasAttrByPath [ name "overrideScope" ] prev then
+          # Namespaced package sets created with `lib.makeScope pkgs.newScope`.
+          prev.${name}.overrideScope (final': prev':
+            lib.mapAttrs (name': value': final'.callPackage value' { }) value)
+        else if lib.hasAttrByPath [ name "extend" ] prev then
+          # Namespaced package sets created with `lib.makeExtensible`.
+          prev.${name}.extend (final': prev':
+            lib.mapAttrs (name': value': final.callPackage value' { }) value)
+        else
+          # Namespaced package sets in regular attrsets.
+          prev.${name} // value
+      else
+        final.callPackage value { })
+    pkgs
+

overlays/libcamera.nix

@@ -0,0 +1,25 @@
+final: prev:
+{
+  libcamera = prev.libcamera.overrideAttrs (old: {
+    postPatch = ''
+      patchShebangs utils/ src/py/
+    '';
+
+    patches = [
+      ./0001-Remove-relative-config-lookups.patch
+    ];
+
+    mesonFlags = old.mesonFlags ++ [
+      "--buildtype=release"
+      "-Dpipelines=rpi/vc4"
+      "-Dipas=rpi/vc4"
+      "-Dgstreamer=enabled"
+      "-Dtest=false"
+      "-Dcam=enabled"
+    ];
+  });
+
+  camera-streamer = prev.callPackage ../pkgs/camera-streamer/package.nix {
+    libcamera = final.libcamera;
+  };
+}

pkgs/camera-streamer/package.nix

@@ -0,0 +1,75 @@
+{ stdenv
+, fetchFromGitea
+
+, cmake
+, gnumake
+, pkg-config
+, xxd
+
+, v4l-utils
+, nlohmann_json
+, ffmpegSupport ? true
+, ffmpeg
+, libcameraSupport ? true
+, libcamera
+, rtspSupport ? false
+, live555
+, webrtcSupport ? false
+, openssl
+
+, lib
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "camera-streamer";
+  version = "0.2.8";
+
+  src = fetchFromGitea {
+    domain = "git.vimium.com";
+    owner = "jordan";
+    repo = "camera-streamer";
+    rev = "464f05172c725b4b302464eecdb8b6e85fda6e84";
+    hash = "sha256-IkLR/oozYU+hfpct+GXej2T3GEhauQtqwWOcrQAErbM=";
+    fetchSubmodules = true;
+  };
+
+  # Second replacement fixes literal newline in generated version.h.
+  postPatch = ''
+    substituteInPlace Makefile \
+      --replace '/usr/local/bin' '/bin' \
+      --replace 'echo "#define' 'echo -e "#define'
+  '';
+
+  env.NIX_CFLAGS_COMPILE = builtins.toString [
+    "-Wno-error=stringop-overflow"
+    "-Wno-error=format"
+    "-Wno-format"
+    "-Wno-format-security"
+    "-Wno-error=unused-result"
+  ];
+
+  nativeBuildInputs = [
+    cmake
+    gnumake
+    pkg-config
+    xxd
+  ];
+
+  dontUseCmakeConfigure = true;
+
+  buildInputs = [ nlohmann_json v4l-utils ]
+    ++ (lib.optional ffmpegSupport ffmpeg)
+    ++ (lib.optional libcameraSupport libcamera)
+    ++ (lib.optional rtspSupport live555)
+    ++ (lib.optional webrtcSupport openssl);
+
+  installFlags = [ "DESTDIR=${builtins.placeholder "out"}" ];
+  preInstall = "mkdir -p $out/bin";
+
+  meta = with lib; {
+    description = "High-performance low-latency camera streamer for Raspberry Pi's";
+    website = "https://github.com/ayufan/camera-streamer";
+    license = licenses.gpl3Only;
+  };
+})
+

pkgs/rpicam-apps/package.nix

@@ -0,0 +1,58 @@
+{ stdenv
+, fetchFromGitHub
+, meson
+, ninja
+, pkg-config
+, boost
+, ffmpeg
+, libcamera
+, libdrm
+, libexif
+, libjpeg
+, libpng
+, libtiff
+, lib
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "rpicam-apps";
+  version = "1.4.1";
+
+  src = fetchFromGitHub {
+    owner = "raspberrypi";
+    repo = "rpicam-apps";
+    rev = "v" + finalAttrs.version;
+    hash = "sha256-3NG2ZE/Ub3lTbfne0LCXuDgLGTPaAAADRdElEbZwvls=";
+  };
+
+  nativeBuildInputs = [
+    meson
+    ninja
+    pkg-config
+  ];
+
+  buildInputs = [
+    boost
+    ffmpeg
+    libcamera
+    libdrm
+    libexif
+    libjpeg
+    libpng
+    libtiff
+  ];
+
+  # Meson is no longer able to pick up Boost automatically:
+  # https://github.com/NixOS/nixpkgs/issues/86131
+  BOOST_INCLUDEDIR = "${lib.getDev boost}/include";
+  BOOST_LIBRARYDIR = "${lib.getLib boost}/lib";
+
+  meta = with lib; {
+    description = ''
+      libcamera-based applications to drive the cameras on a Raspberry Pi platform
+    '';
+    homepage = "https://github.com/raspberrypi/rpicam-apps";
+    license = licenses.bsd2;
+  };
+})
+