Merge branch 'main' into wiki

flake.lock

@@ -50,11 +50,11 @@
         "nixpkgs-lib": "nixpkgs-lib"
       },
       "locked": {
-        "lastModified": 1775087534,
-        "narHash": "sha256-91qqW8lhL7TLwgQWijoGBbiD4t7/q75KTi8NxjVmSmA=",
+        "lastModified": 1778716662,
+        "narHash": "sha256-m1Yf0wZ8j1OHjTc2UwHwyQRSnNeSgLJOd7q5Y45hzi4=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "3107b77cd68437b9a76194f0f7f9c55f2329ca5b",
+        "rev": "f7c1a2d347e4c52d5fb8d10cb4d94b5884e546fb",
         "type": "github"
       },
       "original": {
@@ -86,27 +86,27 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1776434932,
-        "narHash": "sha256-gyqXNMgk3sh+ogY5svd2eNLJ6oEwzbAeaoBrrxD0lKk=",
+        "lastModified": 1780902259,
+        "narHash": "sha256-q8yYEC5f1mFlQO9RGna4LTc9QrcvWunX6FYp83munkQ=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "c7f47036d3df2add644c46d712d14262b7d86c0c",
+        "rev": "bd0ff2d3eac24699c3664d5966b9ef36f388e2ca",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixos-25.11",
+        "ref": "nixos-26.05",
         "repo": "nixpkgs",
         "type": "github"
       }
     },
     "nixpkgs-lib": {
       "locked": {
-        "lastModified": 1774748309,
-        "narHash": "sha256-+U7gF3qxzwD5TZuANzZPeJTZRHS29OFQgkQ2kiTJBIQ=",
+        "lastModified": 1777168982,
+        "narHash": "sha256-GOkGPcboWE9BmGCRMLX3worL4EMnsnG8MyKmXNeYuhQ=",
         "owner": "nix-community",
         "repo": "nixpkgs.lib",
-        "rev": "333c4e0545a6da976206c74db8773a1645b5870a",
+        "rev": "f5901329dade4a6ea039af1433fb087bd9c1fe14",
         "type": "github"
       },
       "original": {
@@ -145,11 +145,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1775636079,
-        "narHash": "sha256-pc20NRoMdiar8oPQceQT47UUZMBTiMdUuWrYu2obUP0=",
+        "lastModified": 1780220602,
+        "narHash": "sha256-eynAfOmbmxJnkp7YewvCEbShNnnYJ9gLLqkzsYtBPeM=",
         "owner": "numtide",
         "repo": "treefmt-nix",
-        "rev": "790751ff7fd3801feeaf96d7dc416a8d581265ba",
+        "rev": "db947814a175b7ca6ded66e21383d938df01c227",
         "type": "github"
       },
       "original": {

flake.nix

@@ -2,7 +2,7 @@
   description = "Configuration NixOS du Crans";
 
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-26.05";
     flake-parts.url = "github:hercules-ci/flake-parts";
 
     # Formatter

hosts/iso/default.nix

@@ -20,6 +20,7 @@
     kernelParams = [ "console=ttyS0,115200" ];
     kernelPackages = pkgs.linuxPackages_latest;
     supportedFilesystems = lib.mkForce [ "btrfs" "vfat" "zfs"];
+    zfs.forceImportRoot = lib.mkDefault false;
   };
 
   services.openssh = {

hosts/physiques/thot/default.nix

@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ lib, pkgs, ... }:
 
 {
   imports = [
@@ -27,7 +27,9 @@
         "head"
         "backups"
       ];
-      forceImportAll = true;
+      forceImportAll = lib.mkForce true;
+      # Ajouté suite au passage en 26.05 par souci de cohérence
+      forceImportRoot = lib.mkForce true;
     };
   };
 

hosts/vm/neo/synapse-admin.nix

@@ -1,7 +1,7 @@
 { pkgs, ... }:
 
 let
-  synapse-admin_over = pkgs.synapse-admin-etkecc.overrideAttrs (_: {
+  synapse-admin_over = pkgs.ketesa.overrideAttrs (_: {
     yarnBuildFlags = "--base=/admin";
   });
   synapse-admin = synapse-admin_over.withConfig {

hosts/vm/reverseproxy/reverseproxy.nix

@@ -61,6 +61,19 @@ let
     ];
   };
 
+  anubisAllowOther = formatJSON.generate "anubis_allow.json" {
+    "bots" = [
+      {
+        import = "${antiBot}";
+      }
+      {
+        name = "allow-other";
+        path_regex = "^*";
+        action = "ALLOW";
+      }
+    ];
+  };
+
   anubisPerso = formatJSON.generate "anubis_perso.json" {
     "bots" = [
       {
@@ -171,7 +184,7 @@ in
           ];
         };
         "wiki" = {
-          ## anubisConfig = "${anubisChallenge}";
+          anubisConfig = "${anubisChallenge}";
           target = "172.16.10.161";
           serverAliases = [
             "wikipedia"

modules/crans/default.nix

@@ -18,6 +18,7 @@ in
     ./nullmailer.nix
     ./packages.nix
     ./ssh.nix
+    ./store.nix
     ./users.nix
     ./virtualisation.nix
   ];

modules/crans/store.nix

@@ -0,0 +1,10 @@
+{...}:
+{
+  nix.gc = {
+    automatic = true;
+    dates = "04:15";
+    # avoid to run nix gc on all machine at the same time
+    randomizedDelaySec = "1h";
+    options = "--delete-older-than 14d";
+  };
+}

modules/default.nix

@@ -1,4 +1,4 @@
-{ ... }:
+{ lib, ... }:
 
 {
   imports = [
@@ -24,4 +24,8 @@
     useTmpfs = true;
     cleanOnBoot = true;
   };
+
+  # Recommandé depuis le passage à 26.05
+  boot.zfs.forceImportAll = lib.mkDefault false;
+  boot.zfs.forceImportRoot = lib.mkDefault false;
 }