diff --git a/config/nvim/init.lua b/config/nvim/init.lua
index a7b7c78..2e8bb2a 100644
--- a/config/nvim/init.lua
+++ b/config/nvim/init.lua
@@ -1,5 +1,28 @@
 vim.g.mapleader = ' '
 
+vim.g.loaded_2html_plugin = true
+vim.g.loaded_bugreport = true
+vim.g.loaded_getscript = true
+vim.g.loaded_getscriptPlugin = true
+vim.g.loaded_gzip = true
+vim.g.loaded_logipat = true
+vim.g.loaded_netrw = true
+vim.g.loaded_netrwFileHandlers = true
+vim.g.loaded_netrwPlugin = true
+vim.g.loaded_netrwSettings = true
+vim.g.loaded_optwin = true
+vim.g.loaded_rplugin = true
+vim.g.loaded_rrhelper = true
+vim.g.loaded_synmenu = true
+vim.g.loaded_tar = true
+vim.g.loaded_tarPlugin = true
+vim.g.loaded_tohtml = true
+vim.g.loaded_tutor = true
+vim.g.loaded_vimball = true
+vim.g.loaded_vimballPlugin = true
+vim.g.loaded_zip = true
+vim.g.loaded_zipPlugin = true
+
 vim.g.lz_n = {
     load = function(name)
         vim.cmd.packadd((name:match('[^/]+$') or name))
diff --git a/config/nvim/lua/plugins/git.lua b/config/nvim/lua/plugins/git.lua
index 91d3d06..b6a95cd 100644
--- a/config/nvim/lua/plugins/git.lua
+++ b/config/nvim/lua/plugins/git.lua
@@ -1,5 +1,20 @@
 vim.pack.add({
     'https://github.com/tpope/vim-fugitive',
+})
+
+function _G._fugitive_stl()
+    local s = vim.fn.FugitiveStatusline()
+    return s ~= '' and s .. ' ' or ''
+end
+
+vim.api.nvim_create_autocmd('VimEnter', {
+    once = true,
+    callback = function()
+        vim.o.statusline = ' %{v:lua._fugitive_stl()}' .. vim.o.statusline:sub(2)
+    end,
+})
+
+vim.pack.add({
     'https://github.com/lewis6991/gitsigns.nvim',
 }, { load = function() end })
 
@@ -207,13 +222,6 @@ vim.keymap.set('n', '<leader>gp', function()
 end)
 
 return {
-    {
-        'tpope/vim-fugitive',
-        cmd = { 'Git', 'G', 'Gread', 'Gwrite', 'Gdiffsplit', 'Gvdiffsplit' },
-        after = function()
-            vim.o.statusline = '%{FugitiveStatusline()} ' .. vim.o.statusline
-        end,
-    },
     {
         'barrettruth/diffs.nvim',
         before = function()
diff --git a/config/nvim/plugin/lines.lua b/config/nvim/plugin/lines.lua
deleted file mode 100644
index bcd1e94..0000000
--- a/config/nvim/plugin/lines.lua
+++ /dev/null
@@ -1 +0,0 @@
-vim.o.statusline = " %{expand('%:~')} %h%m%r%=%c:%l/%L "
diff --git a/config/nvim/plugin/options.lua b/config/nvim/plugin/options.lua
index 1e77ce6..e78c3ed 100644
--- a/config/nvim/plugin/options.lua
+++ b/config/nvim/plugin/options.lua
@@ -46,7 +46,9 @@ opt.matchpairs:append('<:>')
 o.number = true
 o.relativenumber = true
 o.signcolumn = 'no'
+
 o.statuscolumn = '%s%C %=%{v:relnum?v:relnum:v:lnum} '
+o.statusline = " %{len(expand('%'))?expand('%:~').' ':''}%h%m%r%=%c:%l/%L "
 
 opt.path:append('**')