luks

single disk array
2026-01-15 14:09:07 +01:00 · 2026-01-15 10:32:07 +01:00
11 changed files with 219 additions and 104 deletions
--- a/flake.lock
+++ b/flake.lock
@@ -49,11 +49,11 @@
        "nixpkgs": "nixpkgs_3"
      },
      "locked": {
-        "lastModified": 1768336726,
-        "narHash": "sha256-Os4qn0S0bv7MauXGz16ozyOYZuMrA2FJuXNjDnr5yps=",
+        "lastModified": 1767637959,
+        "narHash": "sha256-+gBU5Cj9QNpHLQ5PHJoWNQft7TMsBM6X+tDQg+/B2P0=",
        "owner": "9001",
        "repo": "copyparty",
-        "rev": "c46cd7f57a8ae3b121866485c91ec078c4dd970e",
+        "rev": "038af507772593b904b5c3efc306f89cbdf2b6fb",
        "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": 1767838769,
-        "narHash": "sha256-KCLU6SUU80tEBKIVZsBrSjRYX6kn1eVIYI3fEEqOp24=",
+        "lastModified": 1767147099,
+        "narHash": "sha256-395ehjdAtaqCbKmx+PhKAqnkYLvTtAzq2qzFG9qaGDw=",
        "owner": "Infinidoge",
        "repo": "nix-minecraft",
-        "rev": "4da21f019f6443f513f16af7f220ba4db1cdfc04",
+        "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": {
@@ -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": 1768127708,
-        "narHash": "sha256-1Sm77VfZh3mU0F5OqKABNLWxOuDeHIlcFjsXeeiPazs=",
+        "lastModified": 1767640445,
+        "narHash": "sha256-UWYqmD7JFBEDBHWYcqE6s6c77pWdcU/i+bwD6XxMb8A=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "ffbc9f8cbaacfb331b6017d5a5abb21a492c9a38",
+        "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",
--- a/flake.nix
+++ b/flake.nix
@@ -17,7 +17,10 @@
    # 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";

    copyparty.url = "github:9001/copyparty";

@@ -41,6 +44,7 @@
      # striped-back,
      nix-minecraft,
      testing-grounds,
+      reclamation,
      copyparty,
      ...
    }:
@@ -63,22 +67,22 @@
    {
      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;
-          };
+           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 {
--- a/hosts/sin/copyparty.nix
+++ b/hosts/sin/copyparty.nix
@@ -27,48 +27,11 @@
      shr = "/shares";
    };

-    accounts = {
-      serhao = {
-        passwordFile = config.age.secrets.copyparty-serhao.path;
-      };
-    };
-
    volumes = {
-      "/movies" = {
-        path = "/mnt/mediacenter/media/movies";
-        access = {
-          r = "*";
-        };
-      };
-      "/shows" = {
-        path = "/mnt/mediacenter/media/shows";
-        access = {
-          r = "*";
-        };
-      };
-
-      "/musics" = {
-        path = "/mnt/mediacenter/media/musics";
-        access = {
-          r = "*";
-        };
-      };
-      "/mediacenter" = {
+      "/media" = {
        path = "/mnt/mediacenter/media";
        access = {
-          rw = ["serhao"];
-        };
-        flags = {
-          e2d = true;
-        };
-      };
-      "/data" = {
-        path = "/mnt/data";
-        access = {
-          rwd = ["serhao"];
-        };
-        flags = {
-          e2d = true;
+          r = "*";
        };
      };
    };
--- a/hosts/sin/homepage.nix
+++ b/hosts/sin/homepage.nix
@@ -122,7 +122,7 @@
              description = "bring back your world to life";
              widget = {
                type = "minecraft";
-                url = "udp://minecraft.shobu.fr:25665";
+                url = "udp://minecraft.shobu.fr:43001";
              };
            };
          }
--- a/hosts/sin/jellyfin.nix
+++ b/hosts/sin/jellyfin.nix
@@ -54,12 +54,6 @@ in
    "transmission"
  ];

