chore(gpg): fix upstream changes in configuration

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": {

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 = {

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 - "$@")"
         }
 

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
 

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 = ''
-        <span font_scale='small-caps'>%a</span>\n<b>%s</b>\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 = ''
+          <span font_scale='small-caps'>%a</span>\n<b>%s</b>\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";
+        };
+      };
     };
   };
 }