diff --git a/lua/cosmic/core/pluginsInit.lua b/lua/cosmic/core/pluginsInit.lua index a5777e7..8afbcfd 100644 --- a/lua/cosmic/core/pluginsInit.lua +++ b/lua/cosmic/core/pluginsInit.lua @@ -103,29 +103,7 @@ return packer.startup(function() 'ray-x/lsp_signature.nvim', }, config = function() - local diagnostic = {} - local hover = {} - local signature_help = {} - local user_config = require('cosmic.config') - local icons = require('cosmic.theme.icons') - - if user_config and user_config.lsp and user_config.lsp.diagnostic then - diagnostic = user_config.lsp.diagnostic - end - if user_config and user_config.lsp and user_config.lsp.hover then - hover = user_config.lsp.hover - end - if user_config and user_config.lsp and user_config.lsp.signature_help then - signature_help = user_config.lsp.signature_help - end - - require('cosmic-ui').setup({ - border = 'rounded', - icons = icons, - diagnostic = diagnostic, - hover = hover, - signature_help = signature_help, - }) + require('cosmic.plugins.cosmic-ui') end, after = 'nvim-lspconfig', }) @@ -157,7 +135,7 @@ return packer.startup(function() config = function() require('cosmic.plugins.auto-pairs') end, - after = 'cmp-path', + after = 'nvim-cmp', }, }, event = 'InsertEnter', diff --git a/lua/cosmic/plugins/cosmic-ui/init.lua b/lua/cosmic/plugins/cosmic-ui/init.lua new file mode 100644 index 0000000..6f8efc0 --- /dev/null +++ b/lua/cosmic/plugins/cosmic-ui/init.lua @@ -0,0 +1,23 @@ +local diagnostic = {} +local hover = {} +local signature_help = {} +local user_config = require('cosmic.config') +local icons = require('cosmic.theme.icons') + +if user_config and user_config.lsp and user_config.lsp.diagnostic then + diagnostic = user_config.lsp.diagnostic +end +if user_config and user_config.lsp and user_config.lsp.hover then + hover = user_config.lsp.hover +end +if user_config and user_config.lsp and user_config.lsp.signature_help then + signature_help = user_config.lsp.signature_help +end + +require('cosmic-ui').setup({ + border = 'rounded', + icons = icons, + diagnostic = diagnostic, + hover = hover, + signature_help = signature_help, +}) diff --git a/lua/cosmic/plugins/terminal/init.lua b/lua/cosmic/plugins/terminal/init.lua index a46fab4..cc7845e 100644 --- a/lua/cosmic/plugins/terminal/init.lua +++ b/lua/cosmic/plugins/terminal/init.lua @@ -4,4 +4,5 @@ local title = vim.env.SHELL g.floaterm_width = 0.7 g.floaterm_height = 0.8 g.floaterm_title = '[' .. title .. ']:($1/$2)' +g.floaterm_borderchars = '─│─│╭╮╯╰' g.floaterm_opener = 'vsplit'