AAAAAAA

7 files changed, 102 insertions, 83 deletions

diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua
index 8fb9f57..fae4408 100644
--- a/.config/nvim/init.lua
+++ b/.config/nvim/init.lua
@@ -1,4 +1,4 @@
-local packer_path = vim.fn.stdpath('config') .. '/site'
+local packer_path = vim.fn.stdpath("config") .. "/site"
 vim.o.packpath = vim.o.packpath .. ',' .. packer_path
 
 require("plugins")
diff --git a/.config/nvim/lua/autocomplete.lua b/.config/nvim/lua/autocomplete.lua
index c45333c..96495c4 100644
--- a/.config/nvim/lua/autocomplete.lua
+++ b/.config/nvim/lua/autocomplete.lua
@@ -2,31 +2,24 @@ local cmp = require("cmp")
 
 cmp.setup({
   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,
   },
   mapping = {
     ['<C-b>'] = cmp.mapping(cmp.mapping.scroll_docs(-4), { 'i', 'c' }),
     ['<C-f>'] = cmp.mapping(cmp.mapping.scroll_docs(4), { 'i', 'c' }),
     ['<C-Space>'] = cmp.mapping(cmp.mapping.complete(), { 'i', 'c' }),
-    ['<C-y>'] = cmp.config.disable, -- Specify `cmp.config.disable` if you want to remove the default `<C-y>` mapping.
+    ['<C-y>'] = cmp.config.disable,
     ['<C-e>'] = cmp.mapping({
       i = cmp.mapping.abort(),
       c = cmp.mapping.close(),
     }),
-    ['<tab>'] = cmp.mapping.confirm({ select = true }), -- Accept currently selected item. Set `select` to `false` to only confirm explicitly selected items.
+    ['<tab>'] = cmp.mapping.confirm({ select = true }),
   },
   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 = 'vsnip' },
   }, {
     { name = 'buffer' },
   })
diff --git a/.config/nvim/lua/lsp.lua b/.config/nvim/lua/lsp.lua
index 3a4b605..92c7b0e 100644
--- a/.config/nvim/lua/lsp.lua
+++ b/.config/nvim/lua/lsp.lua
@@ -1,4 +1,4 @@
-local lsp = require('lspconfig')
+local lsp = require("lspconfig")
 
 local capabilities = require("cmp_nvim_lsp").default_capabilities(
   vim.lsp.protocol.make_client_capabilities())
@@ -15,15 +15,18 @@ lsp.lua_ls.setup({
   }
 })
 
-
 lsp.clangd.setup {
   capabilities=capabilities,
 }
 
+lsp.cmake.setup {}
+
+lsp.gdscript.setup {}
+
 lsp.rust_analyzer.setup({
   capabilities=capabilities,
   settings = {
-    ['rust-analyzer'] = {},
+    ["rust-analyzer"] = {},
   },
 })
 
diff --git a/.config/nvim/lua/plugin_conf.lua b/.config/nvim/lua/plugin_conf.lua
index da62a99..53f0929 100644
--- a/.config/nvim/lua/plugin_conf.lua
+++ b/.config/nvim/lua/plugin_conf.lua
@@ -1,11 +1,11 @@
-require('nvim-tree').setup{}
+require("nvim-tree").setup{}
 
