akkoma: Build ImageMagick with SVT-AV1 encoder

config/hosts/crime/configuration.nix

@@ -1,4 +1,4 @@
-{ inputs, ... }: {
+{ ... }: {
   imports = [
     ../../common
     ../../users/lucy
@@ -8,7 +8,6 @@
     ../../services/arrs
     ../../services/jellyfin.nix
     ../../services/nginx.nix
-    inputs.oth.nixosModules.default
   ];
   networking.hostName = "crime";
   systemd.network.networks."98-eth-default" = {
@@ -25,7 +24,6 @@
       "/var/lib/radarr"
       "/var/lib/sonarr"
       "/var/lib/private/prowlarr"
-      "/home"
     ];
   };
 }

config/services/akkoma/default.nix

@@ -22,70 +22,33 @@
       };
     in with pkgs; [ exiftool ffmpeg-headless imagemagick ];
 
-    extraStatic = let
-      actualFetchzip =
-      {
-        url,
-        hash
-      }: pkgs.runCommandNoCC "${lib.last (lib.splitString "/" url)}" {
-        src = pkgs.fetchurl {
-          inherit url hash;
-        };
-      } ''
-        ${lib.getExe pkgs.unzip} $src -d $out
-        for f in $out/*_256.png; do
-          mv -- "$f" "''${f/_256}"
-        done
-      '';
-    in {
-      "emoji/blobs.gg" = pkgs.akkoma-emoji.blobs_gg;
+    extraStatic."emoji/blobs.gg" = pkgs.akkoma-emoji.blobs_gg;
 
-      "emoji/custom" = pkgs.runCommandNoCC "florp" {
-        src = inputs.florp-branding.packages.${config.nixpkgs.hostPlatform.system}.favicon;
-      } ''
-        mkdir $out
-        cp $src $out/florp.png
-      '';
+    extraStatic."emoji/florp" = pkgs.runCommandNoCC "florp" {
+      src = inputs.florp-branding.packages.${config.nixpkgs.hostPlatform.system}.favicon;
+    } ''
+      mkdir $out
+      cp $src $out/florp.png
+    '';
 
-      "emoji/neodog" = actualFetchzip {
-        url = "https://git.gay/moonrabbits/neodog/raw/commit/6f9eb283b6dcbe507fde1110abab267cb2d73b70/neodog.zip";
-        hash = "sha256-ISyzpRyjHf+4jKrOtHHqH0Qn7CQu5RQSLH/HL/YSdT4=";
-      };
+    extraStatic."static/styles.json" = pkgs.writeText "styles.json" (builtins.toJSON (
+      builtins.fromJSON (builtins.readFile "${pkgs.akkoma-fe-domi}/static/styles.json") // {
+        elly-mod = "/static/themes/elly-mod.json";
+      }
+    ));
 
-      "emoji/neocat" = actualFetchzip {
-        url = "https://volpeon.ink/emojis/neocat/neocat.zip";
-        hash = "sha256-DZDuk0Djlax504flNWdpqAw+ROLOOVGj0ZvJLyouo7A=";
-      };
+    extraStatic."static/themes/elly-mod.json" = pkgs.writeText "elly-mod.json" (builtins.readFile ./elly-mod.json);
 
-      "emoji/neofox" = actualFetchzip {
-        url = "https://volpeon.ink/emojis/neofox/neofox.zip";
-        hash = "sha256-rZUPA7ZvrO8q/lx8XK3IxJ1URLgq0PSh752eWzG+uos=";
-      };
+    extraStatic."static/custom.css" = pkgs.writeText "custom.css" ''
+      .tos-content img, .terms-of-service img { 
+        max-width: 100%;
+      }
+    '';
 
-      "emoji/blobhaj" = actualFetchzip {
-        url = "https://web.archive.org/web/20240829143703/https://heatherhorns.com/wp-content/uploads/2022/12/Blobhaj-12-13-2022.zip";
-        hash = "sha256-5l8ozTivCSOomPq+zDD4FWhK5mA/H2qkGs8beuDnp9s=";
-      };
-
-      "static/styles.json" = pkgs.writeText "styles.json" (builtins.toJSON (
-        builtins.fromJSON (builtins.readFile "${pkgs.akkoma-fe-domi}/static/styles.json") // {
-          elly-mod = "/static/themes/elly-mod.json";
-        }
-      ));
-
-      "static/themes/elly-mod.json" = pkgs.writeText "elly-mod.json" (builtins.readFile ./elly-mod.json);
-
-      "static/custom.css" = pkgs.writeText "custom.css" ''
-        .tos-content img, .terms-of-service img {
-          max-width: 100%;
-        }
-      '';
-
-      "static/terms-of-service.html" = inputs.florp-about.packages.${pkgs.system}.default;
-      "images/sylvia-ritter-15012323.avif" = inputs.florp-branding.packages.${pkgs.system}.wallpaper;
-      "images/florp_banner.avif" = inputs.florp-branding.packages.${pkgs.system}.banner;
-      "favicon.png" = inputs.florp-branding.packages.${pkgs.system}.favicon;
-    };
+    extraStatic."static/terms-of-service.html" = inputs.florp-about.packages.${pkgs.system}.default;
+    extraStatic."images/sylvia-ritter-15012323.avif" = inputs.florp-branding.packages.${pkgs.system}.wallpaper;
+    extraStatic."images/florp_banner.avif" = inputs.florp-branding.packages.${pkgs.system}.banner;
+    extraStatic."favicon.png" = inputs.florp-branding.packages.${pkgs.system}.favicon;
 
     frontends = {
       primary = {
@@ -155,21 +118,6 @@
         ];
       };
 
-      ":emoji".groups = {
-        blobs = "/emoji/blobs.gg/*.png";
-        blobhaj = "/emoji/blobhaj/512w/*.png";
-        neodog = "/emoji/neodog/*.png";
-        neocat = [
-          "/emoji/neocat/*.png"
-          "/emoji/neodog/additional_neocat/*.png"
-        ];
-        neofox = [
-          "/emoji/neofox/*.png"
-          "/emoji/neodog/additional_neofox/*.png"
-        ];
-        Custom = "/emoji/custom/*.png";
-      };
-
       "Pleroma.Captcha".method = mkRaw "Pleroma.Captcha.Kocaptcha";
 
       "Pleroma.Web.Endpoint".url.host = "florp.social";

config/services/hydra/nix-config.nix

@@ -28,8 +28,8 @@
       supportedFeatures = base ++ [ "gccarch-rv64imac" "gccarch-rv64imacfd" "gccarch-rv64gc" ];
       sshKey = config.sops.secrets."services/hydra/id_ed25519_hydra".path;
     }
-  ] ++ lib.forEach (lib.range 0 10) (num: {
-      hostName = "build-worker-${lib.fixedWidthNumber 2 num}";
+  ] ++ lib.forEach (lib.genList (i: i + 1) 8) (num: {
+      hostName = "build-worker-0${toString num}";
       sshUser = "root";
       maxJobs = 2;
       speedFactor = 20;
@@ -56,7 +56,6 @@
       "schrodinger.kyouma.net".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKo7vZ6lS1wx76YsbAdhOsGcc20YMAW52ep8SZ/FCHDp";
       "lab.nyantec.com".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIUePtVPtBK+CYosufbaGiMT4EVanti4V5t2Wg0g/Fy4";
       "localhost".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPNVavo3YHVsrYwXRVISu7kDoknn+5inFGySn4azlB8P";
-      "[build-worker-kyoumanet.fly.dev]:2200".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJUGzlilikAUfUGKXVCoTeDvPRoWUgDDkNU5WaRUBzls";
       "[build-worker-kyoumanet.fly.dev]:2201".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDL2M97UBHg9aUfjDUxzmzg1r0ga0m3/stummBVwuEAB";
       "[build-worker-kyoumanet.fly.dev]:2202".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOTwVKL0P0chPM2Gz23rbT94844+w1CGJdCaZdzfjThz";
       "[build-worker-kyoumanet.fly.dev]:2203".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAjy2eZGJQeAYy0+fLgW9jiS0jVY2LInY0NDMnzCvvKp";
@@ -65,17 +64,15 @@
       "[build-worker-kyoumanet.fly.dev]:2206".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGf0kxGgwOG9KhUhvxxTSiQC5YikrzZXKDgSpBw33qN4";
       "[build-worker-kyoumanet.fly.dev]:2207".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIL9z95a6Fn/dB+iNigEYpuJdBnBwCkIZYaKHcFbGP+RY";
       "[build-worker-kyoumanet.fly.dev]:2208".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAk+FNMhTfAVqk3MfLp4QiG/i5ti53DlpnC0q+sOvU9O";
-      "[build-worker-kyoumanet-cdg.fly.dev]:2209".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJGlQD/3fLn/Kyb7v0RIycHRcArGi75jURj803EMpW0S";
-      "[build-worker-kyoumanet-cdg.fly.dev]:2210".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMQm1FSGBGdCR5f8MvBvdKM0M4yIQVnH1po7hHO5T1qz";
     }; 
     extraConfig = ''
       Host machine-0008.cloud-v.co
         Hostname machine.cloud-v.co
         Port 20008
-    '' + lib.concatLines (lib.forEach (lib.range 0 10) (num: ''
-      Host build-worker-${lib.fixedWidthNumber 2 num}
-        Hostname build-worker-kyoumanet${lib.optionalString (num > 8) "-cdg"}.fly.dev
-        Port 22${lib.fixedWidthNumber 2 num}
-    ''));
+    '' + lib.concatLines (lib.genList (i: ''
+      Host build-worker-0${toString (i + 1)}
+        Hostname build-worker-kyoumanet.fly.dev
+        Port 220${toString (i + 1)}
+    '') 8);
   };
 }

config/users/emily/default.nix

@@ -37,9 +37,7 @@
       pavucontrol
       signal-desktop
       element-desktop
-      firefox
-      # currently broken
-      #inputs.firefox.packages.${pkgs.system}.firefox
+      inputs.firefox.packages.${pkgs.system}.firefox
       
       nixfmt-classic
       wl-clipboard

flake.lock

@@ -1151,29 +1151,6 @@
         "type": "github"
       }
     },
-    "oth": {
-      "inputs": {
-        "flake-utils": [
-          "flake-utils"
-        ],
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1732215904,
-        "narHash": "sha256-bXXoyQcVMULYOj1KlzbquUyMTyByzmLatIgm0ra/7sk=",
-        "ref": "refs/heads/main",
-        "rev": "847cc8493f7f44bd5ada0283d6b96457f4ee5a9b",
-        "revCount": 1,
-        "type": "git",
-        "url": "ssh://forgejo@woof.rip/emily/oth.git"
-      },
-      "original": {
-        "type": "git",
-        "url": "ssh://forgejo@woof.rip/emily/oth.git"
-      }
-    },
     "pre-commit-hooks": {
       "flake": false,
       "locked": {
@@ -1210,7 +1187,6 @@
         "nixos-needsreboot": "nixos-needsreboot",
         "nixpkgs": "nixpkgs_4",
         "nixvim": "nixvim",
-        "oth": "oth",
         "sops-nix": "sops-nix",
         "stylix": "stylix"
       }

flake.nix

@@ -64,11 +64,6 @@
       inputs.nixpkgs.follows = "nixpkgs";
       inputs.home-manager.follows = "home-manager";
     };
-    oth = {
-      url = "git+ssh://forgejo@woof.rip/emily/oth.git";
-      inputs.nixpkgs.follows = "nixpkgs";
-      inputs.flake-utils.follows = "flake-utils";
-    };
     sops-nix = {
       url = "github:Mic92/sops-nix";
       inputs.nixpkgs.follows = "nixpkgs";

fly.toml

@@ -5,7 +5,6 @@ primary_region = 'ams'
   image = 'registry.fly.io/build-worker-kyoumanet:latest'
 
 [processes]
-  bw-00 = '/entrypoint.sh'
   bw-01 = '/entrypoint.sh'
   bw-02 = '/entrypoint.sh'
   bw-03 = '/entrypoint.sh'
@@ -15,34 +14,28 @@ primary_region = 'ams'
   bw-07 = '/entrypoint.sh'
   bw-08 = '/entrypoint.sh'
 
-[[mounts]]
-  source = 'bw00'
-  destination = '/mnt/data'
-  initial_size = '256GB'
-  processes = ['bw-00']
-
 [[mounts]]
   source = 'bw01'
   destination = '/mnt/data'
-  initial_size = '256GB'
+  initial_size = '128GB'
   processes = ['bw-01']
 
 [[mounts]]
   source = 'bw02'
   destination = '/mnt/data'
-  initial_size = '256GB'
+  initial_size = '128GB'
   processes = ['bw-02']
 
 [[mounts]]
   source = 'bw03'
   destination = '/mnt/data'
-  initial_size = '256GB'
+  initial_size = '128GB'
   processes = ['bw-03']
 
 [[mounts]]
   source = 'bw04'
   destination = '/mnt/data'
-  initial_size = '256GB'
+  initial_size = '128GB'
   processes = ['bw-04']
 
 [[mounts]]
@@ -69,15 +62,6 @@ primary_region = 'ams'
   initial_size = '256GB'
   processes = ['bw-08']
 
-[[services]]
-  protocol = 'tcp'
-  internal_port = 2222
-  auto_stop_machines = 'off'
-  processes = ['bw-00']
-
-  [[services.ports]]
-    port = 2200
-
 [[services]]
   protocol = 'tcp'
   internal_port = 2222

modules/graphical/hyprland.nix

@@ -8,9 +8,7 @@
         playerctl = "${pkgs.playerctl}/bin/playerctl";
         notifysend = "${pkgs.libnotify}/bin/notify-send";
         dolphin = "${pkgs.libsForQt5.dolphin}/bin/dolphin";
-        firefox = "${pkgs.firefox}/bin/firefox";
-        # currently broken
-        #firefox = "${inputs.firefox.packages.${pkgs.system}.firefox}/bin/firefox";
+        firefox = "${inputs.firefox.packages.${pkgs.system}.firefox}/bin/firefox";
         brightnessctl = "${pkgs.brightnessctl}/bin/brightnessctl";
         screenshot = "~/.local/bin/hypr/screenshot.sh";
         rofi = "${pkgs.rofi-wayland}/bin/rofi";

pkgs/build-worker-oci/cdg/fly.toml

@@ -1,67 +0,0 @@
-# fly.toml app configuration file generated for build-worker-kyoumanet-cdg on 2024-11-21T00:31:54+01:00
-#
-# See https://fly.io/docs/reference/configuration/ for information about how to use this file.
-#
-
-app = 'build-worker-kyoumanet-cdg'
-primary_region = 'cdg'
-
-[build]
-  image = 'registry.fly.io/build-worker-kyoumanet:latest'
-
-[processes]
-  bw-09 = '/entrypoint.sh'
-  bw-10 = '/entrypoint.sh'
-  bw-11 = '/entrypoint.sh'
-
-[[mounts]]
-  source = 'bw09'
-  destination = '/mnt/data'
-  initial_size = '256GB'
-  processes = ['bw-09']
-
-[[mounts]]
-  source = 'bw10'
-  destination = '/mnt/data'
-  initial_size = '256GB'
-  processes = ['bw-10']
-
-[[mounts]]
-  source = 'bw11'
-  destination = '/mnt/data'
-  initial_size = '256GB'
-  processes = ['bw-11']
-
-[[services]]
-  protocol = 'tcp'
-  internal_port = 2222
-  auto_stop_machines = 'off'
-  processes = ['bw-09']
-
-  [[services.ports]]
-    port = 2209
-
-[[services]]
-  protocol = 'tcp'
-  internal_port = 2222
-  auto_stop_machines = 'off'
-  processes = ['bw-10']
-
-  [[services.ports]]
-    port = 2210
-
-[[services]]
-  protocol = 'tcp'
-  internal_port = 2222
-  auto_stop_machines = 'off'
-  processes = ['bw-11']
-
-  [[services.ports]]
-    port = 2211
-
-[[restart]]
-  policy = 'never'
-
-[[vm]]
-  size = 'performance-16x'
-  memory = '96GB'