From 97d7adfb2f710345bf5d6a0cac4d76900f11fd38 Mon Sep 17 00:00:00 2001
From: Sv7n
Date: Mon, 5 Jul 2021 12:43:59 +0100
Subject: lv-vimtex exists but wasn't called, no config was called.
---
init.lua | 1 +
1 file changed, 1 insertion(+)
diff --git a/init.lua b/init.lua
index 8e44e868..dd2bee0d 100644
--- a/init.lua
+++ b/init.lua
@@ -4,6 +4,7 @@ vim.cmd("luafile " .. CONFIG_PATH .. "/lv-config.lua")
require "settings"
require "plugins"
require "lv-utils"
+require "lv-vimtex"
require "lv-galaxyline"
require "lv-treesitter"
require "lv-which-key"
--
cgit v1.2.3
From 113f73100d4bd4a271df81459dfa8a3d88cc257c Mon Sep 17 00:00:00 2001
From: Sv7n
Date: Mon, 5 Jul 2021 23:39:01 +0100
Subject: Cleaner way to load vimtex config thanks to rebuilt.
---
init.lua | 1 -
lua/plugins.lua | 3 +--
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/init.lua b/init.lua
index 3eb76e76..2b5a9515 100644
--- a/init.lua
+++ b/init.lua
@@ -4,7 +4,6 @@ vim.cmd("luafile " .. CONFIG_PATH .. "/lv-config.lua")
require "settings"
require "plugins"
require "lv-utils"
-require "lv-vimtex"
require "lv-galaxyline"
require "lv-treesitter"
require "lv-which-key"
diff --git a/lua/plugins.lua b/lua/plugins.lua
index 2b215291..aadca5d6 100644
--- a/lua/plugins.lua
+++ b/lua/plugins.lua
@@ -432,8 +432,7 @@ return require("packer").startup(function(use)
}
-- LANGUAGE SPECIFIC GOES HERE
-
- use { "lervag/vimtex", ft = "tex" }
+ use { "lervag/vimtex", ft = "tex", config = function() require("lv-vimtex") end }
-- Rust tools
-- TODO: use lazy loading maybe?
--
cgit v1.2.3
From ca75cb5a49a93ceae1d30a3b979dbed58e4169e1 Mon Sep 17 00:00:00 2001
From: Pasi Bergman
Date: Tue, 6 Jul 2021 02:39:08 +0300
Subject: Fix vue lsp root_dir configuration (#716)
---
ftplugin/vue.lua | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/ftplugin/vue.lua b/ftplugin/vue.lua
index 6787d12f..ff44d761 100644
--- a/ftplugin/vue.lua
+++ b/ftplugin/vue.lua
@@ -1,5 +1,6 @@
+-- Vue language server configuration (vetur)
require("lspconfig").vuels.setup {
cmd = { DATA_PATH .. "/lspinstall/vue/node_modules/.bin/vls", "--stdio" },
on_attach = require("lsp").common_on_attach,
- root_dir = require("lspconfig").util.root_pattern(".git", "."),
+ root_dir = require("lspconfig").util.root_pattern(".git", "vue.config.js", "package.json", "yarn.lock"),
}
--
cgit v1.2.3
From f7aeeba663666b75ab0063f786d21648c0c71766 Mon Sep 17 00:00:00 2001
From: Pasi Bergman
Date: Tue, 6 Jul 2021 02:39:40 +0300
Subject: Add csharp ls setup for cs filetype (#712)
---
ftplugin/cs.lua | 6 ++++++
1 file changed, 6 insertions(+)
create mode 100644 ftplugin/cs.lua
diff --git a/ftplugin/cs.lua b/ftplugin/cs.lua
new file mode 100644
index 00000000..7fdbbc66
--- /dev/null
+++ b/ftplugin/cs.lua
@@ -0,0 +1,6 @@
+-- C# language server (csharp/OmniSharp) setup
+require("lspconfig").omnisharp.setup{
+ on_attach = require("lsp").common_on_attach,
+ root_dir = require("lspconfig").util.root_pattern(".sln",".git"),
+ cmd = { DATA_PATH .. "/lspinstall/csharp/omnisharp/run", "--languageserver", "--hostPID", tostring(vim.fn.getpid()) },
+}
--
cgit v1.2.3
From 6258b2b4bab1964f36279e16afc093306b35d006 Mon Sep 17 00:00:00 2001
From: Anshuman Medhi
Date: Tue, 6 Jul 2021 07:48:58 +0800
Subject: Add Treesitter extensions for better textobjects (#700)
This adds three plugins that use treesitters parsing to provide smarter text objects
[ts_textobjects](https://github.com/nvim-treesitter/nvim-treesitter-textobjects) lets you define text objects for things like functions and classes
[ts_textsubjects](https://github.com/RRethy/nvim-treesitter-textsubjects.git) defines a smart text object that selects a semantic block around the cursor
[ts_hintobjects](https://github.com/mfussenegger/nvim-ts-hint-textobject) uses easymotion style hint labeling to show all the surrounding semantic blocks, letting you choose the correct one
I have also added which-key entries for all the above
Co-authored-by: Christian Chiarulli
---
lua/default-config.lua | 29 +++++++++--
lua/lv-treesitter/init.lua | 117 ++++++++++++++++++++++++++++++++++++++++++---
lua/plugins.lua | 18 +++++++
3 files changed, 154 insertions(+), 10 deletions(-)
diff --git a/lua/default-config.lua b/lua/default-config.lua
index e05fc9e3..bd996acd 100644
--- a/lua/default-config.lua
+++ b/lua/default-config.lua
@@ -30,6 +30,29 @@ O = {
ignore_install = { "haskell" },
highlight = { enabled = true },
rainbow = { enabled = false },
+ -- The below are for treesitter-textobjects plugin
+ textobj_prefixes = {
+ goto_next = "]", -- Go to next
+ goto_previous = "[", -- Go to previous
+ inner = "i", -- Select inside
+ outer = "a", -- Selct around
+ swap = "a", -- Swap with next
+ },
+ textobj_suffixes = {
+ -- Start and End respectively for the goto keys
+ -- for other keys it only uses the first
+ ["function"] = { "f", "F" },
+ ["class"] = { "m", "M" },
+ ["parameter"] = { "a", "A" },
+ ["block"] = { "k", "K" },
+ ["conditional"] = { "i", "I" },
+ ["call"] = { "c", "C" },
+ ["loop"] = { "l", "L" },
+ ["statement"] = { "s", "S" },
+ ["comment"] = { "/", "?" },
+ },
+ -- The below is for treesitter hint textobjects plugin
+ hint_labels = { "h", "j", "f", "d", "n", "v", "s", "l", "a" },
},
lsp = {
@@ -46,6 +69,9 @@ O = {
zen = { active = false },
ts_playground = { active = false },
ts_context_commentstring = { active = false },
+ ts_hintobjects = { active = false },
+ ts_textobjects = { active = false },
+ ts_textsubjects = { active = false },
telescope_fzy = { active = false },
telescope_project = { active = false },
indent_line = { active = false },
@@ -81,9 +107,6 @@ O = {
sanegx = { active = false },
snap = { active = false },
tabnine = { active = false },
-
-
-
},
custom_plugins = {
diff --git a/lua/lv-treesitter/init.lua b/lua/lv-treesitter/init.lua
index ea7ff56f..2fdd7f14 100644
--- a/lua/lv-treesitter/init.lua
+++ b/lua/lv-treesitter/init.lua
@@ -1,6 +1,85 @@
--- if not package.loaded['nvim-treesitter'] then
--- return
--- end
+-- if not package.loaded['nvim-treesitter'] then return end
+--
+-- Custom parsers
+local parser_config = require("nvim-treesitter.parsers").get_parser_configs()
+-- parser_config.make = {
+-- install_info = {
+-- url = "https://github.com/alemuller/tree-sitter-make", -- local path or git repo
+-- files = {"src/parser.c"},
+-- requires_generate_from_grammar = true
+-- }
+-- }
+-- parser_config.just = {
+-- install_info = {
+-- url = "~/dev/tree-sitter-just", -- local path or git repo
+-- files = {"src/parser.c"}
+-- }
+-- -- filetype = "just", -- if filetype does not agrees with parser name
+-- -- used_by = {"bar", "baz"} -- additional filetypes that use this parser
+-- }
+
+-- Custom text objects
+local textobj_prefixes = O.treesitter.textobj_prefixes
+local textobj_suffixes = O.treesitter.textobj_suffixes
+local textobj_sel_keymaps = {}
+local textobj_swap_keymaps = {}
+local textobj_move_keymaps = {
+ enable = O.plugin.ts_textobjects,
+ set_jumps = true, -- whether to set jumps in the jumplist
+ goto_next_start = {},
+ goto_next_end = {},
+ goto_previous_start = {},
+ goto_previous_end = {},
+}
+for obj, suffix in pairs(textobj_suffixes) do
+ if textobj_prefixes["goto_next"] ~= nil then
+ textobj_move_keymaps["goto_next_start"][textobj_prefixes["goto_next"] .. suffix[1]] = "@" .. obj .. ".outer"
+ textobj_move_keymaps["goto_next_end"][textobj_prefixes["goto_next"] .. suffix[2]] = "@" .. obj .. ".outer"
+ end
+ if textobj_prefixes["goto_prev"] ~= nil then
+ textobj_move_keymaps["goto_previous_start"][textobj_prefixes["goto_previous"] .. suffix[2]] = "@" .. obj .. ".outer"
+ textobj_move_keymaps["goto_previous_end"][textobj_prefixes["goto_previous"] .. suffix[1]] = "@" .. obj .. ".outer"
+ end
+
+ if textobj_prefixes["inner"] ~= nil then
+ textobj_sel_keymaps[textobj_prefixes["inner"] .. suffix[1]] = "@" .. obj .. ".inner"
+ end
+ if textobj_prefixes["outer"] ~= nil then
+ textobj_sel_keymaps[textobj_prefixes["outer"] .. suffix[1]] = "@" .. obj .. ".outer"
+ end
+
+ if textobj_prefixes["swap"] ~= nil then
+ textobj_swap_keymaps[textobj_prefixes["swap"] .. suffix[1]] = "@" .. obj .. ".outer"
+ end
+end
+vim.g.ts_hint_textobject_keys = O.treesitter.hint_labels -- Requires https://github.com/mfussenegger/nvim-ts-hint-textobject/pull/2
+
+-- Add which key menu entries
+local status, wk = pcall(require, "which-key")
+if status then
+ local normal = {
+ mode = "n", -- Normal mode
+ }
+ local operators = {
+ mode = "o", -- Operator mode
+ }
+ wk.register(textobj_sel_keymaps, operators)
+ wk.register({
+ ["m"] = "Hint Objects",
+ ["."] = "Textsubject",
+ [";"] = "Textsubject-big",
+ }, operators)
+ wk.register(textobj_swap_keymaps, normal)
+ wk.register({
+ [textobj_prefixes["swap"]] = "Swap",
+ -- [textobj_prefixes["goto_next"]] = "Jump [",
+ -- [textobj_prefixes["goto_previous"]] = "Jump ]"
+ }, normal)
+ wk.register(textobj_move_keymaps["goto_next_start"], normal)
+ wk.register(textobj_move_keymaps["goto_next_end"], normal)
+ wk.register(textobj_move_keymaps["goto_previous_start"], normal)
+ wk.register(textobj_move_keymaps["goto_previous_end"], normal)
+end
require("nvim-treesitter.configs").setup {
ensure_installed = O.treesitter.ensure_installed, -- one of "all", "maintained" (parsers with maintainers), or a list of languages
@@ -10,14 +89,33 @@ require("nvim-treesitter.configs").setup {
-- disable = { "c", "ruby" }, -- optional, list of language that will be disabled
},
highlight = {
- enable = O.treesitter.highlight.enabled, -- false will disable the whole extension
+ enable = O.treesitter.enabled, -- false will disable the whole extension
+ additional_vim_regex_highlighting = true,
+ disable = { "latex" },
+ },
+ context_commentstring = {
+ enable = O.plugin.ts_context_commentstring.active,
+ config = { css = "// %s" },
},
- context_commentstring = { enable = O.plugin.ts_context_commentstring, config = { css = "// %s" } },
-- indent = {enable = true, disable = {"python", "html", "javascript"}},
-- TODO seems to be broken
indent = { enable = { "javascriptreact" } },
- autotag = { enable = true },
-
+ autotag = { enable = O.plugin.ts_autotag.active },
+ textobjects = {
+ swap = {
+ enable = O.plugin.ts_textobjects,
+ swap_next = textobj_swap_keymaps,
+ },
+ move = textobj_move_keymaps,
+ select = {
+ enable = O.plugin.ts_textobjects,
+ keymaps = textobj_sel_keymaps,
+ },
+ },
+ textsubjects = {
+ enable = O.plugin.ts_textsubjects,
+ keymaps = { ["."] = "textsubjects-smart", [";"] = "textsubjects-big" },
+ },
playground = {
enable = O.plugin.ts_playground.active,
disable = {},
@@ -36,4 +134,9 @@ require("nvim-treesitter.configs").setup {
show_help = "?",
},
},
+ rainbow = {
+ enable = O.plugin.ts_rainbow.active,
+ extended_mode = true, -- Highlight also non-parentheses delimiters, boolean or table: lang -> boolean
+ max_file_lines = 1000, -- Do not enable for files with more than 1000 lines, int
+ },
}
diff --git a/lua/plugins.lua b/lua/plugins.lua
index aadca5d6..86c2c628 100644
--- a/lua/plugins.lua
+++ b/lua/plugins.lua
@@ -478,6 +478,24 @@ return require("packer").startup(function(use)
requires = "hrsh7th/nvim-compe",
disable = not O.plugin.tabnine.active,
}
+
+ -- Custom semantic text objects
+ use {
+ "nvim-treesitter/nvim-treesitter-textobjects",
+ disable = not O.plugin.ts_textobjects.active,
+ }
+ -- Smart text objects
+ use {
+ "RRethy/nvim-treesitter-textsubjects",
+ disable = not O.plugin.ts_textsubjects.active,
+ }
+ -- Text objects using hint labels
+ use {
+ "mfussenegger/nvim-ts-hint-textobject",
+ event = "BufRead",
+ disable = not O.plugin.ts_hintobjects.active,
+ }
+
for _, plugin in pairs(O.custom_plugins) do
packer.use(plugin)
end
--
cgit v1.2.3
From 0b7e8e1b073b7b362f0ea08f989724dd7d312fcc Mon Sep 17 00:00:00 2001
From: Chris
Date: Mon, 5 Jul 2021 19:56:08 -0400
Subject: fix ts bugs
---
lua/lv-treesitter/init.lua | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/lua/lv-treesitter/init.lua b/lua/lv-treesitter/init.lua
index 2fdd7f14..3876fb7a 100644
--- a/lua/lv-treesitter/init.lua
+++ b/lua/lv-treesitter/init.lua
@@ -100,7 +100,7 @@ require("nvim-treesitter.configs").setup {
-- indent = {enable = true, disable = {"python", "html", "javascript"}},
-- TODO seems to be broken
indent = { enable = { "javascriptreact" } },
- autotag = { enable = O.plugin.ts_autotag.active },
+ -- autotag = { enable = O.plugin.ts_autotag.active },
textobjects = {
swap = {
enable = O.plugin.ts_textobjects,
@@ -134,9 +134,9 @@ require("nvim-treesitter.configs").setup {
show_help = "?",
},
},
- rainbow = {
- enable = O.plugin.ts_rainbow.active,
- extended_mode = true, -- Highlight also non-parentheses delimiters, boolean or table: lang -> boolean
- max_file_lines = 1000, -- Do not enable for files with more than 1000 lines, int
- },
+ -- rainbow = {
+ -- enable = O.plugin.ts_rainbow.active,
+ -- extended_mode = true, -- Highlight also non-parentheses delimiters, boolean or table: lang -> boolean
+ -- max_file_lines = 1000, -- Do not enable for files with more than 1000 lines, int
+ -- },
}
--
cgit v1.2.3
From 2e4314331b442dc4686546d9721b0db4769158e0 Mon Sep 17 00:00:00 2001
From: Chris
Date: Mon, 5 Jul 2021 20:15:53 -0400
Subject: another ts typo
---
lua/lv-treesitter/init.lua | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/lua/lv-treesitter/init.lua b/lua/lv-treesitter/init.lua
index 3876fb7a..0cd3bf6f 100644
--- a/lua/lv-treesitter/init.lua
+++ b/lua/lv-treesitter/init.lua
@@ -1,7 +1,7 @@
-- if not package.loaded['nvim-treesitter'] then return end
--
-- Custom parsers
-local parser_config = require("nvim-treesitter.parsers").get_parser_configs()
+-- local parser_config = require("nvim-treesitter.parsers").get_parser_configs()
-- parser_config.make = {
-- install_info = {
-- url = "https://github.com/alemuller/tree-sitter-make", -- local path or git repo
@@ -17,7 +17,6 @@ local parser_config = require("nvim-treesitter.parsers").get_parser_configs()
-- -- filetype = "just", -- if filetype does not agrees with parser name
-- -- used_by = {"bar", "baz"} -- additional filetypes that use this parser
-- }
-
-- Custom text objects
local textobj_prefixes = O.treesitter.textobj_prefixes
local textobj_suffixes = O.treesitter.textobj_suffixes
@@ -89,7 +88,7 @@ require("nvim-treesitter.configs").setup {
-- disable = { "c", "ruby" }, -- optional, list of language that will be disabled
},
highlight = {
- enable = O.treesitter.enabled, -- false will disable the whole extension
+ enable = O.treesitter.highlight.enabled, -- false will disable the whole extension
additional_vim_regex_highlighting = true,
disable = { "latex" },
},
--
cgit v1.2.3
From 326f1e7060a06a543fbe7971550650d7606776a4 Mon Sep 17 00:00:00 2001
From: christianchiarulli
Date: Mon, 5 Jul 2021 21:03:46 -0400
Subject: more treesitter
---
lua/default-config.lua | 4 +++-
lua/lv-treesitter/init.lua | 13 +++++++------
lua/plugins.lua | 37 ++++++++++++++++++++++++++++++++++++-
3 files changed, 46 insertions(+), 8 deletions(-)
diff --git a/lua/default-config.lua b/lua/default-config.lua
index bd996acd..97f0c58a 100644
--- a/lua/default-config.lua
+++ b/lua/default-config.lua
@@ -70,6 +70,8 @@ O = {
ts_playground = { active = false },
ts_context_commentstring = { active = false },
ts_hintobjects = { active = false },
+ ts_autotag = { active = false },
+ ts_rainbow = { active = false },
ts_textobjects = { active = false },
ts_textsubjects = { active = false },
telescope_fzy = { active = false },
@@ -263,4 +265,4 @@ O = {
},
footer = { "chrisatmachine.com" },
},
-}
\ No newline at end of file
+}
diff --git a/lua/lv-treesitter/init.lua b/lua/lv-treesitter/init.lua
index 0cd3bf6f..27877f03 100644
--- a/lua/lv-treesitter/init.lua
+++ b/lua/lv-treesitter/init.lua
@@ -1,3 +1,4 @@
+-- TODO refacor this whole file and treesitter in general
-- if not package.loaded['nvim-treesitter'] then return end
--
-- Custom parsers
@@ -99,7 +100,7 @@ require("nvim-treesitter.configs").setup {
-- indent = {enable = true, disable = {"python", "html", "javascript"}},
-- TODO seems to be broken
indent = { enable = { "javascriptreact" } },
- -- autotag = { enable = O.plugin.ts_autotag.active },
+ autotag = { enable = O.plugin.ts_autotag.active },
textobjects = {
swap = {
enable = O.plugin.ts_textobjects,
@@ -133,9 +134,9 @@ require("nvim-treesitter.configs").setup {
show_help = "?",
},
},
- -- rainbow = {
- -- enable = O.plugin.ts_rainbow.active,
- -- extended_mode = true, -- Highlight also non-parentheses delimiters, boolean or table: lang -> boolean
- -- max_file_lines = 1000, -- Do not enable for files with more than 1000 lines, int
- -- },
+ rainbow = {
+ enable = O.plugin.ts_rainbow.active,
+ extended_mode = true, -- Highlight also non-parentheses delimiters, boolean or table: lang -> boolean
+ max_file_lines = 1000, -- Do not enable for files with more than 1000 lines, int
+ },
}
diff --git a/lua/plugins.lua b/lua/plugins.lua
index 86c2c628..643d133d 100644
--- a/lua/plugins.lua
+++ b/lua/plugins.lua
@@ -315,6 +315,7 @@ return require("packer").startup(function(use)
end,
disable = not O.plugin.lsp_rooter.active,
}
+
-- Markdown preview
use {
"iamcco/markdown-preview.nvim",
@@ -322,18 +323,21 @@ return require("packer").startup(function(use)
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 {
"nvim-telescope/telescope-fzy-native.nvim",
event = "BufRead",
disable = not O.plugin.telescope_fzy.active,
}
+
-- Use project for telescope
use {
"nvim-telescope/telescope-project.nvim",
@@ -347,24 +351,28 @@ return require("packer").startup(function(use)
event = "BufRead",
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",
@@ -386,24 +394,28 @@ return require("packer").startup(function(use)
disable = not O.plugin.gitlinker.active,
requires = "nvim-lua/plenary.nvim",
}
+
-- Lazygit
use {
"kdheepak/lazygit.nvim",
cmd = "LazyGit",
disable = not O.plugin.lazygit.active,
}
+
-- Octo
use {
"pwntester/octo.nvim",
event = "BufRead",
disable = not O.plugin.octo.active,
}
+
-- Diffview
use {
"sindrets/diffview.nvim",
event = "BufRead",
disable = not O.plugin.diffview.active,
}
+
-- Easily Create Gists
use {
"mattn/vim-gist",
@@ -411,12 +423,14 @@ return require("packer").startup(function(use)
disable = not O.plugin.gist.active,
requires = "mattn/webapi-vim",
}
+
-- Lush Create Color Schemes
use {
"rktjmp/lush.nvim",
-- cmd = {"LushRunQuickstart", "LushRunTutorial", "Lushify"},
disable = not O.plugin.lush.active,
}
+
-- HTML preview
use {
"turbio/bracey.vim",
@@ -432,7 +446,13 @@ return require("packer").startup(function(use)
}
-- LANGUAGE SPECIFIC GOES HERE
- use { "lervag/vimtex", ft = "tex", config = function() require("lv-vimtex") end }
+ use {
+ "lervag/vimtex",
+ ft = "tex",
+ config = function()
+ require "lv-vimtex"
+ end,
+ }
-- Rust tools
-- TODO: use lazy loading maybe?
@@ -479,16 +499,31 @@ return require("packer").startup(function(use)
disable = not O.plugin.tabnine.active,
}
+ -- Pretty parentheses
+ use {
+ "p00f/nvim-ts-rainbow",
+ disable = not O.plugin.ts_rainbow.active,
+ }
+
+ -- Autotags |
+ use {
+ "windwp/nvim-ts-autotag",
+ event = "InsertEnter",
+ disable = not O.plugin.ts_autotag.active,
+ }
+
-- Custom semantic text objects
use {
"nvim-treesitter/nvim-treesitter-textobjects",
disable = not O.plugin.ts_textobjects.active,
}
+
-- Smart text objects
use {
"RRethy/nvim-treesitter-textsubjects",
disable = not O.plugin.ts_textsubjects.active,
}
+
-- Text objects using hint labels
use {
"mfussenegger/nvim-ts-hint-textobject",
--
cgit v1.2.3
From 4b0451892279e30bf39a6ad2307d7ba7c3b1a30f Mon Sep 17 00:00:00 2001
From: Chris
Date: Mon, 5 Jul 2021 22:57:00 -0400
Subject: fix logo
---
lua/default-config.lua | 39 ++++++++++++++++++++-------------------
1 file changed, 20 insertions(+), 19 deletions(-)
diff --git a/lua/default-config.lua b/lua/default-config.lua
index bd996acd..fa95b551 100644
--- a/lua/default-config.lua
+++ b/lua/default-config.lua
@@ -70,6 +70,7 @@ O = {
ts_playground = { active = false },
ts_context_commentstring = { active = false },
ts_hintobjects = { active = false },
+ ts_autotag = { active = false },
ts_textobjects = { active = false },
ts_textsubjects = { active = false },
telescope_fzy = { active = false },
@@ -242,25 +243,25 @@ O = {
dashboard = {
custom_header = {
- "⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢀⣀⣀⣀⣀⣀⣀⣀⡀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀",
- "⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⣠⣤⣶⣾⠿⠿⠟⠛⠛⠛⠛⠿⠿⣿⣷⣤⣄⡀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀",
- "⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢀⣠⣾⡿⠋⠉⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠈⠙⠿⣷⣤⡀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀",
- "⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⣤⡿⠛⠉⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠉⠛⢿⣦⡀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀",
- "⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⡠⠒⠂⠉⠉⠉⠉⢩⣿⡿⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠹⣷⡄⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀",
- "⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠸⡀⠀⠀⠀⠀⠀⢰⣿⠋⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠙⣿⣧⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀",
- "⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠑⠠⡀⠀⠀⢀⣾⠋⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠘⣿⡆⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀",
- "⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠈⠢⢀⣸⡟⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢹⣇⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀",
- "⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⣿⡧⢄⡀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢸⣿⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀",
- "⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⣿⡇⠀⠈⠁⠒⠤⣀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢸⣿⣀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀",
- "⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢸⣇⠀⠀⠀⠀⠀⠀⠉⠢⠤⠀⢀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⣸⡟⠈⠑⠄⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀",
- "⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢿⡄⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠉⠑⠒⠤⣀⡀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢠⣿⡇⠀⠀⢀⣣⡀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀",
- "⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⣿⡟⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠸⣷⡄⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠉⠀⠀⠒⠢⠤⠄⣀⣀⠀⠀⠀⢠⣿⡟⠀⠀⠀⣺⣿⡿⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀",
- "⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⣿⠇⠀⠀⠀⠀⠀⣤⡄⠀⠀⢠⣤⡄⠀⢨⣭⣠⣤⣤⣤⡀⠀⠀⢀⣤⣤⣤⣤⡄⠀⠀⠀⣤⣄⣤⣤⣤⠀⠀⣿⣯⠉⠉⣿⡟⠀⠈⢩⣭⣤⣤⠀⠀⠀⠀⣠⣤⣤⣤⣄⣤⣤⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀",
- "⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢠⣿⠀⠀⠀⠀⠀⠀⣿⠃⠀⠀⣸⣿⠁⠀⣿⣿⠉⠀⠈⣿⡇⠀⠀⠛⠋⠀⠀⢹⣿⠀⠀⠀⣿⠏⠀⠸⠿⠃⠀⣿⣿⠀⣰⡟⠀⠀⠀⠀⠀⢸⣿⠀⠀⠀⠀⣿⡟⢸⣿⡇⢀⣿⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀",
- "⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⣸⡇⠀⠀⠀⠀⠀⢸⣿⠀⠀⠀⣿⡟⠀⢠⣿⡇⠀⠀⢰⣿⡇⠀⣰⣾⠟⠛⠛⣻⡇⠀⠀⢸⡿⠀⠀⠀⠀⠀⠀⢻⣿⢰⣿⠀⠀⠀⠀⠀⠀⣾⡇⠀⠀⠀⢸⣿⠇⢸⣿⠀⢸⡏⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀",
- "⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⣿⣧⣤⣤⣤⡄⠀⠘⣿⣤⣤⡤⣿⠇⠀⢸⣿⠁⠀⠀⣼⣿⠀⠀⢿⣿⣤⣤⠔⣿⠃⠀⠀⣾⡇⠀⠀⠀⠀⠀⠀⢸⣿⣿⠋⠀⠀⠀⢠⣤⣤⣿⣥⣤⡄⠀⣼⣿⠀⣸⡏⠀⣿⠃⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀",
- "⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠈⠉⠉⠉⠉⠉⠁⠀⠀⠈⠉⠉⠀⠉⠀⠀⠈⠉⠀⠀⠀⠉⠉⠀⠀⠀⠉⠉⠁⠈⠉⠀⠀⠀⠉⠀⠀⠀⠀⠀⠀⠀⠈⠉⠉⠀⠀⠀⠀⠈⠉⠉⠉⠉⠉⠁⠀⠉⠁⠀⠉⠁⠀⠉⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀",
+ "⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢀⣀⣀⣀⣀⣀⣀⣀⡀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀",
+ "⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⣠⣤⣶⣾⠿⠿⠟⠛⠛⠛⠛⠿⠿⣿⣷⣤⣄⡀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀",
+ " ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢀⣠⣾⡿⠋⠉⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠈⠙⠿⣷⣤⡀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀",
+ "⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⣤⡿⠛⠉⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠉⠛⢿⣦⡀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀",
+ "⠀⠀⠀⠀⠀⠀⠀⠀⠀⡠⠒⠂⠉⠉⠉⠉⢩⣿⡿⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠹⣷⡄⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀",
+ "⠀⠀⠀⠀⠀⠀⠀⠀⠸⡀⠀⠀⠀⠀⠀⢰⣿⠋⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠙⣿⣧⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀",
+ "⠀⠀⠀⠀⠀⠀⠀⠀⠀⠑⠠⡀⠀⠀⢀⣾⠋⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠘⣿⡆⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀",
+ "⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠈⠢⢀⣸⡟⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢹⣇⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀",
+ "⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⣿⡧⢄⡀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢸⣿⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀",
+ "⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⣿⡇⠀⠈⠁⠒⠤⣀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢸⣿⣀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀",
+ "⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢸⣇⠀⠀⠀⠀⠀⠀⠉⠢⠤⠀⢀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⣸⡟⠈⠑⠄⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀",
+ "⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢿⡄⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠉⠑⠒⠤⣀⡀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢠⣿⡇⠀⠀⢀⣣⡀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀",
+ "⠀⣿⡟⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠸⣷⡄⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠉⠀⠀⠒⠢⠤⠄⣀⣀⠀⠀⠀⢠⣿⡟⠀⠀⠀⣺⣿⡿⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀",
+ "⠀⣿⠇⠀⠀⠀⠀⠀⣤⡄⠀⠀⢠⣤⡄⠀⢨⣭⣠⣤⣤⣤⡀⠀⠀⢀⣤⣤⣤⣤⡄⠀⠀⠀⣤⣄⣤⣤⣤⠀⠀⣿⣯⠉⠉⣿⡟⠀⠈⢩⣭⣤⣤⠀⠀⠀⠀⣠⣤⣤⣤⣄⣤⣤",
+ "⢠⣿⠀⠀⠀⠀⠀⠀⣿⠃⠀⠀⣸⣿⠁⠀⣿⣿⠉⠀⠈⣿⡇⠀⠀⠛⠋⠀⠀⢹⣿⠀⠀⠀⣿⠏⠀⠸⠿⠃⠀⣿⣿⠀⣰⡟⠀⠀⠀⠀⠀⢸⣿⠀⠀⠀⠀⣿⡟⢸⣿⡇⢀⣿",
+ "⣸⡇⠀⠀⠀⠀⠀⢸⣿⠀⠀⠀⣿⡟⠀⢠⣿⡇⠀⠀⢰⣿⡇⠀⣰⣾⠟⠛⠛⣻⡇⠀⠀⢸⡿⠀⠀⠀⠀⠀⠀⢻⣿⢰⣿⠀⠀⠀⠀⠀⠀⣾⡇⠀⠀⠀⢸⣿⠇⢸⣿⠀⢸⡏",
+ "⣿⣧⣤⣤⣤⡄⠀⠘⣿⣤⣤⡤⣿⠇⠀⢸⣿⠁⠀⠀⣼⣿⠀⠀⢿⣿⣤⣤⠔⣿⠃⠀⠀⣾⡇⠀⠀⠀⠀⠀⠀⢸⣿⣿⠋⠀⠀⠀⢠⣤⣤⣿⣥⣤⡄⠀⣼⣿⠀⣸⡏⠀⣿⠃",
+ "⠉⠉⠉⠉⠉⠁⠀⠀⠈⠉⠉⠀⠉⠀⠀⠈⠉⠀⠀⠀⠉⠉⠀⠀⠀⠉⠉⠁⠈⠉⠀⠀⠀⠉⠀⠀⠀⠀⠀⠀⠀⠈⠉⠉⠀⠀⠀⠀⠈⠉⠉⠉⠉⠉⠁⠀⠉⠁⠀⠉⠁⠀⠉⠀",
},
footer = { "chrisatmachine.com" },
},
-}
\ No newline at end of file
+}
--
cgit v1.2.3
From e2c336ff9f5544192ce94133d7312fbc1b6e6e08 Mon Sep 17 00:00:00 2001
From: Chris
Date: Mon, 5 Jul 2021 23:00:56 -0400
Subject: fix rainbow
---
lua/default-config.lua | 1 +
1 file changed, 1 insertion(+)
diff --git a/lua/default-config.lua b/lua/default-config.lua
index fa95b551..3c6efce9 100644
--- a/lua/default-config.lua
+++ b/lua/default-config.lua
@@ -71,6 +71,7 @@ O = {
ts_context_commentstring = { active = false },
ts_hintobjects = { active = false },
ts_autotag = { active = false },
+ ts_rainbow = { active = false },
ts_textobjects = { active = false },
ts_textsubjects = { active = false },
telescope_fzy = { active = false },
--
cgit v1.2.3
From 1e8c7921702c48cd662cd293d710dd2b6dce77f4 Mon Sep 17 00:00:00 2001
From: Luc Sinet
Date: Tue, 6 Jul 2021 05:28:23 +0200
Subject: Define a form for Feature request issues (#641)
---
.github/ISSUE_TEMPLATE/feature-form.yaml | 34 ++++++++++++++++++++++++++++++++
1 file changed, 34 insertions(+)
create mode 100644 .github/ISSUE_TEMPLATE/feature-form.yaml
diff --git a/.github/ISSUE_TEMPLATE/feature-form.yaml b/.github/ISSUE_TEMPLATE/feature-form.yaml
new file mode 100644
index 00000000..cfd0793b
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature-form.yaml
@@ -0,0 +1,34 @@
+name: Feature Request
+description: Suggest an idea for improving this project
+title: "[Feature]: "
+labels: [enhancement]
+# assignees:
+# - ChristianChiarulli
+body:
+ - type: markdown
+ attributes:
+ value: |
+ Thank you for helping us improve !
+ - type: textarea
+ id: motivation
+ attributes:
+ label: Feature motivation
+ description: A clear and concise description of the problem or missing capability
+ placeholder: |
+ I am always frustrated when ...
+ validations:
+ required: true
+ - type: textarea
+ id: solution
+ attributes:
+ label: Describe the expected solution
+ - type: textarea
+ id: alternatives
+ attributes:
+ label: Describe the alternatives you've considered
+ description: Let us know about other solutions you've tried or researched
+ - type: textarea
+ id: additional-context
+ attributes:
+ label: Additional context
+ description: If applicable, add screenshots or link related issues
--
cgit v1.2.3
From b6caebf60f535af7141d2ef1cbeab560b8797078 Mon Sep 17 00:00:00 2001
From: abzcoding
Date: Tue, 6 Jul 2021 10:09:37 +0430
Subject: telescope project and packer had the same keybinding
---
lua/lv-which-key/init.lua | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lua/lv-which-key/init.lua b/lua/lv-which-key/init.lua
index 084be113..856bead4 100644
--- a/lua/lv-which-key/init.lua
+++ b/lua/lv-which-key/init.lua
@@ -295,7 +295,7 @@ if O.plugin.telescope_project.active then
-- open projects
vim.api.nvim_set_keymap(
"n",
- "p",
+ "P",
":lua require'telescope'.extensions.project.project{}",
{ noremap = true, silent = true }
)
--
cgit v1.2.3
From a2ba3ce55433090901bf88176404d4b8b9d280be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joan=20L=C3=B3pez?=
Date: Tue, 6 Jul 2021 14:54:22 +0200
Subject: fixed missing format setting for php language. (#727)
---
utils/installer/lv-config.example.lua | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/utils/installer/lv-config.example.lua b/utils/installer/lv-config.example.lua
index 71d9dfc8..917aa1e0 100644
--- a/utils/installer/lv-config.example.lua
+++ b/utils/installer/lv-config.example.lua
@@ -65,6 +65,12 @@ O.lang.php.environment.php_version = "7.4"
O.lang.php.diagnostics.signs = true
O.lang.php.diagnostics.underline = true
O.lang.php.filetypes = {"php", "phtml"}
+O.lang.php.format = {
+ format = {
+ default = "psr12"
+ }
+}
+
-- Autocommands (https://neovim.io/doc/user/autocmd.html)
-- O.user_autocommands = {{ "BufWinEnter", "*", "echo \"hi again\""}}
--
cgit v1.2.3
From 76bb4c3f8e06e6efb37c3c7c93ca66565aad65de Mon Sep 17 00:00:00 2001
From: Abouzar Parvan
Date: Tue, 6 Jul 2021 17:25:47 +0430
Subject: fix resizing keybindings for mac (#725)
---
lua/keymappings.lua | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
diff --git a/lua/keymappings.lua b/lua/keymappings.lua
index 2161b8e9..ea9c0e18 100644
--- a/lua/keymappings.lua
+++ b/lua/keymappings.lua
@@ -20,10 +20,17 @@ vim.cmd [[
-- TODO fix this
-- resize with arrows
-vim.api.nvim_set_keymap("n", "", ":resize -2", { silent = true })
-vim.api.nvim_set_keymap("n", "", ":resize +2", { silent = true })
-vim.api.nvim_set_keymap("n", "", ":vertical resize -2", { silent = true })
-vim.api.nvim_set_keymap("n", "", ":vertical resize +2", { silent = true })
+if vim.fn.has("mac") == 1 then
+ vim.api.nvim_set_keymap("n", "", ":resize -2", { silent = true })
+ vim.api.nvim_set_keymap("n", "", ":resize +2", { silent = true })
+ vim.api.nvim_set_keymap("n", "", ":vertical resize -2", { silent = true })
+ vim.api.nvim_set_keymap("n", "", ":vertical resize +2", { silent = true })
+else
+ vim.api.nvim_set_keymap("n", "", ":resize -2", { silent = true })
+ vim.api.nvim_set_keymap("n", "", ":resize +2", { silent = true })
+ vim.api.nvim_set_keymap("n", "", ":vertical resize -2", { silent = true })
+ vim.api.nvim_set_keymap("n", "", ":vertical resize +2", { silent = true })
+end
-- better indenting
vim.api.nvim_set_keymap("v", "<", "
Date: Tue, 6 Jul 2021 09:32:56 -0400
Subject: Update FUNDING.yml
---
.github/FUNDING.yml | 1 +
1 file changed, 1 insertion(+)
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
index af7701b4..255497d6 100644
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@@ -1,4 +1,5 @@
# These are supported funding model platforms
+github: christianchiarulli
patreon: chrisatmachine
--
cgit v1.2.3
From 29981f32beef7a5370059efe6d458b271f5342b4 Mon Sep 17 00:00:00 2001
From: Christian Chiarulli
Date: Tue, 6 Jul 2021 09:50:53 -0400
Subject: Update README.md
---
README.md | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/README.md b/README.md
index d37ba7b6..86ec2deb 100644
--- a/README.md
+++ b/README.md
@@ -115,3 +115,8 @@ cd ~/.config/nvim && git pull
> "I have the processing power of a potato with 4 gb of ram and LunarVim runs perfectly."
> - @juanCortelezzi, LunarVim user.
+
+
+[]()
+
+
--
cgit v1.2.3
From 63e1a79e14f2a87ec1b474e1b879720908383d81 Mon Sep 17 00:00:00 2001
From: Christian Chiarulli
Date: Tue, 6 Jul 2021 10:02:40 -0400
Subject: Update README.md
---
README.md | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/README.md b/README.md
index 86ec2deb..ad107561 100644
--- a/README.md
+++ b/README.md
@@ -4,19 +4,20 @@
-
-
-
+
+
-
+
+
## Install In One Command!
@@ -119,4 +120,5 @@ cd ~/.config/nvim && git pull
[]()
+
--
cgit v1.2.3
From 08ebd34a43abd139321bd34dfe70c0b632835746 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joan=20L=C3=B3pez?=
Date: Tue, 6 Jul 2021 16:03:42 +0200
Subject: add top level keybinding for symbols outline. (#728)
---
lua/lv-which-key/init.lua | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/lua/lv-which-key/init.lua b/lua/lv-which-key/init.lua
index 856bead4..acc342c4 100644
--- a/lua/lv-which-key/init.lua
+++ b/lua/lv-which-key/init.lua
@@ -274,6 +274,11 @@ end
-- }
-- end
+if O.plugin.symbol_outline.active then
+ vim.api.nvim_set_keymap("n", "o", ":SymbolsOutline", { noremap = true, silent = true })
+ mappings["o"] = "Symbols outline"
+end
+
if O.plugin.gitlinker.active then
mappings["gy"] = "Gitlink"
end
--
cgit v1.2.3
From 15603354acdc5ab88a5eb0d70a7b3e17a1792efe Mon Sep 17 00:00:00 2001
From: christianchiarulli
Date: Tue, 6 Jul 2021 11:30:01 -0400
Subject: remove plugin bloat
---
lua/default-config.lua | 27 +----
lua/lv-compe/init.lua | 6 +-
lua/lv-galaxyline/init.lua | 2 +-
lua/lv-which-key/init.lua | 43 ++------
lua/plugins.lua | 194 ++--------------------------------
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",
-- {noremap = true, silent = true})
--- telescope or snap
-if O.plugin.snap.active then
- vim.api.nvim_set_keymap("n", "f", ":Snap find_files", { noremap = true, silent = true })
-else
- vim.api.nvim_set_keymap("n", "f", ":Telescope find_files", { noremap = true, silent = true })
-end
+vim.api.nvim_set_keymap("n", "f", ":Telescope find_files", { noremap = true, silent = true })
-- dashboard
vim.api.nvim_set_keymap("n", ";", ":Dashboard", { noremap = true, silent = true })
@@ -101,7 +96,7 @@ local mappings = {
b = {
name = "Buffers",
j = { "BufferPick", "jump to buffer" },
- f = { O.plugin.snap.active and "Snap buffers" or "Telescope buffers", "Find buffer" },
+ f = { "Telescope buffers", "Find buffer" },
w = { "BufferWipeout", "wipeout buffer" },
e = {
"BufferCloseAllButCurrent",
@@ -224,21 +219,12 @@ local mappings = {
name = "Search",
b = { "Telescope git_branches", "Checkout branch" },
c = { "Telescope colorscheme", "Colorscheme" },
- -- d = {
- -- "Telescope lsp_document_diagnostics",
- -- "Document Diagnostics"
- -- },
- -- D = {
- -- "Telescope lsp_workspace_diagnostics",
- -- "Workspace Diagnostics"
- -- },
- f = { O.plugin.snap.active and "Snap find_files" or "Telescope find_files", "Find File" },
+ f = { "Telescope find_files", "Find File" },
h = { "Telescope help_tags", "Find Help" },
- -- m = {"Telescope marks", "Marks"},
M = { "Telescope man_pages", "Man Pages" },
- r = { O.plugin.snap.active and "Snap oldfiles" or "Telescope oldfiles", "Open Recent File" },
+ r = { "Telescope oldfiles", "Open Recent File" },
R = { "Telescope registers", "Registers" },
- t = { O.plugin.snap.active and "Snap live_grep" or "Telescope live_grep", "Text" },
+ t = { "Telescope live_grep", "Text" },
},
S = {
name = "Session",
@@ -251,17 +237,6 @@ local mappings = {
},
}
-if O.plugin.spectre.active then
- mappings["r"] = {
- name = "Replace",
- f = {
- "lua require('spectre').open_file_search()",
- "Current File",
- },
- p = { "lua require('spectre').open()", "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", "o", ":SymbolsOutline", { noremap = true, silent = true })
- mappings["o"] = "Symbols outline"
-end
-
-if O.plugin.gitlinker.active then
- mappings["gy"] = "Gitlink"
+ vim.api.nvim_set_keymap("n", "o", ":SymbolsOutline", { 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 = "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
--
cgit v1.2.3
From 00e0db32a0a64562067c1f2f56267c01a214c6e9 Mon Sep 17 00:00:00 2001
From: christianchiarulli
Date: Tue, 6 Jul 2021 11:36:04 -0400
Subject: remove extra config files
---
lua/lv-bufferline/init.lua | 73 ----------------------------------------------
lua/lv-dial/init.lua | 30 -------------------
lua/lv-gitblame/init.lua | 2 --
lua/lv-hop/init.lua | 9 ------
lua/lv-lsp-rooter/init.lua | 5 ----
lua/lv-matchup/init.lua | 7 -----
lua/lv-quickscope/init.lua | 4 ---
lua/lv-rnvimr/init.lua | 6 ----
lua/lv-snap/init.lua | 14 ---------
lua/lv-spectre/init.lua | 50 -------------------------------
10 files changed, 200 deletions(-)
delete mode 100644 lua/lv-bufferline/init.lua
delete mode 100644 lua/lv-dial/init.lua
delete mode 100644 lua/lv-gitblame/init.lua
delete mode 100644 lua/lv-hop/init.lua
delete mode 100644 lua/lv-lsp-rooter/init.lua
delete mode 100644 lua/lv-matchup/init.lua
delete mode 100644 lua/lv-quickscope/init.lua
delete mode 100644 lua/lv-rnvimr/init.lua
delete mode 100644 lua/lv-snap/init.lua
delete mode 100644 lua/lv-spectre/init.lua
diff --git a/lua/lv-bufferline/init.lua b/lua/lv-bufferline/init.lua
deleted file mode 100644
index af1a2d20..00000000
--- a/lua/lv-bufferline/init.lua
+++ /dev/null
@@ -1,73 +0,0 @@
-local M = {}
-
-M.config = function()
- -- Buffer line setup
- require("bufferline").setup {
- options = {
- indicator_icon = "▎",
- buffer_close_icon = "",
- modified_icon = "●",
- close_icon = "",
- close_command = "bdelete %d",
- right_mouse_command = "bdelete! %d",
- left_trunc_marker = "",
- right_trunc_marker = "",
- offsets = {
- {
- filetype = "NvimTree",
- text = "",
- text_align = "center",
- padding = 1,
- },
- },
- show_tab_indicators = true,
- show_close_icon = false,
- },
- highlights = {
- fill = {
- guifg = { attribute = "fg", highlight = "Normal" },
- guibg = { attribute = "bg", highlight = "StatusLineNC" },
- },
- -- background = {
- -- guifg = {attribute = "fg", highlight = "Normal"},
- -- guibg = {attribute = "bg", highlight = "StatusLine"}
- -- },
- -- buffer_visible = {
- -- gui = "",
- -- guifg = {attribute = "fg", highlight = "Normal"},
- -- guibg = {attribute = "bg", highlight = "Normal"}
- -- },
- -- buffer_selected = {
- -- gui = "",
- -- guifg = {attribute = "fg", highlight = "Normal"},
- -- guibg = {attribute = "bg", highlight = "Normal"}
- -- },
- -- separator = {
- -- guifg = {attribute = "bg", highlight = "Normal"},
- -- guibg = {attribute = "bg", highlight = "StatusLine"}
- -- },
- -- separator_selected = {
- -- guifg = {attribute = "fg", highlight = "Special"},
- -- guibg = {attribute = "bg", highlight = "Normal"}
- -- },
- -- separator_visible = {
- -- guifg = {attribute = "fg", highlight = "Normal"},
- -- guibg = {attribute = "bg", highlight = "StatusLineNC"}
- -- },
- -- close_button = {
- -- guifg = {attribute = "fg", highlight = "Normal"},
- -- guibg = {attribute = "bg", highlight = "StatusLine"}
- -- },
- -- close_button_selected = {
- -- guifg = {attribute = "fg", highlight = "normal"},
- -- guibg = {attribute = "bg", highlight = "normal"}
- -- },
- -- close_button_visible = {
- -- guifg = {attribute = "fg", highlight = "normal"},
- -- guibg = {attribute = "bg", highlight = "normal"}
- -- }
- },
- }
-end
-
-return M
diff --git a/lua/lv-dial/init.lua b/lua/lv-dial/init.lua
deleted file mode 100644
index 842e86be..00000000
--- a/lua/lv-dial/init.lua
+++ /dev/null
@@ -1,30 +0,0 @@
-local M = {}
-
-M.config = function()
- vim.cmd [[
-nmap (dial-increment)
-nmap (dial-decrement)
-vmap (dial-increment)
-vmap (dial-decrement)
-vmap g (dial-increment-additional)
-vmap g (dial-decrement-additional)
-]]
-
- local dial = require "dial"
-
- dial.augends["custom#boolean"] = dial.common.enum_cyclic {
- name = "boolean",
- strlist = { "true", "false" },
- }
- table.insert(dial.config.searchlist.normal, "custom#boolean")
-
- -- For Languages which prefer True/False, e.g. python.
- dial.augends["custom#Boolean"] = dial.common.enum_cyclic {
- name = "Boolean",
- strlist = { "True", "False" },
- }
- table.insert(dial.config.searchlist.normal, "custom#Boolean")
-
-end
-
-return M
diff --git a/lua/lv-gitblame/init.lua b/lua/lv-gitblame/init.lua
deleted file mode 100644
index 3ed93a2b..00000000
--- a/lua/lv-gitblame/init.lua
+++ /dev/null
@@ -1,2 +0,0 @@
-vim.cmd "highlight default link gitblame SpecialComment"
-vim.g.gitblame_enabled = 0
diff --git a/lua/lv-hop/init.lua b/lua/lv-hop/init.lua
deleted file mode 100644
index 3d2610ce..00000000
--- a/lua/lv-hop/init.lua
+++ /dev/null
@@ -1,9 +0,0 @@
-local M = {}
-
-M.config = function()
- require("hop").setup()
- vim.api.nvim_set_keymap("n", "s", ":HopChar2", { silent = true })
- vim.api.nvim_set_keymap("n", "S", ":HopWord", { silent = true })
-end
-
-return M
diff --git a/lua/lv-lsp-rooter/init.lua b/lua/lv-lsp-rooter/init.lua
deleted file mode 100644
index f4c16a9f..00000000
--- a/lua/lv-lsp-rooter/init.lua
+++ /dev/null
@@ -1,5 +0,0 @@
-require("lsp-rooter").setup {
- -- your configuration comes here
- -- or leave it empty to use the default settings
- -- refer to the configuration section below
-}
diff --git a/lua/lv-matchup/init.lua b/lua/lv-matchup/init.lua
deleted file mode 100644
index 92df923b..00000000
--- a/lua/lv-matchup/init.lua
+++ /dev/null
@@ -1,7 +0,0 @@
-local M = {}
-
-M.config = function()
- vim.g.matchup_matchparen_offscreen = { method = "popup" }
-end
-
-return M
diff --git a/lua/lv-quickscope/init.lua b/lua/lv-quickscope/init.lua
deleted file mode 100644
index 8ae441d3..00000000
--- a/lua/lv-quickscope/init.lua
+++ /dev/null
@@ -1,4 +0,0 @@
--- Trigger a highlight in the appropriate direction when pressing these keys:
--- vim.cmd('let g:qs_highlight_on_keys = [\'f\', \'F\', \'t\', \'T\']')
-vim.g.qs_highlight_on_keys = { "f", "F", "t", "T" }
-vim.g.qs_max_chars = 150
diff --git a/lua/lv-rnvimr/init.lua b/lua/lv-rnvimr/init.lua
deleted file mode 100644
index d05307b1..00000000
--- a/lua/lv-rnvimr/init.lua
+++ /dev/null
@@ -1,6 +0,0 @@
--- Make Ranger replace netrw and be the file explorer
--- vim.g.rnvimr_ex_enable = 1
-vim.g.rnvimr_draw_border = 1
-vim.g.rnvimr_pick_enable = 1
-vim.g.rnvimr_bw_enable = 1
-vim.api.nvim_set_keymap("n", "-", ":RnvimrToggle", { noremap = true, silent = true })
diff --git a/lua/lv-snap/init.lua b/lua/lv-snap/init.lua
deleted file mode 100644
index c37f068a..00000000
--- a/lua/lv-snap/init.lua
+++ /dev/null
@@ -1,14 +0,0 @@
-local M = {}
-
-M.config = function()
- local snap = require "snap"
- local layout = snap.get("layout").bottom
- local file = snap.config.file:with { consumer = "fzy", layout = layout }
- local vimgrep = snap.config.vimgrep:with { layout = layout }
- snap.register.command("find_files", file { producer = "ripgrep.file" })
- snap.register.command("buffers", file { producer = "vim.buffer" })
- snap.register.command("oldfiles", file { producer = "vim.oldfile" })
- snap.register.command("live_grep", vimgrep {})
-end
-
-return M
diff --git a/lua/lv-spectre/init.lua b/lua/lv-spectre/init.lua
deleted file mode 100644
index cd7757f3..00000000
--- a/lua/lv-spectre/init.lua
+++ /dev/null
@@ -1,50 +0,0 @@
-require("spectre").setup {
- mapping = {
- ["toggle_line"] = {
- map = "dd",
- cmd = "lua require('spectre').toggle_line()",
- desc = "toggle current item",
- },
- ["enter_file"] = {
- map = "",
- cmd = "lua require('spectre.actions').select_entry()",
- desc = "goto current file",
- },
- ["send_to_qf"] = {
- map = "q",
- cmd = "lua require('spectre.actions').send_to_qf()",
- desc = "send all item to quickfix",
- },
- ["replace_cmd"] = {
- map = "c",
- cmd = "lua require('spectre.actions').replace_cmd()",
- desc = "input replace vim command",
- },
- ["show_option_menu"] = {
- map = "o",
- cmd = "lua require('spectre').show_options()",
- desc = "show option",
- },
- ["run_replace"] = {
- map = "R",
- cmd = "lua require('spectre.actions').run_replace()",
- desc = "replace all",
- },
- ["change_view_mode"] = {
- map = "v",
- cmd = "lua require('spectre').change_view()",
- desc = "change result view mode",
- },
- ["toggle_ignore_case"] = {
- map = "ti",
- cmd = "lua require('spectre').change_options('ignore-case')",
- desc = "toggle ignore case",
- },
- ["toggle_ignore_hidden"] = {
- map = "th",
- cmd = "lua require('spectre').change_options('hidden')",
- desc = "toggle search hidden",
- },
- -- you can put your mapping here it only use normal mode
- },
-}
--
cgit v1.2.3
From afc97effbdd10ef017c25a2ae18f176b68b263b6 Mon Sep 17 00:00:00 2001
From: christianchiarulli
Date: Tue, 6 Jul 2021 11:39:41 -0400
Subject: add user config in lua director
---
lua/user-config/.keep | 0
1 file changed, 0 insertions(+), 0 deletions(-)
create mode 100644 lua/user-config/.keep
diff --git a/lua/user-config/.keep b/lua/user-config/.keep
new file mode 100644
index 00000000..e69de29b
--
cgit v1.2.3
From b99585d2a3eb47ea5649c582101bbc9ef837463b Mon Sep 17 00:00:00 2001
From: christianchiarulli
Date: Tue, 6 Jul 2021 11:40:07 -0400
Subject: add user config for advanced users
---
lua/lv-user/.keep | 0
lua/user-config/.keep | 0
2 files changed, 0 insertions(+), 0 deletions(-)
create mode 100644 lua/lv-user/.keep
delete mode 100644 lua/user-config/.keep
diff --git a/lua/lv-user/.keep b/lua/lv-user/.keep
new file mode 100644
index 00000000..e69de29b
diff --git a/lua/user-config/.keep b/lua/user-config/.keep
deleted file mode 100644
index e69de29b..00000000
--
cgit v1.2.3
From 020fe412c117d691f1c5fa9a80a333bf1b259e3e Mon Sep 17 00:00:00 2001
From: christianchiarulli
Date: Tue, 6 Jul 2021 11:48:14 -0400
Subject: readme in user config
---
lua/lv-user/.keep | 0
lua/lv-user/README.md | 5 +++++
2 files changed, 5 insertions(+)
delete mode 100644 lua/lv-user/.keep
create mode 100644 lua/lv-user/README.md
diff --git a/lua/lv-user/.keep b/lua/lv-user/.keep
deleted file mode 100644
index e69de29b..00000000
diff --git a/lua/lv-user/README.md b/lua/lv-user/README.md
new file mode 100644
index 00000000..789001a2
--- /dev/null
+++ b/lua/lv-user/README.md
@@ -0,0 +1,5 @@
+# User Config
+
+If you have found this directory then you are probably advanced enough to add your own config. All `lua` files you create here will be available in lv-config.
+
+**NOTE** I may update this readme in the future so I recommend not changing anything in this file specifically
--
cgit v1.2.3
From ec868f92cc9a26cd080fe467d5d5e45f79a8b637 Mon Sep 17 00:00:00 2001
From: christianchiarulli
Date: Tue, 6 Jul 2021 11:55:29 -0400
Subject: galaxyline refactor
---
lua/lv-galaxyline/init.lua | 46 ----------------------------------------------
1 file changed, 46 deletions(-)
diff --git a/lua/lv-galaxyline/init.lua b/lua/lv-galaxyline/init.lua
index 23f13556..d44e56e4 100644
--- a/lua/lv-galaxyline/init.lua
+++ b/lua/lv-galaxyline/init.lua
@@ -26,51 +26,6 @@ local colors = {
info_yellow = "#FFCC66",
}
--- galaxyline themes for Gruvbox and NVCode.
--- Uncomment and change 'colors_colorschemeName'
--- to 'colors' to enable.
-
--- Colors for Gruvbox
--- local colors_gruvbox = {
--- bg = '#32302F',
--- yellow = '#FABD2F',
--- dark_yellow = '#D79921',
--- cyan = '#689D6A',
--- green = '#608B4E',
--- light_green = '#B8BB26',
--- string_orange = '#D65D0E',
--- orange = '#FE8019',
--- purple = '#B16286',
--- magenta = '#D3869B',
--- grey = '#A89984',
--- blue = '#458588',
--- -- vivid_blue = '#4FC1FF',
--- light_blue = '#83A598',
--- red = '#FB4834',
--- error_red = '#CC241D',
--- info_yellow = '#D79921'
--- }
--- colors for NVCode theme (very minimal changes)
--- local colors_nvcode = {
--- bg = '#2E2E2E',
--- yellow = '#DCDCAA',
--- dark_yellow = '#D7BA7D',
--- cyan = '#4EC9B0',
--- green = '#608B4E',
--- light_green = '#B5CEA8',
--- string_orange = '#CE9178',
--- orange = '#FF8800',
--- purple = '#C586C0',
--- magenta = '#D16D9E',
--- grey = '#729CB3',
--- blue = '#569CD6',
--- vivid_blue = '#4FC1FF',
--- light_blue = '#9CDCFE',
--- red = '#D16969',
--- error_red = '#F44747',
--- info_yellow = '#FFCC66'
--- }
-
local condition = require "galaxyline.condition"
local gls = gl.section
gl.short_line_list = { "NvimTree", "vista", "dbui", "packer" }
@@ -105,7 +60,6 @@ table.insert(gls.left, {
return "▊"
end,
highlight = "StatusLineNC",
- -- highlight = {colors.red, colors.bg}
},
})
-- print(vim.fn.getbufvar(0, 'ts'))
--
cgit v1.2.3
From 3417a343e2792503d54cb308c17a04a3657ae768 Mon Sep 17 00:00:00 2001
From: christianchiarulli
Date: Tue, 6 Jul 2021 12:12:24 -0400
Subject: galaxyline filler
---
lua/lv-galaxyline/init.lua | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/lua/lv-galaxyline/init.lua b/lua/lv-galaxyline/init.lua
index d44e56e4..2189eab3 100644
--- a/lua/lv-galaxyline/init.lua
+++ b/lua/lv-galaxyline/init.lua
@@ -59,6 +59,7 @@ table.insert(gls.left, {
vim.api.nvim_command("hi GalaxyViMode guifg=" .. mode_color[vim.fn.mode()])
return "▊"
end,
+ separator_highlight = "StatusLineSeparator",
highlight = "StatusLineNC",
},
})
@@ -114,6 +115,15 @@ table.insert(gls.left, {
},
})
+table.insert(gls.left, {
+ Filler = {
+ provider = function()
+ return " "
+ end,
+ highlight = "StatusLineGitDelete",
+ },
+})
+
table.insert(gls.right, {
DiagnosticError = {
provider = "DiagnosticError",
@@ -163,7 +173,7 @@ table.insert(gls.right, {
})
local get_lsp_client = function(msg)
- msg = msg or "No Active LSP Client"
+ msg = msg or "LSP Inactive"
local buf_ft = vim.api.nvim_buf_get_option(0, "filetype")
local clients = vim.lsp.get_active_clients()
if next(clients) == nil then
--
cgit v1.2.3
From 35e37f06da8fc53414b2b8c10bc9201aa1fd23dd Mon Sep 17 00:00:00 2001
From: "hui.liu"
Date: Wed, 7 Jul 2021 00:18:03 +0800
Subject: Setup tailwindcss-ls (#729)
---
init.lua | 3 +++
lua/default-config.lua | 1 +
lua/lsp/tailwindcss-ls.lua | 2 ++
3 files changed, 6 insertions(+)
diff --git a/init.lua b/init.lua
index 2b5a9515..95ef162a 100644
--- a/init.lua
+++ b/init.lua
@@ -11,6 +11,9 @@ require "lsp"
if O.lang.emmet.active then
require "lsp.emmet-ls"
end
+if O.lang.tailwindcss.active then
+ require "lsp.tailwindcss-ls"
+end
-- autoformat
if O.format_on_save then
diff --git a/lua/default-config.lua b/lua/default-config.lua
index b892f357..fcf33799 100644
--- a/lua/default-config.lua
+++ b/lua/default-config.lua
@@ -146,6 +146,7 @@ O = {
},
},
tailwindcss = {
+ active = false,
filetypes = {
"html",
"css",
diff --git a/lua/lsp/tailwindcss-ls.lua b/lua/lsp/tailwindcss-ls.lua
index 87cd924c..c56a8336 100644
--- a/lua/lsp/tailwindcss-ls.lua
+++ b/lua/lsp/tailwindcss-ls.lua
@@ -6,5 +6,7 @@ lspconfig.tailwindcss.setup {
"node", DATA_PATH .. "/lspinstall/tailwindcss/tailwindcss-intellisense/extension/dist/server/tailwindServer.js",
"--stdio"
},
+ filetypes = O.lang.tailwindcss.filetypes,
+ root_dir = require("lspconfig/util").root_pattern("tailwind.config.js", "postcss.config.ts", ".postcssrc"),
on_attach = require'lsp'.common_on_attach
}
--
cgit v1.2.3
From 68bfac0468ea4d5d7faf5bede0a4ab8cb5572f0c Mon Sep 17 00:00:00 2001
From: Abouzar Parvan
Date: Tue, 6 Jul 2021 20:50:38 +0430
Subject: fix telescope project issue (#723)
---
lua/plugins.lua | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lua/plugins.lua b/lua/plugins.lua
index f78a85fd..69542b94 100644
--- a/lua/plugins.lua
+++ b/lua/plugins.lua
@@ -238,7 +238,7 @@ return require("packer").startup(function(use)
use {
"nvim-telescope/telescope-project.nvim",
event = "BufRead",
- after = "telescope.nvim",
+ setup = function () vim.cmd[[packadd telescope.nvim]] end,
disable = not O.plugin.telescope_project.active,
}
--
cgit v1.2.3