-require('lualine').setup {
+require("lualine").setup {
   options = {
     icons_enabled = false,
-    -- theme = 'dracula-nvim',
-    component_separators = { left = ' ', right = ' '},
-    section_separators = { left = ' ', right = ' '},
+    -- theme = "dracula-nvim",
+    component_separators = { left = " ", right = " "},
+    section_separators = { left = " ", right = " "},
     disabled_filetypes = {
       statusline = {},
       winbar = {},
@@ -20,18 +20,18 @@ require('lualine').setup {
     }
   },
   sections = {
-    lualine_a = {'mode'},
-    lualine_b = {'branch', 'diff', 'diagnostics'},
-    lualine_c = {'filename'},
-    lualine_x = {'encoding', 'fileformat', 'filetype'},
-    lualine_y = {'progress'},
-    lualine_z = {'location'}
+    lualine_a = {"mode"},
+    lualine_b = {"branch", "diff", "diagnostics"},
+    lualine_c = {"filename"},
+    lualine_x = {"encoding", "fileformat", "filetype"},
+    lualine_y = {"progress"},
+    lualine_z = {"location"}
   },
   inactive_sections = {
     lualine_a = {},
     lualine_b = {},
-    lualine_c = {'filename'},
-    lualine_x = {'location'},
+    lualine_c = {"filename"},
+    lualine_x = {"location"},
     lualine_y = {},
     lualine_z = {}
   },
@@ -41,23 +41,25 @@ require('lualine').setup {
   extensions = {}
 }
 
-require('nvim-autopairs').setup{
+require("nvim-autopairs").setup {
   fast_wrap = {
-    map = '<M-e>',
-    chars = { '{', '[', '(', '"', "'" },
-    pattern = [=[[%'%"%>%]%)%}%,]]=],
-    end_key = '$',
-    keys = 'qwertyuiopzxcvbnmasdfghjkl',
+    map = "<M-e>",
+    chars = { "{", "[", "(", "\"", "'" },
+    pattern = [=[[%"%"%>%]%)%}%,]]=],
+    end_key = "$",
+    keys = "qwertyuiopzxcvbnmasdfghjkl",
     check_comma = true,
-    highlight = 'Search',
-    highlight_grey='Comment'
+    highlight = "Search",
+    highlight_grey="Comment"
   }
 }
 
-require('terminal').setup{
+require("barbar").setup {}
+
+require("terminal").setup{
   layout = { open_cmd = "botright new" },
   cmd = { vim.o.shell },
   autoclose = false,
 }
 
-require('Comment').setup {}
+require("Comment").setup {}
diff --git a/.config/nvim/lua/plugins.lua b/.config/nvim/lua/plugins.lua
index 350fd61..39cb8c0 100644
--- a/.config/nvim/lua/plugins.lua
+++ b/.config/nvim/lua/plugins.lua
@@ -1,40 +1,43 @@
-return require('packer').startup(function(use)
+return require("packer").startup(function(use)
+  use { "ThePrimeagen/vim-be-good" }
+
   use {
-    'kyazdani42/nvim-tree.lua',
-    requires = 'kyazdani42/nvim-web-devicons'
+    "kyazdani42/nvim-tree.lua",
+    requires = "kyazdani42/nvim-web-devicons"
   }
 
   use {
-    'nvim-telescope/telescope.nvim',
-    requires = { { 'nvim-lua/plenary.nvim' } }
+    "nvim-telescope/telescope.nvim",
+    requires = { { "nvim-lua/plenary.nvim" } }
   }
 
   use {
-    'rebelot/terminal.nvim',
+    "rebelot/terminal.nvim",
   }
 
-  use { 'neovim/nvim-lspconfig' }
+  use { "neovim/nvim-lspconfig" }
 
-  use { 'majutsushi/tagbar' }
-  use { 'Yggdroot/indentLine' }
-  use { 'tpope/vim-fugitive' }
-  use { 'junegunn/gv.vim' }
-  use { 'windwp/nvim-autopairs' }
+  use { "majutsushi/tagbar" }
+  use { "Yggdroot/indentLine" }
+  use { "tpope/vim-fugitive" }
+  use { "junegunn/gv.vim" }
+  use { "windwp/nvim-autopairs" }
 
-  use { 'mhinz/vim-startify' }
-  use { 'DanilaMihailov/beacon.nvim' }
+  use { "mhinz/vim-startify" }
+  use { "DanilaMihailov/beacon.nvim" }
   use {
-    'nvim-lualine/lualine.nvim',
-    requires = { 'kyazdani42/nvim-web-devicons', opt = true }
+    "nvim-lualine/lualine.nvim",
+    requires = { "kyazdani42/nvim-web-devicons", opt = true }
   }
-  use { 'numToStr/Comment.nvim' }
+  use { "numToStr/Comment.nvim" }
+  use { "romgrk/barbar.nvim" }
 
-  use { 'hrsh7th/cmp-nvim-lsp' }
-  use { 'hrsh7th/cmp-buffer' }
-  use { 'hrsh7th/cmp-path' }
-  use { 'hrsh7th/cmp-cmdline' }
-  use { 'hrsh7th/nvim-cmp' }
-  use { 'hrsh7th/vim-vsnip' }
+  use { "hrsh7th/cmp-nvim-lsp" }
+  use { "hrsh7th/cmp-buffer" }
+  use { "hrsh7th/cmp-path" }
+  use { "hrsh7th/cmp-cmdline" }
+  use { "hrsh7th/nvim-cmp" }
+  use { "hrsh7th/vim-vsnip" }
 
-  use { 'loctvl842/monokai-pro.nvim' }
+  use { "loctvl842/monokai-pro.nvim" }
 end)
diff --git a/.config/nvim/lua/remapping.lua b/.config/nvim/lua/remapping.lua
index 79aaa81..b59a504 100644
--- a/.config/nvim/lua/remapping.lua
+++ b/.config/nvim/lua/remapping.lua
@@ -1,25 +1,42 @@
 vim.g.mapleader = " "
 
-vim.keymap.set('i', 'jk', '<escape>', {})
-vim.keymap.set('n', '<leader>n', [[:NvimTreeToggle<cr>]], {})
-vim.keymap.set('n', '<leader>f', [[:Telescope find_files<cr>]], {})
-vim.keymap.set('n', '<leader>g', [[:Git<cr>]], {})
-vim.keymap.set('n', '<leader>to', [[:TermOpen<cr><cr>]], {})
-vim.keymap.set('n', '<leader>c', [[:noh<cr>]], {})
+vim.keymap.set("i", "jk", "<escape>", {})
+vim.keymap.set("n", "<leader>n", [[:NvimTreeToggle<cr>]], {})
+vim.keymap.set("n", "<leader>f", [[:Telescope find_files<cr>]], {})
+vim.keymap.set("n", "<leader>g", [[:Git<cr>]], {})
+vim.keymap.set("n", "<leader>to", [[:TermOpen<cr><cr>]], {})
+vim.keymap.set("n", "<leader>c", [[:noh<cr>]], {})
 
-vim.keymap.set('n', '<C-h>', '<C-w>h', {})
-vim.keymap.set('n', '<C-j>', '<C-w>j', {})
-vim.keymap.set('n', '<C-k>', '<C-w>k', {})
-vim.keymap.set('n', '<C-l>', '<C-w>l', {})
+vim.keymap.set("n", "<C-h>", "<C-w>h", {})
+vim.keymap.set("n", "<C-j>", "<C-w>j", {})
+vim.keymap.set("n", "<C-k>", "<C-w>k", {})
+vim.keymap.set("n", "<C-l>", "<C-w>l", {})
 
-vim.keymap.set('o', 'as', 'a"', {})
-vim.keymap.set('o', 'is', 'i"', {})
-vim.keymap.set('o', 'it', 'i[', {})
-vim.keymap.set('o', 'at', 'a[', {})
-vim.keymap.set('o', 'ic', 'i<', {})
-vim.keymap.set('o', 'ac', 'a<', {})
+vim.keymap.set("n", "<up>", "<C-u>zz", {})
+vim.keymap.set("n", "<down>", "<C-d>zz", {})
 
-vim.keymap.set('t', '<escape>', '<C-\\><C-n>', {})
-vim.keymap.set('t', 'jk', '<C-\\><C-n>', {})
+vim.keymap.set("o", "as", "a\"", {})
+vim.keymap.set("o", "is", "i\"", {})
+vim.keymap.set("o", "it", "i[", {})
+vim.keymap.set("o", "at", "a[", {})
+vim.keymap.set("o", "ic", "i<", {})
+vim.keymap.set("o", "ac", "a<", {})
 
+vim.keymap.set("t", "<escape>", "<C-\\><C-n>", {})
+vim.keymap.set("t", "jk", "<C-\\><C-n>", {})
 
+vim.keymap.set("n", "<leader>1", ":BufferGoto 1<CR>", {})
+vim.keymap.set("n", "<leader>2", ":BufferGoto 2<CR>", {})
+vim.keymap.set("n", "<leader>3", ":BufferGoto 3<CR>", {})
+vim.keymap.set("n", "<leader>4", ":BufferGoto 4<CR>", {})
+vim.keymap.set("n", "<leader>5", ":BufferGoto 5<CR>", {})
+vim.keymap.set("n", "<leader>6", ":BufferGoto 6<CR>", {})
+vim.keymap.set("n", "<leader>7", ":BufferGoto 7<CR>", {})
+vim.keymap.set("n", "<leader>8", ":BufferGoto 8<CR>", {})
+vim.keymap.set("n", "<leader>9", ":BufferGoto 9<CR>", {})
+vim.keymap.set("n", "<leader>0", ":BufferLast<CR>", {})
+
+vim.keymap.set("n", "<leader>ww", ":BufferClose!<CR>", {})
+vim.keymap.set("n", "<leader>wa", ":BufferCloseAllButCurrent<CR>", {})
+vim.keymap.set("n", "<leader>wu", ":BufferRestore<CR>", {})
+vim.keymap.set("n", "<leader>wl", ":BufferLast<CR>", {})
diff --git a/.config/nvim/lua/set.lua b/.config/nvim/lua/set.lua
index 816ddb3..1f358e0 100644
--- a/.config/nvim/lua/set.lua
+++ b/.config/nvim/lua/set.lua
@@ -1,14 +1,13 @@
 vim.opt.number = true
-vim.opt.relativenumber = false
+vim.opt.relativenumber = true
 vim.opt.cursorline = true
 vim.opt.scrolloff = 4
 vim.opt.signcolumn = "yes"
 
-vim.opt.encoding = 'utf8'
-vim.opt.fileencoding = 'utf8'
+vim.opt.encoding = "utf8"
+vim.opt.fileencoding = "utf8"
 vim.opt.syntax = "ON"
 vim.opt.termguicolors = true
-vim.api.nvim_command('colorscheme monokai-pro-spectrum')
 
 vim.opt.ignorecase = true
 vim.opt.smartcase = true
@@ -23,4 +22,6 @@ vim.opt.splitright = true
 vim.opt.splitbelow = true
 vim.opt.cc = "80"
 
+vim.opt.mouse = ""
 
+vim.api.nvim_command("colorscheme monokai-pro-spectrum")