better

2023-03-03 14:54:30 +00:00
parent d74c1dccda
commit 4c731313ef
2 changed files with 81 additions and 76 deletions
--- a/common/.config/nvim/lua/plugins.lua
+++ b/common/.config/nvim/lua/plugins.lua
@@ -15,6 +15,7 @@ local packer = require('packer').startup(function(use)
  -- colorscheme
  use { 'catppuccin/nvim', as = 'catppuccin' }
  use 'rebelot/kanagawa.nvim'
+  use 'nvim-tree/nvim-web-devicons'

  -- QUALITY OF LIFE INTEGRATIONS

@@ -26,6 +27,8 @@ local packer = require('packer').startup(function(use)
    }
  }

+  use 'tpope/vim-fugitive'
+
  -- speedy searching
  use 'ggandor/leap.nvim'

@@ -53,26 +56,20 @@ local packer = require('packer').startup(function(use)
      codewindow.apply_default_keybinds()
    end,
  }
-  -- surround vim
-  use 'tpope/vim-surround'

  -- nerd commenter
  use 'scrooloose/nerdcommenter'

  -- nice diagnostic pane on the bottom
-  use 'folke/lsp-trouble.nvim'
-
-  -- support the missing lsp diagnostic colors
-  use 'folke/lsp-colors.nvim'
+  use 'folke/trouble.nvim'

  -- better LSP UI (for code actions, rename etc.)
  use({
    "glepnir/lspsaga.nvim",
    branch = "main",
    config = function()
-      require("lspsaga").setup({})
+        require("lspsaga").setup({})
    end,
-    requires = { {"nvim-tree/nvim-web-devicons"} }
  })

  -- better find and replace
