refactoring

main
spike 2 years ago
parent 6a364535a3
commit 0489999b69

@ -1,4 +1,3 @@
- fix C-k expand snippet
-WARN: finish after/plugin/lspAutostart.lua : read per project lsp settings -WARN: finish after/plugin/lspAutostart.lua : read per project lsp settings
-INFO:using extranl ui process in neovim: check fzflua,iron.nvim -INFO:using extranl ui process in neovim: check fzflua,iron.nvim
- add tag="*" to plugins that use tags - add tag="*" to plugins that use tags
@ -39,3 +38,4 @@
- [x] fix color/icon of status line diagnostics to match navigator - [x] fix color/icon of status line diagnostics to match navigator
-[x] pin all plugins -[x] pin all plugins
- [x] autocommand move current directory when move to new window - [x] autocommand move current directory when move to new window
- [done]fix C-k expand snippet - it was alacritty overriding C-k

@ -1,3 +1,4 @@
augroup my_json augroup my_json
au!
au FileType json set formatprg=jq au FileType json set formatprg=jq
aug END aug END

@ -747,7 +747,7 @@ M.asyncrun = { --{{{
M.vim_bookmarks = {--{{{ M.vim_bookmarks = {--{{{
n = { n = {
["<space>m"] = {"<cmd> Telescope vim_bookmarks<CR>", "show bookmarks"}, ["<BS>m"] = {"<cmd> Telescope vim_bookmarks<CR>", "show bookmarks"},
["mm"] = {"<cmd> BookmarkToggle<CR>", "toggle bookmarks"}, ["mm"] = {"<cmd> BookmarkToggle<CR>", "toggle bookmarks"},
["<leader>mm"] = {"<cmd> BookmarkAnnotate<CR>", "annotation bookmarks"}, ["<leader>mm"] = {"<cmd> BookmarkAnnotate<CR>", "annotation bookmarks"},
["<leader>mc"] = {"<cmd> BookmarkClear<CR>", "clear bookmarks in buffer"}, ["<leader>mc"] = {"<cmd> BookmarkClear<CR>", "clear bookmarks in buffer"},

@ -2,7 +2,7 @@ local M = {}
local config = { local config = {
-- verbose = true, -- verbose = true,
run_in_floaterm = true, run_in_floaterm = false,
icons = false, icons = false,
-- icons = { breakpoint = "🧘", currentpos = "🏃" }, -- set to false to disable -- icons = { breakpoint = "🧘", currentpos = "🏃" }, -- set to false to disable
lsp_cfg = false, -- handled handled instead by navigator lsp_cfg = false, -- handled handled instead by navigator

@ -7,7 +7,7 @@ end
M = {} M = {}
local config = { local config = {
debug = true, debug = false,
transparency = 5, transparency = 5,
lsp_signature_help = false, -- needs plugin lsp_signature lsp_signature_help = false, -- needs plugin lsp_signature
default_mapping = false, default_mapping = false,
@ -148,7 +148,8 @@ local config = {
-- disable auto start of lsp per language -- disable auto start of lsp per language
-- set global default on lspconfig (see lspconfig doc) -- set global default on lspconfig (see lspconfig doc)
gopls = { gopls = {
-- on_attach = require("spike.lsp").custom_attach, -- on_attach = require("spike.lsp.go").custom_attach,
on_attach = require("spike.lsp.go").gopls_onattach,
settings = { settings = {
gopls = { gopls = {
hints = { hints = {
@ -167,7 +168,8 @@ local config = {
["lua-dev"] = { ["lua-dev"] = {
library = { library = {
enabled = true, enabled = true,
plugins = {"navigator.lua", "guihua.lua", "go.nvim", "plenary.nvim"}, plugins = {"plenary.nvim"},
-- plugins = {"navigator.lua", "guihua.lua", "go.nvim", "plenary.nvim"},
runtime = true, runtime = true,
types = true, types = true,
} }

@ -7,6 +7,14 @@ end
M = {} M = {}
local config = { local config = {
keywords = {
["_TODO"] = { color = "warning"},
},
colors = {
info = {"#2563EB"},
hint = {"#10B981"},
default = {"#8C3AED" },
},
} }
M.setup = function() M.setup = function()

@ -232,7 +232,7 @@ return {
-- snippets -- snippets
["L3MON4D3/LuaSnip"] = { ["L3MON4D3/LuaSnip"] = {
lock = true, lock = false,
config = function() config = function()
-- load default config first -- load default config first
require("plugins.configs.others").luasnip() require("plugins.configs.others").luasnip()
@ -258,6 +258,7 @@ return {
}, },
["neovim/nvim-lspconfig"] = { ["neovim/nvim-lspconfig"] = {
after = {"lua-dev.nvim", "mason.nvim", "mason-lspconfig.nvim"}, after = {"lua-dev.nvim", "mason.nvim", "mason-lspconfig.nvim"},
module = {"lspconfig"},
lock = false, lock = false,
config = function() config = function()
require("plugins.configs.lspconfig").setup() require("plugins.configs.lspconfig").setup()
@ -290,7 +291,7 @@ return {
["ray-x/navigator.lua"] = { ["ray-x/navigator.lua"] = {
lock = true, lock = true,
opt = true, opt = true,
module = "navigator.lua", module = "navigator",
after = { "nvim-lspconfig", "base46", "ui", "mason.nvim", "mason-lspconfig.nvim", "lua-dev.nvim" }, after = { "nvim-lspconfig", "base46", "ui", "mason.nvim", "mason-lspconfig.nvim", "lua-dev.nvim" },
requires = {"neovim/nvim-lspconfig", "ray-x/guihua.lua", "nvim-treesitter/nvim-treesitter"}, requires = {"neovim/nvim-lspconfig", "ray-x/guihua.lua", "nvim-treesitter/nvim-treesitter"},
setup = function() setup = function()

@ -33,6 +33,7 @@ local options = {
-- list of mode / prefixes that should never be hooked by WhichKey -- list of mode / prefixes that should never be hooked by WhichKey
i = { "j", "k" }, i = { "j", "k" },
v = { "j", "k" }, v = { "j", "k" },
n = { "`", "'", "\"", "@"},
}, },
} }

@ -2,7 +2,10 @@ vim.cmd "packadd packer.nvim"
local plugins = { local plugins = {
["nvim-lua/plenary.nvim"] = { module = "plenary" }, ["nvim-lua/plenary.nvim"] = {
module = "plenary",
module_pattern = "plenary*",
},
["wbthomason/packer.nvim"] = { ["wbthomason/packer.nvim"] = {
cmd = require("core.lazy_load").packer_cmds, cmd = require("core.lazy_load").packer_cmds,
config = function() config = function()

Loading…
Cancel
Save