diff --git a/modules/hm/__basic.nix b/modules/hm/__basic.nix
index bed6876..372333a 100644
--- a/modules/hm/__basic.nix
+++ b/modules/hm/__basic.nix
@@ -5,31 +5,31 @@
     packages = builtins.attrValues {
       inherit (pkgs)
         fastfetch
-        fd
         file
-        htop
         mmv-go
-        nixos-option
         pv
-        ripgrep
         unrar
         unzip
         wget
-        xclip
-        yq
         zip
         ;
     };
   };
 
+  programs = {
+    bottom.enable = true;
+    ripgrep.enable = true;
+    fd = { enable = true; hidden = true; };
+  };
+
   imports = [
     ./configurations.nix
 
     ./bash.nix
-    ./bat.nix
+    # ./bat.nix
     # ./bottom.nix
     # ./broot.nix
-    ./dircolors.nix
+    # ./dircolors.nix
     ./direnv.nix
     # ./exa.nix
     ./lsd.nix
@@ -37,7 +37,7 @@
     ./git.nix
     ./gpg.nix
     ./info.nix
-    ./jq.nix
+    # ./jq.nix
     # ./joshuto.nix
     ./keychain.nix
     # ./lf.nix
diff --git a/modules/hm/direnv.nix b/modules/hm/direnv.nix
index 7c26805..2fd445a 100644
--- a/modules/hm/direnv.nix
+++ b/modules/hm/direnv.nix
@@ -3,6 +3,7 @@
     enable = true;
     enableBashIntegration = true;
     enableZshIntegration = true;
+    enableNushellIntegration = true;
     nix-direnv.enable = true;
   };
 }
diff --git a/modules/hm/gpg.nix b/modules/hm/gpg.nix
index 2a09965..634bf34 100644
--- a/modules/hm/gpg.nix
+++ b/modules/hm/gpg.nix
@@ -1,4 +1,4 @@
-{
+{ pkgs, ... }: {
   programs.gpg = {
     enable = true;
     settings = { };
@@ -7,6 +7,10 @@
   services.gpg-agent = {
     enable = true;
     defaultCacheTtl = 600;
+    enableBashIntegration = true;
+    enableZshIntegration = true;
+    enableNushellIntegration = true;
+    pinentryPackage = pkgs.pinentry-gnome3;
     # extraConfig = "allow-loopback-pinentry";
   };
 }