diff --git a/ftplugin/c.lua b/ftplugin/c.lua
deleted file mode 100644
index 0e4c436..0000000
--- a/ftplugin/c.lua
+++ /dev/null
@@ -1 +0,0 @@
-vim.opt.colorcolumn = "81"
diff --git a/ftplugin/python.lua b/ftplugin/python.lua
index b51ccb3..918114f 100644
--- a/ftplugin/python.lua
+++ b/ftplugin/python.lua
@@ -1,4 +1,3 @@
 setlocal tabstop = 4
 setlocal softtabstop = 4
 setlocal shiftwidth = 4
-vim.opt.colorcolumn="80"
diff --git a/ftplugin/tex.lua b/ftplugin/tex.lua
index 30b0cff..6262f2e 100644
--- a/ftplugin/tex.lua
+++ b/ftplugin/tex.lua
@@ -5,7 +5,6 @@ vim.api.nvim_buf_set_keymap(0, "i", "<F5>", "<esc> :exec 'w' <bar> :exec '!xelat
 vim.api.nvim_buf_set_keymap(0, "v", "<F5>", "<esc> :exec 'w' <bar> :exec '!xelatex %'<cr>", {})
 
 -- Open PDF-Viewer from LaTeX-file
-vim.api.nvim_buf_set_keymap(0, "n", "<leader>cz", ":silent !zathura --fork %:r.pdf& <cr>", {})
 vim.api.nvim_buf_set_keymap(0, "n", "<F6>", ":silent !zathura --fork %:r.pdf& <cr>", {})
 vim.api.nvim_buf_set_keymap(0, "i", "<F6>", "<esc> :silent !zathura --fork %:r.pdf& <cr>", {})
 vim.api.nvim_buf_set_keymap(0, "v", "<F6>", "<esc> :silent !zathura --fork %:r.pdf& <cr>", {})
diff --git a/init.lua b/init.lua
index 3652a0e..6c2aedb 100644
--- a/init.lua
+++ b/init.lua
@@ -22,9 +22,8 @@ require("lazy").setup({
         border = "rounded",
     },
     install = {
-        colorscheme = { "everforest" }
+        colorscheme = { "gruvbox-material" }
     },
-    change_detection = { notify = false }
 })
 
 
diff --git a/lua/core/autocmd.lua b/lua/core/autocmd.lua
index 08d5d93..e7ba79f 100644
--- a/lua/core/autocmd.lua
+++ b/lua/core/autocmd.lua
@@ -7,26 +7,7 @@ vim.api.nvim_create_autocmd("Filetype", {
 	command = "setlocal formatoptions-=c formatoptions-=r formatoptions-=o"
 })
 
