From aea41140bfce938298a237a8559bda568c27e117 Mon Sep 17 00:00:00 2001 From: Yorick Barbanneau Date: Mon, 19 May 2025 20:47:08 +0200 Subject: [PATCH 1/8] chore: upgrade packages repositories --- flake.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index 2c35989..ee1569a 100644 --- a/flake.lock +++ b/flake.lock @@ -43,11 +43,11 @@ ] }, "locked": { - "lastModified": 1744902080, - "narHash": "sha256-px7OEMQYhS9StY3sTYYeM/jJspk6SXgoPU7OmOSx+1c=", + "lastModified": 1747565775, + "narHash": "sha256-B6jmKHUEX1jxxcdoYHl7RVaeohtAVup8o3nuVkzkloA=", "owner": "nix-community", "repo": "home-manager", - "rev": "2c71aae678c03a39c2542e136b87bd040ae1b3cb", + "rev": "97118a310eb8e13bc1b9b12d67267e55b7bee6c8", "type": "github" }, "original": { @@ -79,11 +79,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1744463964, - "narHash": "sha256-LWqduOgLHCFxiTNYi3Uj5Lgz0SR+Xhw3kr/3Xd0GPTM=", + "lastModified": 1747542820, + "narHash": "sha256-GaOZntlJ6gPPbbkTLjbd8BMWaDYafhuuYRNrxCGnPJw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2631b0b7abcea6e640ce31cd78ea58910d31e650", + "rev": "292fa7d4f6519c074f0a50394dbbe69859bb6043", "type": "github" }, "original": { @@ -94,11 +94,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1744463964, - "narHash": "sha256-LWqduOgLHCFxiTNYi3Uj5Lgz0SR+Xhw3kr/3Xd0GPTM=", + "lastModified": 1747542820, + "narHash": "sha256-GaOZntlJ6gPPbbkTLjbd8BMWaDYafhuuYRNrxCGnPJw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2631b0b7abcea6e640ce31cd78ea58910d31e650", + "rev": "292fa7d4f6519c074f0a50394dbbe69859bb6043", "type": "github" }, "original": { @@ -115,11 +115,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1744904898, - "narHash": "sha256-wLepe0sdFFgXUOLY2t+GrfjBquiGFgNydQkQYGh6UwQ=", + "lastModified": 1747676902, + "narHash": "sha256-jksy3fqyf4zUPIrAL8RFIHEECXITHtsyV9hp0VHmlLY=", "owner": "nix-community", "repo": "NUR", - "rev": "9ea0c40c52673079dfe50e82ddbb78679723be05", + "rev": "d4ae72a58d239b565c34323f9f02aac91901f9c7", "type": "github" }, "original": { @@ -144,11 +144,11 @@ ] }, "locked": { - "lastModified": 1744669848, - "narHash": "sha256-pXyanHLUzLNd3MX9vsWG+6Z2hTU8niyphWstYEP3/GU=", + "lastModified": 1747603214, + "narHash": "sha256-lAblXm0VwifYCJ/ILPXJwlz0qNY07DDYdLD+9H+Wc8o=", "owner": "Mic92", "repo": "sops-nix", - "rev": "61154300d945f0b147b30d24ddcafa159148026a", + "rev": "8d215e1c981be3aa37e47aeabd4e61bb069548fd", "type": "github" }, "original": { From f37231b35d7f025aadeac1802e8bbe9bdb043a65 Mon Sep 17 00:00:00 2001 From: Yorick Barbanneau Date: Mon, 19 May 2025 20:47:38 +0200 Subject: [PATCH 2/8] chore(mako): adapt configugation to upstream changes --- .../desktop/sway/includes/mako.nix | 59 ++++++++++--------- 1 file changed, 30 insertions(+), 29 deletions(-) diff --git a/modules/home-manager/desktop/sway/includes/mako.nix b/modules/home-manager/desktop/sway/includes/mako.nix index d3e293e..323e831 100644 --- a/modules/home-manager/desktop/sway/includes/mako.nix +++ b/modules/home-manager/desktop/sway/includes/mako.nix @@ -13,35 +13,36 @@ with lib; }; services.mako = { enable = true; - font = "Fira Code Nerd Font 10"; - backgroundColor = "#353535FF"; - borderColor = "#1CD180"; - progressColor = "over #5566AAFF"; - textColor = "#FDFDFD"; - width = 300; - height = 100; - borderRadius = 0; - borderSize = 2; - icons = true; - maxIconSize = 64; - layer = "overlay"; - anchor = "top-right"; - format = '' - %a\n%s\n%b - ''; - extraConfig = '' - [urgency="high"] - border-color=#F268b3 - - [app-name="cmus"] - border-size=1 - default-timeout=7000 - group-by=app-name - format=%b - - [app-name="cmus" grouped] - format=%b - ''; + settings = { + font = "Fira Code Nerd Font 10"; + backgroundColor = "#353535FF"; + borderColor = "#1CD180"; + progressColor = "over #5566AAFF"; + textColor = "#FDFDFD"; + width = 300; + height = 100; + borderRadius = 0; + borderSize = 2; + icons = true; + maxIconSize = 64; + layer = "overlay"; + anchor = "top-right"; + format = '' + %a\n%s\n%b + ''; + "urgency=high" = { + border-color = "#F268b3"; + }; + "app-name=cmus" = { + border-size = 1; + default-timeout = 7000; + group-by = "app-name"; + format= "%b"; + }; + "app-name=cmus grouped" = { + format = "%b"; + }; + }; }; }; } From 590303f5be6724213877736a85abcb9d09fc20d5 Mon Sep 17 00:00:00 2001 From: Yorick Barbanneau Date: Mon, 19 May 2025 20:56:25 +0200 Subject: [PATCH 3/8] chore(zsh): implement upstreamn changes in configuration --- modules/home-manager/cli/vifm/default.nix | 4 ++-- modules/home-manager/cli/zsh/default.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/home-manager/cli/vifm/default.nix b/modules/home-manager/cli/vifm/default.nix index 5f4aefa..c499ca6 100644 --- a/modules/home-manager/cli/vifm/default.nix +++ b/modules/home-manager/cli/vifm/default.nix @@ -14,11 +14,11 @@ in poppler_utils # Preview PDF file ]; programs.zsh = { - initExtra = '' + initContent = '' cdv() { cd "$(vifm --choose-dir - "$@")" } - openv() { + openv() { xdg-open "$(vifm --choose-file - "$@")" } diff --git a/modules/home-manager/cli/zsh/default.nix b/modules/home-manager/cli/zsh/default.nix index f8e5977..108dd36 100644 --- a/modules/home-manager/cli/zsh/default.nix +++ b/modules/home-manager/cli/zsh/default.nix @@ -60,7 +60,7 @@ in "\\n" = "fg=#7cafc2"; }; }; - initExtra = '' + initContent = '' # Ctrl + backspace: delete word bindkey -v "^H" backward-kill-word From 5c86792c5bd89fa916f5298630fe2f612f675137 Mon Sep 17 00:00:00 2001 From: Yorick Barbanneau Date: Mon, 19 May 2025 20:56:58 +0200 Subject: [PATCH 4/8] chore(gpg): fix upstream changes in configuration --- modules/home-manager/application/gnupg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/home-manager/application/gnupg/default.nix b/modules/home-manager/application/gnupg/default.nix index ee7b38f..2990e94 100644 --- a/modules/home-manager/application/gnupg/default.nix +++ b/modules/home-manager/application/gnupg/default.nix @@ -17,7 +17,7 @@ in home.packages = with pkgs; [ # pinentry-gnome - pkgs.gcr + gcr ]; programs.gpg = { @@ -31,7 +31,7 @@ in enable = true; enableScDaemon = true; enableZshIntegration = true; - pinentryPackage = pkgs.pinentry-gnome3; + pinentry.package = pkgs.pinentry-gnome3; }; programs.password-store = { From 7a1e126483b93326a703b5fd4360c78eb6b4509e Mon Sep 17 00:00:00 2001 From: Yorick Barbanneau Date: Mon, 19 May 2025 20:47:08 +0200 Subject: [PATCH 5/8] chore: upgrade packages repositories --- flake.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index 2c35989..da4e55b 100644 --- a/flake.lock +++ b/flake.lock @@ -43,11 +43,11 @@ ] }, "locked": { - "lastModified": 1744902080, - "narHash": "sha256-px7OEMQYhS9StY3sTYYeM/jJspk6SXgoPU7OmOSx+1c=", + "lastModified": 1748955489, + "narHash": "sha256-OmZXyW2g5qIuo5Te74McwR0TwauCO2sF3/SjGDVuxyg=", "owner": "nix-community", "repo": "home-manager", - "rev": "2c71aae678c03a39c2542e136b87bd040ae1b3cb", + "rev": "bb846c031be68a96466b683be32704ef6e07b159", "type": "github" }, "original": { @@ -79,11 +79,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1744463964, - "narHash": "sha256-LWqduOgLHCFxiTNYi3Uj5Lgz0SR+Xhw3kr/3Xd0GPTM=", + "lastModified": 1748693115, + "narHash": "sha256-StSrWhklmDuXT93yc3GrTlb0cKSS0agTAxMGjLKAsY8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2631b0b7abcea6e640ce31cd78ea58910d31e650", + "rev": "910796cabe436259a29a72e8d3f5e180fc6dfacc", "type": "github" }, "original": { @@ -94,11 +94,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1744463964, - "narHash": "sha256-LWqduOgLHCFxiTNYi3Uj5Lgz0SR+Xhw3kr/3Xd0GPTM=", + "lastModified": 1748693115, + "narHash": "sha256-StSrWhklmDuXT93yc3GrTlb0cKSS0agTAxMGjLKAsY8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2631b0b7abcea6e640ce31cd78ea58910d31e650", + "rev": "910796cabe436259a29a72e8d3f5e180fc6dfacc", "type": "github" }, "original": { @@ -115,11 +115,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1744904898, - "narHash": "sha256-wLepe0sdFFgXUOLY2t+GrfjBquiGFgNydQkQYGh6UwQ=", + "lastModified": 1748973087, + "narHash": "sha256-ZN0XKKdCBC9eLeog7qYhfGPbajkPtQPdlxp/dhwONw4=", "owner": "nix-community", "repo": "NUR", - "rev": "9ea0c40c52673079dfe50e82ddbb78679723be05", + "rev": "90add46380908ba4395f5f1dfec84224a3b0d4b9", "type": "github" }, "original": { @@ -144,11 +144,11 @@ ] }, "locked": { - "lastModified": 1744669848, - "narHash": "sha256-pXyanHLUzLNd3MX9vsWG+6Z2hTU8niyphWstYEP3/GU=", + "lastModified": 1747603214, + "narHash": "sha256-lAblXm0VwifYCJ/ILPXJwlz0qNY07DDYdLD+9H+Wc8o=", "owner": "Mic92", "repo": "sops-nix", - "rev": "61154300d945f0b147b30d24ddcafa159148026a", + "rev": "8d215e1c981be3aa37e47aeabd4e61bb069548fd", "type": "github" }, "original": { From ec5bb7cb70c0b247aabaf3386b55ab9d260f8c6d Mon Sep 17 00:00:00 2001 From: Yorick Barbanneau Date: Mon, 19 May 2025 20:47:38 +0200 Subject: [PATCH 6/8] chore(mako): adapt configugation to upstream changes --- .../desktop/sway/includes/mako.nix | 59 ++++++++++--------- 1 file changed, 30 insertions(+), 29 deletions(-) diff --git a/modules/home-manager/desktop/sway/includes/mako.nix b/modules/home-manager/desktop/sway/includes/mako.nix index d3e293e..323e831 100644 --- a/modules/home-manager/desktop/sway/includes/mako.nix +++ b/modules/home-manager/desktop/sway/includes/mako.nix @@ -13,35 +13,36 @@ with lib; }; services.mako = { enable = true; - font = "Fira Code Nerd Font 10"; - backgroundColor = "#353535FF"; - borderColor = "#1CD180"; - progressColor = "over #5566AAFF"; - textColor = "#FDFDFD"; - width = 300; - height = 100; - borderRadius = 0; - borderSize = 2; - icons = true; - maxIconSize = 64; - layer = "overlay"; - anchor = "top-right"; - format = '' - %a\n%s\n%b - ''; - extraConfig = '' - [urgency="high"] - border-color=#F268b3 - - [app-name="cmus"] - border-size=1 - default-timeout=7000 - group-by=app-name - format=%b - - [app-name="cmus" grouped] - format=%b - ''; + settings = { + font = "Fira Code Nerd Font 10"; + backgroundColor = "#353535FF"; + borderColor = "#1CD180"; + progressColor = "over #5566AAFF"; + textColor = "#FDFDFD"; + width = 300; + height = 100; + borderRadius = 0; + borderSize = 2; + icons = true; + maxIconSize = 64; + layer = "overlay"; + anchor = "top-right"; + format = '' + %a\n%s\n%b + ''; + "urgency=high" = { + border-color = "#F268b3"; + }; + "app-name=cmus" = { + border-size = 1; + default-timeout = 7000; + group-by = "app-name"; + format= "%b"; + }; + "app-name=cmus grouped" = { + format = "%b"; + }; + }; }; }; } From 814d7589b12f0a61fd112e90587f383926ffdfaf Mon Sep 17 00:00:00 2001 From: Yorick Barbanneau Date: Mon, 19 May 2025 20:56:25 +0200 Subject: [PATCH 7/8] chore(zsh): implement upstreamn changes in configuration --- modules/home-manager/cli/vifm/default.nix | 4 ++-- modules/home-manager/cli/zsh/default.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/home-manager/cli/vifm/default.nix b/modules/home-manager/cli/vifm/default.nix index 5f4aefa..c499ca6 100644 --- a/modules/home-manager/cli/vifm/default.nix +++ b/modules/home-manager/cli/vifm/default.nix @@ -14,11 +14,11 @@ in poppler_utils # Preview PDF file ]; programs.zsh = { - initExtra = '' + initContent = '' cdv() { cd "$(vifm --choose-dir - "$@")" } - openv() { + openv() { xdg-open "$(vifm --choose-file - "$@")" } diff --git a/modules/home-manager/cli/zsh/default.nix b/modules/home-manager/cli/zsh/default.nix index f8e5977..108dd36 100644 --- a/modules/home-manager/cli/zsh/default.nix +++ b/modules/home-manager/cli/zsh/default.nix @@ -60,7 +60,7 @@ in "\\n" = "fg=#7cafc2"; }; }; - initExtra = '' + initContent = '' # Ctrl + backspace: delete word bindkey -v "^H" backward-kill-word From 169233de37c327d8ca9d11f18ee45226c7309852 Mon Sep 17 00:00:00 2001 From: Yorick Barbanneau Date: Mon, 19 May 2025 20:56:58 +0200 Subject: [PATCH 8/8] chore(gpg): fix upstream changes in configuration --- modules/home-manager/application/gnupg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/home-manager/application/gnupg/default.nix b/modules/home-manager/application/gnupg/default.nix index ee7b38f..2990e94 100644 --- a/modules/home-manager/application/gnupg/default.nix +++ b/modules/home-manager/application/gnupg/default.nix @@ -17,7 +17,7 @@ in home.packages = with pkgs; [ # pinentry-gnome - pkgs.gcr + gcr ]; programs.gpg = { @@ -31,7 +31,7 @@ in enable = true; enableScDaemon = true; enableZshIntegration = true; - pinentryPackage = pkgs.pinentry-gnome3; + pinentry.package = pkgs.pinentry-gnome3; }; programs.password-store = {