From bc7e0a5247d8c4c0b10d963c45180066f570a9c4 Mon Sep 17 00:00:00 2001
From: Warren Hood <nullbyte001@gmail.com>
Date: Thu, 10 Nov 2022 02:08:11 +0200
Subject: [PATCH] Add Format command to neovim

---
 neovim/.config/nvim/init.lua                    |  1 +
 neovim/.config/nvim/lua/warrenhood/commands.lua |  2 ++
 neovim/.config/nvim/lua/warrenhood/settings.lua | 10 +++++++---
 3 files changed, 10 insertions(+), 3 deletions(-)
 create mode 100644 neovim/.config/nvim/lua/warrenhood/commands.lua

diff --git a/neovim/.config/nvim/init.lua b/neovim/.config/nvim/init.lua
index ed35093..53db1dc 100644
--- a/neovim/.config/nvim/init.lua
+++ b/neovim/.config/nvim/init.lua
@@ -5,3 +5,4 @@ require("warrenhood.mason-config")
 require("warrenhood.cmp-config")
 require("warrenhood.theme")
 require("warrenhood.keybinds")
+require("warrenhood.commands")
diff --git a/neovim/.config/nvim/lua/warrenhood/commands.lua b/neovim/.config/nvim/lua/warrenhood/commands.lua
new file mode 100644
index 0000000..83c5f97
--- /dev/null
+++ b/neovim/.config/nvim/lua/warrenhood/commands.lua
@@ -0,0 +1,2 @@
+-- Format file
+vim.cmd "silent! command! Format lua vim.lsp.buf.format()"
diff --git a/neovim/.config/nvim/lua/warrenhood/settings.lua b/neovim/.config/nvim/lua/warrenhood/settings.lua
index 8ef5148..c7de725 100644
--- a/neovim/.config/nvim/lua/warrenhood/settings.lua
+++ b/neovim/.config/nvim/lua/warrenhood/settings.lua
@@ -4,10 +4,14 @@ local g = vim.g
 -- General stuff
 o.number = true
 o.relativenumber = true
+o.autoindent = true
 
-o.tabstop = 2 
-o.shiftwidth = 0
-o.softtabstop = -1
+o.tabstop = 4
+o.shiftwidth = 4
+o.softtabstop = 4
+o.smartindent = true
+
+o.expandtab = true
 
 -- Make clipboard work with neovim
 o.clipboard = 'unnamedplus'