diff --git a/modules/home/rsydn/programs/nvim/lua/plugins/auto-save.lua b/modules/home/rsydn/programs/nvim/lua/plugins/auto-save.lua
new file mode 100644
index 0000000..afb7fdd
--- /dev/null
+++ b/modules/home/rsydn/programs/nvim/lua/plugins/auto-save.lua
@@ -0,0 +1,52 @@
+return {
+  "okuuva/auto-save.nvim",
+  event = { "InsertLeave", "TextChanged" },
+  opts = {
+    enabled = true, -- Plugin is loaded but conditional on manual toggle
+    execution_message = {
+      enabled = true,
+      message = function()
+        return "AutoSave: saved at " .. vim.fn.strftime("%H:%M:%S")
+      end,
+      dim = 0.18,
+      cleaning_interval = 1250,
+    },
+    trigger_events = {
+      immediate_save = { "BufLeave", "FocusLost" },
+      defer_save = { "InsertLeave", "TextChanged" },
+      cancel_deferred_save = { "InsertEnter" },
+    },
+    condition = function(buf)
+      -- Only save if manually enabled
+      if not vim.g.auto_save_enabled then
+        return false
+      end
+
+      local fn = vim.fn
+      local utils = require("auto-save.utils.data")
+
+      -- Don't save for special buffer types
+      if utils.not_in(fn.getbufvar(buf, "&filetype"), {}) and fn.getbufvar(buf, "&buftype") == "" and fn.filereadable(fn.bufname(buf)) == 1 then
+        return true
+      end
+
+      return false
+    end,
+    write_all_buffers = false,
+    debounce_delay = 1000, -- Wait 1 second after typing stops before saving
+  },
+  keys = {
+    {
+      "<leader>ta",
+      function()
+        vim.g.auto_save_enabled = not vim.g.auto_save_enabled
+        if vim.g.auto_save_enabled then
+          vim.notify("Auto-save enabled", vim.log.levels.INFO)
+        else
+          vim.notify("Auto-save disabled", vim.log.levels.INFO)
+        end
+      end,
+      desc = "Toggle auto-save",
+    },
+  },
+}
diff --git a/modules/home/rsydn/programs/nvim/lua/plugins/which-key.lua b/modules/home/rsydn/programs/nvim/lua/plugins/which-key.lua
index e79bf9a..8571924 100644
--- a/modules/home/rsydn/programs/nvim/lua/plugins/which-key.lua
+++ b/modules/home/rsydn/programs/nvim/lua/plugins/which-key.lua
@@ -63,6 +63,7 @@ return {
           { mode = "n", keys = "<Leader>o", desc = "+open" },
           { mode = "n", keys = "<Leader>r", desc = "+rename" },
           { mode = "n", keys = "<Leader>s", desc = "+search" },
+          { mode = "n", keys = "<Leader>t", desc = "+toggle" },
         },
 
         window = {