diff --git a/flake.lock b/flake.lock index bddaa78c..93b277a3 100644 --- a/flake.lock +++ b/flake.lock @@ -259,6 +259,7 @@ "nixos-apple-silicon": "nixos-apple-silicon", "nixpkgs": "nixpkgs_3", "nixpkgs-unstable": "nixpkgs-unstable", + "signal-aarch64": "signal-aarch64", "unambig-path": "unambig-path", "unispect": "unispect" } @@ -279,6 +280,26 @@ "type": "github" } }, + "signal-aarch64": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1739931434, + "narHash": "sha256-XIcisx/PG/Li6l9A0k7T1ule3yX7VCGBQmKpljbbJmU=", + "owner": "youwen5", + "repo": "signal-desktop-flake", + "rev": "6f0ec210e6a2a0060ad1297d9f5a0871c4aeac36", + "type": "github" + }, + "original": { + "owner": "youwen5", + "repo": "signal-desktop-flake", + "type": "github" + } + }, "systems": { "locked": { "lastModified": 1681028828, diff --git a/flake.nix b/flake.nix index 3907e21c..2bea903e 100644 --- a/flake.nix +++ b/flake.nix @@ -35,9 +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"; + }; }; - outputs = { self, nixpkgs, nixpkgs-unstable, home-manager, nix-darwin, kak, unispect, ansi-utils, unambig-path, nixos-apple-silicon }: + outputs = { self, nixpkgs, nixpkgs-unstable, home-manager, nix-darwin, kak, unispect, ansi-utils, unambig-path, nixos-apple-silicon, signal-aarch64 }: let mkPkgs = system: import nixpkgs { system = system; config.allowUnfree = true; }; mkPkgsUnstable = system: import nixpkgs-unstable { system = system; config.allowUnfree = true; }; @@ -213,7 +217,7 @@ nixos-apple-silicon.nixosModules.apple-silicon-support ./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; }) + (import ./nixos/machines/foxhut/machine.nix { inherit pkgs pkgs-unstable asahi-firmware signal-aarch64; }) base networking graphical diff --git a/nixos/machines/foxhut/machine.nix b/nixos/machines/foxhut/machine.nix index 7041b1e7..c057c902 100644 --- a/nixos/machines/foxhut/machine.nix +++ b/nixos/machines/foxhut/machine.nix @@ -1,16 +1,11 @@ -{ pkgs, pkgs-unstable, asahi-firmware, ... }: +{ pkgs, pkgs-unstable, asahi-firmware, signal-aarch64, ... }: { config, ... }: -# signal needs to be updated quite continuously. https://lazamar.co.uk/nix-versions/ is nice -let pkgs-signal = import (builtins.fetchTarball { - url = "https://github.com/NixOS/nixpkgs/archive/2ee7b5ee169e9634ea8c331ac67ada859a386676.tar.gz"; - sha256 = "11n1mg1vyi9w2k71g7v4la3k79f906nvyvn79gyrjdyaz9lj9wsi"; - }) { - inherit (pkgs) system; - }; +let signal-desktop = signal-aarch64.packages.aarch64-linux.signal-desktop.override { electronPageSizeFix = true; }; in { environment.systemPackages = (with pkgs-unstable; [ renoise + signal-desktop wireguard-tools cifs-utils sshfs @@ -19,7 +14,7 @@ in { vlc ]) ++ (with pkgs; [ prismlauncher - ]) ++ [pkgs-signal.signal-desktop]; + ]) ++ [ signal-desktop ]; services.mysql = { enable = true;