Merge pull request '⚙️ Raubahn configuration' (#13) from raubahn into master

Reviewed-on: #13

flake.lock

@@ -96,20 +96,6 @@
         "type": "github"
       }
     },
-    "flake-schemas": {
-      "locked": {
-        "lastModified": 1780327564,
-        "narHash": "sha256-HiRPtA0spK+Dkgbhz/1zW9glXxNVB+L4Rj2VYmdawb8=",
-        "rev": "6cc9bd98891b1fc6bb2b8cb3277df8bc72799ca6",
-        "revCount": 149,
-        "type": "tarball",
-        "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/flake-schemas/0.5.0/019e83cf-9af3-78b1-ac5b-70e68ad1efe1/source.tar.gz"
-      },
-      "original": {
-        "type": "tarball",
-        "url": "https://flakehub.com/f/DeterminateSystems/flake-schemas/%2A"
-      }
-    },
     "flake-utils": {
       "inputs": {
         "systems": "systems"
@@ -211,26 +197,6 @@
         "type": "github"
       }
     },
-    "hildibrand": {
-      "inputs": {
-        "flake-schemas": "flake-schemas",
-        "nixpkgs": "nixpkgs_3",
-        "rust-overlay": "rust-overlay_2"
-      },
-      "locked": {
-        "lastModified": 1785717646,
-        "narHash": "sha256-j6MlkwaYOLa3bogK4SbOnVI5eMZ9j2GdExSiKMaELPo=",
-        "ref": "refs/heads/master",
-        "rev": "9588520925513ed0e47711a5798c6e9958143a0a",
-        "revCount": 5,
-        "type": "git",
-        "url": "https://scm.wyattjmiller.com/wymiller/hildibrand.git"
-      },
-      "original": {
-        "type": "git",
-        "url": "https://scm.wyattjmiller.com/wymiller/hildibrand.git"
-      }
-    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
@@ -254,7 +220,7 @@
     },
     "home-manager_2": {
       "inputs": {
-        "nixpkgs": "nixpkgs_4"
+        "nixpkgs": "nixpkgs_3"
       },
       "locked": {
         "lastModified": 1779507042,
@@ -319,20 +285,6 @@
       }
     },
     "nixpkgs_3": {
-      "locked": {
-        "lastModified": 1784280462,
-        "narHash": "sha256-DtoqIqM7VkR6NxAkcLpMwmi02USwWb3JdmNGLyhthc0=",
-        "rev": "293d6abedf0478e681a4dfcfcb35b30fc796a32f",
-        "revCount": 1009740,
-        "type": "tarball",
-        "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.2605.1009740%2Brev-293d6abedf0478e681a4dfcfcb35b30fc796a32f/019f73de-20f7-7ec2-98c8-65726640dbf9/source.tar.gz"
-      },
-      "original": {
-        "type": "tarball",
-        "url": "https://flakehub.com/f/NixOS/nixpkgs/%2A"
-      }
-    },
-    "nixpkgs_4": {
       "locked": {
         "lastModified": 1778443072,
         "narHash": "sha256-zi7/fsqM/kFdNuED//4WOCUtezGtKKqRNORjMvfwjnA=",
@@ -348,7 +300,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_5": {
+    "nixpkgs_4": {
       "locked": {
         "lastModified": 1780902259,
         "narHash": "sha256-q8yYEC5f1mFlQO9RGna4LTc9QrcvWunX6FYp83munkQ=",
@@ -364,7 +316,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_6": {
+    "nixpkgs_5": {
       "locked": {
         "lastModified": 1744536153,
         "narHash": "sha256-awS2zRgF4uTwrOKwwiJcByDzDOdo3Q1rPZbiHQg/N38=",
@@ -384,16 +336,15 @@
       "inputs": {
         "darwin": "darwin_2",
         "flake-utils": "flake-utils_2",
-        "hildibrand": "hildibrand",
         "home-manager": "home-manager_2",
-        "nixpkgs": "nixpkgs_5"
+        "nixpkgs": "nixpkgs_4"
       },
       "locked": {
-        "lastModified": 1786304454,
+        "lastModified": 1783886399,
-        "narHash": "sha256-2ovOgwFWnKqUMoQfxbobtIWQ+TSN62llX9eJVb9hFoY=",
+        "narHash": "sha256-pcHOwEcr5xFGFRUriCdWFcBFBU5oouFW3iO65HCZ3cI=",
         "ref": "refs/heads/master",
-        "rev": "ea7094e4e33fbb030edf28383de37073fc8b84e0",
+        "rev": "b43f2ace4941315daabccc716e151a0ca47276db",
-        "revCount": 43,
+        "revCount": 32,
         "type": "git",
         "url": "https://scm.wyattjmiller.com/wymiller/nur.git"
       },
@@ -411,7 +362,7 @@
         "nix-flatpak": "nix-flatpak",
         "nixpkgs": "nixpkgs_2",
         "nur": "nur",
-        "rust-overlay": "rust-overlay_3"
+        "rust-overlay": "rust-overlay_2"
       }
     },
     "rust-overlay": {
@@ -437,29 +388,7 @@
     },
     "rust-overlay_2": {
       "inputs": {
-        "nixpkgs": [
+        "nixpkgs": "nixpkgs_5"
-          "nur",
-          "hildibrand",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1784438913,
-        "narHash": "sha256-NYF7ZM5ip0u+w1pBFDpIGEbrbgN/wpnLFAmBkWkYMXw=",
-        "owner": "oxalica",
-        "repo": "rust-overlay",
-        "rev": "afacd6819d3765a05814ee8e3de74c77d42ac799",
-        "type": "github"
-      },
-      "original": {
-        "owner": "oxalica",
-        "repo": "rust-overlay",
-        "type": "github"
-      }
-    },
-    "rust-overlay_3": {
-      "inputs": {
-        "nixpkgs": "nixpkgs_6"
       },
       "locked": {
         "lastModified": 1783834461,

flake.nix

@@ -187,18 +187,18 @@
       ];
     };
 
-    # Matrix and Mastodon server
+    # Vintage story server - for a friend
-    nixosConfigurations."yshtola" = nixpkgs.lib.nixosSystem {
+    nixosConfigurations."raubahn" = nixpkgs.lib.nixosSystem {
       system = "x86_64-linux";
       specialArgs = {
-        inherit userName userEmail;
+        inherit userName userEmail nur;
-        hostname = "yshtola";
+        hostname = "raubahn";
         role = "server";
       };
       modules = [
         myOverlays
         ./modules/common
-        ./modules/machine/yshtola
+        ./modules/machine/raubahn
 
         home-manager.nixosModules.home-manager
         {
@@ -213,18 +213,18 @@
       ];
     };
 
-    # Discord bot server
+    # Matrix and Mastodon server
-    nixosConfigurations."estinien" = nixpkgs.lib.nixosSystem {
+    nixosConfigurations."yshtola" = nixpkgs.lib.nixosSystem {
       system = "x86_64-linux";
       specialArgs = {
-        inherit userName userEmail nur;
+        inherit userName userEmail;
-        hostname = "estinien";
+        hostname = "yshtola";
         role = "server";
       };
       modules = [
         myOverlays
         ./modules/common
-        ./modules/machine/estinien
+        ./modules/machine/yshtola
 
         home-manager.nixosModules.home-manager
         {

modules/machine/raubahn/configuration.nix

@@ -3,13 +3,11 @@
   userName,
   nur,
   ...
-}: let
+}: {
-    hildibrand = nur.packages.${pkgs.stdenv.hostPlatform.system}.hildibrand;
-    caitsith = nur.packages.${pkgs.stdenv.hostPlatform.system}.caitsith;
-  in {
   imports = [
     ../../pwrMgmt
     ../../networking/core.nix
+    ../../virtualization/podman.nix
   ];
 
   # Enable flakes for NixOS
@@ -51,42 +49,31 @@
   network = {
     firewall = {
       enable = true;
+      tcpPorts = {
+        allowedPorts = [ 42420 ];
+      };
+      udpPorts = {
+        allowedPorts = [ 42420 ];
+      };
     };
     networkManager.enable = true;
   };
 
   environment.systemPackages = [
-    hildibrand
+    nur.packages.${pkgs.system}.vintage-story
-    caitsith
   ];
 
-  systemd.services.hildibrand = {
+  systemd.services.vintagestory-server = {
-    description = "Hildibrand - trivia buzzer bot";
+    description = "Vintage Story Server";
     wantedBy = [ "multi-user.target" ];
     after = [ "network.target" ];
     serviceConfig = {
       Type = "simple";
       User = userName;
       WorkingDirectory = "/home/${userName}";
-      ExecStart = "${hildibrand}/bin/hildebrand";
+      ExecStart = "${nur.packages.${pkgs.system}.vintage-story}/bin/vintagestory-server";
       Restart = "on-failure";
       RestartSec = "5s";
-      EnvironmentFile = "/etc/secrets/hildibrand.env";
-    };
-  };
-
-  systemd.services.caitsith = {
-    description = "Caitsith - a randomizer bot";
-    wantedBy = [ "multi-user.target" ];
-    after = [ "network.target" ];
-    serviceConfig = {
-      Type = "simple";
-      User = userName;
-      WorkingDirectory = "/home/${userName}";
-      ExecStart = "${caitsith}/bin/hildebrand";
-      Restart = "on-failure";
-      RestartSec = "5s";
-      EnvironmentFile = "/etc/secrets/caitsith.env";
     };
   };
 

modules/machine/raubahn/hardware-configuration.nix

@@ -14,18 +14,18 @@
   boot.extraModulePackages = [ ];
 
   fileSystems."/" =
-    { device = "/dev/disk/by-uuid/498ce176-f090-46d8-96bf-9e6141cffa19";
+    { device = "/dev/disk/by-uuid/ec4c43ec-efcc-40ea-a4c8-411e60ee7c4e";
       fsType = "ext4";
     };
 
   fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/09A6-B803";
+    { device = "/dev/disk/by-uuid/140E-FE19";
       fsType = "vfat";
       options = [ "fmask=0022" "dmask=0022" ];
     };
 
   swapDevices =
-    [ { device = "/dev/disk/by-uuid/4a64a2ee-2b32-4e53-b00f-7b1f127162aa"; }
+    [ { device = "/dev/disk/by-uuid/547bbd78-85be-4d17-a519-c4a2a923bdab"; }
     ];
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";