-  users.users.whisparr.extraGroups = [
-    "jellyfin"
-    "starr"
-    "transmission"
-  ];
-
  users.users.shobu.extraGroups = [
    "jellyfin"
    "starr"
@@ -99,10 +93,7 @@ in
    lidarr = {
      enable = true;
      openFirewall = true;
-    };
-    whisparr = {
-      enable = true;
-      openFirewall = true;
+      package = unstable.lidarr;
    };

    jellyseerr = {
--- a/hosts/sin/luks-btrfs-raid.nix
+++ b/hosts/sin/luks-btrfs-raid.nix
@@ -7,7 +7,7 @@
      # and the actual btrfs raid on the second disk, and the name of these entries matters!
      system = {
        type = "disk";
-        device = "/dev/sdb";
+        device = "/dev/mmcblk0";
        content = {
          type = "gpt";
          partitions = {
@@ -42,10 +42,6 @@
                    "/root" = {
                      mountpoint = "/";
                    };
-                    "/nix" = {
-                      mountpoint = "/nix";
-                      mountOptions = [ "compress=zstd:3" ];
-                    };
                  };
                };
              };
@@ -78,6 +74,10 @@
                      mountpoint = "/mnt/fs";
                      mountOptions = [ "compress=zstd:3" ];
                    };
+                    "/nix" = {
+                      mountpoint = "/nix";
+                      mountOptions = [ "compress=zstd:3" ];
+                    };

                    "/data" = {
                      mountpoint = "/mnt/data";
--- a/hosts/sin/secrets.nix
+++ b/hosts/sin/secrets.nix
@@ -10,10 +10,5 @@
      file = ./secrets/airvpn_wireguard_key_env.age;
      mode = "700";
    };
-    copyparty-serhao = {
-      file = ./secrets/copyparty-serhao.age;
-      mode = "700";
-      owner = "copyparty";
-    };
  };
 }
--- a/hosts/sin/secrets/copyparty-serhao.age
+++ b/hosts/sin/secrets/copyparty-serhao.age
@@ -1,7 +0,0 @@
-age-encryption.org/v1
-> ssh-ed25519 BoEq8A O6x9n4kvpqLucX7NuNeD2SsMmvT5n6aVYwo4nQt21H8
-R+4g1QuXtxovyv5Mav+mAhgGjOcGQW4q17FSBtzXZQo
-> ssh-ed25519 NoSl6Q iKPipXfIGWxUobXF/9CSRhc/zKgmKKWWZhDTDgX0jWA
-LB4TFCdbEG0VToYzTWdFedd0duF5PKlCnpBs4nBbLAQ
--- D7VE3Mwgx9ehk5rNuHm62S5ggQBm9wJodZa61jLEVsY
-8ÔîÐÄÒë`S«šéT¯Fª9&(½Ú²Á‡¸=~Ïášoù».XŽ¶ž7ðV&'Øøå ÒÔ¸‹%ã î
--- a/hosts/thea/configuration.nix
+++ b/hosts/thea/configuration.nix
@@ -20,6 +20,7 @@ in
    # ./cybercoffee
    ./ollama.nix
    ./minecraft.nix
+    ./nix-serve.nix
  ];

  # Use the systemd-boot EFI boot loader.
@@ -36,14 +37,7 @@ in
    # dhcpcd.extraConfig = "nohook resolv.conf";

    firewall = {
-      allowedTCPPorts = [
-        nodes.sin.config.services.gitea.settings.server.SSH_PORT
-      ]
-      ++ [
-        # minecraft ad hoc server ports
-        25665
-        25675
-      ];
+      allowedTCPPorts = [ nodes.sin.config.services.gitea.settings.server.SSH_PORT ];
    };
    nat = {
      enable = true;
--- a/hosts/thea/minecraft.nix
+++ b/hosts/thea/minecraft.nix
@@ -9,6 +9,7 @@ let
    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 ];
@@ -19,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;

--- a/hosts/thea/nginx.nix
+++ b/hosts/thea/nginx.nix
@@ -44,7 +44,6 @@ in
        // mkStarr "jellyseerr.shobu.fr" "5055"
        // mkStarr "fileshelter.shobu.fr" "5091"
        // mkStarr "lidarr.shobu.fr" "8686"
-        // mkStarr "whisparr.shobu.fr" "6969"
        // mkStarr "transmission.shobu.fr" "9091"
        // mkStarr "zimablade-admin.shobu.fr" "61208"
        // {
Author	SHA1	Message	Date
sin serhao	07ae2f1996	luks All checks were successful / perform flake analysis (push) Successful in 36s Details	2026-01-15 14:09:07 +01:00
sin serhao	679e8e2781	single disk array All checks were successful / perform flake analysis (push) Successful in 40s Details	2026-01-15 10:32:07 +01:00