store path to docker exec and correct key in gitea runner conf

.gitea/workflows/deploy.yaml

@@ -5,33 +5,14 @@ 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: 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:
+      - uses: actions/checkout@v4
-          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": 1767637959,
+        "lastModified": 1762095388,
-        "narHash": "sha256-+gBU5Cj9QNpHLQ5PHJoWNQft7TMsBM6X+tDQg+/B2P0=",
+        "narHash": "sha256-7Q8LtcvKWHbP8znARRTOY2tpU5WoV6FHwp5TZJOI8Us=",
         "owner": "9001",
         "repo": "copyparty",
-        "rev": "038af507772593b904b5c3efc306f89cbdf2b6fb",
+        "rev": "ac085b8149ff50e03d260128596dd130ed1c7cae",
         "type": "github"
       },
       "original": {
@@ -91,11 +91,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1766150702,
+        "lastModified": 1762276996,
-        "narHash": "sha256-P0kM+5o+DKnB6raXgFEk3azw8Wqg5FL6wyl9jD+G5a4=",
+        "narHash": "sha256-TtcPgPmp2f0FAnc+DMEw4ardEgv1SGNR3/WFGH0N19M=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "916506443ecd0d0b4a0f4cf9d40a3c22ce39b378",
+        "rev": "af087d076d3860760b3323f6b583f4d828c1ac17",
         "type": "github"
       },
       "original": {
@@ -136,22 +136,6 @@
         "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,
@@ -200,24 +184,6 @@
         "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": [
@@ -267,31 +233,11 @@
         "nixpkgs": "nixpkgs_4"
       },
       "locked": {
-        "lastModified": 1767147099,
+        "lastModified": 1762826586,
-        "narHash": "sha256-395ehjdAtaqCbKmx+PhKAqnkYLvTtAzq2qzFG9qaGDw=",
+        "narHash": "sha256-KlPcXOxxyv+KNcf7yNFQ4DGVFbOpITqHfvMcAUYrL7E=",
         "owner": "Infinidoge",
         "repo": "nix-minecraft",
-        "rev": "01f571579edd64433f97c4294137fbc366deef4b",
+        "rev": "1a4fa22ec6e9f2ece24fca273352463b75f6f7c0",
-        "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": {
@@ -365,11 +311,11 @@
     },
     "nixpkgs_5": {
       "locked": {
-        "lastModified": 1767313136,
+        "lastModified": 1762756533,
-        "narHash": "sha256-16KkgfdYqjaeRGBaYsNrhPRRENs0qzkQVUooNHtoy2w=",
+        "narHash": "sha256-HiRDeUOD1VLklHeOmaKDzf+8Hb7vSWPVFcWwaTrpm+U=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "ac62194c3917d5f474c1a844b6fd6da2db95077d",
+        "rev": "c2448301fb856e351aab33e64c33a3fc8bcf637d",
         "type": "github"
       },
       "original": {
@@ -380,36 +326,6 @@
       }
     },
     "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=",
@@ -423,7 +339,7 @@
         "url": "https://flakehub.com/f/NixOS/nixpkgs/0.1.%2A.tar.gz"
       }
     },
