From 4c90de34e9ca520560bd50f095c2d37200f6ecaa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jalil=20David=20Salam=C3=A9=20Messina?= Date: Sun, 16 Mar 2025 22:25:58 +0100 Subject: [PATCH 01/30] wip: niri take 2 Take two, since one wasn't enough. --- flake-modules/nixos-modules.nix | 1 + flake.lock | 62 +++++++++++++++++++++++++++++++++ flake.nix | 11 ++++++ 3 files changed, 74 insertions(+) diff --git a/flake-modules/nixos-modules.nix b/flake-modules/nixos-modules.nix index ef8355e..44ec630 100644 --- a/flake-modules/nixos-modules.nix +++ b/flake-modules/nixos-modules.nix @@ -9,6 +9,7 @@ let nixosModule = { imports = [ + inputs.niri.nixosModules.niri inputs.stylix.nixosModules.stylix inputs.home-manager.nixosModules.home-manager ../modules/nixos diff --git a/flake.lock b/flake.lock index 4c24de6..a494396 100644 --- a/flake.lock +++ b/flake.lock @@ -301,6 +301,50 @@ "url": "https://git.lix.systems/lix-project/nixos-module/archive/release-2.92.tar.gz" } }, + "niri": { + "inputs": { + "niri-stable": "niri-stable", + "niri-unstable": [], + "nixpkgs": [ + "unstable" + ], + "nixpkgs-stable": [ + "nixpkgs" + ], + "xwayland-satellite-stable": "xwayland-satellite-stable", + "xwayland-satellite-unstable": [] + }, + "locked": { + "lastModified": 1742108116, + "narHash": "sha256-NrV9ysEfSbeRUPo0jdCBeesuNLTVrpHGXg40snH1YGE=", + "owner": "sodiboo", + "repo": "niri-flake", + "rev": "824f10012de455a1d0ef795a605f28948ee10467", + "type": "github" + }, + "original": { + "owner": "sodiboo", + "repo": "niri-flake", + "type": "github" + } + }, + "niri-stable": { + "flake": false, + "locked": { + "lastModified": 1740117926, + "narHash": "sha256-mTTHA0RAaQcdYe+9A3Jx77cmmyLFHmRoZdd8RpWa+m8=", + "owner": "YaLTeR", + "repo": "niri", + "rev": "b94a5db8790339cf9134873d8b490be69e02ac71", + "type": "github" + }, + "original": { + "owner": "YaLTeR", + "ref": "v25.02", + "repo": "niri", + "type": "github" + } + }, "nixpkgs": { "locked": { "lastModified": 1743367904, @@ -385,6 +429,7 @@ "flake-parts": "flake-parts", "home-manager": "home-manager", "lix-module": "lix-module", + "niri": "niri", "nixpkgs": "nixpkgs", "nixvim": "nixvim", "nuschtosSearch": "nuschtosSearch", @@ -523,6 +568,23 @@ "repo": "treefmt-nix", "type": "github" } + }, + "xwayland-satellite-stable": { + "flake": false, + "locked": { + "lastModified": 1739246919, + "narHash": "sha256-/hBM43/Gd0/tW+egrhlWgOIISeJxEs2uAOIYVpfDKeU=", + "owner": "Supreeeme", + "repo": "xwayland-satellite", + "rev": "44590a416d4a3e8220e19e29e0b6efe64a80315d", + "type": "github" + }, + "original": { + "owner": "Supreeeme", + "ref": "v0.5.1", + "repo": "xwayland-satellite", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 04aaea2..5f68856 100644 --- a/flake.nix +++ b/flake.nix @@ -43,6 +43,17 @@ nuschtosSearch.follows = ""; }; }; + niri = { + url = "github:sodiboo/niri-flake"; + inputs = { + # Deduplicate + nixpkgs.follows = "unstable"; + nixpkgs-stable.follows = "nixpkgs"; + # Unused + niri-unstable.follows = ""; + xwayland-satellite-unstable.follows = ""; + }; + }; flake-parts = { url = "github:hercules-ci/flake-parts"; inputs.nixpkgs-lib.follows = "nixpkgs"; From 40968edd0d623040aa114a2a3c023814c75379c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jalil=20David=20Salam=C3=A9=20Messina?= Date: Tue, 1 Apr 2025 23:13:40 +0200 Subject: [PATCH 02/30] fix(zellij): set default shell For some reason it fails when trying to start bash. --- modules/hm/gui/default.nix | 12 +++++++++++- modules/nixos/default.nix | 5 ----- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/modules/hm/gui/default.nix b/modules/hm/gui/default.nix index d885697..bc12a65 100644 --- a/modules/hm/gui/default.nix +++ b/modules/hm/gui/default.nix @@ -125,7 +125,17 @@ in }; }; }; - zellij.enable = cfg.terminal == "alacritty"; # alacritty has no terminal multiplexer built-in + zellij = { + enable = cfg.terminal == "alacritty"; # alacritty has no terminal multiplexer built-in + # Set default shell + settings.default_shell = + if config.programs.fish.enable then + "fish" + else if config.programs.zsh.enable then + "zsh" + else + "bash"; + }; # PDF reader zathura.enable = true; # Auto start sway diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix index 875044b..da8f8b4 100644 --- a/modules/nixos/default.nix +++ b/modules/nixos/default.nix @@ -35,11 +35,6 @@ in ]; programs = { - # Launch fish if shell is interactive (from https://wiki.nixos.org/wiki/Fish) - bash.interactiveShellInit = # bash - '' - if [[ "$(${pkgs.procps}/bin/ps --no-header --pid=$PPID --format=comm)" != "fish" && -z "$BASH_EXECUTION_STRING" ]]; then shopt -q login_shell && LOGIN_OPTION='--login' || LOGIN_OPTION=""; exec ${pkgs.fish}/bin/fish "$LOGIN_OPTION"; fi - ''; # Default shell fish.enable = true; # Shell prompt From fc595853e624f137e83b758f76ed298f6488c3a3 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Wed, 2 Apr 2025 00:00:17 +0200 Subject: [PATCH 03/30] chore(deps): lock file maintenance --- flake.lock | 12 ++++++------ scripts/audiomenu/Cargo.lock | 4 ++-- scripts/jpassmenu/Cargo.lock | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/flake.lock b/flake.lock index 4c24de6..b1f346b 100644 --- a/flake.lock +++ b/flake.lock @@ -319,11 +319,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1742800061, - "narHash": "sha256-oDJGK1UMArK52vcW9S5S2apeec4rbfNELgc50LqiPNs=", + "lastModified": 1743441817, + "narHash": "sha256-+OE03P3u0FRwhS+Ah6EYiwxdS1rcIYlXheuXGM3wP3Q=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1750f3c1c89488e2ffdd47cab9d05454dddfb734", + "rev": "3eeaa42ef4c19447b48d1c676fe59077dfd0846e", "type": "github" }, "original": { @@ -342,11 +342,11 @@ "nuschtosSearch": [] }, "locked": { - "lastModified": 1743362786, - "narHash": "sha256-XbXIRDbb8/vLBX1M096l7lM5wfzBTp1ZXfUl9bUhVGU=", + "lastModified": 1743536158, + "narHash": "sha256-/jlBU7EGIfaa5VKwvVyrSspuuNmgKYOjAuTd2ywyevg=", "owner": "nix-community", "repo": "nixvim", - "rev": "d81f37256d0a8691b837b74979d27bf89be8ecdd", + "rev": "754b8df7e37be04b7438decee5a5aa18af72cbe1", "type": "github" }, "original": { diff --git a/scripts/audiomenu/Cargo.lock b/scripts/audiomenu/Cargo.lock index e783945..6a0a53e 100644 --- a/scripts/audiomenu/Cargo.lock +++ b/scripts/audiomenu/Cargo.lock @@ -327,9 +327,9 @@ checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" [[package]] name = "rustix" -version = "1.0.3" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e56a18552996ac8d29ecc3b190b4fdbb2d91ca4ec396de7bbffaf43f3d637e96" +checksum = "d97817398dd4bb2e6da002002db259209759911da105da92bec29ccb12cf58bf" dependencies = [ "bitflags", "errno", diff --git a/scripts/jpassmenu/Cargo.lock b/scripts/jpassmenu/Cargo.lock index bfefd24..ab875c8 100644 --- a/scripts/jpassmenu/Cargo.lock +++ b/scripts/jpassmenu/Cargo.lock @@ -492,9 +492,9 @@ checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" [[package]] name = "rustix" -version = "1.0.3" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e56a18552996ac8d29ecc3b190b4fdbb2d91ca4ec396de7bbffaf43f3d637e96" +checksum = "d97817398dd4bb2e6da002002db259209759911da105da92bec29ccb12cf58bf" dependencies = [ "bitflags", "errno", From e535c1d197c5fb64e64da86ab789ef0fbda2397d Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Thu, 3 Apr 2025 00:00:34 +0200 Subject: [PATCH 04/30] chore(deps): lock file maintenance --- flake.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index b1f346b..d7e5b0a 100644 --- a/flake.lock +++ b/flake.lock @@ -90,11 +90,11 @@ ] }, "locked": { - "lastModified": 1741352980, - "narHash": "sha256-+u2UunDA4Cl5Fci3m7S643HzKmIDAe+fiXrLqYsR2fs=", + "lastModified": 1743550720, + "narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "f4330d22f1c5d2ba72d3d22df5597d123fdb60a9", + "rev": "c621e8422220273271f52058f618c94e405bb0f5", "type": "github" }, "original": { @@ -303,11 +303,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1743367904, - "narHash": "sha256-sOos1jZGKmT6xxPvxGQyPTApOunXvScV4lNjBCXd/CI=", + "lastModified": 1743501102, + "narHash": "sha256-7PCBQ4aGVF8OrzMkzqtYSKyoQuU2jtpPi4lmABpe5X4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7ffe0edc685f14b8c635e3d6591b0bbb97365e6c", + "rev": "02f2af8c8a8c3b2c05028936a1e84daefa1171d4", "type": "github" }, "original": { @@ -319,11 +319,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1743441817, - "narHash": "sha256-+OE03P3u0FRwhS+Ah6EYiwxdS1rcIYlXheuXGM3wP3Q=", + "lastModified": 1743538100, + "narHash": "sha256-Bl/ynRPIb4CdtbEw3gfJYpKiHmRmrKltXc8zipqpO0o=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3eeaa42ef4c19447b48d1c676fe59077dfd0846e", + "rev": "b9d43b3fe5152d1dc5783a2ba865b2a03388b741", "type": "github" }, "original": { @@ -342,11 +342,11 @@ "nuschtosSearch": [] }, "locked": { - "lastModified": 1743536158, - "narHash": "sha256-/jlBU7EGIfaa5VKwvVyrSspuuNmgKYOjAuTd2ywyevg=", + "lastModified": 1743598191, + "narHash": "sha256-30aI8rWjX64E9vIlE4iqgQguTjItvTnQLTqHtFppF/w=", "owner": "nix-community", "repo": "nixvim", - "rev": "754b8df7e37be04b7438decee5a5aa18af72cbe1", + "rev": "a183298bf67307bdb7a25a2a3c565e76029f1b9e", "type": "github" }, "original": { @@ -511,11 +511,11 @@ ] }, "locked": { - "lastModified": 1743081648, - "narHash": "sha256-WRAylyYptt6OX5eCEBWyTwOEqEtD6zt33rlUkr6u3cE=", + "lastModified": 1743589519, + "narHash": "sha256-iBzr7Zb11nQxwX90bO1+Bm1MGlhMSmu4ixgnQFB+j4E=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "29a3d7b768c70addce17af0869f6e2bd8f5be4b7", + "rev": "18bed671738e36c5504e188aadc18b7e2a6e408f", "type": "github" }, "original": { From 68643b889cb175f8d75b1b955e545ea61a18d577 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Fri, 4 Apr 2025 00:00:31 +0200 Subject: [PATCH 05/30] chore(deps): lock file maintenance --- flake.lock | 18 +++++++++--------- scripts/audiomenu/Cargo.lock | 4 ++-- scripts/jpassmenu/Cargo.lock | 4 ++-- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/flake.lock b/flake.lock index d7e5b0a..caf4242 100644 --- a/flake.lock +++ b/flake.lock @@ -303,11 +303,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1743501102, - "narHash": "sha256-7PCBQ4aGVF8OrzMkzqtYSKyoQuU2jtpPi4lmABpe5X4=", + "lastModified": 1743576891, + "narHash": "sha256-vXiKURtntURybE6FMNFAVpRPr8+e8KoLPrYs9TGuAKc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "02f2af8c8a8c3b2c05028936a1e84daefa1171d4", + "rev": "44a69ed688786e98a101f02b712c313f1ade37ab", "type": "github" }, "original": { @@ -367,11 +367,11 @@ ] }, "locked": { - "lastModified": 1743201766, - "narHash": "sha256-bb/dqoIjtIWtJRzASOe8g4m8W2jUIWtuoGPXdNjM/Tk=", + "lastModified": 1743683223, + "narHash": "sha256-LdXtHFvhEC3S64dphap1pkkzwjErbW65eH1VRerCUT0=", "owner": "NuschtOS", "repo": "search", - "rev": "2651dbfad93d6ef66c440cbbf23238938b187bde", + "rev": "56a49ffef2908dad1e9a8adef1f18802bc760962", "type": "github" }, "original": { @@ -511,11 +511,11 @@ ] }, "locked": { - "lastModified": 1743589519, - "narHash": "sha256-iBzr7Zb11nQxwX90bO1+Bm1MGlhMSmu4ixgnQFB+j4E=", + "lastModified": 1743677901, + "narHash": "sha256-eWZln+k+L/VHO69tUTzEmgeDWNQNKIpSUa9nqQgBrSE=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "18bed671738e36c5504e188aadc18b7e2a6e408f", + "rev": "57dabe2a6255bd6165b2437ff6c2d1f6ee78421a", "type": "github" }, "original": { diff --git a/scripts/audiomenu/Cargo.lock b/scripts/audiomenu/Cargo.lock index 6a0a53e..baa29c6 100644 --- a/scripts/audiomenu/Cargo.lock +++ b/scripts/audiomenu/Cargo.lock @@ -263,9 +263,9 @@ dependencies = [ [[package]] name = "miniz_oxide" -version = "0.8.5" +version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e3e04debbb59698c15bacbb6d93584a8c0ca9cc3213cb423d31f760d8843ce5" +checksum = "ff70ce3e48ae43fa075863cef62e8b43b71a4f2382229920e0df362592919430" dependencies = [ "adler2", ] diff --git a/scripts/jpassmenu/Cargo.lock b/scripts/jpassmenu/Cargo.lock index ab875c8..2142ec3 100644 --- a/scripts/jpassmenu/Cargo.lock +++ b/scripts/jpassmenu/Cargo.lock @@ -384,9 +384,9 @@ dependencies = [ [[package]] name = "miniz_oxide" -version = "0.8.5" +version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e3e04debbb59698c15bacbb6d93584a8c0ca9cc3213cb423d31f760d8843ce5" +checksum = "ff70ce3e48ae43fa075863cef62e8b43b71a4f2382229920e0df362592919430" dependencies = [ "adler2", ] From cc66a85f7e251dd686907fbb8b2e0bcedaa74a40 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Sat, 5 Apr 2025 00:00:30 +0200 Subject: [PATCH 06/30] chore(deps): lock file maintenance --- flake.lock | 18 +++++++++--------- scripts/audiomenu/Cargo.lock | 4 ++-- scripts/jpassmenu/Cargo.lock | 4 ++-- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/flake.lock b/flake.lock index caf4242..82a7c75 100644 --- a/flake.lock +++ b/flake.lock @@ -303,11 +303,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1743576891, - "narHash": "sha256-vXiKURtntURybE6FMNFAVpRPr8+e8KoLPrYs9TGuAKc=", + "lastModified": 1743703532, + "narHash": "sha256-s1KLDALEeqy+ttrvqV3jx9mBZEvmthQErTVOAzbjHZs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "44a69ed688786e98a101f02b712c313f1ade37ab", + "rev": "bdb91860de2f719b57eef819b5617762f7120c70", "type": "github" }, "original": { @@ -342,11 +342,11 @@ "nuschtosSearch": [] }, "locked": { - "lastModified": 1743598191, - "narHash": "sha256-30aI8rWjX64E9vIlE4iqgQguTjItvTnQLTqHtFppF/w=", + "lastModified": 1743723573, + "narHash": "sha256-yxONmoimNU0hy0s8pF5lKCSZNqxVmbIHuag3sdk3R30=", "owner": "nix-community", "repo": "nixvim", - "rev": "a183298bf67307bdb7a25a2a3c565e76029f1b9e", + "rev": "9f495dda930ceca1653813ded11859d6b1342803", "type": "github" }, "original": { @@ -511,11 +511,11 @@ ] }, "locked": { - "lastModified": 1743677901, - "narHash": "sha256-eWZln+k+L/VHO69tUTzEmgeDWNQNKIpSUa9nqQgBrSE=", + "lastModified": 1743748085, + "narHash": "sha256-uhjnlaVTWo5iD3LXics1rp9gaKgDRQj6660+gbUU3cE=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "57dabe2a6255bd6165b2437ff6c2d1f6ee78421a", + "rev": "815e4121d6a5d504c0f96e5be2dd7f871e4fd99d", "type": "github" }, "original": { diff --git a/scripts/audiomenu/Cargo.lock b/scripts/audiomenu/Cargo.lock index baa29c6..6b9487d 100644 --- a/scripts/audiomenu/Cargo.lock +++ b/scripts/audiomenu/Cargo.lock @@ -174,9 +174,9 @@ dependencies = [ [[package]] name = "errno" -version = "0.3.10" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d" +checksum = "976dd42dc7e85965fe702eb8164f21f450704bdde31faefd6471dba214cb594e" dependencies = [ "libc", "windows-sys", diff --git a/scripts/jpassmenu/Cargo.lock b/scripts/jpassmenu/Cargo.lock index 2142ec3..c37b2ad 100644 --- a/scripts/jpassmenu/Cargo.lock +++ b/scripts/jpassmenu/Cargo.lock @@ -230,9 +230,9 @@ dependencies = [ [[package]] name = "errno" -version = "0.3.10" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d" +checksum = "976dd42dc7e85965fe702eb8164f21f450704bdde31faefd6471dba214cb594e" dependencies = [ "libc", "windows-sys", From addf6e9e6ac35734735a21e5f0c848403ce76333 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Sun, 6 Apr 2025 00:00:37 +0200 Subject: [PATCH 07/30] chore(deps): lock file maintenance --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 82a7c75..1a5d985 100644 --- a/flake.lock +++ b/flake.lock @@ -226,11 +226,11 @@ ] }, "locked": { - "lastModified": 1743387206, - "narHash": "sha256-24N3NAuZZbYqZ39NgToZgHUw6M7xHrtrAm18kv0+2Wo=", + "lastModified": 1743808813, + "narHash": "sha256-2lDQBOmlz9ggPxcS7/GvcVdzXMIiT+PpMao6FbLJSr0=", "owner": "nix-community", "repo": "home-manager", - "rev": "15c5f9d04fabd176f30286c8f52bbdb2c853a146", + "rev": "a9f8b3db211b4609ddd83683f9db89796c7f6ac6", "type": "github" }, "original": { @@ -342,11 +342,11 @@ "nuschtosSearch": [] }, "locked": { - "lastModified": 1743723573, - "narHash": "sha256-yxONmoimNU0hy0s8pF5lKCSZNqxVmbIHuag3sdk3R30=", + "lastModified": 1743844372, + "narHash": "sha256-59T+ikFiTt0CiSvuja3/xYahT6SL2s3XtNykfG8l0gk=", "owner": "nix-community", "repo": "nixvim", - "rev": "9f495dda930ceca1653813ded11859d6b1342803", + "rev": "7b4311333b542178828e90f6997d8f03e8327b89", "type": "github" }, "original": { From bf6ad2ce28e786c8f21b699aca3ced348e87315d Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Sun, 6 Apr 2025 00:20:15 +0200 Subject: [PATCH 08/30] chore(deps): lock file maintenance --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 1a5d985..7865205 100644 --- a/flake.lock +++ b/flake.lock @@ -70,11 +70,11 @@ "firefox-gnome-theme": { "flake": false, "locked": { - "lastModified": 1741628778, - "narHash": "sha256-RsvHGNTmO2e/eVfgYK7g+eYEdwwh7SbZa+gZkT24MEA=", + "lastModified": 1743774811, + "narHash": "sha256-oiHLDHXq7ymsMVYSg92dD1OLnKLQoU/Gf2F1GoONLCE=", "owner": "rafaelmardojai", "repo": "firefox-gnome-theme", - "rev": "5a81d390bb64afd4e81221749ec4bffcbeb5fa80", + "rev": "df53a7a31872faf5ca53dd0730038a62ec63ca9e", "type": "github" }, "original": { @@ -167,11 +167,11 @@ ] }, "locked": { - "lastModified": 1741379162, - "narHash": "sha256-srpAbmJapkaqGRE3ytf3bj4XshspVR5964OX5LfjDWc=", + "lastModified": 1742649964, + "narHash": "sha256-DwOTp7nvfi8mRfuL1escHDXabVXFGT1VlPD1JHrtrco=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "b5a62751225b2f62ff3147d0a334055ebadcd5cc", + "rev": "dcf5072734cb576d2b0c59b2ac44f5050b5eac82", "type": "github" }, "original": { @@ -425,11 +425,11 @@ "tinted-tmux": "tinted-tmux" }, "locked": { - "lastModified": 1741961698, - "narHash": "sha256-utsgC6H3ja6sLAXMd8//I2D7yjyScFqVDRX0wpbqPZo=", + "lastModified": 1743891370, + "narHash": "sha256-VZs6LYfQApmOgW2Z9a+NstryX//0qXysss1H+hzU7J0=", "owner": "danth", "repo": "stylix", - "rev": "9bfc74f330ead111e8ea354b2220a431b0cfaa26", + "rev": "331d56a5adc3a54ac338f73577cac1b2cc54def7", "type": "github" }, "original": { @@ -491,11 +491,11 @@ "tinted-tmux": { "flake": false, "locked": { - "lastModified": 1740877430, - "narHash": "sha256-zWcCXgdC4/owfH/eEXx26y5BLzTrefjtSLFHWVD5KxU=", + "lastModified": 1743296873, + "narHash": "sha256-8IQulrb1OBSxMwdKijO9fB70ON//V32dpK9Uioy7FzY=", "owner": "tinted-theming", "repo": "tinted-tmux", - "rev": "d48ee86394cbe45b112ba23ab63e33656090edb4", + "rev": "af5152c8d7546dfb4ff6df94080bf5ff54f64e3a", "type": "github" }, "original": { From 5b6469411422d88976343af6c76c38943eac92b0 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Mon, 7 Apr 2025 00:00:28 +0200 Subject: [PATCH 09/30] chore(deps): lock file maintenance --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 7865205..589a736 100644 --- a/flake.lock +++ b/flake.lock @@ -303,11 +303,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1743703532, - "narHash": "sha256-s1KLDALEeqy+ttrvqV3jx9mBZEvmthQErTVOAzbjHZs=", + "lastModified": 1743813633, + "narHash": "sha256-BgkBz4NpV6Kg8XF7cmHDHRVGZYnKbvG0Y4p+jElwxaM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "bdb91860de2f719b57eef819b5617762f7120c70", + "rev": "7819a0d29d1dd2bc331bec4b327f0776359b1fa6", "type": "github" }, "original": { @@ -319,11 +319,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1743538100, - "narHash": "sha256-Bl/ynRPIb4CdtbEw3gfJYpKiHmRmrKltXc8zipqpO0o=", + "lastModified": 1743814133, + "narHash": "sha256-drDyYyUmjeYGiHmwB9eOPTQRjmrq3Yz26knwmMPLZFk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b9d43b3fe5152d1dc5783a2ba865b2a03388b741", + "rev": "250b695f41e0e2f5afbf15c6b12480de1fe0001b", "type": "github" }, "original": { @@ -342,11 +342,11 @@ "nuschtosSearch": [] }, "locked": { - "lastModified": 1743844372, - "narHash": "sha256-59T+ikFiTt0CiSvuja3/xYahT6SL2s3XtNykfG8l0gk=", + "lastModified": 1743964204, + "narHash": "sha256-DFktXTeZWVM4kEET+GQHhI0XlrUG0HUAi+hZ7C/MEp0=", "owner": "nix-community", "repo": "nixvim", - "rev": "7b4311333b542178828e90f6997d8f03e8327b89", + "rev": "99a2f96cf0f54034201b40d878aa9bb21b72cdf2", "type": "github" }, "original": { @@ -425,11 +425,11 @@ "tinted-tmux": "tinted-tmux" }, "locked": { - "lastModified": 1743891370, - "narHash": "sha256-VZs6LYfQApmOgW2Z9a+NstryX//0qXysss1H+hzU7J0=", + "lastModified": 1743892916, + "narHash": "sha256-RWvfosAHobUiGMhWIS915WF4TsrQYDXv1gJk59TLAdU=", "owner": "danth", "repo": "stylix", - "rev": "331d56a5adc3a54ac338f73577cac1b2cc54def7", + "rev": "aebfec1998ebbc087de0104e4a4cec99ec1e3f7a", "type": "github" }, "original": { From 0fe0d5634b6c827e2f2c0fdd46c5911f473dcfb6 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Tue, 8 Apr 2025 00:00:10 +0200 Subject: [PATCH 10/30] chore(deps): lock file maintenance --- flake.lock | 12 ++++++------ scripts/jpassmenu/Cargo.lock | 8 ++++---- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/flake.lock b/flake.lock index 589a736..e6b0e33 100644 --- a/flake.lock +++ b/flake.lock @@ -319,11 +319,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1743814133, - "narHash": "sha256-drDyYyUmjeYGiHmwB9eOPTQRjmrq3Yz26knwmMPLZFk=", + "lastModified": 1743938762, + "narHash": "sha256-UgFYn8sGv9B8PoFpUfCa43CjMZBl1x/ShQhRDHBFQdI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "250b695f41e0e2f5afbf15c6b12480de1fe0001b", + "rev": "74a40410369a1c35ee09b8a1abee6f4acbedc059", "type": "github" }, "original": { @@ -342,11 +342,11 @@ "nuschtosSearch": [] }, "locked": { - "lastModified": 1743964204, - "narHash": "sha256-DFktXTeZWVM4kEET+GQHhI0XlrUG0HUAi+hZ7C/MEp0=", + "lastModified": 1744028177, + "narHash": "sha256-etbUDe2Httgl6oI14M1nTV39+478dJ0UyLJKx/DtZi8=", "owner": "nix-community", "repo": "nixvim", - "rev": "99a2f96cf0f54034201b40d878aa9bb21b72cdf2", + "rev": "cc8918663a711a10cd45650e7bb4c933c5ec4ad7", "type": "github" }, "original": { diff --git a/scripts/jpassmenu/Cargo.lock b/scripts/jpassmenu/Cargo.lock index c37b2ad..032c7b5 100644 --- a/scripts/jpassmenu/Cargo.lock +++ b/scripts/jpassmenu/Cargo.lock @@ -293,9 +293,9 @@ checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" [[package]] name = "jiff" -version = "0.2.5" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c102670231191d07d37a35af3eb77f1f0dbf7a71be51a962dcd57ea607be7260" +checksum = "1f33145a5cbea837164362c7bd596106eb7c5198f97d1ba6f6ebb3223952e488" dependencies = [ "jiff-static", "log", @@ -306,9 +306,9 @@ dependencies = [ [[package]] name = "jiff-static" -version = "0.2.5" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cdde31a9d349f1b1f51a0b3714a5940ac022976f4b49485fc04be052b183b4c" +checksum = "43ce13c40ec6956157a3635d97a1ee2df323b263f09ea14165131289cb0f5c19" dependencies = [ "proc-macro2", "quote", From c7573d910b826f413c100db6dc98a6e1629f9607 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jalil=20David=20Salam=C3=A9=20Messina?= Date: Wed, 9 Apr 2025 17:32:53 +0200 Subject: [PATCH 11/30] fix: remove unused dev packages - Stable gitoxide is insecure (and I mostly rely on jj rn) - As I switched to jj `git-absorb` is unneeded --- modules/hm/options.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/modules/hm/options.nix b/modules/hm/options.nix index 2f65337..e274f52 100644 --- a/modules/hm/options.nix +++ b/modules/hm/options.nix @@ -198,8 +198,6 @@ in [ "just" ] # just a command runner [ "typos" ] # low false positive rate typo checker [ "gcc" ] # GNU Compiler Collection - [ "git-absorb" ] # fixup! but automatic - [ "gitoxide" ] # git but RiiR [ "man-pages" ] # gimme the man pages [ "man-pages-posix" ] # I said gimme the man pages!!! ]; From 7f4750c0fadf9cce645894b8b27960e243c8435d Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Wed, 9 Apr 2025 17:40:13 +0200 Subject: [PATCH 12/30] chore(deps): lock file maintenance --- flake.lock | 30 +++++++++++++++--------------- scripts/audiomenu/Cargo.lock | 8 ++++---- scripts/jpassmenu/Cargo.lock | 12 ++++++------ 3 files changed, 25 insertions(+), 25 deletions(-) diff --git a/flake.lock b/flake.lock index e6b0e33..6d5875e 100644 --- a/flake.lock +++ b/flake.lock @@ -226,11 +226,11 @@ ] }, "locked": { - "lastModified": 1743808813, - "narHash": "sha256-2lDQBOmlz9ggPxcS7/GvcVdzXMIiT+PpMao6FbLJSr0=", + "lastModified": 1744117652, + "narHash": "sha256-t7dFCDl4vIOOUMhEZnJF15aAzkpaup9x4ZRGToDFYWI=", "owner": "nix-community", "repo": "home-manager", - "rev": "a9f8b3db211b4609ddd83683f9db89796c7f6ac6", + "rev": "b4e98224ad1336751a2ac7493967a4c9f6d9cb3f", "type": "github" }, "original": { @@ -303,11 +303,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1743813633, - "narHash": "sha256-BgkBz4NpV6Kg8XF7cmHDHRVGZYnKbvG0Y4p+jElwxaM=", + "lastModified": 1743975612, + "narHash": "sha256-o4FjFOUmjSRMK7dn0TFdAT0RRWUWD+WsspPHa+qEQT8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7819a0d29d1dd2bc331bec4b327f0776359b1fa6", + "rev": "a880f49904d68b5e53338d1e8c7bf80f59903928", "type": "github" }, "original": { @@ -319,11 +319,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1743938762, - "narHash": "sha256-UgFYn8sGv9B8PoFpUfCa43CjMZBl1x/ShQhRDHBFQdI=", + "lastModified": 1744096231, + "narHash": "sha256-kUfx3FKU1Etnua3EaKvpeuXs7zoFiAcli1gBwkPvGSs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "74a40410369a1c35ee09b8a1abee6f4acbedc059", + "rev": "b2b0718004cc9a5bca610326de0a82e6ea75920b", "type": "github" }, "original": { @@ -342,11 +342,11 @@ "nuschtosSearch": [] }, "locked": { - "lastModified": 1744028177, - "narHash": "sha256-etbUDe2Httgl6oI14M1nTV39+478dJ0UyLJKx/DtZi8=", + "lastModified": 1744200902, + "narHash": "sha256-BqTLjxT1C1XfREDBQSxPrfKI9DBpZHBVLHzfXZs+h8M=", "owner": "nix-community", "repo": "nixvim", - "rev": "cc8918663a711a10cd45650e7bb4c933c5ec4ad7", + "rev": "51203927e395535c4a427295efed4e1b2ef8349b", "type": "github" }, "original": { @@ -425,11 +425,11 @@ "tinted-tmux": "tinted-tmux" }, "locked": { - "lastModified": 1743892916, - "narHash": "sha256-RWvfosAHobUiGMhWIS915WF4TsrQYDXv1gJk59TLAdU=", + "lastModified": 1744152965, + "narHash": "sha256-LWUeN1+bH3k46fwtIv0bNgtmkqB0UduyX7T2i+230n0=", "owner": "danth", "repo": "stylix", - "rev": "aebfec1998ebbc087de0104e4a4cec99ec1e3f7a", + "rev": "8748db082ca15d32243c86e5d785d5dfc8a65719", "type": "github" }, "original": { diff --git a/scripts/audiomenu/Cargo.lock b/scripts/audiomenu/Cargo.lock index 6b9487d..47a301a 100644 --- a/scripts/audiomenu/Cargo.lock +++ b/scripts/audiomenu/Cargo.lock @@ -220,9 +220,9 @@ checksum = "c19937216e9d3aa9956d9bb8dfc0b0c8beb6058fc4f7a4dc4d850edf86a237d6" [[package]] name = "linux-raw-sys" -version = "0.9.3" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe7db12097d22ec582439daf8618b8fdd1a7bef6270e9af3b1ebcd30893cf413" +checksum = "cd945864f07fe9f5371a27ad7b52a172b4b499999f1d97574c9fa68373937e12" [[package]] name = "memchr" @@ -263,9 +263,9 @@ dependencies = [ [[package]] name = "miniz_oxide" -version = "0.8.7" +version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff70ce3e48ae43fa075863cef62e8b43b71a4f2382229920e0df362592919430" +checksum = "3be647b768db090acb35d5ec5db2b0e1f1de11133ca123b9eacf5137868f892a" dependencies = [ "adler2", ] diff --git a/scripts/jpassmenu/Cargo.lock b/scripts/jpassmenu/Cargo.lock index 032c7b5..6e1d5fa 100644 --- a/scripts/jpassmenu/Cargo.lock +++ b/scripts/jpassmenu/Cargo.lock @@ -108,9 +108,9 @@ checksum = "5c8214115b7bf84099f1309324e63141d4c5d7cc26862f97a0a857dbefe165bd" [[package]] name = "bstr" -version = "1.11.3" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "531a9155a481e2ee699d4f98f43c0ca4ff8ee1bfd55c31e9e98fb29d2b176fe0" +checksum = "234113d19d0d7d613b40e86fb654acf958910802bcceab913a4f9e7cda03b1a4" dependencies = [ "memchr", "serde", @@ -335,9 +335,9 @@ checksum = "c19937216e9d3aa9956d9bb8dfc0b0c8beb6058fc4f7a4dc4d850edf86a237d6" [[package]] name = "linux-raw-sys" -version = "0.9.3" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe7db12097d22ec582439daf8618b8fdd1a7bef6270e9af3b1ebcd30893cf413" +checksum = "cd945864f07fe9f5371a27ad7b52a172b4b499999f1d97574c9fa68373937e12" [[package]] name = "log" @@ -384,9 +384,9 @@ dependencies = [ [[package]] name = "miniz_oxide" -version = "0.8.7" +version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff70ce3e48ae43fa075863cef62e8b43b71a4f2382229920e0df362592919430" +checksum = "3be647b768db090acb35d5ec5db2b0e1f1de11133ca123b9eacf5137868f892a" dependencies = [ "adler2", ] From 486ae7713ee9e5a307f51745ab68cdf56ac1867e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jalil=20David=20Salam=C3=A9=20Messina?= Date: Wed, 9 Apr 2025 17:41:12 +0200 Subject: [PATCH 13/30] fix: disable combinePlugins due to upstream issue It is experimental (and thus expected to break). It was working fine but now I ran into https://github.com/nix-community/nixvim/issues/3140 --- flake-modules/nixvim-modules.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/flake-modules/nixvim-modules.nix b/flake-modules/nixvim-modules.nix index 1f8a395..b40b0dd 100644 --- a/flake-modules/nixvim-modules.nix +++ b/flake-modules/nixvim-modules.nix @@ -23,7 +23,8 @@ inherit system; modules = [ self.nixvimModules.standalone - { performance.combinePlugins.enable = true; } + # FIXME: borked due to https://github.com/nix-community/nixvim/issues/3140 + # { performance.combinePlugins.enable = true; } extraConfig ]; }; From 40e478c2939d04973e7f8e2d920828bb05cf5d5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jalil=20David=20Salam=C3=A9=20Messina?= Date: Wed, 9 Apr 2025 18:57:59 +0200 Subject: [PATCH 14/30] fix(nvim): create own pkgset This should ensure we pull the correct version of nvim. --- modules/nixvim/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/nixvim/default.nix b/modules/nixvim/default.nix index afe1a05..9a9b212 100644 --- a/modules/nixvim/default.nix +++ b/modules/nixvim/default.nix @@ -9,7 +9,6 @@ in (import ./standalone.nix) (lib.mkIf cfg.enable { enable = true; - nixpkgs.useGlobalPackages = true; defaultEditor = lib.mkDefault true; jhome.nvim = cfg; }) From c47909105684bda5a2aa690e3ad7d4c175045969 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Thu, 10 Apr 2025 00:00:27 +0200 Subject: [PATCH 15/30] chore(deps): lock file maintenance --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 6d5875e..486ec62 100644 --- a/flake.lock +++ b/flake.lock @@ -303,11 +303,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1743975612, - "narHash": "sha256-o4FjFOUmjSRMK7dn0TFdAT0RRWUWD+WsspPHa+qEQT8=", + "lastModified": 1744168086, + "narHash": "sha256-S9M4HddBCxbbX1CKSyDYgZ8NCVyHcbKnBfoUXeRu2jQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a880f49904d68b5e53338d1e8c7bf80f59903928", + "rev": "60e405b241edb6f0573f3d9f944617fe33ac4a73", "type": "github" }, "original": { From 09dc56a284eac61d2adf708a8b58aa83cd3fa88e Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Fri, 11 Apr 2025 00:00:13 +0200 Subject: [PATCH 16/30] chore(deps): lock file maintenance --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 486ec62..89d208c 100644 --- a/flake.lock +++ b/flake.lock @@ -319,11 +319,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1744096231, - "narHash": "sha256-kUfx3FKU1Etnua3EaKvpeuXs7zoFiAcli1gBwkPvGSs=", + "lastModified": 1744157173, + "narHash": "sha256-bWSjxDwq7iVePrhmA7tY2dyMWHuNJo8knkO4y+q4ZkY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b2b0718004cc9a5bca610326de0a82e6ea75920b", + "rev": "6a39c6e495eefabc935d8ddf66aa45d85b85fa3f", "type": "github" }, "original": { @@ -342,11 +342,11 @@ "nuschtosSearch": [] }, "locked": { - "lastModified": 1744200902, - "narHash": "sha256-BqTLjxT1C1XfREDBQSxPrfKI9DBpZHBVLHzfXZs+h8M=", + "lastModified": 1744272522, + "narHash": "sha256-cFuxYOLp/6L0eu5wX7xmaF4VhqEm/aT08awzEHGMMQE=", "owner": "nix-community", "repo": "nixvim", - "rev": "51203927e395535c4a427295efed4e1b2ef8349b", + "rev": "33c3f98fdc9a62183ec7d535bf910e04f141284b", "type": "github" }, "original": { From 9e34ff7ee393f0957714c23441965a4e52e45ec9 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Fri, 11 Apr 2025 22:10:14 +0200 Subject: [PATCH 17/30] fix(deps): update rust crate clap to v4.5.36 | datasource | package | from | to | | ---------- | ------- | ------ | ------ | | crate | clap | 4.5.35 | 4.5.36 | --- scripts/audiomenu/Cargo.lock | 8 ++++---- scripts/jpassmenu/Cargo.lock | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/scripts/audiomenu/Cargo.lock b/scripts/audiomenu/Cargo.lock index 47a301a..9b96787 100644 --- a/scripts/audiomenu/Cargo.lock +++ b/scripts/audiomenu/Cargo.lock @@ -116,9 +116,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "clap" -version = "4.5.35" +version = "4.5.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8aa86934b44c19c50f87cc2790e19f54f7a67aedb64101c2e1a2e5ecfb73944" +checksum = "2df961d8c8a0d08aa9945718ccf584145eee3f3aa06cddbeac12933781102e04" dependencies = [ "clap_builder", "clap_derive", @@ -126,9 +126,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.35" +version = "4.5.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2414dbb2dd0695280da6ea9261e327479e9d37b0630f6b53ba2a11c60c679fd9" +checksum = "132dbda40fb6753878316a489d5a1242a8ef2f0d9e47ba01c951ea8aa7d013a5" dependencies = [ "anstream", "anstyle", diff --git a/scripts/jpassmenu/Cargo.lock b/scripts/jpassmenu/Cargo.lock index 6e1d5fa..32cbb9c 100644 --- a/scripts/jpassmenu/Cargo.lock +++ b/scripts/jpassmenu/Cargo.lock @@ -124,9 +124,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "clap" -version = "4.5.35" +version = "4.5.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8aa86934b44c19c50f87cc2790e19f54f7a67aedb64101c2e1a2e5ecfb73944" +checksum = "2df961d8c8a0d08aa9945718ccf584145eee3f3aa06cddbeac12933781102e04" dependencies = [ "clap_builder", "clap_derive", @@ -134,9 +134,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.35" +version = "4.5.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2414dbb2dd0695280da6ea9261e327479e9d37b0630f6b53ba2a11c60c679fd9" +checksum = "132dbda40fb6753878316a489d5a1242a8ef2f0d9e47ba01c951ea8aa7d013a5" dependencies = [ "anstream", "anstyle", From 4c94fbec753756278d7cd6f23497de1d7370a3d4 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Sat, 12 Apr 2025 00:00:25 +0200 Subject: [PATCH 18/30] chore(deps): lock file maintenance --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index 89d208c..45c58d5 100644 --- a/flake.lock +++ b/flake.lock @@ -303,11 +303,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1744168086, - "narHash": "sha256-S9M4HddBCxbbX1CKSyDYgZ8NCVyHcbKnBfoUXeRu2jQ=", + "lastModified": 1744309437, + "narHash": "sha256-QZnNHM823am8apCqKSPdtnzPGTy2ZB4zIXOVoBp5+W0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "60e405b241edb6f0573f3d9f944617fe33ac4a73", + "rev": "f9ebe33a928b5d529c895202263a5ce46bdf12f7", "type": "github" }, "original": { @@ -342,11 +342,11 @@ "nuschtosSearch": [] }, "locked": { - "lastModified": 1744272522, - "narHash": "sha256-cFuxYOLp/6L0eu5wX7xmaF4VhqEm/aT08awzEHGMMQE=", + "lastModified": 1744383153, + "narHash": "sha256-We4ePUixXnMOIqA9IRMWXGEW6efZRTGwTVCv5/yCvcU=", "owner": "nix-community", "repo": "nixvim", - "rev": "33c3f98fdc9a62183ec7d535bf910e04f141284b", + "rev": "e537d4a6b4c1c81f8b71dfd916fdf970d0d5c987", "type": "github" }, "original": { @@ -367,11 +367,11 @@ ] }, "locked": { - "lastModified": 1743683223, - "narHash": "sha256-LdXtHFvhEC3S64dphap1pkkzwjErbW65eH1VRerCUT0=", + "lastModified": 1744375525, + "narHash": "sha256-/Wf5Ca0DmV+y+qVBDXX8HAfAvSQI6y5oE27dv6t1jXk=", "owner": "NuschtOS", "repo": "search", - "rev": "56a49ffef2908dad1e9a8adef1f18802bc760962", + "rev": "c0e7d3bda11e2cfad692d205d82757078475957a", "type": "github" }, "original": { From aca88245388bb822249fb9921e5cb01422b4de70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jalil=20David=20Salam=C3=A9=20Messina?= Date: Sat, 12 Apr 2025 12:53:16 +0200 Subject: [PATCH 19/30] fix(rust): remove bacon and rustAnalyzerPackage `rustAnalyzerPackage` was removed and I never got around to properly using `bacon`, so might as well save on space. --- modules/hm/dev.nix | 11 -------- modules/nixvim/dev-plugins.nix | 47 ++++++++++++++-------------------- 2 files changed, 19 insertions(+), 39 deletions(-) diff --git a/modules/hm/dev.nix b/modules/hm/dev.nix index 5e58c72..5e765ff 100644 --- a/modules/hm/dev.nix +++ b/modules/hm/dev.nix @@ -17,17 +17,6 @@ in [ (lib.mkIf cfg.rust.enable { home.packages = [ pkgs.rustup ] ++ cfg.rust.extraPackages; - # Background code checker (for Rust) - programs.bacon = { - enable = true; - settings = { - export = { - enabled = true; - path = ".bacon-locations"; - line_format = "{kind} {path}:{line}:{column} {message}"; - }; - }; - }; }) { home = { diff --git a/modules/nixvim/dev-plugins.nix b/modules/nixvim/dev-plugins.nix index f44c09b..fdfaff1 100644 --- a/modules/nixvim/dev-plugins.nix +++ b/modules/nixvim/dev-plugins.nix @@ -7,6 +7,7 @@ }: let inherit (helpers) enableExceptInTests; + inherit (lib.trivial) const; cfg = config.jhome.nvim; enabledLSPs = [ "basedpyright" @@ -23,21 +24,18 @@ let "zls" "fish_lsp" ]; + + enableOpt.enable = true; + noPackage.package = null; in { config = lib.mkIf cfg.dev.enable ( lib.mkMerge [ # Enable LSPs - { - plugins.lsp.servers = lib.genAttrs enabledLSPs (_: { - enable = true; - }); - } + { plugins.lsp.servers = lib.genAttrs enabledLSPs (const enableOpt); } # Remove bundled LSPs (lib.mkIf (!cfg.dev.bundleLSPs) { - plugins.lsp.servers = lib.genAttrs enabledLSPs (_: { - package = null; - }); + plugins.lsp.servers = lib.genAttrs enabledLSPs (const noPackage); }) # Configure LSPs { @@ -52,11 +50,12 @@ in return vim.fs.root(0, {'flake.nix', '.git', '.jj', 'pyproject.toml', 'setup.py'}) end ''; - bashls.package = lib.mkDefault pkgs.bash-language-server; - # Adds ~2 GiB, install in a devShell instead - clangd.package = lib.mkDefault null; - # zls & other zig tools are big, install in a devShell instead - zls.package = lib.mkDefault null; + # Big but infrequently used dependencies. + # + # Configure the LSPs, but don't install the packages. + # If you need to use them, add them to your project's devShell + clangd = noPackage; + zls = noPackage; }; }; lspkind = { @@ -82,10 +81,10 @@ in (lib.mkIf (!cfg.dev.bundleGrammars) { plugins.treesitter.grammarPackages = [ ]; }) # Remove tools for building gramars when bundling them (lib.mkIf cfg.dev.bundleGrammars { - plugins.treesitter = { - gccPackage = null; - nodejsPackage = null; - treesitterPackage = null; + dependencies = { + gcc.enable = false; + nodejs.enable = false; + tree-sitter.enable = false; }; }) # Configure Formatters @@ -159,17 +158,9 @@ in } # Rust plugins { - plugins = { - bacon = { - enable = true; - settings.quickfix.enabled = true; - }; - rustaceanvim = { - enable = true; - # Install through rustup - rustAnalyzerPackage = null; - }; - }; + plugins.rustaceanvim.enable = true; + # install through rustup + dependencies.rust-analyzer.enable = false; } # Other plugins { From 92feab7ac3e5aa8399da3c5225bf6df64fa8af68 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Sun, 13 Apr 2025 00:00:12 +0200 Subject: [PATCH 20/30] chore(deps): lock file maintenance --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 45c58d5..92fce99 100644 --- a/flake.lock +++ b/flake.lock @@ -342,11 +342,11 @@ "nuschtosSearch": [] }, "locked": { - "lastModified": 1744383153, - "narHash": "sha256-We4ePUixXnMOIqA9IRMWXGEW6efZRTGwTVCv5/yCvcU=", + "lastModified": 1744429493, + "narHash": "sha256-T3nhF5uBFaLSoR4EM7/Yf5TuD2kghyqRlNCmcN4tQx0=", "owner": "nix-community", "repo": "nixvim", - "rev": "e537d4a6b4c1c81f8b71dfd916fdf970d0d5c987", + "rev": "1095b7f89192c1e2bc9b52d0d9660c02752afe5a", "type": "github" }, "original": { From 6602d3eb44f1412826ff2026f5263dc496a1a500 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Mon, 14 Apr 2025 00:00:31 +0200 Subject: [PATCH 21/30] chore(deps): lock file maintenance --- flake.lock | 12 ++++++------ scripts/jpassmenu/Cargo.lock | 8 ++++---- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/flake.lock b/flake.lock index 92fce99..1c26e49 100644 --- a/flake.lock +++ b/flake.lock @@ -303,11 +303,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1744309437, - "narHash": "sha256-QZnNHM823am8apCqKSPdtnzPGTy2ZB4zIXOVoBp5+W0=", + "lastModified": 1744440957, + "narHash": "sha256-FHlSkNqFmPxPJvy+6fNLaNeWnF1lZSgqVCl/eWaJRc4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f9ebe33a928b5d529c895202263a5ce46bdf12f7", + "rev": "26d499fc9f1d567283d5d56fcf367edd815dba1d", "type": "github" }, "original": { @@ -342,11 +342,11 @@ "nuschtosSearch": [] }, "locked": { - "lastModified": 1744429493, - "narHash": "sha256-T3nhF5uBFaLSoR4EM7/Yf5TuD2kghyqRlNCmcN4tQx0=", + "lastModified": 1744580380, + "narHash": "sha256-uiqlgYUL2WdgL1xcrRmRw3waxRw44CR1a8FSIglW9O8=", "owner": "nix-community", "repo": "nixvim", - "rev": "1095b7f89192c1e2bc9b52d0d9660c02752afe5a", + "rev": "327d4919365dcd1cfb857b6c1ac7a3a44970e104", "type": "github" }, "original": { diff --git a/scripts/jpassmenu/Cargo.lock b/scripts/jpassmenu/Cargo.lock index 32cbb9c..4da0b16 100644 --- a/scripts/jpassmenu/Cargo.lock +++ b/scripts/jpassmenu/Cargo.lock @@ -293,9 +293,9 @@ checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" [[package]] name = "jiff" -version = "0.2.6" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f33145a5cbea837164362c7bd596106eb7c5198f97d1ba6f6ebb3223952e488" +checksum = "18ac8a13ed52bd2a3004d6495147917068b1eb90e4e8b43eff0906fd7d9882a2" dependencies = [ "jiff-static", "log", @@ -306,9 +306,9 @@ dependencies = [ [[package]] name = "jiff-static" -version = "0.2.6" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43ce13c40ec6956157a3635d97a1ee2df323b263f09ea14165131289cb0f5c19" +checksum = "f078382f7a4e3fd1526c40d1fb2b3cea0e5552592fd394a002c52b4bf283bc45" dependencies = [ "proc-macro2", "quote", From 9702f229c28028c724c7e7c63050e3edb07a0d1b Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Mon, 14 Apr 2025 00:10:12 +0200 Subject: [PATCH 22/30] chore(deps): lock file maintenance --- scripts/jpassmenu/Cargo.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/jpassmenu/Cargo.lock b/scripts/jpassmenu/Cargo.lock index 4da0b16..24c86c1 100644 --- a/scripts/jpassmenu/Cargo.lock +++ b/scripts/jpassmenu/Cargo.lock @@ -293,9 +293,9 @@ checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" [[package]] name = "jiff" -version = "0.2.7" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18ac8a13ed52bd2a3004d6495147917068b1eb90e4e8b43eff0906fd7d9882a2" +checksum = "e5ad87c89110f55e4cd4dc2893a9790820206729eaf221555f742d540b0724a0" dependencies = [ "jiff-static", "log", @@ -306,9 +306,9 @@ dependencies = [ [[package]] name = "jiff-static" -version = "0.2.7" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f078382f7a4e3fd1526c40d1fb2b3cea0e5552592fd394a002c52b4bf283bc45" +checksum = "d076d5b64a7e2fe6f0743f02c43ca4a6725c0f904203bfe276a5b3e793103605" dependencies = [ "proc-macro2", "quote", From f19ed998ea7e7b6db615fd9e9c1d42853e898e0b Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Tue, 15 Apr 2025 00:00:15 +0200 Subject: [PATCH 23/30] chore(deps): lock file maintenance --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 1c26e49..d7700b6 100644 --- a/flake.lock +++ b/flake.lock @@ -342,11 +342,11 @@ "nuschtosSearch": [] }, "locked": { - "lastModified": 1744580380, - "narHash": "sha256-uiqlgYUL2WdgL1xcrRmRw3waxRw44CR1a8FSIglW9O8=", + "lastModified": 1744588744, + "narHash": "sha256-57yF0pk7IUMiwq5XA9X/TX1fuIJYVnBfqhJWD/1+W0Q=", "owner": "nix-community", "repo": "nixvim", - "rev": "327d4919365dcd1cfb857b6c1ac7a3a44970e104", + "rev": "d15f5e6f422e353901a425f26925129929e8a38a", "type": "github" }, "original": { From d7979bf77d8d62f65a3c86476ec6513ef2ac7581 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jalil=20David=20Salam=C3=A9=20Messina?= Date: Tue, 15 Apr 2025 13:01:23 +0200 Subject: [PATCH 24/30] fix(nvim): remove vim-jjdescription It is now part of NeoVIM (since 0.11). Also adjust the `draft_commit_description` as `jj` now supports the `ignore-rest` comment. --- modules/hm/dev.nix | 7 ++++--- modules/nixvim/standalone.nix | 1 - 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/hm/dev.nix b/modules/hm/dev.nix index 5e765ff..2c2d898 100644 --- a/modules/hm/dev.nix +++ b/modules/hm/dev.nix @@ -72,13 +72,14 @@ in templates.draft_commit_description = '' concat( description, + "\n", surround( "\nJJ: This commit contains the following changes:\n", "", - indent("JJ: ", diff.stat(72)), + indent("JJ: ", diff.summary()), ), surround( - "\nJJ: Diff:\n", "", - indent("JJ: ", diff.git()), + "JJ: ignore-rest\n", "", + diff.git(), ), ) ''; diff --git a/modules/nixvim/standalone.nix b/modules/nixvim/standalone.nix index cec3117..8f4f63f 100644 --- a/modules/nixvim/standalone.nix +++ b/modules/nixvim/standalone.nix @@ -55,7 +55,6 @@ in extraPlugins = [ plugins.nui-nvim plugins.nvim-web-devicons - plugins.vim-jjdescription # FIXME: included since neovim nightly ]; extraPackages = [ pkgs.luajitPackages.jsregexp ]; extraConfigLuaPre = From 50cee1ee258d1bee96a0e9c66ce7a557b3cdcde0 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Wed, 16 Apr 2025 00:00:16 +0200 Subject: [PATCH 25/30] chore(deps): lock file maintenance --- flake.lock | 18 +++++++++--------- scripts/audiomenu/Cargo.lock | 4 ++-- scripts/jpassmenu/Cargo.lock | 4 ++-- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/flake.lock b/flake.lock index d7700b6..b50793c 100644 --- a/flake.lock +++ b/flake.lock @@ -226,11 +226,11 @@ ] }, "locked": { - "lastModified": 1744117652, - "narHash": "sha256-t7dFCDl4vIOOUMhEZnJF15aAzkpaup9x4ZRGToDFYWI=", + "lastModified": 1744743431, + "narHash": "sha256-iyn/WBYDc7OtjSawbegINDe/gIkok888kQxk3aVnkgg=", "owner": "nix-community", "repo": "home-manager", - "rev": "b4e98224ad1336751a2ac7493967a4c9f6d9cb3f", + "rev": "c61bfe3ae692f42ce688b5865fac9e0de58e1387", "type": "github" }, "original": { @@ -342,11 +342,11 @@ "nuschtosSearch": [] }, "locked": { - "lastModified": 1744588744, - "narHash": "sha256-57yF0pk7IUMiwq5XA9X/TX1fuIJYVnBfqhJWD/1+W0Q=", + "lastModified": 1744753228, + "narHash": "sha256-Re8g2pby4sr4hgzJmQJxeH/9PtgX85nivkWibapRI5s=", "owner": "nix-community", "repo": "nixvim", - "rev": "d15f5e6f422e353901a425f26925129929e8a38a", + "rev": "d4dada282aeac94b5d53dd70e276a2f5f534f783", "type": "github" }, "original": { @@ -511,11 +511,11 @@ ] }, "locked": { - "lastModified": 1743748085, - "narHash": "sha256-uhjnlaVTWo5iD3LXics1rp9gaKgDRQj6660+gbUU3cE=", + "lastModified": 1744707583, + "narHash": "sha256-IPFcShGro/UUp8BmwMBkq+6KscPlWQevZi9qqIwVUWg=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "815e4121d6a5d504c0f96e5be2dd7f871e4fd99d", + "rev": "49d05555ccdd2592300099d6a657cc33571f4fe0", "type": "github" }, "original": { diff --git a/scripts/audiomenu/Cargo.lock b/scripts/audiomenu/Cargo.lock index 9b96787..c293041 100644 --- a/scripts/audiomenu/Cargo.lock +++ b/scripts/audiomenu/Cargo.lock @@ -214,9 +214,9 @@ checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c" [[package]] name = "libc" -version = "0.2.171" +version = "0.2.172" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c19937216e9d3aa9956d9bb8dfc0b0c8beb6058fc4f7a4dc4d850edf86a237d6" +checksum = "d750af042f7ef4f724306de029d18836c26c1765a54a6a3f094cbd23a7267ffa" [[package]] name = "linux-raw-sys" diff --git a/scripts/jpassmenu/Cargo.lock b/scripts/jpassmenu/Cargo.lock index 24c86c1..cf124ce 100644 --- a/scripts/jpassmenu/Cargo.lock +++ b/scripts/jpassmenu/Cargo.lock @@ -329,9 +329,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.171" +version = "0.2.172" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c19937216e9d3aa9956d9bb8dfc0b0c8beb6058fc4f7a4dc4d850edf86a237d6" +checksum = "d750af042f7ef4f724306de029d18836c26c1765a54a6a3f094cbd23a7267ffa" [[package]] name = "linux-raw-sys" From ede2d5b3b6f10a498fdeb6656fd0f8bbefc1b9dd Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Thu, 17 Apr 2025 00:00:15 +0200 Subject: [PATCH 26/30] chore(deps): lock file maintenance --- scripts/audiomenu/Cargo.lock | 4 ++-- scripts/jpassmenu/Cargo.lock | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/audiomenu/Cargo.lock b/scripts/audiomenu/Cargo.lock index c293041..e442a48 100644 --- a/scripts/audiomenu/Cargo.lock +++ b/scripts/audiomenu/Cargo.lock @@ -303,9 +303,9 @@ checksum = "1036865bb9422d3300cf723f657c2851d0e9ab12567854b1f4eba3d77decf564" [[package]] name = "proc-macro2" -version = "1.0.94" +version = "1.0.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a31971752e70b8b2686d7e46ec17fb38dad4051d94024c88df49b667caea9c84" +checksum = "02b3e5e68a3a1a02aad3ec490a98007cbc13c37cbe84a3cd7b8e406d76e7f778" dependencies = [ "unicode-ident", ] diff --git a/scripts/jpassmenu/Cargo.lock b/scripts/jpassmenu/Cargo.lock index cf124ce..822ca98 100644 --- a/scripts/jpassmenu/Cargo.lock +++ b/scripts/jpassmenu/Cargo.lock @@ -439,9 +439,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.94" +version = "1.0.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a31971752e70b8b2686d7e46ec17fb38dad4051d94024c88df49b667caea9c84" +checksum = "02b3e5e68a3a1a02aad3ec490a98007cbc13c37cbe84a3cd7b8e406d76e7f778" dependencies = [ "unicode-ident", ] From a51e2f763917890854cf6b9802541b305432832f Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Fri, 18 Apr 2025 00:00:15 +0200 Subject: [PATCH 27/30] chore(deps): lock file maintenance --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index b50793c..0865d46 100644 --- a/flake.lock +++ b/flake.lock @@ -342,11 +342,11 @@ "nuschtosSearch": [] }, "locked": { - "lastModified": 1744753228, - "narHash": "sha256-Re8g2pby4sr4hgzJmQJxeH/9PtgX85nivkWibapRI5s=", + "lastModified": 1744874965, + "narHash": "sha256-eOnMgAWsjqOhGRoY9smkKlNQcCz9R89mgiKwLrCIYBE=", "owner": "nix-community", "repo": "nixvim", - "rev": "d4dada282aeac94b5d53dd70e276a2f5f534f783", + "rev": "500b56f023e0f095ffee2d4f79e58aa09e6b0719", "type": "github" }, "original": { From b4f5928663ab7d752cc940016ac3cb97d61af885 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Fri, 18 Apr 2025 21:30:12 +0200 Subject: [PATCH 28/30] fix(deps): update rust crate clap to v4.5.37 | datasource | package | from | to | | ---------- | ------- | ------ | ------ | | crate | clap | 4.5.36 | 4.5.37 | --- scripts/audiomenu/Cargo.lock | 8 ++++---- scripts/jpassmenu/Cargo.lock | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/scripts/audiomenu/Cargo.lock b/scripts/audiomenu/Cargo.lock index e442a48..8974818 100644 --- a/scripts/audiomenu/Cargo.lock +++ b/scripts/audiomenu/Cargo.lock @@ -116,9 +116,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "clap" -version = "4.5.36" +version = "4.5.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2df961d8c8a0d08aa9945718ccf584145eee3f3aa06cddbeac12933781102e04" +checksum = "eccb054f56cbd38340b380d4a8e69ef1f02f1af43db2f0cc817a4774d80ae071" dependencies = [ "clap_builder", "clap_derive", @@ -126,9 +126,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.36" +version = "4.5.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "132dbda40fb6753878316a489d5a1242a8ef2f0d9e47ba01c951ea8aa7d013a5" +checksum = "efd9466fac8543255d3b1fcad4762c5e116ffe808c8a3043d4263cd4fd4862a2" dependencies = [ "anstream", "anstyle", diff --git a/scripts/jpassmenu/Cargo.lock b/scripts/jpassmenu/Cargo.lock index 822ca98..73ad397 100644 --- a/scripts/jpassmenu/Cargo.lock +++ b/scripts/jpassmenu/Cargo.lock @@ -124,9 +124,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "clap" -version = "4.5.36" +version = "4.5.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2df961d8c8a0d08aa9945718ccf584145eee3f3aa06cddbeac12933781102e04" +checksum = "eccb054f56cbd38340b380d4a8e69ef1f02f1af43db2f0cc817a4774d80ae071" dependencies = [ "clap_builder", "clap_derive", @@ -134,9 +134,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.36" +version = "4.5.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "132dbda40fb6753878316a489d5a1242a8ef2f0d9e47ba01c951ea8aa7d013a5" +checksum = "efd9466fac8543255d3b1fcad4762c5e116ffe808c8a3043d4263cd4fd4862a2" dependencies = [ "anstream", "anstyle", From bedbf4a032a4aefaeec375c7ac19f81b54bc798c Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Sat, 19 Apr 2025 00:00:14 +0200 Subject: [PATCH 29/30] chore(deps): lock file maintenance --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 0865d46..912aa52 100644 --- a/flake.lock +++ b/flake.lock @@ -511,11 +511,11 @@ ] }, "locked": { - "lastModified": 1744707583, - "narHash": "sha256-IPFcShGro/UUp8BmwMBkq+6KscPlWQevZi9qqIwVUWg=", + "lastModified": 1744961264, + "narHash": "sha256-aRmUh0AMwcbdjJHnytg1e5h5ECcaWtIFQa6d9gI85AI=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "49d05555ccdd2592300099d6a657cc33571f4fe0", + "rev": "8d404a69efe76146368885110f29a2ca3700bee6", "type": "github" }, "original": { From da857a1e7c4d87137b2e5515ce8eeb896c4d44a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jalil=20David=20Salam=C3=A9=20Messina?= Date: Sun, 16 Mar 2025 22:25:58 +0100 Subject: [PATCH 30/30] wip: niri take 2 Take two, since one wasn't enough. --- flake-modules/nixos-modules.nix | 1 + flake.lock | 62 +++++++++++++++++++++++++++++++++ flake.nix | 11 ++++++ 3 files changed, 74 insertions(+) diff --git a/flake-modules/nixos-modules.nix b/flake-modules/nixos-modules.nix index ef8355e..44ec630 100644 --- a/flake-modules/nixos-modules.nix +++ b/flake-modules/nixos-modules.nix @@ -9,6 +9,7 @@ let nixosModule = { imports = [ + inputs.niri.nixosModules.niri inputs.stylix.nixosModules.stylix inputs.home-manager.nixosModules.home-manager ../modules/nixos diff --git a/flake.lock b/flake.lock index 912aa52..5803f77 100644 --- a/flake.lock +++ b/flake.lock @@ -301,6 +301,50 @@ "url": "https://git.lix.systems/lix-project/nixos-module/archive/release-2.92.tar.gz" } }, + "niri": { + "inputs": { + "niri-stable": "niri-stable", + "niri-unstable": [], + "nixpkgs": [ + "unstable" + ], + "nixpkgs-stable": [ + "nixpkgs" + ], + "xwayland-satellite-stable": "xwayland-satellite-stable", + "xwayland-satellite-unstable": [] + }, + "locked": { + "lastModified": 1742108116, + "narHash": "sha256-NrV9ysEfSbeRUPo0jdCBeesuNLTVrpHGXg40snH1YGE=", + "owner": "sodiboo", + "repo": "niri-flake", + "rev": "824f10012de455a1d0ef795a605f28948ee10467", + "type": "github" + }, + "original": { + "owner": "sodiboo", + "repo": "niri-flake", + "type": "github" + } + }, + "niri-stable": { + "flake": false, + "locked": { + "lastModified": 1740117926, + "narHash": "sha256-mTTHA0RAaQcdYe+9A3Jx77cmmyLFHmRoZdd8RpWa+m8=", + "owner": "YaLTeR", + "repo": "niri", + "rev": "b94a5db8790339cf9134873d8b490be69e02ac71", + "type": "github" + }, + "original": { + "owner": "YaLTeR", + "ref": "v25.02", + "repo": "niri", + "type": "github" + } + }, "nixpkgs": { "locked": { "lastModified": 1744440957, @@ -385,6 +429,7 @@ "flake-parts": "flake-parts", "home-manager": "home-manager", "lix-module": "lix-module", + "niri": "niri", "nixpkgs": "nixpkgs", "nixvim": "nixvim", "nuschtosSearch": "nuschtosSearch", @@ -523,6 +568,23 @@ "repo": "treefmt-nix", "type": "github" } + }, + "xwayland-satellite-stable": { + "flake": false, + "locked": { + "lastModified": 1739246919, + "narHash": "sha256-/hBM43/Gd0/tW+egrhlWgOIISeJxEs2uAOIYVpfDKeU=", + "owner": "Supreeeme", + "repo": "xwayland-satellite", + "rev": "44590a416d4a3e8220e19e29e0b6efe64a80315d", + "type": "github" + }, + "original": { + "owner": "Supreeeme", + "ref": "v0.5.1", + "repo": "xwayland-satellite", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 04aaea2..5f68856 100644 --- a/flake.nix +++ b/flake.nix @@ -43,6 +43,17 @@ nuschtosSearch.follows = ""; }; }; + niri = { + url = "github:sodiboo/niri-flake"; + inputs = { + # Deduplicate + nixpkgs.follows = "unstable"; + nixpkgs-stable.follows = "nixpkgs"; + # Unused + niri-unstable.follows = ""; + xwayland-satellite-unstable.follows = ""; + }; + }; flake-parts = { url = "github:hercules-ci/flake-parts"; inputs.nixpkgs-lib.follows = "nixpkgs";