diff --git a/nix/users/base/neovim/default.nix b/nix/users/base/neovim/default.nix
index 300a822..4071ca9 100644
--- a/nix/users/base/neovim/default.nix
+++ b/nix/users/base/neovim/default.nix
@@ -42,6 +42,8 @@
         config = toLuaFile ./plugins/indent.lua;
       }
 
+      # HTML
+      
       # TODO: enable this when treesitter is installed
       # {
       #   plugin = nvim-ts-autotag;
@@ -52,6 +54,15 @@
         plugin = nvim-colorizer-lua;
         config = toLuaFile ./plugins/colorizer.lua;
       }
+
+      # GIT
+      {
+        plugin = gitsigns-nvim;
+        config = toLuaFile ./plugins/gitsigns.lua
+      }
+
+      vim-fugitive
+        
     ];
 
     extraLuaConfig = ''
diff --git a/nix/users/base/neovim/plugins/gitsigns.lua b/nix/users/base/neovim/plugins/gitsigns.lua
new file mode 100644
index 0000000..d8297f4
--- /dev/null
+++ b/nix/users/base/neovim/plugins/gitsigns.lua
@@ -0,0 +1,48 @@
+local status, plugin = pcall(require, 'gitsigns')
+if not status then
+    print('Error with plugin: ', plugin)
+    return
+end
+
+plugin.setup {
+  signs = {
+    add          = { text = '│' },
+    change       = { text = '│' },
+    delete       = { text = '_' },
+    topdelete    = { text = '‾' },
+    changedelete = { text = '~' },
+    untracked    = { text = '┆' },
+  },
+  signcolumn = true,  -- Toggle with `:Gitsigns toggle_signs`
+  numhl      = false, -- Toggle with `:Gitsigns toggle_numhl`
+  linehl     = false, -- Toggle with `:Gitsigns toggle_linehl`
+  word_diff  = false, -- Toggle with `:Gitsigns toggle_word_diff`
+  watch_gitdir = {
+    interval = 1000,
+    follow_files = true
+  },
+  attach_to_untracked = true,
+  current_line_blame = false, -- Toggle with `:Gitsigns toggle_current_line_blame`
+  current_line_blame_opts = {
+    virt_text = true,
+    virt_text_pos = 'eol', -- 'eol' | 'overlay' | 'right_align'
+    delay = 1000,
+    ignore_whitespace = false,
+  },
+  current_line_blame_formatter = '<author>, <author_time:%Y-%m-%d> - <summary>',
+  sign_priority = 6,
+  update_debounce = 100,
+  status_formatter = nil, -- Use default
+  max_file_length = 40000, -- Disable if file is longer than this (in lines)
+  preview_config = {
+    -- Options passed to nvim_open_win
+    border = 'single',
+    style = 'minimal',
+    relative = 'cursor',
+    row = 0,
+    col = 1
+  },
+  yadm = {
+    enable = false
+  },
+}