--- persistent folds
-vim.api.nvim_create_autocmd({"BufWinLeave"}, {
-  pattern = {"*.*"},
-  desc = "save view (folds), when closing file",
-  command = "mkview",
-})
-vim.api.nvim_create_autocmd({"BufWinEnter"}, {
-  pattern = {"*.*"},
-  desc = "load view (folds), when opening file",
-  command = "silent! loadview"
-})
-
-vim.api.nvim_create_autocmd("WinEnter", {
-    callback = function()
-        vim.wo.cursorline = true
-    end,
-})
-
-vim.api.nvim_create_autocmd("WinLeave", {
-    callback = function()
-        vim.wo.cursorline = false
-    end,
+vim.api.nvim_create_autocmd("FocusLost", {
+	pattern = "*",
+	command = ":wa"
 })
diff --git a/lua/core/remap.lua b/lua/core/remap.lua
index 1d68274..fdf942e 100644
--- a/lua/core/remap.lua
+++ b/lua/core/remap.lua
@@ -18,19 +18,10 @@ vim.api.nvim_set_keymap("n", "<C-l>", "<C-w>l", {})
 
 -- buffer operations
 vim.api.nvim_set_keymap("n", "<leader><tab>", "<C-^>", {})
+vim.api.nvim_set_keymap("n", "<leader>on", "<cmd>w <bar> %bd <bar> e#<cr>", {})
 vim.api.nvim_set_keymap("n", "<leader>bd", "<cmd>bd<cr>", {})
-vim.api.nvim_set_keymap("n", "<leader>bn", "<cmd>bnext<cr>", {})
-vim.api.nvim_set_keymap("n", "<leader>bp", "<cmd>bprevious<cr>", {})
-
--- quickfix and locationlist
-vim.api.nvim_set_keymap("n", "<S-h>", "<cmd>cnext<cr>zz", {})
-vim.api.nvim_set_keymap("n", "<S-l>", "<cmd>cprev<cr>zz", {})
-vim.api.nvim_set_keymap("n", "<leader>h", "<cmd>lnext<cr>zz", {})
-vim.api.nvim_set_keymap("n", "<leader>l", "<cmd>lprev<cr>zz", {})
-vim.api.nvim_set_keymap("n", "<leader>L", "<cmd>lcl<cr>", {})
-vim.api.nvim_set_keymap("n", "<leader>Q", "<cmd>cw<cr>", {})
-vim.api.nvim_set_keymap("n", "<leader>q", "<cmd>ccl<cr>", {})
-
+vim.api.nvim_set_keymap("n", "<S-h>", "<cmd>bprevious<cr>", {})
+vim.api.nvim_set_keymap("n", "<S-l>", "<cmd>bnext<cr>", {})
 
 -- moving visual blocks
 vim.api.nvim_set_keymap("v", "J", ":m '>+1<cr>gv=gv", {})
@@ -40,37 +31,21 @@ vim.api.nvim_set_keymap("v", "K", ":m '<-2<cr>gv=gv", {})
 vim.api.nvim_set_keymap("n", "<leader>d", "\"_d", {})
 vim.api.nvim_set_keymap("v", "<leader>d", "\"_d", {})
 
--- paste without yanking selected text
-vim.api.nvim_set_keymap("x", "<leader>p", [["_dP]], {})
-
 -- copy to system clipboard
 vim.api.nvim_set_keymap("n", "<leader>y", "\"+y", {})
 vim.api.nvim_set_keymap("v", "<leader>y", "\"+y", {})
 vim.api.nvim_set_keymap("n", "<leader>Y", "\"+Y", {})
 
 -- paste from system clipboard
-vim.api.nvim_set_keymap("n", "<leader>P", "\"+p", {})
+vim.api.nvim_set_keymap("n", "<leader>p", "\"+p", {})
+
+-- opening explorer
+vim.api.nvim_set_keymap("n", "<leader>E", ":20Lexplore<cr>", {})
 
 -- make current file (un)executable
 vim.api.nvim_set_keymap("n", "<leader>mx", ":exec 'w'<cr> <bar> <cmd>!chmod +x %<cr>", { silent = true })
 vim.api.nvim_set_keymap("n", "<leader>mX", ":exec 'w'<cr> <bar> <cmd>!chmod -x %<cr>", { silent = true })
 
--- <leader><leader> for fast save
-vim.api.nvim_set_keymap("n", "<leader><leader>", ":exec 'w'<cr>", {silent = true})
-
--- <leader>r for redo
-vim.api.nvim_set_keymap("n", "<leader>r", ":redo <cr>", {silent = true})
-
--- better ZQ
-vim.api.nvim_set_keymap("n", "zq", ":q!<cr>", {})
-
--- even better
-vim.api.nvim_set_keymap("n", "<leader>XX", ":qa!<cr>", {})
-vim.api.nvim_set_keymap("n", "<leader>XZZ", ":wqa!<cr>", {})
-vim.api.nvim_set_keymap("n", "<leader>x", ":q<cr>", {})
-
--- fast editing
-vim.api.nvim_set_keymap("n", "<leader>E", ":e ", {})
-
--- vertical resize
-vim.api.nvim_set_keymap("n", "<leader>vr", ":vertical-resize ", {})
+-- mk- and loadview for view-persistance
+vim.api.nvim_set_keymap("n", "<leader>vm", ":exec 'w'<cr> <bar> <cmd>mkview <cr>", {silent = true})
+vim.api.nvim_set_keymap("n", "<leader>vl", ":exec 'w'<cr> <bar> <cmd>loadview <cr>", {silent = true})
diff --git a/lua/core/settings.lua b/lua/core/settings.lua
index 18b9d69..2cc9847 100644
--- a/lua/core/settings.lua
+++ b/lua/core/settings.lua
@@ -1,7 +1,7 @@
 -- Settings
 
 -- cursor 
-vim.api.nvim_set_option("guicursor","n-v-c-sm:hor100-Cursor,i-ci-ve:ver100-iCursor,r-cr-o:hor40,a:blinkwait700-blinkoff400-blinkon250")
+vim.api.nvim_set_option("guicursor","n-v-c-sm:hor20-Cursor,i-ci-ve:ver80-iCursor,r-cr-o:hor40,a:blinkwait700-blinkoff400-blinkon250")
 
 -- disable mouse
 vim.api.nvim_set_option("mouse","")
@@ -9,7 +9,7 @@ vim.api.nvim_set_option("mouse","")
 -- relative numbers
 vim.opt.nu = true
 vim.opt.rnu = true
-vim.opt.signcolumn = 'yes:3'
+vim.opt.signcolumn = 'yes'
 
 -- setting completion menu for autocompletion
 vim.opt.completeopt = 'menu,menuone,noselect'
@@ -24,12 +24,6 @@ vim.opt.expandtab = true
 -- enable foldcolumn
 vim.wo.foldcolumn = "2"
 
--- enable wrap
-vim.opt.wrap = true
-
--- allow "@" in filenames
-vim.opt.isfname:append("@-@")
-
 -- smart indenting by vim
 vim.api.nvim_set_option("smartindent",true)
 
@@ -45,7 +39,7 @@ vim.api.nvim_set_option("background", "dark")
 
 -- always center
 -- vim.api.nvim_set_option("scrolloff",999)
-vim.opt.scrolloff = 10
+vim.api.nvim_set_option("scrolloff",15)
 
 -- spellchecking
 vim.wo.spell = true
@@ -62,19 +56,8 @@ vim.api.nvim_set_option("splitright",true)
 -- disable Netrw-Banner
 vim.g.netrw_banner = 0
 
--- disable Netrw for Filetree Plugin
-vim.g.loaded_netrw = 1
-vim.g.loaded_netrwPlugin = 1
-
-
 -- undotree file management
 vim.opt.swapfile = false
 vim.opt.backup = false
 vim.opt.undodir = os.getenv("HOME") .. "/.local/share/nvim/undodir"
 vim.opt.undofile = true
-
--- message options
-vim.opt.shortmess = "aItTF"
-
--- hide buffers instead of closing
-vim.opt.hidden = true
diff --git a/lua/core/statusline.lua b/lua/core/statusline.lua
index 4852505..9672388 100644
--- a/lua/core/statusline.lua
+++ b/lua/core/statusline.lua
@@ -1,7 +1,7 @@
 -- statusline
-vim.api.nvim_set_option("laststatus", 3)
+vim.api.nvim_set_option("laststatus", 2)
 vim.api.nvim_set_option("statusline", " ")
 
 -- tabline
 -- always show tabline (0 = never, 1 = only with at least 2 tabs, 2 = always) and colors
-vim.api.nvim_set_option("showtabline", 1)
+vim.api.nvim_set_option("showtabline", 2)
diff --git a/lua/plugin/bin.lua b/lua/plugin/bin.lua
deleted file mode 100644
index 26b7b0f..0000000
--- a/lua/plugin/bin.lua
+++ /dev/null
@@ -1,15 +0,0 @@
-return {
-    {
-        "matze/wastebin.nvim",
-        config = function()
-            require("wastebin").setup({
-                url = "https://bin.xesc.de",
-                open_cmd = "xdg-open"
-            })
-        end,
-        opts = {
-            vim.keymap.set("n", "<leader>wp", "<cmd>WastePaste<cr>", { silent = true }),
-            vim.keymap.set("v", "<leader>wp", "<cmd>WastePaste<cr>", { silent = true }),
-        },
-    }
-}
diff --git a/lua/plugin/bufferline.lua b/lua/plugin/bufferline.lua
new file mode 100644
index 0000000..b13e1bc
--- /dev/null
+++ b/lua/plugin/bufferline.lua
@@ -0,0 +1,27 @@
+return {
+    {
+        "akinsho/bufferline.nvim",
+        config = function()
+            require("bufferline").setup({
+                options = {
+                    offsets = {
+                        {
+                            filetype = "netrw",
+                            text = "File Explorer",
+                            highlight = "Directory",
+                            text_align = 'center',
+                            separator = true
+                        }
+                    },
+                    show_buffer_close_icons = false,
+                },
+								highlights = {
+									buffer_selected = {
+										fg = "#d8a657",
+										bg = "#141617",
+									},
+								},
+            })
+        end,
+    }
+}
diff --git a/lua/plugin/everforest.lua b/lua/plugin/everforest.lua
index cb4134b..742b554 100644
--- a/lua/plugin/everforest.lua
+++ b/lua/plugin/everforest.lua
@@ -1,7 +1,7 @@
 return {
     {
         "sainnhe/everforest",
-        priority = 1000,
+        lazy = true,
         config = function()
             -- Settings for colorscheme
             vim.api.nvim_set_var("everforest_background", "hard")
@@ -16,8 +16,8 @@ return {
             -- Settings to override colorscheme
             -- vim.api.nvim_set_hl(0, "ModeMsg", { bold = true, fg = "#d8a657"})
             -- colors of tabline
-            vim.api.nvim_set_hl(0, "TabLine", { bg = "#272e33", fg = "#dfa000" })
-            vim.api.nvim_set_hl(0, "TabLineFil", { bg = "#374145" })
+            vim.api.nvim_set_hl(0, "TabLine", { bg = "#3c3836", fg = "#89b482" })
+            vim.api.nvim_set_hl(0, "TabLineFil", { bg = "#1d2021" })
             vim.api.nvim_set_hl(0, "TabLineSel", { bold = true, bg = "none", fg = "#d8a657" })
             -- color of statusline
             vim.api.nvim_set_hl(0, "StatusLine", { bold = false, bg = "#1d2021", fg = "#89b482" })
@@ -25,22 +25,22 @@ return {
             -- color of vertical split line
             vim.api.nvim_set_hl(0, "VertSplit", { bg = "#141617", fg = "#141617" })
             -- color of the cursorline and cursorlinenumber
-            vim.api.nvim_set_hl(0, "Cursorline", { bg = "#3a464c" })
-            vim.api.nvim_set_hl(0, "CursorLineNr", { bold = true, fg = "#dbbc7f" })
+            vim.api.nvim_set_hl(0, "Cursorline", { bg = "#141617" })
+            vim.api.nvim_set_hl(0, "CursorLineNr", { bold = true, bg = "#141617", fg = "#d8a657" })
             -- color of Floats and FloatBorders
             vim.api.nvim_set_hl(0, "NormalFloat", { bg = none, fg = none })
-            vim.api.nvim_set_hl(0, "FloatBorder", { bg = none, fg = "#9da9a0" })
-            vim.api.nvim_set_hl(0, "DiagnosticFloatingWarn", { bg = none, fg = "#dfa000" })
-            vim.api.nvim_set_hl(0, "DiagnosticFloatingError", { bg = none, fg = "#f85552" })
-            vim.api.nvim_set_hl(0, "DiagnosticFloatingHint", { bg = none, fg = "#35a77c" })
-            vim.api.nvim_set_hl(0, "DiagnosticFloatingInfo", { bg = none, fg = "#8da101" })
+            vim.api.nvim_set_hl(0, "FloatBorder", { bg = none, fg = "#d4be98" })
+            vim.api.nvim_set_hl(0, "DiagnosticFloatingWarn", { bg = none, fg = "#d8a657" })
+            vim.api.nvim_set_hl(0, "DiagnosticFloatingError", { bg = none, fg = "#ea6962" })
+            vim.api.nvim_set_hl(0, "DiagnosticFloatingHint", { bg = none, fg = "#a9b665" })
+            vim.api.nvim_set_hl(0, "DiagnosticFloatingInfo", { bg = none, fg = "#d4be98" })
 
             -- autocommand for overrides
             vim.api.nvim_create_autocmd("ColorScheme", {
                 pattern = "everforest",
                 callback = function()
-                    vim.api.nvim_set_hl(0, "TabLine", { bg = "#272e33", fg = "#dfa000" })
-                    vim.api.nvim_set_hl(0, "TabLineFil", { bg = "#374145" })
+                    vim.api.nvim_set_hl(0, "TabLine", { bg = "#3c3836", fg = "#89b482" })
+                    vim.api.nvim_set_hl(0, "TabLineFil", { bg = "#1d2021" })
                     vim.api.nvim_set_hl(0, "TabLineSel", { bold = true, bg = "none", fg = "#d8a657" })
                     -- color of statusline
                     vim.api.nvim_set_hl(0, "StatusLine", { bold = false, bg = "#1d2021", fg = "#89b482" })
@@ -48,15 +48,15 @@ return {
                     -- color of vertical split line
                     vim.api.nvim_set_hl(0, "VertSplit", { bg = "#141617", fg = "#141617" })
                     -- color of the cursorline and cursorlinenumber
-                    vim.api.nvim_set_hl(0, "Cursorline", { bg = "#3c464c" })
-                    vim.api.nvim_set_hl(0, "CursorLineNr", { bold = true, fg = "#dbbc7f" })
+                    vim.api.nvim_set_hl(0, "Cursorline", { bg = "#141617" })
+                    vim.api.nvim_set_hl(0, "CursorLineNr", { bold = true, bg = "#141617", fg = "#d8a657" })
                     -- color of Floats and FloatBorders
                     vim.api.nvim_set_hl(0, "NormalFloat", { bg = none, fg = none })
-                    vim.api.nvim_set_hl(0, "FloatBorder", { bg = none, fg = "#9da9a0" })
-                    vim.api.nvim_set_hl(0, "DiagnosticFloatingWarn", { bg = none, fg = "#dfa000" })
-                    vim.api.nvim_set_hl(0, "DiagnosticFloatingError", { bg = none, fg = "#f85552" })
-                    vim.api.nvim_set_hl(0, "DiagnosticFloatingHint", { bg = none, fg = "#35a77c" })
-                    vim.api.nvim_set_hl(0, "DiagnosticFloatingInfo", { bg = none, fg = "#8da101" })
+                    vim.api.nvim_set_hl(0, "FloatBorder", { bg = none, fg = "#d4be98" })
+                    vim.api.nvim_set_hl(0, "DiagnosticFloatingWarn", { bg = none, fg = "#d8a657" })
+                    vim.api.nvim_set_hl(0, "DiagnosticFloatingError", { bg = none, fg = "#ea6962" })
+                    vim.api.nvim_set_hl(0, "DiagnosticFloatingHint", { bg = none, fg = "#a9b665" })
+                    vim.api.nvim_set_hl(0, "DiagnosticFloatingInfo", { bg = none, fg = "#d4be98" })
                 end,
             })
         end,
diff --git a/lua/plugin/fugitive.lua b/lua/plugin/fugitive.lua
new file mode 100644
index 0000000..cd5bdbb
--- /dev/null
+++ b/lua/plugin/fugitive.lua
@@ -0,0 +1,18 @@
+return {
+    {
+        'tpope/vim-fugitive',
+        keys = {
+            { "<leader>GG", "<cmd>Git <cr>",                   desc = "git" },
+            { "<leader>Gs", "<cmd>Git status <cr>",            desc = "git status" },
+            { "<leader>Gd", "<cmd>Git diff <cr>",              desc = "git diff" },
+            { "<leader>GD", "<cmd>Git diff --staged <cr>",     desc = "git diff --staged" },
+            { "<leader>Gl", "<cmd>Git log --graph <cr>",       desc = "git log --graph" },
+            { "<leader>Ga", "<cmd>Git add --interactive <cr>", desc = "git add" },
+            { "<leader>GA", "<cmd>Git add -A <cr>",            desc = "git add -A " },
+            { "<leader>Gc", "<cmd>Git commit <cr>",            desc = "git commit" },
+            { "<leader>GC", "<cmd>Git commit --amend <cr>",    desc = "git commit --amend " },
+            { "<leader>Gp", "<cmd>Git push <cr>",              desc = "git push" },
+            { "<leader>GP", "<cmd>Git pull <cr>",              desc = "git pull" },
+        },
+    }
+}
diff --git a/lua/plugin/gitsigns.lua b/lua/plugin/gitsigns.lua
index de1c022..9b63384 100644
--- a/lua/plugin/gitsigns.lua
+++ b/lua/plugin/gitsigns.lua
@@ -15,12 +15,35 @@ return {
                         opts.buffer = bufnr
                         vim.keymap.set(mode, l, r, opts)
                     end
-                    map('n', '<leader>gB', function() gs.blame_line { full = true } end)
-                    map('n', '<leader>gb', gs.toggle_current_line_blame)
-                    map('n', '<leader>gs', gs.stage_hunk) -- git stage this
-                    map('v', '<leader>gs', gs.stage_hunk) -- git stage this
-                    map('n', '<leader>gus', gs.undo_stage_hunk) -- git undo stage this
-                    map('v', '<leader>gus', gs.undo_stage_hunk) -- git undo stage this
+
+                    -- Navigation
+                    map('n', ']c', function()
+                        if vim.wo.diff then return ']c' end
+                        vim.schedule(function() gs.next_hunk() end)
+                        return '<Ignore>'
+                    end, { expr = true })
+
+                    map('n', '[c', function()
+                        if vim.wo.diff then return '[c' end
+                        vim.schedule(function() gs.prev_hunk() end)
+                        return '<Ignore>'
+                    end, { expr = true })
+
+                    -- Actions
+                    map({ 'n', 'v' }, '<leader>hs', ':Gitsigns stage_hunk<CR>')
+                    map({ 'n', 'v' }, '<leader>hr', ':Gitsigns reset_hunk<CR>')
+                    map('n', '<leader>hS', gs.stage_buffer)
+                    map('n', '<leader>hu', gs.undo_stage_hunk)
+                    map('n', '<leader>hR', gs.reset_buffer)
+                    map('n', '<leader>hp', gs.preview_hunk)
+                    map('n', '<leader>hb', function() gs.blame_line { full = true } end)
+                    map('n', '<leader>tb', gs.toggle_current_line_blame)
+                    map('n', '<leader>hd', gs.diffthis)
+                    map('n', '<leader>hD', function() gs.diffthis('~') end)
+                    map('n', '<leader>td', gs.toggle_deleted)
+
+                    -- Text object
+                    map({ 'o', 'x' }, 'ih', ':<C-U>Gitsigns select_hunk<CR>')
                 end
             })
         end,
diff --git a/lua/plugin/gruvbox-material.lua b/lua/plugin/gruvbox-material.lua
index 00b4076..fb9148b 100644
--- a/lua/plugin/gruvbox-material.lua
+++ b/lua/plugin/gruvbox-material.lua
@@ -1,7 +1,7 @@
 return {
     {
         "sainnhe/gruvbox-material",
-        lazy = true,
+        priority = 1000,
         config = function()
             -- Settings for colorscheme
             vim.api.nvim_set_var("gruvbox_material_background", "hard")
diff --git a/lua/plugin/harpoon.lua b/lua/plugin/harpoon.lua
deleted file mode 100644
index b7d297f..0000000
--- a/lua/plugin/harpoon.lua
+++ /dev/null
@@ -1,31 +0,0 @@
-return {
-    {
-        "ThePrimeagen/harpoon",
-        branch = "harpoon2",
-        dependencies = {
-            "nvim-lua/plenary.nvim",
-            lazy = true,
-        },
-        config = function()
-            local harpoon = require("harpoon")
-            harpoon:setup()
-
-            vim.keymap.set("n", "<leader>a", function() harpoon:list():add() end)
-            vim.keymap.set("n", "<C-e>", function() harpoon.ui:toggle_quick_menu(harpoon:list()) end)
-
-            vim.keymap.set("n", "<leader>n", function() harpoon:list():select(1) end)
-            vim.keymap.set("n", "<leader>e", function() harpoon:list():select(2) end)
-            vim.keymap.set("n", "<leader>i", function() harpoon:list():select(3) end)
-            vim.keymap.set("n", "<leader>o", function() harpoon:list():select(4) end)
-            vim.keymap.set("n", "<leader>1", function() harpoon:list():select(1) end)
-            vim.keymap.set("n", "<leader>2", function() harpoon:list():select(2) end)
-            vim.keymap.set("n", "<leader>3", function() harpoon:list():select(3) end)
-            vim.keymap.set("n", "<leader>4", function() harpoon:list():select(4) end)
-            vim.keymap.set("n", "<leader>5", function() harpoon:list():select(5) end)
-            vim.keymap.set("n", "<leader>6", function() harpoon:list():select(6) end)
-            vim.keymap.set("n", "<leader>7", function() harpoon:list():select(7) end)
-            vim.keymap.set("n", "<leader>8", function() harpoon:list():select(8) end)
-            vim.keymap.set("n", "<leader>9", function() harpoon:list():select(9) end)
-        end
-    }
-}
diff --git a/lua/plugin/lsp.lua b/lua/plugin/lsp.lua
deleted file mode 100644
index 90735cd..0000000
--- a/lua/plugin/lsp.lua
+++ /dev/null
@@ -1,342 +0,0 @@
-return {
-  {
-    "neovim/nvim-lspconfig",
-    dependencies = {
-      "williamboman/mason.nvim",
-      "williamboman/mason-lspconfig.nvim",
-      "hrsh7th/cmp-nvim-lsp",
-      "hrsh7th/cmp-buffer",
-      "hrsh7th/cmp-path",
-      "hrsh7th/cmp-cmdline",
-      "hrsh7th/nvim-cmp",
-      "L3MON4D3/LuaSnip",
-      "saadparwaiz1/cmp_luasnip",
-      "nvim-telescope/telescope-ui-select.nvim",
-      "nvimtools/none-ls.nvim",
-      "nvimdev/lspsaga.nvim",
-      'nvim-treesitter/nvim-treesitter',
-      'nvim-tree/nvim-web-devicons',
-      "jay-babu/mason-null-ls.nvim",
-    },
-    config = function()
-      -- setup --
-
-      local capabilities = vim.tbl_deep_extend(
-        "force",
-        {},
-        vim.lsp.protocol.make_client_capabilities()
-      )
-
-      -- mason --
-
-      require("mason").setup({
-        PATH = "append",
-        ui = {
-          border = "rounded",
-          icons = {
-            package_installed = "✔",
-            package_pending = "➜",
-            package_uninstalled = "✘"
-          }
-        }
-      })
-
-      -- mason lspconfig --
-
-      require("mason-lspconfig").setup({
-        ensure_installed = {
-          "lua_ls",
-          "clangd",
-          "rust_analyzer",
-        },
-        handlers = {
-          -- The first entry (without a key) will be the default handler
-          -- and will be called for each installed server that doesn't have
-          -- a dedicated handler.
-          function(server_name)           -- default handler (optional)
-            require("lspconfig")[server_name].setup {
-              capabilities = capabilities
-            }
-          end,
-          clangd = function()
-            require("lspconfig").clangd.setup {
-              capabilities = capabilities,
-              on_attach = function(client)
-                client.server_capabilities.documentFormattingProvider = false
-                client.server_capabilities.documentRangeFormattingProvider = false
-              end,
-            }
-          end,
-        }
-      })
-
-      -- telescope ui for null-ls
-
-      require("telescope").setup {
-        extensions = {
-          ["ui-select"] = {
-            -- require("telescope.themes").get_dropdown {
-            --     -- even more opts
-            -- }
-          }
-        }
-      }
-      require("telescope").load_extension("ui-select")
-
-
-      -- null-ls (none-ls)
-
-      local null_ls = require('null-ls')
-      require("null-ls").setup({
-        sources = {
-          null_ls.builtins.diagnostics.trail_space.with {
-            disabled_filetypes = { "lua" }
-          },
-          null_ls.builtins.diagnostics.sqlfluff.with({
-            extra_args = { "--dialect", "sqlite" },
-          }),
-          null_ls.builtins.formatting.sqlfluff.with({
-            extra_args = { "--dialect", "sqlite" },
-          }),
-          null_ls.builtins.formatting.clang_format.with({
-            extra_args = { "-style={BasedOnStyle: llvm, IndentWidth: 2, BreakBeforeBraces: Linux, ColumnLimit: 0}" }
-          })
-        },
-      })
-
-      require("mason-null-ls").setup({
-        ensure_installed = { "clang_format", "shellharden", "shfmt" }
-      })
-
-
-      -- lspsaga (pretty lsp-windows)
-
-      require('lspsaga').setup({
-        symbol_in_winbar = {
-          enable = false,
-          show_file = false
-        },
-        finder = {
-          keys = {
-            toggle_or_open = "<cr>",
-            quit = { '<Esc>', 'q' }
-          }
-        },
-        outline = {
-          win_position = 'right',
-          win_width = 32,
-          auto_preview = true,
-        },
-        lightbulb = {
-          enable = false
-        },
-        ui = {
-          code_action = '',
-          title = true,
-          border = 'rounded',
-        },
-        rename = {
-          in_select = false,
-          keys = {
-            quit = { '<Esc>', 'q' },
-            select = '<Space>'
-          }
-        },
-        hover_doc = {
-          open_cmd = '!firefox'
-        },
-        code_action = {
-          keys = {
-            quit = { '<Esc>', 'q' }
-          },
-          extend_gitsigns = false,
-        },
-        definition = {
-          keys = {
-            quit = { '<Esc>', 'q' },
-          },
-        },
-        diagnostic = {
-          border_follow = true,
-          extend_relatedInformation = true,
-          keys = {
-            quit = { '<Esc>', 'q' },
-            quit_in_show = { '<Esc>', 'q' },
-          }
-        }
-      })
-
-      -- autocomplete --
-
-      local kind_icons = {
-        Text = "",
-        Method = "󰆧",
-        Function = "󰊕",
-        Constructor = "",
-        Field = "󰇽",
-        Variable = "󰂡",
-        Class = "󰠱",
-        Interface = "",
-        Module = "",
-        Property = "󰜢",
-        Unit = "",
-        Value = "󰎠",
-        Enum = "",
-        Keyword = "󰌋",
-        Snippet = "",
-        Color = "󰏘",
-        File = "󰈙",
-        Reference = "",
-        Folder = "󰉋",
-        EnumMember = "",
-        Constant = "󰏿",
-        Struct = "",
-        Event = "",
-        Operator = "󰆕",
-        TypeParameter = "󰅲"
-      }
-
-      local has_words_before = function()
-        unpack = unpack or table.unpack
-        local line, col = unpack(vim.api.nvim_win_get_cursor(0))
-        return col ~= 0 and
-            vim.api.nvim_buf_get_lines(0, line - 1, line, true)[1]:sub(col, col):match("%s") == nil
-      end
-
-      local luasnip = require("luasnip")
-      local cmp = require("cmp")
-      cmp.setup({
-        formatting = {
-          format = function(entry, vim_item)
-            -- Kind icons
-            vim_item.kind = string.format('%s %s', kind_icons[vim_item.kind], vim_item.kind)             -- This concatonates the icons with the name of the item kind
-            -- Source
-            vim_item.menu = ({
-              buffer = "",
-              nvim_lsp = "",
-              luasnip = "",
-              nvim_lua = "",
-              latex_symbols = "",
-            })[entry.source.name]
-            return vim_item
-          end
-        },
-        snippet = {
-          expand = function(args)
-            require('luasnip').lsp_expand(args.body)             -- For `luasnip` users.
-          end,
-        },
-        window = {
-          completion = cmp.config.window.bordered(),
-          documentation = cmp.config.window.bordered(),
-        },
-        mapping = cmp.mapping.preset.insert({
-          ['<C-b>'] = cmp.mapping.scroll_docs(-4),
-          ['<C-f>'] = cmp.mapping.scroll_docs(4),
-          ['<C-e>'] = cmp.mapping(function(fallback)
-            if cmp.visible() then
-              cmp.abort()
-            else
-              cmp.complete()
-            end
-          end),
-          ['<CR>'] = cmp.mapping.confirm({ select = false }),           -- Accept currently selected item. Set `select` to `false` to only confirm explicitly selected items.
-          ["<Tab>"] = cmp.mapping(function(fallback)
-            if cmp.visible() then
-              cmp.select_next_item()
-              -- You could replace the expand_or_jumpable() calls with expand_or_locally_jumpable()
-              -- they way you will only jump inside the snippet region
-            elseif luasnip.expand_or_jumpable() then
-              luasnip.expand_or_jump()
-            elseif has_words_before() then
-              cmp.complete()
-            else
-              fallback()
-            end
-          end, { "i", "s" }),
-          ["<S-Tab>"] = cmp.mapping(function(fallback)
-            if cmp.visible() then
-              cmp.select_prev_item()
-            elseif luasnip.jumpable(-1) then
-              luasnip.jump(-1)
-            else
-              fallback()
-            end
-          end, { "i", "s" }),
-        }),
-        sources = cmp.config.sources({
-          { name = 'nvim_lsp' },
-          { name = 'luasnip' },           -- For luasnip users.
-          {
-            name = 'buffer',
-            option = {
-              get_bufnrs = function()
-                return vim.api.nvim_list_bufs()
-              end
-            },
-          },
-        }, {
-        }),
-        -- Set configuration for specific filetype.
-        -- Use buffer source for `/` and `?` (if you enabled `native_menu`, this won't work anymore).
-        cmp.setup.cmdline({ '/', '?' }, {
-          mapping = cmp.mapping.preset.cmdline(),
-          sources = {
-            { name = 'buffer' }
-          }
-        }),
-        -- Use cmdline & path source for ':' (if you enabled `native_menu`, this won't work anymore).
-        cmp.setup.cmdline(':', {
-          mapping = cmp.mapping.preset.cmdline(),
-          sources = cmp.config.sources({
-            { name = 'path' }
-          }, {
-            { name = 'cmdline' }
-          })
-        })
-      })
-
-      -- config --
-
-      vim.diagnostic.config({
-        update_in_insert = true,
-        signs = { text = { [vim.diagnostic.severity.ERROR] = "✘ ", [vim.diagnostic.severity.WARN] = " ", [vim.diagnostic.severity.HINT] = " ", [vim.diagnostic.severity.INFO] = " " } },
-        float = {
-          focusable = false,
-          style = "minimal",
-          border = "rounded",
-          source = "always",
-          header = "",
-          prefix = "",
-        },
-        virtual_text = {
-          prefix = '●', -- Could be '●', '■', 'x', '▎', or anything else
-        },
-      })
-
-      -- keymaps --
-
-      local opts = { noremap = true, silent = true }
-      vim.keymap.set('n', 'gd', vim.lsp.buf.definition, opts)
-      vim.keymap.set('n', 'K', function() vim.lsp.buf.hover { border = "rounded" } end, opts)
-      vim.keymap.set('n', '<leader>k', function() vim.lsp.buf.hover { border = "rounded" } end, opts)
-      vim.keymap.set('n', '<space>cl', "<cmd>LspInfo<cr>", opts)
-      vim.keymap.set('n', '<space>cd', vim.diagnostic.open_float, opts)
-      vim.keymap.set('n', '[n', vim.diagnostic.goto_prev, opts)
-      vim.keymap.set('n', ']n', vim.diagnostic.goto_next, opts)
-      vim.keymap.set('n', '<space>gr', vim.lsp.buf.references, opts)
-      vim.keymap.set('n', '<space>cf', function() vim.lsp.buf.format { async = true } end, opts)
-      vim.keymap.set('v', '<space>cf', function() vim.lsp.buf.format { async = true } end, opts)
-      vim.keymap.set("n", "<leader>fws", function() vim.lsp.buf.workspace_symbol() end, opts)
-      vim.keymap.set("i", "<C-s>", function() vim.lsp.buf.signature_help {border = "rounded" } end, opts)
-      vim.keymap.set('n', '<C-n>', "<cmd>Lspsaga term_toggle<cr>", opts)
-      vim.keymap.set('t', '<C-n>', "<cmd>Lspsaga term_toggle<cr>", opts)
-      vim.keymap.set('n', '<space>so', '<cmd>Lspsaga outline<cr>', opts)
-      vim.keymap.set('n', '<space>sf', '<cmd>Lspsaga finder<cr>', opts)
-      vim.keymap.set('n', '<space>sd', '<cmd>Lspsaga peek_definition<cr>', opts)
-      vim.keymap.set('n', '<space>cw', "<cmd>Lspsaga rename mode=n<cr>", opts)
-      vim.keymap.set('n', '<space>cA', vim.lsp.buf.code_action, opts)
-      vim.keymap.set('n', '<space>ca', '<cmd>Lspsaga code_action<cr>', opts)
-    end,
-  }
-}
diff --git a/lua/plugin/lspconfig.lua b/lua/plugin/lspconfig.lua
new file mode 100644
index 0000000..d676f62
--- /dev/null
+++ b/lua/plugin/lspconfig.lua
@@ -0,0 +1,117 @@
+return {
+    {
+        "neovim/nvim-lspconfig",
+        -- event = "BufReadPre",
+        config = function()
+            require('lspconfig.ui.windows').default_options.border = 'rounded'
+            vim.api.nvim_set_hl(0, "LspInfoBorder", { bg = none, fg = "#d4be98" })
+            local opts = { noremap = true, silent = true }
+            vim.keymap.set('n', '<space>cd', vim.diagnostic.open_float, opts)
+            vim.keymap.set('n', '<space>cl', "<cmd>LspInfo<cr>", opts)
+            vim.keymap.set('n', '[d', vim.diagnostic.goto_prev, opts)
+            vim.keymap.set('n', ']d', vim.diagnostic.goto_next, opts)
+            -- vim.keymap.set('n', '<space>q', vim.diagnostic.setloclist, opts)
+
+            local on_attach = function(client, bufnr)
+                -- enable completion triggered by <c-x><c-o>
+                vim.api.nvim_buf_set_option(bufnr, 'omnifunc', 'v:lua.vim.lsp.omnifunc')
+
+                -- Mappings.
+                -- See `:help vim.lsp.*` for documentation on any of the below functions
+                local bufopts = { noremap = true, silent = true, buffer = bufnr }
+                vim.keymap.set('n', 'gD', vim.lsp.buf.declaration, bufopts)
+                vim.keymap.set('n', 'gd', vim.lsp.buf.definition, bufopts)
+                vim.keymap.set('n', '<leader>k', vim.lsp.buf.hover, bufopts)
+                vim.keymap.set('n', 'gi', vim.lsp.buf.implementation, bufopts)
+                -- vim.keymap.set('n', 'gr', vim.lsp.buf.references, bufopts)
+                vim.keymap.set('n', 'gK', vim.lsp.buf.signature_help, bufopts)
+                vim.keymap.set('n', '<C-k>', vim.lsp.buf.signature_help, bufopts)
+                vim.keymap.set('n', '<space>wa', vim.lsp.buf.add_workspace_folder, bufopts)
+                vim.keymap.set('n', '<space>wr', vim.lsp.buf.remove_workspace_folder, bufopts)
+                vim.keymap.set('n', '<space>wl', function()
+                    print(vim.inspect(vim.lsp.buf.list_workspace_folders()))
+                end, bufopts)
+                vim.keymap.set('n', '<space>gt', vim.lsp.buf.type_definition, bufopts)
+                vim.keymap.set('n', '<space>cw', vim.lsp.buf.rename, bufopts)
+                vim.keymap.set('n', '<space>ca', vim.lsp.buf.code_action, bufopts)
+                vim.keymap.set('n', '<space>cf', function() vim.lsp.buf.format { async = true } end, bufopts)
+                vim.keymap.set('v', '<space>cf', function() vim.lsp.buf.format { async = true } end, bufopts)
+            end
+
+            local signs = { Error = "✘ ", Warn = " ", Hint = " ", Info = " " }
+            -- local signs = { Error = "✘ ", Warn = " ", Hint = " ", Info = " " }
+            -- local signs = { Error = "✘ ", Warn = "⚠ ", Hint = " ", Info = " " } -- Unicode
+            for type, icon in pairs(signs) do
+                local hl = "DiagnosticSign" .. type
+                vim.fn.sign_define(hl, { text = icon, texthl = hl })
+            end
+
+
+            local border = {
+                { "╭", "FloatBorder" },
+                { "─", "FloatBorder" },
+                { "╮", "FloatBorder" },
+                { "│", "FloatBorder" },
+                { "╯", "FloatBorder" },
+                { "─", "FloatBorder" },
+                { "╰", "FloatBorder" },
+                { "│", "FloatBorder" },
+            }
+
+            vim.diagnostic.config({
+                float = { border = border },
+                virtual_text = {
+                    prefix = '●', -- Could be '●', '■', 'x', '▎'
+                },
+                update_in_insert = true
+            })
+
+            -- LSP settings (for overriding per client)
+                vim.lsp.handlers["textDocument/hover"] = vim.lsp.with(vim.lsp.handlers.hover, { border = border })
+                vim.lsp.handlers["textDocument/signatureHelp"] = vim.lsp.with(vim.lsp.handlers.signatureHelp, { border = border })
+        end,
+    },
+
+    {
+        "williamboman/mason.nvim",
+        lazy = true,
+        cmd = "Mason",
+        config = function()
+            require("mason").setup({
+                ui = {
+                    border = "rounded",
+                    icons = {
+                        package_installed = "✔",
+                        package_pending = "➜",
+                        package_uninstalled = "✘"
+                    }
+                }
+            })
+        end,
+    },
+
+    {
+        "williamboman/mason-lspconfig.nvim",
+        -- event = "BufReadPre",
+        config = function()
+            require("mason-lspconfig").setup({
+                ensure_installed = {
+                    "lua_ls",
+                    "clangd",
+                }
+            })
+
+            require("mason-lspconfig").setup_handlers {
+                -- The first entry (without a key) will be the default handler
+                -- and will be called for each installed server that doesn't have
+                -- a dedicated handler.
+                function(server_name) -- default handler (optional)
+                    require("lspconfig")[server_name].setup {
+                        on_attach = on_attach,
+                        handlers = handlers,
+                    }
+                end,
+            }
+        end,
+    },
+}
diff --git a/lua/plugin/lualine.lua b/lua/plugin/lualine.lua
index 055ae24..96ff0d4 100644
--- a/lua/plugin/lualine.lua
+++ b/lua/plugin/lualine.lua
@@ -1,161 +1,152 @@
 return {
-    {
-        "nvim-lualine/lualine.nvim",
-        config = function()
-            vim.api.nvim_set_option("showmode", false)
-            local custom_gruvbox = require 'lualine.themes.gruvbox-material'
-            custom_gruvbox.normal.a.bg = '#89b482'
-            custom_gruvbox.normal.c.bg = ''
-            custom_gruvbox.insert.a.bg = '#d8a657'
-            custom_gruvbox.visual.a.bg = '#a9b665'
-            custom_gruvbox.replace.a.bg = '#ea6962'
+	{
+		"nvim-lualine/lualine.nvim",
+		config = function()
+			vim.api.nvim_set_option("showmode", false)
+			local custom_gruvbox = require 'lualine.themes.gruvbox-material'
+			custom_gruvbox.normal.a.bg = '#89b482'
+			custom_gruvbox.normal.c.bg = '#141617'
+			custom_gruvbox.insert.a.bg = '#d8a657'
+			custom_gruvbox.visual.a.bg = '#a9b665'
+			custom_gruvbox.replace.a.bg = '#ea6962'
+			require('lualine').setup {
+				options = {
+					theme = custom_gruvbox,
+					component_separators = { left = '', right = '' },
+					section_separators = { left = '', right = '' },
+					disabled_filetypes = { 'netrw', 'Trouble' }
+				},
+				sections = {
+					lualine_a = {
+						{
+							'mode',
+							padding = 1,
+						}
+					},
+					lualine_b = {
+						{
+							'branch',
+							icon = '',
+							color = { fg = '#d8a657', bg = '#141617', gui = 'bold' },
+							padding = 1,
+						}
+					},
+					lualine_c = {
+						{
+							'filename',
+							color = { gui = 'italic', fg = '#d3869b', bg = '#1d2021' },
+							padding = 1,
+							path = 1,
+						}
+					},
+					lualine_x = {
+						{
+							'filetype',
+							color = { bg = '#1d2021', fg = '#d4be98', gui = 'italic' },
+							padding = 1,
+							fmt = function(str)
+								return (str:gsub("^%l", string.upper))
+							end,
+						},
+						{
+							'fileformat',
+							color = {gui = 'italic'},
+							symbols = {
+								unix = '(unix)',
+								dos = '(dos)',
+								mac = '(mac)',
+							},
+						}
 
+					},
+					lualine_y = {
+						{
+							'diagnostics',
+							color = { gui = 'bold', bg = '#141617' },
+							sections = { 'error', 'warn', 'info', 'hint' },
+							symbols = { error = "✘ ", warn = " ", info = " ", hint = "󰌶 " },
+							padding = 1,
+							update_in_insert = true
+						},
+						{
+							'diff',
+							icon = { ' ', color = { bg = '#141617', fg = '#d8a657', gui = 'bold' } },
+							color = { gui = 'bold', bg = '#141617' },
+							padding = 1,
+						}
+					},
+					lualine_z = {
+						{
+							'location',
+							padding = 1,
+						}
+					}
+				},
 
-            local function lspsaga()
-                return require('lspsaga.symbol.winbar').get_bar()
-            end
-            require('lualine').setup {
-                options = {
-                    theme = custom_gruvbox,
-                    globalstatus = true,
-                    component_separators = { left = '', right = '' },
-                    section_separators = { left = '', right = '' },
-                    disabled_filetypes = { 'netrw', 'Trouble' },
-                },
-                sections = {
-                    lualine_a = {
-                        {
-                            'mode',
-                            padding = 1,
-                        }
-                    },
-                    lualine_b = {
-                        {
-                            'branch',
-                            icon = '',
-                            color = { fg = '#d8a657', bg = '#141617', gui = 'bold' },
-                            padding = 1,
-                        },
-                        {
-                            'filename',
-                            color = { gui = 'italic', fg = '#d3869b', bg = '#1d2021' },
-                            padding = 1,
-                            path = 1,
-                        },
-                    },
-                    lualine_c = {
-                        {
-                            lspsaga
-                        }
-                    },
-                    lualine_x = {
-                        {
-                            'filetype',
-                            color = { bg = '#1d2021', fg = '#d4be98', gui = 'italic' },
-                            padding = 1,
-                            fmt = function(str)
-                                return (str:gsub("^%l", string.upper))
-                            end,
-                        },
-                        {
-                            'fileformat',
-                            color = { gui = 'italic', bg = '#141617' },
-                            symbols = {
-                                unix = '(unix)',
-                                dos = '(dos)',
-                                mac = '(mac)',
-                            },
-                        }
-
-                    },
-                    lualine_y = {
-                        {
-                            'diagnostics',
-                            color = { gui = 'bold', bg = '#141617' },
-                            sections = { 'error', 'warn', 'info', 'hint' },
-                            symbols = { error = "✘ ", warn = " ", info = " ", hint = " " },
-                            padding = 1,
-                            update_in_insert = true
-                        },
-                        {
-                            'diff',
-                            icon = { ' ', color = { bg = '#141617', fg = '#d8a657', gui = 'bold' } },
-                            color = { gui = 'bold', bg = '#141617' },
-                            padding = 1,
-                        }
-                    },
-                    lualine_z = {
-                        {
-                            'location',
-                            padding = 1,
-                        }
-                    }
-                },
-
-                inactive_sections = {
-                    lualine_a = {
-                        {
-                            'mode',
-                            padding = 1,
-                        }
-                    },
-                    lualine_b = {
-                        {
-                            'branch',
-                            icon = '',
-                            padding = 1,
-                        },
-                        {
-                            'filename',
-                            padding = 1,
-                            path = 1,
-                        }
-                    },
-                    lualine_c = {
-                    },
-                    lualine_x = {
-                        {
-                            'filetype',
-                            color = { gui = 'italic' },
-                            padding = 1,
-                            fmt = function(str)
-                                return (str:gsub("^%l", string.upper))
-                            end,
-                        },
-                        {
-                            'fileformat',
-                            color = { gui = 'italic' },
-                            symbols = {
-                                unix = 'Unix',
-                                dos = 'Dos',
-                                mac = 'Mac',
-                            },
-                        },
-                    },
-                    lualine_y = {
-                        {
-                            'diagnostics',
-                            color = { gui = 'bold', bg = '#141617' },
-                            sections = { 'error', 'warn', 'info', 'hint' },
-                            symbols = { error = "✘ ", warn = " ", info = " ", hint = "󰌶 " },
-                            padding = 1,
-                            update_in_insert = true
-                        },
-                        {
-                            'diff',
-                            icon = { ' ', color = { bg = '#141617', gui = 'bold' } },
-                            color = { gui = 'bold', bg = '#141617' },
-                            padding = 1,
-                        }
-                    },
-                    lualine_z = {
-                        {
-                            'location',
-                            padding = 1,
-                        },
-                    }
-                },
-            }
-        end,
-    },
+				inactive_sections = {
+					lualine_a = {
+						{
+							'mode',
+							padding = 1,
+						}
+					},
+					lualine_b = {
+						{
+							'branch',
+							icon = '',
+							padding = 1,
+						}
+					},
+					lualine_c = {
+						{
+							'filename',
+							padding = 1,
+							path = 1,
+						}
+					},
+					lualine_x = {
+						{
+							'filetype',
+							color = { gui = 'italic' },
+							padding = 1,
+							fmt = function(str)
+								return (str:gsub("^%l", string.upper))
+							end,
+						},
+						{
+							'fileformat',
+							color = {gui = 'italic'},
+							symbols = {
+								unix = 'Unix',
+								dos = 'Dos',
+								mac = 'Mac',
+							},
+						},
+					},
+					lualine_y = {
+						{
+							'diagnostics',
+							color = { gui = 'bold', bg = '#141617' },
+							sections = { 'error', 'warn', 'info', 'hint' },
+							symbols = { error = "✘ ", warn = " ", info = " ", hint = "󰌶 " },
+							padding = 1,
+							update_in_insert = true
+						},
+						{
+							'diff',
+							icon = { ' ', color = { bg = '#141617', gui = 'bold' } },
+							color = { gui = 'bold', bg = '#141617' },
+							padding = 1,
+						}
+					},
+					lualine_z = {
+						{
+							'location',
+							padding = 1,
+						},
+					}
+				},
+			}
+		end,
+	},
 }
diff --git a/lua/plugin/marks.lua b/lua/plugin/marks.lua
deleted file mode 100644
index bb23dc8..0000000
--- a/lua/plugin/marks.lua
+++ /dev/null
@@ -1,12 +0,0 @@
-return {
-    {
-        "chentoast/marks.nvim",
-        event = "VeryLazy",
-        opts = {},
-        config = function()
-            require 'marks'.setup({
-                sign_priority = 5,
-            })
-        end,
-    }
-}
diff --git a/lua/plugin/none-ls.lua b/lua/plugin/none-ls.lua
new file mode 100644
index 0000000..22443ff
--- /dev/null
+++ b/lua/plugin/none-ls.lua
@@ -0,0 +1,59 @@
+return {
+    {
+        "nvimtools/none-ls.nvim",
+        -- event = "BufReadPost",
+        dependencies = {
+            {
+                "nvim-telescope/telescope-ui-select.nvim",
+                lazy = true,
+                config = function()
+                    -- This is your opts table
+                    require("telescope").setup {
+                        extensions = {
+                            ["ui-select"] = {
+                                -- require("telescope.themes").get_dropdown {
+                                --     -- even more opts
+                                -- }
+                            }
+                        }
+                    }
+                    require("telescope").load_extension("ui-select")
+                end,
+            },
+        },
+        opts = function()
+            local null_ls = require('null-ls')
+            return {
+                border = 'rounded',
+                on_attach = function(client, bufnr)
+                    local bufopts = { noremap = true, silent = true, buffer = bufnr }
+                    vim.keymap.set('n', 'gD', vim.lsp.buf.declaration, bufopts)
+                    vim.keymap.set('n', 'gd', vim.lsp.buf.definition, bufopts)
+                    vim.keymap.set('n', '<leader>k', vim.lsp.buf.hover, bufopts)
+                    vim.keymap.set('n', 'gi', vim.lsp.buf.implementation, bufopts)
+                    vim.keymap.set('n', '<space>gt', vim.lsp.buf.type_definition, bufopts)
+                    vim.keymap.set('n', '<space>cw', vim.lsp.buf.rename, bufopts)
+                    vim.keymap.set('n', '<space>ca', vim.lsp.buf.code_action, bufopts)
+                    -- vim.keymap.set('n', 'gr', vim.lsp.buf.references, bufopts)
+                    vim.keymap.set('n', '<space>cf', function() vim.lsp.buf.format { async = true } end, bufopts)
+                    vim.keymap.set('v', '<space>cf', function() vim.lsp.buf.format { async = true } end, bufopts)
+                end,
+                sources = {
+                    null_ls.builtins.diagnostics.trail_space.with {
+                        disabled_filetypes = { "lua" }
+                    },
+                    null_ls.builtins.diagnostics.shellcheck,
+                    null_ls.builtins.code_actions.shellcheck,
+                    null_ls.builtins.formatting.jq,
+                    null_ls.builtins.code_actions.gitsigns,
+                    null_ls.builtins.diagnostics.flake8,
+                    null_ls.builtins.diagnostics.yamllint,
+                    null_ls.builtins.formatting.yamlfmt,
+                    null_ls.builtins.formatting.shfmt,
+                    null_ls.builtins.formatting.shellharden,
+                    null_ls.builtins.formatting.beautysh,
+                },
+            }
+        end,
+    },
+}
diff --git a/lua/plugin/nvim-cmp.lua b/lua/plugin/nvim-cmp.lua
new file mode 100644
index 0000000..4f078f9
--- /dev/null
+++ b/lua/plugin/nvim-cmp.lua
@@ -0,0 +1,196 @@
+return {
+
+    -- snippets
+    {
+        "L3MON4D3/LuaSnip",
+        lazy = true,
+        dependencies = {
+            "rafamadriz/friendly-snippets",
+            config = function()
+                require("luasnip.loaders.from_vscode").lazy_load()
+                vim.api.nvim_set_hl(0, "PmenuSel", { fg = 'NONE', bg = '#141617' })
+                vim.api.nvim_set_hl(0, "Pmenu", { fg = 'NONE', bg = '#1d2021' })
+                vim.api.nvim_set_hl(0, "CmpItemMenu", { fg = 'NONE', bg = '#141617' })
+                vim.api.nvim_set_hl(0, "CmpItemMenuDefault", { fg = 'NONE', bg = '#141617' })
+                vim.api.nvim_set_hl(0, "CmpItemKindFunction", { fg = '#d3869b', bg = 'NONE', italic = true })
+                vim.api.nvim_set_hl(0, "CmpItemKindSnippet", { fg = '#d8a657', bg = 'NONE', italic = true })
+                vim.api.nvim_set_hl(0, "CmpItemKindText", { fg = '#ddc7a1', bg = 'NONE', italic = true })
+                vim.api.nvim_set_hl(0, "CmpItemKindVariable", { fg = '#7daea3', bg = 'NONE', italic = true })
+            end,
+        },
+    },
+
+    -- completion
+    {
+        "hrsh7th/nvim-cmp",
+        version = false,
+        event = {
+            -- "InsertEnter",
+            -- "CmdlineEnter",
+            "BufWinEnter",
+        },
+        dependencies = {
+            "hrsh7th/cmp-nvim-lsp",
+            "hrsh7th/cmp-buffer",
+            "hrsh7th/cmp-path",
+            "hrsh7th/cmp-cmdline",
+            "saadparwaiz1/cmp_luasnip",
+        },
+        opts = function()
+            -- Set up nvim-cmp with luasnip
+            local kind_icons = {
+                Text = "",
+                Method = "󰆧",
+                Function = "󰊕",
+                Constructor = "",
+                Field = "󰇽",
+                Variable = "󰂡",
+                Class = "󰠱",
+                Interface = "",
+                Module = "",
+                Property = "󰜢",
+                Unit = "",
+                Value = "󰎠",
+                Enum = "",
+                Keyword = "󰌋",
+                Snippet = "",
+                Color = "󰏘",
+                File = "󰈙",
+                Reference = "",
+                Folder = "󰉋",
+                EnumMember = "",
+                Constant = "󰏿",
+                Struct = "",
+                Event = "",
+                Operator = "󰆕",
+                TypeParameter = "󰅲"
+            }
+
+            local has_words_before = function()
+                unpack = unpack or table.unpack
+                local line, col = unpack(vim.api.nvim_win_get_cursor(0))
+                return col ~= 0 and
+                    vim.api.nvim_buf_get_lines(0, line - 1, line, true)[1]:sub(col, col):match("%s") == nil
+            end
+
+            local luasnip = require("luasnip")
+            local cmp = require("cmp")
+
+            return {
+                formatting = {
+                    format = function(entry, vim_item)
+                        -- Kind icons
+                        vim_item.kind = string.format('%s %s', kind_icons[vim_item.kind], vim_item.kind) -- This concatonates the icons with the name of the item kind
+                        -- Source
+                        vim_item.menu = ({
+                            -- buffer = "[Buffer]",
+                            -- nvim_lsp = "[LSP]",
+                            -- luasnip = "[LuaSnip]",
+                            -- nvim_lua = "[Lua]",
+                            -- latex_symbols = "[LaTeX]",
+                            buffer = "",
+                            nvim_lsp = "",
+                            luasnip = "",
+                            nvim_lua = "",
+                            latex_symbols = "",
+                        })[entry.source.name]
+                        return vim_item
+                    end
+                },
+                snippet = {
+                    -- REQUIRED - you must specify a snippet engine
+                    expand = function(args)
+                        -- vim.fn["vsnip#anonymous"](args.body) -- For `vsnip` users.
+                        require('luasnip').lsp_expand(args.body) -- For `luasnip` users.
+                        -- require('snippy').expand_snippet(args.body) -- For `snippy` users.
+                        -- vim.fn["UltiSnips#Anon"](args.body) -- For `ultisnips` users.
+                    end,
+                },
+                -- completion = {
+                --     autocomplete = false,
+                -- },
+
+                window = {
+                    completion = cmp.config.window.bordered(),
+                    documentation = cmp.config.window.bordered(),
+                },
+                mapping = cmp.mapping.preset.insert({
+                    ['<C-b>'] = cmp.mapping.scroll_docs(-4),
+                    ['<C-f>'] = cmp.mapping.scroll_docs(4),
+                    -- ['<C-Space>'] = cmp.mapping.complete(),
+                    -- ['<C-e>'] = cmp.mapping.abort(),
+                    ['<C-e>'] = cmp.mapping(function(fallback)
+                        if cmp.visible() then
+                            cmp.abort()
+                        else
+                            cmp.complete()
+                        end
+                    end),
+                    ['<CR>'] = cmp.mapping.confirm({ select = false }), -- Accept currently selected item. Set `select` to `false` to only confirm explicitly selected items.
+                    ["<Tab>"] = cmp.mapping(function(fallback)
+                        if cmp.visible() then
+                            cmp.select_next_item()
+                            -- You could replace the expand_or_jumpable() calls with expand_or_locally_jumpable()
+                            -- they way you will only jump inside the snippet region
+                        elseif luasnip.expand_or_jumpable() then
+                            luasnip.expand_or_jump()
+                        elseif has_words_before() then
+                            cmp.complete()
+                        else
+                            fallback()
+                        end
+                    end, { "i", "s" }),
+                    ["<S-Tab>"] = cmp.mapping(function(fallback)
+                        if cmp.visible() then
+                            cmp.select_prev_item()
+                        elseif luasnip.jumpable(-1) then
+                            luasnip.jump(-1)
+                        else
+                            fallback()
+                        end
+                    end, { "i", "s" }),
+                }),
+                sources = cmp.config.sources({
+                    { name = 'nvim_lsp' },
+                    -- { name = 'vsnip' }, -- For vsnip users.
+                    { name = 'luasnip' }, -- For luasnip users.
+                    -- { name = 'ultisnips' }, -- For ultisnips users.
+                    -- { name = 'snippy' }, -- For snippy users.
+                    {
+                        name = 'buffer',
+                        option = {
+                            get_bufnrs = function()
+                                return vim.api.nvim_list_bufs()
+                            end
+                        },
+                    },
+                }, {
+                }),
+                -- Set configuration for specific filetype.
+                cmp.setup.filetype('gitcommit', {
+                    sources = cmp.config.sources({
+                        { name = 'cmp_git' }, -- You can specify the `cmp_git` source if you were installed it.
+                    }, {
+                        { name = 'buffer' },
+                    })
+                }),
+                -- Use buffer source for `/` and `?` (if you enabled `native_menu`, this won't work anymore).
+                cmp.setup.cmdline({ '/', '?' }, {
+                    mapping = cmp.mapping.preset.cmdline(),
+                    sources = {
+                        { name = 'buffer' }
+                    }
+                }),
+                -- Use cmdline & path source for ':' (if you enabled `native_menu`, this won't work anymore).
+                cmp.setup.cmdline(':', {
+                    mapping = cmp.mapping.preset.cmdline(),
+                    sources = cmp.config.sources({
+                        { name = 'path' }
+                    }, {
+                        { name = 'cmdline' }
+                    })
+                }),
+            }
+        end,
+    }
+}
diff --git a/lua/plugin/nvimtree.lua b/lua/plugin/nvimtree.lua
deleted file mode 100644
index e35d7b4..0000000
--- a/lua/plugin/nvimtree.lua
+++ /dev/null
@@ -1,18 +0,0 @@
-return {
-    "nvim-tree/nvim-tree.lua",
-    version = "*",
-    lazy = false,
-    dependencies = {
-        "nvim-tree/nvim-web-devicons",
-    },
-    keys = {
-        { "<leader>F", "<cmd>NvimTreeFindFileToggle<cr>", desc = "Toggle Filetree" },
-    },
-    config = function()
-        require("nvim-tree").setup({
-            view = {
-                width = 56,
-            },
-        })
-    end,
-}
diff --git a/lua/plugin/snippets.lua b/lua/plugin/snippets.lua
deleted file mode 100644
index 273e250..0000000
--- a/lua/plugin/snippets.lua
+++ /dev/null
@@ -1,20 +0,0 @@
-return {
-    {
-        "L3MON4D3/LuaSnip",
-        lazy = true,
-        dependencies = {
-            "rafamadriz/friendly-snippets",
-            config = function()
-                require("luasnip.loaders.from_vscode").lazy_load()
-                vim.api.nvim_set_hl(0, "PmenuSel", { fg = 'NONE', bg = '#272e33' })
-                vim.api.nvim_set_hl(0, "Pmenu", { fg = 'NONE', bg = '#1e2326' })
-                vim.api.nvim_set_hl(0, "CmpItemMenu", { fg = 'NONE', bg = '#272e33' })
-                vim.api.nvim_set_hl(0, "CmpItemMenuDefault", { fg = 'NONE', bg = '#272e33' })
-                vim.api.nvim_set_hl(0, "CmpItemKindFunction", { fg = '#d699b6', bg = 'NONE', italic = true })
-                vim.api.nvim_set_hl(0, "CmpItemKindSnippet", { fg = '#dbbc7f', bg = 'NONE', italic = true })
-                vim.api.nvim_set_hl(0, "CmpItemKindText", { fg = '#9da9a0', bg = 'NONE', italic = true })
-                vim.api.nvim_set_hl(0, "CmpItemKindVariable", { fg = '#7fbbb3', bg = 'NONE', italic = true })
-            end,
-        },
-    }
-}
diff --git a/lua/plugin/surround.lua b/lua/plugin/surround.lua
index c54b65b..6bf538e 100644
--- a/lua/plugin/surround.lua
+++ b/lua/plugin/surround.lua
@@ -1,24 +1,20 @@
 return {
     {
-        "kylechui/nvim-surround",
-        version = "*", -- Use for stability; omit to use `main` branch for the latest features
+        "echasnovski/mini.surround",
         event = "VeryLazy",
-        config = function()
-            require("nvim-surround").setup({
-                -- Configuration here, or leave empty to use defaults
-            })
-        end
+        opts = {
+            mappings = {
+                add = "<leader>sa",
+                delete = "<leader>sd",
+                find = "<leader>sf",
+                find_left = "<leader>sF",
+                highlight = "<leader>sh",
+                replace = "<leader>sr",
+                update_n_lines = "<leader>sn",
+            },
+        },
+        config = function(_, opts)
+            require("mini.surround").setup(opts)
+        end,
     }
 }
-
---     Old text                    Command         New text
--- --------------------------------------------------------------------------------
---     surround_words             ysiw)           (surround_words)
---     make strings               ys$"            "make strings"
---     [delete around me!]        ds]             delete around me!
---     remove <b>HTML tags</b>    dst             remove HTML tags
---     'change quotes'            cs'"            "change quotes"
---     <b>or tag types</b>        csth1<CR>       <h1>or tag types</h1>
---     delete(function calls)     dsf             function calls
-
---    :h nvim-surround.usage
diff --git a/lua/plugin/telescope.lua b/lua/plugin/telescope.lua
index 3f7a68c..724261a 100644
--- a/lua/plugin/telescope.lua
+++ b/lua/plugin/telescope.lua
@@ -4,60 +4,6 @@ return {
         lazy = true,
         cmd = "Telescope",
         version = false,
-        config = function()
-            require('telescope').setup({
-                pickers = {
-                    find_files = {
-                        layout_config = {
-                            prompt_position = 'top',
-                        },
-                        sorting_strategy = 'ascending',
-                    },
-                    live_grep = {
-                        layout_config = {
-                            prompt_position = 'top',
-                        },
-                        sorting_strategy = 'ascending',
-                    },
-                    current_buffer_fuzzy_find = {
-                        layout_config = {
-                            prompt_position = 'top',
-                        },
-                        sorting_strategy = 'ascending',
-                    },
-                    grep_string = {
-                        layout_config = {
-                            prompt_position = 'top',
-                        },
-                        sorting_strategy = 'ascending',
-                    },
-                    git_files = {
-                        layout_config = {
-                            prompt_position = 'top',
-                        },
-                        sorting_strategy = 'ascending',
-                    },
-                    keymaps = {
-                        layout_config = {
-                            prompt_position = 'top',
-                        },
-                        sorting_strategy = 'ascending',
-                    },
-                    oldfiles = {
-                        layout_config = {
-                            prompt_position = 'top',
-                        },
-                        sorting_strategy = 'ascending',
-                    },
-                    command_history = {
-                        layout_config = {
-                            prompt_position = 'top',
-                        },
-                        sorting_strategy = 'ascending',
-                    },
-                },
-            })
-        end,
         keys = {
             { "<leader>:",  "<cmd>Telescope command_history<cr>",               desc = "Command History" },
             { "<leader>,",  "<cmd>Telescope buffers show_all_buffers=true<cr>", desc = "Switch Buffer" },
@@ -65,10 +11,10 @@ return {
             { "<leader>ff", "<cmd>Telescope find_files<cr>",                    desc = "Find Files" },
             { "<leader>fb", "<cmd>Telescope current_buffer_fuzzy_find<cr>",     desc = "Find Strings in current Buffer" },
             { "<leader>fg", "<cmd>Telescope live_grep<cr>",                     desc = "Grep Content in Files" },
-            { "<leader>/",  "<cmd>Telescope current_buffer_fuzzy_find<cr>",     desc = "Find Strings in current Buffer" },
-            { "<leader>fh", "<cmd>Telescope grep_string<cr>",                   desc = "Grep currently hovered String" },
+            { "<leader>/",  "<cmd>Telescope live_grep<cr>",                     desc = "Grep Content in Files" },
+            { "<leader>fl",  "<cmd>Telescope grep_string<cr>",                     desc = "Grep currently hovered String" },
             { "<leader>fG", "<cmd>Telescope git_files<cr>",                     desc = "Find Git Files" },
-            { "<leader>fk", "<cmd>Telescope keymaps<cr>",                       desc = "List Keymaps" },
+            { "<leader>fk", "<cmd>Telescope keymaps<cr>",                       desc = "Find Git Files" },
             { "<leader>fr", "<cmd>Telescope oldfiles<cr>",                      desc = "Find Recent Files" },
         },
     },
diff --git a/lua/plugin/todo-comments.lua b/lua/plugin/todo-comments.lua
new file mode 100644
index 0000000..7e9149a
--- /dev/null
+++ b/lua/plugin/todo-comments.lua
@@ -0,0 +1,11 @@
+return {
+	{
+		"folke/todo-comments.nvim",
+		dependencies = { "nvim-lua/plenary.nvim" },
+		opts = {
+			-- your configuration comes here
+			-- or leave it empty to use the default settings
+			-- refer to the configuration section below
+		}
+	}
+}
diff --git a/lua/plugin/treesitter-context.lua b/lua/plugin/treesitter-context.lua
index 43d76d5..b1f1363 100644
--- a/lua/plugin/treesitter-context.lua
+++ b/lua/plugin/treesitter-context.lua
@@ -1,14 +1,14 @@
 return {
-    {
-        "nvim-treesitter/nvim-treesitter-context",
-        event = "VeryLazy",
-        config = function()
-            require('treesitter-context').setup {
-                enable = true,
-                max_lines = 0,
-                min_window_height = 0,
-                line_numbers = true,
-            }
-        end
-    }
+	{
+		"nvim-treesitter/nvim-treesitter-context",
+		event = "VeryLazy",
+		config = function ()
+			require('treesitter-context').setup{
+				enable = true,
+				max_lines = 0,
+				min_window_height = 0,
+				line_numbers = true,
+			}
+		end
+	}
 }
diff --git a/lua/plugin/treesitter-textobjects.lua b/lua/plugin/treesitter-textobjects.lua
deleted file mode 100644
index c43422f..0000000
--- a/lua/plugin/treesitter-textobjects.lua
+++ /dev/null
@@ -1,68 +0,0 @@
-return {
-    {
-        "nvim-treesitter/nvim-treesitter-textobjects",
-        dependencies = { "nvim-treesitter/nvim-treesitter" },
-        opts = {
-            textobjects = {
-                select = {
-                    enable = true,
-
-                    -- Automatically jump forward to textobj, similar to targets.vim
-                    lookahead = true,
-
-                    keymaps = {
-                        -- You can use the capture groups defined in textobjects.scm
-                        ["af"] = "@function.outer",
-                        ["if"] = "@function.inner",
-                        ["ap"] = "@parameter.outer",
-                        ["ip"] = "@parameter.inner",
-                        ["ac"] = "@comment.outer",
-                        ["aS"] = "@statement.outer",
-                        ["ae"] = "@block.outer",
-                        ["al"] = "@loop.outer",
-                        ["il"] = "@loop.inner",
-                        ["ar"] = "@return.outer",
-                        ["ir"] = "@return.inner",
-                        ["ia"] = "@assignment.rhs",
-                        ["aa"] = "@assignment.inner",
-                        ["i?"] = "@conditional.inner",
-                        ["a?"] = "@conditional.outer",
-                        ["in"] = "@number.inner",
-                        ["iC"] = "@class.inner",
-                        ["aC"] = "@class.outer",
-                        ["ig"] = "@call.inner",
-                        ["ag"] = "@call.outer",
-
-                        -- You can also use captures from other query groups like `locals.scm`
-                        ["as"] = { query = "@scope", query_group = "locals", desc = "Select language scope" },
-                    },
-                    -- You can choose the select mode (default is charwise 'v')
-                    --
-                    -- Can also be a function which gets passed a table with the keys
-                    -- * query_string: eg '@function.inner'
-                    -- * method: eg 'v' or 'o'
-                    -- and should return the mode ('v', 'V', or '<c-v>') or a table
-                    -- mapping query_strings to modes.
-                    selection_modes = {
-                        ['@parameter.outer'] = 'v', -- charwise
-                        ['@function.outer'] = 'V', -- linewise
-                    },
-                    -- If you set this to `true` (default is `false`) then any textobject is
-                    -- extended to include preceding or succeeding whitespace. Succeeding
-                    -- whitespace has priority in order to act similarly to eg the built-in
-                    -- `ap`.
-                    --
-                    -- Can also be a function which gets passed a table with the keys
-                    -- * query_string: eg '@function.inner'
-                    -- * selection_mode: eg 'v'
-                    -- and should return true or false
-                    include_surrounding_whitespace = false,
-                },
-            },
-
-        },
-        config = function(_, opts)
-            require("nvim-treesitter.configs").setup(opts)
-        end,
-    }
-}
diff --git a/lua/plugin/trouble.lua b/lua/plugin/trouble.lua
new file mode 100644
index 0000000..25ef1bd
--- /dev/null
+++ b/lua/plugin/trouble.lua
@@ -0,0 +1,13 @@
+return {
+	"folke/trouble.nvim",
+	dependencies = { "nvim-tree/nvim-web-devicons" },
+	opts = {},
+	config = function()
+		vim.keymap.set("n", "<leader>xx", function() require("trouble").toggle() end)
+		vim.keymap.set("n", "<leader>xw", function() require("trouble").toggle("workspace_diagnostics") end)
+		vim.keymap.set("n", "<leader>xd", function() require("trouble").toggle("document_diagnostics") end)
+		vim.keymap.set("n", "<leader>xq", function() require("trouble").toggle("quickfix") end)
+		vim.keymap.set("n", "<leader>xl", function() require("trouble").toggle("loclist") end)
+		vim.keymap.set("n", "gr", function() require("trouble").open("lsp_references") end)
+	end
+}
diff --git a/lua/plugin/undotree.lua b/lua/plugin/undotree.lua
index 418a3fe..b7a7346 100644
--- a/lua/plugin/undotree.lua
+++ b/lua/plugin/undotree.lua
@@ -1,13 +1,14 @@
 return {
-    {
-        "mbbill/undotree",
-        keys = {
-            { "<leader>u", "<cmd>UndotreeToggle<cr>", desc = "toggle undotree" },
-        },
-        config = function()
-            vim.g.undotree_WindowLayout = 4
-            vim.g.undotree_SplitWidth = 40
-            vim.g.undotree_SetFocusWhenToggle = 1
-        end
-    }
+	{
+		"mbbill/undotree",
+		keys = {
+			{ "<leader>u", "<cmd>UndotreeToggle<cr>", desc = "toggle undotree" },
+		},
+		config = function()
+			vim.g.undotree_WindowLayout = 4
+			vim.g.undotree_SplitWidth = 40
+			vim.g.undotree_SetFocusWhenToggle = 1
+		end
+	}
 }
+
diff --git a/lua/plugin/zen.lua b/lua/plugin/zen.lua
deleted file mode 100644
index 67281a8..0000000
--- a/lua/plugin/zen.lua
+++ /dev/null
@@ -1,20 +0,0 @@
-return {
-    {
-        "folke/zen-mode.nvim",
-        opts = {
-            window = {
-                backdrop = 1,
-                width = 120,
-            },
-            plugins = {
-                options = {
-                    enabled = true,
-                    showcmd = true,
-                    laststatus = 3,
-                },
-                gitsigns = { enabled = false }
-            },
-            vim.keymap.set("n", "<leader>zz", function() require("zen-mode").toggle() end),
-        },
-    }
-}