Compare commits
13 Commits
skycam
...
17b924c84e
Author | SHA1 | Date | |
---|---|---|---|
17b924c84e
|
|||
064f180528
|
|||
3f36be6cb7
|
|||
ab23bb3b76
|
|||
533397fc21
|
|||
7943e063c2
|
|||
91d66003aa
|
|||
ecf34dbc89
|
|||
08c9a6ae19
|
|||
0c564903ab
|
|||
ad9f4e52ef
|
|||
a96d5a9aeb
|
|||
d57d70bbbf
|
247
flake.lock
generated
247
flake.lock
generated
@@ -107,11 +107,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1722821805,
|
"lastModified": 1723080788,
|
||||||
"narHash": "sha256-FGrUPUD+LMDwJsYyNSxNIzFMldtCm8wXiQuyL2PHSrM=",
|
"narHash": "sha256-C5LbM5VMdcolt9zHeLQ0bYMRjUL+N+AL5pK7/tVTdes=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "disko",
|
"repo": "disko",
|
||||||
"rev": "0257e44f4ad472b54f19a6dd1615aee7fa48ed49",
|
"rev": "ffc1f95f6c28e1c6d1e587b51a2147027a3e45ed",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -123,11 +123,11 @@
|
|||||||
"firefox-gnome-theme": {
|
"firefox-gnome-theme": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1721276923,
|
"lastModified": 1723137499,
|
||||||
"narHash": "sha256-HJKuwVvi+yGv+8n9Ez4EwaJA0B79JRss9J30vpgy/GI=",
|
"narHash": "sha256-MOE9NeU2i6Ws1GhGmppMnjOHkNLl2MQMJmGhaMzdoJM=",
|
||||||
"owner": "rafaelmardojai",
|
"owner": "rafaelmardojai",
|
||||||
"repo": "firefox-gnome-theme",
|
"repo": "firefox-gnome-theme",
|
||||||
"rev": "cc70ec20e2775df7cd2bccdd20dcdecc3e0a733b",
|
"rev": "fb5b578a4f49ae8705e5fea0419242ed1b8dba70",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -233,11 +233,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1721042469,
|
"lastModified": 1722857853,
|
||||||
"narHash": "sha256-6FPUl7HVtvRHCCBQne7Ylp4p+dpP3P/OYuzjztZ4s70=",
|
"narHash": "sha256-3Zx53oz/MSIyevuWO/SumxABkrIvojnB7g9cimxkhiE=",
|
||||||
"owner": "cachix",
|
"owner": "cachix",
|
||||||
"repo": "git-hooks.nix",
|
"repo": "git-hooks.nix",
|
||||||
"rev": "f451c19376071a90d8c58ab1a953c6e9840527fd",
|
"rev": "06939f6b7ec4d4f465bf3132a05367cccbbf64da",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -365,40 +365,6 @@
|
|||||||
"type": "github"
|
"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": {
|
"nix-darwin": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
@@ -407,11 +373,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1722609272,
|
"lastModified": 1722924007,
|
||||||
"narHash": "sha256-Kkb+ULEHVmk07AX+OhwyofFxBDpw+2WvsXguUS2m6e4=",
|
"narHash": "sha256-+CQDamNwqO33REJLft8c26NbUi2Td083hq6SvAm2xkU=",
|
||||||
"owner": "lnl7",
|
"owner": "lnl7",
|
||||||
"repo": "nix-darwin",
|
"repo": "nix-darwin",
|
||||||
"rev": "f7142b8024d6b70c66fd646e1d099d3aa5bfec49",
|
"rev": "91010a5613ffd7ee23ee9263213157a1c422b705",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -422,11 +388,11 @@
|
|||||||
},
|
},
|
||||||
"nixos-hardware": {
|
"nixos-hardware": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1722332872,
|
"lastModified": 1723149858,
|
||||||
"narHash": "sha256-2xLM4sc5QBfi0U/AANJAW21Bj4ZX479MHPMPkB+eKBU=",
|
"narHash": "sha256-3u51s7jdhavmEL1ggtd8wqrTH2clTy5yaZmhLvAXTqc=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixos-hardware",
|
"repo": "nixos-hardware",
|
||||||
"rev": "14c333162ba53c02853add87a0000cbd7aa230c2",
|
"rev": "107bb46eef1f05e86fc485ee8af9b637e5157988",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -493,11 +459,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs-unstable": {
|
"nixpkgs-unstable": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1722630782,
|
"lastModified": 1722813957,
|
||||||
"narHash": "sha256-hMyG9/WlUi0Ho9VkRrrez7SeNlDzLxalm9FwY7n/Noo=",
|
"narHash": "sha256-IAoYyYnED7P8zrBFMnmp7ydaJfwTnwcnqxUElC1I26Y=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "d04953086551086b44b6f3c6b7eeb26294f207da",
|
"rev": "cb9a96f23c491c081b38eab96d22fa958043c9fa",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -524,11 +490,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs_3": {
|
"nixpkgs_3": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1722791413,
|
"lastModified": 1722987190,
|
||||||
"narHash": "sha256-rCTrlCWvHzMCNcKxPE3Z/mMK2gDZ+BvvpEVyRM4tKmU=",
|
"narHash": "sha256-68hmex5efCiM2aZlAAEcQgmFI4ZwWt8a80vOeB/5w3A=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "8b5b6723aca5a51edf075936439d9cd3947b7b2c",
|
"rev": "21cc704b5e918c5fbf4f9fff22b4ac2681706d90",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -537,22 +503,6 @@
|
|||||||
"type": "indirect"
|
"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": {
|
"nixvim": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"devshell": "devshell",
|
"devshell": "devshell",
|
||||||
@@ -567,11 +517,11 @@
|
|||||||
"treefmt-nix": "treefmt-nix"
|
"treefmt-nix": "treefmt-nix"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1722688115,
|
"lastModified": 1722925293,
|
||||||
"narHash": "sha256-Ubk5KzAp2Z4Dzmi81aGgabvy41QXjZMwNikDYm7+jS0=",
|
"narHash": "sha256-saXm5dd/e3PMsYTEcp1Qbzifm3KsZtNFkrWjmLhXHGE=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "nixvim",
|
"repo": "nixvim",
|
||||||
"rev": "4e6974c619bd280789ef3697a73fcf7c20f70819",
|
"rev": "170df9814c3e41d5a4d6e3339e611801b1f02ce2",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -591,11 +541,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1722804745,
|
"lastModified": 1723232379,
|
||||||
"narHash": "sha256-l6N3QaiDqN2QmHDAxjczQPLPCTv+Kp7PsrtJBltmhTo=",
|
"narHash": "sha256-F4Y3f9305aHGWKqAd3s2GyNRONdpDBuNuK4TCSdaHz8=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "plasma-manager",
|
"repo": "plasma-manager",
|
||||||
"rev": "61d9342fb471cd3c45a047406428fba7b6fb49ad",
|
"rev": "22bea90404c5ff6457913a03c1a54a3caa5b1c57",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -604,33 +554,6 @@
|
|||||||
"type": "github"
|
"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": {
|
"root": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"agenix": "agenix",
|
"agenix": "agenix",
|
||||||
@@ -646,113 +569,10 @@
|
|||||||
"nixpkgs-unstable": "nixpkgs-unstable",
|
"nixpkgs-unstable": "nixpkgs-unstable",
|
||||||
"nixvim": "nixvim",
|
"nixvim": "nixvim",
|
||||||
"plasma-manager": "plasma-manager",
|
"plasma-manager": "plasma-manager",
|
||||||
"raspberry-pi-nix": "raspberry-pi-nix",
|
|
||||||
"secrets": "secrets",
|
"secrets": "secrets",
|
||||||
"thunderbird-gnome-theme": "thunderbird-gnome-theme"
|
"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": {
|
"secrets": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
@@ -851,19 +671,6 @@
|
|||||||
"type": "github"
|
"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": {
|
"utils": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"systems": "systems_2"
|
"systems": "systems_2"
|
||||||
|
10
flake.nix
10
flake.nix
@@ -41,9 +41,6 @@
|
|||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
inputs.home-manager.follows = "home-manager";
|
inputs.home-manager.follows = "home-manager";
|
||||||
};
|
};
|
||||||
raspberry-pi-nix = {
|
|
||||||
url = "github:nix-community/raspberry-pi-nix";
|
|
||||||
};
|
|
||||||
secrets = {
|
secrets = {
|
||||||
url = "git+ssh://git@git.vimium.com/jordan/nix-secrets.git";
|
url = "git+ssh://git@git.vimium.com/jordan/nix-secrets.git";
|
||||||
flake = false;
|
flake = false;
|
||||||
@@ -70,7 +67,6 @@
|
|||||||
overlays = [
|
overlays = [
|
||||||
agenix.overlays.default
|
agenix.overlays.default
|
||||||
(import ./overlays/gnome.nix)
|
(import ./overlays/gnome.nix)
|
||||||
(import ./overlays/libcamera.nix)
|
|
||||||
(
|
(
|
||||||
final: prev: {
|
final: prev: {
|
||||||
unstable = import inputs.nixpkgs-unstable { system = final.system; };
|
unstable = import inputs.nixpkgs-unstable { system = final.system; };
|
||||||
@@ -123,7 +119,7 @@
|
|||||||
mail = mkNixosSystem { system = "x86_64-linux"; name = "mail"; };
|
mail = mkNixosSystem { system = "x86_64-linux"; name = "mail"; };
|
||||||
odyssey = mkNixosSystem { system = "x86_64-linux"; name = "odyssey"; };
|
odyssey = mkNixosSystem { system = "x86_64-linux"; name = "odyssey"; };
|
||||||
pi = mkNixosSystem { system = "aarch64-linux"; name = "pi"; extraModules = [ nixos-hardware.nixosModules.raspberry-pi-4 ]; };
|
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"; };
|
vps1 = mkNixosSystem { system = "x86_64-linux"; name = "vps1"; };
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -155,7 +151,7 @@
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
pi = {
|
pi = {
|
||||||
hostname = "10.0.1.191";
|
hostname = "pi.mesh.vimium.net";
|
||||||
|
|
||||||
profiles.system = {
|
profiles.system = {
|
||||||
user = "root";
|
user = "root";
|
||||||
@@ -163,7 +159,7 @@
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
skycam = {
|
skycam = {
|
||||||
hostname = "10.0.1.146";
|
hostname = "skycam.mesh.vimium.net";
|
||||||
|
|
||||||
profiles.system = {
|
profiles.system = {
|
||||||
user = "root";
|
user = "root";
|
||||||
|
@@ -45,10 +45,11 @@
|
|||||||
buildMachines = [
|
buildMachines = [
|
||||||
{
|
{
|
||||||
hostName = "10.0.1.79";
|
hostName = "10.0.1.79";
|
||||||
sshUser = "builder";
|
sshUser = "root";
|
||||||
system = "aarch64-linux";
|
system = "aarch64-linux";
|
||||||
maxJobs = 6;
|
maxJobs = 6;
|
||||||
speedFactor = 1;
|
speedFactor = 1;
|
||||||
|
supportedFeatures = [ "big-parallel" "benchmark" ];
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
distributedBuilds = true;
|
distributedBuilds = true;
|
||||||
@@ -62,12 +63,10 @@
|
|||||||
auto-optimise-store = true;
|
auto-optimise-store = true;
|
||||||
substituters = [
|
substituters = [
|
||||||
"http://odyssey.mesh.vimium.net"
|
"http://odyssey.mesh.vimium.net"
|
||||||
"https://nix-community.cachix.org"
|
|
||||||
"https://cache.nixos.org"
|
"https://cache.nixos.org"
|
||||||
];
|
];
|
||||||
trusted-public-keys = [
|
trusted-public-keys = [
|
||||||
"odyssey.mesh.vimium.net:ZhQhjscPWjoN4rlZwoMELznEiBnZ9O26iyGA27ibilQ="
|
"odyssey.mesh.vimium.net:ZhQhjscPWjoN4rlZwoMELznEiBnZ9O26iyGA27ibilQ="
|
||||||
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
|
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
gc = {
|
gc = {
|
||||||
|
@@ -20,3 +20,10 @@ SD card | `/dev/mmcblk0` (ext4, NixOS Root)
|
|||||||
## Devices and connections
|
## Devices and connections
|
||||||
- Camera Module 3 with wide-angle lens
|
- Camera Module 3 with wide-angle lens
|
||||||
|
|
||||||
|
## Building
|
||||||
|
To generate a compressed SD card image for Skycam, run:
|
||||||
|
`nix build '.#nixosConfigurations.skycam.config.system.build.sdImage'`
|
||||||
|
|
||||||
|
Once a card is imaged, the existing SSH host keys should be copied to
|
||||||
|
`/etc/ssh` manually to enable secret decryption.
|
||||||
|
|
||||||
|
@@ -6,11 +6,53 @@
|
|||||||
../server.nix
|
../server.nix
|
||||||
];
|
];
|
||||||
|
|
||||||
raspberry-pi-nix = {
|
hardware = {
|
||||||
board = "bcm2711";
|
raspberry-pi."4" = {
|
||||||
libcamera-overlay.enable = false;
|
apply-overlays-dtmerge.enable = true;
|
||||||
|
audio.enable = false;
|
||||||
|
xhci.enable = false;
|
||||||
|
};
|
||||||
|
deviceTree = {
|
||||||
|
enable = true;
|
||||||
|
filter = "*rpi-4-*.dtb";
|
||||||
|
# From https://github.com/Electrostasy/dots/blob/3b81723feece67610a252ce754912f6769f0cd34/hosts/phobos/klipper.nix#L43-L65
|
||||||
|
overlays =
|
||||||
|
let
|
||||||
|
mkCompatibleDtsFile = dtbo:
|
||||||
|
let
|
||||||
|
drv = pkgs.runCommand "fix-dts" { nativeBuildInputs = with pkgs; [ dtc gnused ]; } ''
|
||||||
|
mkdir "$out"
|
||||||
|
dtc -I dtb -O dts ${dtbo} | sed -e 's/bcm2835/bcm2711/' > $out/overlay.dts
|
||||||
|
'';
|
||||||
|
in
|
||||||
|
"${drv}/overlay.dts";
|
||||||
|
|
||||||
|
inherit (config.boot.kernelPackages) kernel;
|
||||||
|
in
|
||||||
|
[
|
||||||
|
{
|
||||||
|
name = "imx708.dtbo";
|
||||||
|
dtsFile = mkCompatibleDtsFile "${kernel}/dtbs/overlays/imx708.dtbo";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name = "vc4-kms-v3d-pi4.dtbo";
|
||||||
|
dtsFile = mkCompatibleDtsFile "${kernel}/dtbs/overlays/vc4-kms-v3d-pi4.dtbo";
|
||||||
|
}
|
||||||
|
];
|
||||||
|
};
|
||||||
|
firmware = with pkgs; [
|
||||||
|
firmwareLinuxNonfree
|
||||||
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
services.udev.extraRules = ''
|
||||||
|
SUBSYSTEM="dma_heap", GROUP="video", MODE="0600"
|
||||||
|
'';
|
||||||
|
|
||||||
|
nixpkgs.overlays = [
|
||||||
|
(import ./../overlays/libcamera.nix)
|
||||||
|
];
|
||||||
|
|
||||||
networking = {
|
networking = {
|
||||||
hostId = "731d1660";
|
hostId = "731d1660";
|
||||||
firewall = {
|
firewall = {
|
||||||
@@ -40,8 +82,6 @@
|
|||||||
--host=0.0.0.0 \
|
--host=0.0.0.0 \
|
||||||
--resolution=4608x2592
|
--resolution=4608x2592
|
||||||
'';
|
'';
|
||||||
DynamicUser = "yes";
|
|
||||||
SupplementaryGroups = [ "video" "i2c" ];
|
|
||||||
Restart = "always";
|
Restart = "always";
|
||||||
RestartSec = 10;
|
RestartSec = 10;
|
||||||
};
|
};
|
||||||
|
@@ -1,6 +1,27 @@
|
|||||||
{ config, lib, modulesPath, ... }:
|
{ config, lib, modulesPath, ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
|
imports = [
|
||||||
|
(modulesPath + "/installer/sd-card/sd-image-aarch64.nix")
|
||||||
|
];
|
||||||
|
|
||||||
|
boot = {
|
||||||
|
kernelModules = [ "bcm2835-v4l2" ];
|
||||||
|
kernelParams = [
|
||||||
|
"cma=512M"
|
||||||
|
"panic=0"
|
||||||
|
];
|
||||||
|
supportedFilesystems = lib.mkForce [ "f2fs" "vfat" "xfs" ];
|
||||||
|
tmp.cleanOnBoot = false;
|
||||||
|
};
|
||||||
|
|
||||||
|
nixpkgs.overlays = [
|
||||||
|
(final: super: {
|
||||||
|
makeModulesClosure = x:
|
||||||
|
super.makeModulesClosure (x // { allowMissing = true; });
|
||||||
|
})
|
||||||
|
];
|
||||||
|
|
||||||
fileSystems = {
|
fileSystems = {
|
||||||
"/" = {
|
"/" = {
|
||||||
device = "/dev/disk/by-label/NIXOS_SD";
|
device = "/dev/disk/by-label/NIXOS_SD";
|
||||||
|
@@ -36,7 +36,7 @@ with lib;
|
|||||||
in {
|
in {
|
||||||
inherit name;
|
inherit name;
|
||||||
isNormalUser = true;
|
isNormalUser = true;
|
||||||
extraGroups = [ "networkmanager" "wheel" "lxd" "video" ];
|
extraGroups = [ "networkmanager" "wheel" "lxd" ];
|
||||||
description = "Jordan Holt";
|
description = "Jordan Holt";
|
||||||
useDefaultShell = true;
|
useDefaultShell = true;
|
||||||
openssh.authorizedKeys.keys = [
|
openssh.authorizedKeys.keys = [
|
||||||
|
@@ -82,6 +82,13 @@ in {
|
|||||||
worker_connections 20000;
|
worker_connections 20000;
|
||||||
multi_accept off;
|
multi_accept off;
|
||||||
'';
|
'';
|
||||||
|
proxyCachePath = {
|
||||||
|
"skycam" = {
|
||||||
|
enable = true;
|
||||||
|
keysZoneName = "skycam_cache";
|
||||||
|
maxSize = "100m";
|
||||||
|
};
|
||||||
|
};
|
||||||
virtualHosts = {
|
virtualHosts = {
|
||||||
## Static sites
|
## Static sites
|
||||||
"jellyfin.vimium.com" = {
|
"jellyfin.vimium.com" = {
|
||||||
@@ -105,6 +112,21 @@ in {
|
|||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
"jdholt.com" = {
|
||||||
|
forceSSL = true;
|
||||||
|
enableACME = true;
|
||||||
|
serverAliases = [ "www.jdholt.com" ];
|
||||||
|
extraConfig = nginxErrorPages + nginxEdgeHeaders + nginxStrictHeaders;
|
||||||
|
locations."/skycam/snapshot.jpg" = {
|
||||||
|
proxyPass = "http://skycam.mesh.vimium.net:8080/snapshot";
|
||||||
|
extraConfig = ''
|
||||||
|
proxy_cache skycam_cache;
|
||||||
|
proxy_cache_valid any 10s;
|
||||||
|
proxy_ignore_headers Cache-Control Expires Set-Cookie;
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
locations."/".return = "301 https://vimium.com$request_uri";
|
||||||
|
};
|
||||||
"pki.vimium.com" = {
|
"pki.vimium.com" = {
|
||||||
addSSL = true;
|
addSSL = true;
|
||||||
forceSSL = false;
|
forceSSL = false;
|
||||||
@@ -142,7 +164,6 @@ in {
|
|||||||
## Redirects
|
## Redirects
|
||||||
// (mkRedirect "h0lt.com" "jdholt.com")
|
// (mkRedirect "h0lt.com" "jdholt.com")
|
||||||
// (mkRedirect "jordanholt.xyz" "jdholt.com")
|
// (mkRedirect "jordanholt.xyz" "jdholt.com")
|
||||||
// (mkRedirect "jdholt.com" "vimium.com")
|
|
||||||
// (mkRedirect "omnimagic.com" "vimium.com")
|
// (mkRedirect "omnimagic.com" "vimium.com")
|
||||||
// (mkRedirect "omnimagic.net" "vimium.com")
|
// (mkRedirect "omnimagic.net" "vimium.com")
|
||||||
// (mkRedirect "thelostlegend.com" "suhailhussain.com")
|
// (mkRedirect "thelostlegend.com" "suhailhussain.com")
|
||||||
|
@@ -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
|
|
||||||
|
|
Reference in New Issue
Block a user