diff --git a/nvim/.config/nvim/init.lua b/nvim/.config/nvim/init.lua
index 0a18d04..1d3c6a9 100644
--- a/nvim/.config/nvim/init.lua
+++ b/nvim/.config/nvim/init.lua
@@ -50,9 +50,9 @@ opt.number = true                                                       -- Show
 opt.relativenumber = true                                               -- Show relative line numbers
 opt.splitbelow = true                                                   -- New horizontal splits open below
 opt.splitright = true                                                   -- New vertical splits open to the right
-opt.shiftwidth = 8                                                      -- Spaces for auto-indent
-opt.tabstop = 8                                                         -- Spaces for a tab character
-opt.expandtab = false                                                   -- Use spaces instead of tabs
+opt.shiftwidth = 2                                                      -- Spaces for auto-indent
+opt.tabstop = 2                                                         -- Spaces for a tab character
+opt.expandtab = true                                                   -- Use spaces instead of tabs
 opt.scrolloff = 8                                                       -- Lines to keep above/below cursor
 vim.cmd('autocmd BufEnter * set formatoptions-=cro')                    -- Disable auto-commenting on new lines
 vim.cmd('autocmd BufEnter * setlocal formatoptions-=cro')               -- Disable auto-commenting for local buffers