diff options
| -rw-r--r-- | after/plugin/feline.lua | 69 | ||||
| -rw-r--r-- | after/plugin/iron.lua | 61 | ||||
| -rw-r--r-- | after/plugin/mind.lua | 11 | ||||
| -rw-r--r-- | after/plugin/notify.lua | 8 | ||||
| -rw-r--r-- | after/plugin/trouble.lua | 11 | ||||
| -rw-r--r-- | lua/alpha/database.lua (renamed from after/plugin/dbui.lua) | 1 | ||||
| -rw-r--r-- | lua/alpha/lsp/servers.lua | 9 | ||||
| -rw-r--r-- | lua/alpha/plugins.lua | 30 |
8 files changed, 34 insertions, 166 deletions
diff --git a/after/plugin/feline.lua b/after/plugin/feline.lua deleted file mode 100644 index 3b6c6c6..0000000 --- a/after/plugin/feline.lua +++ /dev/null @@ -1,69 +0,0 @@ -local ok, feline = pcall(require, "feline") -if not ok then - return -end - -local my_theme = { - bg = "#131a24", - bg1 = "#192330", - black = "#131a24", - skyblue = "#719cd6", - cyan = "#63cdcf", - fg = "#aeafb0", - green = "#81b29a", - magenta = "#9d79d6", - orange = "#f4a261", - red = "#c94f6d", - white = "#dfdfe0", - yellow = "#dbc074", - oceanblue = "#39506d", -} - -feline.setup() -feline.use_theme(my_theme) - - --- Winbar -local winbar_fileinfo_component = { - provider = { - name = "file_info", - opts = { - type = "relative", - file_modified_icon = "", - }, - }, - hl = { - bg = "bg1", - fg = "skyblue", - }, -} - -local winbar_fileinfo_component_inactive = { - provider = { - name = "file_info", - opts = { - type = "relative", - file_modified_icon = "", - }, - }, - hl = { - bg = "bg1", - fg = "fg", - }, -} - -local winbar_components = { - active = {}, - inactive = {}, -} - --- add a section to each one -table.insert(winbar_components.active, {}) -table.insert(winbar_components.inactive, {}) - -table.insert(winbar_components.active[1], winbar_fileinfo_component) -table.insert(winbar_components.inactive[1], winbar_fileinfo_component_inactive) - -feline.winbar.setup({ - components = winbar_components, -}) diff --git a/after/plugin/iron.lua b/after/plugin/iron.lua deleted file mode 100644 index 972ccbc..0000000 --- a/after/plugin/iron.lua +++ /dev/null @@ -1,61 +0,0 @@ -local ok, iron = pcall(require, "iron.core") - -if not ok then - return -end - -iron.setup({ - config = { - should_map_plug = false, - -- Whether a repl should be discarded or not - scratch_repl = true, - close_window_on_exit = true, - -- Your repl definitions come here - repl_definition = { - sh = { - command = { "zsh" }, - }, - javascript = { - command = { "node" }, - }, - php = { - command = { "psysh" }, - }, - tinker = { - command = { "php", "artisan", "tinker" }, - }, - sail = { - command = { "sail", "tinker" }, - }, - }, - repl_open_cmd = "rightbelow vertical 100 split", - -- how the REPL window will be opened, the default is opening - -- a float window of height 40 at the bottom. - }, - keymaps = { - send_motion = "<space>sc", - visual_send = "<space>sc", - send_file = "<space>sf", - send_line = "<space>sl", - send_mark = "<space>sm", - mark_motion = "<space>mc", - mark_visual = "<space>mc", - remove_mark = "<space>md", - cr = "<space>s<cr>", - interrupt = "<space>s<space>", - exit = "<space>sq", - clear = "<space>cl", - }, - highlight = { - italic = true, - }, -}) - --- Idea --- create a menu to ask which console wants to start --- for php example we have --- psysh | tinker | tinker on sail --- base on that save the expected filetype on a buffer variable --- add the parameter to the command for the IronRepl and all commands to send --- or beter use my own functions useing the core.* functions --- not all functions takes the ft as parameter diff --git a/after/plugin/mind.lua b/after/plugin/mind.lua deleted file mode 100644 index 8457cdb..0000000 --- a/after/plugin/mind.lua +++ /dev/null @@ -1,11 +0,0 @@ -local ok, mind = pcall(require, "mind") -if not ok then - return -end - -mind.setup({ - persistence = { - state_path = "/mnt/nas/alpha/mind/mind.json", - data_dir = "/mnt/nas/alpha/mind/data" - }, -}) diff --git a/after/plugin/notify.lua b/after/plugin/notify.lua deleted file mode 100644 index 7a9f79c..0000000 --- a/after/plugin/notify.lua +++ /dev/null @@ -1,8 +0,0 @@ -local ok, notify = pcall(require, "notify") -if not ok then - return -end - -notify.setup({ - background_colour = "#000000", -}) diff --git a/after/plugin/trouble.lua b/after/plugin/trouble.lua deleted file mode 100644 index 7d137d5..0000000 --- a/after/plugin/trouble.lua +++ /dev/null @@ -1,11 +0,0 @@ -local ok, trouble = pcall(require, "trouble") - -if not ok then - return -end - -trouble.setup({ - mode = "document_diagnostics", -}) - -vim.keymap.set('n', '<leader>oo', ':TroubleToggle<cr>') diff --git a/after/plugin/dbui.lua b/lua/alpha/database.lua index 7715875..df1586b 100644 --- a/after/plugin/dbui.lua +++ b/lua/alpha/database.lua @@ -1,3 +1,4 @@ +P("loading this") vim.g.db_ui_use_nerd_fonts = 1 vim.g.db_ui_show_database_icon = 1 vim.g.db_ui_force_echo_notifications = 1 diff --git a/lua/alpha/lsp/servers.lua b/lua/alpha/lsp/servers.lua index 921a628..de05e0b 100644 --- a/lua/alpha/lsp/servers.lua +++ b/lua/alpha/lsp/servers.lua @@ -1,11 +1,12 @@ return { + "emmet_ls", + "gopls", + "html", + "jsonls", + "marksman", "phpactor", "rust_analyzer", - "gopls", "sumneko_lua", - "emmet_ls", - "jsonls", - "html", "tsserver", "volar", } diff --git a/lua/alpha/plugins.lua b/lua/alpha/plugins.lua index 1c46d96..b8037ed 100644 --- a/lua/alpha/plugins.lua +++ b/lua/alpha/plugins.lua @@ -152,6 +152,12 @@ return require("packer").startup(function(use) use({ "folke/trouble.nvim", requires = "kyazdani42/nvim-web-devicons", + config = function () + require('trouble').setup({mode = "document_diagnostics"}) + vim.keymap.set('n', '<leader>oo', ':TroubleToggle<cr>') + end, + cmd = {"Trouble", "TroubleToggle"}, + keys = "<leader>oo", }) use("vim-test/vim-test") @@ -185,7 +191,12 @@ return require("packer").startup(function(use) -- Style use("stevearc/dressing.nvim") - use("rcarriga/nvim-notify") + use({ + "rcarriga/nvim-notify", + config = function () + require('notify').setup({background_colour = "#000000"}) + end + }) use("xiyaowong/nvim-transparent") use("Raimondi/delimitMate") @@ -226,6 +237,11 @@ return require("packer").startup(function(use) "kristijanhusak/vim-dadbod-completion", "tpope/vim-dotenv", }, + cmd = "DBUI", + keys = "<leader><leader>db", + config = function () + require('alpha.database') + end }) -- Rest client @@ -247,7 +263,17 @@ return require("packer").startup(function(use) "phaazon/mind.nvim", branch = "v2.2", requires = { "nvim-lua/plenary.nvim" }, - cmd = { "MindOpenMain", "MindOpenProject" } + cmd = { "MindOpenMain", "MindOpenProject" }, + config = function () + local dirs = {} + if vim.fn.isdirectory("/mnt/nas/alpha/mind/data") then + dirs = { + state_path = "/mnt/nas/alpha/mind/mind.json", + data_dir = "/mnt/nas/alpha/mind/data", + } + end + require('mind').setup({ persistence = dirs}) + end }) use { |