From 358206f6fb035d6bdbc5880645b0624540377c1f Mon Sep 17 00:00:00 2001
From: Noah Masur <7386960+nmasur@users.noreply.github.com>
Date: Sun, 14 Apr 2024 08:28:39 -0400
Subject: [PATCH] arrow image package derivation

---
 .github/workflows/arrow.yml        |  2 +-
 flake.nix                          | 10 ++++------
 overlays/bypass-paywalls-clean.nix | 29 ++++++++++++++++-------------
 3 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/arrow.yml b/.github/workflows/arrow.yml
index 753e985..85bf9ea 100644
--- a/.github/workflows/arrow.yml
+++ b/.github/workflows/arrow.yml
@@ -65,7 +65,7 @@ jobs:
       # Build the image
       - name: Build Image
         if: inputs.rebuild && inputs.action != 'destroy'
-        run: nix build .#image.arrow
+        run: nix build .#arrow
 
       - name: Upload Image to S3
         if: inputs.rebuild && inputs.action != 'destroy'
diff --git a/flake.nix b/flake.nix
index 3b69d5c..c8770f9 100644
--- a/flake.nix
+++ b/flake.nix
@@ -341,12 +341,10 @@
         in
         {
           x86_64-linux.staff = staff "x86_64-linux";
-          x86_64-linux.image = {
-            arrow = inputs.nixos-generators.nixosGenerate {
-              system = "x86_64-linux";
-              format = "iso";
-              modules = import ./hosts/arrow/modules.nix { inherit inputs globals overlays; };
-            };
+          x86_64-linux.arrow = inputs.nixos-generators.nixosGenerate {
+            system = "x86_64-linux";
+            format = "iso";
+            modules = import ./hosts/arrow/modules.nix { inherit inputs globals overlays; };
           };
 
           # Package Neovim config into standalone package
diff --git a/overlays/bypass-paywalls-clean.nix b/overlays/bypass-paywalls-clean.nix
index cd6eab6..8e7aebd 100644
--- a/overlays/bypass-paywalls-clean.nix
+++ b/overlays/bypass-paywalls-clean.nix
@@ -3,17 +3,20 @@ inputs: _final: prev: {
   # Based on:
   # https://git.sr.ht/~rycee/nur-expressions/tree/master/item/pkgs/firefox-addons/default.nix#L34
 
-  bypass-paywalls-clean = let addonId = "magnolia@12.34";
-  in prev.stdenv.mkDerivation rec {
-    pname = "bypass-paywalls-clean";
-    version = "3.4.9.0";
-    src = inputs.bypass-paywalls-clean + "/bypass_paywalls_clean-3.6.3.0.xpi";
-    preferLocalBuild = true;
-    allowSubstitutes = true;
-    buildCommand = ''
-      dst="$out/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}"
-      mkdir -p "$dst"
-      install -v -m644 "${src}" "$dst/${addonId}.xpi"
-    '';
-  };
+  bypass-paywalls-clean =
+    let
+      addonId = "magnolia@12.34";
+    in
+    prev.stdenv.mkDerivation rec {
+      pname = "bypass-paywalls-clean";
+      version = "3.4.9.0";
+      src = inputs.bypass-paywalls-clean + "/bypass_paywalls_clean-3.6.3.0.xpi";
+      preferLocalBuild = true;
+      allowSubstitutes = true;
+      buildCommand = ''
+        dst="$out/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}"
+        mkdir -p "$dst"
+        install -v -m644 "${src}" "$dst/${addonId}.xpi"
+      '';
+    };
 }