diff --git a/nix/base-system/flake.nix b/nix/base-system/flake.nix
index 7330d29..480d9d2 100644
--- a/nix/base-system/flake.nix
+++ b/nix/base-system/flake.nix
@@ -75,6 +75,8 @@
                 nightfox-nvim
                 melange-nvim
                 julia-vim # TODO I should get julia language server support set up instead.
+                telescope-nvim
+                plenary-nvim
               ] ++ (with nvim-treesitter-parsers; [
                 rust
                 lua
@@ -150,10 +152,17 @@
             datasette
             ocaml
             opam
+            ocamlformat
+            # TODO(jwall): I include these initially for nvim telescope
+            ripgrep
+            fd
             # TODO add sonic-pi here if it supports the arch
-        ]) ++ (with ocamlPackages; [
-            lsp
+        ]) ++ (with pkgs.ocamlPackages; [
             dune_3
+            odoc
+            ocaml-lsp
+            merlin
+            utop
         ]) ++ [
             sile
             runwhen
diff --git a/nix/base-system/init.lua b/nix/base-system/init.lua
index c1a599c..f1567cb 100644
--- a/nix/base-system/init.lua
+++ b/nix/base-system/init.lua
@@ -226,5 +226,13 @@ vim.keymap.set("n", "<Leader>mg", function()
     vim.cmd("MagitOnly")
 end)
 
+local telescope_builtins = require('telescope.builtin')
+local telescope_actions = require('telescope.actions')
+
+-- Telelscope configuration
+require('telescope').setup()
+
+vim.keymap.set("n", "<Leader>nff", telescope_builtins.fd)
+
 -- Show whatever errors we have in our trouble pane
 vim.keymap.set("n", "<Leader>se", "<cmd>TroubleToggle<cr>", { silent = true, noremap = true })
diff --git a/nix/darwin/flake.lock b/nix/darwin/flake.lock
index 39bb557..caf38b1 100644
--- a/nix/darwin/flake.lock
+++ b/nix/darwin/flake.lock
@@ -34,12 +34,12 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-CYkkiHnBEChgg5SVTZfyFBZwAxfeG24fwLxNIbxj56M=",
-        "path": "/nix/store/7nc8f6gglr3256agk90xv0y33gi40bnl-source/nix/base-system",
+        "narHash": "sha256-qPinR/3+sjIfkgfGVaCmodNZsGTVrglMUnOq8pQ1+YI=",
+        "path": "/nix/store/nyhsl3jwbgx53wnwjqwq90dng16m6wsw-source/nix/base-system",
         "type": "path"
       },
       "original": {
-        "path": "/nix/store/7nc8f6gglr3256agk90xv0y33gi40bnl-source/nix/base-system",
+        "path": "/nix/store/nyhsl3jwbgx53wnwjqwq90dng16m6wsw-source/nix/base-system",
         "type": "path"
       }
     },