luks

use correct docker version

.gitea/workflows/deploy.yaml

@@ -5,14 +5,33 @@ on:
 
 jobs:
   deploy:
+    container:
+      volumes:
+        - /nix/store:/var/nix/hosted-store
     permissions:
       contents: read
       id-token: write
     name: build hive configuration
     runs-on: ubuntu-22.04
     steps:
-      - uses: cachix/install-nix-action@v31
       - uses: actions/checkout@v4
+      - name: setup
+        env:
+          CACHE_PRIVKEY: ${{secrets.CACHE_PRIVKEY}}
+        shell: bash
+        run: |
+          mkdir -p /var/secrets/
+          echo "$CACHE_PRIVKEY" >> /var/secrets/cache_privkey
+          mkdir -p /etc/nix
+          cp ./scripts/upload-to-cache.sh /etc/nix/
+          chmod +x /etc/nix/upload-to-cache.sh
+      - uses: cachix/install-nix-action@v31
+        with:
+          extra_nix_config: |
+            extra-trusted-public-keys = localhost:TiRpr2LzamX/MCKBUmFlZ8inWz94QWGL88fMEHg9Kgc=
+            extra-substituters = "local?store=/var/nix/hosted-store&priority=20"
+            secret-key-files = /var/secrets/cache_privkey
+            post-build-hook = /etc/nix/upload-to-cache.sh
       - name: Install SSH key
         uses: shimataro/ssh-key-action@v2
         with:

flake.lock

@@ -49,11 +49,11 @@
         "nixpkgs": "nixpkgs_3"
       },
       "locked": {
-        "lastModified": 1762095388,
-        "narHash": "sha256-7Q8LtcvKWHbP8znARRTOY2tpU5WoV6FHwp5TZJOI8Us=",
+        "lastModified": 1767637959,
+        "narHash": "sha256-+gBU5Cj9QNpHLQ5PHJoWNQft7TMsBM6X+tDQg+/B2P0=",
         "owner": "9001",
         "repo": "copyparty",
-        "rev": "ac085b8149ff50e03d260128596dd130ed1c7cae",
+        "rev": "038af507772593b904b5c3efc306f89cbdf2b6fb",
         "type": "github"
       },
       "original": {
@@ -91,11 +91,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1762276996,
-        "narHash": "sha256-TtcPgPmp2f0FAnc+DMEw4ardEgv1SGNR3/WFGH0N19M=",
+        "lastModified": 1766150702,
+        "narHash": "sha256-P0kM+5o+DKnB6raXgFEk3azw8Wqg5FL6wyl9jD+G5a4=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "af087d076d3860760b3323f6b583f4d828c1ac17",
+        "rev": "916506443ecd0d0b4a0f4cf9d40a3c22ce39b378",
         "type": "github"
       },
       "original": {
@@ -136,6 +136,22 @@
         "type": "github"
       }
     },
+    "flake-compat_3": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1747046372,
+        "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=",
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885",
+        "type": "github"
+      },
+      "original": {
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "type": "github"
+      }
+    },
     "flake-utils": {
       "locked": {
         "lastModified": 1659877975,
@@ -184,6 +200,24 @@
         "type": "github"
       }
     },
