Compare commits

...
Author SHA1 Message Date
ahtlonandahtlon 82e247747e [pretalx] fix eval by pulling service file from unstable
Check flake syntax / flake-check (push) Successful in 9m42s
Hydra callback / on_pr (pull_request) Successful in 2m59s
Hydra callback / on_push (pull_request) Skipped
2026-09-04 20:08:02 +02:00
ahtlonandahtlon a7cac53590 Update again 2026-09-04 20:08:02 +02:00
malobotandahtlon 918dea0d14 Update flake.lock 2026-09-04 20:08:02 +02:00
ahtlon 74a8c7de2d [autoupdate] fix autoupdate not running
Check flake syntax / flake-check (push) Successful in 9m53s
Hydra callback / on_pr (push) Skipped
Hydra callback / on_push (push) Skipped
my bad, i read that `RemainAfterExit` would allow a manual nixos switch to work but it prevents the timer from starting the service at all
2026-09-04 18:47:00 +02:00
ahtlon 426394ff22 [fanny] fix hydra proxy
Check flake syntax / flake-check (push) Successful in 19m36s
Hydra callback / on_pr (push) Skipped
Hydra callback / on_push (push) Skipped
2026-09-04 18:12:55 +02:00
ahtlon f2deba5153 [albert] change url, add binfmt
Check flake syntax / flake-check (push) Successful in 21m8s
Hydra callback / on_pr (push) Skipped
Hydra callback / on_push (push) Skipped
2026-09-04 17:21:22 +02:00
ahtlon ec26c33fc5 [actions] ...and forgot the domain
Check flake syntax / flake-check (push) Successful in 10m26s
2026-09-01 21:01:48 +02:00
ahtlon 20c0426853 [actions] forgor jobset name change...
Check flake syntax / flake-check (push) Successful in 13m34s
2026-09-01 19:52:36 +02:00
ahtlon 06db50b624 [actions] change to hydra.malobeo.org
Check flake syntax / flake-check (push) Successful in 11m30s
2026-08-31 21:26:49 +02:00
ahtlon e6b25a2b45 [autoupdate] fix jobset name
Check flake syntax / flake-check (push) Successful in 18m30s
Hydra callback / on_pr (push) Skipped
Hydra callback / on_push (push) Skipped
2026-08-31 21:01:33 +02:00
ahtlon 227e71feab Merge pull request 'Use static ip on physical hosts' (#174) from fix173 into master
Check flake syntax / flake-check (push) Successful in 10m59s
Hydra callback / on_pr (push) Skipped
Hydra callback / on_push (push) Skipped
Reviewed-on: #174
2026-08-31 20:42:50 +02:00
kalipso 1339e7be60 [machines] stop using networkmanager, we use static ips
Check flake syntax / flake-check (push) Successful in 10m38s
Hydra callback / on_push (pull_request) Skipped
Hydra callback / on_pr (pull_request) Failing after 3h10m5s
2026-08-31 16:58:10 +02:00
kalipso 0a03babba8 [host_builder] fix: static network cfg was only used in microvms 2026-08-31 16:57:03 +02:00
kalipso 9cb1b107c3 [fanny] fix typo
Check flake syntax / flake-check (push) Successful in 9m15s
Hydra callback / on_pr (push) Skipped
Hydra callback / on_push (push) Skipped
2026-08-31 16:14:19 +02:00
ahtlon 229e4814f9 [host_builder] add cache.malobeo.org key
Check flake syntax / flake-check (push) Failing after 3m32s
Hydra callback / on_pr (push) Skipped
Hydra callback / on_push (push) Skipped
2026-08-31 15:41:28 +02:00
ahtlon d659525950 [fanny] fix nginx proxy to albert
Check flake syntax / flake-check (push) Failing after 4m36s
Hydra callback / on_pr (push) Skipped
Hydra callback / on_push (push) Skipped
2026-08-31 15:31:44 +02:00
kalipso 60c12ce7af [albert] set nameserver
Check flake syntax / flake-check (push) Successful in 8m21s
Hydra callback / on_pr (push) Skipped
Hydra callback / on_push (push) Skipped
2026-08-31 12:53:42 +02:00
kalipso 48f2bee3ab Revert "[albert] add nameserver"
This reverts commit 6fc3709519.
2026-08-31 12:53:00 +02:00
kalipso 2ce53e6b0b [antamap] update
Check flake syntax / flake-check (push) Failing after 6m38s
Hydra callback / on_pr (push) Skipped
Hydra callback / on_push (push) Skipped
2026-08-31 12:50:32 +02:00
kalipso 6fc3709519 [albert] add nameserver
Check flake syntax / flake-check (push) Failing after 31m23s
Hydra callback / on_pr (push) Skipped
Hydra callback / on_push (push) Skipped
2026-08-31 12:30:51 +02:00
kalipso 933fcd4d9b [overwatch] add albert
Check flake syntax / flake-check (push) Successful in 30m24s
Hydra callback / on_pr (push) Skipped
Hydra callback / on_push (push) Skipped
2026-08-31 12:11:57 +02:00
ahtlon 103c7730be [albert] move proxy to fanny
Check flake syntax / flake-check (push) Successful in 12m1s
Hydra callback / on_pr (push) Skipped
Hydra callback / on_push (push) Skipped
also add the cache location
2026-08-29 21:14:58 +02:00
ahtlon 59ce9e1c94 Merge branch 'albert_build_host'
Check flake syntax / flake-check (push) Successful in 10m48s
Hydra callback / on_pr (push) Skipped
Hydra callback / on_push (push) Skipped
2026-08-29 21:04:25 +02:00
kalipso 39ca54c94f [antamap] enable admin user, disable malobeo user
Check flake syntax / flake-check (push) Successful in 6m51s
Hydra callback / on_pr (push) Skipped
Hydra callback / on_push (push) Skipped
2026-08-28 17:53:16 +02:00
kalipso 06e51b183c [antamap] fix wrong timezone 2026-08-28 17:51:04 +02:00
kalipso 03a3f7ca19 [antamap] update
Check flake syntax / flake-check (push) Successful in 6m53s
Hydra callback / on_pr (push) Skipped
Hydra callback / on_push (push) Skipped
2026-08-28 17:09:22 +02:00
kalipso 37f0ac278d [fanny] enableACME and forceSSL on antamap
Check flake syntax / flake-check (push) Successful in 8m8s
Hydra callback / on_pr (push) Skipped
Hydra callback / on_push (push) Skipped
2026-08-28 16:36:04 +02:00
kalipso d84de6d550 Merge pull request 'add antamap, interactive map for anarchist days' (#171) from antamap into master
Check flake syntax / flake-check (push) Successful in 6m56s
Hydra callback / on_pr (push) Skipped
Hydra callback / on_push (push) Skipped
Reviewed-on: #171
2026-08-28 16:04:02 +02:00
kalipso b7248d77c1 [fanny] add antamap dyndns
Hydra callback / on_pr (pull_request) Canceled after 0s
Hydra callback / on_push (pull_request) Canceled after 0s
Check flake syntax / flake-check (push) Successful in 17m55s
2026-08-28 14:19:42 +02:00
kalipso cdcc6f364d [antamap] init
Check flake syntax / flake-check (push) Canceled after 24m34s
Hydra callback / on_pr (pull_request) Canceled after 0s
Hydra callback / on_push (pull_request) Canceled after 0s
2026-08-28 14:07:26 +02:00
15 changed files with 188 additions and 68 deletions
+2 -2
View File
@@ -40,7 +40,7 @@ jobs:
timeout-minutes: 200
run: |
echo "Running now @ pr no $PR"
nix run nixpkgs#hydra-cli -- -H https://hydra.dynamicdiscord.de jobset-wait malobeo2 "$PR"
nix run nixpkgs#hydra-cli -- -H https://hydra.malobeo.org jobset-wait malobeo "$PR"
on_push:
if: github.event.push
@@ -60,4 +60,4 @@ jobs:
timeout-minutes: 200
run: |
echo "Running now @ master"
nix run nixpkgs#hydra-cli -- -H https://hydra.dynamicdiscord.de jobset-wait malobeo2 master
nix run nixpkgs#hydra-cli -- -H https://hydra.malobeo.org jobset-wait malobeo master
Generated
+25 -25
View File
@@ -29,11 +29,11 @@
]
},
"locked": {
"lastModified": 1768143854,
"narHash": "sha256-E5/kyPz4zAZn/lZdvqlF83jMgCWNxmqYjjWuadngCbk=",
"lastModified": 1788076475,
"narHash": "sha256-sD4UyILWAhk7aexE3YpDOdb71ZEeL+1/+LV05XIWCBo=",
"owner": "kirelagin",
"repo": "dns.nix",
"rev": "a97cf4156e9f044fe4bed5be531061000dfabb07",
"rev": "4710a34f2c36e7a0d634d7ba8fe2499d75f012a2",
"type": "github"
},
"original": {
@@ -85,11 +85,11 @@
]
},
"locked": {
"lastModified": 1781319724,
"narHash": "sha256-ZGuxexEMo4Xv28KJ0dX/m/PHN4oZIOnxHZpNTyrvx4M=",
"lastModified": 1787377438,
"narHash": "sha256-Sxu1NLTD/Ern6hFGLlZmtKCSct3YQXZI/lls8RE1XeM=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "8355f0a16b2dbb06a97959a918af5b239bbe05ae",
"rev": "65258d5c65a250189fde2e35f490d15e064c4c62",
"type": "github"
},
"original": {
@@ -126,11 +126,11 @@
"spectrum": "spectrum"
},
"locked": {
"lastModified": 1781389237,
"narHash": "sha256-Ne1/E5XNUq0gleaQz0vW5R4xf/0h/uEZ+bOW1aNjeQk=",
"lastModified": 1788263502,
"narHash": "sha256-gyVqW5U9wy6A8voJNu6SiSYTKDplo/MDl31x7FszWlk=",
"owner": "astro",
"repo": "microvm.nix",
"rev": "6ad601df0a07d9855c5e8f9b81135ecaf7c287eb",
"rev": "974d315e504e666eac4920d712e3ff6804dc1502",
"type": "github"
},
"original": {
@@ -180,11 +180,11 @@
"nixpkgs": "nixpkgs_2"
},
"locked": {
"lastModified": 1781622756,
"narHash": "sha256-JrPh4M6S7aPsEE9tOENuZrxC6o2szSLlK+t4+nLke9s=",
"lastModified": 1788335262,
"narHash": "sha256-3jBEq8avfzlrsY4UpW4d5TOmm7ocseZfnitEJhqauyc=",
"owner": "NixOS",
"repo": "nixos-hardware",
"rev": "08018c72174a4df5657f8d94178ac69fb9c243e5",
"rev": "44d95795ee2d475b3d687325e26dcf4ca9104557",
"type": "github"
},
"original": {
@@ -212,11 +212,11 @@
},
"nixpkgs-unstable": {
"locked": {
"lastModified": 1781577229,
"narHash": "sha256-lrp67w8AulE9Ks53n27I45ADSzbOCn4H+CNW1Ck8B+8=",
"lastModified": 1788179007,
"narHash": "sha256-hn1oU2rue2SYK8dAr8+WNZWtbsz1S2W5mnHlSEuh3bo=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "567a49d1913ce81ac6e9582e3553dd90a955875f",
"rev": "34ab99075ac4f7e40cf037eef32cb1c360bb85e9",
"type": "github"
},
"original": {
@@ -241,11 +241,11 @@
},
"nixpkgs_3": {
"locked": {
"lastModified": 1781216227,
"narHash": "sha256-9mUW6gNwoN2SWc/l0fW4svPNOulXLl8ijqKyeSOGgJE=",
"lastModified": 1788187754,
"narHash": "sha256-bu1QxmXKmPuvBLN7bHP355OV9Qo13x9WCiRDH62CqRM=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "a0374025a863d007d98e3297f6aa46cc3141c2f0",
"rev": "5dfba6236110080a54247d6460bc2ff5dda939cc",
"type": "github"
},
"original": {
@@ -280,11 +280,11 @@
]
},
"locked": {
"lastModified": 1780547341,
"narHash": "sha256-Gq8KNx5A7hBB3uGJaj6eQfLDIz5YdLu92gqBcvHvoUo=",
"lastModified": 1788337237,
"narHash": "sha256-gkSH8VUtCo6hnysNmb9DbTuDepH2t5pv+QWjP75xKAk=",
"owner": "Mic92",
"repo": "sops-nix",
"rev": "9ed65852b6257fbeae4355bc24ecfea307ca759a",
"rev": "fbf759290e0cb0a98dfc813a4eb7d53ad1dacb57",
"type": "github"
},
"original": {
@@ -296,11 +296,11 @@
"spectrum": {
"flake": false,
"locked": {
"lastModified": 1778940603,
"narHash": "sha256-voSM8dZNlaOWN3kbYFky+FNY6fFQOEw0xF+ZMpZKkCQ=",
"lastModified": 1785761586,
"narHash": "sha256-MWOMVqJJERwjQGgRIv8d6rlEBqbLM3VZWxHkNKIIZNw=",
"ref": "refs/heads/main",
"rev": "367dd227f539267eae2b62770b4c17b88ac8c1f1",
"revCount": 1265,
"rev": "a7762d6f54b40560dd5255ce902e6e6a5d980fe9",
"revCount": 1416,
"type": "git",
"url": "https://spectrum-os.org/git/spectrum"
},
+7 -4
View File
@@ -6,6 +6,10 @@ let
in
{
networking.hostName = "albert";
networking.nameservers = [
"192.168.1.1"
"1.1.1.1"
];
sops.defaultSopsFile = ./secrets.yaml;
sops.secrets.wg_private = {};
@@ -45,7 +49,7 @@ in
enable = true;
url = "https://hydra.malobeo.org";
project = "malobeo";
jobset = "infrastructure";
jobset = "master";
cacheurl = "https://cache.malobeo.org";
};
@@ -77,14 +81,13 @@ in
networking = {
firewall = {
allowedTCPPorts = [ 80 443 3000 ];
allowedTCPPorts = [ 80 443 3000 5000];
};
};
nixpkgs.config.allowUnfree = true;
boot.binfmt.emulatedSystems = [ "aarch64-linux" "i686-linux" ];
services.acpid.enable = true;
networking.networkmanager.enable = true;
time.timeZone = "Europe/Berlin";
system.stateVersion = "26.05"; # Do.. Not.. Change..
}
+3 -7
View File
@@ -24,7 +24,7 @@
services.hydra = {
enable = true;
hydraURL = "localhost:3000";
hydraURL = "https://hydra.malobeo.org";
useSubstitutes = true;
notificationSender = "hydra@localhost";
@@ -33,6 +33,8 @@
binary_cache_secret_key_file = /etc/nix/albert/secret
binary_cache_dir = /var/lib/hydra/cache
Include ${config.sops.secrets.gitea_token.path}
using_frontend_proxy 1
base_uri hydra.malobeo.org
'';
};
@@ -95,11 +97,5 @@
"git+ssh://git.dynamicdiscord.de/"
"https://git.dynamicdiscord.de"
];
services.nginx.virtualHosts."hydra.malobeo.org" = {
forceSSL = true;
enableACME = true;
locations."/".proxyPass = "http://localhost:3000";
};
}
+59
View File
@@ -0,0 +1,59 @@
{ self, config, lib, pkgs, inputs, ... }:
with lib;
let
antamap-pkg = pkgs.stdenv.mkDerivation {
name = "antamap";
src = pkgs.fetchgit {
url = "https://0xacab.org/AND/antamap.git";
branchName = "master";
rev = "f07f4522e8658ee5dc113ea3feffb67418e5f403";
sha256 = "sha256-ODEey7PwoBAwVxcQm02Q8/a42UxzOcQB2Dqr3FYxqyo=";
};
installPhase = "mkdir -p $out; cp -R * $out/";
};
in
{
networking = {
hostName = mkDefault "antamap";
useDHCP = false;
};
imports = [
self.nixosModules.malobeo.users
../modules/sshd.nix
];
malobeo.users = {
malobeo = false;
admin = true;
};
services.nginx = {
enable = true;
virtualHosts."_" = {
listen = [
{ addr = "0.0.0.0"; port = 80; }
];
root = "${antamap-pkg}";
extraConfig = ''
proxy_buffering off;
proxy_cache off;
proxy_http_version 1.1;
proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto $scheme;
'';
};
};
networking.firewall.allowedTCPPorts = [ 80 ];
time.timeZone = "Europe/Berlin";
system.stateVersion = "22.11"; # Did you read the comment?
}
+1 -2
View File
@@ -19,7 +19,7 @@ in
enable = true;
url = "https://hydra.malobeo.org";
project = "malobeo";
jobset = "infrastructure";
jobset = "master";
cacheurl = "https://cache.malobeo.org";
};
@@ -83,7 +83,6 @@ in
services.acpid.enable = true;
networking.hostName = "bakunin";
networking.networkmanager.enable = true;
security.rtkit.enable = true;
services.pipewire = {
+37 -2
View File
@@ -44,7 +44,7 @@ in
enable = true;
url = "https://hydra.malobeo.org";
project = "malobeo";
jobset = "infrastructure";
jobset = "master";
cacheurl = "https://cache.malobeo.org";
};
@@ -146,6 +146,7 @@ in
"zineshop"
"vaultwarden"
"pretalx"
"antamap"
];
networking = {
@@ -286,6 +287,41 @@ in
'';
};
};
virtualHosts."antamap.malobeo.org" = {
forceSSL = true;
enableACME = true;
locations."/" = {
proxyPass = "http://${hosts.malobeo.hosts.antamap.network.address}:80";
extraConfig = ''
proxy_set_header Host $host;
'';
};
};
virtualHosts."hydra.malobeo.org" = {
forceSSL = true;
enableACME = true;
locations."/" = {
proxyPass = "http://${hosts.malobeo.hosts.albert.network.address}:3000";
recommendedProxySettings = true;
extraConfig = ''
proxy_set_header Host $host;
proxy_set_header X-Forwarded-Port 443;
proxy_set_header X-Forwarded-Proto https;
'';
};
};
virtualHosts."cache.malobeo.org" = {
forceSSL = true;
enableACME = true;
locations."/" = {
proxyPass = "http://${hosts.malobeo.hosts.albert.network.address}:5000";
extraConfig = ''
proxy_set_header Host $host;
'';
};
};
};
services.tor = {
@@ -299,7 +335,6 @@ in
services.acpid.enable = true;
networking.hostName = "fanny";
networking.networkmanager.enable = true;
virtualisation.vmVariant.virtualisation.graphics = false;
+3
View File
@@ -2,12 +2,15 @@
{
sops.secrets.njalacloud = {};
sops.secrets.njalazines = {};
sops.secrets.njalaantamap = {};
systemd.services."dyndns" = {
script = ''
KEYCLOUD=$(cat /run/secrets/njalacloud)
KEYZINES=$(cat /run/secrets/njalazines)
KEYANATAMAP=$(cat /run/secrets/njalaantamap)
${pkgs.curl}/bin/curl --fail --silent --show-error "https://njal.la/update/?h=cloud.malobeo.org&k="$KEYCLOUD"&auto"
${pkgs.curl}/bin/curl --fail --silent --show-error "https://njal.la/update/?h=zines.malobeo.org&k="$KEYZINES"&auto"
${pkgs.curl}/bin/curl --fail --silent --show-error "https://njal.la/update/?h=antamap.malobeo.org&k="$KEYANATAMAP"&auto"
'';
serviceConfig = {
Type = "oneshot";
+8 -7
View File
@@ -3,11 +3,11 @@ shop_cleartext: ENC[AES256_GCM,data:sifpX/R6JCcNKgwN2M4Dbflgnfs5CqB8ez5fULPohuFS
shop_auth: ENC[AES256_GCM,data:0NDIRjmGwlSFls12sCb5OlgyGTCHpPQIjycEJGhYlZsWKhEYXV2u3g1RHMkF8Ny913jarjf0BgwSq5pBD9rgPL9t8X8=,iv:3jgCv/Gg93Mhdm4eYzwF9QrK14QL2bcC4wwSajCA88o=,tag:h8dhMK46hABv9gYW4johkA==,type:str]
njalacloud: ENC[AES256_GCM,data:sp79Ij1vd9pQZuPUR1phmw==,iv:AWKZoOfBA/n16pWQCfA0dZmH1KajCztnLvYItoZZbgA=,tag:BIUrobBoO96pxUz1sjIYIw==,type:str]
njalazines: ENC[AES256_GCM,data:fnObUEnXYvdj9HtkZNzXVA==,iv:0Zj2n2we9w4fj/n7e1ayd9XgFEMAGCHk4QLTu1IlRnQ=,tag:zeOLAB0oE6XbxqdqhdRNxw==,type:str]
njalaantamap: ENC[AES256_GCM,data:nUc+E7HNbW0EDclzNDV6+w==,iv:H8nqeuOrvvu8O8QhGWkBkYWAQXwkBehf/jU6u/grs1A=,tag:mqX6jn47DyeSuk8xzG0e/Q==,type:str]
njala_api_key: ENC[AES256_GCM,data:ohSVzQUvFjia/s9WceqnZCdLyk3N1Lm2BCBmXeBlkWD2dyrohKCnd9GiJ499IORpuYcOXyM=,iv:Uczk8op5mgqe8gefxgU9YuTqOsYvjzHCKvzA7GDsgio=,tag:XA7JRq/LsGkpHcQSO36Whg==,type:str]
sops:
age:
- recipient: age136sz3lzhxf74ryruvq34d4tmmxnezkqkgu6zqa3dm582c22fgejqagrqxk
enc: |
- enc: |
-----BEGIN AGE ENCRYPTED FILE-----
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB2ZFBYMHMzTFRMLzhCbnBE
MXkreklWSUVOckl5OTJ0VzlWS2tIOFBRRVVJCk90OXJoMHQza0hTSGt5VUphNjY1
@@ -15,8 +15,8 @@ sops:
TStjbTBkMTNOcHBja0JRYUdvSWJUN00KtOPBH8xZy/GD9Ua3H6jisoluCR+UzaeE
pAWM9Y6Gn6f7jv2BPKVTaWsyrafsYP7cDabQe2ancAuuKvkng/jrEw==
-----END AGE ENCRYPTED FILE-----
- recipient: age1ljpdczmg5ctqyeezn739hv589fwhssjjnuqf7276fqun6kc62v3qmhkd0c
enc: |
recipient: age136sz3lzhxf74ryruvq34d4tmmxnezkqkgu6zqa3dm582c22fgejqagrqxk
- enc: |
-----BEGIN AGE ENCRYPTED FILE-----
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBhc282T2VVamFGcG1Ub3hp
S1VwKzVsWW1sRXczZnRNdkxDWE5Sd0hhVUJRCkovNGZ1ZlN0c1VyMXV0WThJMGFi
@@ -24,8 +24,9 @@ sops:
QVZyNWVOMTh3ejBha21Qb2xCRkFERGMKH9nMQUoS5bGcLUx2T1dOmKd9jshttTrP
SKFx7MXcjFRLKS2Ij12V8ftjL3Uod6be5zoMibkxK19KmXY/514Jww==
-----END AGE ENCRYPTED FILE-----
lastmodified: "2026-02-20T19:25:05Z"
mac: ENC[AES256_GCM,data:g+bFYqJN1X8F52tpIO60S2WKxLG27ZrP399fsfE6o7rPtIMimZou/4oUo7i+kpNtygEuCr3+suP8TPas4x5zMXhRjnjJuwJwL/NwdciHZU0O3rPJgucCEWqr9OdAtxezDM9c2vv+jzqZxWT9t0fIpB9RxO5oy1pHZs0RCgjAJR4=,iv:v6RdTMeQUxSdjIVNFbx2HtxCsdVgFTQTzMXS5Fj62is=,tag:pLoZMBRIXYElO5rY+xX9zg==,type:str]
recipient: age1ljpdczmg5ctqyeezn739hv589fwhssjjnuqf7276fqun6kc62v3qmhkd0c
lastmodified: "2026-08-28T12:19:14Z"
mac: ENC[AES256_GCM,data:TnElCRaL/b238clfFVEq+Ot1lwg5MLMchCkmhi5PmADRn2exA42Zeq5v1M/IM5sHt4xEyFLn5R/88Y49DAfehRFwu6rddV+3lnFV40k2rWRtMfQOUXSrCd7lGxZdFbMU0eIXF5jaATFbcP0wO03FohNA69/u6kNsS0y0jK3vuLQ=,iv:xPeNXUIavVYFfAv1fs5TXCHXmvnXQDs4mJZMHOX7qG8=,tag:85hrBTKMh1ckTtXpOxj5lg==,type:str]
pgp:
- created_at: "2025-02-11T18:32:49Z"
enc: |-
@@ -66,4 +67,4 @@ sops:
-----END PGP MESSAGE-----
fp: aef8d6c7e4761fc297cda833df13aebb1011b5d4
unencrypted_suffix: _unencrypted
version: 3.11.0
version: 3.13.1
+16 -1
View File
@@ -29,6 +29,8 @@ in
local = true;
hostId = "11";
address = "192.168.1.101";
gateway = "192.168.1.1";
nameservers = [ "192.168.1.1" "1.1.1.1" ];
};
};
@@ -38,6 +40,8 @@ in
local = true;
hostId = "12";
address = "192.168.1.102";
gateway = "192.168.1.1";
nameservers = [ "192.168.1.1" "1.1.1.1" ];
};
};
@@ -47,6 +51,8 @@ in
local = true;
hostId = "13";
address = "192.168.1.103";
gateway = "192.168.1.1";
nameservers = [ "192.168.1.1" "1.1.1.1" ];
};
};
@@ -56,6 +62,8 @@ in
local = true;
hostId = "15";
address = "192.168.1.105";
gateway = "192.168.1.1";
nameservers = [ "192.168.1.1" "1.1.1.1" ];
};
};
@@ -65,6 +73,8 @@ in
local = true;
hostId = "19";
address = "192.168.1.111";
gateway = "192.168.1.1";
nameservers = [ "192.168.1.1" "1.1.1.1" ];
};
};
@@ -118,7 +128,12 @@ in
network = createMaloNet "18" "52:DA:0D:F9:EF:F4";
};
# last host id: 19
antamap = {
type = "microvm";
network = createMaloNet "20" "52:DA:0D:F9:EF:F6";
};
# last host id: 20
};
};
}
+1 -2
View File
@@ -16,7 +16,7 @@
enable = true;
url = "https://hydra.malobeo.org";
project = "malobeo";
jobset = "infrastructure";
jobset = "master";
cacheurl = "https://cache.malobeo.org";
};
@@ -71,7 +71,6 @@
services.acpid.enable = true;
networking.hostName = "louise";
networking.networkmanager.enable = true;
security.rtkit.enable = true;
services.pipewire = {
+17 -15
View File
@@ -31,8 +31,8 @@ rec {
"https://cache.nixos.org/"
];
trusted-public-keys = [
# TODO: add cache.malobeo.org key after creation
"cache.dynamicdiscord.de:DKueZicqi2NhJJXz9MYgUbiyobMs10fTyHCgAUibRP4="
"cache.malobeo.org:+eSv8F63uj94A0fvmdyPcDDH0qI3CYR91fsbA/eLFGw="
];
trusted-users = [ "root" "@wheel" ];
};
@@ -45,6 +45,20 @@ rec {
];
defaultModules = baseModules;
makeNetwork = network: [{
systemd.network.enable = true;
systemd.network.networks."20-lan" = {
matchConfig.Type = "ether";
networkConfig = {
Address = [ "${network.address}/24" ];
Gateway = "${network.gateway}";
DNS = network.nameservers;
DHCP = "no";
};
};
}];
makeMicroVM = hostName: network: modules: [
{
microvm = {
@@ -89,18 +103,6 @@ rec {
}
];
};
systemd.network.enable = true;
systemd.network.networks."20-lan" = {
matchConfig.Type = "ether";
networkConfig = {
Address = [ "${network.address}/24" ];
Gateway = "${network.gateway}";
DNS = network.nameservers;
DHCP = "no";
};
};
}
] ++ defaultModules ++ modules;
@@ -259,9 +261,9 @@ rec {
specialArgs.inputs = inputsMod;
specialArgs.self = self;
modules = (if (settings.type != "microvm") then
defaultModules ++ [ ../${host}/configuration.nix ]
(makeNetwork settings.network) ++ defaultModules ++ [ ../${host}/configuration.nix ]
else
makeMicroVM "${host}" settings.network [
(makeNetwork settings.network) ++ makeMicroVM "${host}" settings.network [
inputs.microvm.nixosModules.microvm
../${host}/configuration.nix
]);
+6
View File
@@ -163,6 +163,12 @@ in
targets = [ "${hosts.malobeo.hosts.fanny.network.address}:9002" ];
}];
}
{
job_name = "albert";
static_configs = [{
targets = [ "${hosts.malobeo.hosts.albert.network.address}:9002" ];
}];
}
# add vpn - check how to reach it first. most probably 10.100.0.1
];
};
+3
View File
@@ -19,7 +19,9 @@ in
useDHCP = false;
};
disabledModules = [ "services/web-apps/pretalx.nix" ];
imports = [
"${inputs.nixpkgs-unstable}/nixos/modules/services/web-apps/pretalx.nix"
self.nixosModules.malobeo.metrics
self.nixosModules.malobeo.users
../modules/sshd.nix
@@ -78,6 +80,7 @@ in
config.sops.secrets.pretalx_smtp.path
];
settings = {
redis.session = false;
locale = {
language_code = "de";
};
-1
View File
@@ -51,7 +51,6 @@ in
services.acpid.enable = true;
networking.hostName = "testvm";
networking.networkmanager.enable = true;
time.timeZone = "Europe/Berlin";
system.stateVersion = "23.05"; # Do.. Not.. Change..