diff --git a/nvim/.editorconfig b/nvim/.editorconfig
new file mode 100644
index 0000000..de847ab
--- /dev/null
+++ b/nvim/.editorconfig
@@ -0,0 +1,3 @@
+[*]
+indent_size=2
+indent_style=space
diff --git a/nvim/lua/config/options.lua b/nvim/lua/config/options.lua
index 7e4755e..84d1a96 100644
--- a/nvim/lua/config/options.lua
+++ b/nvim/lua/config/options.lua
@@ -1,5 +1,15 @@
 vim.opt.langmap = "+]ü["
 vim.keymap.set("n", "ü", "[", {remap=true})
+
+vim.opt.expandtab = true
+vim.opt.shiftwidth = 4
+vim.opt.tabstop = 4
+vim.opt.softtabstop = 4
+
+vim.opt.smarttab = true
+vim.opt.smartindent = true
+vim.opt.autoindent = true
+
 -- Set to true if you have a Nerd Font installed and selected in the terminal
 vim.g.have_nerd_font = false