diff --git a/home-cli.nix b/home-cli.nix
index 53b8332..0e08b66 100644
--- a/home-cli.nix
+++ b/home-cli.nix
@@ -4,8 +4,15 @@ let
   secrets = import ./secrets.nix;
 in
   {
-    home.packages = with pkgs; [ # pastel magic-wormhole
-    ripgrep fd wget nodejs yarn cargo mosh w3m nnn urlview gnupg hexyl httpie cacert catimg tealdeer du-dust duplicati bitwarden-cli rage sd eva glow restic tig gitui spotify-tui manix amfora ghc ocaml weechat deno duf procs
+    home.packages = with pkgs; [
+    ripgrep fd wget mosh w3m nnn urlview gnupg hexyl httpie catimg tealdeer du-dust duplicati bitwarden-cli rage sd eva glow restic tig gitui spotify-tui manix amfora weechat duf procs pandoc magic-wormhole pastel fx
+    nodejs deno yarn nodePackages.stylelint nodePackages.js-beautify
+    ocaml dune_2 ocamlPackages.utop ocamlPackages.ocp-indent ocamlPackages.merlin
+    # racket-minimal
+    rustc
+    ghc cargo haskell-language-server hlint haskellPackages.hoogle # haskellPackages.cabal
+    nixfmt shellcheck fontconfig cmigemo cacert
+    emacsPackages.fontawesome emacs-all-the-icons-fonts
     ispell aspell aspellDicts.en aspellDicts.en-computers aspellDicts.en-science aspellDicts.fr aspellDicts.de aspellDicts.eo aspellDicts.es
 ];
 
@@ -54,16 +61,11 @@ in
     enableAliases = true;
   };
 
-  programs.zoxide = {
+  programs.zoxide = { # z doc -> cd ~/Documents; zi -> interactive
     enable = true;
     enableZshIntegration = true;
   };
 
-  # programs.atuin = {
-  #   enable = true;
-  #   enableZshIntegration = true;
-  # };
-
   programs.zsh = {
     enable = true;
     enableAutosuggestions = true;
@@ -74,6 +76,7 @@ in
     shellAliases = {
       l = "exa -lah --icons --git";
       n = "nnn";
+      h = "himalaya";
       er = "rm -rf logs; unzip -o";
       srsync = "rsync --rsync-path='sudo rsync'";
     };
@@ -89,7 +92,7 @@ in
     enableZshIntegration = true;
   };
 
-  programs.fzf = {
+  programs.fzf = { # ctrl-t, ctrl-r, ssh **<tab>
     enable = true;
     enableZshIntegration = true;
     defaultCommand = "fd --type file --color=always";
@@ -98,6 +101,11 @@ in
     fileWidgetOptions = [ "--min-height 30 --preview-window noborder --preview '(bat --style=numbers,changes --wrap never --color always {} || cat {} || tree -C {}) 2> /dev/null'" ];
   };
 
+  programs.navi = { # ctrl-G
+    enable = true;
+    enableZshIntegration = true;
+  };
+
   programs.ssh = {
     enable = true;
     matchBlocks = {
@@ -226,11 +234,6 @@ in
       }
     ];
     extraConfig = ''
-      " set expandtab " insert spaces when tab is pressed
-      " set tabstop=2
-      " set softtabstop=2
-      " set shiftwidth=2
-
       set hidden
       set number
       set ignorecase
diff --git a/home-mac.nix b/home-mac.nix
index 7e538b7..14d512f 100644
--- a/home-mac.nix
+++ b/home-mac.nix
@@ -3,21 +3,18 @@
 {
   home.packages = with pkgs; [ pinentry_mac terminal-notifier syncthing ];
 
-  home.file.gpg-agent = {
-    target = ".gnupg/gpg-agent.conf";
-    text = ''
-      default-cache-ttl 86400
-      max-cache-ttl 86400
-    '';
-  };
+  # home.file.gpg-agent = {
+  #   target = ".gnupg/gpg-agent.conf";
+  #   text = ''
+  #     default-cache-ttl 86400
+  #     max-cache-ttl 86400
+  #   '';
+  # };
 
-  home.file.gitignore = {
-    target = ".gitignore";
-    text = ''Library'';
-  };
-
-  programs.zsh.initExtra = "source ~/.nix-profile/etc/profile.d/nix.sh";
-  # programs.fish.interactiveShellInit = "source ~/.nix-profile/etc/profile.d/nix.sh";
+  # home.file.gitignore = {
+  #   target = ".gitignore";
+  #   text = ''Library'';
+  # };
 
   imports = [ ./home-cli.nix ./home-gui.nix ./home-mail.nix ];
 }