c3d2/nix-config
c3d2/nix-config
23
7
Fork 3
Code Issues 12 Pull Requests 2 Releases Wiki Activity

Merge https://gitea.c3d2.de/c3d2/nix-config

Browse Source
This commit is contained in:
Leon Vita 2022-11-20 13:33:55 +00:00
commit 6715589da7
5 changed files with 53 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
flake.lock
View File

@ -12,7 +12,7 @@
"locked": { "locked": {
"lastModified": 1663176622, "lastModified": 1663176622,
"narHash": "sha256-ahmQXwS2P34x7PxXt8Ve2ZVKJHW6yP1m/nZoo8sHwmE=", "narHash": "sha256-ahmQXwS2P34x7PxXt8Ve2ZVKJHW6yP1m/nZoo8sHwmE=",
"ref": "master", "ref": "refs/heads/master",
"rev": "b56ed86e45b2a8cdf811f2659644192a69ab5818", "rev": "b56ed86e45b2a8cdf811f2659644192a69ab5818",
"revCount": 293, "revCount": 293,
"type": "git", "type": "git",
@ -91,11 +91,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1668535353, "lastModified": 1668798814,
"narHash": "sha256-cVe++C4wg2CG80qjjSVG4H1udcRi7sbdU/xMGC5WSxc=", "narHash": "sha256-JBXKQ/l0PmuJe3bBkLdICMX3CXG5GatyacuxnTY43RU=",
"ref": "main", "ref": "main",
"rev": "a12dc753b3f3d145883e1de7a0c12407bbe97288", "rev": "91dcf74609695490cc83961518bacc269710296f",
"revCount": 111, "revCount": 128,
"type": "git", "type": "git",
"url": "https://gitea.c3d2.de/astro/caveman.git" "url": "https://gitea.c3d2.de/astro/caveman.git"
}, },
@ -113,11 +113,11 @@
"rust-analyzer-src": "rust-analyzer-src" "rust-analyzer-src": "rust-analyzer-src"
}, },
"locked": { "locked": {
"lastModified": 1668493618, "lastModified": 1668839162,
"narHash": "sha256-Pw8dzHPI3My/nWthhWlD6nVLVPDAi9+NODvayVhKGKk=", "narHash": "sha256-kGpqBpxEbzy/AEEKia2Hd5swMou2Pl9ATAviSTQy/NM=",
"owner": "nix-community", "owner": "nix-community",
"repo": "fenix", "repo": "fenix",
"rev": "3e59a48c3171664ea0797f28273f9929a2335617", "rev": "16ba830351ba5e7c018919e8c70ef31350755f42",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -175,7 +175,7 @@
"locked": { "locked": {
"lastModified": 1657923513, "lastModified": 1657923513,
"narHash": "sha256-YzHPow09B9uSdybUxP5lQn2hXk90Q6oTDL6UXzD0/+k=", "narHash": "sha256-YzHPow09B9uSdybUxP5lQn2hXk90Q6oTDL6UXzD0/+k=",
"ref": "master", "ref": "refs/heads/master",
"rev": "f7cf04a7ad47e388121f0771651fec0df91407f3", "rev": "f7cf04a7ad47e388121f0771651fec0df91407f3",
"revCount": 61, "revCount": 61,
"type": "git", "type": "git",
@ -349,11 +349,11 @@
}, },
"nixos": { "nixos": {
"locked": { "locked": {
"lastModified": 1668459637, "lastModified": 1668766498,
"narHash": "sha256-HqnWCKujmtu8v0CjzOT0sr7m2AR7+vpbZJOp1R0rodY=", "narHash": "sha256-UjZlIrbHGlL3H3HZNPTxPSwJfr49jIfbPWCYxk0EQm4=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "16f4e04658c2ab10114545af2f39db17d51bd1bd", "rev": "f42a45c015f28ac3beeb0df360e50cdbf495d44b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -396,11 +396,11 @@
}, },
"nixos-unstable": { "nixos-unstable": {
"locked": { "locked": {
"lastModified": 1668417584, "lastModified": 1668765800,
"narHash": "sha256-yeuEyxKPwsm5fIHN49L/syn9g5coxnPp3GsVquhrv5A=", "narHash": "sha256-rC40+/W6Hio7b/RsY8SvQPKNx4WqNcTgfYv8cUMAvJk=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "013fcdd106823416918004bb684c3c186d3c460f", "rev": "52b2ac8ae18bbad4374ff0dd5aeee0fdf1aea739",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -511,11 +511,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1668458369, "lastModified": 1668803963,
"narHash": "sha256-Mv4F2AgOIpGyvfoHQtw/sDg3hU7O0K1P9ercnfrwnEQ=", "narHash": "sha256-GmxUN70JXUkAabbJ+qG3A/eHwYf6576twU6nVct291M=",
"owner": "astro", "owner": "astro",
"repo": "nix-openwrt-imagebuilder", "repo": "nix-openwrt-imagebuilder",
"rev": "818db40dd8a0a22b029823ba477c5c3301bd7534", "rev": "bd49940936c490c99c7a7f7b23b74edbd5f2f0d8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -562,11 +562,11 @@
"rust-analyzer-src": { "rust-analyzer-src": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1668182250, "lastModified": 1668800018,
"narHash": "sha256-PYGaOCiFvnJdVz+ZCaKF8geGdffXjJUNcMwaBHv0FT4=", "narHash": "sha256-v2fKKwMFOhc0iTAbrzybwOwmgaO76eYuBOiFkPcd0rU=",
"owner": "rust-lang", "owner": "rust-lang",
"repo": "rust-analyzer", "repo": "rust-analyzer",
"rev": "45ec315e01dc8dd1146dfeb65f0ef6e5c2efed78", "rev": "791cb87cdf47ddfd2a2b1a726dab3aa66ec2bff3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -586,11 +586,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1668479979, "lastModified": 1668825399,
"narHash": "sha256-UI+JUCBaMpn+5Y1hSePmndbYX5zu0+bavlfzrhPrGEk=", "narHash": "sha256-F2ro05D6tGMwSaOYeIediJq6X0ATD7JgWEG2TgOs9Wo=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "2342f70f7257046effc031333c4cfdea66c91d82", "rev": "a705fe51ef5cdf932ff1cb342f0fe9e5d66f1b71",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -604,7 +604,7 @@
"locked": { "locked": {
"lastModified": 1665446321, "lastModified": 1665446321,
"narHash": "sha256-GuZr+BCAIe+UYmQrLHaVr8iRRajn5nSdWyqhjWDIX1Y=", "narHash": "sha256-GuZr+BCAIe+UYmQrLHaVr8iRRajn5nSdWyqhjWDIX1Y=",
"ref": "master", "ref": "refs/heads/master",
"rev": "3700761dd06f271ef26261ed2a90dce8c22b6dca", "rev": "3700761dd06f271ef26261ed2a90dce8c22b6dca",
"revCount": 61, "revCount": 61,
"type": "git", "type": "git",
@ -624,7 +624,7 @@
"locked": { "locked": {
"lastModified": 1659890996, "lastModified": 1659890996,
"narHash": "sha256-xURgGoznCPmpX35dn5AXcyNYicVn5ruvUKxfIMMiu8o=", "narHash": "sha256-xURgGoznCPmpX35dn5AXcyNYicVn5ruvUKxfIMMiu8o=",
"ref": "master", "ref": "refs/heads/master",
"rev": "5ca106f648bef15d9954d956bda336eea28e8d75", "rev": "5ca106f648bef15d9954d956bda336eea28e8d75",
"revCount": 149, "revCount": 149,
"type": "git", "type": "git",
@ -743,7 +743,7 @@
"locked": { "locked": {
"lastModified": 1666559258, "lastModified": 1666559258,
"narHash": "sha256-m4f5QQbE+usnEnM6CJ+nCgXcsi9mm0cCwFm2BhJ0pvQ=", "narHash": "sha256-m4f5QQbE+usnEnM6CJ+nCgXcsi9mm0cCwFm2BhJ0pvQ=",
"ref": "master", "ref": "refs/heads/master",
"rev": "22ecb2b375bebffdfb1af3435a4c4486e6dd923b", "rev": "22ecb2b375bebffdfb1af3435a4c4486e6dd923b",
"revCount": 108, "revCount": 108,
"type": "git", "type": "git",
@ -785,7 +785,7 @@
"locked": { "locked": {
"lastModified": 1663279525, "lastModified": 1663279525,
"narHash": "sha256-lUq4CY//ISplh/4i33nOU7cchpxKrw5V8mVdRnHMBaA=", "narHash": "sha256-lUq4CY//ISplh/4i33nOU7cchpxKrw5V8mVdRnHMBaA=",
"ref": "master", "ref": "refs/heads/master",
"rev": "6d8d2cb1268d26add05baa3f21c325cfe051add3", "rev": "6d8d2cb1268d26add05baa3f21c325cfe051add3",
"revCount": 342, "revCount": 342,
"type": "git", "type": "git",
@ -830,11 +830,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1668554331, "lastModified": 1668626855,
"narHash": "sha256-QExvepHzH2QtHjeu1ZG2gIWh3bOxwsNsO2SBVmGIlRo=", "narHash": "sha256-plm+TYOcTpiTBax50vGN+qJmbm0cztMj+UNaBkKVpws=",
"ref": "master", "ref": "refs/heads/master",
"rev": "9cb7dbc38595e7c213d193f2adf3cbeffcded74b", "rev": "fe9e0fea91dc31396cbdb349b010ebd9d04cd607",
"revCount": 1669, "revCount": 1670,
"type": "git", "type": "git",
"url": "https://gitea.c3d2.de/zentralwerk/network.git" "url": "https://gitea.c3d2.de/zentralwerk/network.git"
}, },

2
flake.nix
View File

@ -948,7 +948,7 @@
gnunet = nixosSystem' { gnunet = nixosSystem' {
modules = [ modules = [
self.nixosModules.microvm self.nixosModules.cluster-options
./hosts/gnunet ./hosts/gnunet
]; ];
nixpkgs = nixos-unstable; nixpkgs = nixos-unstable;

8
hosts/gnunet/default.nix
View File

@ -2,11 +2,11 @@
system.stateVersion = "22.05"; system.stateVersion = "22.05";
c3d2.hq.statistics.enable = true; c3d2.hq.statistics.enable = true;
c3d2.deployment = { deployment = {
server = "server10"; # needs to keep just its ssh key for sops-nix
mounts = [ "etc" "var" ]; persistedShares = [ "/etc" "/var" ];
mem = 1024;
}; };
microvm.mem = 1024;
networking = { networking = {
hostName = "gnunet"; hostName = "gnunet";

18
hosts/radiobert/default.nix
View File

@ -26,14 +26,13 @@
boot = { boot = {
loader = { loader = {
# generates entry for u-boot
generic-extlinux-compatible.enable = true;
grub.enable = false; grub.enable = false;
raspberryPi = { raspberryPi = {
enable = true; # don't use rpi bootloader shit
enable = false;
version = 4; version = 4;
# TODO: this machine actually has u-boot setup but that's no
# longer working with nixos-22.05. DO NOT REBOOT! :-)
# https://github.com/NixOS/nixpkgs/pull/112677
# uboot.enable = true;
firmwareConfig = '' firmwareConfig = ''
gpu_mem=192 gpu_mem=192
dtparam=audio=on dtparam=audio=on
@ -131,5 +130,14 @@
''; '';
}; };
systemd.extraConfig = ''
# Keep cores 2-3 exclusive for SDR processing
CPUAffinity=0-1
'';
systemd.services = {
soapysdr-server.serviceConfig.CPUAffinity = "2-2";
readsdb.serviceConfig.CPUAffinity = "3-3";
};
system.stateVersion = "21.05"; # Did you read the comment? system.stateVersion = "21.05"; # Did you read the comment?
} }

4
modules/cluster/deployment.nix
View File

@ -50,11 +50,11 @@ in
tag = builtins.replaceStrings [ "/" ] [ "-" ] ( tag = builtins.replaceStrings [ "/" ] [ "-" ] (
withoutLeadingSlash mountPoint withoutLeadingSlash mountPoint
); );
source = "/storage/glusterfs/microvms/${user}/${repo}/${vmName}/${withoutLeadingSlash mountPoint}"; source = "/glusterfs/fast/microvms/${user}/${repo}/${vmName}/${withoutLeadingSlash mountPoint}";
inherit mountPoint; inherit mountPoint;
}) config.deployment.persistedShares; }) config.deployment.persistedShares;
# volumes = [ { # volumes = [ {
# image = "/storage/glusterfs/microvms/${user}/${repo}/${vmName}/overlay.img"; # image = "/glusterfs/fast/microvms/${user}/${repo}/${vmName}/overlay.img";
# mountPoint = "/"; # mountPoint = "/";
# size = 8 * 1024; # size = 8 * 1024;
# } ]; # } ];