refactor

2023-03-03 22:45:26 +00:00
parent 0c76051380
commit eac97acadf
6 changed files with 160 additions and 294 deletions
--- a/common/.config/flameshot/flameshot.ini
+++ b/common/.config/flameshot/flameshot.ini
@@ -1,3 +1,3 @@
 [General]
-savePath=/home/ben
+savePath=/home/benk
 uploadWithoutConfirmation=true
--- a/common/.config/nvim/lua/lsp-general.lua
+++ b/common/.config/nvim/lua/lsp-general.lua
@@ -1,3 +1,16 @@
+local lspconfig = require('lspconfig');
+
+require('mason').setup()
+require('mason-lspconfig').setup({
+  ensure_installed = {'clangd'}
+})
+
+require('mason-lspconfig').setup_handlers({
+  function(server)
+    lspconfig[server].setup({})
+  end,
+})
+
 -- diagnostic symbols
 local signs = { Error = "", Warn = "", Hint = "", Info =  ""}
 for type, icon in pairs(signs) do
--- a/common/.config/nvim/lua/plugin-config/indent-guide-lines.lua
+++ b/common/.config/nvim/lua/plugin-config/indent-guide-lines.lua
@@ -1,8 +0,0 @@
-- settings for both plugins:
-- 'lukas-reineke/indent-blankline.nvim'
-- 'Yggdroot/indentLine'
-
-vim.api.nvim_command("let g:indentLine_char = '⎸'")
-vim.api.nvim_command("let g:indentLine_fileTypeExclude = ['text', 'markdown', 'help']")
-vim.api.nvim_command("let g:indentLine_bufNameExclude = ['STARTIFY', 'NVIMTREE']")
-vim.api.nvim_command("let g:indent_blankline_extra_indent_level = -1")
--- a/common/.config/nvim/lua/plugin-config/lspsaga.lua
+++ b/common/.config/nvim/lua/plugin-config/lspsaga.lua
@@ -1,3 +1,5 @@
+require("lspsaga").setup({})
+
 local keymap = vim.keymap.set

 -- LSP finder - Find the symbol's definition
--- a/common/.config/nvim/lua/plugins.lua
+++ b/common/.config/nvim/lua/plugins.lua
@@ -4,152 +4,166 @@ local installPath = DATA_PATH..'/site/pack/packer/start/packer.nvim'
 -- install packer if it's not installed already
 local packerBootstrap = nil
 if fn.empty(fn.glob(installPath)) > 0 then
