config/common/default.nix

@@ -5,7 +5,7 @@ in {
     ./kernel.nix
     ./networking.nix
     ./openssh.nix
-    ./users.nix
+    ./users
     ../../modules
     inputs.lix-module.nixosModules.default
   ];
@@ -23,7 +23,6 @@ in {
     man-pages-posix
     unzip
     zip
-    fd
     figlet
   ];
   programs = {

config/common/users/default.nix

@@ -1,5 +1,5 @@
 { ... }: {
   imports = [
-    ../users/emily
+    ./emily
   ];
 }

config/common/users/emily/default.nix

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

config/hosts/crime/configuration.nix

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

config/hosts/seras/configuration.nix

@@ -1,7 +1,6 @@
-{ pkgs, ... }: {
+{ ... }: {
   imports = [
     ../../common
-    ../../users/nil
     ../../profiles/builder.nix
     ../../profiles/headless.nix
     ../../profiles/kartoffel.nix

config/profiles/rpi.nix

@@ -9,6 +9,10 @@
       options snd_bcm2835 enable_headphones=1
     '';
     kernelParams = [ "snd_bcm2835.enable_hdmi=1" ];
+    loader.raspberryPi.firmwareConfig = ''
+      dtparam=audio=on
+      dtparam=krnbt=on
+    '';
   };
   console.enable = false;
 

config/services/akkoma/default.nix

@@ -1,10 +1,5 @@
 { config, inputs, lib, pkgs, ... }: {
-  imports = [
+ sops.secrets."services/akkoma/mailerPassword" = {
-    inputs.florp-moderation.nixosModules.default
-    # Moderated instances. See https://woof.rip/florp/moderation for more information.
-    inputs.florp-moderation.nixosModules.florp
-  ];
-  sops.secrets."services/akkoma/mailerPassword" = {
     sopsFile = ../../../secrets/services/akkoma.yaml;
   };
   sops.secrets."services/akkoma/deepl" = {
@@ -13,79 +8,32 @@
 
   services.akkoma = {
     enable = true;
-    extraPackages = let
+    extraPackages = with pkgs; [ exiftool ffmpeg-headless imagemagick ];
-      imagemagick = pkgs.imagemagick.override {
+    extraStatic."emoji/blobs.gg" = pkgs.akkoma-emoji.blobs_gg;
-        libheif = pkgs.libheif.overrideAttrs (prevAttrs: {
-          buildInputs = prevAttrs.buildInputs or [ ] ++ [ pkgs.svt-av1 ];
-          cmakeFlags = prevAttrs.cmakeFlags or [ ] ++ [ "-DWITH_SvtEnc=ON" ];
-        });
-      };
-    in with pkgs; [ exiftool ffmpeg-headless imagemagick ];
 
-    extraStatic = let
+    extraStatic."emoji/florp" = pkgs.runCommandNoCC "florp" {
-      actualFetchzip =
+      src = inputs.florp-branding.packages.${config.nixpkgs.hostPlatform.system}.favicon;
-      {
+    } ''
-        url,
+      mkdir $out
-        hash
+      cp $src $out/florp.png
-      }: 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;
 
-      "emoji/custom" = pkgs.runCommandNoCC "florp" {
+    extraStatic."static/styles.json" = pkgs.writeText "styles.json" (builtins.toJSON (
-        src = inputs.florp-branding.packages.${config.nixpkgs.hostPlatform.system}.favicon;
+      builtins.fromJSON (builtins.readFile "${pkgs.akkoma-fe-domi}/static/styles.json") // {
-      } ''
+        elly-mod = "/static/themes/elly-mod.json";
-        mkdir $out
+      }
-        cp $src $out/florp.png
+    ));
-      '';
 
-      "emoji/neodog" = actualFetchzip {
+    extraStatic."static/themes/elly-mod.json" = pkgs.writeText "elly-mod.json" (builtins.readFile ./elly-mod.json);
-        url = "https://git.gay/moonrabbits/neodog/raw/commit/6f9eb283b6dcbe507fde1110abab267cb2d73b70/neodog.zip";
-        hash = "sha256-ISyzpRyjHf+4jKrOtHHqH0Qn7CQu5RQSLH/HL/YSdT4=";
-      };
 
-      "emoji/neocat" = actualFetchzip {
+    extraStatic."static/custom.css" = pkgs.writeText "custom.css" ''
-        url = "https://volpeon.ink/emojis/neocat/neocat.zip";
+      .tos-content img { max-width: 100%; }
-        hash = "sha256-DZDuk0Djlax504flNWdpqAw+ROLOOVGj0ZvJLyouo7A=";
+    '';
-      };
 
-      "emoji/neofox" = actualFetchzip {
+    extraStatic."static/terms-of-service.html" = inputs.florp-about.packages.${pkgs.system}.default;
-        url = "https://volpeon.ink/emojis/neofox/neofox.zip";
+    extraStatic."images/sylvia-ritter-15012323.avif" = inputs.florp-branding.packages.${pkgs.system}.wallpaper;
-        hash = "sha256-rZUPA7ZvrO8q/lx8XK3IxJ1URLgq0PSh752eWzG+uos=";
+    extraStatic."images/florp_banner.avif" = inputs.florp-branding.packages.${pkgs.system}.banner;
-      };
+    extraStatic."favicon.png" = inputs.florp-branding.packages.${pkgs.system}.favicon;
-
-      "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;
-    };
 
     frontends = {
       primary = {
@@ -94,14 +42,16 @@
         ref = "5f0339ce00";
       };
       admin = {
-        package = pkgs.akkoma-admin-fe;
+        package = pkgs.akkoma-frontends.admin-fe;
         name = "admin-fe";
         ref = "stable";
       };
     };
   };
   services.akkoma.config = let
-    inherit ((pkgs.formats.elixirConf { }).lib) mkRaw mkAtom;
+    inherit ((pkgs.formats.elixirConf { }).lib) mkRaw mkAtom mkTuple;
+
+    mapAttrsToListOfTuple = attr: lib.mapAttrsToList (name: value: mkTuple [ name value ]) attr;
 
     mkMapOfPredefinedKeys = set: let
       string = value: "\"${(lib.escape [ "\\" "#" "\"" ]) value}\"";
@@ -129,10 +79,10 @@
         limit = 69420;
         description_limit = 69420;
         remote_limit = 131072;
-        upload_limit = 256 * 1024 * 1024;
+        upload_limit = 160 * 1024 * 1024;
-        avatar_upload_limit = 4 * 1024 * 1024;
+        avatar_upload_limit = 16 * 1024 * 1024;
-        background_upload_limit = 8 * 1024 * 1024;
+        background_upload_limit = 32 * 1024 * 1024;
-        banner_upload_limit = 8 * 1024 * 1024;
+        banner_upload_limit = 32 * 1024 * 1024;
         registrations_open = true;
         registration_reason_length = 2048;
         account_approval_required = true;
@@ -155,21 +105,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";
@@ -213,9 +148,45 @@
       ];
 
       ":mrf".policies = map mkRaw [
+        "Pleroma.Web.ActivityPub.MRF.SimplePolicy"
+        "Pleroma.Web.ActivityPub.MRF.ObjectAgePolicy"
         "Pleroma.Web.ActivityPub.MRF.MediaProxyWarmingPolicy"
       ];
 
+      ":mrf_simple" = {
+        reject = mapAttrsToListOfTuple {
+          "bae.st" = "transphobia, queerphobia";
+          "brighteon.social" = "transphobia, right‐wing extremism";
+          "detroitriotcity.com" = "transphobia, queerphobia";
+          "freeatlantis.com" = "harassment";
+          "freespeechextremist.com" = "N/A";
+          "gab.com" = "N/A";
+          "gleasonator.com" = "transphobia";
+          "kitsunemimi.club" = "transphobia";
+          "kiwifarms.*" = "harassment";
+          "poa.st" = "queerphobia, racism, right‐wing extremism";
+          "seal.cafe" = "transphobia";
+          "social.quodverum.com" = "N/A";
+          "spinster.xyz" = "transphobia";
+          "truthsocial.co.in" = "N/A";
+          "varishangout.net" = "transphobia";
+          "activitypub-troll.cf" = "N/A";
+          "misskey-forkbomb.cf" = "security";
+          "repl.co" = "N/A";
+          "rape.pet" = "CSAM";
+          "childlove.space" = "CSAM";
+          "pedo.school" = "CSAM";
+          "loli.church" = "transphobia";
+          "usasa.ky" = "spam";
+          "tickler.cc" = "spam";
+          "shitposter.club" = "transphobia";
+        };
+
+        followers_only = mapAttrsToListOfTuple {
+          "bitcoinhackers.org" = "annoying";
+        };
+      };
+
       ":mrf_object_age".threshold = 180 * 24 * 3600;
 
       ":frontend_configurations" = {
@@ -227,6 +198,7 @@
           webPushNotifications = true;
           useStreamingApi = true;
           scopeCopy = true;
+          showFeaturesPanel = false;
           subjectLineBehavior = "masto";
           alwaysShowSubjectInput = true;
           postContentType = "text/markdown";
@@ -307,12 +279,6 @@
       };
       locations."^/media(/.*)$".return = "308 https://media.florp.social$1";
       locations."^/proxy(/.*)$".return = "308 https://cache.florp.social$1";
-      locations."= /api/v1/pleroma/admin/config" = {
-        return = ''200 "\{\"error\":\"You must enable configurable_from_database in your config file.\"\}"'';
-        extraConfig = ''
-          types { } default_type "application/json; charset=utf-8";
-        '';
-      };
     };
 
     "media.florp.social" = {

config/services/arrs/default.nix

@@ -17,7 +17,7 @@
     where = "/mnt/mezzomix";
     what = "mezzomix@otos.feralhosting.com:private/rtorrent/data";
     type = "fuse.sshfs";
-    options = "umask=0000,idmap=user,_netdev,rw,nosuid,allow_other,default_permissions,follow_symlinks,reconnect,max_conns=10,identityfile=/etc/keys/ssh_host_ed25519_key";
+    options = "_netdev,rw,nosuid,allow_other,default_permissions,follow_symlinks,identityfile=/etc/keys/ssh_host_ed25519_key";
   };
   systemd.automounts = lib.singleton {
     name = "mnt-mezzomix.automount";
@@ -35,8 +35,8 @@
       verifyClientCert = true;
       disableHttp3 = true;
       locations = {
-        "/".root = pkgs.writeTextDir "index.html" (builtins.readFile ./landingPage.html);
+#        "/".root = pkgs.writeTextDir "index.html" (builtins.readFile ./landingPage.html);
-        "/sonarr/" = {
+        "/" = {
           proxyPass = "http://127.0.0.1:8989";
           recommendedProxySettings = true;
         };

config/services/hydra/default.nix

@@ -30,8 +30,8 @@
     extraConfig = ''
       server_store_uri = https://cache.kyouma.net
       binary_cache_public_uri = https://cache.kyouma.net
-      evaluator_workers = 1
+      evaluator_workers = 8
-      evaluator_max_memory_size = 4096
+      evaluator_max_memory_size = 16384
       max_output_size = ${builtins.toString (24 * 1024 * 1024 * 1024)}
     '';
   };
@@ -44,8 +44,8 @@
   };
 
   systemd.services.hydra-evaluator.serviceConfig = {
-    MemoryHigh = "150G";
+    MemoryHigh = "250G";
-    MemoryMax = "155G";
+    MemoryMax = "254G";
   };
 
   kyouma.nginx.defaultForbidden = "hydra.kyouma.net";

config/services/hydra/nix-config.nix

@@ -25,11 +25,20 @@
       maxJobs = 0;
       speedFactor = 20;
       systems = [ "riscv64-linux" ];
-      supportedFeatures = base ++ [ "gccarch-rv64imac" "gccarch-rv64imacfd" "gccarch-rv64gc" ];
+      supportedFeatures = base ++ [ "gccarch-rv64imac" "gccarch-rv64imacfd" ];
       sshKey = config.sops.secrets."services/hydra/id_ed25519_hydra".path;
     }
-  ] ++ lib.forEach (lib.range 0 11) (num: {
+    {
-      hostName = "build-worker-${lib.fixedWidthNumber 2 num}";
+      hostName = "machine-0008.cloud-v.co";
+      sshUser = "root";
+      maxJobs = 2;
+      speedFactor = 4;
+      systems = [ "riscv64-linux" ];
+      supportedFeatures = base ++ [ "gccarch-rv64imac" "gccarch-rv64imacfd" ];
+      sshKey = config.sops.secrets."services/hydra/id_ed25519_hydra".path;
+    }
+  ] ++ lib.forEach (lib.genList (i: i + 1) 8) (num: {
+      hostName = "build-worker-0${toString num}";
       sshUser = "root";
       maxJobs = 2;
       speedFactor = 20;
@@ -54,9 +63,8 @@
       "build-worker-04.nyantec.com".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICOq+5I+nlAN2lJoOtoXrYEDuZ/TMPMa43pIlablYigK";
       "integra.kyouma.net".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIBwEQiSfaDrUAwgul4mktusBPcIVxI4pLNDh9DPopVU";
       "schrodinger.kyouma.net".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKo7vZ6lS1wx76YsbAdhOsGcc20YMAW52ep8SZ/FCHDp";
-      "lab.nyantec.com".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIUePtVPtBK+CYosufbaGiMT4EVanti4V5t2Wg0g/Fy4";
+      "[machine.cloud-v.co]:20008".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIK6Kri0cjPKEXXDEl2GwfwzPO9wuPZEgJS0M6lKRHCqH";
       "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,18 +73,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";
-      "[build-worker-kyoumanet-cdg.fly.dev]:2211".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINlH+v2ZlcDQY3itw4b7aRbwRTqDsTE0R5Ua3vF0VaGr";
     }; 
     extraConfig = ''
       Host machine-0008.cloud-v.co
         Hostname machine.cloud-v.co
         Port 20008
-    '' + lib.concatLines (lib.forEach (lib.range 0 11) (num: ''
+    '' + lib.concatLines (lib.genList (i: ''
-      Host build-worker-${lib.fixedWidthNumber 2 num}
+      Host build-worker-0${toString (i + 1)}
-        Hostname build-worker-kyoumanet${lib.optionalString (num > 8) "-cdg"}.fly.dev
+        Hostname build-worker-kyoumanet.fly.dev
-        Port 22${lib.fixedWidthNumber 2 num}
+        Port 220${toString (i + 1)}
-    ''));
+    '') 8);
   };
 }

config/users/lucy/default.nix

@@ -1,78 +0,0 @@
-{ inputs, pkgs, ... }: {
-  imports = [
-    inputs.home-manager.nixosModules.home-manager
-  ];
-
-  users.users.lucy = {
-    isNormalUser = true;
-    shell = pkgs.fish;
-    ignoreShellProgramCheck = true;
-    extraGroups = [ "wheel" ];
-    openssh.authorizedKeys.keys = [
-      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIId7XvwEHtC9KdGg4Bn+XE+yyBp7/dRToJX9T56mM7ln kosaki@kosaki"
-      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAZH8HwE1OxVAArRpc3+c7foYJ/WYjp4BqUyuab9yQyl emilia@emilia"
-    ];
-  };
-
-  home-manager.useGlobalPkgs = true;
-  home-manager.users.lucy = {
-    home.stateVersion = "24.11";
-
-    home.packages = with pkgs; [
-      whois
-      htop
-      restic
-      fend
-    ];
-    fonts.fontconfig.enable = true;
-
-    programs.bat.enable = true;
-    programs.gpg.enable = true;
-    programs.ripgrep.enable = true;
-
-    programs.tmux = {
-      enable = true;
-      prefix = "M-w";
-      clock24 = true;
-      extraConfig = ''
-        # unbind keys
-        unbind-key C-b
-
-        # new prefix
-        bind-key M-w send-prefix
-
-        # selection via vim keys
-        bind-key -r	h select-pane -L
-        bind-key -r	j select-pane -D
-        bind-key -r	k select-pane -U
-        bind-key -r	l select-pane -R
-
-        # resize aswell
-        bind-key -r	C-h resize-pane -L 5
-        bind-key -r	C-j resize-pane -D 5
-        bind-key -r	C-k resize-pane -U 5
-        bind-key -r	C-l resize-pane -R 5
-
-        bind-key	g split-window
-        bind-key	v split-window -h
-      '';
-    };
-
-    programs.eza = {
-      enable = true;
-      icons = "auto";
-      git = true;
-      extraOptions = [
-        "--color-scale=all"
-        "--color-scale-mode=gradient"
-        "--group-directories-first"
-      ];
-    };
-    programs.fish = {
-      enable = true;
-      interactiveShellInit = ''
-        set -U fish_greeting
-      '';
-    };
-  };
-}

config/users/nil/default.nix

@@ -1,49 +0,0 @@
-{ inputs, pkgs, ... }: {
-  imports = [
-    inputs.home-manager.nixosModules.home-manager 
-  ];
-
-  users.users.nil = {
-    isNormalUser = true;
-    shell = pkgs.fish;
-    ignoreShellProgramCheck = true;
-    extraGroups = [ "wheel" ];
-    openssh.authorizedKeys.keys = [
-      "sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAICczPHRwY9MAwDGlcB0QgMOJjcpLJhVU3covrW9RBS62AAAABHNzaDo="
-    ];
-  };
-
-  home-manager.useGlobalPkgs = true;
-  home-manager.users.nil = {
-    home.stateVersion = "24.11";
-
-    home.packages = with pkgs; [
-      whois
-      htop
-      restic
-      fend
-    ];
-    fonts.fontconfig.enable = true;
-
-    programs.bat.enable = true;
-    programs.gpg.enable = true;
-    programs.ripgrep.enable = true;
-
-    programs.eza = {
-      enable = true;
-      icons = "auto";
-      git = true;
-      extraOptions = [
-        "--color-scale=all"
-        "--color-scale-mode=gradient"
-        "--group-directories-first"
-      ];
-    };
-    programs.fish = {
-      enable = true;
-      interactiveShellInit = ''
-        set -U fish_greeting
-      '';
-    };
-  };
-}

flake.lock

@@ -30,11 +30,11 @@
         "fromYaml": "fromYaml"
       },
       "locked": {
-        "lastModified": 1732200724,
+        "lastModified": 1708890466,
-        "narHash": "sha256-+R1BH5wHhfnycySb7Sy5KbYEaTJZWm1h+LW1OtyhiTs=",
+        "narHash": "sha256-LlrC09LoPi8OPYOGPXegD72v+//VapgAqhbOFS3i8sc=",
         "owner": "SenchoPens",
         "repo": "base16.nix",
-        "rev": "153d52373b0fb2d343592871009a286ec8837aec",
+        "rev": "665b3c6748534eb766c777298721cece9453fdae",
         "type": "github"
       },
       "original": {
@@ -156,11 +156,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1732482708,
+        "lastModified": 1731549112,
-        "narHash": "sha256-B1MQLiWi4bbeNiRXKxEkpztnKyWae4x0LyK32v3DjLk=",
+        "narHash": "sha256-c9I3i1CwZ10SoM5npQQVnfwgvB86jAS3lT4ZqkRoSOI=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "47bc8dfb6f48d5f66a3cb3a4cece83d8ace1f61a",
+        "rev": "5fd852c4155a689098095406500d0ae3d04654a8",
         "type": "github"
       },
       "original": {
@@ -214,27 +214,6 @@
         "type": "github"
       }
     },
