hosts/default.nix

@@ -141,7 +141,6 @@ in {
     modules = [
       ./sora
       sopsModule
-      atticModule
       hmModule
       {
         home-manager = {
@@ -202,6 +201,7 @@ in {
     modules = [
       ./kaze
       sopsModule
+      atticModule
       hmModule
       {
         home-manager = {

hosts/kaze/services/default.nix

@@ -2,5 +2,6 @@ _: {
   imports = [
     ./tailscale.nix
     ./minio.nix
+    ./attic.nix
   ];
 }

hosts/sora/services/default.nix

@@ -4,9 +4,8 @@
     ./traefik.nix
     ./uptimekuma.nix
     ./ntfy-sh.nix
-    ./attic.nix
     ./tailscale.nix
-    # ./factorio.nix
+    ./factorio.nix
     # ./minecraft.nix
     # ./foundryvtt.nix
   ];

hosts/sora/services/traefik.nix

@@ -171,7 +171,7 @@
           neko.loadBalancer.servers = [{url = "http://100.104.42.96:8085";}];
           justlog.loadBalancer.servers = [{url = "http://100.121.201.47:8025";}];
           ntfy-sh.loadBalancer.servers = [{url = "http://100.104.42.96:8090";}];
-          attic.loadBalancer.servers = [{url = "http://100.104.42.96:8200";}];
+          attic.loadBalancer.servers = [{url = "http://100.69.79.81:8200";}];
           minio.loadBalancer.servers = [{url = "http://100.69.79.81:9005";}];
         };
       };

hosts/tsuki/services/atticd.nix

@@ -1,18 +0,0 @@
-{pkgs, ...}: {
-  environment.systemPackages = [pkgs.attic];
-
-  systemd.services.atticd = {
-    enable = true;
-    wantedBy = [
-      "multi-user.target"
-    ];
-    description = "atticd";
-
-    serviceConfig = {
-      User = "notoh";
-      ExecStart = "${pkgs.attic}/bin/attic watch-store kyasshu";
-      Restart = "always";
-      RestartSec = 30;
-    };
-  };
-}

hosts/tsuki/services/default.nix

@@ -1,6 +1,5 @@
 {...}: {
   imports = [
-    ./atticd.nix
     ./restic.nix
     ./hydroxide.nix
   ];

modules/nix.nix

@@ -34,7 +34,6 @@
         "https://nix-gaming.cachix.org"
         "https://anyrun.cachix.org"
         "https://viperml.cachix.org"
-        "https://cache.flake.sh/kyasshu"
       ];
       trusted-public-keys = [
         "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="
@@ -42,7 +41,6 @@
         "nix-gaming.cachix.org-1:nbjlureqMbRAxR1gJ/f3hxemL9svXaZF/Ees8vCUUs4="
         "anyrun.cachix.org-1:pqBobmOjI7nKlsUMV25u9QHa9btJK65/C8vnO3p346s="
         "viperml.cachix.org-1:qZhKBMTfmcLL+OG6fj/hzsMEedgKvZVFRRAhq7j8Vh8="
-        "kyasshu:g1heIgCgG7M4San6nRsz/omcVQ1GTc7+zKKm3L9Co7o="
       ];
     };
   };

pkgs/chatterino7/default.nix

@@ -21,8 +21,8 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "SevenTV";
     repo = pname;
-    rev = "7eef663cc3e1e863011b6d0eb377e64f9478b673";
+    rev = "a997941f822fae19a613799ff20de4d7a3f71e07";
-    sha256 = "sha256-5Zvjf2nohKK/ykF2VFYVjsPpgj7/xWyL2fa/L1iphbk=";
+    sha256 = "sha256-m0IE6cZ+JSjghD3WaVOlSRABcbnafiW+VYaSGQ4CBqU=";
     fetchSubmodules = true;
   };