hosts/ocelot/default.nix

@@ -5,8 +5,6 @@
     ./website.nix
   ];
   fileSystems."/" = { device = "/dev/sda1"; fsType = "ext4"; };
-  fileSystems."/mnt/gts" = { device = "/dev/sdb1"; fsType = "ext4"; };
-  services.restic.backups.default.paths = ["/mnt/gts"];
   cherrykitten.backups.enable = true;
   cherrykitten.network = {
     public_IPv4 = "128.140.109.125";

hosts/ocelot/gotosocial.nix

@@ -5,9 +5,15 @@ let
   port = 8553;
 in
 {
+  deployment.keys."gts_env" = {
+    destDir = "/root/keys/";
+    keyCommand = [ "pass" "hosts/ocelot/gts/env" ];
+    user = "gotosocial";
+  };
   services.gotosocial = {
     enable = true;
     setupPostgresqlDB = true;
+    environmentFile = "/root/keys/gts_env";
     settings = {
       inherit bind-address host port;
       application-name = "CherryKitten";
@@ -30,8 +36,7 @@ in
       statuses-poll-option-max-chars = 150;
       statuses-media-max-files = 16;
 
-      storage-backend = "local";
-      storage-local-base-path = "/mnt/gts";
+      storage-backend = "s3";
     };
   };
 

hosts/tabby/default.nix

@@ -32,8 +32,6 @@
   users.users.sammy.packages = with pkgs; [
     picard
     discord
-    inkscape
-    osu-lazer-bin
   ];
 
   programs.steam = {

overlays/default.nix

@@ -1,5 +1,7 @@
 { ... }:
 
 {
-  nixpkgs.overlays = [ ];
+  nixpkgs.overlays = [
+    (import ./gotosocial.nix)
+  ];
 }

profiles/base/default.nix

@@ -104,7 +104,6 @@
   environment.systemPackages = with pkgs; [
     bat
     bind.dnsutils
-    comma
     fd
     file
     git