luks

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": {
@@ -267,11 +267,11 @@
         "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": {
@@ -587,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": {

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";
 

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";
               };
             };
           }

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 = {

hosts/sin/luks-btrfs-raid.nix

@@ -50,31 +50,9 @@
         };
       };
 
-      # data1 = {
-      #   type = "disk";
-      #   device = "/dev/sda";
-      #   content = {
-      #     type = "gpt";
-      #     partitions = {
-      #       crypt_p1 = {
-      #         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;
-      #           };
-      #         };
-      #       };
-      #     };
-      #   };
-      # };
       data = {
         type = "disk";
-        device = "/dev/sdc";
+        device = "/dev/sda";
         content = {
           type = "gpt";
           partitions = {
@@ -83,27 +61,6 @@
               content = {
                 type = "luks";
                 name = "p_data";
-                settings = {
-                  allowDiscards = true;
-                  keyFile = "/dev/disk/by-uuid/2021-07-11-12-33-27-00";
-                  keyFileSize = 4096;
-                };
-              };
-            };
-          };
-        };
-      };
-      data1 = {
-        type = "disk";
-        device = "/dev/sdb";
-        content = {
-          type = "gpt";
-          partitions = {
-            crypt_p = {
-              size = "100%";
-              content = {
-                type = "luks";
-                name = "p_data1";
                 # Remove settings.keyFile if you want to use interactive password entry
                 settings = {
                   allowDiscards = true;
@@ -112,10 +69,6 @@
                 };
                 content = {
                   type = "btrfs";
-                  extraArgs = [
-                    "-d raid0"
-                    "/dev/mapper/p_data3" # Use decrypted mapped device, same name as defined in disk1
-                  ];
                   subvolumes = {
                     "/" = {
                       mountpoint = "/mnt/fs";

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;

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;
 

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"
         // {