-    "firefox": {
-      "inputs": {
-        "neoidiosyn": "neoidiosyn",
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1732481910,
-        "narHash": "sha256-XXBdhGvx22lVDgIzzIHowBMGK7Z1jmmcZ6N22+ufu4A=",
-        "ref": "refs/heads/main",
-        "rev": "22fff6832b2828006061d5c8f781ca052f55bdb2",
-        "revCount": 4,
-        "type": "git",
-        "url": "https://woof.rip/mikael/firefox.git"
-      },
-      "original": {
-        "type": "git",
-        "url": "https://woof.rip/mikael/firefox.git"
-      }
-    },
     "flake-compat": {
       "flake": false,
       "locked": {
@@ -384,11 +363,11 @@
         "systems": "systems_2"
       },
       "locked": {
-        "lastModified": 1731533236,
+        "lastModified": 1710146030,
-        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
+        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
+        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
         "type": "github"
       },
       "original": {
@@ -416,24 +395,6 @@
       }
     },
     "flake-utils_4": {
-      "inputs": {
-        "systems": "systems_4"
-      },
-      "locked": {
-        "lastModified": 1731533236,
-        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
-    "flake-utils_5": {
       "inputs": {
         "systems": [
           "stylix",
@@ -469,21 +430,6 @@
         "type": "github"
       }
     },
-    "flakey-profile_2": {
-      "locked": {
-        "lastModified": 1712898590,
-        "narHash": "sha256-FhGIEU93VHAChKEXx905TSiPZKga69bWl1VB37FK//I=",
-        "owner": "lf-",
-        "repo": "flakey-profile",
-        "rev": "243c903fd8eadc0f63d205665a92d4df91d42d9d",
-        "type": "github"
-      },
-      "original": {
-        "owner": "lf-",
-        "repo": "flakey-profile",
-        "type": "github"
-      }
-    },
     "florp-about": {
       "inputs": {
         "nixpkgs": [
@@ -491,11 +437,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1731582952,
+        "lastModified": 1731279732,
-        "narHash": "sha256-hnvqHeekGal+hml6BQB254LsJn+Vk5QNKzkIu8rH/xs=",
+        "narHash": "sha256-eZllHPzbjvTNrzImqtDrs0k1LsIIeTlp8MMN9SxMvvE=",
         "ref": "refs/heads/main",
-        "rev": "f283dba73f777746e1675126f8fa4c5b1fd06152",
+        "rev": "2f1130b23576a403b9b1d70d6431649bfa044621",
-        "revCount": 10,
+        "revCount": 8,
         "type": "git",
         "url": "https://woof.rip/florp/about.git"
       },
@@ -524,34 +470,14 @@
         "url": "https://woof.rip/florp/branding.git"
       }
     },
-    "florp-moderation": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1732211216,
-        "narHash": "sha256-eXsk0hZ2sFAvQht9W6Xxej/8AHYCGzvATFLoY1xwG/o=",
-        "ref": "refs/heads/main",
-        "rev": "81f0a4377c1218d328e7996636a02faf0597efa0",
-        "revCount": 9,
-        "type": "git",
-        "url": "https://woof.rip/florp/moderation.git"
-      },
-      "original": {
-        "type": "git",
-        "url": "https://woof.rip/florp/moderation.git"
-      }
-    },
     "fromYaml": {
       "flake": false,
       "locked": {
-        "lastModified": 1731966426,
+        "lastModified": 1689549921,
-        "narHash": "sha256-lq95WydhbUTWig/JpqiB7oViTcHFP8Lv41IGtayokA8=",
+        "narHash": "sha256-iX0pk/uB019TdBGlaJEWvBCfydT6sRq+eDcGPifVsCM=",
         "owner": "SenchoPens",
         "repo": "fromYaml",
-        "rev": "106af9e2f715e2d828df706c386a685698f3223b",
+        "rev": "11fbbbfb32e3289d3c631e0134a23854e7865c84",
         "type": "github"
       },
       "original": {
@@ -577,11 +503,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1732021966,
+        "lastModified": 1730814269,
-        "narHash": "sha256-mnTbjpdqF0luOkou8ZFi2asa1N3AA2CchR/RqCNmsGE=",
+        "narHash": "sha256-fWPHyhYE6xvMI1eGY3pwBTq85wcy1YXqdzTZF+06nOg=",
         "owner": "cachix",
         "repo": "git-hooks.nix",
-        "rev": "3308484d1a443fc5bc92012435d79e80458fe43c",
+        "rev": "d70155fdc00df4628446352fc58adc640cd705c2",
         "type": "github"
       },
       "original": {
@@ -636,11 +562,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1732482255,
+        "lastModified": 1731535640,
-        "narHash": "sha256-GUffLwzawz5WRVfWaWCg78n/HrBJrOG7QadFY6rtV8A=",
+        "narHash": "sha256-2EckCJn4wxran/TsRiCOFcmVpep2m9EBKl99NBh2GnM=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "a9953635d7f34e7358d5189751110f87e3ac17da",
+        "rev": "35b055009afd0107b69c286fca34d2ad98940d57",
         "type": "github"
       },
       "original": {
@@ -725,68 +651,6 @@
       }
     },
     "lix": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1732112222,
-        "narHash": "sha256-H7GN4++a4vE49SUNojZx+FSk4mmpb2ifJUtJMJHProI=",
-        "rev": "66f6dbda32959dd5cf3a9aaba15af72d037ab7ff",
-        "type": "tarball",
-        "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/66f6dbda32959dd5cf3a9aaba15af72d037ab7ff.tar.gz?rev=66f6dbda32959dd5cf3a9aaba15af72d037ab7ff"
-      },
-      "original": {
-        "type": "tarball",
-        "url": "https://git.lix.systems/lix-project/lix/archive/main.tar.gz"
-      }
-    },
-    "lix-module": {
-      "inputs": {
-        "flake-utils": "flake-utils",
-        "flakey-profile": "flakey-profile",
-        "lix": [
-          "firefox",
-          "neoidiosyn",
-          "lix"
-        ],
-        "nixpkgs": [
-          "firefox",
-          "neoidiosyn",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1731967274,
-        "narHash": "sha256-n6dPGRlMGdL8X5gviA6ZuRfUdbdD5KiNN/BpABA5YT0=",
-        "rev": "aa2846680fa9a2032939d720487942567fd9eb63",
-        "type": "tarball",
-        "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/aa2846680fa9a2032939d720487942567fd9eb63.tar.gz?rev=aa2846680fa9a2032939d720487942567fd9eb63"
-      },
-      "original": {
-        "type": "tarball",
-        "url": "https://git.lix.systems/lix-project/nixos-module/archive/main.tar.gz"
-      }
-    },
-    "lix-module_2": {
-      "inputs": {
-        "flake-utils": "flake-utils_3",
-        "flakey-profile": "flakey-profile_2",
-        "lix": "lix_3",
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1729360442,
-        "narHash": "sha256-6U0CyPycIBc04hbYy2hBINnVso58n/ZyywY2BD3hu+s=",
-        "rev": "9098ac95768f7006d7e070b88bae76939f6034e6",
-        "type": "tarball",
-        "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/9098ac95768f7006d7e070b88bae76939f6034e6.tar.gz?rev=9098ac95768f7006d7e070b88bae76939f6034e6"
-      },
-      "original": {
-        "type": "tarball",
-        "url": "https://git.lix.systems/lix-project/nixos-module/archive/2.91.1-1.tar.gz"
-      }
-    },
-    "lix_2": {
       "inputs": {
         "flake-compat": "flake-compat_2",
         "nix2container": "nix2container",
@@ -795,52 +659,50 @@
         "pre-commit-hooks": "pre-commit-hooks"
       },
       "locked": {
-        "lastModified": 1729298361,
+        "lastModified": 1723503926,
-        "narHash": "sha256-hiGtfzxFkDc9TSYsb96Whg0vnqBVV7CUxyscZNhed0U=",
+        "narHash": "sha256-Rosl9iA9MybF5Bud4BTAQ9adbY81aGmPfV8dDBGl34s=",
-        "rev": "ad9d06f7838a25beec425ff406fe68721fef73be",
+        "rev": "bcaeb6388b8916ac6d1736e3aa2b13313e6a6bd2",
         "type": "tarball",
-        "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/ad9d06f7838a25beec425ff406fe68721fef73be.tar.gz?rev=ad9d06f7838a25beec425ff406fe68721fef73be"
+        "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/bcaeb6388b8916ac6d1736e3aa2b13313e6a6bd2.tar.gz?rev=bcaeb6388b8916ac6d1736e3aa2b13313e6a6bd2"
       },
       "original": {
         "type": "tarball",
-        "url": "https://git.lix.systems/lix-project/lix/archive/2.91.1.tar.gz"
+        "url": "https://git.lix.systems/lix-project/lix/archive/2.91.0.tar.gz"
       }
     },
-    "lix_3": {
+    "lix-module": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1729298361,
-        "narHash": "sha256-hiGtfzxFkDc9TSYsb96Whg0vnqBVV7CUxyscZNhed0U=",
-        "rev": "ad9d06f7838a25beec425ff406fe68721fef73be",
-        "type": "tarball",
-        "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/ad9d06f7838a25beec425ff406fe68721fef73be.tar.gz?rev=ad9d06f7838a25beec425ff406fe68721fef73be"
-      },
-      "original": {
-        "type": "tarball",
-        "url": "https://git.lix.systems/lix-project/lix/archive/2.91.1.tar.gz"
-      }
-    },
-    "neoidiosyn": {
       "inputs": {
-        "lix": "lix",
+        "flake-utils": "flake-utils_2",
-        "lix-module": "lix-module",
+        "flakey-profile": "flakey-profile",
+        "lix": "lix_2",
         "nixpkgs": [
-          "firefox",
           "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1732481879,
+        "lastModified": 1723510904,
-        "narHash": "sha256-Tj9yPVOA2JlAAFhynX9MRkwOd8VYeilkoesn8zzQr2E=",
+        "narHash": "sha256-zNW/rqNJwhq2lYmQf19wJerRuNimjhxHKmzrWWFJYts=",
-        "ref": "refs/heads/main",
+        "rev": "622a2253a071a1fb97a4d3c8103a91114acc1140",
-        "rev": "b7171c109da4f52bf59ad5159ec13ee9246ec28d",
+        "type": "tarball",
-        "revCount": 1,
+        "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/622a2253a071a1fb97a4d3c8103a91114acc1140.tar.gz?rev=622a2253a071a1fb97a4d3c8103a91114acc1140"
-        "type": "git",
-        "url": "https://woof.rip/mikael/neoidiosyn.git"
       },
       "original": {
-        "type": "git",
+        "type": "tarball",
-        "url": "https://woof.rip/mikael/neoidiosyn.git"
+        "url": "https://git.lix.systems/lix-project/nixos-module/archive/2.91.0.tar.gz"
+      }
+    },
+    "lix_2": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1723503926,
+        "narHash": "sha256-Rosl9iA9MybF5Bud4BTAQ9adbY81aGmPfV8dDBGl34s=",
+        "rev": "bcaeb6388b8916ac6d1736e3aa2b13313e6a6bd2",
+        "type": "tarball",
+        "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/bcaeb6388b8916ac6d1736e3aa2b13313e6a6bd2.tar.gz?rev=bcaeb6388b8916ac6d1736e3aa2b13313e6a6bd2"
+      },
+      "original": {
+        "type": "tarball",
+        "url": "https://git.lix.systems/lix-project/lix/archive/2.91.0.tar.gz"
       }
     },
     "nix-darwin": {
@@ -851,11 +713,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1732324260,
+        "lastModified": 1731153869,
-        "narHash": "sha256-0xzQvoId/P008QkTSAdFVv465P9rL9nYkIOWXL5pdsY=",
+        "narHash": "sha256-3Ftf9oqOypcEyyrWJ0baVkRpvQqroK/SVBFLvU3nPuc=",
         "owner": "lnl7",
         "repo": "nix-darwin",
-        "rev": "698a62c628c2ec423aa770d8ec0e1d0bcf4fca1a",
+        "rev": "5c74ab862c8070cbf6400128a1b56abb213656da",
         "type": "github"
       },
       "original": {
@@ -953,11 +815,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1732483221,
+        "lastModified": 1731403644,
-        "narHash": "sha256-kF6rDeCshoCgmQz+7uiuPdREVFuzhIorGOoPXMalL2U=",
+        "narHash": "sha256-T9V7CTucjRZ4Qc6pUEV/kpgNGzQbHWfGcfK6JJLfUeI=",
         "owner": "nixos",
         "repo": "nixos-hardware",
-        "rev": "45348ad6fb8ac0e8415f6e5e96efe47dd7f39405",
+        "rev": "f6581f1c3b137086e42a08a906bdada63045f991",
         "type": "github"
       },
       "original": {
@@ -1034,6 +896,22 @@
         "type": "github"
       }
     },
