From 1b4fbc8657867ef4cffb331c25f3560cf062bcff Mon Sep 17 00:00:00 2001
From: xenia <xenia.agda@gmail.com>
Date: Wed, 30 Apr 2025 21:41:31 +0200
Subject: [PATCH] change signal back to mainline nixpkgs

---
 flake.lock                        | 21 ---------------------
 flake.nix                         |  8 ++------
 nixos/machines/foxhut/machine.nix |  4 ++--
 3 files changed, 4 insertions(+), 29 deletions(-)

diff --git a/flake.lock b/flake.lock
index 7167ef6c..45ec15d8 100644
--- a/flake.lock
+++ b/flake.lock
@@ -320,7 +320,6 @@
         "nixos-apple-silicon": "nixos-apple-silicon",
         "nixpkgs": "nixpkgs_2",
         "nixpkgs-unstable": "nixpkgs-unstable",
-        "signal-aarch64": "signal-aarch64",
         "unambig-path": "unambig-path",
         "unispect": "unispect"
       }
@@ -341,26 +340,6 @@
         "type": "github"
       }
     },
-    "signal-aarch64": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1745037528,
-        "narHash": "sha256-twzHVBNEX6daUCFwtjn3X7WaJnwRqHeAxX0MB7kosHo=",
-        "owner": "youwen5",
-        "repo": "signal-desktop-flake",
-        "rev": "1b41af6489574da6ba1e0186235c87acbf57163f",
-        "type": "github"
-      },
-      "original": {
-        "owner": "youwen5",
-        "repo": "signal-desktop-flake",
-        "type": "github"
-      }
-    },
     "systems": {
       "locked": {
         "lastModified": 1681028828,
diff --git a/flake.nix b/flake.nix
index 52c193f3..275f6c07 100644
--- a/flake.nix
+++ b/flake.nix
@@ -35,17 +35,13 @@
       # TODO: when nixos-24.11 drops, change this
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    signal-aarch64 = {
-      url = "github:youwen5/signal-desktop-flake";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
     niri = {
       url = "github:sodiboo/niri-flake";
       inputs.nixpkgs.follows = "nixpkgs";
     };
   };
 
-  outputs = { self, nixpkgs, nixpkgs-unstable, home-manager, nix-darwin, kak, unispect, ansi-utils, unambig-path, nixos-apple-silicon, signal-aarch64, niri }:
+  outputs = { self, nixpkgs, nixpkgs-unstable, home-manager, nix-darwin, kak, unispect, ansi-utils, unambig-path, nixos-apple-silicon, niri }:
     let
       mkPkgs = system: import nixpkgs { system = system; config.allowUnfree = true; };
       mkPkgsUnstable = system: import nixpkgs-unstable { system = system; config.allowUnfree = true; };
@@ -222,7 +218,7 @@
               niri.nixosModules.niri
               ./nixos/machines/foxhut/hardware.nix
               (import ./nixos/machines/foxhut/boot.nix { inherit pkgs pkgs-unstable asahi-firmware; })
-              (import ./nixos/machines/foxhut/machine.nix { inherit pkgs pkgs-unstable asahi-firmware signal-aarch64; })
+              (import ./nixos/machines/foxhut/machine.nix { inherit pkgs pkgs-unstable asahi-firmware; })
               base
               networking
               graphical
diff --git a/nixos/machines/foxhut/machine.nix b/nixos/machines/foxhut/machine.nix
index ca5667c4..4005c3b2 100644
--- a/nixos/machines/foxhut/machine.nix
+++ b/nixos/machines/foxhut/machine.nix
@@ -1,7 +1,7 @@
-{ pkgs, pkgs-unstable, asahi-firmware, signal-aarch64, ... }:
+{ pkgs, pkgs-unstable, asahi-firmware, ... }:
 { config, ... }:
 
-let signal-desktop = signal-aarch64.packages.aarch64-linux.signal-desktop.override { electronPageSizeFix = true; };
+let signal-desktop = pkgs.signal-desktop;
 in {
   environment.systemPackages = (with pkgs-unstable; [
     renoise