Compare commits
1 Commits
skycam
...
15d9a39349
| Author | SHA1 | Date | |
|---|---|---|---|
15d9a39349
|
235
flake.lock
generated
235
flake.lock
generated
@@ -107,11 +107,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1722821805,
|
||||
"narHash": "sha256-FGrUPUD+LMDwJsYyNSxNIzFMldtCm8wXiQuyL2PHSrM=",
|
||||
"lastModified": 1722476845,
|
||||
"narHash": "sha256-7gZ8uf3qOox8Vrwd+p9EhUHHLhhK8lis/5KcXGmIaow=",
|
||||
"owner": "nix-community",
|
||||
"repo": "disko",
|
||||
"rev": "0257e44f4ad472b54f19a6dd1615aee7fa48ed49",
|
||||
"rev": "7e1b215a0a96efb306ad6440bf706d2b307dc267",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -206,11 +206,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1722555600,
|
||||
"narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=",
|
||||
"lastModified": 1719994518,
|
||||
"narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=",
|
||||
"owner": "hercules-ci",
|
||||
"repo": "flake-parts",
|
||||
"rev": "8471fe90ad337a8074e957b69ca4d0089218391d",
|
||||
"rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -365,40 +365,6 @@
|
||||
"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": [
|
||||
@@ -407,11 +373,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1722609272,
|
||||
"narHash": "sha256-Kkb+ULEHVmk07AX+OhwyofFxBDpw+2WvsXguUS2m6e4=",
|
||||
"lastModified": 1722500642,
|
||||
"narHash": "sha256-Vls0TQRdplex1JslnBxEk3M26Q1vR+OSg+sk5rBG4DA=",
|
||||
"owner": "lnl7",
|
||||
"repo": "nix-darwin",
|
||||
"rev": "f7142b8024d6b70c66fd646e1d099d3aa5bfec49",
|
||||
"rev": "b47af8628624856ad6853168298f1f96364d92d6",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -493,11 +459,11 @@
|
||||
},
|
||||
"nixpkgs-unstable": {
|
||||
"locked": {
|
||||
"lastModified": 1722630782,
|
||||
"narHash": "sha256-hMyG9/WlUi0Ho9VkRrrez7SeNlDzLxalm9FwY7n/Noo=",
|
||||
"lastModified": 1722421184,
|
||||
"narHash": "sha256-/DJBI6trCeVnasdjUo9pbnodCLZcFqnVZiLUfqLH4jA=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "d04953086551086b44b6f3c6b7eeb26294f207da",
|
||||
"rev": "9f918d616c5321ad374ae6cb5ea89c9e04bf3e58",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -524,11 +490,11 @@
|
||||
},
|
||||
"nixpkgs_3": {
|
||||
"locked": {
|
||||
"lastModified": 1722791413,
|
||||
"narHash": "sha256-rCTrlCWvHzMCNcKxPE3Z/mMK2gDZ+BvvpEVyRM4tKmU=",
|
||||
"lastModified": 1722519197,
|
||||
"narHash": "sha256-VEdJmVU2eLFtLqCjTYJd1J7+Go8idAcZoT11IewFiRg=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "8b5b6723aca5a51edf075936439d9cd3947b7b2c",
|
||||
"rev": "05405724efa137a0b899cce5ab4dde463b4fd30b",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -537,22 +503,6 @@
|
||||
"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",
|
||||
@@ -567,11 +517,11 @@
|
||||
"treefmt-nix": "treefmt-nix"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1722688115,
|
||||
"narHash": "sha256-Ubk5KzAp2Z4Dzmi81aGgabvy41QXjZMwNikDYm7+jS0=",
|
||||
"lastModified": 1722542912,
|
||||
"narHash": "sha256-88fmVMPFs3ZN+W7Nqd3PYukUOfY4jwc5uvMJXnFhJ20=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nixvim",
|
||||
"rev": "4e6974c619bd280789ef3697a73fcf7c20f70819",
|
||||
"rev": "76f309d00fb5a6eeb59c13e9b36b4cf86a209d7f",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -591,11 +541,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1722804745,
|
||||
"narHash": "sha256-l6N3QaiDqN2QmHDAxjczQPLPCTv+Kp7PsrtJBltmhTo=",
|
||||
"lastModified": 1722693897,
|
||||
"narHash": "sha256-Gpa3Gf60AqshNJKUP5mAmVImFFQ6BsWG+zbqx0JGFD4=",
|
||||
"owner": "nix-community",
|
||||
"repo": "plasma-manager",
|
||||
"rev": "61d9342fb471cd3c45a047406428fba7b6fb49ad",
|
||||
"rev": "b17a2666bcf400cf245528d143597d1480e298f8",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -604,33 +554,6 @@
|
||||
"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",
|
||||
@@ -646,113 +569,10 @@
|
||||
"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": {
|
||||
@@ -851,19 +671,6 @@
|
||||
"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"
|
||||
|
||||
47
flake.nix
47
flake.nix
@@ -41,9 +41,6 @@
|
||||
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;
|
||||
@@ -56,24 +53,14 @@
|
||||
|
||||
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; };
|
||||
}
|
||||
)
|
||||
];
|
||||
@@ -108,12 +95,6 @@
|
||||
};
|
||||
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"; };
|
||||
@@ -123,7 +104,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 ]; };
|
||||
skycam = mkNixosSystem { system = "aarch64-linux"; name = "skycam"; extraModules = [ nixos-hardware.nixosModules.raspberry-pi-4 ]; };
|
||||
vps1 = mkNixosSystem { system = "x86_64-linux"; name = "vps1"; };
|
||||
};
|
||||
|
||||
@@ -154,22 +135,14 @@
|
||||
path = deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.vps1;
|
||||
};
|
||||
};
|
||||
pi = {
|
||||
hostname = "10.0.1.191";
|
||||
|
||||
profiles.system = {
|
||||
user = "root";
|
||||
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;
|
||||
};
|
||||
};
|
||||
# pi = {
|
||||
# hostname = "10.0.1.191";
|
||||
#
|
||||
# profiles.system = {
|
||||
# user = "root";
|
||||
# path = deploy-rs.lib.aarch64-linux.activate.nixos self.nixosConfigurations.pi;
|
||||
# };
|
||||
# };
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@@ -42,16 +42,6 @@
|
||||
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;
|
||||
@@ -62,12 +52,10 @@
|
||||
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 = {
|
||||
|
||||
@@ -15,7 +15,7 @@ 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`.
|
||||
- Tailscale on `100.64.0.0/10` subnet. FQDN: `pi.mesh.vimium.net`.
|
||||
|
||||
## Devices and connections
|
||||
- Camera Module 3 with wide-angle lens
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
{ config, pkgs, ... }:
|
||||
|
||||
{
|
||||
imports = [
|
||||
@@ -6,9 +6,18 @@
|
||||
../server.nix
|
||||
];
|
||||
|
||||
raspberry-pi-nix = {
|
||||
board = "bcm2711";
|
||||
libcamera-overlay.enable = false;
|
||||
hardware = {
|
||||
raspberry-pi."4" = {
|
||||
apply-overlays-dtmerge.enable = true;
|
||||
audio.enable = false;
|
||||
fkms-3d.enable = true; # VideoCore with 512 MB CMA reservation
|
||||
tc358743.enable = true; # HDMI-to-CSI-2 converter
|
||||
xhci.enable = false;
|
||||
};
|
||||
firmware = with pkgs; [
|
||||
firmwareLinuxNonfree
|
||||
wireless-regdb
|
||||
];
|
||||
};
|
||||
|
||||
networking = {
|
||||
@@ -20,30 +29,30 @@
|
||||
};
|
||||
};
|
||||
|
||||
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
|
||||
ExecStartPre = ''${pkgs.v4l-utils}/bin/v4l2-ctl \
|
||||
--device=/dev/video0 \
|
||||
--fix-edid-checksums \
|
||||
--info-edid
|
||||
'';
|
||||
ExecStart = ''${pkgs.unstable.ustreamer}/bin/ustreamer \
|
||||
--device=/dev/video0 \
|
||||
--resolution=1280x720 \
|
||||
--format=uyvy \
|
||||
--encoder=m2m-image \
|
||||
--workers=3 \
|
||||
--persistent \
|
||||
--dv-timings \
|
||||
--drop-same-frames=30 \
|
||||
--host=0.0.0.0 \
|
||||
--port=8080
|
||||
'';
|
||||
DynamicUser = "yes";
|
||||
SupplementaryGroups = [ "video" "i2c" ];
|
||||
Restart = "always";
|
||||
RestartSec = 10;
|
||||
};
|
||||
wantedBy = [ "network-online.target" ];
|
||||
confinement.mode = "chroot-only";
|
||||
@@ -52,12 +61,11 @@
|
||||
environment.systemPackages = with pkgs; [
|
||||
git
|
||||
neovim
|
||||
libcamera
|
||||
libraspberrypi
|
||||
raspberrypi-eeprom
|
||||
v4l-utils
|
||||
unstable.ustreamer
|
||||
];
|
||||
|
||||
system.stateVersion = "24.05";
|
||||
system.stateVersion = "22.11";
|
||||
}
|
||||
|
||||
@@ -1,6 +1,22 @@
|
||||
{ config, lib, modulesPath, ... }:
|
||||
|
||||
{
|
||||
imports = [
|
||||
(modulesPath + "/installer/sd-card/sd-image-aarch64.nix")
|
||||
];
|
||||
|
||||
boot = {
|
||||
supportedFilesystems = lib.mkForce [ "f2fs" "vfat xfs" ];
|
||||
tmp.cleanOnBoot = true;
|
||||
};
|
||||
|
||||
nixpkgs.overlays = [
|
||||
(final: super: {
|
||||
makeModulesClosure = x:
|
||||
super.makeModulesClosure (x // { allowMissing = true; });
|
||||
})
|
||||
];
|
||||
|
||||
fileSystems = {
|
||||
"/" = {
|
||||
device = "/dev/disk/by-label/NIXOS_SD";
|
||||
|
||||
@@ -36,7 +36,7 @@ with lib;
|
||||
in {
|
||||
inherit name;
|
||||
isNormalUser = true;
|
||||
extraGroups = [ "networkmanager" "wheel" "lxd" "video" ];
|
||||
extraGroups = [ "networkmanager" "wheel" "lxd" ];
|
||||
description = "Jordan Holt";
|
||||
useDefaultShell = true;
|
||||
openssh.authorizedKeys.keys = [
|
||||
|
||||
@@ -1,32 +0,0 @@
|
||||
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
|
||||
|
||||
@@ -1,142 +0,0 @@
|
||||
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
|
||||
|
||||
@@ -1,35 +0,0 @@
|
||||
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
|
||||
|
||||
@@ -1,25 +0,0 @@
|
||||
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;
|
||||
};
|
||||
}
|
||||
@@ -1,75 +0,0 @@
|
||||
{ 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;
|
||||
};
|
||||
})
|
||||
|
||||
@@ -1,58 +0,0 @@
|
||||
{ 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;
|
||||
};
|
||||
})
|
||||
|
||||
Reference in New Issue
Block a user