7 files changed, 16 insertions, 60 deletions
diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua
index 0065226..7d4a97f 100644
--- a/.config/nvim/init.lua
+++ b/.config/nvim/init.lua
@@ -1,4 +1,3 @@
 require("opt")
-require("lsp")
 require("map")
 require("plugin")
diff --git a/.config/nvim/lua/map.lua b/.config/nvim/lua/map.lua
index a0af88a..b52ad22 100644
--- a/.config/nvim/lua/map.lua
+++ b/.config/nvim/lua/map.lua
@@ -34,5 +34,3 @@ vim.api.nvim_create_user_command("Wq",  "wq",  {bang=true})
 vim.api.nvim_create_user_command("Wqa", "wqa", {bang=true})
 vim.api.nvim_create_user_command("Q",   "q",   {bang=true})
 vim.api.nvim_create_user_command("Qa",  "qa",  {bang=true})
-
-vim.api.nvim_create_user_command("ClangFormat", "!clang-format -i %", {})
diff --git a/.config/nvim/lua/opt.lua b/.config/nvim/lua/opt.lua
index 56a9b84..446229d 100644
--- a/.config/nvim/lua/opt.lua
+++ b/.config/nvim/lua/opt.lua
@@ -11,8 +11,10 @@ vim.o.splitright = true
 vim.o.splitbelow = true
 local tabwidth = 2
 vim.o.tabstop = tabwidth
+vim.o.softtabstop = tabwidth
 vim.o.shiftwidth = tabwidth
 vim.o.expandtab = true
+vim.o.wrap = false
 
 -- Disable line numbers in terminal
 vim.api.nvim_create_autocmd("TermOpen", {
diff --git a/.config/nvim/lua/plugin/init.lua b/.config/nvim/lua/plugin/init.lua
index 6cd9e35..4e60f98 100644
--- a/.config/nvim/lua/plugin/init.lua
+++ b/.config/nvim/lua/plugin/init.lua
@@ -1,3 +1,3 @@
 require("plugin.packer")
 require("plugin.setup")
--- require("plugin.lsp")
+require("plugin.lsp")
diff --git a/.config/nvim/lua/lsp.lua b/.config/nvim/lua/plugin/lsp.lua
index 32ba6f8..50eed85 100644
--- a/.config/nvim/lua/lsp.lua
+++ b/.config/nvim/lua/plugin/lsp.lua
@@ -10,9 +10,9 @@ local servers = {
       Lua = {
         runtime = {
           version = "LuaJIT"
-        }
-      }
-    }
+        },
+      },
+    },
   },
   ["clangd"] = {},
 }
@@ -22,7 +22,6 @@ for lsp, conf in pairs(servers) do
   lspconf[lsp].setup(conf)
 end
 
-
 cmp.setup({
   preselect = "item",
   completion = {
@@ -40,7 +39,7 @@ cmp.setup({
         nvim_lsp = "L",
         buffer = "B",
         path = "P",
-        nvim_lua = "NL",
+        nvim_lua = "V",
       }
 
       item.menu = menu_icon[entry.source.name]
diff --git a/.config/nvim/lua/plugin/packer.lua b/.config/nvim/lua/plugin/packer.lua
index 961af13..359ceab 100644
--- a/.config/nvim/lua/plugin/packer.lua
+++ b/.config/nvim/lua/plugin/packer.lua
@@ -1,16 +1,10 @@
 return require("packer").startup(function(use)
   use {"wbthomason/packer.nvim"}
-  use {"windwp/nvim-autopairs"}
 
-  use {
-    "nvim-telescope/telescope.nvim",
-    requires = {
-      { "nvim-lua/plenary.nvim"}
-    },
-  }
+  use {"ibhagwan/fzf-lua"}
+  use {"stevearc/oil.nvim"}
 
   use {"lewis6991/gitsigns.nvim"}
-  use {"numToStr/Comment.nvim"}
 
   use {"williamboman/mason.nvim"}
   use {"neovim/nvim-lspconfig"}
@@ -21,9 +15,4 @@ return require("packer").startup(function(use)
   use {"hrsh7th/cmp-nvim-lua"}
 
   use {"michaeljsmith/vim-indent-object"}
-
-  use {
-    "nvim-treesitter/nvim-treesitter",
-    run = ":TSUpdate"
-  }
 end)
diff --git a/.config/nvim/lua/plugin/setup.lua b/.config/nvim/lua/plugin/setup.lua
index ca2be66..7a53c6a 100644
--- a/.config/nvim/lua/plugin/setup.lua
+++ b/.config/nvim/lua/plugin/setup.lua
@@ -1,43 +1,12 @@
 ---@diagnostic disable: undefined-global
 
-require("gitsigns").setup {}
-require("Comment").setup {}
-require("mason").setup {}
+require("gitsigns").setup({})
+require("mason").setup({})
 
-require("nvim-autopairs").setup {
-  fast_wrap = {
-    map = "<M-e>",
-    chars = { "<", "{", "[", "(", "\"", "'" },
-    pattern = [=[[%"%"%>%]%)%}%,]]=],
-    end_key = "$",
-    keys = "qwertyuiopzxcvbnmasdfghjkl",
-    check_comma = true,
-    highlight = "Search",
-    highlight_grey="Comment"
-  }
-}
+require("oil").setup({})
+vim.keymap.set("n", "<leader>e", "<CMD>Oil<CR>", {})
 
-require("nvim-treesitter.configs").setup {
-  ensure_installed = { "c", "lua", "vimdoc" },
-  sync_install = true,
-  highlight = {
-    enable = true,
-    additional_vim_regex_highlighting = true,
-  },
-  indent = {enable = true},
-}
+require("fzf-lua").setup(require("fzf-lua.profiles.telescope"))
+vim.keymap.set("n", "<C-o>", function() FzfLua.files({}) end, {})
 
-local builtin = require("telescope.builtin")
-require("telescope").setup {
-  pickers = {
-    find_files = {
-      theme = "dropdown",
-    }
-  }
-}
-
-vim.keymap.set("n", "<C-o>", builtin.find_files, {})
-vim.keymap.set("n", "<C-g>", builtin.git_files, {})
-vim.keymap.set("n", "<C-f>", function()
-  builtin.grep_string({ search = vim.fn.input("grep>") })
-end)
+vim.keymap.set("n", "<C-f>", function() FzfLua.grep() end, {})