diff --git a/roles/neovim/files/init.lua b/roles/neovim/files/init.lua
index 65a5d9d..fa2b20b 100644
--- a/roles/neovim/files/init.lua
+++ b/roles/neovim/files/init.lua
@@ -1,3 +1,7 @@
 require('plugins')
 
 vim.g.mapleader = ";"
+vim.o.signcolumn = "yes"
+vim.wo.number = true
+vim.wo.relativenumber = true
+vim.wo.cursorline = true
diff --git a/roles/neovim/files/lua/plugins.lua b/roles/neovim/files/lua/plugins.lua
index f112964..feb9433 100644
--- a/roles/neovim/files/lua/plugins.lua
+++ b/roles/neovim/files/lua/plugins.lua
@@ -14,6 +14,9 @@ return require('packer').startup(function()
 	-- Easy LSP configurations
 	use 'neovim/nvim-lspconfig'
 
-	-- Git integration
-	use { 'TimUntersberger/neogit', requires = 'nvim-lua/plenary.nvim' }
+	-- Git line decorations
+	use 'lewis6991/gitsigns.nvim'
+
+	-- Git commands from vim
+	use 'tpope/vim-fugitive'
 end)
diff --git a/roles/neovim/files/plugin/gitsigns.lua b/roles/neovim/files/plugin/gitsigns.lua
new file mode 100644
index 0000000..d16d238
--- /dev/null
+++ b/roles/neovim/files/plugin/gitsigns.lua
@@ -0,0 +1 @@
+require("gitsigns").setup()
diff --git a/roles/neovim/files/plugin/lspconfig.lua b/roles/neovim/files/plugin/lspconfig.lua
index 36acc09..961f8c8 100644
--- a/roles/neovim/files/plugin/lspconfig.lua
+++ b/roles/neovim/files/plugin/lspconfig.lua
@@ -32,27 +32,6 @@ local on_attach = function(client, bufnr)
   vim.keymap.set('n', '<leader>f', function() vim.lsp.buf.format { async = true } end, bufopts)
 end
 
--- local lsp_flags = {
---   -- This is the default in Nvim 0.7+
---   debounce_text_changes = 150,
--- }
--- require('lspconfig')['pyright'].setup{
---     on_attach = on_attach,
---     flags = lsp_flags,
--- }
--- require('lspconfig')['tsserver'].setup{
---     on_attach = on_attach,
---     flags = lsp_flags,
--- }
--- require('lspconfig')['rust_analyzer'].setup{
---     on_attach = on_attach,
---     flags = lsp_flags,
---     -- Server-specific settings...
---     settings = {
---       ["rust-analyzer"] = {}
---     }
--- }
-
 require("lspconfig").pylsp.setup{
 	on_attach = on_attach
 }
diff --git a/roles/neovim/files/plugin/neogit.lua b/roles/neovim/files/plugin/neogit.lua
deleted file mode 100644
index 7403464..0000000
--- a/roles/neovim/files/plugin/neogit.lua
+++ /dev/null
@@ -1,2 +0,0 @@
-local neogit = require('neogit')
-neogit.setup {}