diff --git a/nvim/ftplugin/lua.lua b/nvim/ftplugin/lua.lua
new file mode 100644
index 0000000..3b7a35d
--- /dev/null
+++ b/nvim/ftplugin/lua.lua
@@ -0,0 +1,4 @@
+vim.bo.expandtab = true
+vim.bo.tabstop = 4
+vim.bo.shiftwidth = 4
+vim.bo.softtabstop = 4
diff --git a/nvim/lua/kickstart/plugins/which-key.lua b/nvim/lua/kickstart/plugins/which-key.lua
index 231d49a..9dcb71e 100644
--- a/nvim/lua/kickstart/plugins/which-key.lua
+++ b/nvim/lua/kickstart/plugins/which-key.lua
@@ -20,6 +20,9 @@ return {
         'folke/which-key.nvim',
         event = 'VimEnter', -- Sets the loading event to 'VimEnter'
         opts = {
+            -- delay between pressing a key and opening which-key (milliseconds)
+            -- this setting is independent of vim.o.timeoutlen
+            delay = 0,
             icons = {
                 -- set icon mappings to true if you have a Nerd Font
                 mappings = vim.g.have_nerd_font,