@@ -85,15 +82,12 @@ local packer = require('packer').startup(function(use)
  -- start page
  use 'echasnovski/mini.starter'

-  -- status line
-  use 'glepnir/galaxyline.nvim'
-
  -- nicer looking tab display
  use 'lukas-reineke/indent-blankline.nvim'
  use 'echasnovski/mini.indentscope'

-  -- show startup time
-  use 'dstein64/vim-startuptime'
+  -- statusline
+  use 'ojroques/nvim-hardline'

  -- UX improvements
  use({
@@ -114,16 +108,16 @@ local packer = require('packer').startup(function(use)
  use {
    'neovim/nvim-lspconfig',
    'williamboman/nvim-lsp-installer',
-    'hrsh7th/nvim-cmp',
  }

-  ---- for LSP autocompletion
-  --use 'hrsh7th/cmp-nvim-lsp'
-  --use 'hrsh7th/cmp-buffer'
-  --use 'hrsh7th/cmp-path'
-  --use 'hrsh7th/cmp-cmdline'
+  -- for LSP autocompletion
+  use 'hrsh7th/nvim-cmp'
+  use 'hrsh7th/cmp-nvim-lsp'
+  use 'hrsh7th/cmp-buffer'
+  use 'hrsh7th/cmp-path'
+  use 'hrsh7th/cmp-cmdline'

-  -- highlight variables under cursor
+   --highlight variables under cursor
  use 'RRethy/vim-illuminate'

  -- this will automatically install listed dependencies
@@ -133,7 +127,8 @@ local packer = require('packer').startup(function(use)
  end
 end)

-require('leap').add_default_mappings()-- small plugin pre-init goes here
+-- SIMPLE PLUGIN CONFIGURATION 
+require('leap').add_default_mappings()
 require("indent_blankline").setup {
  char = "│",
  filetype_exclude = { "help", "alpha", "dashboard", "neo-tree", "Trouble", "lazy" },
@@ -144,14 +139,14 @@ require('mini.indentscope').setup({
  symbol = "│",
  options = { try_as_border = true },
 })
+require('hardline').setup {}

-- plugin specific configs go here
+-- MORE VERBOSE PLUGIN CONFIGS
 require('plugin-config/nvim-cmp')
 require('plugin-config/telescope')
 require('plugin-config/nvim-treesitter')
 require('plugin-config/lsp-trouble')
 require('plugin-config/lspsaga')
-require('plugin-config/galaxyline')
 require('plugin-config/gitsigns')
 require('plugin-config/indent-guide-lines')
 require('plugin-config/dressing')
--- a/common/.config/nvim/plugin/packer_compiled.lua
+++ b/common/.config/nvim/plugin/packer_compiled.lua
@@ -49,8 +49,8 @@ local function save_profiles(threshold)
 end

 time([[Luarocks path setup]], true)
-local package_path_str = "/home/ben/.cache/nvim/packer_hererocks/2.1.0-beta3/share/lua/5.1/?.lua;/home/ben/.cache/nvim/packer_hererocks/2.1.0-beta3/share/lua/5.1/?/init.lua;/home/ben/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/luarocks/rocks-5.1/?.lua;/home/ben/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/luarocks/rocks-5.1/?/init.lua"
-local install_cpath_pattern = "/home/ben/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/lua/5.1/?.so"
+local package_path_str = "/home/benk/.cache/nvim/packer_hererocks/2.1.0-beta3/share/lua/5.1/?.lua;/home/benk/.cache/nvim/packer_hererocks/2.1.0-beta3/share/lua/5.1/?/init.lua;/home/benk/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/luarocks/rocks-5.1/?.lua;/home/benk/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/luarocks/rocks-5.1/?/init.lua"
+local install_cpath_pattern = "/home/benk/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/lua/5.1/?.so"
 if not string.find(package.path, package_path_str, 1, true) then
  package.path = package.path .. ';' .. package_path_str
 end
@@ -76,160 +76,170 @@ time([[Defining packer_plugins]], true)
 _G.packer_plugins = {
  catppuccin = {
    loaded = true,
-    path = "/home/ben/.local/share/nvim/site/pack/packer/start/catppuccin",
+    path = "/home/benk/.local/share/nvim/site/pack/packer/start/catppuccin",
    url = "https://github.com/catppuccin/nvim"
  },
+  ["cmp-buffer"] = {
+    loaded = true,
+    path = "/home/benk/.local/share/nvim/site/pack/packer/start/cmp-buffer",
+    url = "https://github.com/hrsh7th/cmp-buffer"
+  },
+  ["cmp-cmdline"] = {
+    loaded = true,
+    path = "/home/benk/.local/share/nvim/site/pack/packer/start/cmp-cmdline",
+    url = "https://github.com/hrsh7th/cmp-cmdline"
+  },
+  ["cmp-nvim-lsp"] = {
+    loaded = true,
+    path = "/home/benk/.local/share/nvim/site/pack/packer/start/cmp-nvim-lsp",
+    url = "https://github.com/hrsh7th/cmp-nvim-lsp"
+  },
+  ["cmp-path"] = {
+    loaded = true,
+    path = "/home/benk/.local/share/nvim/site/pack/packer/start/cmp-path",
+    url = "https://github.com/hrsh7th/cmp-path"
+  },
  ["codewindow.nvim"] = {
    config = { "\27LJ\2\nW\0\0\3\0\4\0\b6\0\0\0'\2\1\0B\0\2\0029\1\2\0B\1\1\0019\1\3\0B\1\1\1K\0\1\0\27apply_default_keybinds\nsetup\15codewindow\frequire\0" },
    loaded = true,
-    path = "/home/ben/.local/share/nvim/site/pack/packer/start/codewindow.nvim",
+    path = "/home/benk/.local/share/nvim/site/pack/packer/start/codewindow.nvim",
    url = "https://github.com/gorbit99/codewindow.nvim"
  },
  ["dressing.nvim"] = {
    loaded = true,
-    path = "/home/ben/.local/share/nvim/site/pack/packer/start/dressing.nvim",
+    path = "/home/benk/.local/share/nvim/site/pack/packer/start/dressing.nvim",
    url = "https://github.com/stevearc/dressing.nvim"
  },
-  ["galaxyline.nvim"] = {
-    loaded = true,
-    path = "/home/ben/.local/share/nvim/site/pack/packer/start/galaxyline.nvim",
-    url = "https://github.com/glepnir/galaxyline.nvim"
-  },
  ["gitsigns.nvim"] = {
    loaded = true,
-    path = "/home/ben/.local/share/nvim/site/pack/packer/start/gitsigns.nvim",
+    path = "/home/benk/.local/share/nvim/site/pack/packer/start/gitsigns.nvim",
    url = "https://github.com/lewis6991/gitsigns.nvim"
  },
  ["indent-blankline.nvim"] = {
    loaded = true,
-    path = "/home/ben/.local/share/nvim/site/pack/packer/start/indent-blankline.nvim",
+    path = "/home/benk/.local/share/nvim/site/pack/packer/start/indent-blankline.nvim",
    url = "https://github.com/lukas-reineke/indent-blankline.nvim"
  },
  ["kanagawa.nvim"] = {
    loaded = true,
-    path = "/home/ben/.local/share/nvim/site/pack/packer/start/kanagawa.nvim",
+    path = "/home/benk/.local/share/nvim/site/pack/packer/start/kanagawa.nvim",
    url = "https://github.com/rebelot/kanagawa.nvim"
  },
  ["leap.nvim"] = {
    loaded = true,
-    path = "/home/ben/.local/share/nvim/site/pack/packer/start/leap.nvim",
+    path = "/home/benk/.local/share/nvim/site/pack/packer/start/leap.nvim",
    url = "https://github.com/ggandor/leap.nvim"
  },
-  ["lsp-colors.nvim"] = {
-    loaded = true,
-    path = "/home/ben/.local/share/nvim/site/pack/packer/start/lsp-colors.nvim",
-    url = "https://github.com/folke/lsp-colors.nvim"
-  },
-  ["lsp-trouble.nvim"] = {
-    loaded = true,
-    path = "/home/ben/.local/share/nvim/site/pack/packer/start/lsp-trouble.nvim",
-    url = "https://github.com/folke/lsp-trouble.nvim"
-  },
  ["lspsaga.nvim"] = {
    config = { "\27LJ\2\n9\0\0\3\0\3\0\a6\0\0\0'\2\1\0B\0\2\0029\0\2\0004\2\0\0B\0\2\1K\0\1\0\nsetup\flspsaga\frequire\0" },
    loaded = true,
-    path = "/home/ben/.local/share/nvim/site/pack/packer/start/lspsaga.nvim",
+    path = "/home/benk/.local/share/nvim/site/pack/packer/start/lspsaga.nvim",
    url = "https://github.com/glepnir/lspsaga.nvim"
  },
  ["mini.indentscope"] = {
    loaded = true,
-    path = "/home/ben/.local/share/nvim/site/pack/packer/start/mini.indentscope",
+    path = "/home/benk/.local/share/nvim/site/pack/packer/start/mini.indentscope",
    url = "https://github.com/echasnovski/mini.indentscope"
  },
  ["mini.starter"] = {
    loaded = true,
-    path = "/home/ben/.local/share/nvim/site/pack/packer/start/mini.starter",
+    path = "/home/benk/.local/share/nvim/site/pack/packer/start/mini.starter",
    url = "https://github.com/echasnovski/mini.starter"
  },
  nerdcommenter = {
    loaded = true,
-    path = "/home/ben/.local/share/nvim/site/pack/packer/start/nerdcommenter",
+    path = "/home/benk/.local/share/nvim/site/pack/packer/start/nerdcommenter",
    url = "https://github.com/scrooloose/nerdcommenter"
  },
  ["noice.nvim"] = {
    loaded = true,
-    path = "/home/ben/.local/share/nvim/site/pack/packer/start/noice.nvim",
+    path = "/home/benk/.local/share/nvim/site/pack/packer/start/noice.nvim",
    url = "https://github.com/folke/noice.nvim"
  },
  ["nui.nvim"] = {
    loaded = true,
-    path = "/home/ben/.local/share/nvim/site/pack/packer/start/nui.nvim",
+    path = "/home/benk/.local/share/nvim/site/pack/packer/start/nui.nvim",
    url = "https://github.com/MunifTanjim/nui.nvim"
  },
  ["nvim-bqf"] = {
    loaded = true,
-    path = "/home/ben/.local/share/nvim/site/pack/packer/start/nvim-bqf",
+    path = "/home/benk/.local/share/nvim/site/pack/packer/start/nvim-bqf",
    url = "https://github.com/kevinhwang91/nvim-bqf"
  },
  ["nvim-cmp"] = {
    loaded = true,
-    path = "/home/ben/.local/share/nvim/site/pack/packer/start/nvim-cmp",
+    path = "/home/benk/.local/share/nvim/site/pack/packer/start/nvim-cmp",
    url = "https://github.com/hrsh7th/nvim-cmp"
  },
+  ["nvim-hardline"] = {
+    loaded = true,
+    path = "/home/benk/.local/share/nvim/site/pack/packer/start/nvim-hardline",
+    url = "https://github.com/ojroques/nvim-hardline"
+  },
  ["nvim-lsp-installer"] = {
    loaded = true,
-    path = "/home/ben/.local/share/nvim/site/pack/packer/start/nvim-lsp-installer",
+    path = "/home/benk/.local/share/nvim/site/pack/packer/start/nvim-lsp-installer",
    url = "https://github.com/williamboman/nvim-lsp-installer"
  },
  ["nvim-lspconfig"] = {
    loaded = true,
-    path = "/home/ben/.local/share/nvim/site/pack/packer/start/nvim-lspconfig",
+    path = "/home/benk/.local/share/nvim/site/pack/packer/start/nvim-lspconfig",
    url = "https://github.com/neovim/nvim-lspconfig"
  },
  ["nvim-notify"] = {
    loaded = true,
-    path = "/home/ben/.local/share/nvim/site/pack/packer/start/nvim-notify",
+    path = "/home/benk/.local/share/nvim/site/pack/packer/start/nvim-notify",
    url = "https://github.com/rcarriga/nvim-notify"
  },
  ["nvim-spectre"] = {
    loaded = true,
-    path = "/home/ben/.local/share/nvim/site/pack/packer/start/nvim-spectre",
+    path = "/home/benk/.local/share/nvim/site/pack/packer/start/nvim-spectre",
    url = "https://github.com/windwp/nvim-spectre"
  },
  ["nvim-treesitter"] = {
    loaded = true,
-    path = "/home/ben/.local/share/nvim/site/pack/packer/start/nvim-treesitter",
+    path = "/home/benk/.local/share/nvim/site/pack/packer/start/nvim-treesitter",
    url = "https://github.com/nvim-treesitter/nvim-treesitter"
  },
  ["nvim-web-devicons"] = {
    loaded = true,
-    path = "/home/ben/.local/share/nvim/site/pack/packer/start/nvim-web-devicons",
+    path = "/home/benk/.local/share/nvim/site/pack/packer/start/nvim-web-devicons",
    url = "https://github.com/nvim-tree/nvim-web-devicons"
  },
  ["packer.nvim"] = {
    loaded = true,
-    path = "/home/ben/.local/share/nvim/site/pack/packer/start/packer.nvim",
+    path = "/home/benk/.local/share/nvim/site/pack/packer/start/packer.nvim",
    url = "https://github.com/wbthomason/packer.nvim"
  },
  ["plenary.nvim"] = {
    loaded = true,
-    path = "/home/ben/.local/share/nvim/site/pack/packer/start/plenary.nvim",
+    path = "/home/benk/.local/share/nvim/site/pack/packer/start/plenary.nvim",
    url = "https://github.com/nvim-lua/plenary.nvim"
  },
  ["smart-splits.nvim"] = {
    loaded = true,
-    path = "/home/ben/.local/share/nvim/site/pack/packer/start/smart-splits.nvim",
+    path = "/home/benk/.local/share/nvim/site/pack/packer/start/smart-splits.nvim",
    url = "https://github.com/mrjones2014/smart-splits.nvim"
  },
  ["telescope.nvim"] = {
    loaded = true,
-    path = "/home/ben/.local/share/nvim/site/pack/packer/start/telescope.nvim",
+    path = "/home/benk/.local/share/nvim/site/pack/packer/start/telescope.nvim",
    url = "https://github.com/nvim-telescope/telescope.nvim"
  },
+  ["trouble.nvim"] = {
+    loaded = true,
+    path = "/home/benk/.local/share/nvim/site/pack/packer/start/trouble.nvim",
+    url = "https://github.com/folke/trouble.nvim"
+  },
+  ["vim-fugitive"] = {
+    loaded = true,
+    path = "/home/benk/.local/share/nvim/site/pack/packer/start/vim-fugitive",
+    url = "https://github.com/tpope/vim-fugitive"
+  },
  ["vim-illuminate"] = {
    loaded = true,
-    path = "/home/ben/.local/share/nvim/site/pack/packer/start/vim-illuminate",
+    path = "/home/benk/.local/share/nvim/site/pack/packer/start/vim-illuminate",
    url = "https://github.com/RRethy/vim-illuminate"
-  },
-  ["vim-startuptime"] = {
-    loaded = true,
-    path = "/home/ben/.local/share/nvim/site/pack/packer/start/vim-startuptime",
-    url = "https://github.com/dstein64/vim-startuptime"
-  },
-  ["vim-surround"] = {
-    loaded = true,
-    path = "/home/ben/.local/share/nvim/site/pack/packer/start/vim-surround",
-    url = "https://github.com/tpope/vim-surround"
  }
 }