Merge branch 'master' of gitlab2.federez.net:federez/nix

This commit is contained in:
jeltz 2025-06-21 12:00:25 +02:00
commit 5c4df54d2c
Signed by: jeltz
GPG key ID: 800882B66C0C3326
4 changed files with 8 additions and 3 deletions

View file

@ -48,8 +48,8 @@
"nixpkgs": { "nixpkgs": {
"type": "Channel", "type": "Channel",
"name": "nixos-unstable-small", "name": "nixos-unstable-small",
"url": "https://releases.nixos.org/nixos/unstable-small/nixos-25.05pre777042.1d3a750cb7d8/nixexprs.tar.xz", "url": "https://releases.nixos.org/nixos/unstable-small/nixos-25.11pre818584.a269ce395284/nixexprs.tar.xz",
"hash": "0g2q7g6chpmaa0b6py8aqgwx71gvxlpirijlk6b0y5z15r0hdabk" "hash": "0gjazqi3z82wkzlkchg7bvf60iippxsa7d204iz0bjgrv1vm8ki8"
} }
}, },
"version": 5 "version": 5

View file

@ -24,6 +24,8 @@ in
services.gitlab = { services.gitlab = {
enable = true; enable = true;
host = "gitlab2.federez.net";
https = true;
databasePasswordFile = secrets.gitlab-db-password.path; databasePasswordFile = secrets.gitlab-db-password.path;
initialRootPasswordFile = secrets.gitlab-initial-root-password.path; initialRootPasswordFile = secrets.gitlab-initial-root-password.path;
secrets = { secrets = {

2
pubkeys/asyncnomi.keys Normal file
View file

@ -0,0 +1,2 @@
ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAEAQC3wkkW58044OeMnwbok+KQJrxNVPLx8Bbh4ukfADkBNFhve0+XDHMdMXRsD8MEheiRW/tlkHOljD2206cYIfW5w/lCJIWnP/EJgOfQ+vSQ5cJMXjP18Wm7HBYsyc4PYdeZLbRS6lFYisWkSwKscO1sy3s5JtftMI5/QXK6al1Xbnr5K2mkeB90w3aiaUCz2pXXe1SiHitTmIeiuEY/4iycEBxkxEupSEivCBHoSO7uBpEhasZcpSxTz/303Ti4+JgWs69xUooyEuIhcwjWH/91a0LV+5yKzOpdDQeJrSv8Cw1EQmmGM0ZJv7wFKKQ3ht9DXZd4lrvPtyWSD+JYOSRSsNCEMy6dPX7uUdcDwkwnrdPaxBOXFOB1InTGQWVnMGBsG0aK7UkwmPuoJXhaordrHFEac9aIcg5P7q1D8S+L6u/DdFq2IGZsymTrSAJsHQJ6q9wnOwGmiLaPw4WBaagzdlTmNz6WODG/9I25vQsC3z+I4Q39NG1u9/d+f465e2Z79D8X3H/pfKkAllgOrMY2eWVqjttZpjCbFo2Ckpat7JRYrvUIQCrzbhWK0uwUlH7+wGDqcPPrtpLYtVfKcWR8G4hFZl7HzN18riNHJ3158Pf4Te4/OzC6kbXa62zFpB9BWXoL8VXfDHaNv/5LB27Ikqd3QsCJfuhUBpFbndiUtlO/WSSx/ryPv3P0tWWlLcZXHTgTAzSjd+Git2FWXnSQd4QY5N48zVZE4jMK92ZBb1sqoDQnsWv5PeBWFiti/fNbJhqUJhraUerNpXgkNgxq6I1CTWG27cq8cA2v8Pf3VTM26NlQU3fR+m5ClbzS2iAeNjnh8dN9jx+q+4f5d/WS4HhsbBE+0l7sOaNp/ahOTPandZcU4wELc1sWkF/8apI1NItFtESU+So5gGs4nCoE8DXGV6kMPHsL4lmOlCVMjqe35AXu6XLQidocAKMr2sZxvaB/57oKPf6w+XjAxN2Aur8J6ocBGiePVK+VOud3NdpJLQ6QNeI4n7NHXBh9NVuS/RTy9r/EtoSXDwibINWNNDSCANLT7WQNorM4LiJRVFFfAcmwaCY1LbYnnr27qrboPTMT+jrOOQn35wZboAC531oD//qt7VP03uQeeXtFlUmZYywAdhStour7YsmwnxdEe8B+FfRmdhFaOlWdoMnUrziNdWHWTuIH0UIiB/DuF8eGLRtAdDBT3cFOHDMekx0LW/a1BYn3dXXuW+p7gTQUtEZXe+NJcgc62dSPFXwVKo8sogjFQzscupkFFXn3FSmfH91iVa8B84AhAZi/bZ5TslccHr3C+333RJ8holOOynOfFxryN5mKPP4ycypF66TNcZ5/b/klpvUt7BitvPZT asyncnomi@rezo
ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIENo/g3BZ1bJViYE6EY4VZO96a4q8U4nWKjTprQJtjEH asyncnomi@rezo

View file

@ -16,8 +16,9 @@ let
bensmrs = readKeyFile ../pubkeys/bensmrs.keys; bensmrs = readKeyFile ../pubkeys/bensmrs.keys;
tomate = readKeyFile ../pubkeys/tomate.keys; tomate = readKeyFile ../pubkeys/tomate.keys;
jeltz = readKeyFile ../pubkeys/jeltz.keys; jeltz = readKeyFile ../pubkeys/jeltz.keys;
asyncnomi = readKeyFile ../pubkeys/asyncnomi.keys;
active-admins = raito ++ bensmrs ++ tomate ++ jeltz; active-admins = raito ++ bensmrs ++ tomate ++ jeltz ++ asyncnomi;
matrix-admins = active-admins; matrix-admins = active-admins;
vaultwarden-admins = active-admins; vaultwarden-admins = active-admins;