fix eval

config/services/akkoma/default.nix

@@ -2,6 +2,9 @@
   pkgs,
   config,
   system,
+  akkoma,
+  admin-fe,
+  akkoma-fe,
   ...
 }: let
   purge_url_script = pkgs.writeScript "purge-url" ''
@@ -29,8 +32,8 @@
     name = "akkoma-static";
     src = pkgs.emptyDirectory;
     nativeBuildInputs = with pkgs; [xorg.lndir];
-    akkoma_fe = pkgs.akkoma-fe;
-    akkoma_admin_fe = pkgs.admin-fe;
+    akkoma_fe = akkoma-fe.packages.${system}.akkoma-fe;
+    akkoma_admin_fe = admin-fe.packages.${system}.admin-fe;
     inherit fedibird_fe;
     tos = ./terms-of-service.html;
     dontUnpack = false;
@@ -263,7 +266,7 @@
 in {
   services.pleroma = {
     enable = true;
-    package = pkgs.akkoma;
+    package = akkoma.packages.${system}.akkoma;
     configs = [
       ''
         import Config

flake.nix

@@ -187,12 +187,6 @@ rec {
               home-manager.nixosModules.home-manager
               ({pkgs, ...}: {
                 home-manager.extraSpecialArgs = args // {inherit system;};
-                nixpkgs.overlays = [
-                  args.admin-fe.overlays.default
-                  args.akkoma.overlays.default
-                  args.akkoma-fe.overlays.default
-                  args.element-web.overlays.default
-                ];
               })
               (import utils/link-input.nix args)
             ];
@@ -225,6 +219,44 @@ rec {
         ];
       };
     formatter.x86_64-linux = nixpkgs.legacyPackages.x86_64-linux.alejandra;
+    packages.x86_64-linux = let
+      pkgs = import nixpkgs {
+        system = "x86_64-linux";
+        overlays = [
+          self.overlays.x86_64-linux
+          args.nix-packages.overlays.x86_64-linux.default
+        ];
+        config.allowUnfree = true;
+      };
+    in {
+      neovim-base = args.nix-neovim.buildNeovim {
+        inherit pkgs;
+        configuration = import ./config/programs/vim/configuration.nix false;
+      };
+      neovim = args.nix-neovim.buildNeovim {
+        inherit pkgs;
+        configuration = import ./config/programs/vim/configuration.nix true;
+      };
+    };
+    packages.aarch64-linux = let
+      pkgs = import nixpkgs {
+        system = "aarch64-linux";
+        overlays = [
+          self.overlays.aarch64-linux
+          args.nix-packages.overlays.aarch64-linux.default
+        ];
+        config.allowUnfree = true;
+      };
+    in {
+      neovim-base = args.nix-neovim.buildNeovim {
+        inherit pkgs;
+        configuration = import ./config/programs/vim/configuration.nix false;
+      };
+      neovim = args.nix-neovim.buildNeovim {
+        inherit pkgs;
+        configuration = import ./config/programs/vim/configuration.nix true;
+      };
+    };
     hydraJobs =
       (builtins.listToAttrs (map
         ({
@@ -240,6 +272,7 @@ rec {
         systems))
       // {
         inherit devShell;
+        inherit packages;
         # Uncomment the line to build an installer image
         # This is EXTREMELY LARGE and will make builds take forever
         # installer.x86_64-linux = nixosConfigurations.installer.config.system.build.isoImage;

overlays/default.nix

@@ -74,4 +74,5 @@ in
       doCheck = false;
       doInstallCheck = false;
     });
+    inherit (inputs.element-web.packages.${system}) element-web;
   }