From dfcae02467cc44fdb3948673e77219d8f6c7448e Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Thu, 6 Mar 2025 16:33:38 +0100 Subject: [PATCH 1/3] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/f44bd8ca21e026135061a0a57dcf3d0775b67a49' (2025-02-26) → 'github:NixOS/nixpkgs/6af28b834daca767a7ef99f8a7defa957d0ade6f' (2025-03-04) --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 448fcb5..d5cd130 100644 --- a/flake.lock +++ b/flake.lock @@ -298,11 +298,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1740603184, - "narHash": "sha256-t+VaahjQAWyA+Ctn2idyo1yxRIYpaDxMgHkgCNiMJa4=", + "lastModified": 1741048562, + "narHash": "sha256-W4YZ3fvWZiFYYyd900kh8P8wU6DHSiwaH0j4+fai1Sk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f44bd8ca21e026135061a0a57dcf3d0775b67a49", + "rev": "6af28b834daca767a7ef99f8a7defa957d0ade6f", "type": "github" }, "original": { From 3d405d43f161051ef4caab2189d42d37a9443e7d Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Thu, 6 Mar 2025 16:33:45 +0100 Subject: [PATCH 2/3] flake: bump jj to v0.27.0 --- flake.lock | 8 ++++---- flake.nix | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/flake.lock b/flake.lock index d5cd130..5d4fe9d 100644 --- a/flake.lock +++ b/flake.lock @@ -183,16 +183,16 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1738805560, - "narHash": "sha256-jGy+0VDxQrgNhj+eX06FRhPP31V8QZVAM4j4yBosAGE=", + "lastModified": 1741218530, + "narHash": "sha256-fBgJrSglH46+NHu3spk5mC51ASDHWnOoW6veKZ0R2YA=", "owner": "jj-vcs", "repo": "jj", - "rev": "613742dfbbd89324b25672a75ef8ce9e671ae0d3", + "rev": "6ce7a77da5a18343f4f3effef49b77428e43bc74", "type": "github" }, "original": { "owner": "jj-vcs", - "ref": "v0.26.0", + "ref": "v0.27.0", "repo": "jj", "type": "github" } diff --git a/flake.nix b/flake.nix index 6d36b6b..7756c0d 100644 --- a/flake.nix +++ b/flake.nix @@ -59,7 +59,7 @@ type = "github"; owner = "jj-vcs"; repo = "jj"; - ref = "v0.26.0"; + ref = "v0.27.0"; inputs.nixpkgs.follows = "nixpkgs"; }; }; From 13b76ea50bf48bb82cbe05a65d1e73abb0165744 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Thu, 6 Mar 2025 16:33:45 +0100 Subject: [PATCH 3/3] home: i3bar: only enable when i3 is used notmuch is broken in nixpkgs right now and i3status-rust depended on it. This broke my config's build, but I don't actually use i3status-rust anymore since I switched to Sway on Wayland. --- home/x/i3bar.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/x/i3bar.nix b/home/x/i3bar.nix index 3ac8b63..a00e483 100644 --- a/home/x/i3bar.nix +++ b/home/x/i3bar.nix @@ -13,7 +13,7 @@ types ; - isEnabled = config.my.home.x.enable; + isEnabled = config.my.home.x.i3.enable; i3BarTheme = config.my.theme.i3BarTheme; cfg = config.my.home.x.i3bar; in {