hosts/ame/hardware.nix

@@ -23,6 +23,11 @@
     fsType = "vfat";
   };
 
+  fileSystems."/nas" = {
+    device = "192.168.1.199:/mnt/Sutoreji/ame";
+    fsType = "nfs";
+  };
+
   swapDevices = [
     {device = "/dev/disk/by-uuid/4f69ab31-f6a9-4799-92f1-5abbe0dc9180";}
   ];

hosts/ame/home.nix

@@ -1,7 +1,6 @@
 {pkgs, ...}: {
   imports = [
     ../../home
-    ../../home/firefox
     ../../home/wezterm
     ../../home/zathura
     ../../home/zellij
@@ -16,6 +15,7 @@
     username = "notoh";
     homeDirectory = "/home/notoh";
     packages = with pkgs; [
+      floorp
       discord
       spotify-player
       cinny-desktop

hosts/ame/networking.nix

@@ -1,7 +1,7 @@
 _: {
   networking = {
     networkmanager.enable = true;
-    nameservers = ["192.168.1.103"];
+    nameservers = ["192.168.1.221"];
     firewall = {
       enable = true;
     };

hosts/sora/services/default.nix

@@ -7,7 +7,6 @@
     ./attic.nix
     ./tailscale.nix
     ./croc.nix
-    ./terraria.nix
     # ./factorio.nix
     # ./minecraft.nix
     # ./foundryvtt.nix

hosts/sora/services/terraria.nix

@@ -1,24 +0,0 @@
-{...}: {
-  networking.firewall.allowedTCPPorts = [7777];
-  virtualisation.oci-containers.containers.terraria = {
-    image = "jacobsmile/tmodloader1.4:v2023.11.3.3";
-    ports = ["7777:7777"];
-    volumes = ["/var/lib/terraria/tmodloader:/data"];
-    environment = {
-      TMOD_MOTD = "forsen";
-      TMOD_PASS = "forsen";
-      TMOD_AUTOSAVE_INTERVAL = "10";
-      TMOD_SHUTDOWN_MESSAGE = "Server is shutting down NOW!";
-      TMOD_AUTODOWNLOAD = "2824688072,2824688266,2669644269,2563309347,2619954303,2687866031,2563851005,2908170107";
-      TMOD_ENABLEDMODS = "2824688072,2824688266,2669644269,2563309347,2619954303,2687866031,2563851005,2908170107";
-      TMOD_MAXPLAYERS = "10";
-      TMOD_WORLDNAME = "forsenv2";
-      TMOD_WORLDSIZE = "3";
-      TMOD_DIFFICULTY = "2";
-      TMOD_NPCSTREAM = "60";
-      TMOD_WORLDSEED = "random";
-      TMOD_LANGUAGE = "en-US";
-      TMOD_UPNP = "1";
-    };
-  };
-}

hosts/yuki/services/stash.nix

@@ -1,6 +1,6 @@
 _: {
   virtualisation.oci-containers.containers.stash = {
-    image = "stashapp/stash:v0.24.2";
+    image = "stashapp/stash:v0.24.1";
     environment = {
       STASH_STASH = "/data/";
       STASH_GENERATED = "/generated/";