diff options
| -rw-r--r-- | lua/default-config.lua | 27 | ||||
| -rw-r--r-- | lua/lv-compe/init.lua | 6 | ||||
| -rw-r--r-- | lua/lv-galaxyline/init.lua | 2 | ||||
| -rw-r--r-- | lua/lv-which-key/init.lua | 43 | ||||
| -rw-r--r-- | lua/plugins.lua | 194 | ||||
| -rw-r--r-- | utils/installer/lv-config.example.lua | 5 | 
6 files changed, 19 insertions, 258 deletions
| diff --git a/lua/default-config.lua b/lua/default-config.lua index 3c6efce9..b892f357 100644 --- a/lua/default-config.lua +++ b/lua/default-config.lua @@ -29,7 +29,6 @@ O = {      ensure_installed = "all",      ignore_install = { "haskell" },      highlight = { enabled = true }, -    rainbow = { enabled = false },      -- The below are for treesitter-textobjects plugin      textobj_prefixes = {        goto_next = "]", -- Go to next @@ -62,7 +61,6 @@ O = {    database = { save_location = "~/.config/nvcode_db", auto_execute = 1 },    plugin = { -    -- TODO remove non built-ins      -- Builtins      dashboard = { active = false },      colorizer = { active = false }, @@ -83,32 +81,9 @@ O = {      lazygit = { active = false },      lush = { active = false },      diffview = { active = false }, - -    ---------------------------------------------------------------------- -    -- Non builtins - -    octo = { active = false }, -    gitlinker = { active = false }, -    todo_comments = { active = false }, -    gist = { active = false }, -    git_blame = { active = false }, -    lsp_colors = { active = false }, -    ranger = { active = false }, -    hop = { active = false }, -    dial = { active = false }, -    matchup = { active = false }, -    numb = { active = false }, -    bqf = { active = false }, -    trouble = { active = false },      floatterm = { active = false }, -    spectre = { active = false }, -    lsp_rooter = { active = false }, -    markdown_preview = { active = false }, -    bracey = { active = false }, -    codi = { active = false }, +    trouble = { active = false },      sanegx = { active = false }, -    snap = { active = false }, -    tabnine = { active = false },    },    custom_plugins = { diff --git a/lua/lv-compe/init.lua b/lua/lv-compe/init.lua index 19998b62..5b86f27e 100644 --- a/lua/lv-compe/init.lua +++ b/lua/lv-compe/init.lua @@ -31,7 +31,7 @@ M.config = function()        nvim_lua = false,        spell = { kind = "   (Spell)" },        tags = false, -      vim_dadbod_completion = true, +      -- vim_dadbod_completion = true,        -- snippets_nvim = {kind = "  "},        -- ultisnips = {kind = "  "},        -- treesitter = {kind = "  "}, @@ -40,10 +40,6 @@ M.config = function()      },    } -  if O.plugin.tabnine.active then -    opt.source.tabnine = { kind = " ", priority = 200, max_reslts = 6 } -  end -    require("compe").setup(opt)    local t = function(str) diff --git a/lua/lv-galaxyline/init.lua b/lua/lv-galaxyline/init.lua index efb6a988..23f13556 100644 --- a/lua/lv-galaxyline/init.lua +++ b/lua/lv-galaxyline/init.lua @@ -104,7 +104,7 @@ table.insert(gls.left, {        vim.api.nvim_command("hi GalaxyViMode guifg=" .. mode_color[vim.fn.mode()])        return "▊"      end, -    highlight = 'StatusLineNC' +    highlight = "StatusLineNC",      -- highlight = {colors.red, colors.bg}    },  }) diff --git a/lua/lv-which-key/init.lua b/lua/lv-which-key/init.lua index acc342c4..5fb3c92d 100644 --- a/lua/lv-which-key/init.lua +++ b/lua/lv-which-key/init.lua @@ -72,12 +72,7 @@ vim.api.nvim_set_keymap(  --                         ":NvimTreeToggle<CR>",  --                         {noremap = true, silent = true}) --- telescope or snap -if O.plugin.snap.active then -  vim.api.nvim_set_keymap("n", "<Leader>f", ":Snap find_files<CR>", { noremap = true, silent = true }) -else -  vim.api.nvim_set_keymap("n", "<Leader>f", ":Telescope find_files<CR>", { noremap = true, silent = true }) -end +vim.api.nvim_set_keymap("n", "<Leader>f", ":Telescope find_files<CR>", { noremap = true, silent = true })  -- dashboard  vim.api.nvim_set_keymap("n", "<Leader>;", ":Dashboard<CR>", { noremap = true, silent = true }) @@ -101,7 +96,7 @@ local mappings = {    b = {      name = "Buffers",      j = { "<cmd>BufferPick<cr>", "jump to buffer" }, -    f = { O.plugin.snap.active and "<cmd>Snap buffers<cr>" or "<cmd>Telescope buffers<cr>", "Find buffer" }, +    f = { "<cmd>Telescope buffers<cr>", "Find buffer" },      w = { "<cmd>BufferWipeout<cr>", "wipeout buffer" },      e = {        "<cmd>BufferCloseAllButCurrent<cr>", @@ -224,21 +219,12 @@ local mappings = {      name = "Search",      b = { "<cmd>Telescope git_branches<cr>", "Checkout branch" },      c = { "<cmd>Telescope colorscheme<cr>", "Colorscheme" }, -    -- d = { -    --     "<cmd>Telescope lsp_document_diagnostics<cr>", -    --     "Document Diagnostics" -    -- }, -    -- D = { -    --     "<cmd>Telescope lsp_workspace_diagnostics<cr>", -    --     "Workspace Diagnostics" -    -- }, -    f = { O.plugin.snap.active and "<cmd>Snap find_files<cr>" or "<cmd>Telescope find_files<cr>", "Find File" }, +    f = { "<cmd>Telescope find_files<cr>", "Find File" },      h = { "<cmd>Telescope help_tags<cr>", "Find Help" }, -    -- m = {"<cmd>Telescope marks<cr>", "Marks"},      M = { "<cmd>Telescope man_pages<cr>", "Man Pages" }, -    r = { O.plugin.snap.active and "<cmd>Snap oldfiles<cr>" or "<cmd>Telescope oldfiles<cr>", "Open Recent File" }, +    r = { "<cmd>Telescope oldfiles<cr>", "Open Recent File" },      R = { "<cmd>Telescope registers<cr>", "Registers" }, -    t = { O.plugin.snap.active and "<cmd>Snap live_grep<cr>" or "<cmd>Telescope live_grep<cr>", "Text" }, +    t = { "<cmd>Telescope live_grep<cr>", "Text" },    },    S = {      name = "Session", @@ -251,17 +237,6 @@ local mappings = {    },  } -if O.plugin.spectre.active then -  mappings["r"] = { -    name = "Replace", -    f = { -      "<cmd>lua require('spectre').open_file_search()<cr>", -      "Current File", -    }, -    p = { "<cmd>lua require('spectre').open()<cr>", "Project" }, -  } -end -  -- if O.plugin.trouble.active then  --   mappings["d"] = {  --     name = "Diagnostics", @@ -275,12 +250,8 @@ end  -- end  if O.plugin.symbol_outline.active then -    vim.api.nvim_set_keymap("n", "<leader>o", ":SymbolsOutline<CR>", { noremap = true, silent = true }) -    mappings["o"] = "Symbols outline" -end - -if O.plugin.gitlinker.active then -  mappings["gy"] = "Gitlink" +  vim.api.nvim_set_keymap("n", "<leader>o", ":SymbolsOutline<CR>", { noremap = true, silent = true }) +  mappings["o"] = "Symbols outline"  end  if O.plugin.ts_playground.active then diff --git a/lua/plugins.lua b/lua/plugins.lua index 643d133d..f78a85fd 100644 --- a/lua/plugins.lua +++ b/lua/plugins.lua @@ -14,8 +14,6 @@ if not packer_ok then  end  packer.init { -  -- compile_path = vim.fn.stdpath('data')..'/site/pack/loader/start/packer.nvim/plugin/packer_compiled.vim', -  compile_path = require("packer.util").join_paths(vim.fn.stdpath "config", "plugin", "packer_compiled.vim"),    git = { clone_timeout = 300 },    display = {      open_fn = function() @@ -32,7 +30,7 @@ return require("packer").startup(function(use)    -- TODO refactor all of this (for now it works, but yes I know it could be wrapped in a simpler function)    use { "neovim/nvim-lspconfig" } -  use { "kabouzeid/nvim-lspinstall" } +  use { "kabouzeid/nvim-lspinstall", event = "BufRead" }    -- Telescope    use { "nvim-lua/popup.nvim" }    use { "nvim-lua/plenary.nvim" } @@ -40,17 +38,9 @@ return require("packer").startup(function(use)    use {      "nvim-telescope/telescope.nvim",      config = [[require('lv-telescope')]], -    cmd = "Telescope", +    event = "BufEnter",    } -  -- Snap TODO disable for now, need to only install fzy when user specifies they want to use snap -  -- use { -  -- "camspiers/snap", -  -- rocks = "fzy", -  -- config = function() -  --    require("lv-snap").config() -  -- end, -  -- disable = not O.plugin.snap.active -  -- } +    -- Autocomplete    use {      "hrsh7th/nvim-compe", @@ -67,7 +57,7 @@ return require("packer").startup(function(use)    use { "nvim-treesitter/nvim-treesitter", run = ":TSUpdate" }    -- Neoformat -  use { "sbdchd/neoformat", event = "BufEnter" } +  use { "sbdchd/neoformat" }    use {      "kyazdani42/nvim-tree.lua", @@ -93,7 +83,7 @@ return require("packer").startup(function(use)    use {      "windwp/nvim-autopairs",      event = "InsertEnter", -    after = { "telescope.nvim", "nvim-compe" }, +    after = { "telescope.nvim" },      config = function()        require "lv-autopairs"      end, @@ -127,34 +117,8 @@ return require("packer").startup(function(use)      -- event = "BufRead",    } -  -- use { -  --     "akinsho/nvim-bufferline.lua", -  --     config = function() require("lv-bufferline").config() end, -  --     event = "BufRead" -  -- } - -  -- Extras, these do not load by default +  -- Builtins, these do not load by default -  -- Better motions -  use { -    "phaazon/hop.nvim", -    event = "BufRead", -    config = function() -      require("lv-hop").config() -    end, -    disable = not O.plugin.hop.active, -    opt = true, -  } -  -- Enhanced increment/decrement -  use { -    "monaqa/dial.nvim", -    event = "BufRead", -    config = function() -      require("lv-dial").config() -    end, -    disable = not O.plugin.dial.active, -    opt = true, -  }    -- Dashboard    use {      "ChristianChiarulli/dashboard-nvim", @@ -176,25 +140,6 @@ return require("packer").startup(function(use)      end,      disable = not O.plugin.zen.active,    } -  -- Ranger -  use { -    "kevinhwang91/rnvimr", -    cmd = "Rnvimr", -    config = function() -      require("lv-rnvimr").config() -    end, -    disable = not O.plugin.ranger.active, -  } - -  -- matchup -  use { -    "andymass/vim-matchup", -    event = "CursorMoved", -    config = function() -      require("lv-matchup").config() -    end, -    disable = not O.plugin.matchup.active, -  }    use {      "norcalli/nvim-colorizer.lua", @@ -206,18 +151,6 @@ return require("packer").startup(function(use)      disable = not O.plugin.colorizer.active,    } -  use { -    "nacro90/numb.nvim", -    event = "BufRead", -    config = function() -      require("numb").setup { -        show_numbers = true, -- Enable 'number' for the window while peeking -        show_cursorline = true, -- Enable 'cursorline' for the window while peeking -      } -    end, -    disable = not O.plugin.numb.active, -  } -    -- Treesitter playground    use {      "nvim-treesitter/playground", @@ -264,6 +197,7 @@ return require("packer").startup(function(use)      cmd = "TroubleToggle",      disable = not O.plugin.trouble.active,    } +    -- Debugging    use {      "mfussenegger/nvim-dap", @@ -279,12 +213,7 @@ return require("packer").startup(function(use)      end,      disable = not O.plugin.debug.active,    } -  -- Better quickfix -  use { -    "kevinhwang91/nvim-bqf", -    event = "BufRead", -    disable = not O.plugin.bqf.active, -  } +    -- Floating terminal    use {      "numToStr/FTerm.nvim", @@ -297,39 +226,6 @@ return require("packer").startup(function(use)      end,      disable = not O.plugin.floatterm.active,    } -  -- Search & Replace -  use { -    "windwp/nvim-spectre", -    event = "BufRead", -    config = function() -      require("spectre").setup() -    end, -    disable = not O.plugin.spectre.active, -  } -  -- lsp root with this nvim-tree will follow you -  use { -    "ahmedkhalf/lsp-rooter.nvim", -    event = "BufRead", -    config = function() -      require("lsp-rooter").setup() -    end, -    disable = not O.plugin.lsp_rooter.active, -  } - -  -- Markdown preview -  use { -    "iamcco/markdown-preview.nvim", -    run = "cd app && npm install", -    ft = "markdown", -    disable = not O.plugin.markdown_preview.active, -  } - -  -- Interactive scratchpad -  use { -    "metakirby5/codi.vim", -    cmd = "Codi", -    disable = not O.plugin.codi.active, -  }    -- Use fzy for telescope    use { @@ -345,6 +241,7 @@ return require("packer").startup(function(use)      after = "telescope.nvim",      disable = not O.plugin.telescope_project.active,    } +    -- Sane gx for netrw_gx bug    use {      "felipec/vim-sanegx", @@ -352,49 +249,6 @@ return require("packer").startup(function(use)      disable = not O.plugin.sanegx.active,    } -  -- Sane gx for netrw_gx bug -  use { -    "folke/todo-comments.nvim", -    event = "BufRead", -    disable = not O.plugin.todo_comments.active, -  } - -  -- LSP Colors -  use { -    "folke/lsp-colors.nvim", -    event = "BufRead", -    disable = not O.plugin.lsp_colors.active, -  } - -  -- Git Blame -  use { -    "f-person/git-blame.nvim", -    event = "BufRead", -    disable = not O.plugin.git_blame.active, -  } - -  use { -    "ruifm/gitlinker.nvim", -    event = "BufRead", -    config = function() -      require("gitlinker").setup { -        opts = { -          -- remote = 'github', -- force the use of a specific remote -          -- adds current line nr in the url for normal mode -          add_current_line_on_normal_mode = true, -          -- callback for what to do with the url -          action_callback = require("gitlinker.actions").open_in_browser, -          -- print the url after performing the action -          print_url = false, -          -- mapping to call url generation -          mappings = "<leader>gy", -        }, -      } -    end, -    disable = not O.plugin.gitlinker.active, -    requires = "nvim-lua/plenary.nvim", -  } -    -- Lazygit    use {      "kdheepak/lazygit.nvim", @@ -402,13 +256,6 @@ return require("packer").startup(function(use)      disable = not O.plugin.lazygit.active,    } -  -- Octo -  use { -    "pwntester/octo.nvim", -    event = "BufRead", -    disable = not O.plugin.octo.active, -  } -    -- Diffview    use {      "sindrets/diffview.nvim", @@ -416,14 +263,6 @@ return require("packer").startup(function(use)      disable = not O.plugin.diffview.active,    } -  -- Easily Create Gists -  use { -    "mattn/vim-gist", -    event = "BufRead", -    disable = not O.plugin.gist.active, -    requires = "mattn/webapi-vim", -  } -    -- Lush Create Color Schemes    use {      "rktjmp/lush.nvim", @@ -431,13 +270,6 @@ return require("packer").startup(function(use)      disable = not O.plugin.lush.active,    } -  -- HTML preview -  use { -    "turbio/bracey.vim", -    event = "BufRead", -    run = "npm install --prefix server", -    disable = not O.plugin.bracey.active, -  }    -- Debugger management    use {      "Pocco81/DAPInstall.nvim", @@ -491,14 +323,6 @@ return require("packer").startup(function(use)    --   end,    -- } -  -- Tabnine -  use { -    "tzachar/compe-tabnine", -    run = "./install.sh", -    requires = "hrsh7th/nvim-compe", -    disable = not O.plugin.tabnine.active, -  } -    -- Pretty parentheses    use {      "p00f/nvim-ts-rainbow", diff --git a/utils/installer/lv-config.example.lua b/utils/installer/lv-config.example.lua index 917aa1e0..f0aceb55 100644 --- a/utils/installer/lv-config.example.lua +++ b/utils/installer/lv-config.example.lua @@ -22,15 +22,10 @@ O.transparent_window = false  -- TODO User Config for predefined plugins  -- After changing plugin config exit and reopen LunarVim, Run :PackerInstall :PackerCompile -O.plugin.hop.active = false -O.plugin.dial.active = false  O.plugin.dashboard.active = true -O.plugin.matchup.active = false  O.plugin.colorizer.active = false -O.plugin.numb.active = false  O.plugin.ts_playground.active = false  O.plugin.indent_line.active = false -O.plugin.gitlinker.active = false  O.plugin.zen.active = false  -- dashboard | 
