From c5e698d7ecc0221432b107c7e58dfbcebd10a941 Mon Sep 17 00:00:00 2001 From: rope Date: Mon, 1 Jun 2026 15:29:25 +0100 Subject: [PATCH 1/2] fix geary crash by using programs.geary module Co-Authored-By: Claude Opus 4.8 --- hosts/FredOS-Gaming.nix | 5 ++++- hosts/FredOS-Macbook.nix | 4 +++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/hosts/FredOS-Gaming.nix b/hosts/FredOS-Gaming.nix index cee41f7..f476e76 100644 --- a/hosts/FredOS-Gaming.nix +++ b/hosts/FredOS-Gaming.nix @@ -11,7 +11,8 @@ faugus-launcher adwaita-icon-theme mission-center - geary + vlc + gnome-text-editor wowup-cf adwsteamgtk proton-vpn @@ -19,6 +20,8 @@ woeusb ]; + programs.geary.enable = true; + # Force heavy builds off the gaming PC onto the media server so nix updates # never compete with games for CPU/RAM. Pairs with the distributed build # config in common.nix. builders-use-substitutes lets the server pull from diff --git a/hosts/FredOS-Macbook.nix b/hosts/FredOS-Macbook.nix index ec2b939..159e679 100644 --- a/hosts/FredOS-Macbook.nix +++ b/hosts/FredOS-Macbook.nix @@ -8,13 +8,15 @@ adwaita-icon-theme mission-center vlc - geary + gnome-text-editor proton-vpn onlyoffice-desktopeditors woeusb vscodium ]; + programs.geary.enable = true; + nix.settings.max-jobs = 0; services.tlp.enable = false; From bf6115a3235b72c5f6f89c0bd894888738c848ac Mon Sep 17 00:00:00 2001 From: rope Date: Wed, 3 Jun 2026 13:19:35 +0100 Subject: [PATCH 2/2] pin stylix to release-26.05 branch Co-Authored-By: Claude Opus 4.8 --- flake.lock | 21 +++++++++++---------- flake.nix | 3 +-- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 9c220ff..6c427b6 100644 --- a/flake.lock +++ b/flake.lock @@ -313,16 +313,16 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1779560665, - "narHash": "sha256-tpyBcxPpcQb8ukyNF7DoCwfSY3VPsxHoYwj00Cayv5o=", + "lastModified": 1780203844, + "narHash": "sha256-K5sT4jTpGs15ADhviMKNBH38REpPf5Q6mM1+N6cArVE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "64c08a7ca051951c8eae34e3e3cb1e202fe36786", + "rev": "b51242d7d43689db2f3be91bd05d5b24fbb469c4", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable", + "ref": "nixos-26.05", "repo": "nixpkgs", "type": "github" } @@ -339,11 +339,11 @@ ] }, "locked": { - "lastModified": 1780281641, - "narHash": "sha256-M/+hUKoKbHXpV0xGVfELbN1Ds1aoe3pL5p5/t46YhVo=", + "lastModified": 1779766384, + "narHash": "sha256-P7Ohnlq8b8b2fU+Sgkrej7LBTM60LBTkHleLuYzmLmU=", "owner": "nix-community", "repo": "NUR", - "rev": "30f9ae2f04174de63ba8bcf3580ca90843b28a01", + "rev": "57800b7ab648725ccd33551d01484ee14952ad3f", "type": "github" }, "original": { @@ -398,15 +398,16 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1780418031, - "narHash": "sha256-/lkloe/Vlpq8GmKiHzxA3woYUubWX1mV/RDtv8TE4d0=", + "lastModified": 1780469283, + "narHash": "sha256-FjpEUzVPGfJg48/0LSO8STCLMJCu9JC6f7sTz6igqeU=", "owner": "nix-community", "repo": "stylix", - "rev": "b670c2bdf09861b3215f30fc8a70f2fe26dc5f16", + "rev": "d9c8c2a80e49c4d87317c5398afad2ecacc29637", "type": "github" }, "original": { "owner": "nix-community", + "ref": "release-26.05", "repo": "stylix", "type": "github" } diff --git a/flake.nix b/flake.nix index 5ddc428..ce78b5e 100644 --- a/flake.nix +++ b/flake.nix @@ -20,8 +20,7 @@ proton-cachyos-nix.url = "github:powerofthe69/proton-cachyos-nix"; - # No release-26.05 branch yet — use master until stylix cuts one. - stylix.url = "github:nix-community/stylix"; + stylix.url = "github:nix-community/stylix/release-26.05"; }; outputs = { self