From 7b93918ac0b71c1a2eb654ffe286a4f9c9efa7ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jalil=20David=20Salam=C3=A9=20Messina?= Date: Thu, 27 Mar 2025 21:59:35 +0100 Subject: [PATCH 001/168] fix: update lix-module to pull overlay fixes The overlay was broken and it was causing the configuration to fail to build. Hopefully now I fixed the CI issues that caused the automerge to work even though CI was failing, and this won't happen again. --- flake.lock | 20 ++++++++++---------- flake.nix | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/flake.lock b/flake.lock index 0ebe228..307eade 100644 --- a/flake.lock +++ b/flake.lock @@ -269,15 +269,15 @@ "lix": { "flake": false, "locked": { - "lastModified": 1737234286, - "narHash": "sha256-CCKIAE84dzkrnlxJCKFyffAxP3yfsOAbdvydUGqq24g=", - "rev": "2837da71ec1588c1187d2e554719b15904a46c8b", + "lastModified": 1742250400, + "narHash": "sha256-be2mY7VFiWcPw7GcaJBbUvpnpoLd39wxqTXagBNTR5w=", + "rev": "d8db15010d2059a23a17f70ef542b4d1e7d2c640", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/2837da71ec1588c1187d2e554719b15904a46c8b.tar.gz?rev=2837da71ec1588c1187d2e554719b15904a46c8b" + "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/d8db15010d2059a23a17f70ef542b4d1e7d2c640.tar.gz?rev=d8db15010d2059a23a17f70ef542b4d1e7d2c640" }, "original": { "type": "tarball", - "url": "https://git.lix.systems/lix-project/lix/archive/2.92.0.tar.gz" + "url": "https://git.lix.systems/lix-project/lix/archive/release-2.92.tar.gz" } }, "lix-module": { @@ -290,15 +290,15 @@ ] }, "locked": { - "lastModified": 1737237494, - "narHash": "sha256-YMLrcBpf0TR5r/eaqm8lxzFPap2TxCor0ZGcK3a7+b8=", - "rev": "b90bf629bbd835e61f1317b99e12f8c831017006", + "lastModified": 1742943028, + "narHash": "sha256-fprwZKE1uMzO9tiWWOrmLWBW3GPkMayQfb0xOvVFIno=", + "rev": "3fae818597ca2f1474de62022f850c23be50528d", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/b90bf629bbd835e61f1317b99e12f8c831017006.tar.gz?rev=b90bf629bbd835e61f1317b99e12f8c831017006" + "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/3fae818597ca2f1474de62022f850c23be50528d.tar.gz?rev=3fae818597ca2f1474de62022f850c23be50528d" }, "original": { "type": "tarball", - "url": "https://git.lix.systems/lix-project/nixos-module/archive/2.92.0.tar.gz" + "url": "https://git.lix.systems/lix-project/nixos-module/archive/release-2.92.tar.gz" } }, "nixpkgs": { diff --git a/flake.nix b/flake.nix index 70fa1ee..04aaea2 100644 --- a/flake.nix +++ b/flake.nix @@ -12,7 +12,7 @@ unstable.follows = "nixvim/nixpkgs"; # Lix lix-module = { - url = "https://git.lix.systems/lix-project/nixos-module/archive/2.92.0.tar.gz"; + url = "https://git.lix.systems/lix-project/nixos-module/archive/release-2.92.tar.gz"; inputs = { nixpkgs.follows = "nixpkgs"; flake-utils.inputs.systems.follows = "systems"; From b51df570e18471c588d0acca2d09a751cc896470 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Fri, 28 Mar 2025 00:00:32 +0100 Subject: [PATCH 002/168] chore(deps): lock file maintenance --- flake.lock | 20 ++++++++++---------- scripts/audiomenu/Cargo.lock | 4 ++-- scripts/jpassmenu/Cargo.lock | 4 ++-- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/flake.lock b/flake.lock index 307eade..8b58d97 100644 --- a/flake.lock +++ b/flake.lock @@ -269,11 +269,11 @@ "lix": { "flake": false, "locked": { - "lastModified": 1742250400, - "narHash": "sha256-be2mY7VFiWcPw7GcaJBbUvpnpoLd39wxqTXagBNTR5w=", - "rev": "d8db15010d2059a23a17f70ef542b4d1e7d2c640", + "lastModified": 1737234286, + "narHash": "sha256-pgDJZjj4jpzkFxsqBTI/9Yb0n3gW+DvDtuv9SwQZZcs=", + "rev": "079528098f5998ba13c88821a2eca1005c1695de", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/d8db15010d2059a23a17f70ef542b4d1e7d2c640.tar.gz?rev=d8db15010d2059a23a17f70ef542b4d1e7d2c640" + "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/079528098f5998ba13c88821a2eca1005c1695de.tar.gz?rev=079528098f5998ba13c88821a2eca1005c1695de" }, "original": { "type": "tarball", @@ -303,11 +303,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1742751704, - "narHash": "sha256-rBfc+H1dDBUQ2mgVITMGBPI1PGuCznf9rcWX/XIULyE=", + "lastModified": 1742937945, + "narHash": "sha256-lWc+79eZRyvHp/SqMhHTMzZVhpxkRvthsP1Qx6UCq0E=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f0946fa5f1fb876a9dc2e1850d9d3a4e3f914092", + "rev": "d02d88f8de5b882ccdde0465d8fa2db3aa1169f7", "type": "github" }, "original": { @@ -511,11 +511,11 @@ ] }, "locked": { - "lastModified": 1742982148, - "narHash": "sha256-aRA6LSxjlbMI6MmMzi/M5WH/ynd8pK+vACD9za3MKLQ=", + "lastModified": 1743081648, + "narHash": "sha256-WRAylyYptt6OX5eCEBWyTwOEqEtD6zt33rlUkr6u3cE=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "61c88349bf6dff49fa52d7dfc39b21026c2a8881", + "rev": "29a3d7b768c70addce17af0869f6e2bd8f5be4b7", "type": "github" }, "original": { diff --git a/scripts/audiomenu/Cargo.lock b/scripts/audiomenu/Cargo.lock index 3a7eda5..cbb93e8 100644 --- a/scripts/audiomenu/Cargo.lock +++ b/scripts/audiomenu/Cargo.lock @@ -281,9 +281,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.21.1" +version = "1.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d75b0bedcc4fe52caa0e03d9f1151a323e4aa5e2d78ba3580400cd3c9e2bc4bc" +checksum = "c2806eaa3524762875e21c3dcd057bc4b7bfa01ce4da8d46be1cd43649e1cc6b" [[package]] name = "os_pipe" diff --git a/scripts/jpassmenu/Cargo.lock b/scripts/jpassmenu/Cargo.lock index 7354614..9ab4da8 100644 --- a/scripts/jpassmenu/Cargo.lock +++ b/scripts/jpassmenu/Cargo.lock @@ -402,9 +402,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.21.1" +version = "1.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d75b0bedcc4fe52caa0e03d9f1151a323e4aa5e2d78ba3580400cd3c9e2bc4bc" +checksum = "c2806eaa3524762875e21c3dcd057bc4b7bfa01ce4da8d46be1cd43649e1cc6b" [[package]] name = "os_pipe" From e8299f98b059066b65689dd5d0291b10994c901a Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Sat, 29 Mar 2025 00:00:14 +0100 Subject: [PATCH 003/168] 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 8b58d97..516c482 100644 --- a/flake.lock +++ b/flake.lock @@ -342,11 +342,11 @@ "nuschtosSearch": [] }, "locked": { - "lastModified": 1742991302, - "narHash": "sha256-5S+qnc5ijgFWlAWS9+L7uAgpDnL0RtVEDhVpHWGoavA=", + "lastModified": 1743157969, + "narHash": "sha256-ldlSyVKNaXL7ys7Jr7mLhlpGDE4VPVcWmV7Odupn5TY=", "owner": "nix-community", "repo": "nixvim", - "rev": "1c0dd320d9c4f250ac33382e11d370b7abe97622", + "rev": "95573411bc9be155a93b0f15d2bad62c6b43b3cc", "type": "github" }, "original": { @@ -367,11 +367,11 @@ ] }, "locked": { - "lastModified": 1742659553, - "narHash": "sha256-i/JCrr/jApVorI9GkSV5to+USrRCa0rWuQDH8JSlK2A=", + "lastModified": 1743201766, + "narHash": "sha256-bb/dqoIjtIWtJRzASOe8g4m8W2jUIWtuoGPXdNjM/Tk=", "owner": "NuschtOS", "repo": "search", - "rev": "508752835128a3977985a4d5225ff241f7756181", + "rev": "2651dbfad93d6ef66c440cbbf23238938b187bde", "type": "github" }, "original": { diff --git a/scripts/audiomenu/Cargo.lock b/scripts/audiomenu/Cargo.lock index cbb93e8..851b718 100644 --- a/scripts/audiomenu/Cargo.lock +++ b/scripts/audiomenu/Cargo.lock @@ -281,9 +281,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.21.2" +version = "1.21.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2806eaa3524762875e21c3dcd057bc4b7bfa01ce4da8d46be1cd43649e1cc6b" +checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d" [[package]] name = "os_pipe" diff --git a/scripts/jpassmenu/Cargo.lock b/scripts/jpassmenu/Cargo.lock index 9ab4da8..dc567ea 100644 --- a/scripts/jpassmenu/Cargo.lock +++ b/scripts/jpassmenu/Cargo.lock @@ -402,9 +402,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.21.2" +version = "1.21.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2806eaa3524762875e21c3dcd057bc4b7bfa01ce4da8d46be1cd43649e1cc6b" +checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d" [[package]] name = "os_pipe" From 57b7e9f1519579a94e52dfba870de9bce30f7af1 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Sun, 30 Mar 2025 00:00:16 +0100 Subject: [PATCH 004/168] chore(deps): lock file maintenance --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 516c482..e43ba02 100644 --- a/flake.lock +++ b/flake.lock @@ -342,11 +342,11 @@ "nuschtosSearch": [] }, "locked": { - "lastModified": 1743157969, - "narHash": "sha256-ldlSyVKNaXL7ys7Jr7mLhlpGDE4VPVcWmV7Odupn5TY=", + "lastModified": 1743288994, + "narHash": "sha256-hUlfAcIUnS8/eSFq+uzOHPZO1p8QgBTAoqhDWzEkUto=", "owner": "nix-community", "repo": "nixvim", - "rev": "95573411bc9be155a93b0f15d2bad62c6b43b3cc", + "rev": "81fdde9fc529e0a5f9ff0d570f31acfe85fd20ac", "type": "github" }, "original": { From b489a09085799451021b2492dab2fccfde12f274 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Sun, 30 Mar 2025 00:19:55 +0100 Subject: [PATCH 005/168] chore(deps): lock file maintenance --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index e43ba02..92bc63b 100644 --- a/flake.lock +++ b/flake.lock @@ -303,11 +303,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1742937945, - "narHash": "sha256-lWc+79eZRyvHp/SqMhHTMzZVhpxkRvthsP1Qx6UCq0E=", + "lastModified": 1743231893, + "narHash": "sha256-tpJsHMUPEhEnzySoQxx7+kA+KUtgWqvlcUBqROYNNt0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d02d88f8de5b882ccdde0465d8fa2db3aa1169f7", + "rev": "c570c1f5304493cafe133b8d843c7c1c4a10d3a6", "type": "github" }, "original": { From 7ff376d0f3350da2813f1d915765bf0949680398 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Mon, 31 Mar 2025 00:00:15 +0200 Subject: [PATCH 006/168] chore(deps): lock file maintenance --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 92bc63b..d7bcf0b 100644 --- a/flake.lock +++ b/flake.lock @@ -342,11 +342,11 @@ "nuschtosSearch": [] }, "locked": { - "lastModified": 1743288994, - "narHash": "sha256-hUlfAcIUnS8/eSFq+uzOHPZO1p8QgBTAoqhDWzEkUto=", + "lastModified": 1743362786, + "narHash": "sha256-XbXIRDbb8/vLBX1M096l7lM5wfzBTp1ZXfUl9bUhVGU=", "owner": "nix-community", "repo": "nixvim", - "rev": "81fdde9fc529e0a5f9ff0d570f31acfe85fd20ac", + "rev": "d81f37256d0a8691b837b74979d27bf89be8ecdd", "type": "github" }, "original": { From 12675acc21f23d6b9658a64a4ee762b06be5eae0 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Tue, 1 Apr 2025 00:00:31 +0200 Subject: [PATCH 007/168] chore(deps): lock file maintenance --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index d7bcf0b..4c24de6 100644 --- a/flake.lock +++ b/flake.lock @@ -226,11 +226,11 @@ ] }, "locked": { - "lastModified": 1742655702, - "narHash": "sha256-jbqlw4sPArFtNtA1s3kLg7/A4fzP4GLk9bGbtUJg0JQ=", + "lastModified": 1743387206, + "narHash": "sha256-24N3NAuZZbYqZ39NgToZgHUw6M7xHrtrAm18kv0+2Wo=", "owner": "nix-community", "repo": "home-manager", - "rev": "0948aeedc296f964140d9429223c7e4a0702a1ff", + "rev": "15c5f9d04fabd176f30286c8f52bbdb2c853a146", "type": "github" }, "original": { @@ -303,11 +303,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1743231893, - "narHash": "sha256-tpJsHMUPEhEnzySoQxx7+kA+KUtgWqvlcUBqROYNNt0=", + "lastModified": 1743367904, + "narHash": "sha256-sOos1jZGKmT6xxPvxGQyPTApOunXvScV4lNjBCXd/CI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c570c1f5304493cafe133b8d843c7c1c4a10d3a6", + "rev": "7ffe0edc685f14b8c635e3d6591b0bbb97365e6c", "type": "github" }, "original": { From 3c8d299f22d245c138953e4cc3db923907f58bdb Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Tue, 1 Apr 2025 19:20:09 +0200 Subject: [PATCH 008/168] fix(deps): update rust crate clap to v4.5.35 | datasource | package | from | to | | ---------- | ------- | ------ | ------ | | crate | clap | 4.5.34 | 4.5.35 | --- 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 851b718..e783945 100644 --- a/scripts/audiomenu/Cargo.lock +++ b/scripts/audiomenu/Cargo.lock @@ -116,9 +116,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "clap" -version = "4.5.34" +version = "4.5.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e958897981290da2a852763fe9cdb89cd36977a5d729023127095fa94d95e2ff" +checksum = "d8aa86934b44c19c50f87cc2790e19f54f7a67aedb64101c2e1a2e5ecfb73944" dependencies = [ "clap_builder", "clap_derive", @@ -126,9 +126,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.34" +version = "4.5.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83b0f35019843db2160b5bb19ae09b4e6411ac33fc6a712003c33e03090e2489" +checksum = "2414dbb2dd0695280da6ea9261e327479e9d37b0630f6b53ba2a11c60c679fd9" dependencies = [ "anstream", "anstyle", diff --git a/scripts/jpassmenu/Cargo.lock b/scripts/jpassmenu/Cargo.lock index dc567ea..cfd1d1d 100644 --- a/scripts/jpassmenu/Cargo.lock +++ b/scripts/jpassmenu/Cargo.lock @@ -124,9 +124,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "clap" -version = "4.5.34" +version = "4.5.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e958897981290da2a852763fe9cdb89cd36977a5d729023127095fa94d95e2ff" +checksum = "d8aa86934b44c19c50f87cc2790e19f54f7a67aedb64101c2e1a2e5ecfb73944" dependencies = [ "clap_builder", "clap_derive", @@ -134,9 +134,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.34" +version = "4.5.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83b0f35019843db2160b5bb19ae09b4e6411ac33fc6a712003c33e03090e2489" +checksum = "2414dbb2dd0695280da6ea9261e327479e9d37b0630f6b53ba2a11c60c679fd9" dependencies = [ "anstream", "anstyle", From 7353f2ff23aa3c40c6e1251bb38bad6eb24db89b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jalil=20David=20Salam=C3=A9=20Messina?= Date: Tue, 1 Apr 2025 20:04:26 +0200 Subject: [PATCH 009/168] fix(jpassmenu): PASSWORD_STORE_DIR not set Because of the switch to `fish`, the hm session vars are no longer sourced. --- modules/hm/default.nix | 1 + modules/nixos/default.nix | 6 +----- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/modules/hm/default.nix b/modules/hm/default.nix index 3f31f26..98de725 100644 --- a/modules/hm/default.nix +++ b/modules/hm/default.nix @@ -59,6 +59,7 @@ in icons = "auto"; }; # Shell + bash.enable = true; # ensure HM variables are passed to `bash` too (otherwise `jpassmenu` doesn't work) fish = { enable = true; preferAbbrs = true; # when defining an alias, prefer instead to define an abbreviation diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix index d6eeff7..875044b 100644 --- a/modules/nixos/default.nix +++ b/modules/nixos/default.nix @@ -38,11 +38,7 @@ in # 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 + 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; From 93eaa6d9f66d20df9f7293be4129dd28fd637f2b Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Tue, 1 Apr 2025 22:00:09 +0200 Subject: [PATCH 010/168] fix(deps): update rust crate env_logger to v0.11.8 | datasource | package | from | to | | ---------- | ---------- | ------ | ------ | | crate | env_logger | 0.11.7 | 0.11.8 | --- scripts/jpassmenu/Cargo.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/jpassmenu/Cargo.lock b/scripts/jpassmenu/Cargo.lock index cfd1d1d..bfefd24 100644 --- a/scripts/jpassmenu/Cargo.lock +++ b/scripts/jpassmenu/Cargo.lock @@ -217,9 +217,9 @@ dependencies = [ [[package]] name = "env_logger" -version = "0.11.7" +version = "0.11.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3716d7a920fb4fac5d84e9d4bce8ceb321e9414b4409da61b07b75c1e3d0697" +checksum = "13c863f0904021b108aa8b2f55046443e6b1ebde8fd4a15c399893aae4fa069f" dependencies = [ "anstream", "anstyle", 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 011/168] 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 012/168] 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 013/168] 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 014/168] 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 015/168] 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 016/168] 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 017/168] 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 018/168] 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 019/168] 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 020/168] 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 021/168] 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 022/168] 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 023/168] 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 024/168] 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 025/168] 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 026/168] 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 027/168] 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 028/168] 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 029/168] 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 030/168] 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 031/168] 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 032/168] 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 033/168] 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 034/168] 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 035/168] 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 036/168] 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 037/168] 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 038/168] 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 4e058fb70f9938eb81d98124857ef30706ddade6 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Sun, 20 Apr 2025 00:00:18 +0200 Subject: [PATCH 039/168] chore(deps): lock file maintenance --- flake.lock | 20 ++++++++++---------- scripts/jpassmenu/Cargo.lock | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/flake.lock b/flake.lock index 912aa52..6ec0764 100644 --- a/flake.lock +++ b/flake.lock @@ -252,16 +252,16 @@ ] }, "locked": { - "lastModified": 1729958008, - "narHash": "sha256-EiOq8jF4Z/zQe0QYVc3+qSKxRK//CFHMB84aYrYGwEs=", + "lastModified": 1737371634, + "narHash": "sha256-fTVAWzT1UMm1lT+YxHuVPtH+DATrhYfea3B0MxG/cGw=", "owner": "NuschtOS", "repo": "ixx", - "rev": "9fd01aad037f345350eab2cd45e1946cc66da4eb", + "rev": "a1176e2a10ce745ff8f63e4af124ece8fe0b1648", "type": "github" }, "original": { "owner": "NuschtOS", - "ref": "v0.0.6", + "ref": "v0.0.7", "repo": "ixx", "type": "github" } @@ -342,11 +342,11 @@ "nuschtosSearch": [] }, "locked": { - "lastModified": 1744874965, - "narHash": "sha256-eOnMgAWsjqOhGRoY9smkKlNQcCz9R89mgiKwLrCIYBE=", + "lastModified": 1745083083, + "narHash": "sha256-Wp/1vHq+XGAeYDNwQuoV4WNJii1svgnxZRbTDN0r4eA=", "owner": "nix-community", "repo": "nixvim", - "rev": "500b56f023e0f095ffee2d4f79e58aa09e6b0719", + "rev": "85c99eaebad22859962239a1fe42a3ba74a0ab02", "type": "github" }, "original": { @@ -367,11 +367,11 @@ ] }, "locked": { - "lastModified": 1744375525, - "narHash": "sha256-/Wf5Ca0DmV+y+qVBDXX8HAfAvSQI6y5oE27dv6t1jXk=", + "lastModified": 1745046075, + "narHash": "sha256-8v4y6k16Ra/fiecb4DxhsoOGtzLKgKlS+9/XJ9z0T2I=", "owner": "NuschtOS", "repo": "search", - "rev": "c0e7d3bda11e2cfad692d205d82757078475957a", + "rev": "066afe8643274470f4a294442aadd988356a478f", "type": "github" }, "original": { diff --git a/scripts/jpassmenu/Cargo.lock b/scripts/jpassmenu/Cargo.lock index 73ad397..514317f 100644 --- a/scripts/jpassmenu/Cargo.lock +++ b/scripts/jpassmenu/Cargo.lock @@ -293,9 +293,9 @@ checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" [[package]] name = "jiff" -version = "0.2.8" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5ad87c89110f55e4cd4dc2893a9790820206729eaf221555f742d540b0724a0" +checksum = "59ec30f7142be6fe14e1b021f50b85db8df2d4324ea6e91ec3e5dcde092021d0" dependencies = [ "jiff-static", "log", @@ -306,9 +306,9 @@ dependencies = [ [[package]] name = "jiff-static" -version = "0.2.8" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d076d5b64a7e2fe6f0743f02c43ca4a6725c0f904203bfe276a5b3e793103605" +checksum = "526b834d727fd59d37b076b0c3236d9adde1b1729a4361e20b2026f738cc1dbe" dependencies = [ "proc-macro2", "quote", From fc30d21254bd9583ad2b5fecb2cc15665df40f9e Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Sun, 20 Apr 2025 00:20:20 +0200 Subject: [PATCH 040/168] chore(deps): lock file maintenance --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 6ec0764..7ef2cec 100644 --- a/flake.lock +++ b/flake.lock @@ -319,11 +319,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1744157173, - "narHash": "sha256-bWSjxDwq7iVePrhmA7tY2dyMWHuNJo8knkO4y+q4ZkY=", + "lastModified": 1744536153, + "narHash": "sha256-awS2zRgF4uTwrOKwwiJcByDzDOdo3Q1rPZbiHQg/N38=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6a39c6e495eefabc935d8ddf66aa45d85b85fa3f", + "rev": "18dd725c29603f582cf1900e0d25f9f1063dbf11", "type": "github" }, "original": { @@ -342,11 +342,11 @@ "nuschtosSearch": [] }, "locked": { - "lastModified": 1745083083, - "narHash": "sha256-Wp/1vHq+XGAeYDNwQuoV4WNJii1svgnxZRbTDN0r4eA=", + "lastModified": 1745099712, + "narHash": "sha256-fj/S+L9nQyJYdWFk3+8BGPp4tg5rY3uaF6jGADm7OA0=", "owner": "nix-community", "repo": "nixvim", - "rev": "85c99eaebad22859962239a1fe42a3ba74a0ab02", + "rev": "710f9cbd520b8e78fa95d4c5d255891e2b14a277", "type": "github" }, "original": { From e853dd6656e10a110f49c30235f9cefdae4400e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jalil=20David=20Salam=C3=A9=20Messina?= Date: Sun, 20 Apr 2025 22:24:43 +0200 Subject: [PATCH 041/168] fix(nix): remove unnecessary imports These just waste evaluation time. --- modules/nixvim/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/nixvim/default.nix b/modules/nixvim/default.nix index 9a9b212..6152af6 100644 --- a/modules/nixvim/default.nix +++ b/modules/nixvim/default.nix @@ -6,7 +6,7 @@ in imports = [ ./options.nix ]; config.programs.nixvim = lib.mkMerge [ - (import ./standalone.nix) + ./standalone.nix (lib.mkIf cfg.enable { enable = true; defaultEditor = lib.mkDefault true; From 816cfdd2af666f0be75c60076074e014fd633ed3 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Mon, 21 Apr 2025 00:00:15 +0200 Subject: [PATCH 042/168] chore(deps): lock file maintenance --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 7ef2cec..91e891e 100644 --- a/flake.lock +++ b/flake.lock @@ -342,11 +342,11 @@ "nuschtosSearch": [] }, "locked": { - "lastModified": 1745099712, - "narHash": "sha256-fj/S+L9nQyJYdWFk3+8BGPp4tg5rY3uaF6jGADm7OA0=", + "lastModified": 1745182672, + "narHash": "sha256-xh4O19Hre9LiJk0Aa3ZY/XlN00gAGhRUxCRz15j00JU=", "owner": "nix-community", "repo": "nixvim", - "rev": "710f9cbd520b8e78fa95d4c5d255891e2b14a277", + "rev": "6c4e2d9279e57369203ecfa159696c6a2af22130", "type": "github" }, "original": { From 5358188ad176d312ca9476d300b3825fabbd367d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jalil=20David=20Salam=C3=A9=20Messina?= Date: Mon, 21 Apr 2025 14:01:24 +0200 Subject: [PATCH 043/168] refactor(hm/gui): reorganize modules This way we are not `import`ing stuff which is slow. It also makes it easier to turn off the sway module. --- justfile | 4 +- modules/hm/gui/default.nix | 40 +---- modules/hm/gui/keybindings.nix | 118 --------------- modules/hm/gui/sway-config.nix | 101 ------------- modules/hm/gui/sway.nix | 226 +++++++++++++++++++++++++++++ modules/hm/gui/waybar-settings.nix | 127 ---------------- modules/hm/gui/waybar.nix | 159 ++++++++++++++++++++ 7 files changed, 392 insertions(+), 383 deletions(-) delete mode 100644 modules/hm/gui/keybindings.nix delete mode 100644 modules/hm/gui/sway-config.nix create mode 100644 modules/hm/gui/sway.nix delete mode 100644 modules/hm/gui/waybar-settings.nix create mode 100644 modules/hm/gui/waybar.nix diff --git a/justfile b/justfile index 4021089..483e46c 100644 --- a/justfile +++ b/justfile @@ -3,10 +3,10 @@ default: # Update a specific flake input update input: - nix flake lock --update-input {{input}} --commit-lock-file + nix flake lock --update-input "{{input}}" --commit-lock-file build-vm: - nixos-rebuild build-vm --flake .#vm --print-build-logs + nixos-rebuild build-vm --fallback --flake .#vm --print-build-logs run-vm: build-vm QEMU_OPTS="$QEMU_OPTS_WL" result/bin/run-nixos-vm diff --git a/modules/hm/gui/default.nix b/modules/hm/gui/default.nix index bc12a65..75d6cea 100644 --- a/modules/hm/gui/default.nix +++ b/modules/hm/gui/default.nix @@ -21,6 +21,11 @@ let }; in { + imports = [ + ./sway.nix + ./waybar.nix + ]; + config = lib.mkIf (jhome.enable && cfg.enable) { home.packages = (with pkgs; [ @@ -73,30 +78,6 @@ in }; # Text editor nixvim.clipboard.providers.wl-copy.enable = lib.mkDefault true; - # Status bar - waybar = { - enable = true; - systemd.enable = true; - settings = lib.mkIf config.jhome.styling.enable ( - import ./waybar-settings.nix { inherit config lib; } - ); - # Style overrides to highlight workspaces with windows - style = - lib.pipe - # css - '' - .modules-left #workspaces button { - border-bottom: 3px solid @base01; - } - .modules-left #workspaces button.persistent { - border-bottom: 3px solid transparent; - } - '' - [ - (lib.optionalString config.jhome.styling.enable) - lib.mkAfter - ]; - }; # Terminal wezterm = { enable = cfg.terminal == "wezterm"; @@ -173,17 +154,6 @@ in }; }; - # Window Manager - wayland.windowManager.sway = { - inherit (cfg.sway) enable; - package = swayPkg; # no sway package if it comes from the OS - config = import ./sway-config.nix { inherit config pkgs; }; - systemd = { - enable = true; - xdgAutostart = true; - }; - }; - # Set cursor style stylix = lib.mkIf config.jhome.styling.enable { inherit cursor; }; home.pointerCursor = lib.mkIf config.jhome.styling.enable ( diff --git a/modules/hm/gui/keybindings.nix b/modules/hm/gui/keybindings.nix deleted file mode 100644 index cfc8788..0000000 --- a/modules/hm/gui/keybindings.nix +++ /dev/null @@ -1,118 +0,0 @@ -{ pkgs, config }: -let - cfg = config.jhome.gui.sway; - passmenu = "${pkgs.jpassmenu}/bin/jpassmenu"; - selectAudio = "${pkgs.audiomenu}/bin/audiomenu"; - swayconf = config.wayland.windowManager.sway.config; - mod = swayconf.modifier; - workspaces = map toString [ - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - ]; - dirs = - map - (dir: { - key = swayconf.${dir}; - arrow = dir; - direction = dir; - }) - [ - "up" - "down" - "left" - "right" - ]; - joinKeys = builtins.concatStringsSep "+"; - # Generate a keybind from a modifier prefix and a key - keycombo = prefix: key: joinKeys (prefix ++ [ key ]); - modKeybind = keycombo [ mod ]; - modCtrlKeybind = keycombo [ - mod - "Ctrl" - ]; - modShiftKeybind = keycombo [ - mod - "Shift" - ]; - modCtrlShiftKeybind = keycombo [ - mod - "Ctrl" - "Shift" - ]; - dir2resize.up = "resize grow height"; - dir2resize.down = "resize shrink height"; - dir2resize.right = "resize grow width"; - dir2resize.left = "resize shrink width"; - # Bind a key combo to an action - genKeybind = prefix: action: key: { "${prefix key}" = "${action key}"; }; - genKey = - prefix: action: genKeybind ({ key, ... }: prefix key) ({ direction, ... }: action direction); - genArrow = - prefix: action: genKeybind ({ arrow, ... }: prefix arrow) ({ direction, ... }: action direction); - genArrowAndKey = - prefix: action: key: - (genKey prefix action key) // (genArrow prefix action key); - # Move window - moveWindowKeybinds = map (genArrowAndKey modShiftKeybind (dir: "move ${dir}")) dirs; - # Focus window - focusWindowKeybinds = map (genArrowAndKey modKeybind (dir: "focus ${dir}")) dirs; - # Resize window - resizeWindowKeybinds = map (genArrowAndKey modCtrlKeybind (dir: dir2resize.${dir})) dirs; - # Move container to workspace - moveWorkspaceKeybindings = map (genKeybind modShiftKeybind ( - number: "move container to workspace number ${number}" - )) workspaces; - # Focus workspace - focusWorkspaceKeybindings = map (genKeybind modKeybind ( - number: "workspace number ${number}" - )) workspaces; - # Move container to Workspace and focus on it - moveFocusWorkspaceKeybindings = map (genKeybind modCtrlShiftKeybind ( - number: "move container to workspace number ${number}; workspace number ${number}" - )) workspaces; -in -builtins.foldl' (l: r: l // r) - { - "${mod}+Return" = "exec ${swayconf.terminal}"; - "${mod}+D" = "exec ${swayconf.menu}"; - "${mod}+P" = "exec ${passmenu}"; - "${mod}+Shift+P" = "exec ${passmenu} --type"; - "${mod}+F2" = "exec qutebrowser"; - "${mod}+Shift+Q" = "kill"; - "${mod}+F" = "fullscreen toggle"; - # Media Controls - "${mod}+F10" = "exec ${selectAudio} select-sink"; - "${mod}+Shift+F10" = "exec ${selectAudio} select-source"; - "XF86AudioRaiseVolume" = "exec ${pkgs.avizo}/bin/volumectl up"; - "XF86AudioLowerVolume" = "exec ${pkgs.avizo}/bin/volumectl down"; - "XF86AudioMute" = "exec ${pkgs.avizo}/bin/volumectl toggle-mute"; - "XF86ScreenSaver" = "exec ${pkgs.swaylock}/bin/swaylock --image ${cfg.background}"; - "XF86MonBrightnessUp" = "exec ${pkgs.avizo}/bin/lightctl up"; - "XF86MonBrightnessDown" = "exec ${pkgs.avizo}/bin/lightctl down"; - # Floating - "${mod}+Space" = "floating toggle"; - "${mod}+Shift+Space" = "focus mode_toggle"; - # Scratchpad - "${mod}+Minus" = "scratchpad show"; - "${mod}+Shift+Minus" = "move scratchpad"; - # Layout - "${mod}+e" = "layout toggle split"; - # Session control - "${mod}+r" = "reload"; - "${mod}+Shift+m" = "exit"; - } - ( - focusWindowKeybinds - ++ moveWindowKeybinds - ++ resizeWindowKeybinds - ++ focusWorkspaceKeybindings - ++ moveWorkspaceKeybindings - ++ moveFocusWorkspaceKeybindings - ) diff --git a/modules/hm/gui/sway-config.nix b/modules/hm/gui/sway-config.nix deleted file mode 100644 index e20e8aa..0000000 --- a/modules/hm/gui/sway-config.nix +++ /dev/null @@ -1,101 +0,0 @@ -{ config, pkgs }: -let - cfg = config.jhome.gui.sway; - modifier = "Mod4"; - inherit (config.jhome.gui) terminal; - termCmd = - if terminal == "wezterm" then - "wezterm start" - else if terminal == "alacritty" then - "alacritty -e" - else - builtins.abort "no command configured for ${terminal}"; - menu = "${pkgs.fuzzel}/bin/fuzzel --terminal '${termCmd}'"; - # currently, there is some friction between sway and gtk: - # https://github.com/swaywm/sway/wiki/GTK-3-settings-on-Wayland - # the suggested way to set gtk settings is with gsettings - # for gsettings to work, we need to tell it where the schemas are - # using the XDG_DATA_DIR environment variable - # run at the end of sway config - configure-gtk = - let - schema = pkgs.gsettings-desktop-schemas; - datadir = "${schema}/share/gsettings-schemas/${schema.name}"; - in - pkgs.writers.writeDashBin "configure-gtk" '' - export XDG_DATA_DIRS="${datadir}:$XDG_DATA_DIRS" - - gnome_schema=org.gnome.desktop.interface - config="${config.xdg.configHome}/gtk-3.0/settings.ini" - if [ ! -f "$config" ]; then exit 1; fi - # Read settings from gtk3 - gtk_theme="$(${pkgs.gnugrep}/bin/grep 'gtk-theme-name' "$config" | ${pkgs.gnused}/bin/sed 's/.*\s*=\s*//')" - icon_theme="$(${pkgs.gnugrep}/bin/grep 'gtk-icon-theme-name' "$config" | ${pkgs.gnused}/bin/sed 's/.*\s*=\s*//')" - cursor_theme="$(${pkgs.gnugrep}/bin/grep 'gtk-cursor-theme-name' "$config" | ${pkgs.gnused}/bin/sed 's/.*\s*=\s*//')" - font_name="$(grep 'gtk-font-name' "$config" | sed 's/.*\s*=\s*//')" - ${pkgs.glib}/bin/gsettings set "$gnome_schema" gtk-theme "$gtk_theme" - ${pkgs.glib}/bin/gsettings set "$gnome_schema" icon-theme "$icon_theme" - ${pkgs.glib}/bin/gsettings set "$gnome_schema" cursor-theme "$cursor_theme" - ${pkgs.glib}/bin/gsettings set "$gnome_schema" font-name "$font_name" - ${pkgs.glib}/bin/gsettings set "$gnome_schema" color-scheme prefer-dark - ''; - cmdOnce = command: { inherit command; }; - cmdAlways = command: { - inherit command; - always = true; - }; -in -{ - inherit modifier terminal menu; - keybindings = import ./keybindings.nix { inherit config pkgs; }; - # Appearance - bars = [ ]; # Waybar is started as a systemd service - gaps = { - smartGaps = true; - smartBorders = "on"; - inner = 4; - }; - output."*".bg = "${cfg.background} fill"; - # Window Appearance - window = { - border = 2; - titlebar = false; - # Make certain windows floating - commands = [ - { - command = "floating enable"; - criteria.title = "zoom"; - } - { - command = "floating enable"; - criteria.class = "floating"; - } - { - command = "floating enable"; - criteria.app_id = "floating"; - } - ]; - }; - # Startup scripts - startup = - [ - (cmdAlways "${configure-gtk}/bin/configure-gtk") - ] - ++ (builtins.map cmdAlways cfg.exec.always) - ++ (builtins.map cmdOnce cfg.exec.once); - # Keyboard configuration - input."type:keyboard" = { - repeat_delay = "300"; - repeat_rate = "50"; - xkb_options = "caps:swapescape,compose:ralt"; - xkb_numlock = "enabled"; - }; - # Touchpad - input."type:touchpad" = { - click_method = "clickfinger"; - natural_scroll = "enabled"; - scroll_method = "two_finger"; - tap = "enabled"; - tap_button_map = "lrm"; - }; -} diff --git a/modules/hm/gui/sway.nix b/modules/hm/gui/sway.nix new file mode 100644 index 0000000..5ed2293 --- /dev/null +++ b/modules/hm/gui/sway.nix @@ -0,0 +1,226 @@ +{ + config, + pkgs, + lib, + ... +}: +let + cfg = config.jhome.gui.sway; +in +{ + config = lib.mkIf (config.jhome.enable && config.jhome.gui.enable && cfg.enable) { + # Window Manager + wayland.windowManager.sway = { + inherit (cfg) enable; + config = + let + inherit (config.jhome.gui) terminal; + termCmd = + if terminal == "wezterm" then + "wezterm start" + else if terminal == "alacritty" then + "alacritty -e" + else + builtins.abort "no command configured for ${terminal}"; + menu = "${pkgs.fuzzel}/bin/fuzzel --terminal '${termCmd}'"; + cmdOnce = command: { inherit command; }; + cmdAlways = command: { + inherit command; + always = true; + }; + in + { + modifier = "Mod4"; + inherit terminal menu; + # Appearance + bars = [ ]; # Waybar is started as a systemd service + gaps = { + smartGaps = true; + smartBorders = "on"; + inner = 4; + }; + output."*".bg = "${cfg.background} fill"; + # Window Appearance + window = { + border = 2; + titlebar = false; + # Make certain windows floating + commands = [ + { + command = "floating enable"; + criteria.title = "zoom"; + } + { + command = "floating enable"; + criteria.class = "floating"; + } + { + command = "floating enable"; + criteria.app_id = "floating"; + } + ]; + }; + # Startup scripts + startup = + let + # currently, there is some friction between sway and gtk: + # https://github.com/swaywm/sway/wiki/GTK-3-settings-on-Wayland + # the suggested way to set gtk settings is with gsettings + # for gsettings to work, we need to tell it where the schemas are + # using the XDG_DATA_DIR environment variable + # run at the end of sway config + schema = pkgs.gsettings-desktop-schemas; + datadir = "${schema}/share/gsettings-schemas/${schema.name}"; + in + [ + (cmdAlways "${pkgs.writers.writeDash "configure-gtk" '' + export XDG_DATA_DIRS="${datadir}:$XDG_DATA_DIRS" + + gnome_schema=org.gnome.desktop.interface + config="${config.xdg.configHome}/gtk-3.0/settings.ini" + if [ ! -f "$config" ]; then exit 1; fi + # Read settings from gtk3 + gtk_theme="$(${pkgs.gnugrep}/bin/grep 'gtk-theme-name' "$config" | ${pkgs.gnused}/bin/sed 's/.*\s*=\s*//')" + icon_theme="$(${pkgs.gnugrep}/bin/grep 'gtk-icon-theme-name' "$config" | ${pkgs.gnused}/bin/sed 's/.*\s*=\s*//')" + cursor_theme="$(${pkgs.gnugrep}/bin/grep 'gtk-cursor-theme-name' "$config" | ${pkgs.gnused}/bin/sed 's/.*\s*=\s*//')" + font_name="$(grep 'gtk-font-name' "$config" | sed 's/.*\s*=\s*//')" + ${pkgs.glib}/bin/gsettings set "$gnome_schema" gtk-theme "$gtk_theme" + ${pkgs.glib}/bin/gsettings set "$gnome_schema" icon-theme "$icon_theme" + ${pkgs.glib}/bin/gsettings set "$gnome_schema" cursor-theme "$cursor_theme" + ${pkgs.glib}/bin/gsettings set "$gnome_schema" font-name "$font_name" + ${pkgs.glib}/bin/gsettings set "$gnome_schema" color-scheme prefer-dark + ''}") + ] + ++ (builtins.map cmdAlways cfg.exec.always) + ++ (builtins.map cmdOnce cfg.exec.once); + # Keyboard configuration + input."type:keyboard" = { + repeat_delay = "300"; + repeat_rate = "50"; + xkb_options = "caps:swapescape,compose:ralt"; + xkb_numlock = "enabled"; + }; + # Touchpad + input."type:touchpad" = { + click_method = "clickfinger"; + natural_scroll = "enabled"; + scroll_method = "two_finger"; + tap = "enabled"; + tap_button_map = "lrm"; + }; + # Keybinds + keybindings = + let + passmenu = "${pkgs.jpassmenu}/bin/jpassmenu"; + selectAudio = "${pkgs.audiomenu}/bin/audiomenu"; + swayconf = config.wayland.windowManager.sway.config; + mod = swayconf.modifier; + workspaces = map toString (lib.lists.range 1 9); + dirs = + map + (dir: { + key = swayconf.${dir}; + arrow = dir; + direction = dir; + }) + [ + "up" + "down" + "left" + "right" + ]; + joinKeys = builtins.concatStringsSep "+"; + # Generate a keybind from a modifier prefix and a key + keycombo = prefix: key: joinKeys (prefix ++ [ key ]); + modKeybind = keycombo [ mod ]; + modCtrlKeybind = keycombo [ + mod + "Ctrl" + ]; + modShiftKeybind = keycombo [ + mod + "Shift" + ]; + modCtrlShiftKeybind = keycombo [ + mod + "Ctrl" + "Shift" + ]; + dir2resize.up = "resize grow height"; + dir2resize.down = "resize shrink height"; + dir2resize.right = "resize grow width"; + dir2resize.left = "resize shrink width"; + # Bind a key combo to an action + genKeybind = prefix: action: key: { "${prefix key}" = "${action key}"; }; + genKey = + prefix: action: genKeybind ({ key, ... }: prefix key) ({ direction, ... }: action direction); + genArrow = + prefix: action: genKeybind ({ arrow, ... }: prefix arrow) ({ direction, ... }: action direction); + genArrowAndKey = + prefix: action: key: + (genKey prefix action key) // (genArrow prefix action key); + # Move window + moveWindowKeybinds = map (genArrowAndKey modShiftKeybind (dir: "move ${dir}")) dirs; + # Focus window + focusWindowKeybinds = map (genArrowAndKey modKeybind (dir: "focus ${dir}")) dirs; + # Resize window + resizeWindowKeybinds = map (genArrowAndKey modCtrlKeybind (dir: dir2resize.${dir})) dirs; + # Move container to workspace + moveWorkspaceKeybindings = map (genKeybind modShiftKeybind ( + number: "move container to workspace number ${number}" + )) workspaces; + # Focus workspace + focusWorkspaceKeybindings = map (genKeybind modKeybind ( + number: "workspace number ${number}" + )) workspaces; + # Move container to Workspace and focus on it + moveFocusWorkspaceKeybindings = map (genKeybind modCtrlShiftKeybind ( + number: "move container to workspace number ${number}; workspace number ${number}" + )) workspaces; + in + builtins.foldl' (l: r: l // r) + { + "${mod}+Return" = "exec ${swayconf.terminal}"; + "${mod}+D" = "exec ${swayconf.menu}"; + "${mod}+P" = "exec ${passmenu}"; + "${mod}+Shift+P" = "exec ${passmenu} --type"; + "${mod}+F2" = "exec qutebrowser"; + "${mod}+Shift+Q" = "kill"; + "${mod}+F" = "fullscreen toggle"; + # Media Controls + "${mod}+F10" = "exec ${selectAudio} select-sink"; + "${mod}+Shift+F10" = "exec ${selectAudio} select-source"; + "XF86AudioRaiseVolume" = "exec ${pkgs.avizo}/bin/volumectl up"; + "XF86AudioLowerVolume" = "exec ${pkgs.avizo}/bin/volumectl down"; + "XF86AudioMute" = "exec ${pkgs.avizo}/bin/volumectl toggle-mute"; + "XF86ScreenSaver" = "exec ${pkgs.swaylock}/bin/swaylock --image ${cfg.background}"; + "XF86MonBrightnessUp" = "exec ${pkgs.avizo}/bin/lightctl up"; + "XF86MonBrightnessDown" = "exec ${pkgs.avizo}/bin/lightctl down"; + # Floating + "${mod}+Space" = "floating toggle"; + "${mod}+Shift+Space" = "focus mode_toggle"; + # Scratchpad + "${mod}+Minus" = "scratchpad show"; + "${mod}+Shift+Minus" = "move scratchpad"; + # Layout + "${mod}+e" = "layout toggle split"; + # Session control + "${mod}+r" = "reload"; + "${mod}+Shift+m" = "exit"; + } + ( + focusWindowKeybinds + ++ moveWindowKeybinds + ++ resizeWindowKeybinds + ++ focusWorkspaceKeybindings + ++ moveWorkspaceKeybindings + ++ moveFocusWorkspaceKeybindings + ); + }; + systemd = { + enable = true; + xdgAutostart = true; + }; + }; + }; +} diff --git a/modules/hm/gui/waybar-settings.nix b/modules/hm/gui/waybar-settings.nix deleted file mode 100644 index 3fcf58c..0000000 --- a/modules/hm/gui/waybar-settings.nix +++ /dev/null @@ -1,127 +0,0 @@ -{ config, lib }: -let - cfg = config.jhome.gui; -in -{ - mainBar = { - layer = "top"; - position = "top"; - margin = "2 2 2 2"; - # Choose the order of the modules - modules-left = [ "sway/workspaces" ]; - modules-center = [ "clock" ]; - modules-right = - [ - "pulseaudio" - "backlight" - "battery" - "sway/language" - "memory" - ] - ++ lib.optional (cfg.tempInfo != null) "temperature" - ++ [ "tray" ]; - "sway/workspaces" = { - disable-scroll = true; - persistent-workspaces = { - "1" = [ ]; - "2" = [ ]; - "3" = [ ]; - "4" = [ ]; - "5" = [ ]; - "6" = [ ]; - "7" = [ ]; - "8" = [ ]; - "9" = [ ]; - }; - }; - "sway/language" = { - format = "{} "; - min-length = 5; - tooltip = false; - }; - memory = { - format = "{used:0.1f}/{total:0.1f}GiB "; - interval = 3; - }; - clock = { - timezone = "Europe/Berlin"; - tooltip-format = "{:%Y %B}\n{calendar}"; - format = "{:%a, %d %b, %H:%M}"; - }; - pulseaudio = { - reverse-scrolling = 1; - format = "{volume}% {icon} {format_source}"; - format-bluetooth = "{volume}% {icon} {format_source}"; - format-bluetooth-muted = "{volume}% 󰖁 {icon} {format_source}"; - format-muted = "{volume}% 󰖁 {format_source}"; - format-source = "{volume}% "; - format-source-muted = "{volume}% 󰍭"; - format-icons = { - headphone = "󰋋"; - hands-free = ""; - headset = "󰋎"; - phone = "󰘂"; - portable = ""; - car = ""; - default = [ - "󰕿" - "󰖀" - "󰕾" - ]; - }; - on-click = "pavucontrol"; - min-length = 13; - }; - temperature = lib.optionalAttrs (cfg.tempInfo != null) { - inherit (cfg.tempInfo) hwmon-path; - critical-threshold = 80; - format = "{temperatureC}°C {icon}"; - format-icons = [ - "" - "" - "" - "" - "" - ]; - tooltip = false; - }; - backlight = { - device = "intel_backlight"; - format = "{percent}% {icon}"; - format-icons = [ - "󰃚" - "󰃛" - "󰃜" - "󰃝" - "󰃞" - "󰃟" - "󰃠" - ]; - min-length = 7; - }; - battery = { - states.warning = 30; - states.critical = 15; - format = "{capacity}% {icon}"; - format-charging = "{capacity}% 󰂄"; - format-plugged = "{capacity}% 󰚥"; - format-alt = "{time} {icon}"; - format-icons = [ - "󰁺" - "󰁻" - "󰁼" - "󰁽" - "󰁾" - "󰁿" - "󰂀" - "󰂁" - "󰂂" - "󰁹" - ]; - }; - tray = { - icon-size = 16; - spacing = 0; - }; - }; -} diff --git a/modules/hm/gui/waybar.nix b/modules/hm/gui/waybar.nix new file mode 100644 index 0000000..eefdab4 --- /dev/null +++ b/modules/hm/gui/waybar.nix @@ -0,0 +1,159 @@ +{ + config, + pkgs, + lib, + ... +}: +let + inherit (config) jhome; + cfg = jhome.gui; + swayconf = config.wayland.windowManager.sway; +in +{ + config = lib.mkIf (config.jhome.enable && cfg.enable) { + # Status bar + programs.waybar = { + enable = true; + systemd.enable = true; + settings = lib.mkIf config.jhome.styling.enable { + mainBar = { + layer = "top"; + position = "top"; + margin = "2 2 2 2"; + # Choose the order of the modules + modules-left = [ "sway/workspaces" ]; + modules-center = [ "clock" ]; + modules-right = + [ + "pulseaudio" + "backlight" + "battery" + "sway/language" + "memory" + ] + ++ lib.optional (cfg.tempInfo != null) "temperature" + ++ [ "tray" ]; + "sway/workspaces" = lib.mkIf swayconf.enable { + disable-scroll = true; + persistent-workspaces = { + "1" = [ ]; + "2" = [ ]; + "3" = [ ]; + "4" = [ ]; + "5" = [ ]; + "6" = [ ]; + "7" = [ ]; + "8" = [ ]; + "9" = [ ]; + }; + }; + "sway/language" = lib.mkIf swayconf.enable { + format = "{} "; + min-length = 5; + tooltip = false; + }; + memory = { + format = "{used:0.1f}/{total:0.1f}GiB "; + interval = 3; + }; + clock = { + timezone = "Europe/Berlin"; + tooltip-format = "{:%Y %B}\n{calendar}"; + format = "{:%a, %d %b, %H:%M}"; + }; + wireplumber = { + reverse-scrolling = 1; + format = "{volume}% {icon} {format_source}"; + format-bluetooth = "{volume}% {icon} {format_source}"; + format-bluetooth-muted = "{volume}% 󰖁 {icon} {format_source}"; + format-muted = "{volume}% 󰖁 {format_source}"; + format-source = "{volume}% "; + format-source-muted = "{volume}% 󰍭"; + format-icons = { + headphone = "󰋋"; + hands-free = ""; + headset = "󰋎"; + phone = "󰘂"; + portable = ""; + car = ""; + default = [ + "󰕿" + "󰖀" + "󰕾" + ]; + }; + on-click = lib.getExe pkgs.helvum; + min-length = 13; + }; + temperature = lib.optionalAttrs (cfg.tempInfo != null) { + inherit (cfg.tempInfo) hwmon-path; + critical-threshold = 80; + format = "{temperatureC}°C {icon}"; + format-icons = [ + "" + "" + "" + "" + "" + ]; + tooltip = false; + }; + backlight = { + device = "intel_backlight"; + format = "{percent}% {icon}"; + format-icons = [ + "󰃚" + "󰃛" + "󰃜" + "󰃝" + "󰃞" + "󰃟" + "󰃠" + ]; + min-length = 7; + }; + battery = { + states.warning = 30; + states.critical = 15; + format = "{capacity}% {icon}"; + format-charging = "{capacity}% 󰂄"; + format-plugged = "{capacity}% 󰚥"; + format-alt = "{time} {icon}"; + format-icons = [ + "󰁺" + "󰁻" + "󰁼" + "󰁽" + "󰁾" + "󰁿" + "󰂀" + "󰂁" + "󰂂" + "󰁹" + ]; + }; + tray = { + icon-size = 16; + spacing = 0; + }; + }; + }; + # Style overrides to highlight workspaces with windows + style = + lib.pipe + # css + '' + .modules-left #workspaces button { + border-bottom: 3px solid @base01; + } + .modules-left #workspaces button.persistent { + border-bottom: 3px solid transparent; + } + '' + [ + (lib.optionalString config.jhome.styling.enable) + lib.mkAfter + ]; + }; + }; +} From 46ba379d08a7d783ad3c5b2ce115aae0e4527abd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jalil=20David=20Salam=C3=A9=20Messina?= Date: Mon, 21 Apr 2025 18:54:53 +0200 Subject: [PATCH 044/168] refactor(nvim): pull in vim plugins properly This way should be faster to evaluate and more correct as we follow the way done in nixpkgs. --- modules/nixvim/extraPlugins/default.nix | 11 ----------- modules/nixvim/standalone.nix | 9 +++++++-- 2 files changed, 7 insertions(+), 13 deletions(-) delete mode 100644 modules/nixvim/extraPlugins/default.nix diff --git a/modules/nixvim/extraPlugins/default.nix b/modules/nixvim/extraPlugins/default.nix deleted file mode 100644 index 87e972c..0000000 --- a/modules/nixvim/extraPlugins/default.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ pkgs }: -let - overlay = pkgs.callPackage ./generated.nix { - inherit (pkgs.vimUtils) buildVimPlugin buildNeovimPlugin; - }; - plugins = overlay pkgs pkgs; -in -{ - inherit overlay; - inherit (plugins) nvim-silicon; -} diff --git a/modules/nixvim/standalone.nix b/modules/nixvim/standalone.nix index 8f4f63f..f66d239 100644 --- a/modules/nixvim/standalone.nix +++ b/modules/nixvim/standalone.nix @@ -7,7 +7,12 @@ let cfg = config.jhome.nvim; plugins = pkgs.vimPlugins; - extraPlugins = import ./extraPlugins { inherit pkgs; }; + jExtraVimPlugins = pkgs.vimPlugins.extend ( + pkgs.callPackage ./extraPlugins/generated.nix { + inherit (pkgs.vimUtils) buildVimPlugin; + inherit (pkgs.neovimUtils) buildNeovimPlugin; + } + ); in { imports = [ @@ -78,7 +83,7 @@ in } # Big packages that are kinda unnecessary (lib.mkIf (!cfg.reduceSize) { - extraPlugins = [ extraPlugins.nvim-silicon ]; + extraPlugins = [ jExtraVimPlugins.nvim-silicon ]; extraPackages = [ pkgs.silicon ]; extraConfigLua = # lua From 165c4030723ed33a8743e25758967f33c9bfe924 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jalil=20David=20Salam=C3=A9=20Messina?= Date: Mon, 21 Apr 2025 19:56:24 +0200 Subject: [PATCH 045/168] refactor(scripts): remove unnecessary imports They slow down evaluations --- flake-modules/default.nix | 2 +- flake-modules/scripts.nix | 14 -------------- scripts/default.nix | 30 ++++++++++++++++++++++-------- 3 files changed, 23 insertions(+), 23 deletions(-) delete mode 100644 flake-modules/scripts.nix diff --git a/flake-modules/default.nix b/flake-modules/default.nix index ce3e3c5..6b81037 100644 --- a/flake-modules/default.nix +++ b/flake-modules/default.nix @@ -13,7 +13,7 @@ in ./home-modules.nix ./nixvim-modules.nix ./overlays.nix - ./scripts.nix + ../scripts ]; perSystem = diff --git a/flake-modules/scripts.nix b/flake-modules/scripts.nix deleted file mode 100644 index 590f6a1..0000000 --- a/flake-modules/scripts.nix +++ /dev/null @@ -1,14 +0,0 @@ -let - scripts = import ../scripts; -in -{ - # Add scripts to overlay - flake.overlays.scripts = final: prev: scripts final; - - # Add scripts to packages - perSystem = - { pkgs, ... }: - { - packages = scripts pkgs; - }; -} diff --git a/scripts/default.nix b/scripts/default.nix index 23ec010..1894de7 100644 --- a/scripts/default.nix +++ b/scripts/default.nix @@ -1,23 +1,37 @@ -# Autodetects files with a package.nix and calls `callPackage` on them. -# -# Will add a package .#dirname to the flake if it finds a ./dirname/package.nix file. +{ lib, ... }: let - files = builtins.readDir ./.; + src = ./.; + # Autodetects files with a package.nix and calls `callPackage` on them. + # + # Will add a package .#dirname to the flake if it finds a ./dirname/package.nix file. + files = builtins.readDir src; isPackage = path: type: (type == "directory") && (builtins.readDir path) ? "package.nix"; toPackage = name: pkgs: { inherit name; - value = pkgs.callPackage (./. + "/${name}/package.nix") { }; + value = pkgs.callPackage "${src}/${name}/package.nix" { }; }; # call pkgs.callPackage on all ./*/package.nix makePackage = pkgs: name: let type = files.${name}; - path = ./. + "/${name}"; + path = "${src}/${name}"; package = toPackage name pkgs; in # if it is a package then return a package otherwise return no package c: if isPackage path type then [ package ] else [ ]; + # we have lib.filterMapAttrs at home + scripts = + pkgs: builtins.listToAttrs (builtins.concatMap (makePackage pkgs) (builtins.attrNames files)); in -# we have lib.filterMapAttrs at home -pkgs: builtins.listToAttrs (builtins.concatMap (makePackage pkgs) (builtins.attrNames files)) +{ + # Add scripts to overlay + flake.overlays.scripts = final: scripts; + + # Add scripts to packages + perSystem = + { pkgs, ... }: + { + packages = scripts pkgs; + }; +} From ecc37b8fc306c3fcb24715ff36b025efe8e1d4e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jalil=20David=20Salam=C3=A9=20Messina?= Date: Mon, 21 Apr 2025 21:01:41 +0200 Subject: [PATCH 046/168] refactor(example-vm): don't import nixpkgs This should save on evaluation time. --- example-vm/vm-config.nix | 2 ++ flake-modules/example-vm.nix | 17 ++++++++--------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/example-vm/vm-config.nix b/example-vm/vm-config.nix index 1b2b4d0..67e38a7 100644 --- a/example-vm/vm-config.nix +++ b/example-vm/vm-config.nix @@ -31,4 +31,6 @@ # Before changing this value read the documentation for this option # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). system.stateVersion = "24.11"; # Did you read the comment? + + nixpkgs.hostPlatform = "x86_64-linux"; } diff --git a/flake-modules/example-vm.nix b/flake-modules/example-vm.nix index b21085d..e941b37 100644 --- a/flake-modules/example-vm.nix +++ b/flake-modules/example-vm.nix @@ -1,19 +1,18 @@ { inputs, lib, ... }: -let - system = "x86_64-linux"; - overlays = builtins.attrValues inputs.self.overlays; - config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ "steam-unwrapped" ]; - pkgs = import inputs.nixpkgs { inherit system overlays config; }; -in { # Example vm configuration flake.nixosConfigurations.vm = lib.nixosSystem { - inherit pkgs; modules = [ inputs.self.nixosModules.default ../example-vm # import vm configuration - { nix.registry.nixpkgs.flake = inputs.nixpkgs; } # pin nixpkgs to the one used by the system + { + nixpkgs = { + overlays = builtins.attrValues inputs.self.overlays; + config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ "steam-unwrapped" ]; + }; + # pin nixpkgs to the one used by the system + nix.registry.nixpkgs.flake = inputs.nixpkgs; + } ]; }; - } From 176fcae9c3a1699ce3713b3be2a8c7f245cdc8b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jalil=20David=20Salam=C3=A9=20Messina?= Date: Mon, 21 Apr 2025 21:06:59 +0200 Subject: [PATCH 047/168] refactor(flake): don't overlay nixpkgs It is not needed for the flake itself (yes for the packages). --- flake-modules/default.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/flake-modules/default.nix b/flake-modules/default.nix index 6b81037..d793f21 100644 --- a/flake-modules/default.nix +++ b/flake-modules/default.nix @@ -1,7 +1,4 @@ { inputs, ... }: -let - overlays = builtins.attrValues inputs.self.overlays; -in { imports = [ inputs.treefmt-nix.flakeModule @@ -19,8 +16,6 @@ in perSystem = { system, ... }: { - _module.args.pkgs = import inputs.nixpkgs { inherit system overlays; }; - # Setup formatters treefmt = { projectRootFile = "flake.nix"; From 52ce2a852a288cf011dcd3017fa3a9462f3dc011 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jalil=20David=20Salam=C3=A9=20Messina?= Date: Mon, 21 Apr 2025 21:21:37 +0200 Subject: [PATCH 048/168] refactor(starship): move config to own module Should make evaluation faster. --- modules/nixos/default.nix | 29 +--- modules/nixos/starship-nerdfont-symbols.nix | 89 ---------- modules/nixos/starship-shorter-text.nix | 66 ------- modules/nixos/starship.nix | 183 ++++++++++++++++++++ 4 files changed, 185 insertions(+), 182 deletions(-) delete mode 100644 modules/nixos/starship-nerdfont-symbols.nix delete mode 100644 modules/nixos/starship-shorter-text.nix create mode 100644 modules/nixos/starship.nix diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix index da8f8b4..e2e4370 100644 --- a/modules/nixos/default.nix +++ b/modules/nixos/default.nix @@ -17,6 +17,7 @@ in ./options.nix ./dev.nix ./gui.nix + ./starship.nix ./styling.nix ]; @@ -34,33 +35,7 @@ in pkgs.unzip ]; - programs = { - # Default shell - fish.enable = true; - # Shell prompt - starship = { - enable = true; - settings = lib.mkMerge [ - { - format = "$time$all"; - add_newline = false; - cmd_duration.min_time = 500; - cmd_duration.show_milliseconds = true; - time.disabled = false; - status = { - format = "[$signal_name$common_meaning$maybe_int](red)"; - symbol = "[✗](bold red)"; - disabled = false; - }; - sudo.disabled = false; - } - # Add nerdfont symbols - (lib.mkIf cfg.styling.enable (import ./starship-nerdfont-symbols.nix)) - # Remove the `in`s and `on`s from the prompt - (import ./starship-shorter-text.nix) - ]; - }; - }; + programs.fish.enable = true; environment.etc = keysFromGithub; services = { diff --git a/modules/nixos/starship-nerdfont-symbols.nix b/modules/nixos/starship-nerdfont-symbols.nix deleted file mode 100644 index 2032150..0000000 --- a/modules/nixos/starship-nerdfont-symbols.nix +++ /dev/null @@ -1,89 +0,0 @@ -{ - aws.symbol = " "; - buf.symbol = " "; - c.symbol = " "; - conda.symbol = " "; - crystal.symbol = " "; - dart.symbol = " "; - directory.read_only = " 󰌾"; - docker_context.symbol = " "; - elixir.symbol = " "; - elm.symbol = " "; - fennel.symbol = " "; - fossil_branch.symbol = " "; - git_branch.symbol = " "; - git_commit.tag_symbol = "  "; - golang.symbol = " "; - gradle.symbol = " "; - guix_shell.symbol = " "; - haskell.symbol = " "; - haxe.symbol = " "; - hg_branch.symbol = " "; - hostname.ssh_symbol = " "; - java.symbol = " "; - julia.symbol = " "; - kotlin.symbol = " "; - lua.symbol = " "; - memory_usage.symbol = "󰍛 "; - meson.symbol = "󰔷 "; - nim.symbol = "󰆥 "; - nix_shell.symbol = " "; - nodejs.symbol = " "; - ocaml.symbol = " "; - package.symbol = "󰏗 "; - perl.symbol = " "; - php.symbol = " "; - pijul_channel.symbol = " "; - python.symbol = " "; - rlang.symbol = "󰟔 "; - ruby.symbol = " "; - rust.symbol = "󱘗 "; - scala.symbol = " "; - swift.symbol = " "; - zig.symbol = " "; - os.symbols = { - Alpaquita = " "; - Alpine = " "; - AlmaLinux = " "; - Amazon = " "; - Android = " "; - Arch = " "; - Artix = " "; - CentOS = " "; - Debian = " "; - DragonFly = " "; - Emscripten = " "; - EndeavourOS = " "; - Fedora = " "; - FreeBSD = " "; - Garuda = "󰛓 "; - Gentoo = " "; - HardenedBSD = "󰞌 "; - Illumos = "󰈸 "; - Kali = " "; - Linux = " "; - Mabox = " "; - Macos = " "; - Manjaro = " "; - Mariner = " "; - MidnightBSD = " "; - Mint = " "; - NetBSD = " "; - NixOS = " "; - OpenBSD = "󰈺 "; - openSUSE = " "; - OracleLinux = "󰌷 "; - Pop = " "; - Raspbian = " "; - Redhat = " "; - RedHatEnterprise = " "; - RockyLinux = " "; - Redox = "󰀘 "; - Solus = "󰠳 "; - SUSE = " "; - Ubuntu = " "; - Unknown = " "; - Void = " "; - Windows = "󰍲 "; - }; -} diff --git a/modules/nixos/starship-shorter-text.nix b/modules/nixos/starship-shorter-text.nix deleted file mode 100644 index 605a53a..0000000 --- a/modules/nixos/starship-shorter-text.nix +++ /dev/null @@ -1,66 +0,0 @@ -{ - aws.format = "[$symbol($profile)(\\($region\\))(\\[$duration\\])]($style) "; - bun.format = "[$symbol($version)]($style) "; - c.format = "[$symbol($version(-$name))]($style) "; - cmake.format = "[$symbol($version)]($style) "; - cmd_duration.format = "[⏱ $duration]($style) "; - cobol.format = "[$symbol($version)]($style) "; - conda.format = "[$symbol$environment]($style) "; - crystal.format = "[$symbol($version)]($style) "; - daml.format = "[$symbol($version)]($style) "; - dart.format = "[$symbol($version)]($style) "; - deno.format = "[$symbol($version)]($style) "; - docker_context.format = "[$symbol$context]($style) "; - dotnet.format = "[$symbol($version)(🎯 $tfm)]($style) "; - elixir.format = "[$symbol($version \\(OTP $otp_version\\))]($style) "; - elm.format = "[$symbol($version)]($style) "; - erlang.format = "[$symbol($version)]($style) "; - fennel.format = "[$symbol($version)]($style) "; - fossil_branch.format = "[$symbol$branch]($style) "; - gcloud.format = "[$symbol$account(@$domain)(\\($region\\))]($style) "; - git_branch.format = "[$symbol$branch]($style) "; - git_status.format = "[$all_status$ahead_behind]($style) "; - golang.format = "[$symbol($version)]($style) "; - gradle.format = "[$symbol($version)]($style) "; - guix_shell.format = "[$symbol]($style) "; - haskell.format = "[$symbol($version)]($style) "; - haxe.format = "[$symbol($version)]($style) "; - helm.format = "[$symbol($version)]($style) "; - hg_branch.format = "[$symbol$branch]($style) "; - java.format = "[$symbol($version)]($style) "; - julia.format = "[$symbol($version)]($style) "; - kotlin.format = "[$symbol($version)]($style) "; - kubernetes.format = "[$symbol$context( \\($namespace\\))]($style) "; - lua.format = "[$symbol($version)]($style) "; - memory_usage.format = "$symbol[$ram( | $swap)]($style) "; - meson.format = "[$symbol$project]($style) "; - nim.format = "[$symbol($version)]($style) "; - nix_shell.format = "[$symbol$state( \\($name\\))]($style) "; - nodejs.format = "[$symbol($version)]($style) "; - ocaml.format = "[$symbol($version)(\\($switch_indicator$switch_name\\))]($style) "; - opa.format = "[$symbol($version)]($style) "; - openstack.format = "[$symbol$cloud(\\($project\\))]($style) "; - os.format = "[$symbol]($style) "; - package.format = "[$symbol$version]($style) "; - perl.format = "[$symbol($version)]($style) "; - php.format = "[$symbol($version)]($style) "; - pijul_channel.format = "[$symbol$channel]($style) "; - pulumi.format = "[$symbol$stack]($style) "; - purescript.format = "[$symbol($version)]($style) "; - python.format = "[\${symbol}\${pyenv_prefix}(\${version})(\\($virtualenv\\))]($style) "; - raku.format = "[$symbol($version-$vm_version)]($style) "; - red.format = "[$symbol($version)]($style) "; - ruby.format = "[$symbol($version)]($style) "; - rust.format = "[$symbol($version)]($style) "; - scala.format = "[$symbol($version)]($style) "; - spack.format = "[$symbol$environment]($style) "; - sudo.format = "[as $symbol]($style) "; - swift.format = "[$symbol($version)]($style) "; - terraform.format = "[$symbol$workspace]($style) "; - time.format = "[$time]($style) "; - username.format = "[$user]($style) "; - vagrant.format = "[$symbol($version)]($style) "; - vlang.format = "[$symbol($version)]($style) "; - zig.format = "[$symbol($version)]($style) "; - solidity.format = "[$symbol($version)]($style) "; -} diff --git a/modules/nixos/starship.nix b/modules/nixos/starship.nix new file mode 100644 index 0000000..3ab8d8b --- /dev/null +++ b/modules/nixos/starship.nix @@ -0,0 +1,183 @@ +{ pkgs, lib, ... }@args: +let + cfg = args.config.jconfig; +in +{ + config = lib.mkIf cfg.enable { + programs.starship = { + enable = true; + settings = lib.mkMerge [ + { + format = "$time$all"; + add_newline = false; + cmd_duration.min_time = 500; + cmd_duration.show_milliseconds = true; + time.disabled = false; + status = { + format = "[$signal_name$common_meaning$maybe_int](red)"; + symbol = "[✗](bold red)"; + disabled = false; + }; + sudo.disabled = false; + } + # Add nerdfont symbols + (lib.mkIf cfg.styling.enable { + aws.symbol = " "; + buf.symbol = " "; + c.symbol = " "; + conda.symbol = " "; + crystal.symbol = " "; + dart.symbol = " "; + directory.read_only = " 󰌾"; + docker_context.symbol = " "; + elixir.symbol = " "; + elm.symbol = " "; + fennel.symbol = " "; + fossil_branch.symbol = " "; + git_branch.symbol = " "; + git_commit.tag_symbol = "  "; + golang.symbol = " "; + gradle.symbol = " "; + guix_shell.symbol = " "; + haskell.symbol = " "; + haxe.symbol = " "; + hg_branch.symbol = " "; + hostname.ssh_symbol = " "; + java.symbol = " "; + julia.symbol = " "; + kotlin.symbol = " "; + lua.symbol = " "; + memory_usage.symbol = "󰍛 "; + meson.symbol = "󰔷 "; + nim.symbol = "󰆥 "; + nix_shell.symbol = " "; + nodejs.symbol = " "; + ocaml.symbol = " "; + package.symbol = "󰏗 "; + perl.symbol = " "; + php.symbol = " "; + pijul_channel.symbol = " "; + python.symbol = " "; + rlang.symbol = "󰟔 "; + ruby.symbol = " "; + rust.symbol = "󱘗 "; + scala.symbol = " "; + swift.symbol = " "; + zig.symbol = " "; + os.symbols = { + Alpaquita = " "; + Alpine = " "; + AlmaLinux = " "; + Amazon = " "; + Android = " "; + Arch = " "; + Artix = " "; + CentOS = " "; + Debian = " "; + DragonFly = " "; + Emscripten = " "; + EndeavourOS = " "; + Fedora = " "; + FreeBSD = " "; + Garuda = "󰛓 "; + Gentoo = " "; + HardenedBSD = "󰞌 "; + Illumos = "󰈸 "; + Kali = " "; + Linux = " "; + Mabox = " "; + Macos = " "; + Manjaro = " "; + Mariner = " "; + MidnightBSD = " "; + Mint = " "; + NetBSD = " "; + NixOS = " "; + OpenBSD = "󰈺 "; + openSUSE = " "; + OracleLinux = "󰌷 "; + Pop = " "; + Raspbian = " "; + Redhat = " "; + RedHatEnterprise = " "; + RockyLinux = " "; + Redox = "󰀘 "; + Solus = "󰠳 "; + SUSE = " "; + Ubuntu = " "; + Unknown = " "; + Void = " "; + Windows = "󰍲 "; + }; + }) + # Remove the `in`s and `on`s from the prompt + { + aws.format = "[$symbol($profile)(\\($region\\))(\\[$duration\\])]($style) "; + bun.format = "[$symbol($version)]($style) "; + c.format = "[$symbol($version(-$name))]($style) "; + cmake.format = "[$symbol($version)]($style) "; + cmd_duration.format = "[⏱ $duration]($style) "; + cobol.format = "[$symbol($version)]($style) "; + conda.format = "[$symbol$environment]($style) "; + crystal.format = "[$symbol($version)]($style) "; + daml.format = "[$symbol($version)]($style) "; + dart.format = "[$symbol($version)]($style) "; + deno.format = "[$symbol($version)]($style) "; + docker_context.format = "[$symbol$context]($style) "; + dotnet.format = "[$symbol($version)(🎯 $tfm)]($style) "; + elixir.format = "[$symbol($version \\(OTP $otp_version\\))]($style) "; + elm.format = "[$symbol($version)]($style) "; + erlang.format = "[$symbol($version)]($style) "; + fennel.format = "[$symbol($version)]($style) "; + fossil_branch.format = "[$symbol$branch]($style) "; + gcloud.format = "[$symbol$account(@$domain)(\\($region\\))]($style) "; + git_branch.format = "[$symbol$branch]($style) "; + git_status.format = "[$all_status$ahead_behind]($style) "; + golang.format = "[$symbol($version)]($style) "; + gradle.format = "[$symbol($version)]($style) "; + guix_shell.format = "[$symbol]($style) "; + haskell.format = "[$symbol($version)]($style) "; + haxe.format = "[$symbol($version)]($style) "; + helm.format = "[$symbol($version)]($style) "; + hg_branch.format = "[$symbol$branch]($style) "; + java.format = "[$symbol($version)]($style) "; + julia.format = "[$symbol($version)]($style) "; + kotlin.format = "[$symbol($version)]($style) "; + kubernetes.format = "[$symbol$context( \\($namespace\\))]($style) "; + lua.format = "[$symbol($version)]($style) "; + memory_usage.format = "$symbol[$ram( | $swap)]($style) "; + meson.format = "[$symbol$project]($style) "; + nim.format = "[$symbol($version)]($style) "; + nix_shell.format = "[$symbol$state( \\($name\\))]($style) "; + nodejs.format = "[$symbol($version)]($style) "; + ocaml.format = "[$symbol($version)(\\($switch_indicator$switch_name\\))]($style) "; + opa.format = "[$symbol($version)]($style) "; + openstack.format = "[$symbol$cloud(\\($project\\))]($style) "; + os.format = "[$symbol]($style) "; + package.format = "[$symbol$version]($style) "; + perl.format = "[$symbol($version)]($style) "; + php.format = "[$symbol($version)]($style) "; + pijul_channel.format = "[$symbol$channel]($style) "; + pulumi.format = "[$symbol$stack]($style) "; + purescript.format = "[$symbol($version)]($style) "; + python.format = "[\${symbol}\${pyenv_prefix}(\${version})(\\($virtualenv\\))]($style) "; + raku.format = "[$symbol($version-$vm_version)]($style) "; + red.format = "[$symbol($version)]($style) "; + ruby.format = "[$symbol($version)]($style) "; + rust.format = "[$symbol($version)]($style) "; + scala.format = "[$symbol($version)]($style) "; + spack.format = "[$symbol$environment]($style) "; + sudo.format = "[as $symbol]($style) "; + swift.format = "[$symbol($version)]($style) "; + terraform.format = "[$symbol$workspace]($style) "; + time.format = "[$time]($style) "; + username.format = "[$user]($style) "; + vagrant.format = "[$symbol($version)]($style) "; + vlang.format = "[$symbol($version)]($style) "; + zig.format = "[$symbol($version)]($style) "; + solidity.format = "[$symbol($version)]($style) "; + } + ]; + }; + }; +} From e71ab67615e29392c66dfc165e94bb6cd2fa4277 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Tue, 22 Apr 2025 00:00:17 +0200 Subject: [PATCH 049/168] chore(deps): lock file maintenance --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 91e891e..b1b4d38 100644 --- a/flake.lock +++ b/flake.lock @@ -342,11 +342,11 @@ "nuschtosSearch": [] }, "locked": { - "lastModified": 1745182672, - "narHash": "sha256-xh4O19Hre9LiJk0Aa3ZY/XlN00gAGhRUxCRz15j00JU=", + "lastModified": 1745244491, + "narHash": "sha256-UlwXkytxGW/aokB9fZ6cSznYKM9ynDLHqhjcPve0KL4=", "owner": "nix-community", "repo": "nixvim", - "rev": "6c4e2d9279e57369203ecfa159696c6a2af22130", + "rev": "7a58109958d14bcece8ec3e2085e41ea3351e387", "type": "github" }, "original": { From ef5320c70eaaf9cb61c2c90138d41d131e2b8adc Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Wed, 23 Apr 2025 00:00:17 +0200 Subject: [PATCH 050/168] 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 b1b4d38..8960db1 100644 --- a/flake.lock +++ b/flake.lock @@ -319,11 +319,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1744536153, - "narHash": "sha256-awS2zRgF4uTwrOKwwiJcByDzDOdo3Q1rPZbiHQg/N38=", + "lastModified": 1744868846, + "narHash": "sha256-5RJTdUHDmj12Qsv7XOhuospjAjATNiTMElplWnJE9Hs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "18dd725c29603f582cf1900e0d25f9f1063dbf11", + "rev": "ebe4301cbd8f81c4f8d3244b3632338bbeb6d49c", "type": "github" }, "original": { @@ -342,11 +342,11 @@ "nuschtosSearch": [] }, "locked": { - "lastModified": 1745244491, - "narHash": "sha256-UlwXkytxGW/aokB9fZ6cSznYKM9ynDLHqhjcPve0KL4=", + "lastModified": 1745324162, + "narHash": "sha256-Sjb/LvtWpPtSXacjJCTrLAmWtXNJd0SWxO3PzTvD7Tc=", "owner": "nix-community", "repo": "nixvim", - "rev": "7a58109958d14bcece8ec3e2085e41ea3351e387", + "rev": "60638182b8d1b0fe13631d02eafaf8903499ee60", "type": "github" }, "original": { diff --git a/scripts/jpassmenu/Cargo.lock b/scripts/jpassmenu/Cargo.lock index 514317f..71c492f 100644 --- a/scripts/jpassmenu/Cargo.lock +++ b/scripts/jpassmenu/Cargo.lock @@ -293,9 +293,9 @@ checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" [[package]] name = "jiff" -version = "0.2.9" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59ec30f7142be6fe14e1b021f50b85db8df2d4324ea6e91ec3e5dcde092021d0" +checksum = "5a064218214dc6a10fbae5ec5fa888d80c45d611aba169222fc272072bf7aef6" dependencies = [ "jiff-static", "log", @@ -306,9 +306,9 @@ dependencies = [ [[package]] name = "jiff-static" -version = "0.2.9" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "526b834d727fd59d37b076b0c3236d9adde1b1729a4361e20b2026f738cc1dbe" +checksum = "199b7932d97e325aff3a7030e141eafe7f2c6268e1d1b24859b753a627f45254" dependencies = [ "proc-macro2", "quote", From 330497a8472312f9a936ad8803d18786d4f78510 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Thu, 24 Apr 2025 00:00:34 +0200 Subject: [PATCH 051/168] chore(deps): lock file maintenance --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 8960db1..273b984 100644 --- a/flake.lock +++ b/flake.lock @@ -303,11 +303,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1744440957, - "narHash": "sha256-FHlSkNqFmPxPJvy+6fNLaNeWnF1lZSgqVCl/eWaJRc4=", + "lastModified": 1745279238, + "narHash": "sha256-AQ7M9wTa/Pa/kK5pcGTgX/DGqMHyzsyINfN7ktsI7Fo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "26d499fc9f1d567283d5d56fcf367edd815dba1d", + "rev": "9684b53175fc6c09581e94cc85f05ab77464c7e3", "type": "github" }, "original": { @@ -342,11 +342,11 @@ "nuschtosSearch": [] }, "locked": { - "lastModified": 1745324162, - "narHash": "sha256-Sjb/LvtWpPtSXacjJCTrLAmWtXNJd0SWxO3PzTvD7Tc=", + "lastModified": 1745415369, + "narHash": "sha256-XcbDjFXADOGDRXq9da4gvlKBLuMdDQ32ZSem5kf9MmE=", "owner": "nix-community", "repo": "nixvim", - "rev": "60638182b8d1b0fe13631d02eafaf8903499ee60", + "rev": "78f6ff036918dcb6369f8b48abcef6a8788096e8", "type": "github" }, "original": { From 701a3dccf78cc813709a2d4943f9f9e3024c12dd Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Fri, 25 Apr 2025 00:00:35 +0200 Subject: [PATCH 052/168] chore(deps): lock file maintenance --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index 273b984..cb59615 100644 --- a/flake.lock +++ b/flake.lock @@ -303,11 +303,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1745279238, - "narHash": "sha256-AQ7M9wTa/Pa/kK5pcGTgX/DGqMHyzsyINfN7ktsI7Fo=", + "lastModified": 1745487689, + "narHash": "sha256-FQoi3R0NjQeBAsEOo49b5tbDPcJSMWc3QhhaIi9eddw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9684b53175fc6c09581e94cc85f05ab77464c7e3", + "rev": "5630cf13cceac06cefe9fc607e8dfa8fb342dde3", "type": "github" }, "original": { @@ -319,11 +319,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1744868846, - "narHash": "sha256-5RJTdUHDmj12Qsv7XOhuospjAjATNiTMElplWnJE9Hs=", + "lastModified": 1745377448, + "narHash": "sha256-jhZDfXVKdD7TSEGgzFJQvEEZ2K65UMiqW5YJ2aIqxMA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ebe4301cbd8f81c4f8d3244b3632338bbeb6d49c", + "rev": "507b63021ada5fee621b6ca371c4fca9ca46f52c", "type": "github" }, "original": { @@ -342,11 +342,11 @@ "nuschtosSearch": [] }, "locked": { - "lastModified": 1745415369, - "narHash": "sha256-XcbDjFXADOGDRXq9da4gvlKBLuMdDQ32ZSem5kf9MmE=", + "lastModified": 1745518054, + "narHash": "sha256-jaYDGY/7Uja1/HRvogrvvfIdKKl600kI/fxPdQ3PcUw=", "owner": "nix-community", "repo": "nixvim", - "rev": "78f6ff036918dcb6369f8b48abcef6a8788096e8", + "rev": "e6e536953580a956c143fc4413e8d9b4c876aeb8", "type": "github" }, "original": { From 3193c3a1ea305822e87f3a0f49cc1ec8439232cf Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Sat, 26 Apr 2025 00:00:20 +0200 Subject: [PATCH 053/168] chore(deps): lock file maintenance --- flake.lock | 12 ++++++------ modules/nixvim/dev-plugins.nix | 13 +++++++------ 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index cb59615..8c3dada 100644 --- a/flake.lock +++ b/flake.lock @@ -226,11 +226,11 @@ ] }, "locked": { - "lastModified": 1744743431, - "narHash": "sha256-iyn/WBYDc7OtjSawbegINDe/gIkok888kQxk3aVnkgg=", + "lastModified": 1745557122, + "narHash": "sha256-eqSo9ugzsqhFgaDFYUZj943nurlX4L6f+AW0skJ4W+M=", "owner": "nix-community", "repo": "home-manager", - "rev": "c61bfe3ae692f42ce688b5865fac9e0de58e1387", + "rev": "dd26f75fb4ec1c731d4b1396eaf4439ce40a91c1", "type": "github" }, "original": { @@ -342,11 +342,11 @@ "nuschtosSearch": [] }, "locked": { - "lastModified": 1745518054, - "narHash": "sha256-jaYDGY/7Uja1/HRvogrvvfIdKKl600kI/fxPdQ3PcUw=", + "lastModified": 1745593478, + "narHash": "sha256-GV0YnG6ZLW+BDsEKS2rjTtKcfTcTbdlVaf0ESQDBsK8=", "owner": "nix-community", "repo": "nixvim", - "rev": "e6e536953580a956c143fc4413e8d9b4c876aeb8", + "rev": "b72ba2e4e2af53269a19b99bf684480f3ad4a78f", "type": "github" }, "original": { diff --git a/modules/nixvim/dev-plugins.nix b/modules/nixvim/dev-plugins.nix index fdfaff1..4e3424e 100644 --- a/modules/nixvim/dev-plugins.nix +++ b/modules/nixvim/dev-plugins.nix @@ -44,12 +44,13 @@ in enable = true; servers = { # Pyright needs to have the project root set? - basedpyright.rootDir = # lua - '' - function() - return vim.fs.root(0, {'flake.nix', '.git', '.jj', 'pyproject.toml', 'setup.py'}) - end - ''; + basedpyright.rootMarkers = [ + "flake.nix" + ".git" + ".jj" + "pyproject.toml" + "setup.py" + ]; # Big but infrequently used dependencies. # # Configure the LSPs, but don't install the packages. From 67820bb649a56f14dc74c99e76ce962f0f1f9129 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jalil=20David=20Salam=C3=A9=20Messina?= Date: Sat, 26 Apr 2025 18:22:51 +0200 Subject: [PATCH 054/168] fix(envrc): watch relevant flake-modules files Otherwise direnv doesn't work. --- .envrc | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.envrc b/.envrc index 49bacf7..e483044 100644 --- a/.envrc +++ b/.envrc @@ -1,10 +1,11 @@ # update repo if has jj; then - jj git fetch --all-remotes + jj git fetch --all-remotes elif has gix; then - gix fetch + gix fetch elif has git; then - git fetch + git fetch fi +watch_file ./flake.{nix,lock} ./flake-modules/{default,devshells,overlays,nixvim-modules}.nix use flake From 549a355e9601802dbf88120c87b550194a34c737 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Sun, 27 Apr 2025 00:00:18 +0200 Subject: [PATCH 055/168] chore(deps): lock file maintenance --- flake.lock | 6 +++--- scripts/audiomenu/Cargo.lock | 4 ++-- scripts/jpassmenu/Cargo.lock | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/flake.lock b/flake.lock index 8c3dada..32ba8c9 100644 --- a/flake.lock +++ b/flake.lock @@ -342,11 +342,11 @@ "nuschtosSearch": [] }, "locked": { - "lastModified": 1745593478, - "narHash": "sha256-GV0YnG6ZLW+BDsEKS2rjTtKcfTcTbdlVaf0ESQDBsK8=", + "lastModified": 1745697134, + "narHash": "sha256-WvozW6IXhuRfGlDy7S777S5fjZeGSOEIRRbo2eK6K5o=", "owner": "nix-community", "repo": "nixvim", - "rev": "b72ba2e4e2af53269a19b99bf684480f3ad4a78f", + "rev": "8d8a8568968f0e77b90749929c4683633d1ebdf6", "type": "github" }, "original": { diff --git a/scripts/audiomenu/Cargo.lock b/scripts/audiomenu/Cargo.lock index 8974818..5ef1ce4 100644 --- a/scripts/audiomenu/Cargo.lock +++ b/scripts/audiomenu/Cargo.lock @@ -415,9 +415,9 @@ checksum = "b7401a30af6cb5818bb64852270bb722533397edcfc7344954a38f420819ece2" [[package]] name = "syn" -version = "2.0.100" +version = "2.0.101" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b09a44accad81e1ba1cd74a32461ba89dee89095ba17b32f5d03683b1b1fc2a0" +checksum = "8ce2b7fc941b3a24138a0a7cf8e858bfc6a992e7978a068a5c760deb0ed43caf" dependencies = [ "proc-macro2", "quote", diff --git a/scripts/jpassmenu/Cargo.lock b/scripts/jpassmenu/Cargo.lock index 71c492f..349b125 100644 --- a/scripts/jpassmenu/Cargo.lock +++ b/scripts/jpassmenu/Cargo.lock @@ -571,9 +571,9 @@ checksum = "b7401a30af6cb5818bb64852270bb722533397edcfc7344954a38f420819ece2" [[package]] name = "syn" -version = "2.0.100" +version = "2.0.101" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b09a44accad81e1ba1cd74a32461ba89dee89095ba17b32f5d03683b1b1fc2a0" +checksum = "8ce2b7fc941b3a24138a0a7cf8e858bfc6a992e7978a068a5c760deb0ed43caf" dependencies = [ "proc-macro2", "quote", From 46e52d96ff59d1a11abc0d488827642914e0a920 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Sun, 27 Apr 2025 07:30:10 +0200 Subject: [PATCH 056/168] fix(deps): update rust crate miette to v7.6.0 | datasource | package | from | to | | ---------- | ------- | ----- | ----- | | crate | miette | 7.5.0 | 7.6.0 | --- scripts/audiomenu/Cargo.lock | 29 ++++------------------------- scripts/jpassmenu/Cargo.lock | 29 ++++------------------------- 2 files changed, 8 insertions(+), 50 deletions(-) diff --git a/scripts/audiomenu/Cargo.lock b/scripts/audiomenu/Cargo.lock index 5ef1ce4..8ce08df 100644 --- a/scripts/audiomenu/Cargo.lock +++ b/scripts/audiomenu/Cargo.lock @@ -232,9 +232,9 @@ checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" [[package]] name = "miette" -version = "7.5.0" +version = "7.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a955165f87b37fd1862df2a59547ac542c77ef6d17c666f619d1ad22dd89484" +checksum = "5f98efec8807c63c752b5bd61f862c165c115b0a35685bdcfd9238c7aeb592b7" dependencies = [ "backtrace", "backtrace-ext", @@ -246,15 +246,14 @@ dependencies = [ "supports-unicode", "terminal_size", "textwrap", - "thiserror", "unicode-width 0.1.14", ] [[package]] name = "miette-derive" -version = "7.5.0" +version = "7.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf45bf44ab49be92fd1227a3be6fc6f617f1a337c06af54981048574d8783147" +checksum = "db5b29714e950dbb20d5e6f74f9dcec4edbcc1067bb7f8ed198c097b8c1a818b" dependencies = [ "proc-macro2", "quote", @@ -444,26 +443,6 @@ dependencies = [ "unicode-width 0.2.0", ] -[[package]] -name = "thiserror" -version = "1.0.69" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.69" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "unicode-ident" version = "1.0.18" diff --git a/scripts/jpassmenu/Cargo.lock b/scripts/jpassmenu/Cargo.lock index 349b125..a730bc0 100644 --- a/scripts/jpassmenu/Cargo.lock +++ b/scripts/jpassmenu/Cargo.lock @@ -353,9 +353,9 @@ checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" [[package]] name = "miette" -version = "7.5.0" +version = "7.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a955165f87b37fd1862df2a59547ac542c77ef6d17c666f619d1ad22dd89484" +checksum = "5f98efec8807c63c752b5bd61f862c165c115b0a35685bdcfd9238c7aeb592b7" dependencies = [ "backtrace", "backtrace-ext", @@ -367,15 +367,14 @@ dependencies = [ "supports-unicode", "terminal_size", "textwrap", - "thiserror", "unicode-width 0.1.14", ] [[package]] name = "miette-derive" -version = "7.5.0" +version = "7.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf45bf44ab49be92fd1227a3be6fc6f617f1a337c06af54981048574d8783147" +checksum = "db5b29714e950dbb20d5e6f74f9dcec4edbcc1067bb7f8ed198c097b8c1a818b" dependencies = [ "proc-macro2", "quote", @@ -600,26 +599,6 @@ dependencies = [ "unicode-width 0.2.0", ] -[[package]] -name = "thiserror" -version = "1.0.69" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.69" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "unicode-ident" version = "1.0.18" From c8ed3e392862fdbaa143130ddcfb30261380680c Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Mon, 28 Apr 2025 00:00:17 +0200 Subject: [PATCH 057/168] chore(deps): lock file maintenance --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index 32ba8c9..6acca36 100644 --- a/flake.lock +++ b/flake.lock @@ -342,11 +342,11 @@ "nuschtosSearch": [] }, "locked": { - "lastModified": 1745697134, - "narHash": "sha256-WvozW6IXhuRfGlDy7S777S5fjZeGSOEIRRbo2eK6K5o=", + "lastModified": 1745746098, + "narHash": "sha256-3f6vvpa2/8XmzTaJjhUYtedlNMHIjwXJ6C2oWXBTubk=", "owner": "nix-community", "repo": "nixvim", - "rev": "8d8a8568968f0e77b90749929c4683633d1ebdf6", + "rev": "89c94d9ea72d7080838981295f9b526eb3a960de", "type": "github" }, "original": { @@ -425,11 +425,11 @@ "tinted-tmux": "tinted-tmux" }, "locked": { - "lastModified": 1744152965, - "narHash": "sha256-LWUeN1+bH3k46fwtIv0bNgtmkqB0UduyX7T2i+230n0=", + "lastModified": 1745750068, + "narHash": "sha256-LbbioU14KbJpXE0DKcPJaW6W2lB8ayHE4YddupfvU+c=", "owner": "danth", "repo": "stylix", - "rev": "8748db082ca15d32243c86e5d785d5dfc8a65719", + "rev": "ed3f7d9ecbf2c95cc4fe633f648cb776385efd86", "type": "github" }, "original": { @@ -511,11 +511,11 @@ ] }, "locked": { - "lastModified": 1744961264, - "narHash": "sha256-aRmUh0AMwcbdjJHnytg1e5h5ECcaWtIFQa6d9gI85AI=", + "lastModified": 1745780832, + "narHash": "sha256-jGzkZoJWx+nJnPe0Z2xQBUOqMKuR1slVFQrMjFTKgeM=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "8d404a69efe76146368885110f29a2ca3700bee6", + "rev": "b2b6c027d708fbf4b01c9c11f6e80f2800b5a624", "type": "github" }, "original": { From 322a50c98f6e54b957ae242cd9dbb2893bf75d26 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Tue, 29 Apr 2025 00:00:30 +0200 Subject: [PATCH 058/168] chore(deps): lock file maintenance --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index 6acca36..9ccbe44 100644 --- a/flake.lock +++ b/flake.lock @@ -303,11 +303,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1745487689, - "narHash": "sha256-FQoi3R0NjQeBAsEOo49b5tbDPcJSMWc3QhhaIi9eddw=", + "lastModified": 1745742390, + "narHash": "sha256-1rqa/XPSJqJg21BKWjzJZC7yU0l/YTVtjRi0RJmipus=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5630cf13cceac06cefe9fc607e8dfa8fb342dde3", + "rev": "26245db0cb552047418cfcef9a25da91b222d6c7", "type": "github" }, "original": { @@ -342,11 +342,11 @@ "nuschtosSearch": [] }, "locked": { - "lastModified": 1745746098, - "narHash": "sha256-3f6vvpa2/8XmzTaJjhUYtedlNMHIjwXJ6C2oWXBTubk=", + "lastModified": 1745863758, + "narHash": "sha256-uoBdIvKK/qVwa0eCIX04tj+jd4x9VJBdRyXmqw4plQM=", "owner": "nix-community", "repo": "nixvim", - "rev": "89c94d9ea72d7080838981295f9b526eb3a960de", + "rev": "bf276f5223830fa48c52e38a2dad7c167d25fd30", "type": "github" }, "original": { @@ -511,11 +511,11 @@ ] }, "locked": { - "lastModified": 1745780832, - "narHash": "sha256-jGzkZoJWx+nJnPe0Z2xQBUOqMKuR1slVFQrMjFTKgeM=", + "lastModified": 1745848521, + "narHash": "sha256-gNrTO3pEjmu3WiuYrUHJrTGCFw9v+qZXCFmX/Vjf5WI=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "b2b6c027d708fbf4b01c9c11f6e80f2800b5a624", + "rev": "763f1ce0dd12fe44ce6a5c6ea3f159d438571874", "type": "github" }, "original": { From efdc8e62100d70eb902f84460097ecf0c4a1ac7c Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Tue, 29 Apr 2025 00:20:15 +0200 Subject: [PATCH 059/168] chore(deps): lock file maintenance --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 9ccbe44..c8fdfb2 100644 --- a/flake.lock +++ b/flake.lock @@ -342,11 +342,11 @@ "nuschtosSearch": [] }, "locked": { - "lastModified": 1745863758, - "narHash": "sha256-uoBdIvKK/qVwa0eCIX04tj+jd4x9VJBdRyXmqw4plQM=", + "lastModified": 1745878358, + "narHash": "sha256-YImreQ+dij3mLeqcjuIZZvT13Yscj7O1dxOC/+TZdJM=", "owner": "nix-community", "repo": "nixvim", - "rev": "bf276f5223830fa48c52e38a2dad7c167d25fd30", + "rev": "7a6c5b48031059ace82ce90b9a279ec243999554", "type": "github" }, "original": { From 66aebcb50364d7b2cbfcae66860b77908098a829 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Wed, 30 Apr 2025 00:00:29 +0200 Subject: [PATCH 060/168] chore(deps): lock file maintenance --- flake.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index c8fdfb2..3d8728b 100644 --- a/flake.lock +++ b/flake.lock @@ -303,11 +303,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1745742390, - "narHash": "sha256-1rqa/XPSJqJg21BKWjzJZC7yU0l/YTVtjRi0RJmipus=", + "lastModified": 1745868005, + "narHash": "sha256-hZScOyQphT4RUmSEJX+2OxjIlGgLwSd8iW1LNtAWIOs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "26245db0cb552047418cfcef9a25da91b222d6c7", + "rev": "330d0a4167924b43f31cc9406df363f71b768a02", "type": "github" }, "original": { @@ -319,11 +319,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1745377448, - "narHash": "sha256-jhZDfXVKdD7TSEGgzFJQvEEZ2K65UMiqW5YJ2aIqxMA=", + "lastModified": 1745804731, + "narHash": "sha256-v/sK3AS0QKu/Tu5sHIfddiEHCvrbNYPv8X10Fpux68g=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "507b63021ada5fee621b6ca371c4fca9ca46f52c", + "rev": "29335f23bea5e34228349ea739f31ee79e267b88", "type": "github" }, "original": { @@ -342,11 +342,11 @@ "nuschtosSearch": [] }, "locked": { - "lastModified": 1745878358, - "narHash": "sha256-YImreQ+dij3mLeqcjuIZZvT13Yscj7O1dxOC/+TZdJM=", + "lastModified": 1745933874, + "narHash": "sha256-K/bEekSd3iibHoTUgytBYJZd0/e4xQ4IyKkS+NI1XyI=", "owner": "nix-community", "repo": "nixvim", - "rev": "7a6c5b48031059ace82ce90b9a279ec243999554", + "rev": "cd3cbb1e26f463543dc4710548ed35b0ac711370", "type": "github" }, "original": { @@ -425,11 +425,11 @@ "tinted-tmux": "tinted-tmux" }, "locked": { - "lastModified": 1745750068, - "narHash": "sha256-LbbioU14KbJpXE0DKcPJaW6W2lB8ayHE4YddupfvU+c=", + "lastModified": 1745893500, + "narHash": "sha256-MXkFfYmufV7UA1/UY3Hw/+bBv9gNvR4vqJi6wEu3yJA=", "owner": "danth", "repo": "stylix", - "rev": "ed3f7d9ecbf2c95cc4fe633f648cb776385efd86", + "rev": "eb8366e23f7f4c779711965371c20da1279d9c20", "type": "github" }, "original": { @@ -511,11 +511,11 @@ ] }, "locked": { - "lastModified": 1745848521, - "narHash": "sha256-gNrTO3pEjmu3WiuYrUHJrTGCFw9v+qZXCFmX/Vjf5WI=", + "lastModified": 1745929750, + "narHash": "sha256-k5ELLpTwRP/OElcLpNaFWLNf8GRDq4/eHBmFy06gGko=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "763f1ce0dd12fe44ce6a5c6ea3f159d438571874", + "rev": "82bf32e541b30080d94e46af13d46da0708609ea", "type": "github" }, "original": { From 8e0457c394b63f77234d486c433a8c59df3b84bf Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Thu, 1 May 2025 00:00:25 +0200 Subject: [PATCH 061/168] chore(deps): lock file maintenance --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index 3d8728b..2343a8d 100644 --- a/flake.lock +++ b/flake.lock @@ -303,11 +303,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1745868005, - "narHash": "sha256-hZScOyQphT4RUmSEJX+2OxjIlGgLwSd8iW1LNtAWIOs=", + "lastModified": 1745921652, + "narHash": "sha256-hEAvEN+y/OQ7wA7+u3bFJwXSe8yoSf2QaOMH3hyTJTQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "330d0a4167924b43f31cc9406df363f71b768a02", + "rev": "b000159bba69b0106a42f65e52dbf27f77aca9d3", "type": "github" }, "original": { @@ -319,11 +319,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1745804731, - "narHash": "sha256-v/sK3AS0QKu/Tu5sHIfddiEHCvrbNYPv8X10Fpux68g=", + "lastModified": 1745998881, + "narHash": "sha256-vonyYAKJSlsX4n9GCsS0pHxR6yCrfqBIuGvANlkwG6U=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "29335f23bea5e34228349ea739f31ee79e267b88", + "rev": "423d2df5b04b4ee7688c3d71396e872afa236a89", "type": "github" }, "original": { @@ -342,11 +342,11 @@ "nuschtosSearch": [] }, "locked": { - "lastModified": 1745933874, - "narHash": "sha256-K/bEekSd3iibHoTUgytBYJZd0/e4xQ4IyKkS+NI1XyI=", + "lastModified": 1746042926, + "narHash": "sha256-r6fMbet8n+5RgsVqfMJZXqwRjfEX/4XXOu6jxi9XP8E=", "owner": "nix-community", "repo": "nixvim", - "rev": "cd3cbb1e26f463543dc4710548ed35b0ac711370", + "rev": "eeae36203848b34a7ef3f8710d357c7dce84cfa4", "type": "github" }, "original": { From 8c953923933a42b7e3bb85ed15ecff0c276a31ec Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Thu, 1 May 2025 00:10:21 +0200 Subject: [PATCH 062/168] chore(deps): lock file maintenance --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 2343a8d..c999c8d 100644 --- a/flake.lock +++ b/flake.lock @@ -342,11 +342,11 @@ "nuschtosSearch": [] }, "locked": { - "lastModified": 1746042926, - "narHash": "sha256-r6fMbet8n+5RgsVqfMJZXqwRjfEX/4XXOu6jxi9XP8E=", + "lastModified": 1746046178, + "narHash": "sha256-cdx9+2aSYc7ffKK/8D7P7x34P8jHxzB7EG4pnwY3ud0=", "owner": "nix-community", "repo": "nixvim", - "rev": "eeae36203848b34a7ef3f8710d357c7dce84cfa4", + "rev": "913a3521ab9ce9223957a1679914e71498a4be43", "type": "github" }, "original": { From 8d74932b333bb8449f28c6ace6fd1702e15bd173 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Fri, 2 May 2025 00:00:30 +0200 Subject: [PATCH 063/168] chore(deps): lock file maintenance --- flake.lock | 18 +++++++++--------- scripts/audiomenu/Cargo.lock | 8 ++++---- scripts/jpassmenu/Cargo.lock | 16 ++++++++-------- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/flake.lock b/flake.lock index c999c8d..3fc2c3a 100644 --- a/flake.lock +++ b/flake.lock @@ -303,11 +303,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1745921652, - "narHash": "sha256-hEAvEN+y/OQ7wA7+u3bFJwXSe8yoSf2QaOMH3hyTJTQ=", + "lastModified": 1746055187, + "narHash": "sha256-3dqArYSMP9hM7Qpy5YWhnSjiqniSaT2uc5h2Po7tmg0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b000159bba69b0106a42f65e52dbf27f77aca9d3", + "rev": "3e362ce63e16b9572d8c2297c04f7c19ab6725a5", "type": "github" }, "original": { @@ -319,11 +319,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1745998881, - "narHash": "sha256-vonyYAKJSlsX4n9GCsS0pHxR6yCrfqBIuGvANlkwG6U=", + "lastModified": 1746061036, + "narHash": "sha256-OxYwCGJf9VJ2KnUO+w/hVJVTjOgscdDg/lPv8Eus07Y=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "423d2df5b04b4ee7688c3d71396e872afa236a89", + "rev": "3afd19146cac33ed242fc0fc87481c67c758a59e", "type": "github" }, "original": { @@ -342,11 +342,11 @@ "nuschtosSearch": [] }, "locked": { - "lastModified": 1746046178, - "narHash": "sha256-cdx9+2aSYc7ffKK/8D7P7x34P8jHxzB7EG4pnwY3ud0=", + "lastModified": 1746101723, + "narHash": "sha256-loxT2bAglD3w8XDx+7huMXQHbg07yHHHCNiCiVWneqI=", "owner": "nix-community", "repo": "nixvim", - "rev": "913a3521ab9ce9223957a1679914e71498a4be43", + "rev": "c91753bbe57781e08226829b9e354facd50caf1b", "type": "github" }, "original": { diff --git a/scripts/audiomenu/Cargo.lock b/scripts/audiomenu/Cargo.lock index 8ce08df..f395b59 100644 --- a/scripts/audiomenu/Cargo.lock +++ b/scripts/audiomenu/Cargo.lock @@ -326,9 +326,9 @@ checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" [[package]] name = "rustix" -version = "1.0.5" +version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d97817398dd4bb2e6da002002db259209759911da105da92bec29ccb12cf58bf" +checksum = "c71e83d6afe7ff64890ec6b71d6a69bb8a610ab78ce364b3352876bb4c801266" dependencies = [ "bitflags", "errno", @@ -377,9 +377,9 @@ dependencies = [ [[package]] name = "shared_child" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09fa9338aed9a1df411814a5b2252f7cd206c55ae9bf2fa763f8de84603aa60c" +checksum = "7e297bd52991bbe0686c086957bee142f13df85d1e79b0b21630a99d374ae9dc" dependencies = [ "libc", "windows-sys", diff --git a/scripts/jpassmenu/Cargo.lock b/scripts/jpassmenu/Cargo.lock index a730bc0..a0bcccd 100644 --- a/scripts/jpassmenu/Cargo.lock +++ b/scripts/jpassmenu/Cargo.lock @@ -293,9 +293,9 @@ checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" [[package]] name = "jiff" -version = "0.2.10" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a064218214dc6a10fbae5ec5fa888d80c45d611aba169222fc272072bf7aef6" +checksum = "27e77966151130221b079bcec80f1f34a9e414fa489d99152a201c07fd2182bc" dependencies = [ "jiff-static", "log", @@ -306,9 +306,9 @@ dependencies = [ [[package]] name = "jiff-static" -version = "0.2.10" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "199b7932d97e325aff3a7030e141eafe7f2c6268e1d1b24859b753a627f45254" +checksum = "97265751f8a9a4228476f2fc17874a9e7e70e96b893368e42619880fe143b48a" dependencies = [ "proc-macro2", "quote", @@ -491,9 +491,9 @@ checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" [[package]] name = "rustix" -version = "1.0.5" +version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d97817398dd4bb2e6da002002db259209759911da105da92bec29ccb12cf58bf" +checksum = "c71e83d6afe7ff64890ec6b71d6a69bb8a610ab78ce364b3352876bb4c801266" dependencies = [ "bitflags", "errno", @@ -533,9 +533,9 @@ dependencies = [ [[package]] name = "shared_child" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09fa9338aed9a1df411814a5b2252f7cd206c55ae9bf2fa763f8de84603aa60c" +checksum = "7e297bd52991bbe0686c086957bee142f13df85d1e79b0b21630a99d374ae9dc" dependencies = [ "libc", "windows-sys", From 2e6cf53aa622a3d374ceed02134d3f17a8c7d77f Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Fri, 2 May 2025 00:40:18 +0200 Subject: [PATCH 064/168] chore(deps): lock file maintenance --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 3fc2c3a..5d3300c 100644 --- a/flake.lock +++ b/flake.lock @@ -342,11 +342,11 @@ "nuschtosSearch": [] }, "locked": { - "lastModified": 1746101723, - "narHash": "sha256-loxT2bAglD3w8XDx+7huMXQHbg07yHHHCNiCiVWneqI=", + "lastModified": 1746138649, + "narHash": "sha256-mLtPx5Zb6b3iMmypaYsxzA8vjiI6DQObpbmGcn5QDjo=", "owner": "nix-community", "repo": "nixvim", - "rev": "c91753bbe57781e08226829b9e354facd50caf1b", + "rev": "0ec7ea3d6242de84c8a18b228b963064751cb56d", "type": "github" }, "original": { From 05ae7a0bb70d27f935f49fa4a1be0e76ee17c816 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Sat, 3 May 2025 00:00:28 +0200 Subject: [PATCH 065/168] chore(deps): lock file maintenance --- flake.lock | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/flake.lock b/flake.lock index 5d3300c..cf943be 100644 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "fromYaml": "fromYaml" }, "locked": { - "lastModified": 1732200724, - "narHash": "sha256-+R1BH5wHhfnycySb7Sy5KbYEaTJZWm1h+LW1OtyhiTs=", + "lastModified": 1745523430, + "narHash": "sha256-EAYWV+kXbwsH+8G/8UtmcunDeKwLwSOyfcmzZUkWE/c=", "owner": "SenchoPens", "repo": "base16.nix", - "rev": "153d52373b0fb2d343592871009a286ec8837aec", + "rev": "58bfe2553d937d8af0564f79d5b950afbef69717", "type": "github" }, "original": { @@ -226,11 +226,11 @@ ] }, "locked": { - "lastModified": 1745557122, - "narHash": "sha256-eqSo9ugzsqhFgaDFYUZj943nurlX4L6f+AW0skJ4W+M=", + "lastModified": 1746171682, + "narHash": "sha256-EyXUNSa+H+YvGVuQJP1nZskXAowxKYp79RNUsNdQTj4=", "owner": "nix-community", "repo": "home-manager", - "rev": "dd26f75fb4ec1c731d4b1396eaf4439ce40a91c1", + "rev": "50eee705bbdbac942074a8c120e8194185633675", "type": "github" }, "original": { @@ -303,11 +303,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1746055187, - "narHash": "sha256-3dqArYSMP9hM7Qpy5YWhnSjiqniSaT2uc5h2Po7tmg0=", + "lastModified": 1746183838, + "narHash": "sha256-kwaaguGkAqTZ1oK0yXeQ3ayYjs8u/W7eEfrFpFfIDFA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3e362ce63e16b9572d8c2297c04f7c19ab6725a5", + "rev": "bf3287dac860542719fe7554e21e686108716879", "type": "github" }, "original": { @@ -319,11 +319,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1746061036, - "narHash": "sha256-OxYwCGJf9VJ2KnUO+w/hVJVTjOgscdDg/lPv8Eus07Y=", + "lastModified": 1746152631, + "narHash": "sha256-zBuvmL6+CUsk2J8GINpyy8Hs1Zp4PP6iBWSmZ4SCQ/s=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3afd19146cac33ed242fc0fc87481c67c758a59e", + "rev": "032bc6539bd5f14e9d0c51bd79cfe9a055b094c3", "type": "github" }, "original": { @@ -342,11 +342,11 @@ "nuschtosSearch": [] }, "locked": { - "lastModified": 1746138649, - "narHash": "sha256-mLtPx5Zb6b3iMmypaYsxzA8vjiI6DQObpbmGcn5QDjo=", + "lastModified": 1746221140, + "narHash": "sha256-lXFXddrfTY47kF3IGmUQHgJssvGnYY5T4luL+1UmCkc=", "owner": "nix-community", "repo": "nixvim", - "rev": "0ec7ea3d6242de84c8a18b228b963064751cb56d", + "rev": "4b27678512c4b8a3c16676fd6d5d885f2fb84cb3", "type": "github" }, "original": { @@ -425,11 +425,11 @@ "tinted-tmux": "tinted-tmux" }, "locked": { - "lastModified": 1745893500, - "narHash": "sha256-MXkFfYmufV7UA1/UY3Hw/+bBv9gNvR4vqJi6wEu3yJA=", + "lastModified": 1746143246, + "narHash": "sha256-O8rZjqJUIkUva66XTOZy0wcgfBP2eaxU9+Xt7ZHtfhI=", "owner": "danth", "repo": "stylix", - "rev": "eb8366e23f7f4c779711965371c20da1279d9c20", + "rev": "20ace60f9cb5e179cb2256abaee505780df8e804", "type": "github" }, "original": { @@ -511,11 +511,11 @@ ] }, "locked": { - "lastModified": 1745929750, - "narHash": "sha256-k5ELLpTwRP/OElcLpNaFWLNf8GRDq4/eHBmFy06gGko=", + "lastModified": 1746216483, + "narHash": "sha256-4h3s1L/kKqt3gMDcVfN8/4v2jqHrgLIe4qok4ApH5x4=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "82bf32e541b30080d94e46af13d46da0708609ea", + "rev": "29ec5026372e0dec56f890e50dbe4f45930320fd", "type": "github" }, "original": { From 2f6b05915000871272d08886e50149d70a62c30a Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Sun, 4 May 2025 00:00:16 +0200 Subject: [PATCH 066/168] 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 cf943be..fc08606 100644 --- a/flake.lock +++ b/flake.lock @@ -319,11 +319,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1746152631, - "narHash": "sha256-zBuvmL6+CUsk2J8GINpyy8Hs1Zp4PP6iBWSmZ4SCQ/s=", + "lastModified": 1746206129, + "narHash": "sha256-JA4DynBKhY7t4DdJZTuomRLAiXFDUgCGGwxgt+XGiik=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "032bc6539bd5f14e9d0c51bd79cfe9a055b094c3", + "rev": "9a7caecf30a0494c88b7daeeed29244cd9a52e7d", "type": "github" }, "original": { @@ -342,11 +342,11 @@ "nuschtosSearch": [] }, "locked": { - "lastModified": 1746221140, - "narHash": "sha256-lXFXddrfTY47kF3IGmUQHgJssvGnYY5T4luL+1UmCkc=", + "lastModified": 1746309496, + "narHash": "sha256-+2LsdNQdzw4VGygeGFbkfeEkE7ykjsqz07FV3HwjJK4=", "owner": "nix-community", "repo": "nixvim", - "rev": "4b27678512c4b8a3c16676fd6d5d885f2fb84cb3", + "rev": "8fcd7f1a92a9e8b8c9be91d8bc52b15742abfb20", "type": "github" }, "original": { diff --git a/scripts/jpassmenu/Cargo.lock b/scripts/jpassmenu/Cargo.lock index a0bcccd..8104c3f 100644 --- a/scripts/jpassmenu/Cargo.lock +++ b/scripts/jpassmenu/Cargo.lock @@ -293,9 +293,9 @@ checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" [[package]] name = "jiff" -version = "0.2.11" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27e77966151130221b079bcec80f1f34a9e414fa489d99152a201c07fd2182bc" +checksum = "d07d8d955d798e7a4d6f9c58cd1f1916e790b42b092758a9ef6e16fef9f1b3fd" dependencies = [ "jiff-static", "log", @@ -306,9 +306,9 @@ dependencies = [ [[package]] name = "jiff-static" -version = "0.2.11" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97265751f8a9a4228476f2fc17874a9e7e70e96b893368e42619880fe143b48a" +checksum = "f244cfe006d98d26f859c7abd1318d85327e1882dc9cef80f62daeeb0adcf300" dependencies = [ "proc-macro2", "quote", From 7ffa92eaf90103db09b40feafbbbc31a91dafd92 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Sun, 4 May 2025 00:20:22 +0200 Subject: [PATCH 067/168] chore(deps): lock file maintenance --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index fc08606..d65ff16 100644 --- a/flake.lock +++ b/flake.lock @@ -342,11 +342,11 @@ "nuschtosSearch": [] }, "locked": { - "lastModified": 1746309496, - "narHash": "sha256-+2LsdNQdzw4VGygeGFbkfeEkE7ykjsqz07FV3HwjJK4=", + "lastModified": 1746309817, + "narHash": "sha256-oqOpTyjdeY+LP+WiU9LxGdZ/bZ9YK7MNzNMDUw98kPM=", "owner": "nix-community", "repo": "nixvim", - "rev": "8fcd7f1a92a9e8b8c9be91d8bc52b15742abfb20", + "rev": "c978122396a4208bf1965d346b7456e7256fe70c", "type": "github" }, "original": { From 5f392f673f88cd2cc7793d6d8c820fe1203963f2 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Mon, 5 May 2025 00:00:30 +0200 Subject: [PATCH 068/168] chore(deps): lock file maintenance --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index d65ff16..a930f8e 100644 --- a/flake.lock +++ b/flake.lock @@ -303,11 +303,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1746183838, - "narHash": "sha256-kwaaguGkAqTZ1oK0yXeQ3ayYjs8u/W7eEfrFpFfIDFA=", + "lastModified": 1746301764, + "narHash": "sha256-5odz+NZszRya//Zd0P8h+sIwOnV35qJi+73f4I+iv1M=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "bf3287dac860542719fe7554e21e686108716879", + "rev": "537ee98218704e21ea465251de512ab6bbb9012e", "type": "github" }, "original": { @@ -319,11 +319,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1746206129, - "narHash": "sha256-JA4DynBKhY7t4DdJZTuomRLAiXFDUgCGGwxgt+XGiik=", + "lastModified": 1746300365, + "narHash": "sha256-thYTdWqCRipwPRxWiTiH1vusLuAy0okjOyzRx4hLWh4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9a7caecf30a0494c88b7daeeed29244cd9a52e7d", + "rev": "f21e4546e3ede7ae34d12a84602a22246b31f7e0", "type": "github" }, "original": { @@ -342,11 +342,11 @@ "nuschtosSearch": [] }, "locked": { - "lastModified": 1746309817, - "narHash": "sha256-oqOpTyjdeY+LP+WiU9LxGdZ/bZ9YK7MNzNMDUw98kPM=", + "lastModified": 1746387720, + "narHash": "sha256-x8k0DKiQYRNaf9Hg+di+WCKxb76zJVWSjKOlPiuc22o=", "owner": "nix-community", "repo": "nixvim", - "rev": "c978122396a4208bf1965d346b7456e7256fe70c", + "rev": "7d18194a22325f212e17eb876d9c00afcc434113", "type": "github" }, "original": { From 3771b00d0d63a2660ae680c41dd08c4a013d837b Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Tue, 6 May 2025 00:00:28 +0200 Subject: [PATCH 069/168] chore(deps): lock file maintenance --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index a930f8e..fe35ee7 100644 --- a/flake.lock +++ b/flake.lock @@ -303,11 +303,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1746301764, - "narHash": "sha256-5odz+NZszRya//Zd0P8h+sIwOnV35qJi+73f4I+iv1M=", + "lastModified": 1746422338, + "narHash": "sha256-NTtKOTLQv6dPfRe00OGSywg37A1FYqldS6xiNmqBUYc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "537ee98218704e21ea465251de512ab6bbb9012e", + "rev": "5b35d248e9206c1f3baf8de6a7683fee126364aa", "type": "github" }, "original": { @@ -319,11 +319,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1746300365, - "narHash": "sha256-thYTdWqCRipwPRxWiTiH1vusLuAy0okjOyzRx4hLWh4=", + "lastModified": 1746332716, + "narHash": "sha256-VBmKSkmw9PYBCEGhBKzORjx+nwNZkPZyHcUHE21A/ws=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f21e4546e3ede7ae34d12a84602a22246b31f7e0", + "rev": "6b1c028bce9c89e9824cde040d6986d428296055", "type": "github" }, "original": { @@ -342,11 +342,11 @@ "nuschtosSearch": [] }, "locked": { - "lastModified": 1746387720, - "narHash": "sha256-x8k0DKiQYRNaf9Hg+di+WCKxb76zJVWSjKOlPiuc22o=", + "lastModified": 1746479605, + "narHash": "sha256-YZT1uhEuHx+BLCpy25g4fPxyyyRNx07iA+fVKLczr18=", "owner": "nix-community", "repo": "nixvim", - "rev": "7d18194a22325f212e17eb876d9c00afcc434113", + "rev": "64cd675ece86352c8540da765aef72eeba045cf5", "type": "github" }, "original": { From e643aaeccc3b4782ed472a18dc7b9eaaaba4569b Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Wed, 7 May 2025 00:00:15 +0200 Subject: [PATCH 070/168] chore(deps): lock file maintenance --- flake.lock | 12 ++++++------ scripts/audiomenu/Cargo.lock | 4 ++-- scripts/jpassmenu/Cargo.lock | 12 ++++++------ 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/flake.lock b/flake.lock index fe35ee7..0f02ee6 100644 --- a/flake.lock +++ b/flake.lock @@ -319,11 +319,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1746332716, - "narHash": "sha256-VBmKSkmw9PYBCEGhBKzORjx+nwNZkPZyHcUHE21A/ws=", + "lastModified": 1746397377, + "narHash": "sha256-5oLdRa3vWSRbuqPIFFmQBGGUqaYZBxX+GGtN9f/n4lU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6b1c028bce9c89e9824cde040d6986d428296055", + "rev": "ed30f8aba41605e3ab46421e3dcb4510ec560ff8", "type": "github" }, "original": { @@ -342,11 +342,11 @@ "nuschtosSearch": [] }, "locked": { - "lastModified": 1746479605, - "narHash": "sha256-YZT1uhEuHx+BLCpy25g4fPxyyyRNx07iA+fVKLczr18=", + "lastModified": 1746536883, + "narHash": "sha256-EJax0aiJIVJlqF7QyAefZ9fi1HgGcm7U1rBkcm2Z3Ps=", "owner": "nix-community", "repo": "nixvim", - "rev": "64cd675ece86352c8540da765aef72eeba045cf5", + "rev": "c26f5c2e31c1da895bf9289783ff8e2fe3637ca0", "type": "github" }, "original": { diff --git a/scripts/audiomenu/Cargo.lock b/scripts/audiomenu/Cargo.lock index f395b59..2594a3d 100644 --- a/scripts/audiomenu/Cargo.lock +++ b/scripts/audiomenu/Cargo.lock @@ -80,9 +80,9 @@ dependencies = [ [[package]] name = "backtrace" -version = "0.3.74" +version = "0.3.75" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a" +checksum = "6806a6321ec58106fea15becdad98371e28d92ccbc7c8f1b3b6dd724fe8f1002" dependencies = [ "addr2line", "cfg-if", diff --git a/scripts/jpassmenu/Cargo.lock b/scripts/jpassmenu/Cargo.lock index 8104c3f..bd657db 100644 --- a/scripts/jpassmenu/Cargo.lock +++ b/scripts/jpassmenu/Cargo.lock @@ -78,9 +78,9 @@ dependencies = [ [[package]] name = "backtrace" -version = "0.3.74" +version = "0.3.75" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a" +checksum = "6806a6321ec58106fea15becdad98371e28d92ccbc7c8f1b3b6dd724fe8f1002" dependencies = [ "addr2line", "cfg-if", @@ -293,9 +293,9 @@ checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" [[package]] name = "jiff" -version = "0.2.12" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d07d8d955d798e7a4d6f9c58cd1f1916e790b42b092758a9ef6e16fef9f1b3fd" +checksum = "f02000660d30638906021176af16b17498bd0d12813dbfe7b276d8bc7f3c0806" dependencies = [ "jiff-static", "log", @@ -306,9 +306,9 @@ dependencies = [ [[package]] name = "jiff-static" -version = "0.2.12" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f244cfe006d98d26f859c7abd1318d85327e1882dc9cef80f62daeeb0adcf300" +checksum = "f3c30758ddd7188629c6713fc45d1188af4f44c90582311d0c8d8c9907f60c48" dependencies = [ "proc-macro2", "quote", From 434829c96a44ffc98c77294f36a55991f0c9128c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jalil=20David=20Salam=C3=A9=20Messina?= Date: Wed, 7 May 2025 14:38:24 +0200 Subject: [PATCH 071/168] fix(neovim): set formatters and linters binaries Otherwise they are picked up from the environment. --- modules/nixvim/dev-plugins.nix | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/modules/nixvim/dev-plugins.nix b/modules/nixvim/dev-plugins.nix index 4e3424e..53b22ca 100644 --- a/modules/nixvim/dev-plugins.nix +++ b/modules/nixvim/dev-plugins.nix @@ -90,18 +90,18 @@ in }) # Configure Formatters { - extraPackages = [ - pkgs.luajitPackages.jsregexp - pkgs.shfmt - pkgs.stylua - pkgs.taplo - pkgs.yamlfmt - pkgs.fish - ]; + extraPackages = [ pkgs.luajitPackages.jsregexp ]; plugins.conform-nvim = { enable = true; settings = { - formatters.nixfmt.command = "${lib.getExe pkgs.nixfmt-rfc-style}"; + formatters = { + fish.command = lib.getExe pkgs.fish; + nixfmt.command = lib.getExe pkgs.nixfmt-rfc-style; + shfmt.command = lib.getExe pkgs.shfmt; + stylua.command = lib.getExe pkgs.stylua; + taplo.command = lib.getExe pkgs.taplo; + yamlfmt.command = lib.getExe' pkgs.yamlfmt "fish_indent"; + }; formatters_by_ft = { "_" = [ "trim_whitespace" ]; c = [ "clang_format" ]; @@ -120,12 +120,13 @@ in } # Configure Linters { - extraPackages = [ - pkgs.dash - pkgs.statix - ]; plugins.lint = { enable = true; + linters = { + dash.command = lib.getExe pkgs.dash; + statix.command = lib.getExe pkgs.statix; + # chktex = lib.getExe pkgs.chktex; # Not in use + }; lintersByFt = { # latex = [ "chktex" ]; # Not in use nix = [ "statix" ]; From 298a95758987f9100fb8a4f9d79695ce0b9014ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jalil=20David=20Salam=C3=A9=20Messina?= Date: Wed, 7 May 2025 16:36:38 +0200 Subject: [PATCH 072/168] fix(nvim): yamlfmt and fish swapped binaries Typo in the previous commit T-T --- modules/nixvim/dev-plugins.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/nixvim/dev-plugins.nix b/modules/nixvim/dev-plugins.nix index 53b22ca..eb47a0e 100644 --- a/modules/nixvim/dev-plugins.nix +++ b/modules/nixvim/dev-plugins.nix @@ -95,12 +95,12 @@ in enable = true; settings = { formatters = { - fish.command = lib.getExe pkgs.fish; + fish.command = lib.getExe' pkgs.fish "fish_indent"; nixfmt.command = lib.getExe pkgs.nixfmt-rfc-style; shfmt.command = lib.getExe pkgs.shfmt; stylua.command = lib.getExe pkgs.stylua; taplo.command = lib.getExe pkgs.taplo; - yamlfmt.command = lib.getExe' pkgs.yamlfmt "fish_indent"; + yamlfmt.command = lib.getExe pkgs.yamlfmt; }; formatters_by_ft = { "_" = [ "trim_whitespace" ]; From 223beef34102f8618ed33221336521ac5791888c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jalil=20David=20Salam=C3=A9=20Messina?= Date: Wed, 7 May 2025 16:36:38 +0200 Subject: [PATCH 073/168] feat(jj): configure jj fix with formatters from nvim Export nvim formatters as `jj fix` tools. --- modules/hm/dev.nix | 59 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) diff --git a/modules/hm/dev.nix b/modules/hm/dev.nix index 2c2d898..571619b 100644 --- a/modules/hm/dev.nix +++ b/modules/hm/dev.nix @@ -6,6 +6,64 @@ }: let cfg = config.jhome.dev; + nvimFormatters = builtins.mapAttrs ( + name: value: value.command + ) config.programs.nixvim.plugins.conform-nvim.settings.formatters; + jjFormatters = + let + ext = extension: "glob:'**/*.${extension}'"; + in + { + fish = cmd: { + command = [ cmd ]; + patterns = [ (ext "fish") ]; + }; + nixfmt = cmd: { + command = [ + cmd + "--filename=$path" + ]; + patterns = [ (ext "nix") ]; + }; + shfmt = cmd: { + command = [ + cmd + "--filename" + "$path" + "-" + ]; + patterns = [ + (ext "sh") + (ext "bash") + ]; + }; + stylua = cmd: { + command = [ + cmd + "--stdin-filepath=$path" + "-" + ]; + patterns = [ (ext "lua") ]; + }; + taplo = cmd: { + command = [ + cmd + "--stdin-filepath=$path" + "-" + ]; + patterns = [ (ext "toml") ]; + }; + yamlfmt = cmd: { + command = [ + cmd + "-in" + ]; + patterns = [ + (ext "yaml") + (ext "yml") + ]; + }; + }; in { config = @@ -68,6 +126,7 @@ in package = pkgs.unstable.jujutsu; settings = { ui.pager = "bat"; + fix.tools = builtins.mapAttrs (tool: cmd: jjFormatters.${tool} cmd) nvimFormatters; # mimic git commit --verbose by adding a diff templates.draft_commit_description = '' concat( From f30e911b9ea996514150f9a1904c97b474233673 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Wed, 7 May 2025 23:00:12 +0200 Subject: [PATCH 074/168] fix(deps): update rust crate duct to v1 | datasource | package | from | to | | ---------- | ------- | ------ | ----- | | crate | duct | 0.13.7 | 1.0.0 | --- scripts/audiomenu/Cargo.lock | 12 +++++++++--- scripts/audiomenu/Cargo.toml | 2 +- scripts/jpassmenu/Cargo.lock | 12 +++++++++--- scripts/jpassmenu/Cargo.toml | 2 +- 4 files changed, 20 insertions(+), 8 deletions(-) diff --git a/scripts/audiomenu/Cargo.lock b/scripts/audiomenu/Cargo.lock index 2594a3d..5a91592 100644 --- a/scripts/audiomenu/Cargo.lock +++ b/scripts/audiomenu/Cargo.lock @@ -162,14 +162,14 @@ checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990" [[package]] name = "duct" -version = "0.13.7" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4ab5718d1224b63252cd0c6f74f6480f9ffeb117438a2e0f5cf6d9a4798929c" +checksum = "b6ce170a0e8454fa0f9b0e5ca38a6ba17ed76a50916839d217eb5357e05cdfde" dependencies = [ "libc", - "once_cell", "os_pipe", "shared_child", + "shared_thread", ] [[package]] @@ -385,6 +385,12 @@ dependencies = [ "windows-sys", ] +[[package]] +name = "shared_thread" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7a6f98357c6bb0ebace19b22220e5543801d9de90ffe77f8abb27c056bac064" + [[package]] name = "strsim" version = "0.11.1" diff --git a/scripts/audiomenu/Cargo.toml b/scripts/audiomenu/Cargo.toml index b469215..b4e0aed 100644 --- a/scripts/audiomenu/Cargo.toml +++ b/scripts/audiomenu/Cargo.toml @@ -6,7 +6,7 @@ edition = "2021" [dependencies] clap = { version = "4.5.23", features = ["derive", "env"] } -duct = "0.13.7" +duct = "1.0.0" miette = { version = "7.4.0", features = ["fancy"] } serde = { version = "1.0.215", features = ["derive"] } serde_json = "1.0.133" diff --git a/scripts/jpassmenu/Cargo.lock b/scripts/jpassmenu/Cargo.lock index bd657db..ce4295a 100644 --- a/scripts/jpassmenu/Cargo.lock +++ b/scripts/jpassmenu/Cargo.lock @@ -195,14 +195,14 @@ checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28" [[package]] name = "duct" -version = "0.13.7" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4ab5718d1224b63252cd0c6f74f6480f9ffeb117438a2e0f5cf6d9a4798929c" +checksum = "b6ce170a0e8454fa0f9b0e5ca38a6ba17ed76a50916839d217eb5357e05cdfde" dependencies = [ "libc", - "once_cell", "os_pipe", "shared_child", + "shared_thread", ] [[package]] @@ -541,6 +541,12 @@ dependencies = [ "windows-sys", ] +[[package]] +name = "shared_thread" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7a6f98357c6bb0ebace19b22220e5543801d9de90ffe77f8abb27c056bac064" + [[package]] name = "strsim" version = "0.11.1" diff --git a/scripts/jpassmenu/Cargo.toml b/scripts/jpassmenu/Cargo.toml index 7ffa4ba..68c2cad 100644 --- a/scripts/jpassmenu/Cargo.toml +++ b/scripts/jpassmenu/Cargo.toml @@ -6,7 +6,7 @@ edition = "2021" [dependencies] clap = { version = "4.5.23", features = ["derive", "env"] } -duct = "0.13.7" +duct = "1.0.0" env_logger = "0.11.5" ignore = "0.4.23" log = "0.4.22" From cf9b9751c0d7dc1c8b1be8bb00bcc3b8a2a4f1c9 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Thu, 8 May 2025 00:00:29 +0200 Subject: [PATCH 075/168] chore(deps): lock file maintenance --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 0f02ee6..189bf62 100644 --- a/flake.lock +++ b/flake.lock @@ -303,11 +303,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1746422338, - "narHash": "sha256-NTtKOTLQv6dPfRe00OGSywg37A1FYqldS6xiNmqBUYc=", + "lastModified": 1746557022, + "narHash": "sha256-QkNoyEf6TbaTW5UZYX0OkwIJ/ZMeKSSoOMnSDPQuol0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5b35d248e9206c1f3baf8de6a7683fee126364aa", + "rev": "1d3aeb5a193b9ff13f63f4d9cc169fb88129f860", "type": "github" }, "original": { @@ -342,11 +342,11 @@ "nuschtosSearch": [] }, "locked": { - "lastModified": 1746536883, - "narHash": "sha256-EJax0aiJIVJlqF7QyAefZ9fi1HgGcm7U1rBkcm2Z3Ps=", + "lastModified": 1746625905, + "narHash": "sha256-El/fOZAhTDJRsPN5dro9F3cNHyclk00Acjl1nVQAEDI=", "owner": "nix-community", "repo": "nixvim", - "rev": "c26f5c2e31c1da895bf9289783ff8e2fe3637ca0", + "rev": "5c52e8f9e438b6850f2c7a6e4bf3f967a3a699fd", "type": "github" }, "original": { From 7e7e874c1cd79eea8d85627ab48f5a9f534c0bc9 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Thu, 8 May 2025 00:40:15 +0200 Subject: [PATCH 076/168] chore(deps): lock file maintenance --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 189bf62..ed71b20 100644 --- a/flake.lock +++ b/flake.lock @@ -319,11 +319,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1746397377, - "narHash": "sha256-5oLdRa3vWSRbuqPIFFmQBGGUqaYZBxX+GGtN9f/n4lU=", + "lastModified": 1746576598, + "narHash": "sha256-FshoQvr6Aor5SnORVvh/ZdJ1Sa2U4ZrIMwKBX5k2wu0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ed30f8aba41605e3ab46421e3dcb4510ec560ff8", + "rev": "b3582c75c7f21ce0b429898980eddbbf05c68e55", "type": "github" }, "original": { @@ -342,11 +342,11 @@ "nuschtosSearch": [] }, "locked": { - "lastModified": 1746625905, - "narHash": "sha256-El/fOZAhTDJRsPN5dro9F3cNHyclk00Acjl1nVQAEDI=", + "lastModified": 1746650585, + "narHash": "sha256-9WZtcSn1/UkYK4UNXkcLCnVR7aIVI83VweqVlCf06OA=", "owner": "nix-community", "repo": "nixvim", - "rev": "5c52e8f9e438b6850f2c7a6e4bf3f967a3a699fd", + "rev": "6597afe2097ba07fdf515a541a2a02a7e06768cd", "type": "github" }, "original": { From 9dc24be2b9922f8e01158c05ab4531951e6ae2ce Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Fri, 9 May 2025 00:00:16 +0200 Subject: [PATCH 077/168] chore(deps): lock file maintenance --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index ed71b20..735513f 100644 --- a/flake.lock +++ b/flake.lock @@ -342,11 +342,11 @@ "nuschtosSearch": [] }, "locked": { - "lastModified": 1746650585, - "narHash": "sha256-9WZtcSn1/UkYK4UNXkcLCnVR7aIVI83VweqVlCf06OA=", + "lastModified": 1746731480, + "narHash": "sha256-XRSnQSykuJc42qCaKuquy5m4X24Z0sBqkOqzGIfrWPw=", "owner": "nix-community", "repo": "nixvim", - "rev": "6597afe2097ba07fdf515a541a2a02a7e06768cd", + "rev": "36d63a7c3e0b28d0a2a798826a3b990867079b21", "type": "github" }, "original": { From ee2d1fd0d2835113a7ea52fc7865d9c4890dc24a Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Fri, 9 May 2025 00:30:15 +0200 Subject: [PATCH 078/168] chore(deps): lock file maintenance --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 735513f..a9a2730 100644 --- a/flake.lock +++ b/flake.lock @@ -342,11 +342,11 @@ "nuschtosSearch": [] }, "locked": { - "lastModified": 1746731480, - "narHash": "sha256-XRSnQSykuJc42qCaKuquy5m4X24Z0sBqkOqzGIfrWPw=", + "lastModified": 1746742749, + "narHash": "sha256-K65lPr8vr9vEvWK3Yqx9rL4eDN+eztXTT3ck6fdqAMQ=", "owner": "nix-community", "repo": "nixvim", - "rev": "36d63a7c3e0b28d0a2a798826a3b990867079b21", + "rev": "aa1ae69b573e64ce145672663471795daed2ec9e", "type": "github" }, "original": { From 439886abebac8612ae866f4130a306d22612e626 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jalil=20David=20Salam=C3=A9=20Messina?= Date: Fri, 9 May 2025 10:48:37 +0200 Subject: [PATCH 079/168] fix(home-modules): typo in standalone module Should probably add an example standalone config so that his is caught in the future. --- flake-modules/home-modules.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake-modules/home-modules.nix b/flake-modules/home-modules.nix index 09c500d..e117fb9 100644 --- a/flake-modules/home-modules.nix +++ b/flake-modules/home-modules.nix @@ -15,7 +15,7 @@ }; standalone = { imports = defaultModules ++ [ - inputs.stylix.homeManagerModules.stilyx + inputs.stylix.homeManagerModules.stylix ( { config, ... }: { From 70129ce5e1deb37b6e4d3b030b0b0eb45ace0313 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jalil=20David=20Salam=C3=A9=20Messina?= Date: Fri, 9 May 2025 12:35:17 +0200 Subject: [PATCH 080/168] fix(home-modules): don't set stylix image when headless --- flake-modules/home-modules.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake-modules/home-modules.nix b/flake-modules/home-modules.nix index e117fb9..277a3cd 100644 --- a/flake-modules/home-modules.nix +++ b/flake-modules/home-modules.nix @@ -17,9 +17,9 @@ imports = defaultModules ++ [ inputs.stylix.homeManagerModules.stylix ( - { config, ... }: - { - stylix.image = config.jhome.sway.background; + { lib, config, ... }: + lib.mkIf config.jhome.gui.enable { + stylix.image = config.jhome.gui.sway.background; } ) ]; From 6e412416fa6686527994fafd5dc90b648e7f5e70 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Sat, 10 May 2025 00:00:15 +0200 Subject: [PATCH 081/168] chore(deps): lock file maintenance --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index a9a2730..8c7feb9 100644 --- a/flake.lock +++ b/flake.lock @@ -342,11 +342,11 @@ "nuschtosSearch": [] }, "locked": { - "lastModified": 1746742749, - "narHash": "sha256-K65lPr8vr9vEvWK3Yqx9rL4eDN+eztXTT3ck6fdqAMQ=", + "lastModified": 1746822201, + "narHash": "sha256-XAt4FgViCT9kcSkODQUcbQ8JejjjbTGcMVGIP+7o7YE=", "owner": "nix-community", "repo": "nixvim", - "rev": "aa1ae69b573e64ce145672663471795daed2ec9e", + "rev": "1b1e43a36e4f701fb2fc870c322373579936f739", "type": "github" }, "original": { From 7c095bc0f576ffca85b9bb5230e114e29361401a Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Sun, 11 May 2025 00:00:15 +0200 Subject: [PATCH 082/168] chore(deps): lock file maintenance --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 8c7feb9..231a2bb 100644 --- a/flake.lock +++ b/flake.lock @@ -342,11 +342,11 @@ "nuschtosSearch": [] }, "locked": { - "lastModified": 1746822201, - "narHash": "sha256-XAt4FgViCT9kcSkODQUcbQ8JejjjbTGcMVGIP+7o7YE=", + "lastModified": 1746879234, + "narHash": "sha256-L5pwOBj/qAMhCC5QXmWSw8QrcL26bNztwpLhONaFfd8=", "owner": "nix-community", "repo": "nixvim", - "rev": "1b1e43a36e4f701fb2fc870c322373579936f739", + "rev": "e527939f79caa0636c7d5331e4e6c70857a1fbe0", "type": "github" }, "original": { From 9d3a13754753a154f5138d12ebf8b39777a50e08 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Sun, 11 May 2025 03:00:12 +0200 Subject: [PATCH 083/168] fix(deps): update rust crate clap to v4.5.38 | datasource | package | from | to | | ---------- | ------- | ------ | ------ | | crate | clap | 4.5.37 | 4.5.38 | --- 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 5a91592..7bd288d 100644 --- a/scripts/audiomenu/Cargo.lock +++ b/scripts/audiomenu/Cargo.lock @@ -116,9 +116,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "clap" -version = "4.5.37" +version = "4.5.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eccb054f56cbd38340b380d4a8e69ef1f02f1af43db2f0cc817a4774d80ae071" +checksum = "ed93b9805f8ba930df42c2590f05453d5ec36cbb85d018868a5b24d31f6ac000" dependencies = [ "clap_builder", "clap_derive", @@ -126,9 +126,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.37" +version = "4.5.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efd9466fac8543255d3b1fcad4762c5e116ffe808c8a3043d4263cd4fd4862a2" +checksum = "379026ff283facf611b0ea629334361c4211d1b12ee01024eec1591133b04120" dependencies = [ "anstream", "anstyle", diff --git a/scripts/jpassmenu/Cargo.lock b/scripts/jpassmenu/Cargo.lock index ce4295a..6e0b505 100644 --- a/scripts/jpassmenu/Cargo.lock +++ b/scripts/jpassmenu/Cargo.lock @@ -124,9 +124,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "clap" -version = "4.5.37" +version = "4.5.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eccb054f56cbd38340b380d4a8e69ef1f02f1af43db2f0cc817a4774d80ae071" +checksum = "ed93b9805f8ba930df42c2590f05453d5ec36cbb85d018868a5b24d31f6ac000" dependencies = [ "clap_builder", "clap_derive", @@ -134,9 +134,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.37" +version = "4.5.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efd9466fac8543255d3b1fcad4762c5e116ffe808c8a3043d4263cd4fd4862a2" +checksum = "379026ff283facf611b0ea629334361c4211d1b12ee01024eec1591133b04120" dependencies = [ "anstream", "anstyle", From 2a52e4fdebd5abdf67a08ae55c35876615cc7067 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Mon, 12 May 2025 00:00:25 +0200 Subject: [PATCH 084/168] chore(deps): lock file maintenance --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index 231a2bb..6d6de0b 100644 --- a/flake.lock +++ b/flake.lock @@ -303,11 +303,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1746557022, - "narHash": "sha256-QkNoyEf6TbaTW5UZYX0OkwIJ/ZMeKSSoOMnSDPQuol0=", + "lastModified": 1746810718, + "narHash": "sha256-VljtYzyttmvkWUKTVJVW93qAsJsrBbgAzy7DdnJaQfI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1d3aeb5a193b9ff13f63f4d9cc169fb88129f860", + "rev": "0c0bf9c057382d5f6f63d54fd61f1abd5e1c2f63", "type": "github" }, "original": { @@ -342,11 +342,11 @@ "nuschtosSearch": [] }, "locked": { - "lastModified": 1746879234, - "narHash": "sha256-L5pwOBj/qAMhCC5QXmWSw8QrcL26bNztwpLhONaFfd8=", + "lastModified": 1746965641, + "narHash": "sha256-6+Cn5aMDSWvsk4nOXmea3whAI4v+PjYaEpcDkTEAlXc=", "owner": "nix-community", "repo": "nixvim", - "rev": "e527939f79caa0636c7d5331e4e6c70857a1fbe0", + "rev": "02a85bd29333ce9fbde0d2c57a2378f47205bb21", "type": "github" }, "original": { @@ -511,11 +511,11 @@ ] }, "locked": { - "lastModified": 1746216483, - "narHash": "sha256-4h3s1L/kKqt3gMDcVfN8/4v2jqHrgLIe4qok4ApH5x4=", + "lastModified": 1746989248, + "narHash": "sha256-uoQ21EWsAhyskNo8QxrTVZGjG/dV4x5NM1oSgrmNDJY=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "29ec5026372e0dec56f890e50dbe4f45930320fd", + "rev": "708ec80ca82e2bbafa93402ccb66a35ff87900c5", "type": "github" }, "original": { From 5c993d6f67c4215dccea4cdd99b2ba01a6771641 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jalil=20David=20Salam=C3=A9=20Messina?= Date: Tue, 13 May 2025 00:08:53 +0200 Subject: [PATCH 085/168] ci: reduce max-jobs in build-packages The server seems to run out of memory otherwise T-T --- .forgejo/workflows/check.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/check.yml b/.forgejo/workflows/check.yml index 8d44b1d..a275b66 100644 --- a/.forgejo/workflows/check.yml +++ b/.forgejo/workflows/check.yml @@ -26,7 +26,7 @@ jobs: - name: Build target run: | nix --version - nix-fast-build --max-jobs 2 --no-nom --skip-cached --no-link \ + nix-fast-build --max-jobs 1 --no-nom --skip-cached --no-link \ --flake ".#packages.$(nix eval --raw --impure --expr builtins.currentSystem)" build-vm: runs-on: nixos From c0ea237330f754804b6613b6f3c34e1d00983b5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jalil=20David=20Salam=C3=A9=20Messina?= Date: Tue, 6 May 2025 23:14:41 +0200 Subject: [PATCH 086/168] chore(flake): update nixvim Nixvim added a `systems` input which we override, also this commit has the `hunk.nvim` plugin which we want. --- flake.lock | 11 +++++++---- flake.nix | 1 + 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index 6d6de0b..3e01bd2 100644 --- a/flake.lock +++ b/flake.lock @@ -339,14 +339,17 @@ "flake-parts" ], "nixpkgs": "nixpkgs_2", - "nuschtosSearch": [] + "nuschtosSearch": [], + "systems": [ + "systems" + ] }, "locked": { - "lastModified": 1746965641, - "narHash": "sha256-6+Cn5aMDSWvsk4nOXmea3whAI4v+PjYaEpcDkTEAlXc=", + "lastModified": 1747083534, + "narHash": "sha256-r88FEbKX1HLTovPFt1QHxzZDV7D4TGHhYlJcHmK7hYk=", "owner": "nix-community", "repo": "nixvim", - "rev": "02a85bd29333ce9fbde0d2c57a2378f47205bb21", + "rev": "ff0ccdf572ad6700a2a29a82cc5d17db29708988", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 04aaea2..77b627b 100644 --- a/flake.nix +++ b/flake.nix @@ -39,6 +39,7 @@ url = "github:nix-community/nixvim"; inputs = { flake-parts.follows = "flake-parts"; + systems.follows = "systems"; # disable optional inputs nuschtosSearch.follows = ""; }; From fe00695bdeda8ad62e2f423697dff3662abf5b82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jalil=20David=20Salam=C3=A9=20Messina?= Date: Tue, 6 May 2025 23:14:41 +0200 Subject: [PATCH 087/168] feat(nvim): add hunk.nvim plugin This should be a better diff editor for `jj` --- modules/nixvim/dev-plugins.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/nixvim/dev-plugins.nix b/modules/nixvim/dev-plugins.nix index eb47a0e..4a4ff8a 100644 --- a/modules/nixvim/dev-plugins.nix +++ b/modules/nixvim/dev-plugins.nix @@ -174,6 +174,7 @@ in mode = "virtualtext"; }; }; + hunk.enable = true; otter.enable = true; }; } From 77c73c2ea9142c8c534ebf7ebd89e1060dd8321b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jalil=20David=20Salam=C3=A9=20Messina?= Date: Mon, 12 May 2025 23:52:13 +0200 Subject: [PATCH 088/168] feat(jj): configure to use hunk.nvim if available This should keep me inside of nvim for longer c: --- modules/hm/dev.nix | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/modules/hm/dev.nix b/modules/hm/dev.nix index 571619b..b5ba9e3 100644 --- a/modules/hm/dev.nix +++ b/modules/hm/dev.nix @@ -123,9 +123,21 @@ in # Jujutsu (alternative DVCS (git-compatible)) jujutsu = { enable = true; + # Use the more up to date version of jj package = pkgs.unstable.jujutsu; settings = { - ui.pager = "bat"; + ui = lib.mkMerge [ + # If `bat` is available use it as the pager + (lib.mkIf config.programs.bat.enable { pager = "bat"; }) + # if hunk.nvim is enabled use it as a diff editor + (lib.mkIf config.programs.nixvim.plugins.hunk.enable { + diff-editor = [ + "nvim" + "-c" + "DiffEditor $left $right $output" + ]; + }) + ]; fix.tools = builtins.mapAttrs (tool: cmd: jjFormatters.${tool} cmd) nvimFormatters; # mimic git commit --verbose by adding a diff templates.draft_commit_description = '' From e962441ce18dabe73bfe201507e3cfe750a823da Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Tue, 13 May 2025 00:40:16 +0200 Subject: [PATCH 089/168] chore(deps): lock file maintenance --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 3e01bd2..8dd4bd3 100644 --- a/flake.lock +++ b/flake.lock @@ -226,11 +226,11 @@ ] }, "locked": { - "lastModified": 1746171682, - "narHash": "sha256-EyXUNSa+H+YvGVuQJP1nZskXAowxKYp79RNUsNdQTj4=", + "lastModified": 1747020534, + "narHash": "sha256-D/6rkiC6w2p+4SwRiVKrWIeYzun8FBg7NlMKMwQMxO0=", "owner": "nix-community", "repo": "home-manager", - "rev": "50eee705bbdbac942074a8c120e8194185633675", + "rev": "b4bbdc6fde16fc2051fcde232f6e288cd22007ca", "type": "github" }, "original": { @@ -303,11 +303,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1746810718, - "narHash": "sha256-VljtYzyttmvkWUKTVJVW93qAsJsrBbgAzy7DdnJaQfI=", + "lastModified": 1746957726, + "narHash": "sha256-k9ut1LSfHCr0AW82ttEQzXVCqmyWVA5+SHJkS5ID/Jo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0c0bf9c057382d5f6f63d54fd61f1abd5e1c2f63", + "rev": "a39ed32a651fdee6842ec930761e31d1f242cb94", "type": "github" }, "original": { From 99350606a4699849a62e82cb2af99c59eff62df9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jalil=20David=20Salam=C3=A9=20Messina?= Date: Tue, 13 May 2025 10:48:34 +0200 Subject: [PATCH 090/168] feat(jj): add clang_format config Clang format is disabled by default since `clang-tools` is huge, but we should still configure it if it's enabled. --- modules/hm/dev.nix | 37 ++++++++++++++++++++++++++----------- 1 file changed, 26 insertions(+), 11 deletions(-) diff --git a/modules/hm/dev.nix b/modules/hm/dev.nix index b5ba9e3..22a24ab 100644 --- a/modules/hm/dev.nix +++ b/modules/hm/dev.nix @@ -11,19 +11,34 @@ let ) config.programs.nixvim.plugins.conform-nvim.settings.formatters; jjFormatters = let - ext = extension: "glob:'**/*.${extension}'"; + ext_to_glob = ext: "glob:'**/*.${ext}'"; + exts = builtins.map ext_to_glob; in { fish = cmd: { command = [ cmd ]; - patterns = [ (ext "fish") ]; + patterns = exts [ "fish" ]; + }; + clang_format = cmd: { + command = [ + cmd + "--assume-filename=$path" + ]; + patterns = exts [ + "c" + "cc" + "cpp" + "h" + "hh" + "hpp" + ]; }; nixfmt = cmd: { command = [ cmd "--filename=$path" ]; - patterns = [ (ext "nix") ]; + patterns = exts [ "nix" ]; }; shfmt = cmd: { command = [ @@ -32,9 +47,9 @@ let "$path" "-" ]; - patterns = [ - (ext "sh") - (ext "bash") + patterns = exts [ + "sh" + "bash" ]; }; stylua = cmd: { @@ -43,7 +58,7 @@ let "--stdin-filepath=$path" "-" ]; - patterns = [ (ext "lua") ]; + patterns = exts [ "lua" ]; }; taplo = cmd: { command = [ @@ -51,16 +66,16 @@ let "--stdin-filepath=$path" "-" ]; - patterns = [ (ext "toml") ]; + patterns = exts [ "toml" ]; }; yamlfmt = cmd: { command = [ cmd "-in" ]; - patterns = [ - (ext "yaml") - (ext "yml") + patterns = exts [ + "yaml" + "yml" ]; }; }; From ee2908403aa9b42be0f35ca04ffd2d258526efc7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jalil=20David=20Salam=C3=A9=20Messina?= Date: Tue, 13 May 2025 13:32:13 +0200 Subject: [PATCH 091/168] fix(jj): taplo forgot format subcommand Otherwise it doesn't work T-T --- modules/hm/dev.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/hm/dev.nix b/modules/hm/dev.nix index 22a24ab..afa3899 100644 --- a/modules/hm/dev.nix +++ b/modules/hm/dev.nix @@ -63,6 +63,7 @@ let taplo = cmd: { command = [ cmd + "format" "--stdin-filepath=$path" "-" ]; From 3ad83d4fd7f29b77b4ab060f98709c3f68bc3d77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jalil=20David=20Salam=C3=A9=20Messina?= Date: Tue, 13 May 2025 19:13:24 +0200 Subject: [PATCH 092/168] fix(hm): configure nix gc This ensures the old home-manager generations are deleted after a while --- modules/hm/default.nix | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/modules/hm/default.nix b/modules/hm/default.nix index 98de725..c73fc13 100644 --- a/modules/hm/default.nix +++ b/modules/hm/default.nix @@ -31,11 +31,23 @@ in # Add gopass if pass is enabled home.packages = lib.optional config.programs.password-store.enable pkgs.gopass; - nix.settings.use-xdg-base-directories = fromOs [ - "nix" - "settings" - "use-xdg-base-directories" - ] true; + nix = { + # Run GC for Home Manager generations + gc = { + automatic = true; + frequency = "weekly"; + options = "--delete-older-than 30d"; + # run between 0 and 45min after boot if run was missed + randomizedDelaySec = "45min"; + }; + + # Use XDG directories + settings.use-xdg-base-directories = fromOs [ + "nix" + "settings" + "use-xdg-base-directories" + ] true; + }; programs = { # Better cat (bat) From c50d16b93fa6155f3ca3c7037d4e3145e2107b05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jalil=20David=20Salam=C3=A9=20Messina?= Date: Tue, 13 May 2025 19:13:24 +0200 Subject: [PATCH 093/168] feat(hm): run fish if bash is started interactively Setting `fish` as the login shell causes issues, this is safer to do. --- modules/hm/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/modules/hm/default.nix b/modules/hm/default.nix index c73fc13..8073d38 100644 --- a/modules/hm/default.nix +++ b/modules/hm/default.nix @@ -50,6 +50,14 @@ in }; programs = { + # Switch to fish if bash is started interactively + bash.initExtra = '' + 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 + ''; # Better cat (bat) bat = { enable = true; From 81f94a01093824699eebdd390db6d25aa60f75e2 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Tue, 13 May 2025 20:10:09 +0200 Subject: [PATCH 094/168] chore(deps): update https://git.salame.cl/jalil/nix-flake-outputs-size digest to b079370 --- .forgejo/workflows/check.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/check.yml b/.forgejo/workflows/check.yml index a275b66..2cc8f2e 100644 --- a/.forgejo/workflows/check.yml +++ b/.forgejo/workflows/check.yml @@ -46,7 +46,7 @@ jobs: - uses: "https://git.salame.cl/actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683" # v4 - run: nix --version - name: Create Size Report - uses: "https://git.salame.cl/jalil/nix-flake-outputs-size@5c40a31e3e2ed0ea28f8ba68deca41d05fdf2e71" # main + uses: "https://git.salame.cl/jalil/nix-flake-outputs-size@b079370cb22a6f24b2246a60ad5f9681b2b7bc0a" # main with: # Create a comment on the associated PR comment-on-pr: ${{ github.ref_name != 'main' }} From 0d1dbbb72ffa05dd21792df54b4024154e46c94f Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Tue, 13 May 2025 22:10:09 +0200 Subject: [PATCH 095/168] chore(deps): update https://git.salame.cl/jalil/nix-flake-outputs-size digest to b7e76df --- .forgejo/workflows/check.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/check.yml b/.forgejo/workflows/check.yml index 2cc8f2e..767a732 100644 --- a/.forgejo/workflows/check.yml +++ b/.forgejo/workflows/check.yml @@ -46,7 +46,7 @@ jobs: - uses: "https://git.salame.cl/actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683" # v4 - run: nix --version - name: Create Size Report - uses: "https://git.salame.cl/jalil/nix-flake-outputs-size@b079370cb22a6f24b2246a60ad5f9681b2b7bc0a" # main + uses: "https://git.salame.cl/jalil/nix-flake-outputs-size@b7e76df81383680ae01fada8db4d2c6f99391d8b" # main with: # Create a comment on the associated PR comment-on-pr: ${{ github.ref_name != 'main' }} From fb866759bba50ca7aedd23e489eb8bb69dfd6c8e Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Wed, 14 May 2025 00:00:15 +0200 Subject: [PATCH 096/168] chore(deps): lock file maintenance --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 8dd4bd3..1ec56d6 100644 --- a/flake.lock +++ b/flake.lock @@ -319,11 +319,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1746576598, - "narHash": "sha256-FshoQvr6Aor5SnORVvh/ZdJ1Sa2U4ZrIMwKBX5k2wu0=", + "lastModified": 1747060738, + "narHash": "sha256-ByfPRQuqj+nhtVV0koinEpmJw0KLzNbgcgi9EF+NVow=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b3582c75c7f21ce0b429898980eddbbf05c68e55", + "rev": "eaeed9530c76ce5f1d2d8232e08bec5e26f18ec1", "type": "github" }, "original": { @@ -345,11 +345,11 @@ ] }, "locked": { - "lastModified": 1747083534, - "narHash": "sha256-r88FEbKX1HLTovPFt1QHxzZDV7D4TGHhYlJcHmK7hYk=", + "lastModified": 1747171847, + "narHash": "sha256-KZ04peb/fGhpdLVXzAOsIWHMyvolQq0Kn7VA+NSHWVo=", "owner": "nix-community", "repo": "nixvim", - "rev": "ff0ccdf572ad6700a2a29a82cc5d17db29708988", + "rev": "d385972711e9a9a3e7f5e556dd44785c3e2fd4f6", "type": "github" }, "original": { From c88d8468554ab9b6d571d7c8976ecf2b7e7334e1 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Wed, 14 May 2025 00:10:13 +0200 Subject: [PATCH 097/168] chore(deps): lock file maintenance --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 1ec56d6..9780cab 100644 --- a/flake.lock +++ b/flake.lock @@ -345,11 +345,11 @@ ] }, "locked": { - "lastModified": 1747171847, - "narHash": "sha256-KZ04peb/fGhpdLVXzAOsIWHMyvolQq0Kn7VA+NSHWVo=", + "lastModified": 1747173002, + "narHash": "sha256-06aYCSKtw1nlDn7PEAXwAYncSn8Fky4rtYrALep7f6I=", "owner": "nix-community", "repo": "nixvim", - "rev": "d385972711e9a9a3e7f5e556dd44785c3e2fd4f6", + "rev": "1c53ad9b2f5fd4a3c1f644d03895cda7756c92a3", "type": "github" }, "original": { From ba2090ccde8c026384378123daf19f5b3ac6bee7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jalil=20David=20Salam=C3=A9=20Messina?= Date: Wed, 14 May 2025 11:45:15 +0200 Subject: [PATCH 098/168] feat(flake): switch to channels.nixos.org It saves ~15MB of downloads and since we have nixpkgs twice that is 30MB! (see https://github.com/tgirlcloud/lix-diff/issues/1) --- flake.lock | 53 +++++++++++++++++++++++------------------------------ flake.nix | 5 +++-- 2 files changed, 26 insertions(+), 32 deletions(-) diff --git a/flake.lock b/flake.lock index 9780cab..0e50063 100644 --- a/flake.lock +++ b/flake.lock @@ -303,34 +303,15 @@ }, "nixpkgs": { "locked": { - "lastModified": 1746957726, - "narHash": "sha256-k9ut1LSfHCr0AW82ttEQzXVCqmyWVA5+SHJkS5ID/Jo=", - "owner": "NixOS", - "repo": "nixpkgs", + "lastModified": 1747065292, + "narHash": "sha256-BA5Qjz9pzR+L7V3xNCqwALntygahHHCAXNz6R3ccZyw=", "rev": "a39ed32a651fdee6842ec930761e31d1f242cb94", - "type": "github" + "type": "tarball", + "url": "https://releases.nixos.org/nixos/24.11/nixos-24.11.717837.a39ed32a651f/nixexprs.tar.xz?rev=a39ed32a651fdee6842ec930761e31d1f242cb94" }, "original": { - "owner": "NixOS", - "ref": "nixos-24.11", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_2": { - "locked": { - "lastModified": 1747060738, - "narHash": "sha256-ByfPRQuqj+nhtVV0koinEpmJw0KLzNbgcgi9EF+NVow=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "eaeed9530c76ce5f1d2d8232e08bec5e26f18ec1", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" + "type": "tarball", + "url": "https://channels.nixos.org/nixos-24.11/nixexprs.tar.xz" } }, "nixvim": { @@ -338,7 +319,9 @@ "flake-parts": [ "flake-parts" ], - "nixpkgs": "nixpkgs_2", + "nixpkgs": [ + "unstable" + ], "nuschtosSearch": [], "systems": [ "systems" @@ -394,10 +377,7 @@ "stylix": "stylix", "systems": "systems", "treefmt-nix": "treefmt-nix", - "unstable": [ - "nixvim", - "nixpkgs" - ] + "unstable": "unstable" } }, "stylix": { @@ -526,6 +506,19 @@ "repo": "treefmt-nix", "type": "github" } + }, + "unstable": { + "locked": { + "lastModified": 1747005255, + "narHash": "sha256-bFJJ/qwB3VJ0nFuVYYHJXinT4tNJ2jhXTVT6SpYiFOM=", + "rev": "d89fc19e405cb2d55ce7cc114356846a0ee5e956", + "type": "tarball", + "url": "https://releases.nixos.org/nixos/unstable/nixos-25.05pre797896.d89fc19e405c/nixexprs.tar.xz?rev=d89fc19e405cb2d55ce7cc114356846a0ee5e956" + }, + "original": { + "type": "tarball", + "url": "https://channels.nixos.org/nixos-unstable/nixexprs.tar.xz" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 77b627b..e35886f 100644 --- a/flake.nix +++ b/flake.nix @@ -8,8 +8,8 @@ # Flake inputs inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11"; - unstable.follows = "nixvim/nixpkgs"; + nixpkgs.url = "https://channels.nixos.org/nixos-24.11/nixexprs.tar.xz"; + unstable.url = "https://channels.nixos.org/nixos-unstable/nixexprs.tar.xz"; # Lix lix-module = { url = "https://git.lix.systems/lix-project/nixos-module/archive/release-2.92.tar.gz"; @@ -40,6 +40,7 @@ inputs = { flake-parts.follows = "flake-parts"; systems.follows = "systems"; + nixpkgs.follows = "unstable"; # disable optional inputs nuschtosSearch.follows = ""; }; From f8c61e4d17235e8b5538ae15135b3726b2fba21c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jalil=20David=20Salam=C3=A9=20Messina?= Date: Wed, 14 May 2025 21:58:50 +0200 Subject: [PATCH 099/168] feat(hm): enable autoExpire service Stop home-manager from clogging up disk space with old generations. --- modules/hm/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/hm/default.nix b/modules/hm/default.nix index 8073d38..e7e67c7 100644 --- a/modules/hm/default.nix +++ b/modules/hm/default.nix @@ -111,6 +111,8 @@ in pinentryPackage = if config.jhome.gui.enable then pkgs.pinentry-qt else pkgs.pinentry-curses; extraConfig = "allow-preset-passphrase"; }; + # Delete old generations (>month) + home-manager.autoExpire.enable = true; # Spotifyd spotifyd = { inherit (config.jhome.gui) enable; From 8909ad551b728a97f16783843821f6c3fc67ac69 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Thu, 15 May 2025 00:00:31 +0200 Subject: [PATCH 100/168] chore(deps): lock file maintenance --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 0e50063..b0394ad 100644 --- a/flake.lock +++ b/flake.lock @@ -328,11 +328,11 @@ ] }, "locked": { - "lastModified": 1747173002, - "narHash": "sha256-06aYCSKtw1nlDn7PEAXwAYncSn8Fky4rtYrALep7f6I=", + "lastModified": 1747224967, + "narHash": "sha256-we27kbNAAEeT0+PxJ2aUNVFXlJ7uvh4pxTc3R8RUqxA=", "owner": "nix-community", "repo": "nixvim", - "rev": "1c53ad9b2f5fd4a3c1f644d03895cda7756c92a3", + "rev": "95ca65c8d1adee5594bd14f527c68d564fb68879", "type": "github" }, "original": { From 3977e8d50e610087d77d1486d206dac50b6e5927 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Fri, 16 May 2025 00:00:32 +0200 Subject: [PATCH 101/168] chore(deps): lock file maintenance --- flake.lock | 28 ++++++++++++++-------------- scripts/audiomenu/Cargo.lock | 12 ++++++------ scripts/jpassmenu/Cargo.lock | 12 ++++++------ 3 files changed, 26 insertions(+), 26 deletions(-) diff --git a/flake.lock b/flake.lock index b0394ad..8e33ea7 100644 --- a/flake.lock +++ b/flake.lock @@ -226,11 +226,11 @@ ] }, "locked": { - "lastModified": 1747020534, - "narHash": "sha256-D/6rkiC6w2p+4SwRiVKrWIeYzun8FBg7NlMKMwQMxO0=", + "lastModified": 1747331121, + "narHash": "sha256-3MmiUN/jOHBHQUnjqzg6qKArc17j2OS6jisEppDY4g8=", "owner": "nix-community", "repo": "home-manager", - "rev": "b4bbdc6fde16fc2051fcde232f6e288cd22007ca", + "rev": "1eec32f0efe3b830927989767a9e6ece0d82d608", "type": "github" }, "original": { @@ -303,11 +303,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1747065292, - "narHash": "sha256-BA5Qjz9pzR+L7V3xNCqwALntygahHHCAXNz6R3ccZyw=", - "rev": "a39ed32a651fdee6842ec930761e31d1f242cb94", + "lastModified": 1747297572, + "narHash": "sha256-ENc1vQNViytxvo9FN/0bIkOcyge7VDJ4umqnPCpVVbc=", + "rev": "5d736263df906c5da72ab0f372427814de2f52f8", "type": "tarball", - "url": "https://releases.nixos.org/nixos/24.11/nixos-24.11.717837.a39ed32a651f/nixexprs.tar.xz?rev=a39ed32a651fdee6842ec930761e31d1f242cb94" + "url": "https://releases.nixos.org/nixos/24.11/nixos-24.11.717921.5d736263df90/nixexprs.tar.xz?rev=5d736263df906c5da72ab0f372427814de2f52f8" }, "original": { "type": "tarball", @@ -494,11 +494,11 @@ ] }, "locked": { - "lastModified": 1746989248, - "narHash": "sha256-uoQ21EWsAhyskNo8QxrTVZGjG/dV4x5NM1oSgrmNDJY=", + "lastModified": 1747299117, + "narHash": "sha256-JGjCVbxS+9t3tZ2IlPQ7sdqSM4c+KmIJOXVJPfWmVOU=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "708ec80ca82e2bbafa93402ccb66a35ff87900c5", + "rev": "e758f27436367c23bcd63cd973fa5e39254b530e", "type": "github" }, "original": { @@ -509,11 +509,11 @@ }, "unstable": { "locked": { - "lastModified": 1747005255, - "narHash": "sha256-bFJJ/qwB3VJ0nFuVYYHJXinT4tNJ2jhXTVT6SpYiFOM=", - "rev": "d89fc19e405cb2d55ce7cc114356846a0ee5e956", + "lastModified": 1747275534, + "narHash": "sha256-isj7Hlm5+PuoyyfVWOWgv52WXaKV6QgegYr9UKjBeQ4=", + "rev": "adaa24fbf46737f3f1b5497bf64bae750f82942e", "type": "tarball", - "url": "https://releases.nixos.org/nixos/unstable/nixos-25.05pre797896.d89fc19e405c/nixexprs.tar.xz?rev=d89fc19e405cb2d55ce7cc114356846a0ee5e956" + "url": "https://releases.nixos.org/nixos/unstable/nixos-25.05pre799423.adaa24fbf467/nixexprs.tar.xz?rev=adaa24fbf46737f3f1b5497bf64bae750f82942e" }, "original": { "type": "tarball", diff --git a/scripts/audiomenu/Cargo.lock b/scripts/audiomenu/Cargo.lock index 7bd288d..c65db92 100644 --- a/scripts/audiomenu/Cargo.lock +++ b/scripts/audiomenu/Cargo.lock @@ -104,9 +104,9 @@ dependencies = [ [[package]] name = "bitflags" -version = "2.9.0" +version = "2.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c8214115b7bf84099f1309324e63141d4c5d7cc26862f97a0a857dbefe165bd" +checksum = "1b8e56985ec62d17e9c1001dc89c88ecd7dc08e47eba5ec7c29c7b5eeecde967" [[package]] name = "cfg-if" @@ -174,9 +174,9 @@ dependencies = [ [[package]] name = "errno" -version = "0.3.11" +version = "0.3.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "976dd42dc7e85965fe702eb8164f21f450704bdde31faefd6471dba214cb594e" +checksum = "cea14ef9355e3beab063703aa9dab15afd25f0667c341310c1e5274bb1d0da18" dependencies = [ "libc", "windows-sys", @@ -296,9 +296,9 @@ dependencies = [ [[package]] name = "owo-colors" -version = "4.2.0" +version = "4.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1036865bb9422d3300cf723f657c2851d0e9ab12567854b1f4eba3d77decf564" +checksum = "26995317201fa17f3656c36716aed4a7c81743a9634ac4c99c0eeda495db0cec" [[package]] name = "proc-macro2" diff --git a/scripts/jpassmenu/Cargo.lock b/scripts/jpassmenu/Cargo.lock index 6e0b505..eb6f737 100644 --- a/scripts/jpassmenu/Cargo.lock +++ b/scripts/jpassmenu/Cargo.lock @@ -102,9 +102,9 @@ dependencies = [ [[package]] name = "bitflags" -version = "2.9.0" +version = "2.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c8214115b7bf84099f1309324e63141d4c5d7cc26862f97a0a857dbefe165bd" +checksum = "1b8e56985ec62d17e9c1001dc89c88ecd7dc08e47eba5ec7c29c7b5eeecde967" [[package]] name = "bstr" @@ -230,9 +230,9 @@ dependencies = [ [[package]] name = "errno" -version = "0.3.11" +version = "0.3.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "976dd42dc7e85965fe702eb8164f21f450704bdde31faefd6471dba214cb594e" +checksum = "cea14ef9355e3beab063703aa9dab15afd25f0667c341310c1e5274bb1d0da18" dependencies = [ "libc", "windows-sys", @@ -417,9 +417,9 @@ dependencies = [ [[package]] name = "owo-colors" -version = "4.2.0" +version = "4.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1036865bb9422d3300cf723f657c2851d0e9ab12567854b1f4eba3d77decf564" +checksum = "26995317201fa17f3656c36716aed4a7c81743a9634ac4c99c0eeda495db0cec" [[package]] name = "portable-atomic" From dc5e219bc3b74ba761ca58488fcd9aee993f5283 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jalil=20David=20Salam=C3=A9=20Messina?= Date: Fri, 16 May 2025 19:03:09 +0200 Subject: [PATCH 102/168] refactor: clean up scripts Tidy up the script logic and deduplicate it a bit. --- scripts/audiomenu/package.nix | 30 ++++-------------- scripts/default.nix | 59 +++++++++++++++++++++-------------- scripts/jpassmenu/package.nix | 30 ++++-------------- 3 files changed, 47 insertions(+), 72 deletions(-) diff --git a/scripts/audiomenu/package.nix b/scripts/audiomenu/package.nix index 88636da..ceb495b 100644 --- a/scripts/audiomenu/package.nix +++ b/scripts/audiomenu/package.nix @@ -1,31 +1,13 @@ -{ lib, rustPlatform }: +{ + lib, + rustPlatform, + cleanRustSrc, +}: let cargoToml = builtins.fromTOML (builtins.readFile ./Cargo.toml); inherit (cargoToml.package) name version description; pname = name; - src = lib.cleanSourceWith { - src = ./.; - name = "${pname}-source"; - # Adapted from - # no need to pull in crane for just this - filter = - orig_path: type: - let - path = toString orig_path; - base = baseNameOf path; - parentDir = baseNameOf (dirOf path); - matchesSuffix = lib.any (suffix: lib.hasSuffix suffix base) [ - # Rust sources - ".rs" - # TOML files are often used to configure cargo based tools (e.g. .cargo/config.toml) - ".toml" - ]; - isCargoLock = base == "Cargo.lock"; - # .cargo/config.toml is captured above - isOldStyleCargoConfig = parentDir == ".cargo" && base == "config"; - in - type == "directory" || matchesSuffix || isCargoLock || isOldStyleCargoConfig; - }; + src = cleanRustSrc ./.; in rustPlatform.buildRustPackage { inherit pname version src; diff --git a/scripts/default.nix b/scripts/default.nix index 1894de7..534f1e9 100644 --- a/scripts/default.nix +++ b/scripts/default.nix @@ -1,37 +1,48 @@ { lib, ... }: let - src = ./.; - # Autodetects files with a package.nix and calls `callPackage` on them. - # - # Will add a package .#dirname to the flake if it finds a ./dirname/package.nix file. - files = builtins.readDir src; - isPackage = path: type: (type == "directory") && (builtins.readDir path) ? "package.nix"; - toPackage = name: pkgs: { - inherit name; - value = pkgs.callPackage "${src}/${name}/package.nix" { }; + # Clean the package source leaving only the relevant rust files + cleanRustSrc = + pname: src: + lib.cleanSourceWith { + inherit src; + name = "${pname}-source"; + # Adapted from + # no need to pull in crane for just this + filter = + orig_path: type: + let + path_str = toString orig_path; + base = baseNameOf path_str; + parentDir = baseNameOf (dirOf path_str); + matchesSuffix = lib.any (suffix: lib.hasSuffix suffix base) [ + # Rust sources + ".rs" + # TOML files are often used to configure cargo based tools (e.g. .cargo/config.toml) + ".toml" + ]; + isCargoLock = base == "Cargo.lock"; + # .cargo/config.toml is captured above + isOldStyleCargoConfig = parentDir == ".cargo" && base == "config"; + in + type == "directory" || matchesSuffix || isCargoLock || isOldStyleCargoConfig; + }; + # callPackage but for my rust Packages + callRustPackage = + pkgs: pname: nixSrc: + pkgs.callPackage nixSrc { cleanRustSrc = cleanRustSrc pname; }; + packages = { + jpassmenu = ./jpassmenu/package.nix; + audiomenu = ./audiomenu/package.nix; }; - # call pkgs.callPackage on all ./*/package.nix - makePackage = - pkgs: name: - let - type = files.${name}; - path = "${src}/${name}"; - package = toPackage name pkgs; - in - # if it is a package then return a package otherwise return no package c: - if isPackage path type then [ package ] else [ ]; - # we have lib.filterMapAttrs at home - scripts = - pkgs: builtins.listToAttrs (builtins.concatMap (makePackage pkgs) (builtins.attrNames files)); in { # Add scripts to overlay - flake.overlays.scripts = final: scripts; + flake.overlays.scripts = _final: prev: builtins.mapAttrs (callRustPackage prev) packages; # Add scripts to packages perSystem = { pkgs, ... }: { - packages = scripts pkgs; + packages = builtins.mapAttrs (callRustPackage pkgs) packages; }; } diff --git a/scripts/jpassmenu/package.nix b/scripts/jpassmenu/package.nix index 88636da..ceb495b 100644 --- a/scripts/jpassmenu/package.nix +++ b/scripts/jpassmenu/package.nix @@ -1,31 +1,13 @@ -{ lib, rustPlatform }: +{ + lib, + rustPlatform, + cleanRustSrc, +}: let cargoToml = builtins.fromTOML (builtins.readFile ./Cargo.toml); inherit (cargoToml.package) name version description; pname = name; - src = lib.cleanSourceWith { - src = ./.; - name = "${pname}-source"; - # Adapted from - # no need to pull in crane for just this - filter = - orig_path: type: - let - path = toString orig_path; - base = baseNameOf path; - parentDir = baseNameOf (dirOf path); - matchesSuffix = lib.any (suffix: lib.hasSuffix suffix base) [ - # Rust sources - ".rs" - # TOML files are often used to configure cargo based tools (e.g. .cargo/config.toml) - ".toml" - ]; - isCargoLock = base == "Cargo.lock"; - # .cargo/config.toml is captured above - isOldStyleCargoConfig = parentDir == ".cargo" && base == "config"; - in - type == "directory" || matchesSuffix || isCargoLock || isOldStyleCargoConfig; - }; + src = cleanRustSrc ./.; in rustPlatform.buildRustPackage { inherit pname version src; From 46a36b100177f4693f22490eb11cf3590bde4ad9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jalil=20David=20Salam=C3=A9=20Messina?= Date: Fri, 16 May 2025 19:10:11 +0200 Subject: [PATCH 103/168] ci: only run check-renovaterc when the renovaterc changes Otherwise we are just wasting CI time --- .forgejo/workflows/check.yml | 14 +++----------- .forgejo/workflows/renovate.yml | 14 ++++++++++++++ .renovaterc.json => renovate.json | 0 3 files changed, 17 insertions(+), 11 deletions(-) create mode 100644 .forgejo/workflows/renovate.yml rename .renovaterc.json => renovate.json (100%) diff --git a/.forgejo/workflows/check.yml b/.forgejo/workflows/check.yml index 767a732..142bfe0 100644 --- a/.forgejo/workflows/check.yml +++ b/.forgejo/workflows/check.yml @@ -5,27 +5,19 @@ jobs: runs-on: nixos steps: - uses: "https://git.salame.cl/actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683" # v4 + - run: nix --version - name: Run checks run: | - nix --version nix-fast-build --max-jobs 2 --no-nom --skip-cached --no-link \ --flake ".#checks.$(nix eval --raw --impure --expr builtins.currentSystem)" - check-renovaterc: - runs-on: nixos - steps: - - uses: "https://git.salame.cl/actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683" # v4 - - name: Validate renovaterc.json - run: | - nix --version - nix shell nixpkgs#renovate --command renovate-config-validator build-packages: runs-on: nixos needs: check steps: - uses: "https://git.salame.cl/actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683" # v4 + - run: nix --version - name: Build target run: | - nix --version nix-fast-build --max-jobs 1 --no-nom --skip-cached --no-link \ --flake ".#packages.$(nix eval --raw --impure --expr builtins.currentSystem)" build-vm: @@ -33,9 +25,9 @@ jobs: needs: build-packages steps: - uses: "https://git.salame.cl/actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683" # v4 + - run: nix --version - name: Build VM configuration run: | - nix --version nix build --print-build-logs '.#nixosConfigurations.vm.config.system.build.toplevel' report-size: runs-on: nixos diff --git a/.forgejo/workflows/renovate.yml b/.forgejo/workflows/renovate.yml new file mode 100644 index 0000000..ab1aac5 --- /dev/null +++ b/.forgejo/workflows/renovate.yml @@ -0,0 +1,14 @@ +on: + push: + paths: + # only run if the renovate config changed + - renovate.json +jobs: + check-renovaterc: + runs-on: nixos + steps: + - uses: https://git.salame.cl/actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4 + - run: nix --version + - name: Validate renovaterc.json + run: | + nix shell nixpkgs#renovate --command renovate-config-validator diff --git a/.renovaterc.json b/renovate.json similarity index 100% rename from .renovaterc.json rename to renovate.json From f082fe7a6190b66ac0b492488e9ba6a5d6e4a740 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Sat, 17 May 2025 00:00:25 +0200 Subject: [PATCH 104/168] chore(deps): lock file maintenance --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 8e33ea7..b174152 100644 --- a/flake.lock +++ b/flake.lock @@ -494,11 +494,11 @@ ] }, "locked": { - "lastModified": 1747299117, - "narHash": "sha256-JGjCVbxS+9t3tZ2IlPQ7sdqSM4c+KmIJOXVJPfWmVOU=", + "lastModified": 1747417995, + "narHash": "sha256-3WY1yVTcS9Vi6vmBjWsNTG6IYDs/ybu2xAQykdeE22k=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "e758f27436367c23bcd63cd973fa5e39254b530e", + "rev": "42dd9289571ae3c6884af9885b1a7432e3278f92", "type": "github" }, "original": { From c65e793a85b967477f275c283a3338243c85f7f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jalil=20David=20Salam=C3=A9=20Messina?= Date: Sat, 17 May 2025 12:07:49 +0200 Subject: [PATCH 105/168] feat: rewrite jpassmenu in Python There is no reason for it to be a Rust program --- flake-modules/devshells.nix | 1 + scripts/default.nix | 10 +- scripts/jpassmenu/.envrc | 2 + scripts/jpassmenu/.gitignore | 1 - scripts/jpassmenu/.python-version | 1 + scripts/jpassmenu/Cargo.lock | 728 ------------------------------ scripts/jpassmenu/Cargo.toml | 19 - scripts/jpassmenu/README.md | 3 + scripts/jpassmenu/jpassmenu.py | 111 +++++ scripts/jpassmenu/package.nix | 28 +- scripts/jpassmenu/pyproject.toml | 9 + scripts/jpassmenu/src/main.rs | 156 ------- scripts/jpassmenu/uv.lock | 34 ++ 13 files changed, 172 insertions(+), 931 deletions(-) create mode 100644 scripts/jpassmenu/.envrc delete mode 100644 scripts/jpassmenu/.gitignore create mode 100644 scripts/jpassmenu/.python-version delete mode 100644 scripts/jpassmenu/Cargo.lock delete mode 100644 scripts/jpassmenu/Cargo.toml create mode 100644 scripts/jpassmenu/README.md create mode 100644 scripts/jpassmenu/jpassmenu.py create mode 100644 scripts/jpassmenu/pyproject.toml delete mode 100644 scripts/jpassmenu/src/main.rs create mode 100644 scripts/jpassmenu/uv.lock diff --git a/flake-modules/devshells.nix b/flake-modules/devshells.nix index 962c4bf..c387269 100644 --- a/flake-modules/devshells.nix +++ b/flake-modules/devshells.nix @@ -6,6 +6,7 @@ _: { buildInputs = [ pkgs.just self'.packages.nvim + pkgs.uv ]; QEMU_OPTS_WL = "-enable-kvm -nodefaults -m 4G -cpu host -smp 4 -device virtio-gpu"; }; diff --git a/scripts/default.nix b/scripts/default.nix index 534f1e9..0152c68 100644 --- a/scripts/default.nix +++ b/scripts/default.nix @@ -30,19 +30,19 @@ let callRustPackage = pkgs: pname: nixSrc: pkgs.callPackage nixSrc { cleanRustSrc = cleanRustSrc pname; }; - packages = { - jpassmenu = ./jpassmenu/package.nix; - audiomenu = ./audiomenu/package.nix; + packages = pkgs: { + jpassmenu = pkgs.callPackage ./jpassmenu/package.nix { }; + audiomenu = callRustPackage pkgs "audiomenu" ./audiomenu/package.nix; }; in { # Add scripts to overlay - flake.overlays.scripts = _final: prev: builtins.mapAttrs (callRustPackage prev) packages; + flake.overlays.scripts = _final: packages; # Add scripts to packages perSystem = { pkgs, ... }: { - packages = builtins.mapAttrs (callRustPackage pkgs) packages; + packages = packages pkgs; }; } diff --git a/scripts/jpassmenu/.envrc b/scripts/jpassmenu/.envrc new file mode 100644 index 0000000..729d54f --- /dev/null +++ b/scripts/jpassmenu/.envrc @@ -0,0 +1,2 @@ +source_up +source .venv/bin/activate diff --git a/scripts/jpassmenu/.gitignore b/scripts/jpassmenu/.gitignore deleted file mode 100644 index ea8c4bf..0000000 --- a/scripts/jpassmenu/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/target diff --git a/scripts/jpassmenu/.python-version b/scripts/jpassmenu/.python-version new file mode 100644 index 0000000..e4fba21 --- /dev/null +++ b/scripts/jpassmenu/.python-version @@ -0,0 +1 @@ +3.12 diff --git a/scripts/jpassmenu/Cargo.lock b/scripts/jpassmenu/Cargo.lock deleted file mode 100644 index eb6f737..0000000 --- a/scripts/jpassmenu/Cargo.lock +++ /dev/null @@ -1,728 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 4 - -[[package]] -name = "addr2line" -version = "0.24.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1" -dependencies = [ - "gimli", -] - -[[package]] -name = "adler2" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" - -[[package]] -name = "aho-corasick" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" -dependencies = [ - "memchr", -] - -[[package]] -name = "anstream" -version = "0.6.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8acc5369981196006228e28809f761875c0327210a891e941f4c683b3a99529b" -dependencies = [ - "anstyle", - "anstyle-parse", - "anstyle-query", - "anstyle-wincon", - "colorchoice", - "is_terminal_polyfill", - "utf8parse", -] - -[[package]] -name = "anstyle" -version = "1.0.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9" - -[[package]] -name = "anstyle-parse" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b2d16507662817a6a20a9ea92df6652ee4f94f914589377d69f3b21bc5798a9" -dependencies = [ - "utf8parse", -] - -[[package]] -name = "anstyle-query" -version = "1.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c" -dependencies = [ - "windows-sys", -] - -[[package]] -name = "anstyle-wincon" -version = "3.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3534e77181a9cc07539ad51f2141fe32f6c3ffd4df76db8ad92346b003ae4e" -dependencies = [ - "anstyle", - "once_cell", - "windows-sys", -] - -[[package]] -name = "backtrace" -version = "0.3.75" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6806a6321ec58106fea15becdad98371e28d92ccbc7c8f1b3b6dd724fe8f1002" -dependencies = [ - "addr2line", - "cfg-if", - "libc", - "miniz_oxide", - "object", - "rustc-demangle", - "windows-targets", -] - -[[package]] -name = "backtrace-ext" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "537beee3be4a18fb023b570f80e3ae28003db9167a751266b259926e25539d50" -dependencies = [ - "backtrace", -] - -[[package]] -name = "bitflags" -version = "2.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b8e56985ec62d17e9c1001dc89c88ecd7dc08e47eba5ec7c29c7b5eeecde967" - -[[package]] -name = "bstr" -version = "1.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "234113d19d0d7d613b40e86fb654acf958910802bcceab913a4f9e7cda03b1a4" -dependencies = [ - "memchr", - "serde", -] - -[[package]] -name = "cfg-if" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - -[[package]] -name = "clap" -version = "4.5.38" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed93b9805f8ba930df42c2590f05453d5ec36cbb85d018868a5b24d31f6ac000" -dependencies = [ - "clap_builder", - "clap_derive", -] - -[[package]] -name = "clap_builder" -version = "4.5.38" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "379026ff283facf611b0ea629334361c4211d1b12ee01024eec1591133b04120" -dependencies = [ - "anstream", - "anstyle", - "clap_lex", - "strsim", -] - -[[package]] -name = "clap_derive" -version = "4.5.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09176aae279615badda0765c0c0b3f6ed53f4709118af73cf4655d85d1530cd7" -dependencies = [ - "heck", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "clap_lex" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f46ad14479a25103f283c0f10005961cf086d8dc42205bb44c46ac563475dca6" - -[[package]] -name = "colorchoice" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990" - -[[package]] -name = "crossbeam-deque" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9dd111b7b7f7d55b72c0a6ae361660ee5853c9af73f70c3c2ef6858b950e2e51" -dependencies = [ - "crossbeam-epoch", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-epoch" -version = "0.9.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" -dependencies = [ - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-utils" -version = "0.8.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28" - -[[package]] -name = "duct" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6ce170a0e8454fa0f9b0e5ca38a6ba17ed76a50916839d217eb5357e05cdfde" -dependencies = [ - "libc", - "os_pipe", - "shared_child", - "shared_thread", -] - -[[package]] -name = "env_filter" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "186e05a59d4c50738528153b83b0b0194d3a29507dfec16eccd4b342903397d0" -dependencies = [ - "log", - "regex", -] - -[[package]] -name = "env_logger" -version = "0.11.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13c863f0904021b108aa8b2f55046443e6b1ebde8fd4a15c399893aae4fa069f" -dependencies = [ - "anstream", - "anstyle", - "env_filter", - "jiff", - "log", -] - -[[package]] -name = "errno" -version = "0.3.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cea14ef9355e3beab063703aa9dab15afd25f0667c341310c1e5274bb1d0da18" -dependencies = [ - "libc", - "windows-sys", -] - -[[package]] -name = "gimli" -version = "0.31.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f" - -[[package]] -name = "globset" -version = "0.4.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54a1028dfc5f5df5da8a56a73e6c153c9a9708ec57232470703592a3f18e49f5" -dependencies = [ - "aho-corasick", - "bstr", - "log", - "regex-automata", - "regex-syntax", -] - -[[package]] -name = "heck" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" - -[[package]] -name = "ignore" -version = "0.4.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d89fd380afde86567dfba715db065673989d6253f42b88179abd3eae47bda4b" -dependencies = [ - "crossbeam-deque", - "globset", - "log", - "memchr", - "regex-automata", - "same-file", - "walkdir", - "winapi-util", -] - -[[package]] -name = "is_ci" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7655c9839580ee829dfacba1d1278c2b7883e50a277ff7541299489d6bdfdc45" - -[[package]] -name = "is_terminal_polyfill" -version = "1.70.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" - -[[package]] -name = "jiff" -version = "0.2.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f02000660d30638906021176af16b17498bd0d12813dbfe7b276d8bc7f3c0806" -dependencies = [ - "jiff-static", - "log", - "portable-atomic", - "portable-atomic-util", - "serde", -] - -[[package]] -name = "jiff-static" -version = "0.2.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3c30758ddd7188629c6713fc45d1188af4f44c90582311d0c8d8c9907f60c48" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "jpassmenu" -version = "0.1.0" -dependencies = [ - "clap", - "duct", - "env_logger", - "ignore", - "log", - "miette", -] - -[[package]] -name = "libc" -version = "0.2.172" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d750af042f7ef4f724306de029d18836c26c1765a54a6a3f094cbd23a7267ffa" - -[[package]] -name = "linux-raw-sys" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd945864f07fe9f5371a27ad7b52a172b4b499999f1d97574c9fa68373937e12" - -[[package]] -name = "log" -version = "0.4.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94" - -[[package]] -name = "memchr" -version = "2.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" - -[[package]] -name = "miette" -version = "7.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f98efec8807c63c752b5bd61f862c165c115b0a35685bdcfd9238c7aeb592b7" -dependencies = [ - "backtrace", - "backtrace-ext", - "cfg-if", - "miette-derive", - "owo-colors", - "supports-color", - "supports-hyperlinks", - "supports-unicode", - "terminal_size", - "textwrap", - "unicode-width 0.1.14", -] - -[[package]] -name = "miette-derive" -version = "7.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db5b29714e950dbb20d5e6f74f9dcec4edbcc1067bb7f8ed198c097b8c1a818b" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "miniz_oxide" -version = "0.8.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3be647b768db090acb35d5ec5db2b0e1f1de11133ca123b9eacf5137868f892a" -dependencies = [ - "adler2", -] - -[[package]] -name = "object" -version = "0.36.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62948e14d923ea95ea2c7c86c71013138b66525b86bdc08d2dcc262bdb497b87" -dependencies = [ - "memchr", -] - -[[package]] -name = "once_cell" -version = "1.21.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d" - -[[package]] -name = "os_pipe" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ffd2b0a5634335b135d5728d84c5e0fd726954b87111f7506a61c502280d982" -dependencies = [ - "libc", - "windows-sys", -] - -[[package]] -name = "owo-colors" -version = "4.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26995317201fa17f3656c36716aed4a7c81743a9634ac4c99c0eeda495db0cec" - -[[package]] -name = "portable-atomic" -version = "1.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "350e9b48cbc6b0e028b0473b114454c6316e57336ee184ceab6e53f72c178b3e" - -[[package]] -name = "portable-atomic-util" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8a2f0d8d040d7848a709caf78912debcc3f33ee4b3cac47d73d1e1069e83507" -dependencies = [ - "portable-atomic", -] - -[[package]] -name = "proc-macro2" -version = "1.0.95" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02b3e5e68a3a1a02aad3ec490a98007cbc13c37cbe84a3cd7b8e406d76e7f778" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "quote" -version = "1.0.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "regex" -version = "1.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191" -dependencies = [ - "aho-corasick", - "memchr", - "regex-automata", - "regex-syntax", -] - -[[package]] -name = "regex-automata" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax", -] - -[[package]] -name = "regex-syntax" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" - -[[package]] -name = "rustc-demangle" -version = "0.1.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" - -[[package]] -name = "rustix" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c71e83d6afe7ff64890ec6b71d6a69bb8a610ab78ce364b3352876bb4c801266" -dependencies = [ - "bitflags", - "errno", - "libc", - "linux-raw-sys", - "windows-sys", -] - -[[package]] -name = "same-file" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "serde" -version = "1.0.219" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde_derive" -version = "1.0.219" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "shared_child" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e297bd52991bbe0686c086957bee142f13df85d1e79b0b21630a99d374ae9dc" -dependencies = [ - "libc", - "windows-sys", -] - -[[package]] -name = "shared_thread" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7a6f98357c6bb0ebace19b22220e5543801d9de90ffe77f8abb27c056bac064" - -[[package]] -name = "strsim" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" - -[[package]] -name = "supports-color" -version = "3.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c64fc7232dd8d2e4ac5ce4ef302b1d81e0b80d055b9d77c7c4f51f6aa4c867d6" -dependencies = [ - "is_ci", -] - -[[package]] -name = "supports-hyperlinks" -version = "3.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "804f44ed3c63152de6a9f90acbea1a110441de43006ea51bcce8f436196a288b" - -[[package]] -name = "supports-unicode" -version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7401a30af6cb5818bb64852270bb722533397edcfc7344954a38f420819ece2" - -[[package]] -name = "syn" -version = "2.0.101" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ce2b7fc941b3a24138a0a7cf8e858bfc6a992e7978a068a5c760deb0ed43caf" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "terminal_size" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45c6481c4829e4cc63825e62c49186a34538b7b2750b73b266581ffb612fb5ed" -dependencies = [ - "rustix", - "windows-sys", -] - -[[package]] -name = "textwrap" -version = "0.16.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c13547615a44dc9c452a8a534638acdf07120d4b6847c8178705da06306a3057" -dependencies = [ - "unicode-linebreak", - "unicode-width 0.2.0", -] - -[[package]] -name = "unicode-ident" -version = "1.0.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512" - -[[package]] -name = "unicode-linebreak" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b09c83c3c29d37506a3e260c08c03743a6bb66a9cd432c6934ab501a190571f" - -[[package]] -name = "unicode-width" -version = "0.1.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af" - -[[package]] -name = "unicode-width" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fc81956842c57dac11422a97c3b8195a1ff727f06e85c84ed2e8aa277c9a0fd" - -[[package]] -name = "utf8parse" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" - -[[package]] -name = "walkdir" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" -dependencies = [ - "same-file", - "winapi-util", -] - -[[package]] -name = "winapi-util" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" -dependencies = [ - "windows-sys", -] - -[[package]] -name = "windows-sys" -version = "0.59.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" -dependencies = [ - "windows-targets", -] - -[[package]] -name = "windows-targets" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" -dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_gnullvm", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc", -] - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" - -[[package]] -name = "windows_i686_gnu" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" - -[[package]] -name = "windows_i686_gnullvm" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" - -[[package]] -name = "windows_i686_msvc" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" diff --git a/scripts/jpassmenu/Cargo.toml b/scripts/jpassmenu/Cargo.toml deleted file mode 100644 index 68c2cad..0000000 --- a/scripts/jpassmenu/Cargo.toml +++ /dev/null @@ -1,19 +0,0 @@ -[package] -name = "jpassmenu" -description = "A simple program that uses dmenu compatible menu to select a password to type/copy" -version = "0.1.0" -edition = "2021" - -[dependencies] -clap = { version = "4.5.23", features = ["derive", "env"] } -duct = "1.0.0" -env_logger = "0.11.5" -ignore = "0.4.23" -log = "0.4.22" -miette = { version = "7.4.0", features = ["fancy"] } - -[profile.release] -lto = true -opt-level = "s" -panic = "abort" -strip = true diff --git a/scripts/jpassmenu/README.md b/scripts/jpassmenu/README.md new file mode 100644 index 0000000..2c28fb8 --- /dev/null +++ b/scripts/jpassmenu/README.md @@ -0,0 +1,3 @@ +# jpassmenu + +My own implementation of the `passmenu` `dmenu` script, this one uses `fuzzel` by default and types passwords with `ydotool`. diff --git a/scripts/jpassmenu/jpassmenu.py b/scripts/jpassmenu/jpassmenu.py new file mode 100644 index 0000000..f446412 --- /dev/null +++ b/scripts/jpassmenu/jpassmenu.py @@ -0,0 +1,111 @@ +from os import environ +from pathlib import Path +import subprocess +import click + + +def select(options: list[str]) -> int | None: + menu_output = subprocess.run( + ["fuzzel", "--dmenu"], + input="\n".join(options), + encoding="UTF-8", + capture_output=True, + ) + if menu_output.returncode == 2: + return None + menu_output.check_returncode() + selected = menu_output.stdout.rstrip() + return options.index(selected) + + +@click.command( + "jpassmenu", context_settings={"show_default": True, "max_content_width": 120} +) +@click.option( + "--type", + "typeit", + help="Type the password using ydotool instead of copying it to the clipboard", +) +@click.option( + "--store-dir", + type=click.Path(exists=True, file_okay=False, path_type=Path), + envvar="PASSWORD_STORE_DIR", + default=Path("~/.password-store"), +) +@click.option( + "--pass-bin", + default="pass", + help="Path to the pass binary\n\nNeeds to support `pass show` and `pass show --clip`", +) +@click.option( + "--menu-bin", default="fuzzel", help="Path to the dmenu compatible menu binary" +) +@click.argument("menu_args", nargs=-1) +def main( + typeit: bool, store_dir: Path, pass_bin: str, menu_bin: str, menu_args: list[str] +) -> None: + menu_args = ( + ["--dmenu"] if not menu_args and menu_bin.endswith("fuzzel") else menu_args + ) + store_dir = store_dir.expanduser().absolute() + # Get all files in store_dir + secrets = ( + dirpath / fname + for dirpath, _dirnames, filenames in store_dir.walk() + for fname in filenames + ) + # Filter for files ending in .gpg and strip the extension + secrets = ( + secret.with_suffix("") + for secret in secrets + if secret.is_file() and secret.suffix == ".gpg" + ) + # Make the paths relative to store_dir and turn to strings + secrets = sorted(str(secret.relative_to(store_dir)) for secret in secrets) + + if not secrets: + click.secho(f"No valid entries found in {store_dir}", err=True, fg="red") + + selected = select(secrets) + if selected is None: + click.echo("No secret selected") + return + selected = secrets[selected] + + # If PASSWORD_STORE_DIR and --store-dir disagree, set PASSWORD_STORE_DIR to --store-dir + env_store = ( + Path(environ.get("PASSWORD_STORE_DIR", default="~/.password-store")) + .expanduser() + .absolute() + ) + if store_dir != env_store: + environ["PASSWORD_STORE_DIR"] = str(store_dir) + + pass_cmd = ( + [pass_bin, "show", selected] + if typeit + else [pass_bin, "show", "--clip", selected] + ) + + pass_output = subprocess.run( + pass_cmd, + encoding="UTF-8", + check=True, + capture_output=typeit, + ) + if not typeit: + return + + pass_entry = pass_output.stdout + secret = pass_entry.splitlines()[0].strip() + + _ = subprocess.run( + ["ydotool", "type", "--file", "-"], + input=secret, + encoding="UTF-8", + check=True, + ) + + +if __name__ == "__main__": + main() diff --git a/scripts/jpassmenu/package.nix b/scripts/jpassmenu/package.nix index ceb495b..b74c27e 100644 --- a/scripts/jpassmenu/package.nix +++ b/scripts/jpassmenu/package.nix @@ -1,22 +1,6 @@ -{ - lib, - rustPlatform, - cleanRustSrc, -}: -let - cargoToml = builtins.fromTOML (builtins.readFile ./Cargo.toml); - inherit (cargoToml.package) name version description; - pname = name; - src = cleanRustSrc ./.; -in -rustPlatform.buildRustPackage { - inherit pname version src; - cargoLock.lockFile = ./Cargo.lock; - useNextest = true; - meta = { - inherit description; - license = lib.licenses.mit; - homepage = "https://github.com/jalil-salame/configuration.nix"; - mainProgram = name; - }; -} +{ writers, python3Packages }: +writers.writePython3 "jpassmenu" { + libraries = [ python3Packages.click ]; + # line too long, but I like my code well documented + flakeIgnore = [ "E501" ]; +} ./jpassmenu.py diff --git a/scripts/jpassmenu/pyproject.toml b/scripts/jpassmenu/pyproject.toml new file mode 100644 index 0000000..5cfa6aa --- /dev/null +++ b/scripts/jpassmenu/pyproject.toml @@ -0,0 +1,9 @@ +[project] +name = "jpassmenu" +version = "0.1.0" +description = "A simple program that uses dmenu compatible menu to select a password to type/copy" +readme = "README.md" +requires-python = ">=3.12" +dependencies = [ + "click>=8.1.7", +] diff --git a/scripts/jpassmenu/src/main.rs b/scripts/jpassmenu/src/main.rs deleted file mode 100644 index 279dbdc..0000000 --- a/scripts/jpassmenu/src/main.rs +++ /dev/null @@ -1,156 +0,0 @@ -use std::{ - ffi::OsStr, - fmt::Write as _, - path::{Path, PathBuf}, -}; - -use clap::Parser; -use duct::cmd; -use miette::{bail, ensure, Context, IntoDiagnostic, Result}; - -fn main() -> Result<()> { - miette::set_panic_hook(); - env_logger::builder() - .filter_level(log::LevelFilter::Info) - .parse_default_env() - .try_init() - .into_diagnostic()?; - Opts::parse().run() -} - -impl Opts { - fn run(self) -> Result<()> { - log::debug!("parsed opts {self:?}"); - let Self { - typeit, - store_dir, - pass_bin, - menu_bin, - menu_args, - } = self; - let store_dir = resolve_home(store_dir); - // Search paths - log::info!("looking for entries in {}", store_dir.display()); - let mut paths = ignore::Walk::new(&store_dir) - .filter_map(|entry| { - let entry = entry.ok()?; - if entry.file_type()?.is_file() - && entry.path().extension() == Some(OsStr::new("gpg")) - { - let path = entry.path(); - Some( - path.strip_prefix(&store_dir) - .unwrap_or(path) - .with_extension("") - .into_boxed_path(), - ) - } else { - None - } - }) - .collect::>>(); - paths.sort_unstable(); - ensure!( - !paths.is_empty(), - "failed to find entries in {}", - store_dir.display() - ); - log::debug!("found entries: {paths:#?}"); - // Concatenate all paths - let paths = paths - .into_iter() - .try_fold(String::new(), |mut acc, it| { - writeln!(acc, "{}", it.display()).map(|_| acc) - }) - .into_diagnostic() - .wrap_err("preparing paths")?; - // Show dynamic menu - let selected = cmd(menu_bin, menu_args) - .stdin_bytes(paths.as_bytes()) - .read() - .into_diagnostic() - .wrap_err("failed to run menu and retrieve the selected entry")?; - let selected = selected.trim(); - if selected.is_empty() { - bail!("no password entry selected"); - } - // Prepare env dir - let env_store = std::env::var_os("PASSWORD_STORE_DIR"); - let set_env = if let Some(env_store) = env_store { - if store_dir != env_store { - Some(store_dir) - } else { - None - } - } else if store_dir == Path::new("~/.password-store") { - None - } else { - Some(store_dir) - }; - // Prepare pass command - let args = if typeit { - vec!["show", selected] - } else { - vec!["show", "-c", selected] - }; - let pass = cmd(pass_bin, args); - let pass = if let Some(env) = set_env { - pass.env("PASSWORD_STORE_DIR", env) - } else { - pass - }; - // Copy password to clipboard - if !typeit { - pass.run() - .into_diagnostic() - .wrap_err("failed to copy password to clipboard")?; - return Ok(()); - } - // Retrieve password - let pass_entry = pass - .read() - .into_diagnostic() - .wrap_err("failed to retrieve password")?; - let Some(password) = pass_entry.lines().next() else { - bail!("failed to retrieve password or entry was empty"); - }; - // Type password with ydotool - cmd("ydotool", &["type", "--file", "-"]) - .stdin_bytes(password.as_bytes()) - .run() - .into_diagnostic() - .wrap_err("failed to type password with ydotool")?; - Ok(()) - } -} - -#[derive(Debug, Parser)] -struct Opts { - /// Type the password instead of copying it to the clipboard - #[arg(long("type"))] - typeit: bool, - #[arg(long, env("PASSWORD_STORE_DIR"), default_value = "~/.password-store")] - store_dir: PathBuf, - /// Path to the pass binary - /// - /// Needs to support `pass show` and `pass show -c` - #[arg(long, default_value = "pass")] - pass_bin: String, - /// Path to the dynamic menu binary - #[arg(long, default_value = "fuzzel")] - menu_bin: String, - /// Args to the dynamic menu - #[arg(long, default_value = "--dmenu")] - menu_args: Vec, -} - -fn resolve_home(path: PathBuf) -> PathBuf { - if let Ok(path) = path.strip_prefix("~") { - if let Some(home) = std::env::var_os("HOME") { - let mut home = PathBuf::from(home); - home.push(path); - return home; - } - } - path -} diff --git a/scripts/jpassmenu/uv.lock b/scripts/jpassmenu/uv.lock new file mode 100644 index 0000000..55d4696 --- /dev/null +++ b/scripts/jpassmenu/uv.lock @@ -0,0 +1,34 @@ +version = 1 +requires-python = ">=3.12" + +[[package]] +name = "click" +version = "8.2.0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "colorama", marker = "platform_system == 'Windows'" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/cd/0f/62ca20172d4f87d93cf89665fbaedcd560ac48b465bd1d92bfc7ea6b0a41/click-8.2.0.tar.gz", hash = "sha256:f5452aeddd9988eefa20f90f05ab66f17fce1ee2a36907fd30b05bbb5953814d", size = 235857 } +wheels = [ + { url = "https://files.pythonhosted.org/packages/a2/58/1f37bf81e3c689cc74ffa42102fa8915b59085f54a6e4a80bc6265c0f6bf/click-8.2.0-py3-none-any.whl", hash = "sha256:6b303f0b2aa85f1cb4e5303078fadcbcd4e476f114fab9b5007005711839325c", size = 102156 }, +] + +[[package]] +name = "colorama" +version = "0.4.6" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/d8/53/6f443c9a4a8358a93a6792e2acffb9d9d5cb0a5cfd8802644b7b1c9a02e4/colorama-0.4.6.tar.gz", hash = "sha256:08695f5cb7ed6e0531a20572697297273c47b8cae5a63ffc6d6ed5c201be6e44", size = 27697 } +wheels = [ + { url = "https://files.pythonhosted.org/packages/d1/d6/3965ed04c63042e047cb6a3e6ed1a63a35087b6a609aa3a15ed8ac56c221/colorama-0.4.6-py2.py3-none-any.whl", hash = "sha256:4f1d9991f5acc0ca119f9d443620b77f9d6b33703e51011c16baf57afb285fc6", size = 25335 }, +] + +[[package]] +name = "jpassmenu" +version = "0.1.0" +source = { virtual = "." } +dependencies = [ + { name = "click" }, +] + +[package.metadata] +requires-dist = [{ name = "click", specifier = ">=8.2.0" }] From 0a9d16fb9a2a5e70101fec439c9a102fce6008be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jalil=20David=20Salam=C3=A9=20Messina?= Date: Sat, 17 May 2025 14:13:57 +0200 Subject: [PATCH 106/168] feat: rewrite audiomenu in Python There is no reason for it to be a Rust program --- scripts/audiomenu/.envrc | 2 + scripts/audiomenu/.gitignore | 2 +- scripts/audiomenu/.python-version | 1 + scripts/audiomenu/Cargo.lock | 553 ------------------------------ scripts/audiomenu/Cargo.toml | 18 - scripts/audiomenu/README.md | 0 scripts/audiomenu/audiomenu.py | 238 +++++++++++++ scripts/audiomenu/package.nix | 31 +- scripts/audiomenu/pyproject.toml | 9 + scripts/audiomenu/src/main.rs | 231 ------------- scripts/audiomenu/uv.lock | 34 ++ scripts/default.nix | 33 +- 12 files changed, 295 insertions(+), 857 deletions(-) create mode 100644 scripts/audiomenu/.envrc create mode 100644 scripts/audiomenu/.python-version delete mode 100644 scripts/audiomenu/Cargo.lock delete mode 100644 scripts/audiomenu/Cargo.toml create mode 100644 scripts/audiomenu/README.md create mode 100644 scripts/audiomenu/audiomenu.py create mode 100644 scripts/audiomenu/pyproject.toml delete mode 100644 scripts/audiomenu/src/main.rs create mode 100644 scripts/audiomenu/uv.lock diff --git a/scripts/audiomenu/.envrc b/scripts/audiomenu/.envrc new file mode 100644 index 0000000..729d54f --- /dev/null +++ b/scripts/audiomenu/.envrc @@ -0,0 +1,2 @@ +source_up +source .venv/bin/activate diff --git a/scripts/audiomenu/.gitignore b/scripts/audiomenu/.gitignore index ea8c4bf..1d17dae 100644 --- a/scripts/audiomenu/.gitignore +++ b/scripts/audiomenu/.gitignore @@ -1 +1 @@ -/target +.venv diff --git a/scripts/audiomenu/.python-version b/scripts/audiomenu/.python-version new file mode 100644 index 0000000..e4fba21 --- /dev/null +++ b/scripts/audiomenu/.python-version @@ -0,0 +1 @@ +3.12 diff --git a/scripts/audiomenu/Cargo.lock b/scripts/audiomenu/Cargo.lock deleted file mode 100644 index c65db92..0000000 --- a/scripts/audiomenu/Cargo.lock +++ /dev/null @@ -1,553 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 4 - -[[package]] -name = "addr2line" -version = "0.24.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1" -dependencies = [ - "gimli", -] - -[[package]] -name = "adler2" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" - -[[package]] -name = "anstream" -version = "0.6.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8acc5369981196006228e28809f761875c0327210a891e941f4c683b3a99529b" -dependencies = [ - "anstyle", - "anstyle-parse", - "anstyle-query", - "anstyle-wincon", - "colorchoice", - "is_terminal_polyfill", - "utf8parse", -] - -[[package]] -name = "anstyle" -version = "1.0.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9" - -[[package]] -name = "anstyle-parse" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b2d16507662817a6a20a9ea92df6652ee4f94f914589377d69f3b21bc5798a9" -dependencies = [ - "utf8parse", -] - -[[package]] -name = "anstyle-query" -version = "1.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c" -dependencies = [ - "windows-sys", -] - -[[package]] -name = "anstyle-wincon" -version = "3.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3534e77181a9cc07539ad51f2141fe32f6c3ffd4df76db8ad92346b003ae4e" -dependencies = [ - "anstyle", - "once_cell", - "windows-sys", -] - -[[package]] -name = "audiomenu" -version = "0.1.0" -dependencies = [ - "clap", - "duct", - "miette", - "serde", - "serde_json", -] - -[[package]] -name = "backtrace" -version = "0.3.75" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6806a6321ec58106fea15becdad98371e28d92ccbc7c8f1b3b6dd724fe8f1002" -dependencies = [ - "addr2line", - "cfg-if", - "libc", - "miniz_oxide", - "object", - "rustc-demangle", - "windows-targets", -] - -[[package]] -name = "backtrace-ext" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "537beee3be4a18fb023b570f80e3ae28003db9167a751266b259926e25539d50" -dependencies = [ - "backtrace", -] - -[[package]] -name = "bitflags" -version = "2.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b8e56985ec62d17e9c1001dc89c88ecd7dc08e47eba5ec7c29c7b5eeecde967" - -[[package]] -name = "cfg-if" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - -[[package]] -name = "clap" -version = "4.5.38" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed93b9805f8ba930df42c2590f05453d5ec36cbb85d018868a5b24d31f6ac000" -dependencies = [ - "clap_builder", - "clap_derive", -] - -[[package]] -name = "clap_builder" -version = "4.5.38" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "379026ff283facf611b0ea629334361c4211d1b12ee01024eec1591133b04120" -dependencies = [ - "anstream", - "anstyle", - "clap_lex", - "strsim", -] - -[[package]] -name = "clap_derive" -version = "4.5.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09176aae279615badda0765c0c0b3f6ed53f4709118af73cf4655d85d1530cd7" -dependencies = [ - "heck", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "clap_lex" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f46ad14479a25103f283c0f10005961cf086d8dc42205bb44c46ac563475dca6" - -[[package]] -name = "colorchoice" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990" - -[[package]] -name = "duct" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6ce170a0e8454fa0f9b0e5ca38a6ba17ed76a50916839d217eb5357e05cdfde" -dependencies = [ - "libc", - "os_pipe", - "shared_child", - "shared_thread", -] - -[[package]] -name = "errno" -version = "0.3.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cea14ef9355e3beab063703aa9dab15afd25f0667c341310c1e5274bb1d0da18" -dependencies = [ - "libc", - "windows-sys", -] - -[[package]] -name = "gimli" -version = "0.31.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f" - -[[package]] -name = "heck" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" - -[[package]] -name = "is_ci" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7655c9839580ee829dfacba1d1278c2b7883e50a277ff7541299489d6bdfdc45" - -[[package]] -name = "is_terminal_polyfill" -version = "1.70.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" - -[[package]] -name = "itoa" -version = "1.0.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c" - -[[package]] -name = "libc" -version = "0.2.172" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d750af042f7ef4f724306de029d18836c26c1765a54a6a3f094cbd23a7267ffa" - -[[package]] -name = "linux-raw-sys" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd945864f07fe9f5371a27ad7b52a172b4b499999f1d97574c9fa68373937e12" - -[[package]] -name = "memchr" -version = "2.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" - -[[package]] -name = "miette" -version = "7.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f98efec8807c63c752b5bd61f862c165c115b0a35685bdcfd9238c7aeb592b7" -dependencies = [ - "backtrace", - "backtrace-ext", - "cfg-if", - "miette-derive", - "owo-colors", - "supports-color", - "supports-hyperlinks", - "supports-unicode", - "terminal_size", - "textwrap", - "unicode-width 0.1.14", -] - -[[package]] -name = "miette-derive" -version = "7.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db5b29714e950dbb20d5e6f74f9dcec4edbcc1067bb7f8ed198c097b8c1a818b" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "miniz_oxide" -version = "0.8.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3be647b768db090acb35d5ec5db2b0e1f1de11133ca123b9eacf5137868f892a" -dependencies = [ - "adler2", -] - -[[package]] -name = "object" -version = "0.36.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62948e14d923ea95ea2c7c86c71013138b66525b86bdc08d2dcc262bdb497b87" -dependencies = [ - "memchr", -] - -[[package]] -name = "once_cell" -version = "1.21.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d" - -[[package]] -name = "os_pipe" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ffd2b0a5634335b135d5728d84c5e0fd726954b87111f7506a61c502280d982" -dependencies = [ - "libc", - "windows-sys", -] - -[[package]] -name = "owo-colors" -version = "4.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26995317201fa17f3656c36716aed4a7c81743a9634ac4c99c0eeda495db0cec" - -[[package]] -name = "proc-macro2" -version = "1.0.95" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02b3e5e68a3a1a02aad3ec490a98007cbc13c37cbe84a3cd7b8e406d76e7f778" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "quote" -version = "1.0.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "rustc-demangle" -version = "0.1.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" - -[[package]] -name = "rustix" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c71e83d6afe7ff64890ec6b71d6a69bb8a610ab78ce364b3352876bb4c801266" -dependencies = [ - "bitflags", - "errno", - "libc", - "linux-raw-sys", - "windows-sys", -] - -[[package]] -name = "ryu" -version = "1.0.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f" - -[[package]] -name = "serde" -version = "1.0.219" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde_derive" -version = "1.0.219" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "serde_json" -version = "1.0.140" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20068b6e96dc6c9bd23e01df8827e6c7e1f2fddd43c21810382803c136b99373" -dependencies = [ - "itoa", - "memchr", - "ryu", - "serde", -] - -[[package]] -name = "shared_child" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e297bd52991bbe0686c086957bee142f13df85d1e79b0b21630a99d374ae9dc" -dependencies = [ - "libc", - "windows-sys", -] - -[[package]] -name = "shared_thread" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7a6f98357c6bb0ebace19b22220e5543801d9de90ffe77f8abb27c056bac064" - -[[package]] -name = "strsim" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" - -[[package]] -name = "supports-color" -version = "3.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c64fc7232dd8d2e4ac5ce4ef302b1d81e0b80d055b9d77c7c4f51f6aa4c867d6" -dependencies = [ - "is_ci", -] - -[[package]] -name = "supports-hyperlinks" -version = "3.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "804f44ed3c63152de6a9f90acbea1a110441de43006ea51bcce8f436196a288b" - -[[package]] -name = "supports-unicode" -version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7401a30af6cb5818bb64852270bb722533397edcfc7344954a38f420819ece2" - -[[package]] -name = "syn" -version = "2.0.101" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ce2b7fc941b3a24138a0a7cf8e858bfc6a992e7978a068a5c760deb0ed43caf" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "terminal_size" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45c6481c4829e4cc63825e62c49186a34538b7b2750b73b266581ffb612fb5ed" -dependencies = [ - "rustix", - "windows-sys", -] - -[[package]] -name = "textwrap" -version = "0.16.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c13547615a44dc9c452a8a534638acdf07120d4b6847c8178705da06306a3057" -dependencies = [ - "unicode-linebreak", - "unicode-width 0.2.0", -] - -[[package]] -name = "unicode-ident" -version = "1.0.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512" - -[[package]] -name = "unicode-linebreak" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b09c83c3c29d37506a3e260c08c03743a6bb66a9cd432c6934ab501a190571f" - -[[package]] -name = "unicode-width" -version = "0.1.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af" - -[[package]] -name = "unicode-width" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fc81956842c57dac11422a97c3b8195a1ff727f06e85c84ed2e8aa277c9a0fd" - -[[package]] -name = "utf8parse" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" - -[[package]] -name = "windows-sys" -version = "0.59.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" -dependencies = [ - "windows-targets", -] - -[[package]] -name = "windows-targets" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" -dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_gnullvm", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc", -] - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" - -[[package]] -name = "windows_i686_gnu" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" - -[[package]] -name = "windows_i686_gnullvm" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" - -[[package]] -name = "windows_i686_msvc" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" diff --git a/scripts/audiomenu/Cargo.toml b/scripts/audiomenu/Cargo.toml deleted file mode 100644 index b4e0aed..0000000 --- a/scripts/audiomenu/Cargo.toml +++ /dev/null @@ -1,18 +0,0 @@ -[package] -name = "audiomenu" -description = "fuzzel script to select the default audio device for pipewire+wireplumber" -version = "0.1.0" -edition = "2021" - -[dependencies] -clap = { version = "4.5.23", features = ["derive", "env"] } -duct = "1.0.0" -miette = { version = "7.4.0", features = ["fancy"] } -serde = { version = "1.0.215", features = ["derive"] } -serde_json = "1.0.133" - -[profile.release] -lto = true -opt-level = 's' -panic = "abort" -strip = true diff --git a/scripts/audiomenu/README.md b/scripts/audiomenu/README.md new file mode 100644 index 0000000..e69de29 diff --git a/scripts/audiomenu/audiomenu.py b/scripts/audiomenu/audiomenu.py new file mode 100644 index 0000000..f9ffe9d --- /dev/null +++ b/scripts/audiomenu/audiomenu.py @@ -0,0 +1,238 @@ +# pyright: strict, reportAny=false +from dataclasses import dataclass +import json +import subprocess +from typing import Self +import typing +import click + + +def expect[T](typ: type[T], value: object) -> T: + if not isinstance(value, typ): + raise ValueError( + f"expected value to be of type {typ} but was of type {type(value)}" + ) + return value + + +@dataclass(slots=True) +class PWNodeProps: + object_id: int + node_description: str + node_name: str + media_class: str + + @classmethod + def from_json(cls, data: dict[str, object]) -> Self: + return cls( + object_id=expect(int, data["object.id"]), + node_description=expect(str, data.get("node.description", "(unknown)")), + node_name=expect(str, data["node.name"]), + media_class=expect(str, data.get("media.class", "(unknown)")), + ) + + +@dataclass(slots=True) +class PWNodeInfo: + props: PWNodeProps + + @classmethod + def from_json(cls, data: dict[str, object]) -> Self: + props = typing.cast(dict[str, object], expect(dict, data["props"])) + return cls(PWNodeProps.from_json(props)) + + +@dataclass(slots=True) +class PWNode: + node_type: str + info: PWNodeInfo | None + + @classmethod + def from_json(cls, data: dict[str, object]) -> Self: + info = data.get("info", None) + if info is not None: + info = PWNodeInfo.from_json( + typing.cast(dict[str, object], expect(dict, info)) + ) + return cls(node_type=expect(str, data["type"]), info=info) + + +@dataclass(slots=True) +class AudioDevice: + id: int + name: str + volume: float + muted: bool + default: bool + + @staticmethod + def get_volume(id: int | str) -> tuple[float, bool]: + wpctl_output = subprocess.run( + ["wpctl", "get-volume", str(id)], + encoding="UTF-8", + check=True, + capture_output=True, + ) + match wpctl_output.stdout.strip().split(sep=" "): + case ["Volume:", value]: + return (float(value), False) + case ["Volume:", value, "[MUTED]"]: + return (float(value), True) + case _: + raise ValueError(f"Unexpected wpctl output: {wpctl_output.stdout}") + + @classmethod + def from_pw_node(cls, node: PWNode, default: str) -> Self: + if node.info is None: + raise ValueError(f"Node is not a valid audio device {node}") + + id = node.info.props.object_id + volume, muted = cls.get_volume(id) + + return cls( + id=id, + name=node.info.props.node_description, + volume=volume, + muted=muted, + default=node.info.props.node_name == default, + ) + + def menu_item(self) -> str: + id = f"id={self.id:<3}" + + if self.default: + id = f"[{id}]" + else: + id = f" {id} " + + if self.muted: + return f"{id} {self.volume:>4.0%} [MUTED] {self.name}" + else: + return f"{id} {self.volume:>4.0%} {self.name}" + + +def get_nodes(data: list[dict[str, object]]) -> list[PWNode]: + def is_audio_node(node: object) -> bool: + if not isinstance(node, dict): + return False + + node = typing.cast(dict[str, object], node) + if node["type"] != "PipeWire:Interface:Node": + return False + info = node.get("info", None) + if info is None or not isinstance(info, dict): + return False + info = typing.cast(dict[str, object], info) + props = info.get("props", None) + if props is None or not isinstance(props, dict): + return False + props = typing.cast(dict[str, object], props) + if (media_class := props.get("media.class", None)) is not None: + return isinstance(media_class, str) and media_class.startswith("Audio") + return False + + return [ + PWNode.from_json(typing.cast(dict[str, object], expect(dict, node))) + for node in data + if is_audio_node(node) + ] + + +def pw_dump() -> list[dict[str, object]]: + dump_output = subprocess.run( + ["pw-dump"], encoding="UTF-8", check=True, capture_output=True + ) + data = json.loads(dump_output.stdout) + return typing.cast(list[dict[str, object]], expect(list, data)) + + +def get_defaults_metadata(data: list[dict[str, object]]) -> list[dict[str, object]]: + return typing.cast( + list[dict[str, object]], + expect( + list, + next( + node + for node in data + if node["type"] == "PipeWire:Interface:Metadata" + and expect(dict, node["props"])["metadata.name"] == "default" + )["metadata"], + ), + ) + + +def get_sinks() -> list[AudioDevice]: + data = pw_dump() + default = next( + typing.cast(dict[str, str], expect(dict, data["value"]))["name"] + for data in get_defaults_metadata(data) + if data["key"] == "default.audio.sink" + ) + return [ + AudioDevice.from_pw_node(node, default) + for node in get_nodes(data) + if node.info is not None and node.info.props.media_class == "Audio/Sink" + ] + + +def get_sources() -> list[AudioDevice]: + data = pw_dump() + default = next( + typing.cast(dict[str, str], expect(dict, data["value"]))["name"] + for data in get_defaults_metadata(data) + if data["key"] == "default.audio.source" + ) + return [ + AudioDevice.from_pw_node(node, default) + for node in get_nodes(data) + if node.info is not None and node.info.props.media_class == "Audio/Source" + ] + + +@click.group(name="audiomenu") +def main() -> None: + pass + + +def select(options: list[str], prompt: str) -> int | None: + menu_output = subprocess.run( + ["fuzzel", "--dmenu", f"--prompt={prompt}"], + input="\n".join(options), + encoding="UTF-8", + capture_output=True, + ) + if menu_output.returncode == 2: + return None + menu_output.check_returncode() + selected = menu_output.stdout.rstrip() + return options.index(selected) + + +@main.command() +def select_sink() -> None: + devices = get_sinks() + selected = select([device.menu_item() for device in devices], prompt="Select Sink>") + if selected is None: + click.echo("No sink selected") + return + + device = devices[selected] + _ = subprocess.run(["wpctl", "set-default", str(device.id)], check=True) + + +@main.command() +def select_source() -> None: + devices = get_sources() + selected = select( + [device.menu_item() for device in devices], prompt="Select Source>" + ) + if selected is None: + click.echo("No source selected") + return + + device = devices[selected] + _ = subprocess.run(["wpctl", "set-default", str(device.id)], check=True) + + +if __name__ == "__main__": + main() diff --git a/scripts/audiomenu/package.nix b/scripts/audiomenu/package.nix index ceb495b..a7415a6 100644 --- a/scripts/audiomenu/package.nix +++ b/scripts/audiomenu/package.nix @@ -1,22 +1,9 @@ -{ - lib, - rustPlatform, - cleanRustSrc, -}: -let - cargoToml = builtins.fromTOML (builtins.readFile ./Cargo.toml); - inherit (cargoToml.package) name version description; - pname = name; - src = cleanRustSrc ./.; -in -rustPlatform.buildRustPackage { - inherit pname version src; - cargoLock.lockFile = ./Cargo.lock; - useNextest = true; - meta = { - inherit description; - license = lib.licenses.mit; - homepage = "https://github.com/jalil-salame/configuration.nix"; - mainProgram = name; - }; -} +{ writers, python3Packages }: +writers.writePython3 "audiomenu" { + libraries = [ python3Packages.click ]; + + flakeIgnore = [ + "E501" # line too long, but I like my code well documented + "W503" # line break before binary operator, ruff does this, I trust it + ]; +} ./audiomenu.py diff --git a/scripts/audiomenu/pyproject.toml b/scripts/audiomenu/pyproject.toml new file mode 100644 index 0000000..6d992a3 --- /dev/null +++ b/scripts/audiomenu/pyproject.toml @@ -0,0 +1,9 @@ +[project] +name = "audiomenu" +version = "0.1.0" +description = "fuzzel script to select the default audio device for pipewire+wireplumber" +readme = "README.md" +requires-python = ">=3.12" +dependencies = [ + "click>=8.1.7", +] diff --git a/scripts/audiomenu/src/main.rs b/scripts/audiomenu/src/main.rs deleted file mode 100644 index a542fd4..0000000 --- a/scripts/audiomenu/src/main.rs +++ /dev/null @@ -1,231 +0,0 @@ -use std::{ - fmt::{Display, Write as _}, - io::{Read, Write as _}, - process::{Command, Stdio}, -}; - -use clap::Parser; -use duct::cmd; -use miette::{bail, Context, IntoDiagnostic, Result}; -use serde::Deserialize; - -fn main() -> Result<()> { - miette::set_panic_hook(); - Opts::parse().run() -} - -/// fuzzel script to select the default audio device for pipewire+wireplumber -#[derive(Debug, Parser)] -struct Opts { - #[clap(subcommand)] - cmd: Cmd, -} - -impl Opts { - fn run(self) -> Result<()> { - self.cmd.run() - } -} - -#[derive(Debug, clap::Subcommand)] -enum Cmd { - /// Select audio sink (speakers/headphones) - SelectSink, - /// Select audio source (microphone) - SelectSource, -} - -impl Cmd { - fn run(self) -> Result<()> { - let id = match self { - Cmd::SelectSink => { - let devices = get_sinks().wrap_err("failed to get sinks")?; - let selected = select( - devices.iter().map(|dev| dev.name.as_ref()), - Some("Select input>"), - ) - .wrap_err("failed to select a default sink")?; - if selected.is_empty() { - eprintln!("did not select a device"); - return Ok(()); - } - let Some(dev) = devices.into_iter().find(|dev| dev.name == selected) else { - bail!("couldn't find a device matching `{selected}`"); - }; - dev.id - } - Cmd::SelectSource => { - let devices = get_sources().wrap_err("failed to get sinks")?; - let selected = select( - devices.iter().map(|dev| dev.name.as_ref()), - Some("Select output>"), - ) - .wrap_err("failed to select a default source")?; - if selected.is_empty() { - eprintln!("did not select a device"); - return Ok(()); - } - let Some(dev) = devices.into_iter().find(|dev| dev.name == selected) else { - bail!("couldn't find a device matching `{selected}`"); - }; - dev.id - } - }; - cmd!("wpctl", "set-default", id.to_string()) - .run() - .map(drop) - .into_diagnostic() - .wrap_err("failed to set default input") - } -} - -#[derive(Debug, Deserialize)] -struct PWNode { - #[serde(rename = "type")] - node_type: Box, - #[serde(default)] - info: PWNodeInfo, - // json ignores the rest of the fields by default -} - -#[derive(Debug, Deserialize, Default)] -struct PWNodeInfo { - props: PWNodeProps, - // json ignores the rest of the fields by default -} - -#[derive(Debug, Deserialize, Default)] -struct PWNodeProps { - #[serde(rename = "object.id")] - object_id: u32, - #[serde(rename = "node.description", default)] - node_description: Box, - #[serde(rename = "media.class", default)] - media_class: Box, - // json ignores the rest of the fields by default -} - -struct AudioDevice { - id: u32, - name: Box, - _side: S, -} - -/// Output (e.g. speakers) -struct AudioSink; - -/// Input (e.g. microphone) -struct AudioSource; - -fn get_sinks() -> Result>> { - get_devices() -} - -fn get_sources() -> Result>> { - get_devices() -} - -fn get_devices() -> Result>> -where - AudioDevice: TryFrom, -{ - Ok(get_nodes()? - .into_iter() - .filter_map(|node| AudioDevice::::try_from(node).ok()) - .collect()) -} - -impl TryFrom for AudioDevice { - type Error = miette::Report; - - fn try_from(value: PWNode) -> std::result::Result { - if value.node_type.as_ref() != "PipeWire:Interface:Node" { - bail!( - "invalid type: `{}`, expected `PipeWire:Interface:Node`", - value.node_type - ) - } - let class = value.info.props.media_class; - match class.as_ref() { - "Audio/Source" => Ok(Self { - id: value.info.props.object_id, - name: value.info.props.node_description, - _side: AudioSource, - }), - _ => bail!("invalid media.class: `{class}`, expected `Audio/Source`"), - } - } -} - -impl TryFrom for AudioDevice { - type Error = miette::Report; - - fn try_from(value: PWNode) -> std::result::Result { - if value.node_type.as_ref() != "PipeWire:Interface:Node" { - bail!( - "invalid type: `{}`, expected `PipeWire:Interface:Node`", - value.node_type - ) - } - let class = value.info.props.media_class; - match class.as_ref() { - "Audio/Sink" => Ok(Self { - id: value.info.props.object_id, - name: value.info.props.node_description, - _side: AudioSink, - }), - _ => bail!("invalid media.class: `{class}`, expected `Audio/Sink`"), - } - } -} - -fn get_nodes() -> Result> { - let dump = cmd!("pw-dump") - .read() - .into_diagnostic() - .wrap_err("failed to get devices with pw-dump")?; - serde_json::from_str(&dump) - .into_diagnostic() - .wrap_err("failed to parse pw-dump output") -} - -fn select(options: It, prompt: Option<&str>) -> Result> -where - T: Display, - It: IntoIterator, -{ - let append_line = |mut s: String, it| { - writeln!(s, "{it}").unwrap(); - s - }; - let options = options.into_iter().fold(String::new(), append_line); - let mut menu = Command::new("fuzzel"); - menu.arg("--dmenu"); - if let Some(prompt) = prompt { - menu.arg(format!("--prompt={prompt}")); - } - Ok(pipe_to_stdin_and_return_stdout(&mut menu, options)? - .trim() - .into()) -} - -fn pipe_to_stdin_and_return_stdout(cmd: &mut Command, data: impl Display) -> Result { - let mut child = cmd - .stdin(Stdio::piped()) - .stdout(Stdio::piped()) - .spawn() - .into_diagnostic() - .wrap_err_with(|| format!("failed to run {cmd:?}"))?; - let mut stdin = child.stdin.take().expect("stdin not piped"); - write!(stdin, "{data}") - .into_diagnostic() - .wrap_err("failed to send data to process' stdin")?; - drop(stdin); - let mut stdout = child.stdout.take().expect("stdout not piped"); - let mut buf = String::new(); - stdout - .read_to_string(&mut buf) - .into_diagnostic() - .wrap_err("failed to retrieve output from process")?; - Ok(buf) -} diff --git a/scripts/audiomenu/uv.lock b/scripts/audiomenu/uv.lock new file mode 100644 index 0000000..1876983 --- /dev/null +++ b/scripts/audiomenu/uv.lock @@ -0,0 +1,34 @@ +version = 1 +requires-python = ">=3.12" + +[[package]] +name = "audiomenu" +version = "0.1.0" +source = { virtual = "." } +dependencies = [ + { name = "click" }, +] + +[package.metadata] +requires-dist = [{ name = "click", specifier = ">=8.1.7" }] + +[[package]] +name = "click" +version = "8.2.0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "colorama", marker = "platform_system == 'Windows'" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/cd/0f/62ca20172d4f87d93cf89665fbaedcd560ac48b465bd1d92bfc7ea6b0a41/click-8.2.0.tar.gz", hash = "sha256:f5452aeddd9988eefa20f90f05ab66f17fce1ee2a36907fd30b05bbb5953814d", size = 235857 } +wheels = [ + { url = "https://files.pythonhosted.org/packages/a2/58/1f37bf81e3c689cc74ffa42102fa8915b59085f54a6e4a80bc6265c0f6bf/click-8.2.0-py3-none-any.whl", hash = "sha256:6b303f0b2aa85f1cb4e5303078fadcbcd4e476f114fab9b5007005711839325c", size = 102156 }, +] + +[[package]] +name = "colorama" +version = "0.4.6" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/d8/53/6f443c9a4a8358a93a6792e2acffb9d9d5cb0a5cfd8802644b7b1c9a02e4/colorama-0.4.6.tar.gz", hash = "sha256:08695f5cb7ed6e0531a20572697297273c47b8cae5a63ffc6d6ed5c201be6e44", size = 27697 } +wheels = [ + { url = "https://files.pythonhosted.org/packages/d1/d6/3965ed04c63042e047cb6a3e6ed1a63a35087b6a609aa3a15ed8ac56c221/colorama-0.4.6-py2.py3-none-any.whl", hash = "sha256:4f1d9991f5acc0ca119f9d443620b77f9d6b33703e51011c16baf57afb285fc6", size = 25335 }, +] diff --git a/scripts/default.nix b/scripts/default.nix index 0152c68..5cde95c 100644 --- a/scripts/default.nix +++ b/scripts/default.nix @@ -1,38 +1,7 @@ -{ lib, ... }: let - # Clean the package source leaving only the relevant rust files - cleanRustSrc = - pname: src: - lib.cleanSourceWith { - inherit src; - name = "${pname}-source"; - # Adapted from - # no need to pull in crane for just this - filter = - orig_path: type: - let - path_str = toString orig_path; - base = baseNameOf path_str; - parentDir = baseNameOf (dirOf path_str); - matchesSuffix = lib.any (suffix: lib.hasSuffix suffix base) [ - # Rust sources - ".rs" - # TOML files are often used to configure cargo based tools (e.g. .cargo/config.toml) - ".toml" - ]; - isCargoLock = base == "Cargo.lock"; - # .cargo/config.toml is captured above - isOldStyleCargoConfig = parentDir == ".cargo" && base == "config"; - in - type == "directory" || matchesSuffix || isCargoLock || isOldStyleCargoConfig; - }; - # callPackage but for my rust Packages - callRustPackage = - pkgs: pname: nixSrc: - pkgs.callPackage nixSrc { cleanRustSrc = cleanRustSrc pname; }; packages = pkgs: { jpassmenu = pkgs.callPackage ./jpassmenu/package.nix { }; - audiomenu = callRustPackage pkgs "audiomenu" ./audiomenu/package.nix; + audiomenu = pkgs.callPackage ./audiomenu/package.nix { }; }; in { From bca776687f1e2ce03f6f6bcb7b59df1ec3f7ffe0 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Sat, 17 May 2025 18:10:22 +0200 Subject: [PATCH 107/168] chore(deps): update python docker tag to v3.13 | datasource | package | from | to | | ---------- | ------- | ---- | ---- | | docker | python | 3.12 | 3.13 | --- scripts/audiomenu/.python-version | 2 +- scripts/jpassmenu/.python-version | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/audiomenu/.python-version b/scripts/audiomenu/.python-version index e4fba21..24ee5b1 100644 --- a/scripts/audiomenu/.python-version +++ b/scripts/audiomenu/.python-version @@ -1 +1 @@ -3.12 +3.13 diff --git a/scripts/jpassmenu/.python-version b/scripts/jpassmenu/.python-version index e4fba21..24ee5b1 100644 --- a/scripts/jpassmenu/.python-version +++ b/scripts/jpassmenu/.python-version @@ -1 +1 @@ -3.12 +3.13 From 2410b3fe2aca5d1fd06d0fb965d6ddb0cea23012 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jalil=20David=20Salam=C3=A9=20Messina?= Date: Mon, 19 May 2025 22:59:11 +0200 Subject: [PATCH 108/168] feat: update to nixos-25.05 (beta) Iron out the issues before it releases. --- flake.lock | 87 ++++++++++++++++-------- flake.nix | 9 +-- modules/hm/default.nix | 2 +- modules/hm/gui/default.nix | 117 ++++++++++++++++++++++++++------- scripts/audiomenu/audiomenu.py | 6 +- 5 files changed, 162 insertions(+), 59 deletions(-) diff --git a/flake.lock b/flake.lock index b174152..75f1fef 100644 --- a/flake.lock +++ b/flake.lock @@ -205,16 +205,16 @@ "gnome-shell": { "flake": false, "locked": { - "lastModified": 1732369855, - "narHash": "sha256-JhUWbcYPjHO3Xs3x9/Z9RuqXbcp5yhPluGjwsdE2GMg=", + "lastModified": 1744584021, + "narHash": "sha256-0RJ4mJzf+klKF4Fuoc8VN8dpQQtZnKksFmR2jhWE1Ew=", "owner": "GNOME", "repo": "gnome-shell", - "rev": "dadd58f630eeea41d645ee225a63f719390829dc", + "rev": "52c517c8f6c199a1d6f5118fae500ef69ea845ae", "type": "github" }, "original": { "owner": "GNOME", - "ref": "47.2", + "ref": "48.1", "repo": "gnome-shell", "type": "github" } @@ -226,16 +226,16 @@ ] }, "locked": { - "lastModified": 1747331121, - "narHash": "sha256-3MmiUN/jOHBHQUnjqzg6qKArc17j2OS6jisEppDY4g8=", + "lastModified": 1747556831, + "narHash": "sha256-Qb84nbYFFk0DzFeqVoHltS2RodAYY5/HZQKE8WnBDsc=", "owner": "nix-community", "repo": "home-manager", - "rev": "1eec32f0efe3b830927989767a9e6ece0d82d608", + "rev": "d0bbd221482c2713cccb80220f3c9d16a6e20a33", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-24.11", + "ref": "release-25.05", "repo": "home-manager", "type": "github" } @@ -303,15 +303,15 @@ }, "nixpkgs": { "locked": { - "lastModified": 1747297572, - "narHash": "sha256-ENc1vQNViytxvo9FN/0bIkOcyge7VDJ4umqnPCpVVbc=", - "rev": "5d736263df906c5da72ab0f372427814de2f52f8", + "lastModified": 1747672794, + "narHash": "sha256-O+9sQ6QEoKcM/lJXDumDdUZbuxs2TMuBf7xi3ivOXCo=", + "rev": "ca49c4304acf0973078db0a9d200fd2bae75676d", "type": "tarball", - "url": "https://releases.nixos.org/nixos/24.11/nixos-24.11.717921.5d736263df90/nixexprs.tar.xz?rev=5d736263df906c5da72ab0f372427814de2f52f8" + "url": "https://releases.nixos.org/nixos/25.05/nixos-25.05beta801800.ca49c4304acf/nixexprs.tar.xz?rev=ca49c4304acf0973078db0a9d200fd2bae75676d" }, "original": { "type": "tarball", - "url": "https://channels.nixos.org/nixos-24.11/nixexprs.tar.xz" + "url": "https://channels.nixos.org/nixos-25.05/nixexprs.tar.xz" } }, "nixvim": { @@ -388,9 +388,8 @@ "base16-vim": "base16-vim", "firefox-gnome-theme": "firefox-gnome-theme", "flake-compat": [], - "flake-utils": [ - "lix-module", - "flake-utils" + "flake-parts": [ + "flake-parts" ], "git-hooks": "git-hooks", "gnome-shell": "gnome-shell", @@ -400,24 +399,27 @@ "nixpkgs": [ "nixpkgs" ], + "nur": [], "systems": [ "systems" ], "tinted-foot": "tinted-foot", "tinted-kitty": "tinted-kitty", - "tinted-tmux": "tinted-tmux" + "tinted-schemes": "tinted-schemes", + "tinted-tmux": "tinted-tmux", + "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1746143246, - "narHash": "sha256-O8rZjqJUIkUva66XTOZy0wcgfBP2eaxU9+Xt7ZHtfhI=", - "owner": "danth", + "lastModified": 1747675820, + "narHash": "sha256-Z8o3Tu/FN4GOtZl4WNY0Gcp/Uzuz06ILkRy0oPVteM0=", + "owner": "nix-community", "repo": "stylix", - "rev": "20ace60f9cb5e179cb2256abaee505780df8e804", + "rev": "f8833c5e0c64287cd51a27e6061a88f4225b6b70", "type": "github" }, "original": { - "owner": "danth", - "ref": "release-24.11", + "owner": "nix-community", + "ref": "master", "repo": "stylix", "type": "github" } @@ -457,17 +459,32 @@ "tinted-kitty": { "flake": false, "locked": { - "lastModified": 1716423189, - "narHash": "sha256-2xF3sH7UIwegn+2gKzMpFi3pk5DlIlM18+vj17Uf82U=", + "lastModified": 1735730497, + "narHash": "sha256-4KtB+FiUzIeK/4aHCKce3V9HwRvYaxX+F1edUrfgzb8=", "owner": "tinted-theming", "repo": "tinted-kitty", - "rev": "eb39e141db14baef052893285df9f266df041ff8", + "rev": "de6f888497f2c6b2279361bfc790f164bfd0f3fa", "type": "github" }, "original": { "owner": "tinted-theming", "repo": "tinted-kitty", - "rev": "eb39e141db14baef052893285df9f266df041ff8", + "type": "github" + } + }, + "tinted-schemes": { + "flake": false, + "locked": { + "lastModified": 1747207144, + "narHash": "sha256-pHfbM7mF2mF1beycGAmA+7Jt+vmJ2reU7BvRfKURyaY=", + "owner": "tinted-theming", + "repo": "schemes", + "rev": "8c00a361a99b6d356db9572240053a3f8716ea68", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "schemes", "type": "github" } }, @@ -487,6 +504,22 @@ "type": "github" } }, + "tinted-zed": { + "flake": false, + "locked": { + "lastModified": 1725758778, + "narHash": "sha256-8P1b6mJWyYcu36WRlSVbuj575QWIFZALZMTg5ID/sM4=", + "owner": "tinted-theming", + "repo": "base16-zed", + "rev": "122c9e5c0e6f27211361a04fae92df97940eccf9", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "base16-zed", + "type": "github" + } + }, "treefmt-nix": { "inputs": { "nixpkgs": [ diff --git a/flake.nix b/flake.nix index e35886f..2030f58 100644 --- a/flake.nix +++ b/flake.nix @@ -8,7 +8,7 @@ # Flake inputs inputs = { - nixpkgs.url = "https://channels.nixos.org/nixos-24.11/nixexprs.tar.xz"; + nixpkgs.url = "https://channels.nixos.org/nixos-25.05/nixexprs.tar.xz"; unstable.url = "https://channels.nixos.org/nixos-unstable/nixexprs.tar.xz"; # Lix lix-module = { @@ -20,15 +20,16 @@ }; # Modules home-manager = { - url = "github:nix-community/home-manager/release-24.11"; + url = "github:nix-community/home-manager/release-25.05"; inputs.nixpkgs.follows = "nixpkgs"; }; stylix = { - url = "github:danth/stylix/release-24.11"; + url = "github:nix-community/stylix/master"; # FIXME: pin to 25.05 once released inputs = { nixpkgs.follows = "nixpkgs"; - flake-utils.follows = "lix-module/flake-utils"; + flake-parts.follows = "flake-parts"; systems.follows = "systems"; + nur.follows = ""; home-manager.follows = "home-manager"; # disable optional inputs diff --git a/modules/hm/default.nix b/modules/hm/default.nix index e7e67c7..98cb89a 100644 --- a/modules/hm/default.nix +++ b/modules/hm/default.nix @@ -108,7 +108,7 @@ in gpg-agent = { enable = true; maxCacheTtl = 86400; - pinentryPackage = if config.jhome.gui.enable then pkgs.pinentry-qt else pkgs.pinentry-curses; + pinentry.package = if config.jhome.gui.enable then pkgs.pinentry-qt else pkgs.pinentry-curses; extraConfig = "allow-preset-passphrase"; }; # Delete old generations (>month) diff --git a/modules/hm/gui/default.nix b/modules/hm/gui/default.nix index 75d6cea..cd4ab93 100644 --- a/modules/hm/gui/default.nix +++ b/modules/hm/gui/default.nix @@ -13,6 +13,7 @@ let cfg = jhome.gui; cursor = { package = pkgs.nordzy-cursor-theme; + size = 48; name = "Nordzy-cursors"; }; iconTheme = { @@ -27,20 +28,18 @@ in ]; config = lib.mkIf (jhome.enable && cfg.enable) { - home.packages = - (with pkgs; [ - webcord - ferdium - xournalpp - signal-desktop - pcmanfm - wl-clipboard - # Extra fonts - noto-fonts-cjk-sans # Chinese, Japanese and Korean characters - noto-fonts-cjk-serif # Chinese, Japanese and Korean characters - (nerdfonts.override { fonts = [ "NerdFontsSymbolsOnly" ]; }) - ]) - ++ lib.optional flatpakEnabled pkgs.flatpak; + home.packages = [ + pkgs.webcord + pkgs.ferdium + pkgs.xournalpp + pkgs.signal-desktop + pkgs.pcmanfm + pkgs.wl-clipboard + # Extra fonts + pkgs.noto-fonts-cjk-sans # Chinese, Japanese and Korean characters + pkgs.noto-fonts-cjk-serif # Chinese, Japanese and Korean characters + pkgs.nerd-fonts.symbols-only + ] ++ lib.optional flatpakEnabled pkgs.flatpak; fonts.fontconfig = { enable = true; defaultFonts = lib.mkIf config.jhome.styling.enable { @@ -61,7 +60,75 @@ in }; # Browser programs = { - firefox.enable = true; + firefox = { + enable = true; + profiles."${config.home.username}" = { + search = { + engines = + let + queryParam = name: value: { inherit name value; }; + in + { + # Add search.nixos.org as search engines + nix-packages = { + name = "Nix Packages"; + urls = [ + { + template = "https://search.nixos.org/packages"; + params = [ + (queryParam "type" "packages") + (queryParam "query" "{searchTerms}") + ]; + } + ]; + + icon = "${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg"; + definedAliases = [ + "@np" + "@nixpackages" + ]; + }; + + nixos-options = { + name = "NixOS Options"; + urls = [ + { + template = "https://search.nixos.org/options"; + params = [ + (queryParam "type" "packages") + (queryParam "query" "{searchTerms}") + ]; + } + ]; + + icon = "${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg"; + definedAliases = [ + "@no" + "@nixopts" + ]; + }; + + nixos-wiki = { + name = "NixOS Wiki"; + urls = [ + { + template = "https://wiki.nixos.org/w/index.php"; + params = [ (queryParam "search" "{searchTerms}") ]; + } + ]; + iconMapObj."16" = "https://wiki.nixos.org/favicon.ico"; + definedAliases = [ + "@nw" + "@nixwiki" + ]; + }; + + # hide bing + bing.metaData.hidden = true; + }; + }; + }; + }; # Dynamic Menu fuzzel = { enable = true; @@ -148,14 +215,19 @@ in # Notifications mako = { enable = true; - layer = "overlay"; - borderRadius = 8; - defaultTimeout = 15000; + settings = { + layer = "overlay"; + border-radius = 8; + default-timeout = 15000; + }; }; }; - # Set cursor style - stylix = lib.mkIf config.jhome.styling.enable { inherit cursor; }; + stylix = lib.mkIf config.jhome.styling.enable { + # Set cursor style + inherit cursor; + targets.firefox.profileNames = [ config.home.username ]; + }; home.pointerCursor = lib.mkIf config.jhome.styling.enable ( lib.mkDefault { gtk.enable = true; @@ -170,10 +242,7 @@ in gtk4.extraConfig.gtk-application-prefer-dark-theme = 1; }; # Set Qt theme - qt = lib.mkIf config.jhome.styling.enable { - enable = true; - platformTheme.name = "gtk"; - }; + qt = lib.mkIf config.jhome.styling.enable { enable = true; }; xdg.systemDirs.data = [ "/usr/share" diff --git a/scripts/audiomenu/audiomenu.py b/scripts/audiomenu/audiomenu.py index f9ffe9d..88fe671 100644 --- a/scripts/audiomenu/audiomenu.py +++ b/scripts/audiomenu/audiomenu.py @@ -7,10 +7,10 @@ import typing import click -def expect[T](typ: type[T], value: object) -> T: - if not isinstance(value, typ): +def expect[T](type_: type[T], value: object) -> T: + if not isinstance(value, type_): raise ValueError( - f"expected value to be of type {typ} but was of type {type(value)}" + f"expected value to be of type {type_} but was of type {type(value)}" ) return value From 873d1d706ff64c91833c15cd0c5e2c9e68f81965 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jalil=20David=20Salam=C3=A9=20Messina?= Date: Tue, 20 May 2025 09:58:16 +0200 Subject: [PATCH 109/168] fix(dependabot): remove uv.lock files We don't use them and dependabot chokes on them. --- scripts/audiomenu/uv.lock | 34 ---------------------------------- scripts/jpassmenu/uv.lock | 34 ---------------------------------- 2 files changed, 68 deletions(-) delete mode 100644 scripts/audiomenu/uv.lock delete mode 100644 scripts/jpassmenu/uv.lock diff --git a/scripts/audiomenu/uv.lock b/scripts/audiomenu/uv.lock deleted file mode 100644 index 1876983..0000000 --- a/scripts/audiomenu/uv.lock +++ /dev/null @@ -1,34 +0,0 @@ -version = 1 -requires-python = ">=3.12" - -[[package]] -name = "audiomenu" -version = "0.1.0" -source = { virtual = "." } -dependencies = [ - { name = "click" }, -] - -[package.metadata] -requires-dist = [{ name = "click", specifier = ">=8.1.7" }] - -[[package]] -name = "click" -version = "8.2.0" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "colorama", marker = "platform_system == 'Windows'" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/cd/0f/62ca20172d4f87d93cf89665fbaedcd560ac48b465bd1d92bfc7ea6b0a41/click-8.2.0.tar.gz", hash = "sha256:f5452aeddd9988eefa20f90f05ab66f17fce1ee2a36907fd30b05bbb5953814d", size = 235857 } -wheels = [ - { url = "https://files.pythonhosted.org/packages/a2/58/1f37bf81e3c689cc74ffa42102fa8915b59085f54a6e4a80bc6265c0f6bf/click-8.2.0-py3-none-any.whl", hash = "sha256:6b303f0b2aa85f1cb4e5303078fadcbcd4e476f114fab9b5007005711839325c", size = 102156 }, -] - -[[package]] -name = "colorama" -version = "0.4.6" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/d8/53/6f443c9a4a8358a93a6792e2acffb9d9d5cb0a5cfd8802644b7b1c9a02e4/colorama-0.4.6.tar.gz", hash = "sha256:08695f5cb7ed6e0531a20572697297273c47b8cae5a63ffc6d6ed5c201be6e44", size = 27697 } -wheels = [ - { url = "https://files.pythonhosted.org/packages/d1/d6/3965ed04c63042e047cb6a3e6ed1a63a35087b6a609aa3a15ed8ac56c221/colorama-0.4.6-py2.py3-none-any.whl", hash = "sha256:4f1d9991f5acc0ca119f9d443620b77f9d6b33703e51011c16baf57afb285fc6", size = 25335 }, -] diff --git a/scripts/jpassmenu/uv.lock b/scripts/jpassmenu/uv.lock deleted file mode 100644 index 55d4696..0000000 --- a/scripts/jpassmenu/uv.lock +++ /dev/null @@ -1,34 +0,0 @@ -version = 1 -requires-python = ">=3.12" - -[[package]] -name = "click" -version = "8.2.0" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "colorama", marker = "platform_system == 'Windows'" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/cd/0f/62ca20172d4f87d93cf89665fbaedcd560ac48b465bd1d92bfc7ea6b0a41/click-8.2.0.tar.gz", hash = "sha256:f5452aeddd9988eefa20f90f05ab66f17fce1ee2a36907fd30b05bbb5953814d", size = 235857 } -wheels = [ - { url = "https://files.pythonhosted.org/packages/a2/58/1f37bf81e3c689cc74ffa42102fa8915b59085f54a6e4a80bc6265c0f6bf/click-8.2.0-py3-none-any.whl", hash = "sha256:6b303f0b2aa85f1cb4e5303078fadcbcd4e476f114fab9b5007005711839325c", size = 102156 }, -] - -[[package]] -name = "colorama" -version = "0.4.6" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/d8/53/6f443c9a4a8358a93a6792e2acffb9d9d5cb0a5cfd8802644b7b1c9a02e4/colorama-0.4.6.tar.gz", hash = "sha256:08695f5cb7ed6e0531a20572697297273c47b8cae5a63ffc6d6ed5c201be6e44", size = 27697 } -wheels = [ - { url = "https://files.pythonhosted.org/packages/d1/d6/3965ed04c63042e047cb6a3e6ed1a63a35087b6a609aa3a15ed8ac56c221/colorama-0.4.6-py2.py3-none-any.whl", hash = "sha256:4f1d9991f5acc0ca119f9d443620b77f9d6b33703e51011c16baf57afb285fc6", size = 25335 }, -] - -[[package]] -name = "jpassmenu" -version = "0.1.0" -source = { virtual = "." } -dependencies = [ - { name = "click" }, -] - -[package.metadata] -requires-dist = [{ name = "click", specifier = ">=8.2.0" }] From 8e7658b885c2b0b45f1f9478f80487965fbb3c2a Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Tue, 20 May 2025 11:10:14 +0200 Subject: [PATCH 110/168] chore(deps): lock file maintenance --- flake.lock | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/flake.lock b/flake.lock index 75f1fef..e6c64b6 100644 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "fromYaml": "fromYaml" }, "locked": { - "lastModified": 1745523430, - "narHash": "sha256-EAYWV+kXbwsH+8G/8UtmcunDeKwLwSOyfcmzZUkWE/c=", + "lastModified": 1746562888, + "narHash": "sha256-YgNJQyB5dQiwavdDFBMNKk1wyS77AtdgDk/VtU6wEaI=", "owner": "SenchoPens", "repo": "base16.nix", - "rev": "58bfe2553d937d8af0564f79d5b950afbef69717", + "rev": "806a1777a5db2a1ef9d5d6f493ef2381047f2b89", "type": "github" }, "original": { @@ -70,11 +70,11 @@ "firefox-gnome-theme": { "flake": false, "locked": { - "lastModified": 1743774811, - "narHash": "sha256-oiHLDHXq7ymsMVYSg92dD1OLnKLQoU/Gf2F1GoONLCE=", + "lastModified": 1744642301, + "narHash": "sha256-5A6LL7T0lttn1vrKsNOKUk9V0ittdW0VEqh6AtefxJ4=", "owner": "rafaelmardojai", "repo": "firefox-gnome-theme", - "rev": "df53a7a31872faf5ca53dd0730038a62ec63ca9e", + "rev": "59e3de00f01e5adb851d824cf7911bd90c31083a", "type": "github" }, "original": { @@ -328,11 +328,11 @@ ] }, "locked": { - "lastModified": 1747224967, - "narHash": "sha256-we27kbNAAEeT0+PxJ2aUNVFXlJ7uvh4pxTc3R8RUqxA=", + "lastModified": 1747683610, + "narHash": "sha256-Jis9/4lnr3pn1AIRgCnoeiReKs2MGy6COWc6JtAEESo=", "owner": "nix-community", "repo": "nixvim", - "rev": "95ca65c8d1adee5594bd14f527c68d564fb68879", + "rev": "14c7f5f8968940d1730b5e935dd1d9f3e461a2d3", "type": "github" }, "original": { @@ -475,11 +475,11 @@ "tinted-schemes": { "flake": false, "locked": { - "lastModified": 1747207144, - "narHash": "sha256-pHfbM7mF2mF1beycGAmA+7Jt+vmJ2reU7BvRfKURyaY=", + "lastModified": 1744974599, + "narHash": "sha256-Fg+rdGs5FAgfkYNCs74lnl8vkQmiZVdBsziyPhVqrlY=", "owner": "tinted-theming", "repo": "schemes", - "rev": "8c00a361a99b6d356db9572240053a3f8716ea68", + "rev": "28c26a621123ad4ebd5bbfb34ab39421c0144bdd", "type": "github" }, "original": { @@ -491,11 +491,11 @@ "tinted-tmux": { "flake": false, "locked": { - "lastModified": 1743296873, - "narHash": "sha256-8IQulrb1OBSxMwdKijO9fB70ON//V32dpK9Uioy7FzY=", + "lastModified": 1745111349, + "narHash": "sha256-udV+nHdpqgkJI9D0mtvvAzbqubt9jdifS/KhTTbJ45w=", "owner": "tinted-theming", "repo": "tinted-tmux", - "rev": "af5152c8d7546dfb4ff6df94080bf5ff54f64e3a", + "rev": "e009f18a01182b63559fb28f1c786eb027c3dee9", "type": "github" }, "original": { @@ -527,11 +527,11 @@ ] }, "locked": { - "lastModified": 1747417995, - "narHash": "sha256-3WY1yVTcS9Vi6vmBjWsNTG6IYDs/ybu2xAQykdeE22k=", + "lastModified": 1747469671, + "narHash": "sha256-bo1ptiFoNqm6m1B2iAhJmWCBmqveLVvxom6xKmtuzjg=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "42dd9289571ae3c6884af9885b1a7432e3278f92", + "rev": "ab0378b61b0d85e73a8ab05d5c6029b5bd58c9fb", "type": "github" }, "original": { @@ -542,11 +542,11 @@ }, "unstable": { "locked": { - "lastModified": 1747275534, - "narHash": "sha256-isj7Hlm5+PuoyyfVWOWgv52WXaKV6QgegYr9UKjBeQ4=", - "rev": "adaa24fbf46737f3f1b5497bf64bae750f82942e", + "lastModified": 1747598443, + "narHash": "sha256-Gec67rXs7qwrC1nTfyXRN1m/SL/qqY8A3eRYuK/5ADg=", + "rev": "292fa7d4f6519c074f0a50394dbbe69859bb6043", "type": "tarball", - "url": "https://releases.nixos.org/nixos/unstable/nixos-25.05pre799423.adaa24fbf467/nixexprs.tar.xz?rev=adaa24fbf46737f3f1b5497bf64bae750f82942e" + "url": "https://releases.nixos.org/nixos/unstable/nixos-25.11pre802366.292fa7d4f651/nixexprs.tar.xz?rev=292fa7d4f6519c074f0a50394dbbe69859bb6043" }, "original": { "type": "tarball", From 49920bfe57eefd783e856d7be16c6ee018d03d76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jalil=20David=20Salam=C3=A9=20Messina?= Date: Tue, 20 May 2025 22:05:06 +0200 Subject: [PATCH 111/168] fix(zellij): disable the startup tips dialogue I don't need it and its extra friction. --- modules/hm/gui/default.nix | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/modules/hm/gui/default.nix b/modules/hm/gui/default.nix index cd4ab93..4833619 100644 --- a/modules/hm/gui/default.nix +++ b/modules/hm/gui/default.nix @@ -176,13 +176,16 @@ 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"; + settings = { + show_startup_tips = false; # disable the startup tips dialogue + default_shell = + if config.programs.fish.enable then + "fish" + else if config.programs.zsh.enable then + "zsh" + else + "bash"; + }; }; # PDF reader zathura.enable = true; From 65f41fef0f87302b231ad9d8f32966eabf267952 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Wed, 21 May 2025 00:00:14 +0200 Subject: [PATCH 112/168] chore(deps): lock file maintenance --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index e6c64b6..b0f3270 100644 --- a/flake.lock +++ b/flake.lock @@ -328,11 +328,11 @@ ] }, "locked": { - "lastModified": 1747683610, - "narHash": "sha256-Jis9/4lnr3pn1AIRgCnoeiReKs2MGy6COWc6JtAEESo=", + "lastModified": 1747743401, + "narHash": "sha256-AXk6mf9ySe44faNUGhD1mZud/kB7X+Nipzo2YxHet4s=", "owner": "nix-community", "repo": "nixvim", - "rev": "14c7f5f8968940d1730b5e935dd1d9f3e461a2d3", + "rev": "47dba84e0d068a2b8c07faa0ec737ea98a226537", "type": "github" }, "original": { @@ -410,11 +410,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1747675820, - "narHash": "sha256-Z8o3Tu/FN4GOtZl4WNY0Gcp/Uzuz06ILkRy0oPVteM0=", + "lastModified": 1747769259, + "narHash": "sha256-UGfeK8/iUZVWDOYdEpbcbt0liTRIDNNepVzKzWPp6Zc=", "owner": "nix-community", "repo": "stylix", - "rev": "f8833c5e0c64287cd51a27e6061a88f4225b6b70", + "rev": "69b3dd05e6b64c71a10fb749b5ac4d7c8e40f720", "type": "github" }, "original": { From 7c76072ba2c27f3cc2a8268b61b41bc8cd3bffba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jalil=20David=20Salam=C3=A9=20Messina?= Date: Wed, 21 May 2025 08:35:46 +0200 Subject: [PATCH 113/168] fix(stylix): pin to 25.05 The branch is now available. --- flake.lock | 8 ++++---- flake.nix | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/flake.lock b/flake.lock index b0f3270..c55a0aa 100644 --- a/flake.lock +++ b/flake.lock @@ -410,16 +410,16 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1747769259, - "narHash": "sha256-UGfeK8/iUZVWDOYdEpbcbt0liTRIDNNepVzKzWPp6Zc=", + "lastModified": 1747768578, + "narHash": "sha256-OR+XE+Js/kc7/tUxrjUSoDkAEbQXZ3QTEsyC5sgWzzw=", "owner": "nix-community", "repo": "stylix", - "rev": "69b3dd05e6b64c71a10fb749b5ac4d7c8e40f720", + "rev": "0aef18c27d67ca241df888ed8abc36ee6fbb5a47", "type": "github" }, "original": { "owner": "nix-community", - "ref": "master", + "ref": "release-25.05", "repo": "stylix", "type": "github" } diff --git a/flake.nix b/flake.nix index 2030f58..d4c836b 100644 --- a/flake.nix +++ b/flake.nix @@ -24,7 +24,7 @@ inputs.nixpkgs.follows = "nixpkgs"; }; stylix = { - url = "github:nix-community/stylix/master"; # FIXME: pin to 25.05 once released + url = "github:nix-community/stylix/release-25.05"; inputs = { nixpkgs.follows = "nixpkgs"; flake-parts.follows = "flake-parts"; From bea499a914c779ef8aeeebedef74fea3ae232006 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jalil=20David=20Salam=C3=A9=20Messina?= Date: Wed, 21 May 2025 09:01:20 +0200 Subject: [PATCH 114/168] fix(scripts): use writePython3Bin Otherwise the paths to the binaries are wrong --- scripts/audiomenu/package.nix | 2 +- scripts/jpassmenu/package.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/audiomenu/package.nix b/scripts/audiomenu/package.nix index a7415a6..45a5a3b 100644 --- a/scripts/audiomenu/package.nix +++ b/scripts/audiomenu/package.nix @@ -1,5 +1,5 @@ { writers, python3Packages }: -writers.writePython3 "audiomenu" { +writers.writePython3Bin "audiomenu" { libraries = [ python3Packages.click ]; flakeIgnore = [ diff --git a/scripts/jpassmenu/package.nix b/scripts/jpassmenu/package.nix index b74c27e..6fbfbbd 100644 --- a/scripts/jpassmenu/package.nix +++ b/scripts/jpassmenu/package.nix @@ -1,5 +1,5 @@ { writers, python3Packages }: -writers.writePython3 "jpassmenu" { +writers.writePython3Bin "jpassmenu" { libraries = [ python3Packages.click ]; # line too long, but I like my code well documented flakeIgnore = [ "E501" ]; From 17f7a45a19186c64e2784f743031a9dd61b35da0 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Thu, 22 May 2025 00:00:26 +0200 Subject: [PATCH 115/168] chore(deps): lock file maintenance --- flake.lock | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/flake.lock b/flake.lock index c55a0aa..1703309 100644 --- a/flake.lock +++ b/flake.lock @@ -303,11 +303,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1747672794, - "narHash": "sha256-O+9sQ6QEoKcM/lJXDumDdUZbuxs2TMuBf7xi3ivOXCo=", - "rev": "ca49c4304acf0973078db0a9d200fd2bae75676d", + "lastModified": 1747853442, + "narHash": "sha256-ghsAblp8zRC/CoJka4nDWt8My3ps3MyomTIC99m7Cp4=", + "rev": "cd2812de55cf87df88a9e09bf3be1ce63d50c1a6", "type": "tarball", - "url": "https://releases.nixos.org/nixos/25.05/nixos-25.05beta801800.ca49c4304acf/nixexprs.tar.xz?rev=ca49c4304acf0973078db0a9d200fd2bae75676d" + "url": "https://releases.nixos.org/nixos/25.05/nixos-25.05beta802025.cd2812de55cf/nixexprs.tar.xz?rev=cd2812de55cf87df88a9e09bf3be1ce63d50c1a6" }, "original": { "type": "tarball", @@ -328,11 +328,11 @@ ] }, "locked": { - "lastModified": 1747743401, - "narHash": "sha256-AXk6mf9ySe44faNUGhD1mZud/kB7X+Nipzo2YxHet4s=", + "lastModified": 1747845951, + "narHash": "sha256-wTmZS30RIM6ELx9JFH5XSI5bjI4GzjtpodjHTSZBY3g=", "owner": "nix-community", "repo": "nixvim", - "rev": "47dba84e0d068a2b8c07faa0ec737ea98a226537", + "rev": "7e3a0f4e97c0906a276a860975888db96106b75e", "type": "github" }, "original": { @@ -410,11 +410,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1747768578, - "narHash": "sha256-OR+XE+Js/kc7/tUxrjUSoDkAEbQXZ3QTEsyC5sgWzzw=", + "lastModified": 1747864786, + "narHash": "sha256-lJGjKGlA0g/GhgYfZnZ8qiSt5ZVPZxpuSesaxoc3eBE=", "owner": "nix-community", "repo": "stylix", - "rev": "0aef18c27d67ca241df888ed8abc36ee6fbb5a47", + "rev": "dab1e51d6adc3b3bbb9de40ef648fb8904e5438a", "type": "github" }, "original": { @@ -542,11 +542,11 @@ }, "unstable": { "locked": { - "lastModified": 1747598443, - "narHash": "sha256-Gec67rXs7qwrC1nTfyXRN1m/SL/qqY8A3eRYuK/5ADg=", - "rev": "292fa7d4f6519c074f0a50394dbbe69859bb6043", + "lastModified": 1747794093, + "narHash": "sha256-70Oy39tEBH6YRE4tFjEO9+ioH4C2kUTTybpXc67phd8=", + "rev": "2795c506fe8fb7b03c36ccb51f75b6df0ab2553f", "type": "tarball", - "url": "https://releases.nixos.org/nixos/unstable/nixos-25.11pre802366.292fa7d4f651/nixexprs.tar.xz?rev=292fa7d4f6519c074f0a50394dbbe69859bb6043" + "url": "https://releases.nixos.org/nixos/unstable/nixos-25.11pre803506.2795c506fe8f/nixexprs.tar.xz?rev=2795c506fe8fb7b03c36ccb51f75b6df0ab2553f" }, "original": { "type": "tarball", From 70dda80681faf83c1f433d08ca93fc72f9beb9cb Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Thu, 22 May 2025 00:10:13 +0200 Subject: [PATCH 116/168] chore(deps): lock file maintenance --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 1703309..b39d476 100644 --- a/flake.lock +++ b/flake.lock @@ -410,11 +410,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1747864786, - "narHash": "sha256-lJGjKGlA0g/GhgYfZnZ8qiSt5ZVPZxpuSesaxoc3eBE=", + "lastModified": 1747865146, + "narHash": "sha256-tnVWlU+4zANzrLpFYJXpkMsdRYk3DD1iXJbv5hIMdRE=", "owner": "nix-community", "repo": "stylix", - "rev": "dab1e51d6adc3b3bbb9de40ef648fb8904e5438a", + "rev": "1020d8dd9f0ce9eaf0b409552e71eb36a9428cca", "type": "github" }, "original": { From ddc1c4aaae29f33291de2d68df260566f2810483 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Fri, 23 May 2025 00:00:20 +0200 Subject: [PATCH 117/168] chore(deps): lock file maintenance --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index b39d476..5cf8ebe 100644 --- a/flake.lock +++ b/flake.lock @@ -328,11 +328,11 @@ ] }, "locked": { - "lastModified": 1747845951, - "narHash": "sha256-wTmZS30RIM6ELx9JFH5XSI5bjI4GzjtpodjHTSZBY3g=", + "lastModified": 1747945641, + "narHash": "sha256-Ts16c+kptbC3YDwPcB/NqXFVMHPNYKeFD7LkiawbWCU=", "owner": "nix-community", "repo": "nixvim", - "rev": "7e3a0f4e97c0906a276a860975888db96106b75e", + "rev": "46fd0b184cbc5f1bdc5a8325cb973fc54e49ab68", "type": "github" }, "original": { @@ -410,11 +410,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1747865146, - "narHash": "sha256-tnVWlU+4zANzrLpFYJXpkMsdRYk3DD1iXJbv5hIMdRE=", + "lastModified": 1747941543, + "narHash": "sha256-HQjo42mHtsucc73OdVb0DcerP5Vwu4rx2K4w26qwkkc=", "owner": "nix-community", "repo": "stylix", - "rev": "1020d8dd9f0ce9eaf0b409552e71eb36a9428cca", + "rev": "71962333a15cdf9fc0671c306f68c9b8af53d9bf", "type": "github" }, "original": { @@ -527,11 +527,11 @@ ] }, "locked": { - "lastModified": 1747469671, - "narHash": "sha256-bo1ptiFoNqm6m1B2iAhJmWCBmqveLVvxom6xKmtuzjg=", + "lastModified": 1747912973, + "narHash": "sha256-XgxghfND8TDypxsMTPU2GQdtBEsHTEc3qWE6RVEk8O0=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "ab0378b61b0d85e73a8ab05d5c6029b5bd58c9fb", + "rev": "020cb423808365fa3f10ff4cb8c0a25df35065a3", "type": "github" }, "original": { From 6b3b079426ab8a9895b63d781847c9e5f8d4789a Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Fri, 23 May 2025 00:40:16 +0200 Subject: [PATCH 118/168] chore(deps): lock file maintenance --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 5cf8ebe..e8b842e 100644 --- a/flake.lock +++ b/flake.lock @@ -410,11 +410,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1747941543, - "narHash": "sha256-HQjo42mHtsucc73OdVb0DcerP5Vwu4rx2K4w26qwkkc=", + "lastModified": 1747953125, + "narHash": "sha256-pjr5qNCWFMj7DhfXIsLSTJv0tc/hnifHEx2P+TQWZYQ=", "owner": "nix-community", "repo": "stylix", - "rev": "71962333a15cdf9fc0671c306f68c9b8af53d9bf", + "rev": "91577955e8f4cd7140e011b9fe12b0c48143ba67", "type": "github" }, "original": { From f7dbeda1f274fe930ab46d09aff4b2fdc2bf0b79 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Sat, 24 May 2025 00:00:28 +0200 Subject: [PATCH 119/168] chore(deps): lock file maintenance --- flake.lock | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/flake.lock b/flake.lock index e8b842e..c1415dd 100644 --- a/flake.lock +++ b/flake.lock @@ -303,11 +303,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1747853442, - "narHash": "sha256-ghsAblp8zRC/CoJka4nDWt8My3ps3MyomTIC99m7Cp4=", - "rev": "cd2812de55cf87df88a9e09bf3be1ce63d50c1a6", + "lastModified": 1748020225, + "narHash": "sha256-dQXH7mA/p2etQvYy02ZSKjd21MpWeLnknLogPIYcVO8=", + "rev": "55d1f923c480dadce40f5231feb472e81b0bab48", "type": "tarball", - "url": "https://releases.nixos.org/nixos/25.05/nixos-25.05beta802025.cd2812de55cf/nixexprs.tar.xz?rev=cd2812de55cf87df88a9e09bf3be1ce63d50c1a6" + "url": "https://releases.nixos.org/nixos/25.05/nixos-25.05.802216.55d1f923c480/nixexprs.tar.xz?rev=55d1f923c480dadce40f5231feb472e81b0bab48" }, "original": { "type": "tarball", @@ -328,11 +328,11 @@ ] }, "locked": { - "lastModified": 1747945641, - "narHash": "sha256-Ts16c+kptbC3YDwPcB/NqXFVMHPNYKeFD7LkiawbWCU=", + "lastModified": 1748034126, + "narHash": "sha256-7nPv+Qi3PKxgeE4i9c4ErMCaBjVhnVYEzDmWA+8Kalw=", "owner": "nix-community", "repo": "nixvim", - "rev": "46fd0b184cbc5f1bdc5a8325cb973fc54e49ab68", + "rev": "2f610f97541a9cdebcdb485fe8f41e09bd46420d", "type": "github" }, "original": { @@ -410,11 +410,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1747953125, - "narHash": "sha256-pjr5qNCWFMj7DhfXIsLSTJv0tc/hnifHEx2P+TQWZYQ=", + "lastModified": 1748029503, + "narHash": "sha256-qHewVAhQ2kaZLHcO9lDzMeAGDFmbDd36kls7bi7HgMQ=", "owner": "nix-community", "repo": "stylix", - "rev": "91577955e8f4cd7140e011b9fe12b0c48143ba67", + "rev": "df93f602dd8c84e7bd067654cc2f6422d5868496", "type": "github" }, "original": { From bdfa4dba07f3628589b56ef4e768c803fb8616f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jalil=20David=20Salam=C3=A9=20Messina?= Date: Sat, 24 May 2025 17:39:50 +0200 Subject: [PATCH 120/168] fix(hm/firefox): fix search file conflict The search file is always replaced by firefox so force replace it as otherwise home-manager tries to back it up. --- modules/hm/gui/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/hm/gui/default.nix b/modules/hm/gui/default.nix index 4833619..0e0bdf2 100644 --- a/modules/hm/gui/default.nix +++ b/modules/hm/gui/default.nix @@ -64,6 +64,7 @@ in enable = true; profiles."${config.home.username}" = { search = { + force = true; # firefox replaces the search settings, force replace them back engines = let queryParam = name: value: { inherit name value; }; From abf832810bf9e1e42b164a2c40c19688e2fe85c2 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Sun, 25 May 2025 00:00:17 +0200 Subject: [PATCH 121/168] chore(deps): lock file maintenance --- flake.lock | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/flake.lock b/flake.lock index c1415dd..c7d391f 100644 --- a/flake.lock +++ b/flake.lock @@ -328,11 +328,11 @@ ] }, "locked": { - "lastModified": 1748034126, - "narHash": "sha256-7nPv+Qi3PKxgeE4i9c4ErMCaBjVhnVYEzDmWA+8Kalw=", + "lastModified": 1748088865, + "narHash": "sha256-xfAT2ykSAWcYgxkyZN5n6xRHab93u56zbBjuhoDFKFg=", "owner": "nix-community", "repo": "nixvim", - "rev": "2f610f97541a9cdebcdb485fe8f41e09bd46420d", + "rev": "2c0a9ff1e2bcc6aab15caa504a7c9670f6e0a929", "type": "github" }, "original": { @@ -542,11 +542,11 @@ }, "unstable": { "locked": { - "lastModified": 1747794093, - "narHash": "sha256-70Oy39tEBH6YRE4tFjEO9+ioH4C2kUTTybpXc67phd8=", - "rev": "2795c506fe8fb7b03c36ccb51f75b6df0ab2553f", + "lastModified": 1748107403, + "narHash": "sha256-3W3+7hGHD71iQ1AApEhn07laT/LSmHQCiEJW3ggPnkI=", + "rev": "063f43f2dbdef86376cc29ad646c45c46e93234c", "type": "tarball", - "url": "https://releases.nixos.org/nixos/unstable/nixos-25.11pre803506.2795c506fe8f/nixexprs.tar.xz?rev=2795c506fe8fb7b03c36ccb51f75b6df0ab2553f" + "url": "https://releases.nixos.org/nixos/unstable/nixos-25.11pre804993.063f43f2dbde/nixexprs.tar.xz?rev=063f43f2dbdef86376cc29ad646c45c46e93234c" }, "original": { "type": "tarball", From f41ffc22787a30d111a7795a7a15c664029386a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jalil=20David=20Salam=C3=A9=20Messina?= Date: Sun, 25 May 2025 19:33:17 +0200 Subject: [PATCH 122/168] fix(renovate): simplify config file These are the default values, just leave them empty. --- renovate.json | 5 ----- 1 file changed, 5 deletions(-) diff --git a/renovate.json b/renovate.json index feb16d3..86737e0 100644 --- a/renovate.json +++ b/renovate.json @@ -13,11 +13,6 @@ "config:best-practices" ], "nix": { - "fileMatch": [ - "(^|/)flake\\.nix$" - ], - "commitMessageTopic": "nixpkgs", - "commitMessageExtra": "to {{newValue}}", "enabled": true }, "lockFileMaintenance": { From 56121dbd86edf7cd8b9333e2646dd55e1eb39276 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Mon, 26 May 2025 00:00:29 +0200 Subject: [PATCH 123/168] chore(deps): lock file maintenance --- flake.lock | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/flake.lock b/flake.lock index c7d391f..e0ce7fb 100644 --- a/flake.lock +++ b/flake.lock @@ -303,11 +303,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1748020225, - "narHash": "sha256-dQXH7mA/p2etQvYy02ZSKjd21MpWeLnknLogPIYcVO8=", - "rev": "55d1f923c480dadce40f5231feb472e81b0bab48", + "lastModified": 1748189127, + "narHash": "sha256-zRDR+EbbeObu4V2X5QCd2Bk5eltfDlCr5yvhBwUT6pY=", + "rev": "7c43f080a7f28b2774f3b3f43234ca11661bf334", "type": "tarball", - "url": "https://releases.nixos.org/nixos/25.05/nixos-25.05.802216.55d1f923c480/nixexprs.tar.xz?rev=55d1f923c480dadce40f5231feb472e81b0bab48" + "url": "https://releases.nixos.org/nixos/25.05/nixos-25.05.802491.7c43f080a7f2/nixexprs.tar.xz?rev=7c43f080a7f28b2774f3b3f43234ca11661bf334" }, "original": { "type": "tarball", @@ -328,11 +328,11 @@ ] }, "locked": { - "lastModified": 1748088865, - "narHash": "sha256-xfAT2ykSAWcYgxkyZN5n6xRHab93u56zbBjuhoDFKFg=", + "lastModified": 1748197130, + "narHash": "sha256-WkUknPbMYFeusz3GKkhnklGF0r9bz4Z4bpU8h0t1Ddc=", "owner": "nix-community", "repo": "nixvim", - "rev": "2c0a9ff1e2bcc6aab15caa504a7c9670f6e0a929", + "rev": "b37d429468c1f5133743e967caf97d92dc35ef5b", "type": "github" }, "original": { From 22efbecba63fdc3095507c94efd3249bce3d8564 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jalil=20David=20Salam=C3=A9=20Messina?= Date: Tue, 27 May 2025 13:38:43 +0200 Subject: [PATCH 124/168] ci: don't use nix-fast-build It seems to cause too many issues. --- .forgejo/workflows/check.yml | 58 +++++++++++++++++++++++++++++------- 1 file changed, 47 insertions(+), 11 deletions(-) diff --git a/.forgejo/workflows/check.yml b/.forgejo/workflows/check.yml index 142bfe0..9f70100 100644 --- a/.forgejo/workflows/check.yml +++ b/.forgejo/workflows/check.yml @@ -1,28 +1,65 @@ on: push: jobs: - check: + check-fmt: runs-on: nixos steps: - - uses: "https://git.salame.cl/actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683" # v4 + - uses: https://git.salame.cl/actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4 - run: nix --version - - name: Run checks + - name: Run treefmt run: | - nix-fast-build --max-jobs 2 --no-nom --skip-cached --no-link \ - --flake ".#checks.$(nix eval --raw --impure --expr builtins.currentSystem)" - build-packages: + nix build --print-build-logs ".#checks.$(nix eval --raw --impure --expr builtins.currentSystem).treefmt" + build-package: runs-on: nixos - needs: check + needs: check-fmt + strategy: + matrix: + package: + - audiomenu + - docs + - docs-home-markdown + - docs-nixos-markdown + - docs-nvim-markdown + - jpassmenu + - nvim + - nvim-headless + - nvim-no-lsps + - nvim-no-ts + - nvim-small + - search steps: - uses: "https://git.salame.cl/actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683" # v4 - run: nix --version - name: Build target + env: + PACKAGE: ${{ matrix.package }} run: | - nix-fast-build --max-jobs 1 --no-nom --skip-cached --no-link \ - --flake ".#packages.$(nix eval --raw --impure --expr builtins.currentSystem)" + # shellcheck disable=SC2016 + nix build --print-build-logs ".#$PACKAGE" + check-nvim: + runs-on: nixos + needs: build-package + strategy: + matrix: + nvim: + - nvim + - nvim-headless + - nvim-no-lsps + - nvim-no-ts + - nvim-small + steps: + - uses: "https://git.salame.cl/actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683" # v4 + - run: nix --version + - name: Build target + env: + NVIM: ${{ matrix.nvim }} + run: | + nix build --print-build-logs ".#checks.$(nix eval --raw --impure --expr builtins.currentSystem).$NVIM" build-vm: runs-on: nixos - needs: build-packages + needs: + - build-package + - check-nvim steps: - uses: "https://git.salame.cl/actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683" # v4 - run: nix --version @@ -32,7 +69,6 @@ jobs: report-size: runs-on: nixos needs: - - build-packages - build-vm steps: - uses: "https://git.salame.cl/actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683" # v4 From b69d163ec3cb2259afcb12bde1efe3a7fab751aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jalil=20David=20Salam=C3=A9=20Messina?= Date: Tue, 27 May 2025 13:26:20 +0200 Subject: [PATCH 125/168] fix(hm): importing modules from deprecated paths --- flake-modules/home-modules.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/flake-modules/home-modules.nix b/flake-modules/home-modules.nix index 277a3cd..95db35a 100644 --- a/flake-modules/home-modules.nix +++ b/flake-modules/home-modules.nix @@ -6,7 +6,7 @@ flake.homeModules = let defaultModules = [ - inputs.nixvim.homeManagerModules.nixvim + inputs.nixvim.homeModules.nixvim self.nixvimModules.homeManager ../modules/hm ]; @@ -15,7 +15,7 @@ }; standalone = { imports = defaultModules ++ [ - inputs.stylix.homeManagerModules.stylix + inputs.stylix.homeModules.stylix ( { lib, config, ... }: lib.mkIf config.jhome.gui.enable { From 7db5bbcef6cae26dece0c4fa48104ee7a55a14b1 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Tue, 27 May 2025 14:00:18 +0200 Subject: [PATCH 126/168] chore(deps): lock file maintenance --- flake.lock | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/flake.lock b/flake.lock index e0ce7fb..eda1b49 100644 --- a/flake.lock +++ b/flake.lock @@ -226,11 +226,11 @@ ] }, "locked": { - "lastModified": 1747556831, - "narHash": "sha256-Qb84nbYFFk0DzFeqVoHltS2RodAYY5/HZQKE8WnBDsc=", + "lastModified": 1748226808, + "narHash": "sha256-GaBRgxjWO1bAQa8P2+FDxG4ANBVhjnSjBms096qQdxo=", "owner": "nix-community", "repo": "home-manager", - "rev": "d0bbd221482c2713cccb80220f3c9d16a6e20a33", + "rev": "83665c39fa688bd6a1f7c43cf7997a70f6a109f9", "type": "github" }, "original": { @@ -252,16 +252,16 @@ ] }, "locked": { - "lastModified": 1737371634, - "narHash": "sha256-fTVAWzT1UMm1lT+YxHuVPtH+DATrhYfea3B0MxG/cGw=", + "lastModified": 1748294338, + "narHash": "sha256-FVO01jdmUNArzBS7NmaktLdGA5qA3lUMJ4B7a05Iynw=", "owner": "NuschtOS", "repo": "ixx", - "rev": "a1176e2a10ce745ff8f63e4af124ece8fe0b1648", + "rev": "cc5f390f7caf265461d4aab37e98d2292ebbdb85", "type": "github" }, "original": { "owner": "NuschtOS", - "ref": "v0.0.7", + "ref": "v0.0.8", "repo": "ixx", "type": "github" } @@ -328,11 +328,11 @@ ] }, "locked": { - "lastModified": 1748197130, - "narHash": "sha256-WkUknPbMYFeusz3GKkhnklGF0r9bz4Z4bpU8h0t1Ddc=", + "lastModified": 1748261770, + "narHash": "sha256-X+QUzjjZ64lZzzd1dkxIGoLHkJvmDqoEHhx81Mmx0rw=", "owner": "nix-community", "repo": "nixvim", - "rev": "b37d429468c1f5133743e967caf97d92dc35ef5b", + "rev": "91ee94cde3d5fdde68550ac861fd0644ff47109f", "type": "github" }, "original": { @@ -353,11 +353,11 @@ ] }, "locked": { - "lastModified": 1745046075, - "narHash": "sha256-8v4y6k16Ra/fiecb4DxhsoOGtzLKgKlS+9/XJ9z0T2I=", + "lastModified": 1748298102, + "narHash": "sha256-PP11GVwUt7F4ZZi5A5+99isuq39C59CKc5u5yVisU/U=", "owner": "NuschtOS", "repo": "search", - "rev": "066afe8643274470f4a294442aadd988356a478f", + "rev": "f8a1c221afb8b4c642ed11ac5ee6746b0fe1d32f", "type": "github" }, "original": { @@ -410,11 +410,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1748029503, - "narHash": "sha256-qHewVAhQ2kaZLHcO9lDzMeAGDFmbDd36kls7bi7HgMQ=", + "lastModified": 1748282308, + "narHash": "sha256-pjNhKw3wdj4n1zQrTyuZjpTpr+ssQzG0EPeWMQr9gHo=", "owner": "nix-community", "repo": "stylix", - "rev": "df93f602dd8c84e7bd067654cc2f6422d5868496", + "rev": "c36cc92e08f1ce24a772d2f3ac9f049b963a07f0", "type": "github" }, "original": { @@ -527,11 +527,11 @@ ] }, "locked": { - "lastModified": 1747912973, - "narHash": "sha256-XgxghfND8TDypxsMTPU2GQdtBEsHTEc3qWE6RVEk8O0=", + "lastModified": 1748243702, + "narHash": "sha256-9YzfeN8CB6SzNPyPm2XjRRqSixDopTapaRsnTpXUEY8=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "020cb423808365fa3f10ff4cb8c0a25df35065a3", + "rev": "1f3f7b784643d488ba4bf315638b2b0a4c5fb007", "type": "github" }, "original": { @@ -542,11 +542,11 @@ }, "unstable": { "locked": { - "lastModified": 1748107403, - "narHash": "sha256-3W3+7hGHD71iQ1AApEhn07laT/LSmHQCiEJW3ggPnkI=", - "rev": "063f43f2dbdef86376cc29ad646c45c46e93234c", + "lastModified": 1748281463, + "narHash": "sha256-0VFAX85s2QcFpcNVy7J4yn7j8Cn2IZADd1wsbT+1TYs=", + "rev": "62b852f6c6742134ade1abdd2a21685fd617a291", "type": "tarball", - "url": "https://releases.nixos.org/nixos/unstable/nixos-25.11pre804993.063f43f2dbde/nixexprs.tar.xz?rev=063f43f2dbdef86376cc29ad646c45c46e93234c" + "url": "https://releases.nixos.org/nixos/unstable/nixos-25.11pre805967.62b852f6c674/nixexprs.tar.xz?rev=62b852f6c6742134ade1abdd2a21685fd617a291" }, "original": { "type": "tarball", From 308bd6d90c23044b822cdd1b1ff14e34ad0d8139 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Wed, 28 May 2025 00:00:17 +0200 Subject: [PATCH 127/168] chore(deps): lock file maintenance --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index eda1b49..6b6614b 100644 --- a/flake.lock +++ b/flake.lock @@ -328,11 +328,11 @@ ] }, "locked": { - "lastModified": 1748261770, - "narHash": "sha256-X+QUzjjZ64lZzzd1dkxIGoLHkJvmDqoEHhx81Mmx0rw=", + "lastModified": 1748348238, + "narHash": "sha256-etRxo4m9zbKuZbb1Tjt20mab7hc9bQGIlm+U5X4sctc=", "owner": "nix-community", "repo": "nixvim", - "rev": "91ee94cde3d5fdde68550ac861fd0644ff47109f", + "rev": "65b1bffd3d36e9392083c6efcf2e087921afa86e", "type": "github" }, "original": { @@ -410,11 +410,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1748282308, - "narHash": "sha256-pjNhKw3wdj4n1zQrTyuZjpTpr+ssQzG0EPeWMQr9gHo=", + "lastModified": 1748377234, + "narHash": "sha256-v6fniljfK6GXBuKk+60okdLewbRbnkf+XV8vH1394hw=", "owner": "nix-community", "repo": "stylix", - "rev": "c36cc92e08f1ce24a772d2f3ac9f049b963a07f0", + "rev": "a835b8f6efd172a4635352902f9ba2e6bd22dcdb", "type": "github" }, "original": { From 5011d8a411bd06e6bf7838492103747cdd38673e Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Thu, 29 May 2025 00:00:28 +0200 Subject: [PATCH 128/168] chore(deps): lock file maintenance --- flake.lock | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/flake.lock b/flake.lock index 6b6614b..314c61c 100644 --- a/flake.lock +++ b/flake.lock @@ -226,11 +226,11 @@ ] }, "locked": { - "lastModified": 1748226808, - "narHash": "sha256-GaBRgxjWO1bAQa8P2+FDxG4ANBVhjnSjBms096qQdxo=", + "lastModified": 1748455876, + "narHash": "sha256-4n9uDN54LSgN7WVEzj2r0nBthV5m0uFi9BgiD0dfS54=", "owner": "nix-community", "repo": "home-manager", - "rev": "83665c39fa688bd6a1f7c43cf7997a70f6a109f9", + "rev": "529d2aac542a42c57d4b765501ace564b07e3d99", "type": "github" }, "original": { @@ -303,11 +303,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1748189127, - "narHash": "sha256-zRDR+EbbeObu4V2X5QCd2Bk5eltfDlCr5yvhBwUT6pY=", - "rev": "7c43f080a7f28b2774f3b3f43234ca11661bf334", + "lastModified": 1748449516, + "narHash": "sha256-tNxhTJGbpNvoZJTA8ZPL1HqDBgnIMDYpmo72Yi3h9D4=", + "rev": "7848cd8c982f7740edf76ddb3b43d234cb80fc4d", "type": "tarball", - "url": "https://releases.nixos.org/nixos/25.05/nixos-25.05.802491.7c43f080a7f2/nixexprs.tar.xz?rev=7c43f080a7f28b2774f3b3f43234ca11661bf334" + "url": "https://releases.nixos.org/nixos/25.05/nixos-25.05.802674.7848cd8c982f/nixexprs.tar.xz?rev=7848cd8c982f7740edf76ddb3b43d234cb80fc4d" }, "original": { "type": "tarball", @@ -328,11 +328,11 @@ ] }, "locked": { - "lastModified": 1748348238, - "narHash": "sha256-etRxo4m9zbKuZbb1Tjt20mab7hc9bQGIlm+U5X4sctc=", + "lastModified": 1748460828, + "narHash": "sha256-XAxZ0fpfgMk6ZEsbccnSSUs4aSEseeG2cJsdzcEgHr0=", "owner": "nix-community", "repo": "nixvim", - "rev": "65b1bffd3d36e9392083c6efcf2e087921afa86e", + "rev": "af5a0deaddb54e7b2a787dca6d43724dd103945a", "type": "github" }, "original": { @@ -410,11 +410,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1748377234, - "narHash": "sha256-v6fniljfK6GXBuKk+60okdLewbRbnkf+XV8vH1394hw=", + "lastModified": 1748455958, + "narHash": "sha256-/KFwI0YHL0dzRKEtxiTRnjKzs3CPGVrFHP4gpN3n91Q=", "owner": "nix-community", "repo": "stylix", - "rev": "a835b8f6efd172a4635352902f9ba2e6bd22dcdb", + "rev": "e13d234bcff4b65f6601a87d4a243f5d29141dbf", "type": "github" }, "original": { @@ -542,11 +542,11 @@ }, "unstable": { "locked": { - "lastModified": 1748281463, - "narHash": "sha256-0VFAX85s2QcFpcNVy7J4yn7j8Cn2IZADd1wsbT+1TYs=", - "rev": "62b852f6c6742134ade1abdd2a21685fd617a291", + "lastModified": 1748436628, + "narHash": "sha256-FQwHpcLnwfiPLKKB9YxVfyLxSTfwBsxMR9YPEwzuWuE=", + "rev": "4faa5f5321320e49a78ae7848582f684d64783e9", "type": "tarball", - "url": "https://releases.nixos.org/nixos/unstable/nixos-25.11pre805967.62b852f6c674/nixexprs.tar.xz?rev=62b852f6c6742134ade1abdd2a21685fd617a291" + "url": "https://releases.nixos.org/nixos/unstable/nixos-25.11pre806853.4faa5f532132/nixexprs.tar.xz?rev=4faa5f5321320e49a78ae7848582f684d64783e9" }, "original": { "type": "tarball", From 216aa588144452453a5643673cfdd40e837319f8 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Fri, 30 May 2025 00:00:17 +0200 Subject: [PATCH 129/168] chore(deps): lock file maintenance --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 314c61c..c4fb920 100644 --- a/flake.lock +++ b/flake.lock @@ -226,11 +226,11 @@ ] }, "locked": { - "lastModified": 1748455876, - "narHash": "sha256-4n9uDN54LSgN7WVEzj2r0nBthV5m0uFi9BgiD0dfS54=", + "lastModified": 1748487945, + "narHash": "sha256-e9zc/rHdoH9i+sFFhhQiKoF6IuD+T2rB/nUyPaO7CCg=", "owner": "nix-community", "repo": "home-manager", - "rev": "529d2aac542a42c57d4b765501ace564b07e3d99", + "rev": "0d13ea58d565d3c1c1468ddae1f623316dc395d9", "type": "github" }, "original": { @@ -328,11 +328,11 @@ ] }, "locked": { - "lastModified": 1748460828, - "narHash": "sha256-XAxZ0fpfgMk6ZEsbccnSSUs4aSEseeG2cJsdzcEgHr0=", + "lastModified": 1748521000, + "narHash": "sha256-EnXH5PIrZBoe8U09hPQr2kOuPTZSqAJy78DqUVLmWXg=", "owner": "nix-community", "repo": "nixvim", - "rev": "af5a0deaddb54e7b2a787dca6d43724dd103945a", + "rev": "a9e45072d82374dd3f0d971795e7d7f99e5bc6c2", "type": "github" }, "original": { From 5e684cf70d96fd2c2ae9e7ec527e7a4accbf4c30 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Fri, 30 May 2025 00:20:16 +0200 Subject: [PATCH 130/168] chore(deps): lock file maintenance --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index c4fb920..519ffd5 100644 --- a/flake.lock +++ b/flake.lock @@ -410,11 +410,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1748455958, - "narHash": "sha256-/KFwI0YHL0dzRKEtxiTRnjKzs3CPGVrFHP4gpN3n91Q=", + "lastModified": 1748556928, + "narHash": "sha256-S1/lnThzep5XyEtoUbe+Iu7EEAfLKIPnER180qAacGU=", "owner": "nix-community", "repo": "stylix", - "rev": "e13d234bcff4b65f6601a87d4a243f5d29141dbf", + "rev": "48d85c8aa014b28b1f438f64b9cd8fdb3f8fde98", "type": "github" }, "original": { From 162b9c956e2c30833e3dc3ec18fb044acb57fa24 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Sat, 31 May 2025 00:00:28 +0200 Subject: [PATCH 131/168] chore(deps): lock file maintenance --- flake.lock | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/flake.lock b/flake.lock index 519ffd5..d071a63 100644 --- a/flake.lock +++ b/flake.lock @@ -226,11 +226,11 @@ ] }, "locked": { - "lastModified": 1748487945, - "narHash": "sha256-e9zc/rHdoH9i+sFFhhQiKoF6IuD+T2rB/nUyPaO7CCg=", + "lastModified": 1748627093, + "narHash": "sha256-1hFy+bZRZoYb7RaUXsW+9YFtjjFrQpschd8qZpy9org=", "owner": "nix-community", "repo": "home-manager", - "rev": "0d13ea58d565d3c1c1468ddae1f623316dc395d9", + "rev": "afe9ce8b2014fa1230ade38bf07156cdcef63658", "type": "github" }, "original": { @@ -303,11 +303,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1748449516, - "narHash": "sha256-tNxhTJGbpNvoZJTA8ZPL1HqDBgnIMDYpmo72Yi3h9D4=", - "rev": "7848cd8c982f7740edf76ddb3b43d234cb80fc4d", + "lastModified": 1748586159, + "narHash": "sha256-+buxl/6pynOmVvTeqiom/317JDTDf/kzmvAP6zQ38PM=", + "rev": "7282cb574e0607e65224d33be8241eae7cfe0979", "type": "tarball", - "url": "https://releases.nixos.org/nixos/25.05/nixos-25.05.802674.7848cd8c982f/nixexprs.tar.xz?rev=7848cd8c982f7740edf76ddb3b43d234cb80fc4d" + "url": "https://releases.nixos.org/nixos/25.05/nixos-25.05.802746.7282cb574e06/nixexprs.tar.xz?rev=7282cb574e0607e65224d33be8241eae7cfe0979" }, "original": { "type": "tarball", @@ -328,11 +328,11 @@ ] }, "locked": { - "lastModified": 1748521000, - "narHash": "sha256-EnXH5PIrZBoe8U09hPQr2kOuPTZSqAJy78DqUVLmWXg=", + "lastModified": 1748564405, + "narHash": "sha256-uCmQLJmdg0gKWBs+vhNmS9RIPJW8/ddo6TvQ/a4gupc=", "owner": "nix-community", "repo": "nixvim", - "rev": "a9e45072d82374dd3f0d971795e7d7f99e5bc6c2", + "rev": "8b3a69cfea5ba2fa008c6c57ab79c99c513a349b", "type": "github" }, "original": { @@ -410,11 +410,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1748556928, - "narHash": "sha256-S1/lnThzep5XyEtoUbe+Iu7EEAfLKIPnER180qAacGU=", + "lastModified": 1748573182, + "narHash": "sha256-nnvjhz1PtS/Vfw8bgU0AkXq1U42gilzfFak65EmHW4g=", "owner": "nix-community", "repo": "stylix", - "rev": "48d85c8aa014b28b1f438f64b9cd8fdb3f8fde98", + "rev": "79ec2e885e2b66f2fc6e6b6db15c49c81ebaf7d8", "type": "github" }, "original": { @@ -542,11 +542,11 @@ }, "unstable": { "locked": { - "lastModified": 1748436628, - "narHash": "sha256-FQwHpcLnwfiPLKKB9YxVfyLxSTfwBsxMR9YPEwzuWuE=", - "rev": "4faa5f5321320e49a78ae7848582f684d64783e9", + "lastModified": 1748608111, + "narHash": "sha256-9YDS55RZCRc++4NfZJe3xDmhawAdn+ghpN2Tu3rWeG0=", + "rev": "96ec055edbe5ee227f28cdbc3f1ddf1df5965102", "type": "tarball", - "url": "https://releases.nixos.org/nixos/unstable/nixos-25.11pre806853.4faa5f532132/nixexprs.tar.xz?rev=4faa5f5321320e49a78ae7848582f684d64783e9" + "url": "https://releases.nixos.org/nixos/unstable/nixos-25.11pre807377.96ec055edbe5/nixexprs.tar.xz?rev=96ec055edbe5ee227f28cdbc3f1ddf1df5965102" }, "original": { "type": "tarball", From 906b48758138fdce0ffe408ca216cc3be7b596ff Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Sun, 1 Jun 2025 00:00:19 +0200 Subject: [PATCH 132/168] chore(deps): lock file maintenance --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index d071a63..8031a48 100644 --- a/flake.lock +++ b/flake.lock @@ -226,11 +226,11 @@ ] }, "locked": { - "lastModified": 1748627093, - "narHash": "sha256-1hFy+bZRZoYb7RaUXsW+9YFtjjFrQpschd8qZpy9org=", + "lastModified": 1748665073, + "narHash": "sha256-RMhjnPKWtCoIIHiuR9QKD7xfsKb3agxzMfJY8V9MOew=", "owner": "nix-community", "repo": "home-manager", - "rev": "afe9ce8b2014fa1230ade38bf07156cdcef63658", + "rev": "282e1e029cb6ab4811114fc85110613d72771dea", "type": "github" }, "original": { @@ -410,11 +410,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1748573182, - "narHash": "sha256-nnvjhz1PtS/Vfw8bgU0AkXq1U42gilzfFak65EmHW4g=", + "lastModified": 1748718017, + "narHash": "sha256-Mzu6wzK1wP66aFdwung2ZLWxiLt5iRibu9QBjYqo0Xs=", "owner": "nix-community", "repo": "stylix", - "rev": "79ec2e885e2b66f2fc6e6b6db15c49c81ebaf7d8", + "rev": "8dc316b5766041bdd40b2405105c87d50b4fea00", "type": "github" }, "original": { From 820b4f86021187f3d96c8c1c40ee105786b0b549 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Mon, 2 Jun 2025 00:00:12 +0200 Subject: [PATCH 133/168] chore(deps): lock file maintenance --- flake.lock | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/flake.lock b/flake.lock index 8031a48..49ab467 100644 --- a/flake.lock +++ b/flake.lock @@ -410,11 +410,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1748718017, - "narHash": "sha256-Mzu6wzK1wP66aFdwung2ZLWxiLt5iRibu9QBjYqo0Xs=", + "lastModified": 1748798145, + "narHash": "sha256-GPVR1UT1r0J1Lgux0h28CVCqoh0dJ67qKn2k+CTL/TI=", "owner": "nix-community", "repo": "stylix", - "rev": "8dc316b5766041bdd40b2405105c87d50b4fea00", + "rev": "275e1acae94a1c5495352fd317a87377322a5259", "type": "github" }, "original": { @@ -542,11 +542,11 @@ }, "unstable": { "locked": { - "lastModified": 1748608111, - "narHash": "sha256-9YDS55RZCRc++4NfZJe3xDmhawAdn+ghpN2Tu3rWeG0=", - "rev": "96ec055edbe5ee227f28cdbc3f1ddf1df5965102", + "lastModified": 1748769915, + "narHash": "sha256-fY+Pv/vF9bIzgmG+u56ZzqmP+ALLtcHLc9Xp+44FvZc=", + "rev": "910796cabe436259a29a72e8d3f5e180fc6dfacc", "type": "tarball", - "url": "https://releases.nixos.org/nixos/unstable/nixos-25.11pre807377.96ec055edbe5/nixexprs.tar.xz?rev=96ec055edbe5ee227f28cdbc3f1ddf1df5965102" + "url": "https://releases.nixos.org/nixos/unstable/nixos-25.11pre808478.910796cabe43/nixexprs.tar.xz?rev=910796cabe436259a29a72e8d3f5e180fc6dfacc" }, "original": { "type": "tarball", From 07b4cc640ddefd96da96bfe0ee66c910fb18174d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jalil=20David=20Salam=C3=A9=20Messina?= Date: Mon, 2 Jun 2025 18:38:52 +0200 Subject: [PATCH 134/168] ci: update nix-flake-outputs-size action This pulls in the changes to check the homeConfigurations --- .forgejo/workflows/check.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/check.yml b/.forgejo/workflows/check.yml index 9f70100..bcc845a 100644 --- a/.forgejo/workflows/check.yml +++ b/.forgejo/workflows/check.yml @@ -74,7 +74,7 @@ jobs: - uses: "https://git.salame.cl/actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683" # v4 - run: nix --version - name: Create Size Report - uses: "https://git.salame.cl/jalil/nix-flake-outputs-size@b7e76df81383680ae01fada8db4d2c6f99391d8b" # main + uses: "https://git.salame.cl/jalil/nix-flake-outputs-size@838f2050208b41c339803a1111608d7182bbda3e" # main with: # Create a comment on the associated PR comment-on-pr: ${{ github.ref_name != 'main' }} From a6ab19d528c5d6d8a61e5ce14b9d6c78f8ab88b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jalil=20David=20Salam=C3=A9=20Messina?= Date: Mon, 2 Jun 2025 17:53:48 +0200 Subject: [PATCH 135/168] feat(flake): enable home-manager flake module Let's use the home-manager flake-parts module! --- flake-modules/home-modules.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/flake-modules/home-modules.nix b/flake-modules/home-modules.nix index 95db35a..6c9ae51 100644 --- a/flake-modules/home-modules.nix +++ b/flake-modules/home-modules.nix @@ -1,7 +1,6 @@ { self, inputs, ... }: { - # FIXME(25.05): this version of HM should have the flake module - # imports = [ inputs.home-manager.flakeModules.home-manager ]; + imports = [ inputs.home-manager.flakeModules.home-manager ]; flake.homeModules = let From d4afb26bd1ed30053b383ee30704b84c808ead3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jalil=20David=20Salam=C3=A9=20Messina?= Date: Mon, 2 Jun 2025 17:53:48 +0200 Subject: [PATCH 136/168] feat: add a home-manager example configuration This adds a home-manager example configuration to ensure the home-manager standalone module works properly. --- .forgejo/workflows/check.yml | 12 ++++++ example-hm/home.nix | 70 +++++++++++++++++++++++++++++++ flake-modules/default.nix | 2 +- flake-modules/example-configs.nix | 33 +++++++++++++++ flake-modules/example-vm.nix | 18 -------- 5 files changed, 116 insertions(+), 19 deletions(-) create mode 100644 example-hm/home.nix create mode 100644 flake-modules/example-configs.nix delete mode 100644 flake-modules/example-vm.nix diff --git a/.forgejo/workflows/check.yml b/.forgejo/workflows/check.yml index bcc845a..3199e04 100644 --- a/.forgejo/workflows/check.yml +++ b/.forgejo/workflows/check.yml @@ -66,10 +66,22 @@ jobs: - name: Build VM configuration run: | nix build --print-build-logs '.#nixosConfigurations.vm.config.system.build.toplevel' + build-hm: + runs-on: nixos + needs: + - build-package + - check-nvim + steps: + - uses: "https://git.salame.cl/actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683" # v4 + - run: nix --version + - name: Build Home Manager configuration + run: | + nix build --print-build-logs '.#homeConfigurations.example.activationPackage' report-size: runs-on: nixos needs: - build-vm + - build-hm steps: - uses: "https://git.salame.cl/actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683" # v4 - run: nix --version diff --git a/example-hm/home.nix b/example-hm/home.nix new file mode 100644 index 0000000..4e86064 --- /dev/null +++ b/example-hm/home.nix @@ -0,0 +1,70 @@ +{ + lib, + pkgs, + config, + ... +}: +{ + home = { + homeDirectory = "/home/jdoe"; + stateVersion = "25.05"; + username = "jdoe"; + }; + + jhome = { + enable = true; + dev = { + enable = true; + neovimAsManPager = true; + rust.enable = true; + }; + gui.enable = false; + hostName = "example"; + user = { + enable = true; + defaultIdentity = { + email = "jdoe@example.org"; + name = "John Doe"; + }; + }; + }; + + programs = { + # Switch to fish if bash is started interactively + bash.initExtra = '' + 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 + ''; + + # Enable zellij (tmux like terminal session manager) + zellij.enable = lib.mkForce true; + }; + + nix = { + package = pkgs.lix; + gc = { + automatic = true; + frequency = "weekly"; + options = "--delete-older-than 30d"; + # run between 0 and 45min after boot if run was missed + randomizedDelaySec = "45min"; + }; + settings = { + # Add my personal binary cache to the mix (only for personal computers) + extra-substituters = [ "https://cache.salame.cl" ]; + extra-trusted-public-keys = [ "cache.salame.cl:D+pBaoutwxja7qKGpju+CmM1LRbVmf2gqEQ/9c7qHrw=" ]; + auto-optimise-store = true; + }; + }; + + stylix = { + image = config.jhome.gui.sway.background; + base16Scheme = "${pkgs.base16-schemes}/share/themes/gruvbox-dark-hard.yaml"; + }; + + # Let Home Manager install and manage itself. + programs.home-manager.enable = true; +} diff --git a/flake-modules/default.nix b/flake-modules/default.nix index d793f21..1b806a6 100644 --- a/flake-modules/default.nix +++ b/flake-modules/default.nix @@ -5,7 +5,7 @@ ./devshells.nix ./docs.nix - ./example-vm.nix + ./example-configs.nix ./nixos-modules.nix ./home-modules.nix ./nixvim-modules.nix diff --git a/flake-modules/example-configs.nix b/flake-modules/example-configs.nix new file mode 100644 index 0000000..362e36a --- /dev/null +++ b/flake-modules/example-configs.nix @@ -0,0 +1,33 @@ +{ inputs, lib, ... }: +{ + flake = { + # Example vm configuration + nixosConfigurations.vm = lib.nixosSystem { + modules = [ + inputs.self.nixosModules.default + ../example-vm # import vm configuration + { + nixpkgs = { + overlays = builtins.attrValues inputs.self.overlays; + config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ "steam-unwrapped" ]; + }; + # pin nixpkgs to the one used by the system + nix.registry.nixpkgs.flake = inputs.nixpkgs; + } + ]; + }; + homeConfigurations.example = inputs.home-manager.lib.homeManagerConfiguration { + pkgs = inputs.nixpkgs.legacyPackages.x86_64-linux; + modules = [ + inputs.self.homeModules.standalone + ../example-hm/home.nix # import home-manager configuration + { + nixpkgs.overlays = [ + inputs.self.overlays.unstable + inputs.lix-module.overlays.default + ]; + } + ]; + }; + }; +} diff --git a/flake-modules/example-vm.nix b/flake-modules/example-vm.nix deleted file mode 100644 index e941b37..0000000 --- a/flake-modules/example-vm.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ inputs, lib, ... }: -{ - # Example vm configuration - flake.nixosConfigurations.vm = lib.nixosSystem { - modules = [ - inputs.self.nixosModules.default - ../example-vm # import vm configuration - { - nixpkgs = { - overlays = builtins.attrValues inputs.self.overlays; - config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ "steam-unwrapped" ]; - }; - # pin nixpkgs to the one used by the system - nix.registry.nixpkgs.flake = inputs.nixpkgs; - } - ]; - }; -} From 49bf387f962a3831a5a4c0999bc9140ae2ff6387 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jalil=20David=20Salam=C3=A9=20Messina?= Date: Mon, 2 Jun 2025 22:59:11 +0200 Subject: [PATCH 137/168] feat(nvim): configure gopls (but don't install it) This allows me to work on Go projects (mainly Forgejo). --- modules/nixvim/dev-plugins.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/nixvim/dev-plugins.nix b/modules/nixvim/dev-plugins.nix index 4a4ff8a..d7c0a21 100644 --- a/modules/nixvim/dev-plugins.nix +++ b/modules/nixvim/dev-plugins.nix @@ -13,6 +13,7 @@ let "basedpyright" "bashls" "clangd" + "gopls" # "html" # Not writing html "jsonls" "marksman" @@ -56,6 +57,7 @@ in # Configure the LSPs, but don't install the packages. # If you need to use them, add them to your project's devShell clangd = noPackage; + gopls = noPackage; zls = noPackage; }; }; From ff8aa2e1b3429603dfacffc5a629e1af788a17cf Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Tue, 3 Jun 2025 00:00:29 +0200 Subject: [PATCH 138/168] chore(deps): lock file maintenance --- flake.lock | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/flake.lock b/flake.lock index 49ab467..419e873 100644 --- a/flake.lock +++ b/flake.lock @@ -90,11 +90,11 @@ ] }, "locked": { - "lastModified": 1743550720, - "narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=", + "lastModified": 1748821116, + "narHash": "sha256-F82+gS044J1APL0n4hH50GYdPRv/5JWm34oCJYmVKdE=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "c621e8422220273271f52058f618c94e405bb0f5", + "rev": "49f0870db23e8c1ca0b5259734a02cd9e1e371a1", "type": "github" }, "original": { @@ -303,11 +303,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1748586159, - "narHash": "sha256-+buxl/6pynOmVvTeqiom/317JDTDf/kzmvAP6zQ38PM=", - "rev": "7282cb574e0607e65224d33be8241eae7cfe0979", + "lastModified": 1748842312, + "narHash": "sha256-Jvvr4/8zsEKQJo+vdHC0eqT1onlTUq711N7kkvEFUcs=", + "rev": "a59eb7800787c926045d51b70982ae285faa2346", "type": "tarball", - "url": "https://releases.nixos.org/nixos/25.05/nixos-25.05.802746.7282cb574e06/nixexprs.tar.xz?rev=7282cb574e0607e65224d33be8241eae7cfe0979" + "url": "https://releases.nixos.org/nixos/25.05/nixos-25.05.802985.a59eb7800787/nixexprs.tar.xz?rev=a59eb7800787c926045d51b70982ae285faa2346" }, "original": { "type": "tarball", @@ -328,11 +328,11 @@ ] }, "locked": { - "lastModified": 1748564405, - "narHash": "sha256-uCmQLJmdg0gKWBs+vhNmS9RIPJW8/ddo6TvQ/a4gupc=", + "lastModified": 1748884506, + "narHash": "sha256-P/ldKE0SCGKH6pEVJoW2MJJo2dZCZe10d/h1ree66c0=", "owner": "nix-community", "repo": "nixvim", - "rev": "8b3a69cfea5ba2fa008c6c57ab79c99c513a349b", + "rev": "d063d0dd5e0b82d8be4dd4bc00b887ac1f92e4b2", "type": "github" }, "original": { @@ -410,11 +410,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1748798145, - "narHash": "sha256-GPVR1UT1r0J1Lgux0h28CVCqoh0dJ67qKn2k+CTL/TI=", + "lastModified": 1748888559, + "narHash": "sha256-l9F8IGqmkMYlMLABvoQu5QZIzZzzUIM9r0saqAiWi64=", "owner": "nix-community", "repo": "stylix", - "rev": "275e1acae94a1c5495352fd317a87377322a5259", + "rev": "40ed368ca342dfd9a69a3007410be7d20eb04a0c", "type": "github" }, "original": { From 557813934abb9b0ca7cb07356ddbc23de37f1056 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jalil=20David=20Salam=C3=A9=20Messina?= Date: Tue, 3 Jun 2025 18:57:50 +0200 Subject: [PATCH 139/168] feat: update lix to 2.93 I forgot to do this T-T --- flake.lock | 20 ++++++++++---------- flake.nix | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/flake.lock b/flake.lock index 419e873..837856b 100644 --- a/flake.lock +++ b/flake.lock @@ -269,15 +269,15 @@ "lix": { "flake": false, "locked": { - "lastModified": 1737234286, - "narHash": "sha256-pgDJZjj4jpzkFxsqBTI/9Yb0n3gW+DvDtuv9SwQZZcs=", - "rev": "079528098f5998ba13c88821a2eca1005c1695de", + "lastModified": 1747597901, + "narHash": "sha256-jS+P57tXZEl+zvPfEIHFbd1j3xfuWcrcMrcnbm9wWbE=", + "rev": "33eaaf02fd3f380e99032b25e741eeeb10573cad", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/079528098f5998ba13c88821a2eca1005c1695de.tar.gz?rev=079528098f5998ba13c88821a2eca1005c1695de" + "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/33eaaf02fd3f380e99032b25e741eeeb10573cad.tar.gz?rev=33eaaf02fd3f380e99032b25e741eeeb10573cad" }, "original": { "type": "tarball", - "url": "https://git.lix.systems/lix-project/lix/archive/release-2.92.tar.gz" + "url": "https://git.lix.systems/lix-project/lix/archive/release-2.93.tar.gz" } }, "lix-module": { @@ -290,15 +290,15 @@ ] }, "locked": { - "lastModified": 1742943028, - "narHash": "sha256-fprwZKE1uMzO9tiWWOrmLWBW3GPkMayQfb0xOvVFIno=", - "rev": "3fae818597ca2f1474de62022f850c23be50528d", + "lastModified": 1748803223, + "narHash": "sha256-FXndw1CihZcqQu49DziuMQuc0fG8L0nvGkm0JHZKimo=", + "rev": "2226eb3b97f0f89fdcd5bf2d0a2c7723cf771a62", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/3fae818597ca2f1474de62022f850c23be50528d.tar.gz?rev=3fae818597ca2f1474de62022f850c23be50528d" + "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/2226eb3b97f0f89fdcd5bf2d0a2c7723cf771a62.tar.gz?rev=2226eb3b97f0f89fdcd5bf2d0a2c7723cf771a62" }, "original": { "type": "tarball", - "url": "https://git.lix.systems/lix-project/nixos-module/archive/release-2.92.tar.gz" + "url": "https://git.lix.systems/lix-project/nixos-module/archive/release-2.93.tar.gz" } }, "nixpkgs": { diff --git a/flake.nix b/flake.nix index d4c836b..795adef 100644 --- a/flake.nix +++ b/flake.nix @@ -12,7 +12,7 @@ unstable.url = "https://channels.nixos.org/nixos-unstable/nixexprs.tar.xz"; # Lix lix-module = { - url = "https://git.lix.systems/lix-project/nixos-module/archive/release-2.92.tar.gz"; + url = "https://git.lix.systems/lix-project/nixos-module/archive/release-2.93.tar.gz"; inputs = { nixpkgs.follows = "nixpkgs"; flake-utils.inputs.systems.follows = "systems"; From ac7a337d1639ab5e080bb1a4d223c034ca22b047 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Wed, 4 Jun 2025 00:00:28 +0200 Subject: [PATCH 140/168] chore(deps): lock file maintenance --- flake.lock | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/flake.lock b/flake.lock index 837856b..59b9c9a 100644 --- a/flake.lock +++ b/flake.lock @@ -303,11 +303,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1748842312, - "narHash": "sha256-Jvvr4/8zsEKQJo+vdHC0eqT1onlTUq711N7kkvEFUcs=", - "rev": "a59eb7800787c926045d51b70982ae285faa2346", + "lastModified": 1748911815, + "narHash": "sha256-VYpxyyvf+ptRW+XaHaeelL+RSt4cDp/qJE84M/kL2p4=", + "rev": "10d7f8d34e5eb9c0f9a0485186c1ca691d2c5922", "type": "tarball", - "url": "https://releases.nixos.org/nixos/25.05/nixos-25.05.802985.a59eb7800787/nixexprs.tar.xz?rev=a59eb7800787c926045d51b70982ae285faa2346" + "url": "https://releases.nixos.org/nixos/25.05/nixos-25.05.803297.10d7f8d34e5e/nixexprs.tar.xz?rev=10d7f8d34e5eb9c0f9a0485186c1ca691d2c5922" }, "original": { "type": "tarball", @@ -328,11 +328,11 @@ ] }, "locked": { - "lastModified": 1748884506, - "narHash": "sha256-P/ldKE0SCGKH6pEVJoW2MJJo2dZCZe10d/h1ree66c0=", + "lastModified": 1748942960, + "narHash": "sha256-gJf3WxvDbvCpzIBVju/5GY/olW7zs/B1zDmB52AWMUM=", "owner": "nix-community", "repo": "nixvim", - "rev": "d063d0dd5e0b82d8be4dd4bc00b887ac1f92e4b2", + "rev": "9328f4437d5f788d1c066b274a0aea492dc5fde2", "type": "github" }, "original": { @@ -410,11 +410,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1748888559, - "narHash": "sha256-l9F8IGqmkMYlMLABvoQu5QZIzZzzUIM9r0saqAiWi64=", + "lastModified": 1748971039, + "narHash": "sha256-vB57L1K/q42f4x2VfdUAKqN1XpfPYvTubRb1aZDmFcI=", "owner": "nix-community", "repo": "stylix", - "rev": "40ed368ca342dfd9a69a3007410be7d20eb04a0c", + "rev": "f756c257890a04b4d743b2165efaebad8e651978", "type": "github" }, "original": { From c4ca8cdc7b6ed7c9cc875df4b6edadc3a2fdaad7 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Thu, 5 Jun 2025 00:00:27 +0200 Subject: [PATCH 141/168] chore(deps): lock file maintenance --- flake.lock | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/flake.lock b/flake.lock index 59b9c9a..8a5c3c0 100644 --- a/flake.lock +++ b/flake.lock @@ -303,11 +303,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1748911815, - "narHash": "sha256-VYpxyyvf+ptRW+XaHaeelL+RSt4cDp/qJE84M/kL2p4=", - "rev": "10d7f8d34e5eb9c0f9a0485186c1ca691d2c5922", + "lastModified": 1749054198, + "narHash": "sha256-eiB3nIV15CnBtWrXXAmWcLZ1mbVWRwtwggltPgOLe64=", + "rev": "8f1b52b04f2cb6e5ead50bd28d76528a2f0380ef", "type": "tarball", - "url": "https://releases.nixos.org/nixos/25.05/nixos-25.05.803297.10d7f8d34e5e/nixexprs.tar.xz?rev=10d7f8d34e5eb9c0f9a0485186c1ca691d2c5922" + "url": "https://releases.nixos.org/nixos/25.05/nixos-25.05.803396.8f1b52b04f2c/nixexprs.tar.xz?rev=8f1b52b04f2cb6e5ead50bd28d76528a2f0380ef" }, "original": { "type": "tarball", @@ -328,11 +328,11 @@ ] }, "locked": { - "lastModified": 1748942960, - "narHash": "sha256-gJf3WxvDbvCpzIBVju/5GY/olW7zs/B1zDmB52AWMUM=", + "lastModified": 1749028068, + "narHash": "sha256-ebxyRA7rK6Jb3eXvz+0QcyKLHzUnUQWRFDbKleLdLZ8=", "owner": "nix-community", "repo": "nixvim", - "rev": "9328f4437d5f788d1c066b274a0aea492dc5fde2", + "rev": "1d8724144cef98dad6638e0b6333cc84d0b2f5c3", "type": "github" }, "original": { @@ -410,11 +410,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1748971039, - "narHash": "sha256-vB57L1K/q42f4x2VfdUAKqN1XpfPYvTubRb1aZDmFcI=", + "lastModified": 1749058304, + "narHash": "sha256-8fUXBczmQ7/Y8nrc988oaN4M7YZz/RbzZa0n1d8i3GM=", "owner": "nix-community", "repo": "stylix", - "rev": "f756c257890a04b4d743b2165efaebad8e651978", + "rev": "689d4db89d3be6fd82b7dcb41a1cea5c4743b1ef", "type": "github" }, "original": { @@ -542,11 +542,11 @@ }, "unstable": { "locked": { - "lastModified": 1748769915, - "narHash": "sha256-fY+Pv/vF9bIzgmG+u56ZzqmP+ALLtcHLc9Xp+44FvZc=", - "rev": "910796cabe436259a29a72e8d3f5e180fc6dfacc", + "lastModified": 1749008870, + "narHash": "sha256-5QEAcgawS2tOJrLr+U5DtzlShSCEpeg7PZDC7txvLQs=", + "rev": "c2a03962b8e24e669fb37b7df10e7c79531ff1a4", "type": "tarball", - "url": "https://releases.nixos.org/nixos/unstable/nixos-25.11pre808478.910796cabe43/nixexprs.tar.xz?rev=910796cabe436259a29a72e8d3f5e180fc6dfacc" + "url": "https://releases.nixos.org/nixos/unstable/nixos-25.11pre810143.c2a03962b8e2/nixexprs.tar.xz?rev=c2a03962b8e24e669fb37b7df10e7c79531ff1a4" }, "original": { "type": "tarball", From 068a7ddb88bd82274feb96562cccbc4d23b00016 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Fri, 6 Jun 2025 00:00:31 +0200 Subject: [PATCH 142/168] chore(deps): lock file maintenance --- flake.lock | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/flake.lock b/flake.lock index 8a5c3c0..2020a85 100644 --- a/flake.lock +++ b/flake.lock @@ -226,11 +226,11 @@ ] }, "locked": { - "lastModified": 1748665073, - "narHash": "sha256-RMhjnPKWtCoIIHiuR9QKD7xfsKb3agxzMfJY8V9MOew=", + "lastModified": 1749154018, + "narHash": "sha256-gjN3j7joRvT3a8Zgcylnd4NFsnXeDBumqiu4HmY1RIg=", "owner": "nix-community", "repo": "home-manager", - "rev": "282e1e029cb6ab4811114fc85110613d72771dea", + "rev": "7aae0ee71a17b19708b93b3ed448a1a0952bf111", "type": "github" }, "original": { @@ -303,11 +303,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1749054198, - "narHash": "sha256-eiB3nIV15CnBtWrXXAmWcLZ1mbVWRwtwggltPgOLe64=", - "rev": "8f1b52b04f2cb6e5ead50bd28d76528a2f0380ef", + "lastModified": 1749143784, + "narHash": "sha256-xpJsyRzAdaQ+wjdGweeRe3qAC03vpP6NjeDvvWRI0zk=", + "rev": "4792576cb003c994bd7cc1edada3129def20b27d", "type": "tarball", - "url": "https://releases.nixos.org/nixos/25.05/nixos-25.05.803396.8f1b52b04f2c/nixexprs.tar.xz?rev=8f1b52b04f2cb6e5ead50bd28d76528a2f0380ef" + "url": "https://releases.nixos.org/nixos/25.05/nixos-25.05.803471.4792576cb003/nixexprs.tar.xz?rev=4792576cb003c994bd7cc1edada3129def20b27d" }, "original": { "type": "tarball", @@ -328,11 +328,11 @@ ] }, "locked": { - "lastModified": 1749028068, - "narHash": "sha256-ebxyRA7rK6Jb3eXvz+0QcyKLHzUnUQWRFDbKleLdLZ8=", + "lastModified": 1749107808, + "narHash": "sha256-ohLHvWmAuH4aHOCAGP1UlwRRxX21/eW+N2e7eB0kQeo=", "owner": "nix-community", "repo": "nixvim", - "rev": "1d8724144cef98dad6638e0b6333cc84d0b2f5c3", + "rev": "635a9e770f77a7c586c60f84b1debf054318034a", "type": "github" }, "original": { @@ -410,11 +410,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1749058304, - "narHash": "sha256-8fUXBczmQ7/Y8nrc988oaN4M7YZz/RbzZa0n1d8i3GM=", + "lastModified": 1749154998, + "narHash": "sha256-I+r+1nUZ3EOzYrdWcPfMxwCa5sl0ntVn6/KHXzzIqu0=", "owner": "nix-community", "repo": "stylix", - "rev": "689d4db89d3be6fd82b7dcb41a1cea5c4743b1ef", + "rev": "e1aeebcc59f932e4052dab81795e9634397b9838", "type": "github" }, "original": { From b5b79fb9c046ae850007118e0c4557ae32731e91 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Sat, 7 Jun 2025 00:00:17 +0200 Subject: [PATCH 143/168] chore(deps): lock file maintenance --- flake.lock | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/flake.lock b/flake.lock index 2020a85..2342da5 100644 --- a/flake.lock +++ b/flake.lock @@ -328,11 +328,11 @@ ] }, "locked": { - "lastModified": 1749107808, - "narHash": "sha256-ohLHvWmAuH4aHOCAGP1UlwRRxX21/eW+N2e7eB0kQeo=", + "lastModified": 1749200997, + "narHash": "sha256-In+NjXI8kfJpamTmtytt+rnBzQ213Y9KW55IXvAAK/4=", "owner": "nix-community", "repo": "nixvim", - "rev": "635a9e770f77a7c586c60f84b1debf054318034a", + "rev": "00524c7935f05606fd1b09e8700e9abcc4af7be8", "type": "github" }, "original": { @@ -410,11 +410,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1749154998, - "narHash": "sha256-I+r+1nUZ3EOzYrdWcPfMxwCa5sl0ntVn6/KHXzzIqu0=", + "lastModified": 1749238594, + "narHash": "sha256-pM5Mw81XTgMcrzw+br2ES/THEN1jrznEtWZ+SqnQAEY=", "owner": "nix-community", "repo": "stylix", - "rev": "e1aeebcc59f932e4052dab81795e9634397b9838", + "rev": "2759a42f9be7adf3ca09c7a6c3bf8b94d61fba84", "type": "github" }, "original": { @@ -527,11 +527,11 @@ ] }, "locked": { - "lastModified": 1748243702, - "narHash": "sha256-9YzfeN8CB6SzNPyPm2XjRRqSixDopTapaRsnTpXUEY8=", + "lastModified": 1749194973, + "narHash": "sha256-eEy8cuS0mZ2j/r/FE0/LYBSBcIs/MKOIVakwHVuqTfk=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "1f3f7b784643d488ba4bf315638b2b0a4c5fb007", + "rev": "a05be418a1af1198ca0f63facb13c985db4cb3c5", "type": "github" }, "original": { @@ -542,11 +542,11 @@ }, "unstable": { "locked": { - "lastModified": 1749008870, - "narHash": "sha256-5QEAcgawS2tOJrLr+U5DtzlShSCEpeg7PZDC7txvLQs=", - "rev": "c2a03962b8e24e669fb37b7df10e7c79531ff1a4", + "lastModified": 1749238035, + "narHash": "sha256-+w+VydE8NSQXu8RSNLhn0fVMaEoFPgUbNYa8m1rewuM=", + "rev": "d3d2d80a2191a73d1e86456a751b83aa13085d7d", "type": "tarball", - "url": "https://releases.nixos.org/nixos/unstable/nixos-25.11pre810143.c2a03962b8e2/nixexprs.tar.xz?rev=c2a03962b8e24e669fb37b7df10e7c79531ff1a4" + "url": "https://releases.nixos.org/nixos/unstable/nixos-25.11pre811203.d3d2d80a2191/nixexprs.tar.xz?rev=d3d2d80a2191a73d1e86456a751b83aa13085d7d" }, "original": { "type": "tarball", From b078051f7c386caddd91bc760793acae37758087 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Mon, 9 Jun 2025 00:00:29 +0200 Subject: [PATCH 144/168] chore(deps): lock file maintenance --- flake.lock | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/flake.lock b/flake.lock index 2342da5..5807172 100644 --- a/flake.lock +++ b/flake.lock @@ -90,11 +90,11 @@ ] }, "locked": { - "lastModified": 1748821116, - "narHash": "sha256-F82+gS044J1APL0n4hH50GYdPRv/5JWm34oCJYmVKdE=", + "lastModified": 1749398372, + "narHash": "sha256-tYBdgS56eXYaWVW3fsnPQ/nFlgWi/Z2Ymhyu21zVM98=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "49f0870db23e8c1ca0b5259734a02cd9e1e371a1", + "rev": "9305fe4e5c2a6fcf5ba6a3ff155720fbe4076569", "type": "github" }, "original": { @@ -303,11 +303,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1749143784, - "narHash": "sha256-xpJsyRzAdaQ+wjdGweeRe3qAC03vpP6NjeDvvWRI0zk=", - "rev": "4792576cb003c994bd7cc1edada3129def20b27d", + "lastModified": 1749375374, + "narHash": "sha256-0RxtgAd4gHYPFFwICal8k8hvJBOkCeTjFkh4HsqYDbE=", + "rev": "70c74b02eac46f4e4aa071e45a6189ce0f6d9265", "type": "tarball", - "url": "https://releases.nixos.org/nixos/25.05/nixos-25.05.803471.4792576cb003/nixexprs.tar.xz?rev=4792576cb003c994bd7cc1edada3129def20b27d" + "url": "https://releases.nixos.org/nixos/25.05/nixos-25.05.803579.70c74b02eac4/nixexprs.tar.xz?rev=70c74b02eac46f4e4aa071e45a6189ce0f6d9265" }, "original": { "type": "tarball", @@ -328,11 +328,11 @@ ] }, "locked": { - "lastModified": 1749200997, - "narHash": "sha256-In+NjXI8kfJpamTmtytt+rnBzQ213Y9KW55IXvAAK/4=", + "lastModified": 1749384429, + "narHash": "sha256-a7iDfgvEESk4D07g9cpLd+3AKEtnfREcC7MNvNoC1Ys=", "owner": "nix-community", "repo": "nixvim", - "rev": "00524c7935f05606fd1b09e8700e9abcc4af7be8", + "rev": "dce571fae5ce603d3e22221d64b118dea45811cd", "type": "github" }, "original": { @@ -353,11 +353,11 @@ ] }, "locked": { - "lastModified": 1748298102, - "narHash": "sha256-PP11GVwUt7F4ZZi5A5+99isuq39C59CKc5u5yVisU/U=", + "lastModified": 1749419246, + "narHash": "sha256-rQctLGA1kF8B/wLIe7TTy+mQk23/zkkKzy/dr3nCAvE=", "owner": "NuschtOS", "repo": "search", - "rev": "f8a1c221afb8b4c642ed11ac5ee6746b0fe1d32f", + "rev": "b8a5bb93097d5a5f51c2ca136d1fe33e06188f31", "type": "github" }, "original": { @@ -410,11 +410,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1749238594, - "narHash": "sha256-pM5Mw81XTgMcrzw+br2ES/THEN1jrznEtWZ+SqnQAEY=", + "lastModified": 1749389855, + "narHash": "sha256-//wZBnlBJ7Ki5/ZdafiAZwVFZd/2HhKqEbOupo/HcRA=", "owner": "nix-community", "repo": "stylix", - "rev": "2759a42f9be7adf3ca09c7a6c3bf8b94d61fba84", + "rev": "bf5ab9df57a3d77847289c39c3a537bd6e6ac6f4", "type": "github" }, "original": { @@ -542,11 +542,11 @@ }, "unstable": { "locked": { - "lastModified": 1749238035, - "narHash": "sha256-+w+VydE8NSQXu8RSNLhn0fVMaEoFPgUbNYa8m1rewuM=", - "rev": "d3d2d80a2191a73d1e86456a751b83aa13085d7d", + "lastModified": 1749393960, + "narHash": "sha256-qYyUe0adJrvE1imY6TDUgCao1WR2g6vIYzJ8SGcf3l0=", + "rev": "3e3afe5174c561dee0df6f2c2b2236990146329f", "type": "tarball", - "url": "https://releases.nixos.org/nixos/unstable/nixos-25.11pre811203.d3d2d80a2191/nixexprs.tar.xz?rev=d3d2d80a2191a73d1e86456a751b83aa13085d7d" + "url": "https://releases.nixos.org/nixos/unstable/nixos-25.11pre811950.3e3afe5174c5/nixexprs.tar.xz?rev=3e3afe5174c561dee0df6f2c2b2236990146329f" }, "original": { "type": "tarball", From 0fe8c2f94536e0d34835f932c5f5e5320801a5fe Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Mon, 9 Jun 2025 00:30:18 +0200 Subject: [PATCH 145/168] chore(deps): lock file maintenance --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 5807172..2d7a61a 100644 --- a/flake.lock +++ b/flake.lock @@ -328,11 +328,11 @@ ] }, "locked": { - "lastModified": 1749384429, - "narHash": "sha256-a7iDfgvEESk4D07g9cpLd+3AKEtnfREcC7MNvNoC1Ys=", + "lastModified": 1749420898, + "narHash": "sha256-QiB3xDyHuj2VzS6AaALTeikLt6EsZyMjDRmzb4y2vFM=", "owner": "nix-community", "repo": "nixvim", - "rev": "dce571fae5ce603d3e22221d64b118dea45811cd", + "rev": "2b6f694b48f43bbd89dcc21e8aa7aa676eb18eb8", "type": "github" }, "original": { From 25939fc9c98b9dcb40c62aa02c8b39f56a59e2ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jalil=20David=20Salam=C3=A9=20Messina?= Date: Mon, 9 Jun 2025 23:32:49 +0200 Subject: [PATCH 146/168] fix(docs): nuschtosSearch was broken Fixed it and pulled in the PR. also did some tidying up of the docs. --- docs/book.toml | 6 ++++++ flake-modules/docs.nix | 2 +- flake.lock | 7 ++++--- flake.nix | 2 +- 4 files changed, 12 insertions(+), 5 deletions(-) diff --git a/docs/book.toml b/docs/book.toml index 77ec9d4..aa7e72e 100644 --- a/docs/book.toml +++ b/docs/book.toml @@ -5,6 +5,12 @@ multilingual = false src = "src" title = "Jalil's NixOS configuration modules" +[build] +create-missing = false + [preprocessor.toc] command = "mdbook-toc" renderer = ["html"] + +[output.html] +git-repository-url = "https://github.com/jalil-salame/configuration.nix" diff --git a/flake-modules/docs.nix b/flake-modules/docs.nix index d296e38..594d592 100644 --- a/flake-modules/docs.nix +++ b/flake-modules/docs.nix @@ -62,7 +62,7 @@ ''; # FIXME: only add the `/configuration.nix/` part for GH CI nativeBuildInputs = [ pkgs.mdbook-toc ]; - buildPhase = "${pkgs.mdbook}/bin/mdbook build --dest-dir \"$out\""; + buildPhase = "${pkgs.mdbook}/bin/mdbook build --dest-dir $out"; }; }; }; diff --git a/flake.lock b/flake.lock index 2d7a61a..6d23f40 100644 --- a/flake.lock +++ b/flake.lock @@ -353,15 +353,16 @@ ] }, "locked": { - "lastModified": 1749419246, - "narHash": "sha256-rQctLGA1kF8B/wLIe7TTy+mQk23/zkkKzy/dr3nCAvE=", + "lastModified": 1749507435, + "narHash": "sha256-EHlfZyOywnFxU3f7bgaEio073LO/HwqQjdTQRKaqUuk=", "owner": "NuschtOS", "repo": "search", - "rev": "b8a5bb93097d5a5f51c2ca136d1fe33e06188f31", + "rev": "ca64563e12ec6f54842bb6182a3d2b9517d54bed", "type": "github" }, "original": { "owner": "NuschtOS", + "ref": "pull/232/head", "repo": "search", "type": "github" } diff --git a/flake.nix b/flake.nix index 795adef..0152d12 100644 --- a/flake.nix +++ b/flake.nix @@ -57,7 +57,7 @@ }; # For generating the docs (can be set to null) nuschtosSearch = { - url = "github:NuschtOS/search"; + url = "github:NuschtOS/search/pull/232/head"; # fix inputs = { nixpkgs.follows = "nixpkgs"; flake-utils.follows = "lix-module/flake-utils"; From 564a593d119f94bce245e587897c02cdacada530 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Tue, 10 Jun 2025 00:30:17 +0200 Subject: [PATCH 147/168] chore(deps): lock file maintenance --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 6d23f40..659b1d5 100644 --- a/flake.lock +++ b/flake.lock @@ -328,11 +328,11 @@ ] }, "locked": { - "lastModified": 1749420898, - "narHash": "sha256-QiB3xDyHuj2VzS6AaALTeikLt6EsZyMjDRmzb4y2vFM=", + "lastModified": 1749496904, + "narHash": "sha256-eNDMzrcDBOprdJs7DpMOJfCEcxribxDJP2OjozSC3Wo=", "owner": "nix-community", "repo": "nixvim", - "rev": "2b6f694b48f43bbd89dcc21e8aa7aa676eb18eb8", + "rev": "e0b3d8bc3a0ab5a7cc0792c7705e92f9c5c598f3", "type": "github" }, "original": { @@ -411,11 +411,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1749389855, - "narHash": "sha256-//wZBnlBJ7Ki5/ZdafiAZwVFZd/2HhKqEbOupo/HcRA=", + "lastModified": 1749482869, + "narHash": "sha256-mJTMG3olJSjY4C6Q5RkRRDyGoSQk2FGOQvZYSMJKcw4=", "owner": "nix-community", "repo": "stylix", - "rev": "bf5ab9df57a3d77847289c39c3a537bd6e6ac6f4", + "rev": "82930e92e8990b6ac1be0a81c7727c7cd63220bd", "type": "github" }, "original": { From 6252bb3907dd1853ba813c8526c119d39506c801 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Wed, 11 Jun 2025 00:00:27 +0200 Subject: [PATCH 148/168] chore(deps): lock file maintenance --- flake.lock | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/flake.lock b/flake.lock index 659b1d5..05bcab5 100644 --- a/flake.lock +++ b/flake.lock @@ -303,11 +303,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1749375374, - "narHash": "sha256-0RxtgAd4gHYPFFwICal8k8hvJBOkCeTjFkh4HsqYDbE=", - "rev": "70c74b02eac46f4e4aa071e45a6189ce0f6d9265", + "lastModified": 1749552229, + "narHash": "sha256-rRKvfM4JGmbEAWL/HwMhh00W0zoYVAoEqajQ9Iao1MU=", + "rev": "88331c17ba434359491e8d5889cce872464052c2", "type": "tarball", - "url": "https://releases.nixos.org/nixos/25.05/nixos-25.05.803579.70c74b02eac4/nixexprs.tar.xz?rev=70c74b02eac46f4e4aa071e45a6189ce0f6d9265" + "url": "https://releases.nixos.org/nixos/25.05/nixos-25.05.803751.88331c17ba43/nixexprs.tar.xz?rev=88331c17ba434359491e8d5889cce872464052c2" }, "original": { "type": "tarball", @@ -411,11 +411,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1749482869, - "narHash": "sha256-mJTMG3olJSjY4C6Q5RkRRDyGoSQk2FGOQvZYSMJKcw4=", + "lastModified": 1749579811, + "narHash": "sha256-sdyK8oWWDwxGXLvHTzcSfcb3sAdIb9UJYPVWlgb3eUM=", "owner": "nix-community", "repo": "stylix", - "rev": "82930e92e8990b6ac1be0a81c7727c7cd63220bd", + "rev": "51fb6796fd61c6b9e02b950ccb8baccd8602de2e", "type": "github" }, "original": { From 0b8a3ffe43b4a8c33cb8bc2fe015e22180682f72 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Thu, 12 Jun 2025 00:00:16 +0200 Subject: [PATCH 149/168] chore(deps): lock file maintenance --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 05bcab5..dd3363b 100644 --- a/flake.lock +++ b/flake.lock @@ -328,11 +328,11 @@ ] }, "locked": { - "lastModified": 1749496904, - "narHash": "sha256-eNDMzrcDBOprdJs7DpMOJfCEcxribxDJP2OjozSC3Wo=", + "lastModified": 1749644591, + "narHash": "sha256-v72hZJvAA78+LWohTzTwk/OnzsNxbkoTM+G7+iXwdl0=", "owner": "nix-community", "repo": "nixvim", - "rev": "e0b3d8bc3a0ab5a7cc0792c7705e92f9c5c598f3", + "rev": "64f0d3c86a7894cad9b09bb1015375ffb9949d70", "type": "github" }, "original": { @@ -411,11 +411,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1749579811, - "narHash": "sha256-sdyK8oWWDwxGXLvHTzcSfcb3sAdIb9UJYPVWlgb3eUM=", + "lastModified": 1749671679, + "narHash": "sha256-ijvjSTuWBZOTCUqE5UdmYKN8Hb/hCwFbbvafjoe4o4g=", "owner": "nix-community", "repo": "stylix", - "rev": "51fb6796fd61c6b9e02b950ccb8baccd8602de2e", + "rev": "d4f5e55c3f9f985eff40d41e542702cfc8801726", "type": "github" }, "original": { From 65ca7815d71ae3dd27ec4c69bc2e8d09c5a9f61c Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Fri, 13 Jun 2025 00:00:30 +0200 Subject: [PATCH 150/168] chore(deps): lock file maintenance --- flake.lock | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/flake.lock b/flake.lock index dd3363b..b66de58 100644 --- a/flake.lock +++ b/flake.lock @@ -303,11 +303,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1749552229, - "narHash": "sha256-rRKvfM4JGmbEAWL/HwMhh00W0zoYVAoEqajQ9Iao1MU=", - "rev": "88331c17ba434359491e8d5889cce872464052c2", + "lastModified": 1749750079, + "narHash": "sha256-wRAlD/P6PplFRhPqHrnieshnxSSlRkXiTpzTLWsO3FE=", + "rev": "fd487183437963a59ba763c0cc4f27e3447dd6dd", "type": "tarball", - "url": "https://releases.nixos.org/nixos/25.05/nixos-25.05.803751.88331c17ba43/nixexprs.tar.xz?rev=88331c17ba434359491e8d5889cce872464052c2" + "url": "https://releases.nixos.org/nixos/25.05/nixos-25.05.803882.fd4871834379/nixexprs.tar.xz?rev=fd487183437963a59ba763c0cc4f27e3447dd6dd" }, "original": { "type": "tarball", @@ -328,11 +328,11 @@ ] }, "locked": { - "lastModified": 1749644591, - "narHash": "sha256-v72hZJvAA78+LWohTzTwk/OnzsNxbkoTM+G7+iXwdl0=", + "lastModified": 1749761870, + "narHash": "sha256-y+rCuxTylur4k2MbL8cJwOR3pHIamCxp8xG9Vuhwvgw=", "owner": "nix-community", "repo": "nixvim", - "rev": "64f0d3c86a7894cad9b09bb1015375ffb9949d70", + "rev": "18d838e88945b554d059db5f1fff1daed4b7bf8f", "type": "github" }, "original": { @@ -411,11 +411,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1749671679, - "narHash": "sha256-ijvjSTuWBZOTCUqE5UdmYKN8Hb/hCwFbbvafjoe4o4g=", + "lastModified": 1749756615, + "narHash": "sha256-WZPmoflozppSwgUjGQPBBMUyPJFrHeYhHxPvS/ZqHz0=", "owner": "nix-community", "repo": "stylix", - "rev": "d4f5e55c3f9f985eff40d41e542702cfc8801726", + "rev": "1e9b92c4fceb54bf47ed1b53739f681333c45469", "type": "github" }, "original": { From 41fbc3322195331b6c60fc446a124a297cdca7c6 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Fri, 13 Jun 2025 00:20:13 +0200 Subject: [PATCH 151/168] chore(deps): lock file maintenance --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index b66de58..521e349 100644 --- a/flake.lock +++ b/flake.lock @@ -411,11 +411,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1749756615, - "narHash": "sha256-WZPmoflozppSwgUjGQPBBMUyPJFrHeYhHxPvS/ZqHz0=", + "lastModified": 1749766639, + "narHash": "sha256-ryX5vlkeTggjJCTuaVkGyKSDgrvz45xDalFT9eBi3pk=", "owner": "nix-community", "repo": "stylix", - "rev": "1e9b92c4fceb54bf47ed1b53739f681333c45469", + "rev": "ed2a9fa7ccad5f6b4d27b7e105e54b1af6733da0", "type": "github" }, "original": { From 5cf358465e432255ac48992761adf909643d4c0f Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Sat, 14 Jun 2025 00:00:14 +0200 Subject: [PATCH 152/168] chore(deps): lock file maintenance --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 521e349..d50d895 100644 --- a/flake.lock +++ b/flake.lock @@ -411,11 +411,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1749766639, - "narHash": "sha256-ryX5vlkeTggjJCTuaVkGyKSDgrvz45xDalFT9eBi3pk=", + "lastModified": 1749825872, + "narHash": "sha256-smQ53ejSSB6PyXv84Wj269RxdA6WDIjz0fK1GTmM7Js=", "owner": "nix-community", "repo": "stylix", - "rev": "ed2a9fa7ccad5f6b4d27b7e105e54b1af6733da0", + "rev": "1a11f3526fb0b51f1dffebb328d187daee97fbcf", "type": "github" }, "original": { From 5f8e319f9a3d2305d4fba1b7277332aff4df49c5 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Sun, 15 Jun 2025 00:00:18 +0200 Subject: [PATCH 153/168] chore(deps): lock file maintenance --- flake.lock | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/flake.lock b/flake.lock index d50d895..406a58e 100644 --- a/flake.lock +++ b/flake.lock @@ -328,11 +328,11 @@ ] }, "locked": { - "lastModified": 1749761870, - "narHash": "sha256-y+rCuxTylur4k2MbL8cJwOR3pHIamCxp8xG9Vuhwvgw=", + "lastModified": 1749924512, + "narHash": "sha256-IYv0yEFh86c+UnkcjrUAV0UeIE+9vMEeXDIF+YRlooc=", "owner": "nix-community", "repo": "nixvim", - "rev": "18d838e88945b554d059db5f1fff1daed4b7bf8f", + "rev": "e114d442b14f3a299307ca9b0f0eab20e821f419", "type": "github" }, "original": { @@ -411,11 +411,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1749825872, - "narHash": "sha256-smQ53ejSSB6PyXv84Wj269RxdA6WDIjz0fK1GTmM7Js=", + "lastModified": 1749908208, + "narHash": "sha256-0nf9P4kRAzsBvf5jbY7M3NlnGSwBzU50kJAYGZH5Ez4=", "owner": "nix-community", "repo": "stylix", - "rev": "1a11f3526fb0b51f1dffebb328d187daee97fbcf", + "rev": "67c8eca32f1baf158ffb9a56f28a2fc8e9852fb0", "type": "github" }, "original": { @@ -543,11 +543,11 @@ }, "unstable": { "locked": { - "lastModified": 1749393960, - "narHash": "sha256-qYyUe0adJrvE1imY6TDUgCao1WR2g6vIYzJ8SGcf3l0=", - "rev": "3e3afe5174c561dee0df6f2c2b2236990146329f", + "lastModified": 1749887730, + "narHash": "sha256-gQNGmTBOXstut+K8DFGn5EQNAiRvbN2P/CTphqbn9SM=", + "rev": "ee930f9755f58096ac6e8ca94a1887e0534e2d81", "type": "tarball", - "url": "https://releases.nixos.org/nixos/unstable/nixos-25.11pre811950.3e3afe5174c5/nixexprs.tar.xz?rev=3e3afe5174c561dee0df6f2c2b2236990146329f" + "url": "https://releases.nixos.org/nixos/unstable/nixos-25.11pre814309.ee930f9755f5/nixexprs.tar.xz?rev=ee930f9755f58096ac6e8ca94a1887e0534e2d81" }, "original": { "type": "tarball", From aa79389d665146ea44be93f5a256b7d71bc1b0fd Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Mon, 16 Jun 2025 00:00:32 +0200 Subject: [PATCH 154/168] chore(deps): lock file maintenance --- flake.lock | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/flake.lock b/flake.lock index 406a58e..b993ad4 100644 --- a/flake.lock +++ b/flake.lock @@ -303,11 +303,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1749750079, - "narHash": "sha256-wRAlD/P6PplFRhPqHrnieshnxSSlRkXiTpzTLWsO3FE=", - "rev": "fd487183437963a59ba763c0cc4f27e3447dd6dd", + "lastModified": 1749988255, + "narHash": "sha256-+W/3yiEeSZ+qTbd8eyHRujwP4ER/suXwLbp5DvqwXNU=", + "rev": "5f4f306bea96741f1588ea4f450b2a2e29f42b98", "type": "tarball", - "url": "https://releases.nixos.org/nixos/25.05/nixos-25.05.803882.fd4871834379/nixexprs.tar.xz?rev=fd487183437963a59ba763c0cc4f27e3447dd6dd" + "url": "https://releases.nixos.org/nixos/25.05/nixos-25.05.804002.5f4f306bea96/nixexprs.tar.xz?rev=5f4f306bea96741f1588ea4f450b2a2e29f42b98" }, "original": { "type": "tarball", @@ -328,11 +328,11 @@ ] }, "locked": { - "lastModified": 1749924512, - "narHash": "sha256-IYv0yEFh86c+UnkcjrUAV0UeIE+9vMEeXDIF+YRlooc=", + "lastModified": 1750022650, + "narHash": "sha256-Dllcid/yOQYlsvy+Fne3JvGq85CAHpKkiLfh9wSMPrM=", "owner": "nix-community", "repo": "nixvim", - "rev": "e114d442b14f3a299307ca9b0f0eab20e821f419", + "rev": "7176d51a343c642d4cc6c4ac3f547b54850b0e82", "type": "github" }, "original": { @@ -411,11 +411,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1749908208, - "narHash": "sha256-0nf9P4kRAzsBvf5jbY7M3NlnGSwBzU50kJAYGZH5Ez4=", + "lastModified": 1750004053, + "narHash": "sha256-cwAmZfeIxMwTFcKvNLb+XXmgtt2WpAhCgtYhzwpDvjE=", "owner": "nix-community", "repo": "stylix", - "rev": "67c8eca32f1baf158ffb9a56f28a2fc8e9852fb0", + "rev": "14c82bf2d7c8c3ef62b0cf560a53b51aa2724f82", "type": "github" }, "original": { From 20b7580a594f9aca0a04ea2c02ad78781ed0c34f Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Mon, 16 Jun 2025 00:10:18 +0200 Subject: [PATCH 155/168] chore(deps): lock file maintenance --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index b993ad4..e518c42 100644 --- a/flake.lock +++ b/flake.lock @@ -411,11 +411,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1750004053, - "narHash": "sha256-cwAmZfeIxMwTFcKvNLb+XXmgtt2WpAhCgtYhzwpDvjE=", + "lastModified": 1750025377, + "narHash": "sha256-7gCZ+W0lMLIOvGjgLqej9pwS4cNd8ohnFxpm/JZxeTY=", "owner": "nix-community", "repo": "stylix", - "rev": "14c82bf2d7c8c3ef62b0cf560a53b51aa2724f82", + "rev": "2945d80172e0a82bbdbfe44c205d28ee5d097a5a", "type": "github" }, "original": { From f528a7ed77baaf5160ef6c8480baf3e1a485c4de Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Tue, 17 Jun 2025 00:00:27 +0200 Subject: [PATCH 156/168] chore(deps): lock file maintenance --- flake.lock | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/flake.lock b/flake.lock index e518c42..52b7276 100644 --- a/flake.lock +++ b/flake.lock @@ -303,11 +303,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1749988255, - "narHash": "sha256-+W/3yiEeSZ+qTbd8eyHRujwP4ER/suXwLbp5DvqwXNU=", - "rev": "5f4f306bea96741f1588ea4f450b2a2e29f42b98", + "lastModified": 1750082499, + "narHash": "sha256-ivdukr+0UIQVZjFqXLFNLUj527r3rFIzMwkq3AAhKHQ=", + "rev": "6c64dabd3aa85e0c02ef1cdcb6e1213de64baee3", "type": "tarball", - "url": "https://releases.nixos.org/nixos/25.05/nixos-25.05.804002.5f4f306bea96/nixexprs.tar.xz?rev=5f4f306bea96741f1588ea4f450b2a2e29f42b98" + "url": "https://releases.nixos.org/nixos/25.05/nixos-25.05.804113.6c64dabd3aa8/nixexprs.tar.xz?rev=6c64dabd3aa85e0c02ef1cdcb6e1213de64baee3" }, "original": { "type": "tarball", @@ -328,11 +328,11 @@ ] }, "locked": { - "lastModified": 1750022650, - "narHash": "sha256-Dllcid/yOQYlsvy+Fne3JvGq85CAHpKkiLfh9wSMPrM=", + "lastModified": 1750105753, + "narHash": "sha256-reWddMyGkxjackE4VSZ2NjOQlAdfiofhCEWFHapblNI=", "owner": "nix-community", "repo": "nixvim", - "rev": "7176d51a343c642d4cc6c4ac3f547b54850b0e82", + "rev": "ab0a3682cc40da89029dcb3f467b46ae3b8c0fd1", "type": "github" }, "original": { From bf58f1ab8c3e96b5fe8a5aab05450553e3e97ef0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jalil=20David=20Salam=C3=A9=20Messina?= Date: Tue, 17 Jun 2025 13:45:05 +0200 Subject: [PATCH 157/168] fix(sway): remove caps:swapescape setting Should be configured downstream instead --- modules/hm/gui/sway.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/modules/hm/gui/sway.nix b/modules/hm/gui/sway.nix index 5ed2293..9c7a312 100644 --- a/modules/hm/gui/sway.nix +++ b/modules/hm/gui/sway.nix @@ -97,8 +97,6 @@ in input."type:keyboard" = { repeat_delay = "300"; repeat_rate = "50"; - xkb_options = "caps:swapescape,compose:ralt"; - xkb_numlock = "enabled"; }; # Touchpad input."type:touchpad" = { From 4cd43d5e17f1eef36463463ac58a576d7b7c5bcd Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Wed, 18 Jun 2025 00:00:29 +0200 Subject: [PATCH 158/168] chore(deps): lock file maintenance --- flake.lock | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/flake.lock b/flake.lock index 52b7276..12edaa1 100644 --- a/flake.lock +++ b/flake.lock @@ -328,11 +328,11 @@ ] }, "locked": { - "lastModified": 1750105753, - "narHash": "sha256-reWddMyGkxjackE4VSZ2NjOQlAdfiofhCEWFHapblNI=", + "lastModified": 1750187570, + "narHash": "sha256-/SpLFjBt6mZQszhASi5bWxjx0xE7d3r0TfKSABhBgKE=", "owner": "nix-community", "repo": "nixvim", - "rev": "ab0a3682cc40da89029dcb3f467b46ae3b8c0fd1", + "rev": "b4750c46961be18d6cd61c121fa3f43082a64a3c", "type": "github" }, "original": { @@ -543,11 +543,11 @@ }, "unstable": { "locked": { - "lastModified": 1749887730, - "narHash": "sha256-gQNGmTBOXstut+K8DFGn5EQNAiRvbN2P/CTphqbn9SM=", - "rev": "ee930f9755f58096ac6e8ca94a1887e0534e2d81", + "lastModified": 1750193856, + "narHash": "sha256-KCfcRCnagwT0TG2C82SHsahzL+yG3DugHZIlSYbwAmY=", + "rev": "9e83b64f727c88a7711a2c463a7b16eedb69a84c", "type": "tarball", - "url": "https://releases.nixos.org/nixos/unstable/nixos-25.11pre814309.ee930f9755f5/nixexprs.tar.xz?rev=ee930f9755f58096ac6e8ca94a1887e0534e2d81" + "url": "https://releases.nixos.org/nixos/unstable/nixos-25.11pre816272.9e83b64f727c/nixexprs.tar.xz?rev=9e83b64f727c88a7711a2c463a7b16eedb69a84c" }, "original": { "type": "tarball", From 23635136b856b6a5a9fd1dc088b2ed234450d10d Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Thu, 19 Jun 2025 00:00:25 +0200 Subject: [PATCH 159/168] chore(deps): lock file maintenance --- flake.lock | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/flake.lock b/flake.lock index 12edaa1..e5dbfae 100644 --- a/flake.lock +++ b/flake.lock @@ -303,11 +303,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1750082499, - "narHash": "sha256-ivdukr+0UIQVZjFqXLFNLUj527r3rFIzMwkq3AAhKHQ=", - "rev": "6c64dabd3aa85e0c02ef1cdcb6e1213de64baee3", + "lastModified": 1750215637, + "narHash": "sha256-EeKVw2NRn4Uo+Khb/K+Dzc0DabwuHYneG0mWflWkxHg=", + "rev": "36ab78dab7da2e4e27911007033713bab534187b", "type": "tarball", - "url": "https://releases.nixos.org/nixos/25.05/nixos-25.05.804113.6c64dabd3aa8/nixexprs.tar.xz?rev=6c64dabd3aa85e0c02ef1cdcb6e1213de64baee3" + "url": "https://releases.nixos.org/nixos/25.05/nixos-25.05.804219.36ab78dab7da/nixexprs.tar.xz?rev=36ab78dab7da2e4e27911007033713bab534187b" }, "original": { "type": "tarball", @@ -328,11 +328,11 @@ ] }, "locked": { - "lastModified": 1750187570, - "narHash": "sha256-/SpLFjBt6mZQszhASi5bWxjx0xE7d3r0TfKSABhBgKE=", + "lastModified": 1750249714, + "narHash": "sha256-7r0jQlHQfWkI6dNH6DmofYs4Ha2wB0voqwU4GI+tif0=", "owner": "nix-community", "repo": "nixvim", - "rev": "b4750c46961be18d6cd61c121fa3f43082a64a3c", + "rev": "fef045cb912e51185d0d5d67e035eca7fea7eda4", "type": "github" }, "original": { @@ -411,11 +411,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1750025377, - "narHash": "sha256-7gCZ+W0lMLIOvGjgLqej9pwS4cNd8ohnFxpm/JZxeTY=", + "lastModified": 1750246804, + "narHash": "sha256-PpfLVyPk1fS67g2RI/gkR9eeo1gExae/29xxXf7GhIU=", "owner": "nix-community", "repo": "stylix", - "rev": "2945d80172e0a82bbdbfe44c205d28ee5d097a5a", + "rev": "614f53d3d0e97ade9cffe8b7475dd90dce365821", "type": "github" }, "original": { From 88613523c9873ecc388ebc91fe7c866039d1c8c3 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Fri, 20 Jun 2025 00:00:14 +0200 Subject: [PATCH 160/168] chore(deps): lock file maintenance --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index e5dbfae..e1606b2 100644 --- a/flake.lock +++ b/flake.lock @@ -328,11 +328,11 @@ ] }, "locked": { - "lastModified": 1750249714, - "narHash": "sha256-7r0jQlHQfWkI6dNH6DmofYs4Ha2wB0voqwU4GI+tif0=", + "lastModified": 1750345447, + "narHash": "sha256-yOuSSfI4xovXQpSkZUK02CBcY1f0Nvm0RhnUN8xn2rY=", "owner": "nix-community", "repo": "nixvim", - "rev": "fef045cb912e51185d0d5d67e035eca7fea7eda4", + "rev": "6a1a348ab1f00bd32d2392b5c2fc72489c699af3", "type": "github" }, "original": { @@ -411,11 +411,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1750246804, - "narHash": "sha256-PpfLVyPk1fS67g2RI/gkR9eeo1gExae/29xxXf7GhIU=", + "lastModified": 1750370365, + "narHash": "sha256-Yblt2LusglzBXlg+ekckztIUgvl1WQwJ7gLRJEt/IHE=", "owner": "nix-community", "repo": "stylix", - "rev": "614f53d3d0e97ade9cffe8b7475dd90dce365821", + "rev": "cc82dae884f45ffeb996d2b5116afa70933e507f", "type": "github" }, "original": { From d4c9d05c88ad1b3147e0e0a9db589d9d132a38e8 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Sat, 21 Jun 2025 00:00:26 +0200 Subject: [PATCH 161/168] chore(deps): lock file maintenance --- flake.lock | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/flake.lock b/flake.lock index e1606b2..3146989 100644 --- a/flake.lock +++ b/flake.lock @@ -303,11 +303,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1750215637, - "narHash": "sha256-EeKVw2NRn4Uo+Khb/K+Dzc0DabwuHYneG0mWflWkxHg=", - "rev": "36ab78dab7da2e4e27911007033713bab534187b", + "lastModified": 1750380620, + "narHash": "sha256-c++Ep+nDeZxZVpEWGRrGORAMv/+jYSv+b5lJ7edOBVI=", + "rev": "9ba04bda9249d5d5e5238303c9755de5a49a79c5", "type": "tarball", - "url": "https://releases.nixos.org/nixos/25.05/nixos-25.05.804219.36ab78dab7da/nixexprs.tar.xz?rev=36ab78dab7da2e4e27911007033713bab534187b" + "url": "https://releases.nixos.org/nixos/25.05/nixos-25.05.804329.9ba04bda9249/nixexprs.tar.xz?rev=9ba04bda9249d5d5e5238303c9755de5a49a79c5" }, "original": { "type": "tarball", @@ -543,11 +543,11 @@ }, "unstable": { "locked": { - "lastModified": 1750193856, - "narHash": "sha256-KCfcRCnagwT0TG2C82SHsahzL+yG3DugHZIlSYbwAmY=", - "rev": "9e83b64f727c88a7711a2c463a7b16eedb69a84c", + "lastModified": 1750412855, + "narHash": "sha256-LPEVD7FWRX+GFVWxIxNFLIB7kqet4tsAnV4mCKTdxNo=", + "rev": "08f22084e6085d19bcfb4be30d1ca76ecb96fe54", "type": "tarball", - "url": "https://releases.nixos.org/nixos/unstable/nixos-25.11pre816272.9e83b64f727c/nixexprs.tar.xz?rev=9e83b64f727c88a7711a2c463a7b16eedb69a84c" + "url": "https://releases.nixos.org/nixos/unstable/nixos-25.11pre818804.08f22084e608/nixexprs.tar.xz?rev=08f22084e6085d19bcfb4be30d1ca76ecb96fe54" }, "original": { "type": "tarball", From 87f844074352cce1e031493de34b05ded0fa571f Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Sat, 21 Jun 2025 00:50:26 +0200 Subject: [PATCH 162/168] chore(deps): lock file maintenance --- flake.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index 3146989..fbf9434 100644 --- a/flake.lock +++ b/flake.lock @@ -303,11 +303,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1750380620, - "narHash": "sha256-c++Ep+nDeZxZVpEWGRrGORAMv/+jYSv+b5lJ7edOBVI=", - "rev": "9ba04bda9249d5d5e5238303c9755de5a49a79c5", + "lastModified": 1750459442, + "narHash": "sha256-iEKIktNTNZ6hmqJBs/k6ow+5rMVSFriKitP9zL2nmpg=", + "rev": "b2485d56967598da068b5a6946dadda8bfcbcd37", "type": "tarball", - "url": "https://releases.nixos.org/nixos/25.05/nixos-25.05.804329.9ba04bda9249/nixexprs.tar.xz?rev=9ba04bda9249d5d5e5238303c9755de5a49a79c5" + "url": "https://releases.nixos.org/nixos/25.05/nixos-25.05.804391.b2485d569675/nixexprs.tar.xz?rev=b2485d56967598da068b5a6946dadda8bfcbcd37" }, "original": { "type": "tarball", From 735128ec3eaf995bee46261f039ff8f04b8c1c96 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Mon, 23 Jun 2025 00:00:14 +0200 Subject: [PATCH 163/168] chore(deps): lock file maintenance --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index fbf9434..d3ebceb 100644 --- a/flake.lock +++ b/flake.lock @@ -328,11 +328,11 @@ ] }, "locked": { - "lastModified": 1750345447, - "narHash": "sha256-yOuSSfI4xovXQpSkZUK02CBcY1f0Nvm0RhnUN8xn2rY=", + "lastModified": 1750619045, + "narHash": "sha256-ucgldLHtLTbtk09NadxBWi8m4tE07VinTSECR+m9lN4=", "owner": "nix-community", "repo": "nixvim", - "rev": "6a1a348ab1f00bd32d2392b5c2fc72489c699af3", + "rev": "d2c3b26bf739686bcb08247692a99766f7c44a3b", "type": "github" }, "original": { @@ -411,11 +411,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1750370365, - "narHash": "sha256-Yblt2LusglzBXlg+ekckztIUgvl1WQwJ7gLRJEt/IHE=", + "lastModified": 1750563757, + "narHash": "sha256-twDY14/KiTarsQwrd0RIbU+P1LU/NIWhBBEoVDtEnS0=", "owner": "nix-community", "repo": "stylix", - "rev": "cc82dae884f45ffeb996d2b5116afa70933e507f", + "rev": "c10a257c37a57f5274a841171a02e5bccf5ae027", "type": "github" }, "original": { From 07cc2eedc289142b3fa349a0c217ceaeb2a36849 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Tue, 24 Jun 2025 00:00:14 +0200 Subject: [PATCH 164/168] chore(deps): lock file maintenance --- flake.lock | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/flake.lock b/flake.lock index d3ebceb..a1016f4 100644 --- a/flake.lock +++ b/flake.lock @@ -328,11 +328,11 @@ ] }, "locked": { - "lastModified": 1750619045, - "narHash": "sha256-ucgldLHtLTbtk09NadxBWi8m4tE07VinTSECR+m9lN4=", + "lastModified": 1750691276, + "narHash": "sha256-F507hXG4ORVpvuFeuoyDo/bmO/rR2PJRB7XhtDuBnBE=", "owner": "nix-community", "repo": "nixvim", - "rev": "d2c3b26bf739686bcb08247692a99766f7c44a3b", + "rev": "1f3e5741a927b5b0a983f08ab9d3bcf313bc141e", "type": "github" }, "original": { @@ -411,11 +411,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1750563757, - "narHash": "sha256-twDY14/KiTarsQwrd0RIbU+P1LU/NIWhBBEoVDtEnS0=", + "lastModified": 1750697672, + "narHash": "sha256-F8z6QXKRZfVKwTj8+Uw920tHGDmiRIOD+BsA6wVGOgY=", "owner": "nix-community", "repo": "stylix", - "rev": "c10a257c37a57f5274a841171a02e5bccf5ae027", + "rev": "438a702dc2a49a48eae380623cdc04fe36ef5422", "type": "github" }, "original": { @@ -543,11 +543,11 @@ }, "unstable": { "locked": { - "lastModified": 1750412855, - "narHash": "sha256-LPEVD7FWRX+GFVWxIxNFLIB7kqet4tsAnV4mCKTdxNo=", - "rev": "08f22084e6085d19bcfb4be30d1ca76ecb96fe54", + "lastModified": 1750633290, + "narHash": "sha256-w7N9SeSxFS0jvkbqyfc6FOGGyNiTQtv5jwbi1l/xpk8=", + "rev": "4206c4cb56751df534751b058295ea61357bbbaa", "type": "tarball", - "url": "https://releases.nixos.org/nixos/unstable/nixos-25.11pre818804.08f22084e608/nixexprs.tar.xz?rev=08f22084e6085d19bcfb4be30d1ca76ecb96fe54" + "url": "https://releases.nixos.org/nixos/unstable/nixos-25.11pre819493.4206c4cb5675/nixexprs.tar.xz?rev=4206c4cb56751df534751b058295ea61357bbbaa" }, "original": { "type": "tarball", From bbbe01b4a634d832623355e5939f036900503103 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jalil=20David=20Salam=C3=A9=20Messina?= Date: Tue, 24 Jun 2025 10:56:16 +0200 Subject: [PATCH 165/168] fix(flake): unpin NuschtOS/search The fix was already upstreamed --- flake.lock | 7 +++---- flake.nix | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/flake.lock b/flake.lock index a1016f4..9bb64b1 100644 --- a/flake.lock +++ b/flake.lock @@ -353,16 +353,15 @@ ] }, "locked": { - "lastModified": 1749507435, - "narHash": "sha256-EHlfZyOywnFxU3f7bgaEio073LO/HwqQjdTQRKaqUuk=", + "lastModified": 1749730855, + "narHash": "sha256-L3x2nSlFkXkM6tQPLJP3oCBMIsRifhIDPMQQdHO5xWo=", "owner": "NuschtOS", "repo": "search", - "rev": "ca64563e12ec6f54842bb6182a3d2b9517d54bed", + "rev": "8dfe5879dd009ff4742b668d9c699bc4b9761742", "type": "github" }, "original": { "owner": "NuschtOS", - "ref": "pull/232/head", "repo": "search", "type": "github" } diff --git a/flake.nix b/flake.nix index 0152d12..795adef 100644 --- a/flake.nix +++ b/flake.nix @@ -57,7 +57,7 @@ }; # For generating the docs (can be set to null) nuschtosSearch = { - url = "github:NuschtOS/search/pull/232/head"; # fix + url = "github:NuschtOS/search"; inputs = { nixpkgs.follows = "nixpkgs"; flake-utils.follows = "lix-module/flake-utils"; From 439157db4c83bfbf9e6f72dfd0aa89a155908ad1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jalil=20David=20Salam=C3=A9=20Messina?= Date: Tue, 24 Jun 2025 18:16:20 +0200 Subject: [PATCH 166/168] fix(flake): pull in lix security fix --- flake.lock | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/flake.lock b/flake.lock index 9bb64b1..d39bd49 100644 --- a/flake.lock +++ b/flake.lock @@ -269,11 +269,11 @@ "lix": { "flake": false, "locked": { - "lastModified": 1747597901, - "narHash": "sha256-jS+P57tXZEl+zvPfEIHFbd1j3xfuWcrcMrcnbm9wWbE=", - "rev": "33eaaf02fd3f380e99032b25e741eeeb10573cad", + "lastModified": 1750762203, + "narHash": "sha256-LmQhjQ7c+AOkwhvR9GFgJOy8oHW35MoQRELtrwyVnPw=", + "rev": "38b358ce27203f972faa2973cf44ba80c758f46e", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/33eaaf02fd3f380e99032b25e741eeeb10573cad.tar.gz?rev=33eaaf02fd3f380e99032b25e741eeeb10573cad" + "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/38b358ce27203f972faa2973cf44ba80c758f46e.tar.gz?rev=38b358ce27203f972faa2973cf44ba80c758f46e" }, "original": { "type": "tarball", @@ -290,11 +290,11 @@ ] }, "locked": { - "lastModified": 1748803223, - "narHash": "sha256-FXndw1CihZcqQu49DziuMQuc0fG8L0nvGkm0JHZKimo=", - "rev": "2226eb3b97f0f89fdcd5bf2d0a2c7723cf771a62", + "lastModified": 1750776670, + "narHash": "sha256-EfA5K5EZAnspmraJrXQlziffVpaT+QDBiE6yKmuaNNQ=", + "rev": "c3c78a32273e89d28367d8605a4c880f0b6607e3", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/2226eb3b97f0f89fdcd5bf2d0a2c7723cf771a62.tar.gz?rev=2226eb3b97f0f89fdcd5bf2d0a2c7723cf771a62" + "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/c3c78a32273e89d28367d8605a4c880f0b6607e3.tar.gz?rev=c3c78a32273e89d28367d8605a4c880f0b6607e3" }, "original": { "type": "tarball", From 941823ec3c80d332687a1a918703d2f233792495 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Wed, 25 Jun 2025 00:00:28 +0200 Subject: [PATCH 167/168] chore(deps): lock file maintenance --- flake.lock | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/flake.lock b/flake.lock index d39bd49..3427543 100644 --- a/flake.lock +++ b/flake.lock @@ -226,11 +226,11 @@ ] }, "locked": { - "lastModified": 1749154018, - "narHash": "sha256-gjN3j7joRvT3a8Zgcylnd4NFsnXeDBumqiu4HmY1RIg=", + "lastModified": 1750792728, + "narHash": "sha256-Lh3dopA8DdY+ZoaAJPrtkZOZaFEJGSYjOdAYYgOPgE4=", "owner": "nix-community", "repo": "home-manager", - "rev": "7aae0ee71a17b19708b93b3ed448a1a0952bf111", + "rev": "366f00797b1efb70f2882d3da485e3c10fd3d557", "type": "github" }, "original": { @@ -303,11 +303,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1750459442, - "narHash": "sha256-iEKIktNTNZ6hmqJBs/k6ow+5rMVSFriKitP9zL2nmpg=", - "rev": "b2485d56967598da068b5a6946dadda8bfcbcd37", + "lastModified": 1750906613, + "narHash": "sha256-EcKpawfFHpBnlqYOX+uoU9xovM1B+L16QvfVQPeQKzw=", + "rev": "7284e2decc982b81a296ab35aa46e804baaa1cfe", "type": "tarball", - "url": "https://releases.nixos.org/nixos/25.05/nixos-25.05.804391.b2485d569675/nixexprs.tar.xz?rev=b2485d56967598da068b5a6946dadda8bfcbcd37" + "url": "https://releases.nixos.org/nixos/25.05/nixos-25.05.804745.7284e2decc98/nixexprs.tar.xz?rev=7284e2decc982b81a296ab35aa46e804baaa1cfe" }, "original": { "type": "tarball", @@ -328,11 +328,11 @@ ] }, "locked": { - "lastModified": 1750691276, - "narHash": "sha256-F507hXG4ORVpvuFeuoyDo/bmO/rR2PJRB7XhtDuBnBE=", + "lastModified": 1750788551, + "narHash": "sha256-7tQIndetzeVtTuYQ7vYTaABUS1muiigdXK3XyXuPzvg=", "owner": "nix-community", "repo": "nixvim", - "rev": "1f3e5741a927b5b0a983f08ab9d3bcf313bc141e", + "rev": "6a15c2ffc50ca7998df2fd6b86c3c9f298e9137a", "type": "github" }, "original": { @@ -410,11 +410,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1750697672, - "narHash": "sha256-F8z6QXKRZfVKwTj8+Uw920tHGDmiRIOD+BsA6wVGOgY=", + "lastModified": 1750964616, + "narHash": "sha256-C4Ze08bSadL/3Xba88wrxcmlzn/kPM2Bj3lBX501htk=", "owner": "nix-community", "repo": "stylix", - "rev": "438a702dc2a49a48eae380623cdc04fe36ef5422", + "rev": "d25e22b5c559651da55c0f46106e44fc88069ae1", "type": "github" }, "original": { From 0f344e2c39294d88804cda8c2a93d2cfa149cc8b Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Sat, 28 Jun 2025 00:00:24 +0200 Subject: [PATCH 168/168] chore(deps): lock file maintenance --- flake.lock | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/flake.lock b/flake.lock index 3427543..52dff96 100644 --- a/flake.lock +++ b/flake.lock @@ -328,11 +328,11 @@ ] }, "locked": { - "lastModified": 1750788551, - "narHash": "sha256-7tQIndetzeVtTuYQ7vYTaABUS1muiigdXK3XyXuPzvg=", + "lastModified": 1751053139, + "narHash": "sha256-FMcWdec8fAXs7kiOQBsD+vA/RzjqoDz3zoYgPDQpZlA=", "owner": "nix-community", "repo": "nixvim", - "rev": "6a15c2ffc50ca7998df2fd6b86c3c9f298e9137a", + "rev": "c39f5f39c32e0a8fe91bff1cda847de7a0269411", "type": "github" }, "original": { @@ -527,11 +527,11 @@ ] }, "locked": { - "lastModified": 1749194973, - "narHash": "sha256-eEy8cuS0mZ2j/r/FE0/LYBSBcIs/MKOIVakwHVuqTfk=", + "lastModified": 1750931469, + "narHash": "sha256-0IEdQB1nS+uViQw4k3VGUXntjkDp7aAlqcxdewb/hAc=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "a05be418a1af1198ca0f63facb13c985db4cb3c5", + "rev": "ac8e6f32e11e9c7f153823abc3ab007f2a65d3e1", "type": "github" }, "original": { @@ -542,11 +542,11 @@ }, "unstable": { "locked": { - "lastModified": 1750633290, - "narHash": "sha256-w7N9SeSxFS0jvkbqyfc6FOGGyNiTQtv5jwbi1l/xpk8=", - "rev": "4206c4cb56751df534751b058295ea61357bbbaa", + "lastModified": 1750915984, + "narHash": "sha256-H35GgPwCiZF7vOX6y6/9cbC3Bt8xZyZgy3p2VIENRfM=", + "rev": "30a61f056ac492e3b7cdcb69c1e6abdcf00e39cf", "type": "tarball", - "url": "https://releases.nixos.org/nixos/unstable/nixos-25.11pre819493.4206c4cb5675/nixexprs.tar.xz?rev=4206c4cb56751df534751b058295ea61357bbbaa" + "url": "https://releases.nixos.org/nixos/unstable/nixos-25.11pre820854.30a61f056ac4/nixexprs.tar.xz?rev=30a61f056ac492e3b7cdcb69c1e6abdcf00e39cf" }, "original": { "type": "tarball",