xengi/infra
Watch
0
1
Fork
You've already forked infra
 0
Code Pull requests Activity Actions 1

update to nixos 26.05

Browse source
This commit is contained in:
XenGi 2026-06-01 15:25:01 +02:00
commit ef3045a739
Signed by: xengi
SSH key fingerprint: SHA256:jxWM2RTHvxxcncXycwwWkP7HCWb4VREN05UGJTbIPZg
8 changed files with 64 additions and 69 deletions
Download patch file Download diff file Expand all files Collapse all files

8
flake.lock generated
View file

@ -68,16 +68,16 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1772598333, "lastModified": 1780203844,
"narHash": "sha256-YaHht/C35INEX3DeJQNWjNaTcPjYmBwwjFJ2jdtr+5U=", "narHash": "sha256-K5sT4jTpGs15ADhviMKNBH38REpPf5Q6mM1+N6cArVE=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "fabb8c9deee281e50b1065002c9828f2cf7b2239", "rev": "b51242d7d43689db2f3be91bd05d5b24fbb469c4",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "nixos-25.11", "ref": "nixos-26.05",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }

4
flake.nix
View file

@ -1,7 +1,7 @@
{ {
description = "CCCB services"; description = "CCCB services";
inputs = { inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-26.05";
#flake-utils.url = "github:numtide/flake-utils"; #flake-utils.url = "github:numtide/flake-utils";
agenix = { agenix = {
url = "github:ryantm/agenix"; url = "github:ryantm/agenix";
@ -40,7 +40,7 @@
]; ];
}; };
nixosConfigurations."matrix" = nixpkgs.lib.nixosSystem { nixosConfigurations."matrix" = nixpkgs.lib.nixosSystem {
#system = "x86_64-linux"; #system = "x86_64-linux";d
#pkgs = import nixpkgs { inherit system; }; #pkgs = import nixpkgs { inherit system; };
inherit system; inherit system;
modules = [ modules = [

12
hosts/common.nix
View file

@ -88,12 +88,12 @@
# Cache DNS lookups to improve performance # Cache DNS lookups to improve performance
resolved = { resolved = {
enable = true; enable = true;
dnssec = "allow-downgrade"; settings.Resolve = {
dnsovertls = "true"; DNSSEC = "allow-downgrade";
extraConfig = '' DNSOverTLS = true;
Cache=true Cache = true;
CacheFromLocalhost=true CacheFromLocalhost = true;
''; };
}; };
}; };

5
hosts/matrix/default.nix
View file

@ -23,8 +23,7 @@
}; };
}; };
services = { environment.etc."ssh/banner" = ''
openssh.banner = ''
__ __ __ __
/\ \__ __ /\ \ /\ \__ __ /\ \
___ ___ __ \ \ ,_\ _ __ /\_\ __ _ ___ ___ ___\ \ \____ ___ ___ __ \ \ ,_\ _ __ /\_\ __ _ ___ ___ ___\ \ \____
@ -33,7 +32,7 @@
\ \_\ \_\ \_\ \__/.\_\\ \__\\ \_\ \ \_\/\_/\_\ \ \____\ \____\ \____\\ \_,__/ \ \_\ \_\ \_\ \__/.\_\\ \__\\ \_\ \ \_\/\_/\_\ \ \____\ \____\ \____\\ \_,__/
\/_/\/_/\/_/\/__/\/_/ \/__/ \/_/ \/_/\//\/_/ \/____/\/____/\/____/ \/___/ \/_/\/_/\/_/\/__/\/_/ \/__/ \/_/ \/_/\//\/_/ \/____/\/____/\/____/ \/___/
''; '';
}; services.openssh.settings.Banner = "/etc/ssh/banner";
system.stateVersion = "25.05"; system.stateVersion = "25.05";
} }

7
hosts/md/default.nix
View file

@ -21,17 +21,16 @@
}; };
}; };
services = { environment.etc."ssh/banner" = ''
openssh.banner = ''
__ __
/\ \ /\ \
___ ___ \_\ \ ___ ___ \_\ \
/' __` __`\ /'_` \ /' __` __`\ /'_` \
/\ \/\ \/\ \/\ \L\ \ /\ \/\ \/\ \/\ \L\ \
\ \_\ \_\ \_\ \___,_\ \ \_\ \_\ \_\ \___,_\
\/_/\/_/\/_/\/__,_ / \/_/\/_/\/_/\/__,__/
''; '';
}; services.openssh.settings.Banner = "/etc/ssh/banner";
system.stateVersion = "25.11"; system.stateVersion = "25.11";
} }

5
hosts/monitoring/default.nix
View file

@ -22,8 +22,7 @@
}; };
}; };
services = { environment.etc."ssh/banner" = ''
openssh.banner = ''
__ __
__/\ \__ __ __/\ \__ __
___ ___ ___ ___ /\_\ \ ,_\ ___ _ __ /\_\ ___ __ ___ ___ ___ ___ /\_\ \ ,_\ ___ _ __ /\_\ ___ __
@ -34,7 +33,7 @@
/\____/ /\____/
\_/__/ \_/__/
''; '';
}; services.openssh.settings.Banner = "/etc/ssh/banner";
system.stateVersion = "25.11"; system.stateVersion = "25.11";
} }

5
hosts/sql/default.nix
View file

@ -17,8 +17,7 @@
''; '';
}; };
services = { environment.etc."ssh/banner" = ''
openssh.banner = ''
___ ___
/\_ \ /\_ \
____ __ \//\ \ ____ __ \//\ \
@ -29,7 +28,7 @@
\ \_\ \ \_\
\/_/ \/_/
''; '';
}; services.openssh.settings.Banner = "/etc/ssh/banner";
system.stateVersion = "25.11"; system.stateVersion = "25.11";
} }

5
hosts/www/default.nix
View file

@ -22,15 +22,14 @@
}; };
}; };
services = { environment.etc."ssh/banner" = ''
openssh.banner = ''
__ __ __ __ __ __ __ __ __ __ __ __ __ __ __ __ __ __
/\ \/\ \/\ \/\ \/\ \/\ \/\ \/\ \/\ \ /\ \/\ \/\ \/\ \/\ \/\ \/\ \/\ \/\ \
\ \ \_/ \_/ \ \ \_/ \_/ \ \ \_/ \_/ \ \ \ \_/ \_/ \ \ \_/ \_/ \ \ \_/ \_/ \
\ \___x___/'\ \___x___/'\ \___x___/' \ \___x___/'\ \___x___/'\ \___x___/'
\/__//__/ \/__//__/ \/__//__/ \/__//__/ \/__//__/ \/__//__/
''; '';
}; services.openssh.settings.Banner = "/etc/ssh/banner";
system.stateVersion = "25.11"; system.stateVersion = "25.11";
} }