From fc15a9605bb87eeb8516ac18999c06e860e3af41 Mon Sep 17 00:00:00 2001 From: alejandro-angulo Date: Sat, 20 Sep 2025 21:56:51 -0700 Subject: [PATCH 1/4] Update lockfile --- flake.lock | 49 ++++++++++++++++++++++++++----------------------- 1 file changed, 26 insertions(+), 23 deletions(-) diff --git a/flake.lock b/flake.lock index a3ae358..8aaeecf 100644 --- a/flake.lock +++ b/flake.lock @@ -62,11 +62,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1757320803, - "narHash": "sha256-7PUIQOMQSJLkNtV42SAYUDw0mRdbBNl6q8pLN8GViwM=", + "lastModified": 1758270360, + "narHash": "sha256-yqh6EEhlpVWRoKl85o1s+QZ72UHWTvornnc3C0Ls484=", "owner": "catppuccin", "repo": "nix", - "rev": "d75e3fe67f49728cb5035bc791f4b9065ff3a2c9", + "rev": "2e0aacdd6abbecd1b1c0511a2fcd1460a6bc6645", "type": "github" }, "original": { @@ -101,6 +101,7 @@ "inputs": { "cachix": "cachix", "flake-compat": "flake-compat_2", + "flake-parts": "flake-parts", "git-hooks": "git-hooks", "nix": "nix", "nixpkgs": [ @@ -108,11 +109,11 @@ ] }, "locked": { - "lastModified": 1757570236, - "narHash": "sha256-Gy15+KtKc/MyT4L9Ad/2wkXQvDiMkhtKy9Tnn3+kPww=", + "lastModified": 1758366037, + "narHash": "sha256-5PK0eHAWMtwaexQ7PR68gzpeo5WjMY9hq2BcEBHjSLA=", "owner": "cachix", "repo": "devenv", - "rev": "c57bded76fa6a885ab1dee2c75216cc23d58b311", + "rev": "ebb56bfe1aa0936de2f8a68c616dabff1285e905", "type": "github" }, "original": { @@ -173,16 +174,15 @@ "inputs": { "nixpkgs-lib": [ "devenv", - "nix", "nixpkgs" ] }, "locked": { - "lastModified": 1733312601, - "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", + "lastModified": 1756770412, + "narHash": "sha256-+uWLQZccFHwqpGqr2Yt5VsW/PbeJVTn9Dk6SHWhNRPw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", + "rev": "4524271976b625a4a605beefd893f270620fd751", "type": "github" }, "original": { @@ -341,11 +341,11 @@ ] }, "locked": { - "lastModified": 1757784838, - "narHash": "sha256-6aHo1++bAFdW1z+0tfuxM9EmxHvon90mHo8/+izXMcY=", + "lastModified": 1758375677, + "narHash": "sha256-BLtD+6qWz7fQjPk2wpwyXQLGI0E30Ikgf2ppn2nVadI=", "owner": "nix-community", "repo": "home-manager", - "rev": "6e28513cf2ee9a985c339fcef24d44f43d23456b", + "rev": "edc7468e12be92e926847cb02418e649b02b59dd", "type": "github" }, "original": { @@ -391,7 +391,10 @@ "devenv", "flake-compat" ], - "flake-parts": "flake-parts", + "flake-parts": [ + "devenv", + "flake-parts" + ], "git-hooks-nix": [ "devenv", "git-hooks" @@ -460,11 +463,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1757775351, - "narHash": "sha256-xWsxmNHwt9jV/yFJqzsNeilpH4BR8MPe44Yt0eaGAIM=", + "lastModified": 1757943327, + "narHash": "sha256-w6cDExPBqbq7fTLo4dZ1ozDGeq3yV6dSN4n/sAaS6OM=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "f89c620d3d6e584d98280b48f0af7be4f8506ab5", + "rev": "67a709cfe5d0643dafd798b0b613ed579de8be05", "type": "github" }, "original": { @@ -476,11 +479,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1756266583, - "narHash": "sha256-cr748nSmpfvnhqSXPiCfUPxRz2FJnvf/RjJGvFfaCsM=", + "lastModified": 1758035966, + "narHash": "sha256-qqIJ3yxPiB0ZQTT9//nFGQYn8X/PBoJbofA7hRKZnmE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8a6d5427d99ec71c64f0b93d45778c889005d9c2", + "rev": "8d4ddb19d03c65a36ad8d189d001dc32ffb0306b", "type": "github" }, "original": { @@ -507,11 +510,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1757487488, - "narHash": "sha256-zwE/e7CuPJUWKdvvTCB7iunV4E/+G0lKfv4kk/5Izdg=", + "lastModified": 1758277210, + "narHash": "sha256-iCGWf/LTy+aY0zFu8q12lK8KuZp7yvdhStehhyX1v8w=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ab0f3607a6c7486ea22229b92ed2d355f1482ee0", + "rev": "8eaee110344796db060382e15d3af0a9fc396e0e", "type": "github" }, "original": { From d5128d7d1037f90e1868857fa67489ac020dd117 Mon Sep 17 00:00:00 2001 From: alejandro-angulo Date: Wed, 24 Sep 2025 18:39:20 -0700 Subject: [PATCH 2/4] Update lockfile --- flake.lock | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/flake.lock b/flake.lock index 8aaeecf..b5805e6 100644 --- a/flake.lock +++ b/flake.lock @@ -43,11 +43,11 @@ ] }, "locked": { - "lastModified": 1748883665, - "narHash": "sha256-R0W7uAg+BLoHjMRMQ8+oiSbTq8nkGz5RDpQ+ZfxxP3A=", + "lastModified": 1752264895, + "narHash": "sha256-1zBPE/PNAkPNUsOWFET4J0cjlvziH8DOekesDmjND+w=", "owner": "cachix", "repo": "cachix", - "rev": "f707778d902af4d62d8dd92c269f8e70de09acbe", + "rev": "47053aef762f452e816e44eb9a23fbc3827b241a", "type": "github" }, "original": { @@ -109,11 +109,11 @@ ] }, "locked": { - "lastModified": 1758366037, - "narHash": "sha256-5PK0eHAWMtwaexQ7PR68gzpeo5WjMY9hq2BcEBHjSLA=", + "lastModified": 1758758270, + "narHash": "sha256-VTRgRGbr2lIMWSujokhySjFn8VGHCxXfQstxUsCaw6Y=", "owner": "cachix", "repo": "devenv", - "rev": "ebb56bfe1aa0936de2f8a68c616dabff1285e905", + "rev": "bcd30a9f7f70375a684c29c019e5a5c224c10718", "type": "github" }, "original": { @@ -299,11 +299,11 @@ ] }, "locked": { - "lastModified": 1750779888, - "narHash": "sha256-wibppH3g/E2lxU43ZQHC5yA/7kIKLGxVEnsnVK1BtRg=", + "lastModified": 1758108966, + "narHash": "sha256-ytw7ROXaWZ7OfwHrQ9xvjpUWeGVm86pwnEd1QhzawIo=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "16ec914f6fb6f599ce988427d9d94efddf25fe6d", + "rev": "54df955a695a84cd47d4a43e08e1feaf90b1fd9b", "type": "github" }, "original": { @@ -341,11 +341,11 @@ ] }, "locked": { - "lastModified": 1758375677, - "narHash": "sha256-BLtD+6qWz7fQjPk2wpwyXQLGI0E30Ikgf2ppn2nVadI=", + "lastModified": 1758748290, + "narHash": "sha256-/U2axzLmPgJb/0J+vQ4XmS++72VZWxJnDblwqTyGmEk=", "owner": "nix-community", "repo": "home-manager", - "rev": "edc7468e12be92e926847cb02418e649b02b59dd", + "rev": "2e260431fca7a782e0d0591985f2040944b43541", "type": "github" }, "original": { @@ -420,7 +420,7 @@ }, "original": { "owner": "cachix", - "ref": "devenv-2.30", + "ref": "devenv-2.30.4", "repo": "nix", "type": "github" } @@ -463,11 +463,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1757943327, - "narHash": "sha256-w6cDExPBqbq7fTLo4dZ1ozDGeq3yV6dSN4n/sAaS6OM=", + "lastModified": 1758663926, + "narHash": "sha256-6CFdj7Xs616t1W4jLDH7IohAAvl5Dyib3qEv/Uqw1rk=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "67a709cfe5d0643dafd798b0b613ed579de8be05", + "rev": "170ff93c860b2a9868ed1e1102d4e52cb3d934e1", "type": "github" }, "original": { @@ -510,11 +510,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1758277210, - "narHash": "sha256-iCGWf/LTy+aY0zFu8q12lK8KuZp7yvdhStehhyX1v8w=", + "lastModified": 1758427187, + "narHash": "sha256-pHpxZ/IyCwoTQPtFIAG2QaxuSm8jWzrzBGjwQZIttJc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8eaee110344796db060382e15d3af0a9fc396e0e", + "rev": "554be6495561ff07b6c724047bdd7e0716aa7b46", "type": "github" }, "original": { From 6059bbb7325f4e895f77339a9c51d2e81fd24dbd Mon Sep 17 00:00:00 2001 From: alejandro-angulo Date: Wed, 24 Sep 2025 18:41:20 -0700 Subject: [PATCH 3/4] Add wrapper for signal This fixes some issues I saw running with wayland --- systems/x86_64-linux/carbon/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/systems/x86_64-linux/carbon/default.nix b/systems/x86_64-linux/carbon/default.nix index 45727d7..151a64e 100644 --- a/systems/x86_64-linux/carbon/default.nix +++ b/systems/x86_64-linux/carbon/default.nix @@ -63,7 +63,13 @@ hugo nixos-generators vlc - signal-desktop-bin + (signal-desktop-bin.overrideAttrs (oldAttrs: { + nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ pkgs.makeWrapper ]; + postInstall = oldAttrs.postInstall or "" + '' + wrapProgram $out/bin/signal-desktop \ + --add-flags "--enable-features=UseOzonePlatform --ozone-platform=wayland" + ''; + })) ]; programs.light.enable = true; From b77e23bdf37ec78b3568609c6f6f303a8317c0e9 Mon Sep 17 00:00:00 2001 From: alejandro-angulo Date: Wed, 24 Sep 2025 18:55:43 -0700 Subject: [PATCH 4/4] Move signal-desktop-bin override to an overlay --- overlays/signal-desktop-bin/default.nix | 10 ++++++++++ systems/x86_64-linux/carbon/default.nix | 8 +------- 2 files changed, 11 insertions(+), 7 deletions(-) create mode 100644 overlays/signal-desktop-bin/default.nix diff --git a/overlays/signal-desktop-bin/default.nix b/overlays/signal-desktop-bin/default.nix new file mode 100644 index 0000000..be1b4c3 --- /dev/null +++ b/overlays/signal-desktop-bin/default.nix @@ -0,0 +1,10 @@ +{ ... }: +(final: prev: { + signal-desktop-bin = prev.signal-desktop-bin.overrideAttrs (oldAttrs: { + nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ prev.makeWrapper ]; + postInstall = oldAttrs.postInstall or "" + '' + wrapProgram $out/bin/signal-desktop \ + --add-flags "--enable-features=UseOzonePlatform --ozone-platform=wayland" + ''; + }); +}) diff --git a/systems/x86_64-linux/carbon/default.nix b/systems/x86_64-linux/carbon/default.nix index 151a64e..45727d7 100644 --- a/systems/x86_64-linux/carbon/default.nix +++ b/systems/x86_64-linux/carbon/default.nix @@ -63,13 +63,7 @@ hugo nixos-generators vlc - (signal-desktop-bin.overrideAttrs (oldAttrs: { - nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ pkgs.makeWrapper ]; - postInstall = oldAttrs.postInstall or "" + '' - wrapProgram $out/bin/signal-desktop \ - --add-flags "--enable-features=UseOzonePlatform --ozone-platform=wayland" - ''; - })) + signal-desktop-bin ]; programs.light.enable = true;