diff --git a/init.lua b/init.lua index 69c7dc2..96a7f05 100644 --- a/init.lua +++ b/init.lua @@ -2,7 +2,7 @@ vim.defer_fn(function() pcall(require, "impatient") end, 0) -require "sp4ke.globals" +require "spike.globals" require "core" require "core.options" diff --git a/lua/core/mappings.lua b/lua/core/mappings.lua index 12ec9a6..955fe7e 100644 --- a/lua/core/mappings.lua +++ b/lua/core/mappings.lua @@ -219,10 +219,10 @@ M.general = { --{{{ -- dofile(vim.fn.stdpath("config") .. '/lua/plugins/init.lua') -- dofile(vim.fn.stdpath("config") .. '/lua/custom/plugins/init.lua') -- - require("sp4ke.utils").unload_lua_ns("plugins") - require("sp4ke.utils").unload_lua_ns("custom") + require("spike.utils").unload_lua_ns("plugins") + require("spike.utils").unload_lua_ns("custom") require("plugins") - -- require("sp4ke.utils").unload_lua_ns("custom") + -- require("spike.utils").unload_lua_ns("custom") vim.cmd "PackerCompile" print("reloaded plugin config !") end, @@ -488,7 +488,7 @@ M.dap = { ["ds"] = { function() if vim.o.filetype == "go" then - local spdap = require("sp4ke.dap") + local spdap = require("spike.dap") spdap.setup() spdap.go_debug() @@ -510,7 +510,7 @@ M.dap = { end) end, "dap conditional breakpoint"}, ["dm"] = {function() - require("sp4ke.dapmode").start() + require("spike.dapmode").start() end, "enter dap mode"} }, diff --git a/lua/core/options.lua b/lua/core/options.lua index 9510543..160ec9e 100644 --- a/lua/core/options.lua +++ b/lua/core/options.lua @@ -18,7 +18,6 @@ if g.vim_version < 8 then g.do_filetype_lua = 1 end -opt.cmdheight = 0 opt.laststatus = 3 -- global statusline opt.showmode = false @@ -106,9 +105,8 @@ opt.undofile = true -- backups opt.backup = true opt.backupcopy = "yes" -opt.backupdir = vim.fn.expand("~/.share/nvim/backups") +opt.backupdir = vim.fn.expand("~/.local/share/nvim/backups") opt.sessionoptions="blank,buffers,curdir,folds,help,tabpages,winsize,resize,winpos" -g.sp4ke_bookmark_dir = vim.fn.stdpath("data") .. '/bookmarks' -- interval for writing swap file to disk, also used by gitsigns opt.updatetime = 250 diff --git a/lua/custom/chadrc.lua b/lua/custom/chadrc.lua index 21be71d..2cdc27c 100644 --- a/lua/custom/chadrc.lua +++ b/lua/custom/chadrc.lua @@ -5,7 +5,7 @@ local M = {} -- make sure you maintain the structure of `core/default_config.lua` here, -- example of changing theme: -- --- local custom_theme = require("sp4ke.theme") +-- local custom_theme = require("spike.theme") -- vim.tbl_deep_extend("force", M.ui.hl_add, custom_theme) M.ui = { diff --git a/lua/custom/plugins/configs/navigator.lua b/lua/custom/plugins/configs/navigator.lua index 65b1861..d9732bc 100644 --- a/lua/custom/plugins/configs/navigator.lua +++ b/lua/custom/plugins/configs/navigator.lua @@ -7,7 +7,7 @@ end M = {} local config = { - debug = false, + debug = true, transparency = 5, lsp_signature_help = false, -- needs plugin lsp_signature default_mapping = false, @@ -47,7 +47,7 @@ local config = { { key = 'gL', func = require('navigator.diagnostics').show_diagnostics, desc = 'lsp show_diagnostics' }, { key = 'gG', func = require('navigator.diagnostics').show_buf_diagnostics, desc = 'lsp show_buf_diagnostics' }, -- { key = 'dt', func = require('navigator.diagnostics').toggle_diagnostics, desc = 'lsp toggle_diagnostics' }, - { key = 'dt', func = require('sp4ke.lsp').toggle_diagnostics, desc = 'lsp toggle_diagnostics' }, + { key = 'dt', func = require('spike.lsp').toggle_diagnostics, desc = 'lsp toggle_diagnostics' }, { key = ']d', func = vim.diagnostic.goto_next, desc = 'lsp next diagnostics' }, { key = '[d', func = vim.diagnostic.goto_prev, desc = 'lsp prev diagnostics' }, { key = ']O', func = vim.diagnostic.set_loclist, desc = 'lsp diagnostics set loclist' }, @@ -148,7 +148,7 @@ local config = { -- disable auto start of lsp per language -- set global default on lspconfig (see lspconfig doc) gopls = { - -- on_attach = require("sp4ke.lsp").custom_attach, + -- on_attach = require("spike.lsp").custom_attach, settings = { gopls = { hints = { @@ -167,7 +167,7 @@ local config = { ["lua-dev"] = { library = { enabled = true, - plugins = {"navigator.lua", "guihua.lua", "go.nvim"}, + plugins = {"navigator.lua", "guihua.lua", "go.nvim", "plenary.nvim"}, runtime = true, types = true, } diff --git a/lua/custom/plugins/init.lua b/lua/custom/plugins/init.lua index 98c6efa..70897df 100644 --- a/lua/custom/plugins/init.lua +++ b/lua/custom/plugins/init.lua @@ -166,7 +166,6 @@ return { }, ["tpope/vim-fugitive"] = { - lock = true, cmd = {"G", "Git", "G*"} }, @@ -258,8 +257,8 @@ return { event = "InsertEnter", }, ["neovim/nvim-lspconfig"] = { - after = "lua-dev.nvim", - lock = true, + after = {"lua-dev.nvim", "mason.nvim", "mason-lspconfig.nvim"}, + lock = false, config = function() local lspconfig = require("lspconfig") lspconfig.util.default_config = vim.tbl_extend( @@ -272,7 +271,7 @@ return { end-- disable lspconfig, handled by navigator }, ["williamboman/mason-lspconfig.nvim"] = { - lock = true, + lock = false, requires = {"williamboman/mason.nvim", "nvim-lspconfig"}, -- after = "mason.nvim", module = {"mson-lspconfig.nvim", "mason.nvim"}, @@ -299,7 +298,7 @@ return { lock = true, opt = true, module = "navigator.lua", - after = { "nvim-lspconfig", "base46", "ui", "mason.nvim", "mason-lspconfig.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"}, setup = function() require("core.lazy_load").on_file_open "navigator.lua" @@ -315,6 +314,7 @@ return { }, ["ray-x/lsp_signature.nvim"] = { + lock = true, after = {"navigator.lua"}, config = function() require("custom.plugins.configs.lsp_signature").setup() @@ -351,6 +351,7 @@ return { -- end -- }, ["hkupty/iron.nvim"] = { + loack = true, cmd = {"Iron*"}, setup = function() require("core.utils").load_mappings "iron" @@ -383,6 +384,7 @@ return { -- Lua dev env -- check setup in configs/navigator.lua ["folke/lua-dev.nvim"] = { + loack = true, module = "lua-dev", }, diff --git a/lua/custom/plugins/nvchadui.lua b/lua/custom/plugins/nvchadui.lua index 68cb6fd..4bc8252 100644 --- a/lua/custom/plugins/nvchadui.lua +++ b/lua/custom/plugins/nvchadui.lua @@ -37,7 +37,7 @@ local modes = { } local function is_dapmode() - return require("sp4ke.dapmode").is_active() + return require("spike.dapmode").is_active() -- return false end diff --git a/lua/sp4ke/dap.lua b/lua/spike/dap.lua similarity index 74% rename from lua/sp4ke/dap.lua rename to lua/spike/dap.lua index 9341973..075247e 100644 --- a/lua/sp4ke/dap.lua +++ b/lua/spike/dap.lua @@ -1,4 +1,4 @@ -local dapmode = require("sp4ke.dapmode") +local dapmode = require("spike.dapmode") local M = {} @@ -9,11 +9,11 @@ local function register_listeners() return end - dap.listeners.before['event_initialized']['sp4ke-dap'] = function(session, body) + dap.listeners.before['event_initialized']['spike-dap'] = function(session, body) dapmode.start() end - dap.listeners.after['event_terminated']['sp4ke-dap'] = function(session, body) + dap.listeners.after['event_terminated']['spike-dap'] = function(session, body) -- print("dap session ended") dapmode.stop() end diff --git a/lua/sp4ke/dapmode.lua b/lua/spike/dapmode.lua similarity index 100% rename from lua/sp4ke/dapmode.lua rename to lua/spike/dapmode.lua diff --git a/lua/sp4ke/globals.lua b/lua/spike/globals.lua similarity index 100% rename from lua/sp4ke/globals.lua rename to lua/spike/globals.lua diff --git a/lua/sp4ke/lsp.lua b/lua/spike/lsp.lua similarity index 100% rename from lua/sp4ke/lsp.lua rename to lua/spike/lsp.lua diff --git a/lua/spike/perproject.lua b/lua/spike/perproject.lua new file mode 100644 index 0000000..449c098 --- /dev/null +++ b/lua/spike/perproject.lua @@ -0,0 +1,5 @@ +local M = {} + +M.base_dirname = '.pnvim' + +return M diff --git a/lua/sp4ke/utils.lua b/lua/spike/utils.lua similarity index 100% rename from lua/sp4ke/utils.lua rename to lua/spike/utils.lua