refactor nvim cfg, add more plugins

.config/nvim/init.lua

@@ -1,7 +1,14 @@
 require('plugins')
 require('keybinds')
+require('options')
 
-require('bufferline').setup() -- TODO: only open when more than one buffer is open, remove exit button
+require('bufferline').setup({
+  options = {
+    show_buffer_close_icons = false,
+    show_close_icon = false,
+    always_show_bufferline = false,
+  }
+})
 require('mason').setup({
     ui = {
         icons = {
@@ -22,38 +29,6 @@ require('tokyonight').setup({
   lualine_bold = true,
 })
 
-vim.cmd[[colorscheme tokyonight]]
-vim.opt.undodir        = vim.fn.stdpath "cache" .. "/undo"
-vim.opt.clipboard      = "unnamedplus"
-vim.opt.conceallevel   = 0
-vim.opt.numberwidth    = 3
-vim.opt.hlsearch       = true
-vim.opt.ignorecase     = true
-vim.opt.showmode       = false
-vim.opt.smartindent    = true
-vim.opt.splitbelow     = true
-vim.opt.splitbelow     = true
-vim.opt.splitbelow     = true
-vim.opt.updatetime     = 300
-vim.opt.writebackup    = false
-vim.opt.expandtab      = true
-vim.opt.shiftwidth     = 2
-vim.opt.tabstop        = 2
-vim.opt.cursorline     = true
-vim.opt.signcolumn     = "yes"
-vim.opt.wrap           = false
-vim.opt.scrolloff      = 8
-vim.opt.sidescrolloff  = 8
-vim.opt.undofile       = true
-vim.opt.title          = true
-vim.opt.titlestring    = " %t"
-vim.opt.termguicolors  = true
-vim.opt.timeoutlen     = 500
-vim.opt.foldmethod     = "expr"
-vim.opt.foldlevelstart = 99
-vim.opt.foldexpr       = "nvim_treesitter#foldexpr()"
-vim.opt.number         = true
-vim.opt.relativenumber = true
 
 -- set autocmds defined in autocmd.lua
 for _, entry in ipairs(require('autocmds')) do

.config/nvim/lua/lualine.lua

@@ -1,3 +1,8 @@
+local status_ok, lualine = pcall(require, "lualine")
+if not status_ok then
+  return
+end
+
 local colors = require("tokyonight.colors").setup({ transform = true })
 
 local conditions = {
@@ -185,4 +190,4 @@ ins_right {
   padding = { left = 1 },
 }
 
-return require('lualine').setup(config)
+lualine.setup(config)

.config/nvim/lua/options.lua

@@ -0,0 +1,33 @@
+vim.cmd[[colorscheme tokyonight]]
+vim.opt.undodir        = vim.fn.stdpath "cache" .. "/undo"
+vim.opt.clipboard      = "unnamedplus"
+vim.opt.conceallevel   = 0
+vim.opt.numberwidth    = 3
+vim.opt.hlsearch       = true
+vim.opt.ignorecase     = true
+vim.opt.showmode       = false
+vim.opt.smartindent    = true
+vim.opt.splitbelow     = true
+vim.opt.splitbelow     = true
+vim.opt.splitbelow     = true
+vim.opt.updatetime     = 300
+vim.opt.writebackup    = false
+vim.opt.expandtab      = true
+vim.opt.shiftwidth     = 2
+vim.opt.tabstop        = 2
+vim.opt.cursorline     = true
+vim.opt.signcolumn     = "yes"
+vim.opt.wrap           = false
+vim.opt.scrolloff      = 8
+vim.opt.sidescrolloff  = 8
+vim.opt.undofile       = true
+vim.opt.title          = true
+vim.opt.titlestring    = " %t"
+vim.opt.termguicolors  = true
+vim.opt.timeoutlen     = 500
+vim.opt.foldmethod     = "expr"
+vim.opt.foldlevelstart = 99
+vim.opt.foldexpr       = "nvim_treesitter#foldexpr()"
+vim.opt.number         = true
+vim.opt.relativenumber = true
+

.config/nvim/lua/plugins.lua

@@ -11,29 +11,67 @@ end
 
 local packer_bootstrap = ensure_packer()
 
-return require('packer').startup(function(use)
+local status_ok, packer = pcall(require, "packer")
+if not status_ok then
+  return
+end
+
+packer.init {
+  display = {
+    open_fn = function()
+      return require("packer.util").float { border = "rounded" }
+    end,
+  },
+}
+
+return packer.startup(function(use)
+  -- General Functionality
   use 'wbthomason/packer.nvim'
+  use 'nvim-lua/plenary.nvim'
+  use 'windwp/nvim-autopairs'
+  use 'numToStr/Comment.nvim'
+  use 'JoosepAlviste/nvim-ts-context-commentstring'
+  use 'kyazdani42/nvim-web-devicons'
+  use 'kyazdani42/nvim-tree.lua'
+  use 'akinsho/bufferline.nvim'
+  use 'moll/vim-bbye'
+  use 'nvim-lualine/lualine.nvim'
+  use 'akinsho/toggleterm.nvim'
+  use 'ahmedkhalf/project.nvim'
+  use 'lewis6991/impatient.nvim'
+  use 'lukas-reineke/indent-blankline.nvim'
+  use 'goolord/alpha-nvim'
+  use 'RRethy/vim-illuminate'
+  use 'nvim-telescope/telescope.nvim'
+  use 'nvim-treesitter/nvim-treesitter'
+  use 'lewis6991/gitsigns.nvim'
+  -- Color Schemes
+  use 'folke/tokyonight.nvim'
+  -- Completion
+  use 'hrsh7th/nvim-cmp'
+  use 'hrsh7th/cmp-buffer'
+  use 'hrsh7th/cmp-path'
+  use 'saadparwaiz1/cmp_luasnip'
+  use 'hrsh7th/cmp-nvim-lsp'
+  use 'hrsh7th/cmp-nvim-lua'
+-- Snippets
+  use 'L3MON4D3/LuaSnip'
+  use 'rafamadriz/friendly-snippets'
+-- LSP/DAP
+  use 'williamboman/mason.nvim'
+  use 'mfussenegger/nvim-dap'
+  use 'jose-elias-alvarez/null-ls.nvim'
+  use 'neovim/nvim-lspconfig'
+  use 'williamboman/mason-lspconfig.nvim'
+
+
+
   use 'fladson/vim-kitty'
   use 'folke/lua-dev.nvim'
   use 'tpope/vim-surround'
   use 'tpope/vim-repeat'
   use 'norcalli/nvim-colorizer.lua'
-  use 'folke/tokyonight.nvim'
   use 'vimwiki/vimwiki'
-  use 'williamboman/mason.nvim'
-  use 'kyazdani42/nvim-tree.lua'
-  use 'mfussenegger/nvim-dap'
-  use {
-    'jose-elias-alvarez/null-ls.nvim'
-
-  }
-  use {
-    'akinsho/bufferline.nvim',
-    config = function ()
-      require('bufferline').setup()
-    end,
-    requires = 'kyazdani42/nvim-web-devicons'
-  }
   use {
     'folke/which-key.nvim',
     config = function()
@@ -42,22 +80,6 @@ return require('packer').startup(function(use)
     end
   }
   use {
-    'nvim-telescope/telescope.nvim',
-    requires = 'nvim-lua/plenary.nvim'
-  }
-  use {
-    'nvim-lualine/lualine.nvim',
-    config = require('lualine-conf')
-  }
-  use {
-    'lewis6991/gitsigns.nvim',
-    config = function()
-      require('gitsigns').setup()
-    end
-  }
-  use {
-    'nvim-treesitter/nvim-treesitter',
-    run = ':TSUpdate'
   }
   use {
     'felipec/vim-sanegx',
@@ -65,12 +87,9 @@ return require('packer').startup(function(use)
   }
   use {
     'sindrets/diffview.nvim',
-    requires = 'nvim-lua/plenary.nvim',
     event = 'BufRead'
   }
   use {
-    'williamboman/mason-lspconfig.nvim',
-    requires = 'neovim/nvim-lspconfig'
   }
   if packer_bootstrap then
     require('packer').sync()