-  packerBootstrap = fn.system({'git', 'clone', '--depth', '1', 'https://github.com/wbthomason/packer.nvim', installPath})
-  vim.cmd [[packadd packer.nvim]]
+    packerBootstrap = fn.system({'git', 'clone', '--depth', '1', 'https://github.com/wbthomason/packer.nvim', installPath})
+    vim.cmd [[packadd packer.nvim]]
 end

 local packer = require('packer').startup(function(use)
-  -- Packer should manage itself
-  use 'wbthomason/packer.nvim'
+    -- Packer should manage itself
+    use 'wbthomason/packer.nvim'

-  -- colorscheme
-  use { 'catppuccin/nvim', as = 'catppuccin' }
-  use 'rebelot/kanagawa.nvim'
-  use 'nvim-tree/nvim-web-devicons'
+    -- colorscheme
+    use { 'catppuccin/nvim', as = 'catppuccin' }
+    use 'rebelot/kanagawa.nvim'
+    use 'nvim-tree/nvim-web-devicons'

-  -- QUALITY OF LIFE INTEGRATIONS
+    -- QUALITY OF LIFE INTEGRATIONS

-  -- git integration
-  use {
-    'lewis6991/gitsigns.nvim',
-    requires = {
-      'nvim-lua/plenary.nvim'
+    -- git integration
+    use {
+        'lewis6991/gitsigns.nvim',
+        requires = { 'nvim-lua/plenary.nvim' },
+        config = require('plugin-config/gitsigns'),
    }
-  }

-  use 'tpope/vim-fugitive'
+    use 'tpope/vim-fugitive'

-  -- speedy searching
-  use 'ggandor/leap.nvim'
-
-  -- telescope - searching / navigation
-  use {
-    'nvim-telescope/telescope.nvim',
-    requires = { {'nvim-lua/plenary.nvim'} }
-  }
-
-  -- better hotfix window (for showing and searching through results in telescope's find usages)
-  use 'kevinhwang91/nvim-bqf'
-
-  -- better highlighting
-  use {'nvim-treesitter/nvim-treesitter', run = ':TSUpdate'}
-  use 'nvim-treesitter/nvim-treesitter-context'
-
-  -- better split navigation
-  use 'mrjones2014/smart-splits.nvim'
-
-  -- gorbit's codewindow 
-  use {
-    'gorbit99/codewindow.nvim',
-    config = function()
-      local codewindow = require('codewindow')
-      codewindow.setup()
-      codewindow.apply_default_keybinds()
-    end,
-  }
-
-  -- nerd commenter
-  use 'scrooloose/nerdcommenter'
-
-  -- nice diagnostic pane on the bottom
-  use 'folke/trouble.nvim'
-
-  -- better LSP UI (for code actions, rename etc.)
-  use({
-    "glepnir/lspsaga.nvim",
-    branch = "main",
-    config = function()
-        require("lspsaga").setup({})
-    end,
-  })
-
-  -- better find and replace
-  use 'windwp/nvim-spectre'
-
-
-  -- VISUAL CHANGES
-
-  -- start page
-  use 'echasnovski/mini.starter'
-
-  -- nicer looking tab display
-  use 'lukas-reineke/indent-blankline.nvim'
-  use 'echasnovski/mini.indentscope'
-
-  -- statusline
-  use 'ojroques/nvim-hardline'
-
-  -- UX improvements
-  use({
-    "folke/noice.nvim",
-    requires = {
-      "MunifTanjim/nui.nvim",
-      "rcarriga/nvim-notify",
+    -- speedy searching
+    use {
+        'ggandor/leap.nvim',
+        config = require('leap').add_default_mappings(),
    }
-  })
-  use 'stevearc/dressing.nvim'

-  use 'rcarriga/nvim-notify'
+    -- telescope - searching / navigation
+    use {
+        'nvim-telescope/telescope.nvim',
+        requires = { 'nvim-lua/plenary.nvim' },
+        config = require('plugin-config/telescope'),
+    }
+
+    -- better hotfix window (for showing and searching through results in telescope's find usages)
+    use 'kevinhwang91/nvim-bqf'
+
+    -- better highlighting
+    use {
+        'nvim-treesitter/nvim-treesitter', 
+        run = ':TSUpdate',
+        config = require('plugin-config/nvim-treesitter'),
+    }
+    use 'nvim-treesitter/nvim-treesitter-context'
+
+    -- better split navigation
+    use {
+        'mrjones2014/smart-splits.nvim',
+        config = require('plugin-config/smart-splits'),
+    } 
+    -- gorbit's codewindow 
+    use {
+        'gorbit99/codewindow.nvim',
+        config = function()
+            local codewindow = require('codewindow')
+            codewindow.setup()
+            codewindow.apply_default_keybinds()
+        end,
+    }
+
+    -- nerd commenter
+    use 'scrooloose/nerdcommenter'
+
+    -- nice diagnostic pane on the bottom
+    use {
+        'folke/trouble.nvim',
+        config = require('plugin-config/lsp-trouble'),
+    }
+
+    -- better LSP UI (for code actions, rename etc.)
+    use {
+        "glepnir/lspsaga.nvim",
+        branch = "main",
+        config = require('plugin-config/lspsaga'),
+    }
+
+    -- better find and replace
+    use 'windwp/nvim-spectre'


-  -- FUNCTIONAL CODING STUFF
+    -- VISUAL CHANGES

-  -- lsp config
-  use {
-    "williamboman/mason.nvim",
-    "williamboman/mason-lspconfig.nvim",
-    "neovim/nvim-lspconfig",
-  }
+    -- start page
+    use {
+        'echasnovski/mini.starter',
+        config = require('plugin-config/ministarter'),
+    }

-  -- for LSP autocompletion
-  use 'hrsh7th/nvim-cmp'
-  use 'hrsh7th/cmp-nvim-lsp'
-  use 'hrsh7th/cmp-buffer'
-  use 'hrsh7th/cmp-path'
-  use 'hrsh7th/cmp-cmdline'
+    -- nicer looking tab display
+    use {
+        'lukas-reineke/indent-blankline.nvim',
+        config = require("indent_blankline").setup {
+            char = "│",
+            filetype_exclude = { "help", "alpha", "dashboard", "neo-tree", "Trouble", "lazy" },
+        },
+    }

-  -- this will automatically install listed dependencies
-  -- only the first time NeoVim is opened, because that's when Packer gets installed
-  if packerBootstrap then
-    require('packer').sync()
-  end
+    use {
+        'echasnovski/mini.indentscope',
+        require('mini.indentscope').setup {
+            symbol = "│",
+            options = { try_as_border = true },
+        },
+    }
+
+    -- statusline
+    use {
+        'ojroques/nvim-hardline',
+        require('hardline').setup({}),
+    }
+
+    -- UX improvements
+    use {
+        "folke/noice.nvim",
+        requires = {
+            "MunifTanjim/nui.nvim",
+            "rcarriga/nvim-notify",
+        },
+        config = require('plugin-config/noice')
+    }
+
+    use {
+        'stevearc/dressing.nvim',
+        config = require('plugin-config/dressing'),
+    }
+
+    use 'rcarriga/nvim-notify'
+
+
+    -- FUNCTIONAL CODING STUFF
+
+    -- lsp config
+    use {
+        "williamboman/mason.nvim",
+        requires = {
+            "williamboman/mason-lspconfig.nvim",
+            "neovim/nvim-lspconfig",
+        },
+    }
+
+    -- for LSP autocompletion
+    use {
+        'hrsh7th/nvim-cmp',
+        requires = {
+            'hrsh7th/cmp-nvim-lsp',
+            'hrsh7th/cmp-buffer',
+            'hrsh7th/cmp-path',
+            'hrsh7th/cmp-cmdline',
+        },
+        config = require('plugin-config/nvim-cmp'),
+    } 
+
+    -- this will automatically install listed dependencies
+    -- only the first time NeoVim is opened, because that's when Packer gets installed
+    if packerBootstrap then
+        require('packer').sync()
+    end
 end)

-- SIMPLE PLUGIN CONFIGURATION 
-require('leap').add_default_mappings()
-require("indent_blankline").setup {
-  char = "│",
-  filetype_exclude = { "help", "alpha", "dashboard", "neo-tree", "Trouble", "lazy" },
-  --show_current_context = true,
-  --show_current_context_start = true,
-}
-require('mini.indentscope').setup({
-  symbol = "│",
-  options = { try_as_border = true },
-})
-require('hardline').setup {}
-
-- 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/gitsigns')
-require('plugin-config/indent-guide-lines')
-require('plugin-config/dressing')
-require('plugin-config/noice')
-require('plugin-config/ministarter')
-require('plugin-config/smart-splits')
-
 return packer
--- a/common/.config/nvim/plugin/packer_compiled.lua
+++ b/common/.config/nvim/plugin/packer_compiled.lua
@@ -79,133 +79,11 @@ _G.packer_plugins = {
    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/benk/.local/share/nvim/site/pack/packer/start/codewindow.nvim",
-    url = "https://github.com/gorbit99/codewindow.nvim"
-  },
-  ["dressing.nvim"] = {
-    loaded = true,
-    path = "/home/benk/.local/share/nvim/site/pack/packer/start/dressing.nvim",
-    url = "https://github.com/stevearc/dressing.nvim"
-  },
-  ["gitsigns.nvim"] = {
-    loaded = true,
-    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/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/benk/.local/share/nvim/site/pack/packer/start/kanagawa.nvim",
    url = "https://github.com/rebelot/kanagawa.nvim"
  },
-  ["leap.nvim"] = {
-    loaded = true,
-    path = "/home/benk/.local/share/nvim/site/pack/packer/start/leap.nvim",
-    url = "https://github.com/ggandor/leap.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/benk/.local/share/nvim/site/pack/packer/start/lspsaga.nvim",
-    url = "https://github.com/glepnir/lspsaga.nvim"
-  },
-  ["mason.nvim"] = {
-    loaded = true,
-    path = "/home/benk/.local/share/nvim/site/pack/packer/start/mason.nvim",
-    url = "https://github.com/williamboman/mason.nvim"
-  },
-  ["mini.indentscope"] = {
-    loaded = true,
-    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/benk/.local/share/nvim/site/pack/packer/start/mini.starter",
-    url = "https://github.com/echasnovski/mini.starter"
-  },
-  nerdcommenter = {
-    loaded = true,
-    path = "/home/benk/.local/share/nvim/site/pack/packer/start/nerdcommenter",
-    url = "https://github.com/scrooloose/nerdcommenter"
-  },
-  ["noice.nvim"] = {
-    loaded = true,
-    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/benk/.local/share/nvim/site/pack/packer/start/nui.nvim",
-    url = "https://github.com/MunifTanjim/nui.nvim"
-  },
-  ["nvim-bqf"] = {
-    loaded = true,
-    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/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-lspconfig"] = {
-    loaded = true,
-    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/benk/.local/share/nvim/site/pack/packer/start/nvim-notify",
-    url = "https://github.com/rcarriga/nvim-notify"
-  },
-  ["nvim-spectre"] = {
-    loaded = true,
-    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/benk/.local/share/nvim/site/pack/packer/start/nvim-treesitter",
-    url = "https://github.com/nvim-treesitter/nvim-treesitter"
-  },
-  ["nvim-treesitter-context"] = {
-    loaded = true,
-    path = "/home/benk/.local/share/nvim/site/pack/packer/start/nvim-treesitter-context",
-    url = "https://github.com/nvim-treesitter/nvim-treesitter-context"
-  },
  ["nvim-web-devicons"] = {
    loaded = true,
    path = "/home/benk/.local/share/nvim/site/pack/packer/start/nvim-web-devicons",
@@ -215,43 +93,10 @@ _G.packer_plugins = {
    loaded = true,
    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/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/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/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"
  }
 }

 time([[Defining packer_plugins]], false)
-- Config for: lspsaga.nvim
-time([[Config for lspsaga.nvim]], true)
-try_loadstring("\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", "config", "lspsaga.nvim")
-time([[Config for lspsaga.nvim]], false)
-- Config for: codewindow.nvim
-time([[Config for codewindow.nvim]], true)
-try_loadstring("\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", "config", "codewindow.nvim")
-time([[Config for codewindow.nvim]], false)

 _G._packer.inside_compile = false
 if _G._packer.needs_bufread == true then