+    "nixpkgs-stable_2": {
+      "locked": {
+        "lastModified": 1730602179,
+        "narHash": "sha256-efgLzQAWSzJuCLiCaQUCDu4NudNlHdg2NzGLX5GYaEY=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "3c2f1c4ca372622cb2f9de8016c9a0b1cbd0f37c",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "release-24.05",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "nixpkgs_2": {
       "locked": {
         "lastModified": 1725001927,
@@ -1068,11 +946,11 @@
     },
     "nixpkgs_4": {
       "locked": {
-        "lastModified": 1732014248,
+        "lastModified": 1731139594,
-        "narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=",
+        "narHash": "sha256-IigrKK3vYRpUu+HEjPL/phrfh7Ox881er1UEsZvw9Q4=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "23e89b7da85c3640bbc2173fe04f4bd114342367",
+        "rev": "76612b17c0ce71689921ca12d9ffdc9c23ce40b2",
         "type": "github"
       },
       "original": {
@@ -1099,11 +977,11 @@
         "treefmt-nix": "treefmt-nix_2"
       },
       "locked": {
-        "lastModified": 1732478249,
+        "lastModified": 1731527733,
-        "narHash": "sha256-ka41KXN5B5C6yxJeIpFw5ytXFjd6vXJldw/5sN6y0CA=",
+        "narHash": "sha256-12OpSgbLDiKmxvBXwVracIfGI9FpjFyHpa1r0Ho+NFA=",
         "owner": "nix-community",
         "repo": "nixvim",
-        "rev": "a81a03a3f5dcdcdee5cbe831a9f2e81895e92875",
+        "rev": "f11a877bcc1d66cc8bd7990c704f91c1e99c7d08",
         "type": "github"
       },
       "original": {
@@ -1114,7 +992,7 @@
     },
     "nuschtosSearch": {
       "inputs": {
-        "flake-utils": "flake-utils_4",
+        "flake-utils": "flake-utils_3",
         "ixx": "ixx",
         "nixpkgs": [
           "nixvim",
@@ -1122,11 +1000,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1731936508,
+        "lastModified": 1731060242,
-        "narHash": "sha256-z0BSSf78LkxIrrFXZYmCoRRAxAmxMUKpK7CyxQRvkZI=",
+        "narHash": "sha256-43yLsOm/wxBbfYSNDWVJeVv5Ij+23X3BIjFUfsdx/6M=",
         "owner": "NuschtOS",
         "repo": "search",
-        "rev": "fe07070f811b717a4626d01fab714a87d422a9e1",
+        "rev": "ef493352f9e1f051e01a55c062731503a6b36b4e",
         "type": "github"
       },
       "original": {
@@ -1135,29 +1013,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": {
@@ -1180,21 +1035,18 @@
         "disko": "disko",
         "dns": "dns",
         "fernglas": "fernglas",
-        "firefox": "firefox",
+        "flake-utils": "flake-utils",
-        "flake-utils": "flake-utils_2",
         "florp-about": "florp-about",
         "florp-branding": "florp-branding",
-        "florp-moderation": "florp-moderation",
         "home-manager": "home-manager",
         "hydra": "hydra",
         "kyouma-www": "kyouma-www",
-        "lix": "lix_2",
+        "lix": "lix",
-        "lix-module": "lix-module_2",
+        "lix-module": "lix-module",
         "nixos-hardware": "nixos-hardware",
         "nixos-needsreboot": "nixos-needsreboot",
         "nixpkgs": "nixpkgs_4",
         "nixvim": "nixvim",
-        "oth": "oth",
         "sops-nix": "sops-nix",
         "stylix": "stylix"
       }
@@ -1203,14 +1055,15 @@
       "inputs": {
         "nixpkgs": [
           "nixpkgs"
-        ]
+        ],
+        "nixpkgs-stable": "nixpkgs-stable_2"
       },
       "locked": {
-        "lastModified": 1732186149,
+        "lastModified": 1731364708,
-        "narHash": "sha256-N9JGWe/T8BC0Tss2Cv30plvZUYoiRmykP7ZdY2on2b0=",
+        "narHash": "sha256-HC0anOL+KmUQ2hdRl0AtunbAckasxrkn4VLmxbW/WaA=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "53c853fb1a7e4f25f68805ee25c83d5de18dc699",
+        "rev": "4c91d52db103e757fc25b58998b0576ae702d659",
         "type": "github"
       },
       "original": {
@@ -1226,7 +1079,7 @@
         "base16-helix": "base16-helix",
         "base16-vim": "base16-vim",
         "flake-compat": "flake-compat_4",
-        "flake-utils": "flake-utils_5",
+        "flake-utils": "flake-utils_4",
         "gnome-shell": "gnome-shell",
         "home-manager": [
           "home-manager"
@@ -1234,17 +1087,17 @@
         "nixpkgs": [
           "nixpkgs"
         ],
-        "systems": "systems_5",
+        "systems": "systems_4",
         "tinted-foot": "tinted-foot",
         "tinted-kitty": "tinted-kitty",
         "tinted-tmux": "tinted-tmux"
       },
       "locked": {
-        "lastModified": 1732261424,
+        "lastModified": 1731537763,
-        "narHash": "sha256-8uTKUHkaU980J5kRnLYrdwmjZYB88eBGUk1oVgIUHFE=",
+        "narHash": "sha256-dOjxeHAXbQ4KRe5j9uClFp8SyYY2r62bbsdraETtO84=",
         "owner": "danth",
         "repo": "stylix",
-        "rev": "b667a340730dd3d0596083aa7c949eef01367c62",
+        "rev": "be94701ce7b746cb020e667f71492e398ed470f4",
         "type": "github"
       },
       "original": {
@@ -1313,21 +1166,6 @@
         "type": "github"
       }
     },
-    "systems_5": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
     "tinted-foot": {
       "flake": false,
       "locked": {
@@ -1408,11 +1246,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1732292307,
+        "lastModified": 1730321837,
-        "narHash": "sha256-5WSng844vXt8uytT5djmqBCkopyle6ciFgteuA9bJpw=",
+        "narHash": "sha256-vK+a09qq19QNu2MlLcvN4qcRctJbqWkX7ahgPZ/+maI=",
         "owner": "numtide",
         "repo": "treefmt-nix",
-        "rev": "705df92694af7093dfbb27109ce16d828a79155f",
+        "rev": "746901bb8dba96d154b66492a29f5db0693dbfcc",
         "type": "github"
       },
       "original": {

flake.nix

@@ -21,20 +21,12 @@
       url = "github:wobcom/fernglas";
       inputs.flake-utils.follows = "flake-utils";
     };
-    firefox = {
-      url = "git+https://woof.rip/mikael/firefox.git";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-    florp-about = {
-      url = "git+https://woof.rip/florp/about.git";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
     florp-branding = {
       url = "git+https://woof.rip/florp/branding.git";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    florp-moderation = {
+    florp-about = {
-      url = "git+https://woof.rip/florp/moderation.git";
+      url = "git+https://woof.rip/florp/about.git";
       inputs.nixpkgs.follows = "nixpkgs";
     };
     home-manager = {
@@ -50,9 +42,9 @@
       inputs.nixpkgs.follows = "nixpkgs";
       inputs.flake-utils.follows = "flake-utils";
     };
-    lix.url = "https://git.lix.systems/lix-project/lix/archive/2.91.1.tar.gz";
+    lix.url = "https://git.lix.systems/lix-project/lix/archive/2.91.0.tar.gz";
     lix-module = {
-      url = "https://git.lix.systems/lix-project/nixos-module/archive/2.91.1-1.tar.gz";
+      url = "https://git.lix.systems/lix-project/nixos-module/archive/2.91.0.tar.gz";
       inputs.nixpkgs.follows = "nixpkgs";
     };
     nixos-needsreboot = {
@@ -64,11 +56,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

@@ -1,4 +1,4 @@
-{ config, inputs, lib, pkgs, ... }: {
+{ config, lib, pkgs, ... }: {
   config.home-manager.users.emily = lib.mkIf (config.kyouma.graphical.compositor == "hyprland") {
     wayland.windowManager.hyprland = {
       enable = true;
@@ -9,8 +9,6 @@
         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";
         brightnessctl = "${pkgs.brightnessctl}/bin/brightnessctl";
         screenshot = "~/.local/bin/hypr/screenshot.sh";
         rofi = "${pkgs.rofi-wayland}/bin/rofi";

pkgs/akkoma-admin-fe/default.nix

@@ -1,7 +0,0 @@
-{
-  akkoma-frontends 
-}:
-
-akkoma-frontends.admin-fe.overrideAttrs {
-  patches = [ ./disable-options.patch ];
-}

pkgs/akkoma-admin-fe/disable-options.patch

@@ -1,12 +0,0 @@
-diff --git a/config/prod.env.js b/config/prod.env.js
-index 7acb93a2..ea500e99 100644
---- a/config/prod.env.js
-+++ b/config/prod.env.js
-@@ -2,6 +2,6 @@ module.exports = {
-   NODE_ENV: '"production"',
-   ENV_CONFIG: '"prod"',
-   BASE_API: '"https://api-prod"',
--  DISABLED_FEATURES: '[""]',
-+  DISABLED_FEATURES: '["settings","media-proxy-cache","relays"]',
-   ASSETS_PUBLIC_PATH: '/pleroma/admin/'
- }

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'

pkgs/build-worker-oci/default.nix

@@ -51,9 +51,6 @@ dockerTools.buildLayeredImage {
     ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOpyVefbZLkNVNzdSIlO6x6JohHE1snoHiUB3Qdvl5I2 aprl@idk
     ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDVNo871p97NTefP52KYiwuch+FaVScxvcFd9fg0yykySTq7Y5JsxrJQgTnox/oDa0O87OyHD/GHQljAXkqiHpDkExbiGjDmGXJSKReKH061F4FqBnDIwYRzUu9Cxjl4MNqsU0RqLaz4+F42c/L7GROQwjEPUb8JHThRiI5FJnDvvB+oBLBxeyQA4v3O4i8DaDQayTr/XB+aSlhNwKrb6cjjL93AHT1uE53yY5jn4kZX+RiPQhH7rvt9N6E4Yr3CG6nUgRCUS0L66d9yfrq0XAbAVk9F+viV7Nk9qy4MWHtXZ4h0qUlzrGALPgGsCGiLGd4NvEgeCcV4nvxdmevxTSdKlJP75xlmlLVXGyhqCZkTsxm/png2UvDl+p0pLyrgNaNoXPdE0Jbv7C28WX36Nast1QFSMUhexzuOx8OgaOioeXVfK98AouqWb58iPBCvgreUIH/gJhZcnlB/Foo1KSO+fJNH8hAsLH7w0mnKyHhJjkrjjwUqsnpepB3SOLfZTE= aprl@meow
     ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQD0v3tUBNEUxfoOQBFb+N2DUBQDay0iFggUWa9Nd+BtFLOKkz+RRto3eBF0ZiJZVUxv/hLb8m2s45hcMw8agwuPrXMe5085T1fzkvPdKAPZdsT/cCmBi1OsoLjAKBFIdM4lcV0A2cca8hip+/ZPpjFPUWx73/672gAPHU7co7fP8+8CSf9dx+WIeLx3yaYHYZ/th3dB5auX3VjOazS8MojsAorwTUeBoPamHQ5dFeNafhFUL/hhtGkUI1cNHUn3bJd2V7AKTW3UglK7hVgMJPrzVS31OlpcJEf6S5XgKTWdOSwubn1bs5Lt6YYRDU24NV6CGrwKgCJSRxzNMLwpnFKiSXpO8FzkqWHYWyju141hQcFF31aZIV+7YcwEt5ZukLjFOpVtpbSXvJYigOUzGi34P3/OAGshDXjTQjvM8GIir49gx3b2Nwhg0z4UHBkAKZvDDFPHDMJoclvnhITojaAojfC9zmMCO5ZaEsk8yv7c/lWQumzRpfldWF4mwHvhD5kTADbhRdO7WTdX7AaiAYINooToeWKjFe2wn3rFubPUppptqtP03mmvs7vhhgnEVBbGZRJK3GTVk1XcsfF9rDKzewSa+wb4LsBoZtFRhc8cJqHGlKWSNk7dQ04B1atPyNLKGpGoo/UIPxyZ6bSqFVxY3nhz46VZ6z8XWI48z0/fRQ== aprl@uwu
-    ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAAl3/krXJeCcDEJXRuzOdCOrJLG7b6MRqC+a9Xux3mW vika@hydrangea
-    ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHQjTy9qqHcs5vgTz+iMAiNNMqdyGtOhEpnpJCReEFfZ vika@rafflesia
-    sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAINAgFdk78I4zssUGsAIV01zefLBpwc1W7hfTobbG80XLAAAABHNzaDo= vika@nitrokey
     EOF
 
     cat <<EOF > /root/.ssh/environment

pkgs/build-worker-oci/source.nix

@@ -4,8 +4,8 @@
 
 dockerTools.pullImage {
   imageName = "nixos/nix";
-  imageDigest = "sha256:133a1607deea14a02c2bc0850e275ed135814235a1147f68967afee261caea2b";
+  imageDigest = "sha256:fd7a5c67d396fe6bddeb9c10779d97541ab3a1b2a9d744df3754a99add4046f1";
-  sha256 = "0602a59g14l1jiqfffz14hcp982qaqczi5f0ylvv0h9pp2pqrqs5";
+  sha256 = "1ggkwd9zw8lj97ig7zah7dqy463hfhsgq3iwxxf8117gf8xi422s";
   finalImageName = "nixos/nix";
   finalImageTag = "latest";
 }

pkgs/overlay.nix

@@ -6,7 +6,6 @@ final: prev: {
   librespeed-rust = final.callPackage ./librespeed-rust/default.nix {};
   librespeed-go = final.callPackage ./librespeed-go/default.nix {};
   akkoma-fe-domi = final.callPackage ./akkoma-fe-domi/default.nix {};
-  akkoma-admin-fe = final.callPackage ./akkoma-admin-fe/default.nix {};
   nginxQuic = prev.nginxQuic.override { 
     withSlice = true;
     # Use zlib because zlib-ng uses larger buffers then nginx preallocates.

pkgs/update-nixfiles/update-nixfiles.sh

@@ -23,9 +23,7 @@ merge_theirs () {
 test_build () {
   local build_jobs
 
-  sleep 30
+  build_jobs="$(curl --fail -s -L -H "Accept: application/json" "${JOBSET_URL}/latest-eval" | jq -r ".builds | .[]")"
-
-  build_jobs="$(curl --fail -s -L -H "Accept: application/json" "${JOBSET_URL}/evals" | jq -r ".evals | max_by(.id) | .builds | .[]")"
   for build in ${build_jobs}; do 
     local build_status