Update nixpkgs and home-manager

nixos/boxes/colony/vms/shill/containers/middleman/vhosts.nix

@@ -191,8 +191,9 @@ in
           ${headers}
         '';
         root = pkgs.element-web.override {
+          # Currently it seems like single quotes aren't escaped like they should be...
           conf = {
-            brand = "/dev/player0's Matrix";
+            brand = "/dev/player0 Matrix";
             showLabsSettings = true;
             disable_guests = true;
             default_server_config = {

nixos/boxes/colony/vms/shill/containers/toot.nix

@@ -17,7 +17,7 @@
 
     configuration = { lib, pkgs, config, assignments, allAssignments, ... }:
     let
-      inherit (lib) mkMerge mkIf genAttrs;
+      inherit (lib) mkMerge mkIf genAttrs mkBefore;
       inherit (lib.my) networkdAssignment;
     in
     {
@@ -61,6 +61,9 @@
               mastodon-init-dirs.script = ''
                 echo "AWS_SECRET_ACCESS_KEY=\""$(< ${config.age.secrets."toot/s3-secret-key.txt".path})"\"" >> /var/lib/mastodon/.secrets_env
               '';
+              mastodon-init-db = {
+                after = [ "systemd-networkd-wait-online.service" ];
+              };
 
               # Can't use the extraConfig because these services expect a different format for the both family bind address...
               mastodon-streaming.environment.BIND = "::";
@@ -108,11 +111,10 @@
 
                 redis.createLocally = true;
 
-                # TODO: Re-enable when nixpkgs is updated
-                #mediaAutoRemove = {
-                #  enable = true;
-                #  olderThanDays = 30;
-                #};
+                mediaAutoRemove = {
+                  enable = true;
+                  olderThanDays = 30;
+                };
               }
               {
                 extraConfig = {

nixos/boxes/colony/vms/shill/default.nix

@@ -42,8 +42,8 @@
               kernelParams = [ "console=ttyS0,115200n8" ];
               # Stolen from nixos/modules/services/torrent/transmission.nix
               kernel.sysctl = {
-                "net.core.rmem_max" = "4194304"; # 4MB
-                "net.core.wmem_max" = "1048576"; # 1MB
+                "net.core.rmem_max" = 4194304; # 4MB
+                "net.core.wmem_max" = 1048576; # 1MB
                 "net.ipv4.ip_local_port_range" = "16384 65535";
                 #"net.netfilter.nf_conntrack_generic_timeout" = 60;
                 #"net.netfilter.nf_conntrack_tcp_timeout_established" = 600;