Enable some pended patches again

kachick · May 23, 2024 · 8abc33d · 8abc33d
1 parent 2ec02f2
commit 8abc33d
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 17 deletions.
diff --git a/home-manager/gpg.nix b/home-manager/gpg.nix
@@ -29,8 +29,7 @@
     defaultCacheTtl = 60480000; # 700 days
     maxCacheTtl = 60480000; # 700 days
 
-    # TODO: Enable since release-24.05
-    # pinentryPackage = pkgs.pinentry-tty;
+    pinentryPackage = pkgs.pinentry-tty;
   };
 
   # https://github.com/nix-community/home-manager/blob/release-24.05/modules/programs/gpg.nix

diff --git a/home-manager/ssh.nix b/home-manager/ssh.nix
@@ -51,15 +51,14 @@ in
     controlMaster = "auto";
     controlPersist = "10m";
 
+    addKeysToAgent = "yes";
+
     # Enable custom or temporary config without `home-manager switch`
     includes = [ "${sshDir}/config.local" ];
 
     # https://www.clear-code.com/blog/2023/4/3/recommended-ssh-config.html
     # https://gitlab.com/clear-code/ssh.d/-/blob/main/global.conf?ref_type=heads
-    # TODO: Update AddKeysToAgent since release-24.05. See #394
     extraConfig = ''
-      AddKeysToAgent yes
-
       PasswordAuthentication no
 
       # default: "ask"

diff --git a/home-manager/zsh.nix b/home-manager/zsh.nix
@@ -19,7 +19,6 @@
   # https://zsh.sourceforge.io/Doc/Release/Options.html
   # https://github.com/nix-community/home-manager/blob/release-24.05/modules/programs/zsh.nix
   # You should consider the loading order: https://medium.com/@rajsek/zsh-bash-startup-files-loading-order-bashrc-zshrc-etc-e30045652f2e
-  # TODO: Re-apply some patches since release-24.05: #497
   programs.zsh = {
     enable = true;
 
@@ -83,16 +82,14 @@
         "root"
       ];
 
-      # TODO: Enable since release-24.05
-      #
-      # # This will work if you enabled "pattern" highlighter
-      # patterns = {
-      #   # https://github.com/zsh-users/zsh-syntax-highlighting/blob/e0165eaa730dd0fa321a6a6de74f092fe87630b0/docs/highlighters/pattern.md
-      #   "rm -rf *" = "fg=white,bold,bg=red";
-      # };
+      # This will work if you enabled "pattern" highlighter
+      patterns = {
+        # https://github.com/zsh-users/zsh-syntax-highlighting/blob/e0165eaa730dd0fa321a6a6de74f092fe87630b0/docs/highlighters/pattern.md
+        "rm -rf *" = "fg=white,bold,bg=red";
+      };
     };
 
-    enableAutosuggestions = true;
+    autosuggestions = true;
 
     # NOTE: enabling without tuning makes much slower zsh as +100~200ms execution time
     #       And the default path is not intended, so you SHOULD update `completionInit`
@@ -211,9 +208,6 @@
       # https://github.com/zsh-users/zsh-autosuggestions/issues/259
       zshaddhistory() { whence ''${''${(z)1}[1]} >| /dev/null || return 1 }
 
-      # TODO: Replace this section with home-manager module `patterns` since release-24.05
-      ZSH_HIGHLIGHT_PATTERNS+=('rm -rf *' 'fg=white,bold,bg=red')
-
       # Same as .zshenv.local
       if [ -e '${config.xdg.configHome}/zsh/.zshrc.local' ]; then
         source '${config.xdg.configHome}/zsh/.zshrc.local'