+    "flake-utils_4": {
+      "inputs": {
+        "systems": "systems_3"
+      },
+      "locked": {
+        "lastModified": 1731533236,
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
@@ -233,11 +267,31 @@
         "nixpkgs": "nixpkgs_4"
       },
       "locked": {
-        "lastModified": 1762826586,
-        "narHash": "sha256-KlPcXOxxyv+KNcf7yNFQ4DGVFbOpITqHfvMcAUYrL7E=",
+        "lastModified": 1767147099,
+        "narHash": "sha256-395ehjdAtaqCbKmx+PhKAqnkYLvTtAzq2qzFG9qaGDw=",
         "owner": "Infinidoge",
         "repo": "nix-minecraft",
-        "rev": "1a4fa22ec6e9f2ece24fca273352463b75f6f7c0",
+        "rev": "01f571579edd64433f97c4294137fbc366deef4b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "Infinidoge",
+        "repo": "nix-minecraft",
+        "type": "github"
+      }
+    },
+    "nix-minecraft_2": {
+      "inputs": {
+        "flake-compat": "flake-compat_3",
+        "flake-utils": "flake-utils_4",
+        "nixpkgs": "nixpkgs_6"
+      },
+      "locked": {
+        "lastModified": 1767147099,
+        "narHash": "sha256-395ehjdAtaqCbKmx+PhKAqnkYLvTtAzq2qzFG9qaGDw=",
+        "owner": "Infinidoge",
+        "repo": "nix-minecraft",
+        "rev": "01f571579edd64433f97c4294137fbc366deef4b",
         "type": "github"
       },
       "original": {
@@ -311,11 +365,11 @@
     },
     "nixpkgs_5": {
       "locked": {
-        "lastModified": 1762756533,
-        "narHash": "sha256-HiRDeUOD1VLklHeOmaKDzf+8Hb7vSWPVFcWwaTrpm+U=",
+        "lastModified": 1767313136,
+        "narHash": "sha256-16KkgfdYqjaeRGBaYsNrhPRRENs0qzkQVUooNHtoy2w=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "c2448301fb856e351aab33e64c33a3fc8bcf637d",
+        "rev": "ac62194c3917d5f474c1a844b6fd6da2db95077d",
         "type": "github"
       },
       "original": {
@@ -326,6 +380,36 @@
       }
     },
     "nixpkgs_6": {
+      "locked": {
+        "lastModified": 1748929857,
+        "narHash": "sha256-lcZQ8RhsmhsK8u7LIFsJhsLh/pzR9yZ8yqpTzyGdj+Q=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "c2a03962b8e24e669fb37b7df10e7c79531ff1a4",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_7": {
+      "locked": {
+        "lastModified": 1767364772,
+        "narHash": "sha256-fFUnEYMla8b7UKjijLnMe+oVFOz6HjijGGNS1l7dYaQ=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "16c7794d0a28b5a37904d55bcca36003b9109aaa",
+        "type": "github"
+      },
+      "original": {
+        "id": "nixpkgs",
+        "type": "indirect"
+      }
+    },
+    "nixpkgs_8": {
       "locked": {
         "lastModified": 1737062831,
         "narHash": "sha256-Tbk1MZbtV2s5aG+iM99U8FqwxU/YNArMcWAv6clcsBc=",
@@ -339,7 +423,7 @@
         "url": "https://flakehub.com/f/NixOS/nixpkgs/0.1.%2A.tar.gz"
       }
     },
-    "nixpkgs_7": {
+    "nixpkgs_9": {
       "locked": {
         "lastModified": 1736549401,
         "narHash": "sha256-ibkQrMHxF/7TqAYcQE+tOnIsSEzXmMegzyBWza6uHKM=",
@@ -355,6 +439,26 @@
         "type": "github"
       }
     },
+    "reclamation": {
+      "inputs": {
+        "nix-minecraft": "nix-minecraft_2",
+        "nixpkgs": "nixpkgs_7",
+        "utils": "utils"
+      },
+      "locked": {
+        "lastModified": 1767786101,
+        "narHash": "sha256-ENlpYr2V5u0/Enq07nIHfzetqmS95aydQYIM6sISVUc=",
+        "ref": "refs/heads/master",
+        "rev": "b71acff364b7b5eb3e1b68915aeb379053b86c94",
+        "revCount": 10,
+        "type": "git",
+        "url": "https://git.shobu.fr/sin_serhao/reclamation"
+      },
+      "original": {
+        "type": "git",
+        "url": "https://git.shobu.fr/sin_serhao/reclamation"
+      }
+    },
     "root": {
       "inputs": {
         "agenix": "agenix",
@@ -363,6 +467,7 @@
         "disko": "disko",
         "nix-minecraft": "nix-minecraft",
         "nixpkgs": "nixpkgs_5",
+        "reclamation": "reclamation",
         "shoblog-front": "shoblog-front",
         "testing-grounds": "testing-grounds",
         "unstable": "unstable"
@@ -370,7 +475,7 @@
     },
     "shoblog-front": {
       "inputs": {
-        "nixpkgs": "nixpkgs_6"
+        "nixpkgs": "nixpkgs_8"
       },
       "locked": {
         "lastModified": 1752594581,
@@ -432,9 +537,39 @@
         "type": "github"
       }
     },
+    "systems_3": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
+    "systems_4": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
     "testing-grounds": {
       "inputs": {
-        "nixpkgs": "nixpkgs_7"
+        "nixpkgs": "nixpkgs_9"
       },
       "locked": {
         "lastModified": 1755527993,
@@ -452,11 +587,11 @@
     },
     "unstable": {
       "locked": {
-        "lastModified": 1762596750,
-        "narHash": "sha256-rXXuz51Bq7DHBlfIjN7jO8Bu3du5TV+3DSADBX7/9YQ=",
+        "lastModified": 1767640445,
+        "narHash": "sha256-UWYqmD7JFBEDBHWYcqE6s6c77pWdcU/i+bwD6XxMb8A=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "b6a8526db03f735b89dd5ff348f53f752e7ddc8e",
+        "rev": "9f0c42f8bc7151b8e7e5840fb3bd454ad850d8c5",
         "type": "github"
       },
       "original": {
@@ -465,6 +600,24 @@
         "repo": "nixpkgs",
         "type": "github"
       }
+    },
+    "utils": {
+      "inputs": {
+        "systems": "systems_4"
+      },
+      "locked": {
+        "lastModified": 1731533236,
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
     }
   },
   "root": "root",

flake.nix

@@ -17,6 +17,7 @@
     # sin inputs
     nix-minecraft.url = "github:Infinidoge/nix-minecraft";
     testing-grounds.url = "gitlab:shobu13/testing-grounds";
+    reclamation.url = "git+https://git.shobu.fr/sin_serhao/reclamation";
     shoblog-front.url = "gitlab:shobu13/shoblog";
     # striped-front.url = "git+ssh://git@gitlab.com/striped1/striped-front";
     # striped-back.url = "git+ssh://git@gitlab.com/striped1/striped-back";
@@ -26,24 +27,26 @@
   };
 
   # Flake outputs
-  outputs = inputs@{
-    self,
+  outputs =
+    inputs@{
+      self,
 
-    nixpkgs,
-    unstable,
-    colmena,
+      nixpkgs,
+      unstable,
+      colmena,
 
-    agenix,
+      agenix,
 
-    disko,
+      disko,
 
-    shoblog-front,
-    # striped-front,
-    # striped-back,
-    nix-minecraft,
-    testing-grounds,
-    copyparty,
-    ...
+      shoblog-front,
+      # striped-front,
+      # striped-back,
+      nix-minecraft,
+      testing-grounds,
+      reclamation,
+      copyparty,
+      ...
     }:
     let
       # The systems supported for this flake
@@ -52,16 +55,41 @@
       ];
 
       # Helper to provide system-specific attributes
-      forEachSupportedSystem = f: inputs.nixpkgs.lib.genAttrs supportedSystems (system: f {
-        pkgs = import inputs.nixpkgs { inherit system; };
-      });
+      forEachSupportedSystem =
+        f:
+        inputs.nixpkgs.lib.genAttrs supportedSystems (
+          system:
+          f {
+            pkgs = import inputs.nixpkgs { inherit system; };
+          }
+        );
     in
     {
+      nixosConfigurations = {
+        sin = nixpkgs.lib.nixosSystem {
+           system = "x86_64-linux";
+          
+           modules = [
+              disko.nixosModules.disko
+              agenix.nixosModules.default
+              ./hosts/sin/configuration.nix
+              ./hosts/sin/hardware-configuration.nix
+            ]
+            ++ [
+              # modules
+              ./modules/gitea/sin
+            ];
+            
+            specialArgs = {
+             inherit inputs;
+           };
+        };
+      };
       colmenaHive = colmena.lib.makeHive {
         meta = {
           nixpkgs = import nixpkgs {
             system = "x86_64-linux";
-            overlays = [];
+            overlays = [ ];
           };
 
           specialArgs = {
@@ -69,49 +97,75 @@
           };
         };
 
-        thea = {name, nodes, pkgs, ...}: {
-          imports = [
-            ./hosts/${name}/configuration.nix
-            ./hosts/${name}/hardware-configuration.nix
-          ] ++ [
-            # modules
-            ./modules/gitea/${name}
-          ];
+        thea =
+          {
+            name,
+            nodes,
+            pkgs,
+            ...
+          }:
+          {
+            imports = [
+              agenix.nixosModules.default
+              ./hosts/${name}/configuration.nix
+              ./hosts/${name}/hardware-configuration.nix
+            ]
+            ++ [
+              # modules
+              ./modules/gitea/${name}
+            ];
 
-          deployment.targetHost = "192.168.1.12";
-        };
+            deployment.targetHost = "192.168.1.12";
+          };
 
-        sin = {name, nodes, pkgs, ...}: {
-          imports = [
-            disko.nixosModules.disko
-            agenix.nixosModules.default
-            ./hosts/${name}/configuration.nix
-            ./hosts/${name}/hardware-configuration.nix
-          ] ++ [
-            # modules
-            ./modules/gitea/${name}
-          ];
+        sin =
+          {
+            name,
+            nodes,
+            pkgs,
+            ...
+          }:
+          {
+            imports = [
+              disko.nixosModules.disko
+              agenix.nixosModules.default
+              ./hosts/${name}/configuration.nix
+              ./hosts/${name}/hardware-configuration.nix
+            ]
+            ++ [
+              # modules
+              ./modules/gitea/${name}
+            ];
 
-          deployment.targetHost = "192.168.1.14";
-        };
+            deployment.targetHost = "192.168.1.14";
+            deployment.allowLocalDeployment = true;
+          };
       };
-      devShells = forEachSupportedSystem ({ pkgs }: {
-        default = pkgs.mkShell {
-          # The Nix packages provided in the environment
-          # Add any you need here
-          packages = with pkgs; [ colmena.packages.${pkgs.system}.colmena ];
+      devShells = forEachSupportedSystem (
+        { pkgs }:
+        {
+          default = pkgs.mkShell {
+            # The Nix packages provided in the environment
+            # Add any you need here
+            packages = with pkgs; [
+              colmena.packages.${pkgs.stdenv.system}.colmena
+              agenix.packages.${pkgs.stdenv.system}.agenix
+            ];
 
-          # Set any environment variables for your dev shell
-          env = { };
+            # Set any environment variables for your dev shell
+            env = { };
 
-          # Add any shell logic you want executed any time the environment is activated
-          shellHook = ''
-          '';
-        };
-      });
+            # Add any shell logic you want executed any time the environment is activated
+            shellHook = '''';
+          };
+        }
+      );
 
-      packages = forEachSupportedSystem ({pkgs}: {
-        inherit (colmena.packages."${pkgs.system}") colmena;
-      });
+      packages = forEachSupportedSystem (
+        { pkgs }:
+        {
+          inherit (colmena.packages."${pkgs.system}") colmena;
+        }
+      );
     };
 }

hosts/sin/copyparty.nix

@@ -1,4 +1,9 @@
-{ inputs, pkgs, config, ... }:
+{
+  inputs,
+  pkgs,
+  config,
+  ...
+}:
 {
   imports = [ inputs.copyparty.nixosModules.default ];
   nixpkgs.overlays = [ inputs.copyparty.overlays.default ];

hosts/sin/coredns/default.nix

@@ -1,4 +1,5 @@
-{...}: {
+{ ... }:
+{
   services.coredns = {
     enable = false;
     config = ''

hosts/sin/flake.nix

@@ -14,7 +14,15 @@
   };
 
   # Flake outputs
-    outputs = inputs@{ self, nixpkgs, disko, unstable, agenix, ... }:
+  outputs =
+    inputs@{
+      self,
+      nixpkgs,
+      disko,
+      unstable,
+      agenix,
+      ...
+    }:
     let
       # The systems supported for this flake
       supportedSystems = [
@@ -22,9 +30,14 @@
       ];
 
       # Helper to provide system-specific attributes
-      forEachSupportedSystem = f: nixpkgs.lib.genAttrs supportedSystems (system: f {
-        pkgs = import nixpkgs { inherit system; };
-      });
+      forEachSupportedSystem =
+        f:
+        nixpkgs.lib.genAttrs supportedSystems (
+          system:
+          f {
+            pkgs = import nixpkgs { inherit system; };
+          }
+        );
     in
     {
       nixosConfigurations.zimablade = nixpkgs.lib.nixosSystem {
@@ -40,15 +53,21 @@
         };
       };
 
-      devShells = forEachSupportedSystem ({ pkgs }: {
-        default = pkgs.mkShell {
-          # The Nix packages provided in the environment
-          # Add any you need here
-          packages = with pkgs; [ pkgs.disko nixos-anywhere ];
+      devShells = forEachSupportedSystem (
+        { pkgs }:
+        {
+          default = pkgs.mkShell {
+            # The Nix packages provided in the environment
+            # Add any you need here
+            packages = with pkgs; [
+              pkgs.disko
+              nixos-anywhere
+            ];
 
-          # Add any shell logic you want executed any time the environment is activated
-          shellHook = '''';
-        };
-      });
+            # Add any shell logic you want executed any time the environment is activated
+            shellHook = '''';
+          };
+        }
+      );
     };
 }

hosts/sin/glances.nix

@@ -1,4 +1,5 @@
-{...}: {
+{ ... }:
+{
   services.glances = {
     enable = true;
     openFirewall = true;

hosts/sin/hardware-configuration.nix

@@ -1,14 +1,27 @@
 # Do not modify this file!  It was generated by ‘nixos-generate-config’
 # and may be overwritten by future invocations.  Please make changes
 # to /etc/nixos/configuration.nix instead.
-{ config, lib, pkgs, modulesPath, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  modulesPath,
+  ...
+}:
 
 {
-  imports =
-    [ (modulesPath + "/installer/scan/not-detected.nix")
-    ];
+  imports = [
+    (modulesPath + "/installer/scan/not-detected.nix")
+  ];
 
-  boot.initrd.availableKernelModules = [ "ahci" "xhci_pci" "usb_storage" "usbhid" "sd_mod" "sdhci_pci" ];
+  boot.initrd.availableKernelModules = [
+    "ahci"
+    "xhci_pci"
+    "usb_storage"
+    "usbhid"
+    "sd_mod"
+    "sdhci_pci"
+  ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ "kvm-intel" ];
   boot.extraModulePackages = [ ];

hosts/sin/homepage.nix

@@ -117,6 +117,15 @@
               };
             };
           }
+          {
+            "reclamation" = {
+              description = "bring back your world to life";
+              widget = {
+                type = "minecraft";
+                url = "udp://minecraft.shobu.fr:43001";
+              };
+            };
+          }
         ];
       }
       {

hosts/sin/jellyfin.nix

@@ -1,6 +1,8 @@
-{pkgs, inputs, ...}: let
+{ pkgs, inputs, ... }:
+let
   unstable = import inputs.unstable { system = pkgs.system; };
-in {
+in
+{
   nixpkgs.config.packageOverrides = pkgs: {
     vaapiIntel = pkgs.vaapiIntel.override { enableHybridCodec = true; };
   };
@@ -27,16 +29,41 @@ in {
     extraGroups = [ "jellyfin" ];
   };
 
-  users.users.sonarr.extraGroups = ["jellyfin" "radarr" "transmission" "starr"];
-  users.users.radarr.extraGroups = ["jellyfin" "sonarr" "transmission" "starr"];
-  users.users.bazarr.extraGroups = ["jellyfin" "sonarr" "transmission" "starr" "radarr"];
-  users.users.lidarr.extraGroups = ["jellyfin" "starr" "transmission"];
-  
-  users.users.shobu.extraGroups = [ "jellyfin" "starr" "transmission" "radarr" "sonarr" ];
+  users.users.sonarr.extraGroups = [
+    "jellyfin"
+    "radarr"
+    "transmission"
+    "starr"
+  ];
+  users.users.radarr.extraGroups = [
+    "jellyfin"
+    "sonarr"
+    "transmission"
+    "starr"
+  ];
+  users.users.bazarr.extraGroups = [
+    "jellyfin"
+    "sonarr"
+    "transmission"
+    "starr"
+    "radarr"
+  ];
+  users.users.lidarr.extraGroups = [
+    "jellyfin"
+    "starr"
+    "transmission"
+  ];
 
+  users.users.shobu.extraGroups = [
+    "jellyfin"
+    "starr"
+    "transmission"
+    "radarr"
+    "sonarr"
+  ];
 
   users.groups = {
-    starr = {};
+    starr = { };
   };
 
   services = {

hosts/sin/luks-btrfs-raid.nix

@@ -1,4 +1,5 @@
-{...}: {
+{ ... }:
+{
   disko.devices = {
     disk = {
       # Devices will be mounted and formatted in alphabetical order, and btrfs can only mount raids
@@ -49,39 +50,17 @@
         };
       };
 
-      data1 = {
+      data = {
         type = "disk";
         device = "/dev/sda";
         content = {
           type = "gpt";
           partitions = {
-            crypt_p1 = {
+            crypt_p = {
               size = "100%";
               content = {
                 type = "luks";
-                name = "p_data1"; # device-mapper name when decrypted
-                # Remove settings.keyFile if you want to use interactive password entry
-                settings = {
-                  allowDiscards = true;
-                  keyFile = "/dev/disk/by-uuid/2021-07-11-12-33-27-00";
-                  keyFileSize = 4096;
-                };
-              };
-            };
-          };
-        };
-      };
-      data2 = {
-        type = "disk";
-        device = "/dev/sdb";
-        content = {
-          type = "gpt";
-          partitions = {
-            crypt_p2 = {
-              size = "100%";
-              content = {
-                type = "luks";
-                name = "p_data2";
+                name = "p_data";
                 # Remove settings.keyFile if you want to use interactive password entry
                 settings = {
                   allowDiscards = true;
@@ -90,10 +69,6 @@
                 };
                 content = {
                   type = "btrfs";
-                  extraArgs = [
-                    "-d raid0"
-                    "/dev/mapper/p_data1" # Use decrypted mapped device, same name as defined in disk1
-                  ];
                   subvolumes = {
                     "/" = {
                       mountpoint = "/mnt/fs";

hosts/sin/matrix.nix

@@ -1,4 +1,4 @@
-{pkgs, config, ...}:
+{ pkgs, config, ... }:
 {
   users.users = {
     postgres = {
@@ -26,7 +26,10 @@
     '';
   };
 
-  networking.firewall.allowedTCPPorts = [ 8008 8448 ];
+  networking.firewall.allowedTCPPorts = [
+    8008
+    8448
+  ];
 
   services.matrix-synapse = {
     enable = true;
@@ -39,13 +42,16 @@
       listeners = [
         {
           port = 8008;
-          bind_addresses = ["0.0.0.0"];
+          bind_addresses = [ "0.0.0.0" ];
           type = "http";
           tls = false;
           x_forwarded = true;
           resources = [
             {
-              names = [ "client" "federation" ];
+              names = [
+                "client"
+                "federation"
+              ];
               compress = true;
             }
           ];

hosts/sin/secrets.nix

@@ -1,4 +1,5 @@
-{...}: {
+{ ... }:
+{
   age.secrets = {
     # captcha = {
     #   file = ./secrets/matrix_captcha.age;

hosts/sin/transmission.nix

@@ -1,4 +1,9 @@
-{ config, ... }:
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
 {
 
   users.users."starr" = {
@@ -15,22 +20,22 @@
     transmission.gid = 989;
   };
 
-  systemd.services = {
-    docker-transmission-network = {
-      after = [
-        "network.target"
-        "docker-gluetun.service"
-        "docker-transmission.service"
-      ];
-      wantedBy = [
-        "docker-gluetun.service"
-        "docker-transmission.service"
-      ];
-      serviceConfig = {
-        ExecStart = "docker network create docker-transmission";
-      };
-    };
-  };
+  # systemd.services = {
+  #   docker-transmission-network = {
+  #     after = [
+  #       "network.target"
+  #       "docker-gluetun.service"
+  #       "docker-transmission.service"
+  #     ];
+  #     wantedBy = [
+  #       "docker-gluetun.service"
+  #       "docker-transmission.service"
+  #     ];
+  #     serviceConfig = {
+  #       ExecStart = "${lib.getExe pkgs.docker} network create docker-transmission; exit 0";
+  #     };
+  #   };
+  # };
 
   virtualisation.oci-containers =
     let
@@ -56,7 +61,7 @@
           extraOptions = [
             "--cap-add=NET_ADMIN"
             "--device=/dev/net/tun"
-            "--network=docker-transmission"
+            # "--network=docker-transmission"
           ];
           ports = [
             "13277:13277"
@@ -77,7 +82,7 @@
             "gluetun"
           ];
           extraOptions = [
-            "--network=docker-transmission"
+            "--network=container:gluetun"
           ];
           environment = {
             PUID = toString config.users.users.transmission.uid;

hosts/thea/configuration.nix

@@ -2,20 +2,26 @@
 # your system. Help is available in the configuration.nix(5) man page, on
 # https://search.nixos.org/options and in the NixOS manual (`nixos-help`).
 
-{ config, lib, pkgs, nodes, ... }:let
+{
+  config,
+  lib,
+  pkgs,
+  nodes,
+  ...
+}:
+let
   sin-address = "192.168.1.14";
 in
 
 {
-  imports =
-    [
-      ./nginx.nix
-      # ./striped
-      # ./cybercoffee
-      ./ollama.nix
-      ./minecraft.nix
-      # ./shares.nix
-    ];
+  imports = [
+    ./nginx.nix
+    # ./striped
+    # ./cybercoffee
+    ./ollama.nix
+    ./minecraft.nix
+    ./nix-serve.nix
+  ];
 
   # Use the systemd-boot EFI boot loader.
   boot.loader.systemd-boot.enable = true;
@@ -37,18 +43,23 @@ in
       enable = true;
       internalInterfaces = [ "enp1s0" ];
       externalInterface = "enp1s0";
-      forwardPorts = [ {
-        # TODO refactor this in the gitea/n100 module
-        sourcePort = nodes.sin.config.services.gitea.settings.server.SSH_PORT;
-        proto = "tcp";
-        destination = "${sin-address}:22";  
-      } ];
+      forwardPorts = [
+        {
+          # TODO refactor this in the gitea/n100 module
+          sourcePort = nodes.sin.config.services.gitea.settings.server.SSH_PORT;
+          proto = "tcp";
+          destination = "${sin-address}:22";
+        }
+      ];
     };
   };
 
   time.timeZone = "Europe/Paris";
 
-  nix.settings.experimental-features = [ "nix-command" "flakes" ];
+  nix.settings.experimental-features = [
+    "nix-command"
+    "flakes"
+  ];
   nixpkgs.config.allowUnfree = true;
 
   users.users.n100 = {
@@ -57,14 +68,17 @@ in
     packages = with pkgs; [
     ];
 
-    openssh.authorizedKeys.keys = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKsu+4S+BHmypQTq2IR9y+ihvbF7sXbBznKtIjVAeHJ1 shobu@nixos" ];
+    openssh.authorizedKeys.keys = [
+      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKsu+4S+BHmypQTq2IR9y+ihvbF7sXbBznKtIjVAeHJ1 shobu@nixos"
+    ];
   };
 
   users.users.root = {
-    openssh.authorizedKeys.keys = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKsu+4S+BHmypQTq2IR9y+ihvbF7sXbBznKtIjVAeHJ1 shobu@nixos" ];
+    openssh.authorizedKeys.keys = [
+      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKsu+4S+BHmypQTq2IR9y+ihvbF7sXbBznKtIjVAeHJ1 shobu@nixos"
+    ];
   };
 
-
   environment.systemPackages = with pkgs; [
     lunarvim
     wget
@@ -112,4 +126,3 @@ in
   system.stateVersion = "24.11"; # Did you read the comment?
 
 }
-

hosts/thea/cybercoffee/default.nix

@@ -1,4 +1,4 @@
-{pkgs, ...}:
+{ pkgs, ... }:
 {
   imports = [
     ./halflife.nix

hosts/thea/cybercoffee/halflife.nix

@@ -1,2 +1 @@
-
-{...}: {}
+{ ... }: { }

hosts/thea/flake.nix

@@ -12,23 +12,24 @@
   };
 
   # Flake outputs
-  outputs = inputs@{
-    self,
-    nixpkgs,
-    nix-minecraft,
-    shoblog-front,
-    striped-front,
-    striped-back,
-    ...
-  }:
-  {
-    nixosConfigurations.n100 = nixpkgs.lib.nixosSystem {
-      system = "x86_64-linux";
-      specialArgs = { inherit inputs; };
-      modules = [
-        ./configuration.nix
-        ./hardware-configuration.nix
-      ];
+  outputs =
+    inputs@{
+      self,
+      nixpkgs,
+      nix-minecraft,
+      shoblog-front,
+      striped-front,
+      striped-back,
+      ...
+    }:
+    {
+      nixosConfigurations.n100 = nixpkgs.lib.nixosSystem {
+        system = "x86_64-linux";
+        specialArgs = { inherit inputs; };
+        modules = [
+          ./configuration.nix
+          ./hardware-configuration.nix
+        ];
+      };
     };
-  };
 }

hosts/thea/hardware-configuration.nix

@@ -1,47 +1,61 @@
 # Do not modify this file!  It was generated by ‘nixos-generate-config’
 # and may be overwritten by future invocations.  Please make changes
 # to /etc/nixos/configuration.nix instead.
-{ config, lib, pkgs, modulesPath, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  modulesPath,
+  ...
+}:
 
 {
-  imports =
-    [ (modulesPath + "/installer/scan/not-detected.nix")
-    ];
+  imports = [
+    (modulesPath + "/installer/scan/not-detected.nix")
+  ];
 
-  boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "sd_mod" "sdhci_pci" ];
+  boot.initrd.availableKernelModules = [
+    "xhci_pci"
+    "ahci"
+    "sd_mod"
+    "sdhci_pci"
+  ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ "kvm-intel" ];
   boot.extraModulePackages = [ ];
 
-  fileSystems."/" =
-    { device = "/dev/disk/by-uuid/09c733e4-b0df-4416-977b-50d9feb225fc";
-      fsType = "btrfs";
-      options = [ "subvol=root" ];
-    };
+  fileSystems."/" = {
+    device = "/dev/disk/by-uuid/09c733e4-b0df-4416-977b-50d9feb225fc";
+    fsType = "btrfs";
+    options = [ "subvol=root" ];
+  };
 
-  fileSystems."/nix" =
-    { device = "/dev/disk/by-uuid/09c733e4-b0df-4416-977b-50d9feb225fc";
-      fsType = "btrfs";
-      options = [ "subvol=nix" ];
-    };
+  fileSystems."/nix" = {
+    device = "/dev/disk/by-uuid/09c733e4-b0df-4416-977b-50d9feb225fc";
+    fsType = "btrfs";
+    options = [ "subvol=nix" ];
+  };
 
-  fileSystems."/home" =
-    { device = "/dev/disk/by-uuid/09c733e4-b0df-4416-977b-50d9feb225fc";
-      fsType = "btrfs";
-      options = [ "subvol=home" ];
-    };
+  fileSystems."/home" = {
+    device = "/dev/disk/by-uuid/09c733e4-b0df-4416-977b-50d9feb225fc";
+    fsType = "btrfs";
+    options = [ "subvol=home" ];
+  };
 
-  fileSystems."/swap" =
-    { device = "/dev/disk/by-uuid/09c733e4-b0df-4416-977b-50d9feb225fc";
-      fsType = "btrfs";
-      options = [ "subvol=swap" ];
-    };
+  fileSystems."/swap" = {
+    device = "/dev/disk/by-uuid/09c733e4-b0df-4416-977b-50d9feb225fc";
+    fsType = "btrfs";
+    options = [ "subvol=swap" ];
+  };
 
-  fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/D1B9-8019";
-      fsType = "vfat";
-      options = [ "fmask=0077" "dmask=0077" ];
-    };
+  fileSystems."/boot" = {
+    device = "/dev/disk/by-uuid/D1B9-8019";
+    fsType = "vfat";
+    options = [
+      "fmask=0077"
+      "dmask=0077"
+    ];
+  };
 
   swapDevices = [ ];
 

hosts/thea/minecraft.nix

@@ -1,9 +1,15 @@
-{pkgs, inputs, ...}:
+{
+  pkgs,
+  inputs,
+  lib,
+  ...
+}:
 let
   modpack = pkgs.fetchPackwizModpack {
-      url = "file:///${inputs.testing-grounds.modpack}/pack.toml";
+    url = "file:///${inputs.testing-grounds.modpack}/pack.toml";
     packHash = "sha256-+taYj4uroLNxM4Nia3n+5P1Y/g6dzE6Iq13TsZgk4mU=";
   };
+  reclamation = inputs.reclamation.packages.${pkgs.stdenv.system};
 in
 {
   imports = [ inputs.nix-minecraft.nixosModules.minecraft-servers ];
@@ -14,6 +20,28 @@ in
     eula = true;
     openFirewall = true;
 
+    servers.reclamation = {
+      enable = false;
+      package = pkgs.fabricServers.fabric;
+
+      symlinks = {
+        "mods" = "${reclamation.modpack}/mods";
+        "FTBLang" = "${reclamation.modpack}/FTBLang";
+        "defaultconfigs" = "${reclamation.modpack}/defaultconfigs";
+        "ressourcepacks" = "${reclamation.modpack}/ressourcepacks";
+        "config" = "${reclamation.modpack}/config";
+        "kubejs" = "${reclamation.modpack}/kubejs";
+        "patchouli_books" = "${reclamation.modpack}/patchouli_books";
+        "server.dat" = "${reclamation.modpack}/server.dat";
+      };
+
+      serverProperties = {
+        server-port = 43001;
+        motd = "all hail the gorgon v3.14";
+        allow-flight = true;
+      };
+    };
+
     servers.testing-grounds = {
       enable = true;
 

hosts/thea/ollama.nix

@@ -1,4 +1,5 @@
-{inputs, ...}: {
+{ inputs, ... }:
+{
   # virtualisation.docker = {
   #   enable = true;
   #   storageDriver = "btrfs";

hosts/thea/shares.nix

@@ -1,4 +1,5 @@
-{...}: let
+{ ... }:
+let
   sin-address = "192.168.1.14";
 in
 {

hosts/thea/striped/back.nix

@@ -1,7 +1,8 @@
-{inputs, ...}:
+{ inputs, ... }:
 let
   striped-back = inputs.striped-back;
-in {
+in
+{
   imports = [
     striped-back.nixosModules.default
   ];
@@ -17,7 +18,7 @@ in {
     socket.enable = true;
 
     settings.django = {
-      allowed-hosts = ["striped-api.shobu.fr"];
+      allowed-hosts = [ "striped-api.shobu.fr" ];
       debug = true;
       databases = {
         default = {

hosts/thea/striped/default.nix

@@ -1,4 +1,5 @@
-{striped-back, striped-front, ...}:{
+{ striped-back, striped-front, ... }:
+{
   imports = [
     ./back.nix
   ];

modules/gitea/sin/default.nix

@@ -1,6 +1,8 @@
-{lib, ...}: let
+{ lib, ... }:
+let
   ssh_port = 24658;
-in {
+in
+{
   services = {
     gitea = {
       enable = true;

modules/gitea/thea/virtualisation.nix

@@ -23,8 +23,8 @@
         text = ''
           container:
             network: "host"
-            valid_volume:
-              - "/nix/store:/nix/store"
+            valid_volumes:
+              - "/var/nix/hosted-store"
         '';
       };
     in

scripts/upload-to-cache.sh

@@ -0,0 +1,11 @@
+#!/bin/sh
+set -eu
+set -f
+
+if ! nix --version; then
+  exit 0
+fi
+
+export IFS=' '
+echo "Uploading paths" $OUT_PATHS
+exec nix copy --to "ssh://root@localhost" $OUT_PATHS