diff --git a/modules/hosts/soteria/soteria.nix b/modules/hosts/soteria/soteria.nix
index 9c192cd..cec2159 100644
--- a/modules/hosts/soteria/soteria.nix
+++ b/modules/hosts/soteria/soteria.nix
@@ -64,6 +64,7 @@ in
 
         environment.systemPackages = [
           inputs.self.packages.${pkgs.stdenv.hostPlatform.system}.janus-ca
+          inputs.self.packages.${pkgs.stdenv.hostPlatform.system}.my-neovim
         ];
 
         forgejo.enable = true;
diff --git a/modules/programs/neovim.nix b/modules/programs/neovim.nix
index 9b3e4a8..d097a56 100644
--- a/modules/programs/neovim.nix
+++ b/modules/programs/neovim.nix
@@ -32,17 +32,28 @@
             theme.name = "catppuccin";
             theme.style = "mocha";
 
-            git = {
-              enable = true;
-            };
+            git.enable = true;
+            # git.neogit.enable = true;
+
+            # https://github.com/akinsho/toggleterm.nvim
+            terminal.toggleterm.enable = true;
+            terminal.toggleterm.lazygit.enable = true;
+            terminal.toggleterm.lazygit.direction = "float";
+            terminal.toggleterm.lazygit.mappings.open = "<C-g>";
+
+
+            utility.nix-develop.enable = true;
+
+            utility.oil-nvim.enable = true;
+            utility.oil-nvim.gitStatus.enable = true;
 
             filetree.neo-tree = {
               enable = true;
             };
 
-            lazy = {
-              enable = true;
-            };
+            # lazy = {
+            #   enable = true;
+            # };
 
             # globals = {
             #   SimpylFold_docstring_preview = 1;
@@ -102,16 +113,24 @@
 
             keymaps = [
               {
-                key = "<leader>fd";
+                desc = "Key Maps [Telescope]";
+                key = "<leader>fkm";
                 mode = "n";
                 silent = false;
-                action = ":Telescope find_files";
+                action = "<cmd>:Telescope keymaps<CR>";
               }
               {
+                desc = "Toggle Filesystem Tree [NeoTree]";
                 key = "<C-b>";
-                mode = "n";
-                silent = true;
-                action = ":Neotree";
+                mode = [ "n" "v" "t" ];
+                silent = false;
+                action = "<cmd>:Neotree toggle filesystem left action=show<CR>";
+              }
+              {
+                key = "<C-`>";
+                mode = ["n" "v" "t"];
+                silent = false;
+                action = "<cmd>:ToggleTerm<CR>";
               }
             ];
           };