-    "nixpkgs_9": {
+    "nixpkgs_7": {
       "locked": {
         "lastModified": 1736549401,
         "narHash": "sha256-ibkQrMHxF/7TqAYcQE+tOnIsSEzXmMegzyBWza6uHKM=",
@@ -439,26 +355,6 @@
         "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",
@@ -467,7 +363,6 @@
         "disko": "disko",
         "nix-minecraft": "nix-minecraft",
         "nixpkgs": "nixpkgs_5",
-        "reclamation": "reclamation",
         "shoblog-front": "shoblog-front",
         "testing-grounds": "testing-grounds",
         "unstable": "unstable"
@@ -475,7 +370,7 @@
     },
     "shoblog-front": {
       "inputs": {
-        "nixpkgs": "nixpkgs_8"
+        "nixpkgs": "nixpkgs_6"
       },
       "locked": {
         "lastModified": 1752594581,
@@ -537,39 +432,9 @@
         "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_9"
+        "nixpkgs": "nixpkgs_7"
       },
       "locked": {
         "lastModified": 1755527993,
@@ -587,11 +452,11 @@
     },
     "unstable": {
       "locked": {
-        "lastModified": 1767640445,
+        "lastModified": 1762596750,
-        "narHash": "sha256-UWYqmD7JFBEDBHWYcqE6s6c77pWdcU/i+bwD6XxMb8A=",
+        "narHash": "sha256-rXXuz51Bq7DHBlfIjN7jO8Bu3du5TV+3DSADBX7/9YQ=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "9f0c42f8bc7151b8e7e5840fb3bd454ad850d8c5",
+        "rev": "b6a8526db03f735b89dd5ff348f53f752e7ddc8e",
         "type": "github"
       },
       "original": {
@@ -600,24 +465,6 @@
         "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,7 +17,6 @@
     # 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";
@@ -27,8 +26,7 @@
   };
 
   # Flake outputs
-  outputs =
+  outputs = inputs@{
-    inputs@{
     self,
     
     nixpkgs,
@@ -44,7 +42,6 @@
     # striped-back,
     nix-minecraft,
     testing-grounds,
-      reclamation,
     copyparty,
     ...
     }:
@@ -55,36 +52,11 @@
       ];
 
       # Helper to provide system-specific attributes
-      forEachSupportedSystem =
+      forEachSupportedSystem = f: inputs.nixpkgs.lib.genAttrs supportedSystems (system: f {
-        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 {
@@ -97,20 +69,11 @@
           };
         };
 
-        thea =
+        thea = {name, nodes, pkgs, ...}: {
-          {
-            name,
-            nodes,
-            pkgs,
-            ...
-          }:
-          {
           imports = [
-              agenix.nixosModules.default
             ./hosts/${name}/configuration.nix
             ./hosts/${name}/hardware-configuration.nix
-            ]
+          ] ++ [
-            ++ [
             # modules
             ./modules/gitea/${name}
           ];
@@ -118,54 +81,37 @@
           deployment.targetHost = "192.168.1.12";
         };
 
-        sin =
+        sin = {name, nodes, pkgs, ...}: {
-          {
-            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.allowLocalDeployment = true;
         };
       };
-      devShells = forEachSupportedSystem (
+      devShells = forEachSupportedSystem ({ pkgs }: {
-        { pkgs }:
-        {
         default = pkgs.mkShell {
           # The Nix packages provided in the environment
           # Add any you need here
-            packages = with pkgs; [
+          packages = with pkgs; [ colmena.packages.${pkgs.system}.colmena ];
-              colmena.packages.${pkgs.stdenv.system}.colmena
-              agenix.packages.${pkgs.stdenv.system}.agenix
-            ];
 
           # Set any environment variables for your dev shell
           env = { };
 
           # Add any shell logic you want executed any time the environment is activated
-            shellHook = '''';
+          shellHook = ''
+          '';
         };
-        }
+      });
-      );
 
-      packages = forEachSupportedSystem (
+      packages = forEachSupportedSystem ({pkgs}: {
-        { pkgs }:
-        {
         inherit (colmena.packages."${pkgs.system}") colmena;
-        }
+      });
-      );
     };
 }

hosts/sin/copyparty.nix

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

hosts/sin/coredns/default.nix

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

hosts/sin/flake.nix

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

hosts/sin/glances.nix

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

hosts/sin/hardware-configuration.nix

@@ -1,27 +1,14 @@
 # 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 = [
+  imports =
-    (modulesPath + "/installer/scan/not-detected.nix")
+    [ (modulesPath + "/installer/scan/not-detected.nix")
     ];
 
-  boot.initrd.availableKernelModules = [
+  boot.initrd.availableKernelModules = [ "ahci" "xhci_pci" "usb_storage" "usbhid" "sd_mod" "sdhci_pci" ];
-    "ahci"
-    "xhci_pci"
-    "usb_storage"
-    "usbhid"
-    "sd_mod"
-    "sdhci_pci"
-  ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ "kvm-intel" ];
   boot.extraModulePackages = [ ];

hosts/sin/homepage.nix

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

hosts/sin/jellyfin.nix

@@ -1,8 +1,6 @@
-{ pkgs, inputs, ... }:
+{pkgs, inputs, ...}: let
-let
   unstable = import inputs.unstable { system = pkgs.system; };
-in
+in {
-{
   nixpkgs.config.packageOverrides = pkgs: {
     vaapiIntel = pkgs.vaapiIntel.override { enableHybridCodec = true; };
   };
@@ -29,38 +27,13 @@ in
     extraGroups = [ "jellyfin" ];
   };
 
-  users.users.sonarr.extraGroups = [
+  users.users.sonarr.extraGroups = ["jellyfin" "radarr" "transmission" "starr"];
-    "jellyfin"
+  users.users.radarr.extraGroups = ["jellyfin" "sonarr" "transmission" "starr"];
-    "radarr"
+  users.users.bazarr.extraGroups = ["jellyfin" "sonarr" "transmission" "starr" "radarr"];
-    "transmission"
+  users.users.lidarr.extraGroups = ["jellyfin" "starr" "transmission"];
-    "starr"
+  
-  ];
+  users.users.shobu.extraGroups = [ "jellyfin" "starr" "transmission" "radarr" "sonarr" ];
-  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 = {};

hosts/sin/luks-btrfs-raid.nix

@@ -1,5 +1,4 @@
-{ ... }:
+{...}: {
-{
   disko.devices = {
     disk = {
       # Devices will be mounted and formatted in alphabetical order, and btrfs can only mount raids
@@ -50,17 +49,39 @@
         };
       };
 
-      data = {
+      data1 = {
         type = "disk";
         device = "/dev/sda";
         content = {
           type = "gpt";
           partitions = {
-            crypt_p = {
+            crypt_p1 = {
               size = "100%";
               content = {
                 type = "luks";
-                name = "p_data";
+                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";
                 # Remove settings.keyFile if you want to use interactive password entry
                 settings = {
                   allowDiscards = true;
@@ -69,6 +90,10 @@
                 };
                 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

@@ -26,10 +26,7 @@
     '';
   };
 
-  networking.firewall.allowedTCPPorts = [
+  networking.firewall.allowedTCPPorts = [ 8008 8448 ];
-    8008
-    8448
-  ];
 
   services.matrix-synapse = {
     enable = true;
@@ -48,10 +45,7 @@
           x_forwarded = true;
           resources = [
             {
-              names = [
+              names = [ "client" "federation" ];
-                "client"
-                "federation"
-              ];
               compress = true;
             }
           ];

hosts/sin/secrets.nix

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

hosts/sin/transmission.nix

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

hosts/thea/configuration.nix

@@ -2,25 +2,19 @@
 # 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 = [
+  imports =
+    [
       ./nginx.nix
       # ./striped
       # ./cybercoffee
       ./ollama.nix
       ./minecraft.nix
-    ./nix-serve.nix
+      # ./shares.nix
     ];
 
   # Use the systemd-boot EFI boot loader.
@@ -43,23 +37,18 @@ in
       enable = true;
       internalInterfaces = [ "enp1s0" ];
       externalInterface = "enp1s0";
-      forwardPorts = [
+      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.settings.experimental-features = [ "nix-command" "flakes" ];
-    "nix-command"
-    "flakes"
-  ];
   nixpkgs.config.allowUnfree = true;
 
   users.users.n100 = {
@@ -68,17 +57,14 @@ in
     packages = with pkgs; [
     ];
 
-    openssh.authorizedKeys.keys = [
+    openssh.authorizedKeys.keys = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKsu+4S+BHmypQTq2IR9y+ihvbF7sXbBznKtIjVAeHJ1 shobu@nixos" ];
-      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKsu+4S+BHmypQTq2IR9y+ihvbF7sXbBznKtIjVAeHJ1 shobu@nixos"
-    ];
   };
 
   users.users.root = {
-    openssh.authorizedKeys.keys = [
+    openssh.authorizedKeys.keys = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKsu+4S+BHmypQTq2IR9y+ihvbF7sXbBznKtIjVAeHJ1 shobu@nixos" ];
-      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKsu+4S+BHmypQTq2IR9y+ihvbF7sXbBznKtIjVAeHJ1 shobu@nixos"
-    ];
   };
 
+
   environment.systemPackages = with pkgs; [
     lunarvim 
     wget
@@ -126,3 +112,4 @@ in
   system.stateVersion = "24.11"; # Did you read the comment?
 
 }
+

hosts/thea/cybercoffee/halflife.nix

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

hosts/thea/flake.nix

@@ -12,8 +12,7 @@
   };
 
   # Flake outputs
-  outputs =
+  outputs = inputs@{
-    inputs@{
     self,
     nixpkgs,
     nix-minecraft,

hosts/thea/hardware-configuration.nix

@@ -1,60 +1,46 @@
 # 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 = [
+  imports =
-    (modulesPath + "/installer/scan/not-detected.nix")
+    [ (modulesPath + "/installer/scan/not-detected.nix")
     ];
 
-  boot.initrd.availableKernelModules = [
+  boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "sd_mod" "sdhci_pci" ];
-    "xhci_pci"
-    "ahci"
-    "sd_mod"
-    "sdhci_pci"
-  ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ "kvm-intel" ];
   boot.extraModulePackages = [ ];
 
-  fileSystems."/" = {
+  fileSystems."/" =
-    device = "/dev/disk/by-uuid/09c733e4-b0df-4416-977b-50d9feb225fc";
+    { device = "/dev/disk/by-uuid/09c733e4-b0df-4416-977b-50d9feb225fc";
       fsType = "btrfs";
       options = [ "subvol=root" ];
     };
 
-  fileSystems."/nix" = {
+  fileSystems."/nix" =
-    device = "/dev/disk/by-uuid/09c733e4-b0df-4416-977b-50d9feb225fc";
+    { device = "/dev/disk/by-uuid/09c733e4-b0df-4416-977b-50d9feb225fc";
       fsType = "btrfs";
       options = [ "subvol=nix" ];
     };
 
-  fileSystems."/home" = {
+  fileSystems."/home" =
-    device = "/dev/disk/by-uuid/09c733e4-b0df-4416-977b-50d9feb225fc";
+    { device = "/dev/disk/by-uuid/09c733e4-b0df-4416-977b-50d9feb225fc";
       fsType = "btrfs";
       options = [ "subvol=home" ];
     };
 
-  fileSystems."/swap" = {
+  fileSystems."/swap" =
-    device = "/dev/disk/by-uuid/09c733e4-b0df-4416-977b-50d9feb225fc";
+    { device = "/dev/disk/by-uuid/09c733e4-b0df-4416-977b-50d9feb225fc";
       fsType = "btrfs";
       options = [ "subvol=swap" ];
     };
 
-  fileSystems."/boot" = {
+  fileSystems."/boot" =
-    device = "/dev/disk/by-uuid/D1B9-8019";
+    { device = "/dev/disk/by-uuid/D1B9-8019";
       fsType = "vfat";
-    options = [
+      options = [ "fmask=0077" "dmask=0077" ];
-      "fmask=0077"
-      "dmask=0077"
-    ];
     };
 
   swapDevices = [ ];

hosts/thea/minecraft.nix

@@ -1,15 +1,9 @@
-{
+{pkgs, inputs, ...}:
-  pkgs,
-  inputs,
-  lib,
-  ...
-}:
 let
   modpack = pkgs.fetchPackwizModpack {
       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 ];
@@ -20,28 +14,6 @@ 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,5 +1,4 @@
-{ inputs, ... }:
+{inputs, ...}: {
-{
   # virtualisation.docker = {
   #   enable = true;
   #   storageDriver = "btrfs";

hosts/thea/shares.nix

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

hosts/thea/striped/back.nix

@@ -1,8 +1,7 @@
 {inputs, ...}:
 let
   striped-back = inputs.striped-back;
-in
+in {
-{
   imports = [
     striped-back.nixosModules.default
   ];

hosts/thea/striped/default.nix

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

modules/gitea/sin/default.nix

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

modules/gitea/thea/virtualisation.nix

@@ -24,7 +24,7 @@
           container:
             network: "host"
             valid_volumes:
-              - "/var/nix/hosted-store"
+              - "/nix/store:/nix/store"
         '';
       };
     in

scripts/upload-to-cache.sh

@@ -1,11 +0,0 @@
-#!/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