From f3859db7031dea55ba3f1c0e3e176f22b8229fa5 Mon Sep 17 00:00:00 2001
From: biscuit <biscuit@nixos.com>
Date: Tue, 13 May 2025 13:00:11 -0500
Subject: [PATCH] sync

---
 home-manager/home.nix       |  2 +-
 packages/nvim/default.nix   |  7 ++++++-
 packages/zoxide/default.nix |  8 ++++++++
 packages/zsh/default.nix    | 29 +++++++++++++++++++++++++++--
 4 files changed, 42 insertions(+), 4 deletions(-)
 create mode 100644 packages/zoxide/default.nix

diff --git a/home-manager/home.nix b/home-manager/home.nix
index 5d66889..fdefeac 100644
--- a/home-manager/home.nix
+++ b/home-manager/home.nix
@@ -4,6 +4,7 @@
   imports = [
 	  ../packages/nvim/default.nix
     ../packages/zsh/default.nix
+    ../packages/zoxide/default.nix
   ];
 
   home = {
@@ -12,7 +13,6 @@
   };
 
   home.packages = [
-    pkgs.lazygit
   ];
   home.sessionVariables = {
   
diff --git a/packages/nvim/default.nix b/packages/nvim/default.nix
index 171a896..79f90ed 100644
--- a/packages/nvim/default.nix
+++ b/packages/nvim/default.nix
@@ -1,4 +1,9 @@
-{ ... }: {
+{ pkgs, ... }: {
+
+  home.packages = [
+    pkgs.lazygit
+    pkgs.ripgrep
+  ];
 
   home.file.".config/nvim" = {
     # BUG requires --impure
diff --git a/packages/zoxide/default.nix b/packages/zoxide/default.nix
new file mode 100644
index 0000000..054bbea
--- /dev/null
+++ b/packages/zoxide/default.nix
@@ -0,0 +1,8 @@
+{ ... }: {
+  home.packages = [
+    zoxide
+  ];
+  programs.zoxide.enable = true;
+  programs.zoxide.enableZshIntegration = true;
+  programs.zoxide.options = [];
+}
diff --git a/packages/zsh/default.nix b/packages/zsh/default.nix
index 5c870c7..e3fde04 100644
--- a/packages/zsh/default.nix
+++ b/packages/zsh/default.nix
@@ -1,8 +1,18 @@
-{ ... }: {
+{ pkgs, ... }: {
   programs.zsh = {
     enable = true; 
+    plugins = [
+      {
+        name = "zsh-autocomplete"; # completes history, commands, etc.
+        src = pkgs.fetchFromGitHub {
+          owner = "marlonrichert";
+          repo = "zsh-autocomplete";
+          rev = "762afacbf227ecd173e899d10a28a478b4c84a3f";
+          sha256 = "1357hygrjwj5vd4cjdvxzrx967f1d2dbqm2rskbz5z1q6jri1hm3";
+        }; # e.g., nix-prefetch-url --unpack https://github.com/marlonrichert/zsh-autocomplete/archive/762afacbf227ecd173e899d10a28a478b4c84a3f.tar.gz
+      }
+    ];
     enableCompletion = true;
-    # autosuggestions.enable = true; 
     syntaxHighlighting.enable = true;
     shellAliases = {
       ll = "ls -l";
@@ -11,8 +21,23 @@
     };
     history.size = 10000;
     oh-my-zsh = {
+      plugins = [ "z" ];
       enable = true; 
       theme = "robbyrussell";
+      extraConfig = ''
+                # Required for autocomplete with box: https://unix.stackexchange.com/a/778868
+                zstyle ':completion:*' completer _expand _complete _ignored _approximate _expand_alias
+                zstyle ':autocomplete:*' default-context curcontext 
+                zstyle ':autocomplete:*' min-input 0
+
+                setopt HIST_FIND_NO_DUPS
+
+                autoload -Uz compinit
+                compinit
+
+                setopt autocd  # cd without writing 'cd'
+                setopt globdots # show dotfiles in autocomplete list
+      '';
     };
   };
 }