diff --git a/modules/nixvim/keymaps.nix b/modules/nixvim/keymaps.nix
index a83f448..cd8638f 100644
--- a/modules/nixvim/keymaps.nix
+++ b/modules/nixvim/keymaps.nix
@@ -1,19 +1,5 @@
 _: {
   keymaps = [
-    {
-      key = "<leader>e";
-      action = "<cmd>Neotree toggle<CR>";
-      options = {
-        silent = true;
-      };
-    }
-    {
-      key = "<leader>ff";
-      action = "<cmd>Telescope find_files<CR>";
-      options = {
-        silent = true;
-      };
-    }
     {
       key = "<Space>";
       action = "<Nop>";
diff --git a/modules/nixvim/options.nix b/modules/nixvim/options.nix
index 293c22e..c42bb01 100644
--- a/modules/nixvim/options.nix
+++ b/modules/nixvim/options.nix
@@ -133,12 +133,6 @@ in {
       local actions = require("telescope.actions")
       local action_state = require("telescope.actions.state")
 
-      local pickers = require("telescope.pickers")
-      local finders = require("telescope.finders")
-      local conf = require("telescope.config").values
-      local actions = require("telescope.actions")
-      local action_state = require("telescope.actions.state")
-
       function get_program()
         return coroutine.create(function(coro)
           local opts = {}
diff --git a/modules/nixvim/plugins/neo-tree.nix b/modules/nixvim/plugins/neo-tree.nix
index 1187ff6..ab07e18 100644
--- a/modules/nixvim/plugins/neo-tree.nix
+++ b/modules/nixvim/plugins/neo-tree.nix
@@ -39,9 +39,18 @@
       };
       filesystem = {
         filtered_items = {
-          hide_by_pattern = ["*_templ.go"];
+          hide_by_pattern = [ "*_templ.go" ];
         };
       };
     };
   };
+  keymaps = [
+    {
+      key = "<leader>e";
+      action = "<cmd>Neotree toggle<CR>";
+      options = {
+        silent = true;
+      };
+    }
+  ];
 }
diff --git a/modules/nixvim/plugins/none-ls.nix b/modules/nixvim/plugins/none-ls.nix
index 8f854ef..bc80b71 100644
--- a/modules/nixvim/plugins/none-ls.nix
+++ b/modules/nixvim/plugins/none-ls.nix
@@ -12,6 +12,7 @@
       };
       formatting = {
         phpcbf.enable = true;
+        goimports.enable = true;
       };
     };
   };
diff --git a/modules/nixvim/plugins/telescope.nix b/modules/nixvim/plugins/telescope.nix
index 7447ed9..38dad91 100644
--- a/modules/nixvim/plugins/telescope.nix
+++ b/modules/nixvim/plugins/telescope.nix
@@ -5,6 +5,7 @@
       "<leader>fg" = "live_grep";
       "<leader>fb" = "buffers";
       "<leader>fo" = "oldfiles";
+      "<leader>fF" = "find_files";
       "<leader>ff" = {
         action = "git_files";
         options = {
@@ -17,6 +18,11 @@
       ui-select.enable = true;
     };
     settings = {
+      pickers = {
+        find_files = {
+          find_command = [ "rg" "--no-ignore" "--files" "--hidden" "--glob" "!**/.git/*" "--glob" "!**/.direnv/*" ];
+        };
+      };
       defaults = {
         prompt_prefix = " 󰍉 ";
         selection_caret = "  ";
@@ -38,17 +44,12 @@
           height = 0.80;
           preview_cutoff = 120;
         };
-        file_ignore_patterns = ["node_modules" "vendor"];
-        path_display = ["truncate"];
+        file_ignore_patterns = [ "node_modules" "vendor" ];
+        path_display = [ "truncate" ];
         winblend = 3;
-        border = {};
-        borderchars = [" " " " " " " " " " " " " " " "];
+        border = { };
+        borderchars = [ " " " " " " " " " " " " " " " " ];
         color_devicons = true;
-        pickers = {
-          find_files = {
-            find_command = ["rg" "--files" "--hidden" "--glob" "!**/.git/*"];
-          };
-        };
         mappings = {
           i = {
             "<esc>" = {