diff --git a/common/home.nix b/common/home.nix
index b252653a..930ad6ff 100644
--- a/common/home.nix
+++ b/common/home.nix
@@ -85,6 +85,12 @@
   xdg.enable = true;
 
   programs = {
+    direnv = {
+      enable = true;
+      # enableFishIntegration = true;
+      enableNushellIntegration = true;
+      nix-direnv.enable = true;
+    };
     nix-index-database.comma.enable = true;
     helix = {
       enable = true;
diff --git a/common/nvim.nix b/common/nvim.nix
index 4b99e5c1..b29d129b 100644
--- a/common/nvim.nix
+++ b/common/nvim.nix
@@ -75,6 +75,7 @@
       };
 
       nvim-dap.enable = true;
+      nvim-dap-ui.enable = true;
       todo-comments.enable = true;
       lualine.enable = true;
       commentary.enable = true;
@@ -138,6 +139,10 @@
         "<C-w>\\\"" = "[[<cmd>split<cr>]]";
         "<C-w>%" = "[[<cmd>vsplit<cr>]]";
 
+        "<leader>bb" = "require'dap'.toggle_breakpoint";
+        "<leader>dd" = "require'dapui'.toggle";
+        "<leader>dr" = "[[<cmd>RustLsp debuggables<cr>]]";
+
         "<C-l>" = "[[<cmd>Outline<cr>]]";
         "<C-\\\\>" = "require('FTerm').toggle";
       };
@@ -169,6 +174,7 @@
       cmp-cmdline
       cmp-nvim-lsp
       cmp-nvim-lua
+      cmp-dap
       cmp_luasnip
       cmp-tmux
       cmp-treesitter
diff --git a/flake.lock b/flake.lock
index 162d768c..3df894a3 100644
--- a/flake.lock
+++ b/flake.lock
@@ -486,11 +486,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1709445365,
-        "narHash": "sha256-DVv6nd9FQBbMWbOmhq0KVqmlc3y3FMSYl49UXmMcO+0=",
+        "lastModified": 1710062421,
+        "narHash": "sha256-FiCNRfyUgJOLYIokLiFsfI7B+Zn9HDnOzFR3uVr5qsQ=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "4de84265d7ec7634a69ba75028696d74de9a44a7",
+        "rev": "36f873dfc8e2b6b89936ff3e2b74803d50447e0a",
         "type": "github"
       },
       "original": {
@@ -704,11 +704,11 @@
         "nmt": "nmt"
       },
       "locked": {
-        "lastModified": 1709737441,
-        "narHash": "sha256-SM68Sn82qk8osLkpIcvE8Z4iE8C6dWcAdig8TZz2QKM=",
+        "lastModified": 1710359927,
+        "narHash": "sha256-vq1fm2mXCfCOpyauqsuWsnFW3nS6ObczeHzrQ0+4J48=",
         "owner": "uttarayan21",
         "repo": "NixNeovim",
-        "rev": "21961ef3fd7193aba8ec76572ce7d5d2e79d027f",
+        "rev": "af027313a773c1bd63f9e0160f1f482a23c99d23",
         "type": "github"
       },
       "original": {
@@ -730,11 +730,11 @@
         "poetry2nix": "poetry2nix"
       },
       "locked": {
-        "lastModified": 1709240484,
-        "narHash": "sha256-e7Azz4vD3ogyDbpfEbMunYjPOytBxvcwKblwkIu+Q+M=",
+        "lastModified": 1710080202,
+        "narHash": "sha256-2IF6b0ZDwdrP0h1/+Vw4arcfLk6sGKs0lfzqzJSv2wY=",
         "owner": "nixneovim",
         "repo": "nixneovimplugins",
-        "rev": "27a92496c702a58705b02193462811b00793ed3c",
+        "rev": "6c1112edd6f64a67e698ef8bd594e6f8e45893c4",
         "type": "github"
       },
       "original": {