xenia/home
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

change signal back to mainline nixpkgs

Browse Source
This commit is contained in:
xenia 2025-04-30 21:41:31 +02:00
parent 912377ce82
commit 1b4fbc8657
3 changed files with 4 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
flake.lock
View File

@ -320,7 +320,6 @@
"nixos-apple-silicon": "nixos-apple-silicon", "nixos-apple-silicon": "nixos-apple-silicon",
"nixpkgs": "nixpkgs_2", "nixpkgs": "nixpkgs_2",
"nixpkgs-unstable": "nixpkgs-unstable", "nixpkgs-unstable": "nixpkgs-unstable",
"signal-aarch64": "signal-aarch64",
"unambig-path": "unambig-path", "unambig-path": "unambig-path",
"unispect": "unispect" "unispect": "unispect"
} }
@ -341,26 +340,6 @@
"type": "github" "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": { "systems": {
"locked": { "locked": {
"lastModified": 1681028828, "lastModified": 1681028828,

8
flake.nix
View File

@ -35,17 +35,13 @@
# TODO: when nixos-24.11 drops, change this # TODO: when nixos-24.11 drops, change this
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
signal-aarch64 = {
url = "github:youwen5/signal-desktop-flake";
inputs.nixpkgs.follows = "nixpkgs";
};
niri = { niri = {
url = "github:sodiboo/niri-flake"; url = "github:sodiboo/niri-flake";
inputs.nixpkgs.follows = "nixpkgs"; 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 let
mkPkgs = system: import nixpkgs { system = system; config.allowUnfree = true; }; mkPkgs = system: import nixpkgs { system = system; config.allowUnfree = true; };
mkPkgsUnstable = system: import nixpkgs-unstable { system = system; config.allowUnfree = true; }; mkPkgsUnstable = system: import nixpkgs-unstable { system = system; config.allowUnfree = true; };
@ -222,7 +218,7 @@
niri.nixosModules.niri niri.nixosModules.niri
./nixos/machines/foxhut/hardware.nix ./nixos/machines/foxhut/hardware.nix
(import ./nixos/machines/foxhut/boot.nix { inherit pkgs pkgs-unstable asahi-firmware; }) (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 base
networking networking
graphical graphical

4
nixos/machines/foxhut/machine.nix
View File

@ -1,7 +1,7 @@
{ pkgs, pkgs-unstable, asahi-firmware, signal-aarch64, ... }: { pkgs, pkgs-unstable, asahi-firmware, ... }:
{ config, ... }: { config, ... }:
let signal-desktop = signal-aarch64.packages.aarch64-linux.signal-desktop.override { electronPageSizeFix = true; }; let signal-desktop = pkgs.signal-desktop;
in { in {
environment.systemPackages = (with pkgs-unstable; [ environment.systemPackages = (with pkgs-unstable; [
renoise renoise