Skip to content

Commit

Permalink
Fix neovim LSP issues
Browse files Browse the repository at this point in the history
  • Loading branch information
SingularisArt committed Jul 22, 2023
1 parent 892c096 commit 4707f46
Show file tree
Hide file tree
Showing 4 changed files with 104 additions and 42 deletions.
4 changes: 3 additions & 1 deletion aspects/nvim/files/.config/nvim/lazy-lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
"darkplus.nvim": { "branch": "main", "commit": "6101ffce60682208e9e076710299d189ce11c40d" },
"diffview.nvim": { "branch": "main", "commit": "e91110d2a7f8e2f667666aba6ea089ff823f8748" },
"dressing.nvim": { "branch": "master", "commit": "39611852fd7bbac117e939a26759bb37361f0c90" },
"dropbar.nvim": { "branch": "master", "commit": "90fc6aa051d31f22b512f967cd1485dc0d1cf32a" },
"edge": { "branch": "master", "commit": "358cb6688ac577470a4eafcb53bdd63899dfc937" },
"emmet-vim": { "branch": "master", "commit": "def5d57a1ae5afb1b96ebe83c4652d1c03640f4d" },
"everforest": { "branch": "master", "commit": "1db527e770deb8cbb3b5b60d8921f80bd2a4c12c" },
Expand All @@ -40,13 +39,15 @@
"guihua.lua": { "branch": "master", "commit": "ab8b1f09603cc268770efd057115035dc6cfa83d" },
"harpoon": { "branch": "master", "commit": "21f4c47c6803d64ddb934a5b314dcb1b8e7365dc" },
"horizon.nvim": { "branch": "master", "commit": "f7c758f0ebd47a72dd2832a8744340e72dad62f8" },
"incline.nvim": { "branch": "main", "commit": "71a03756a5f750c79a2889a80fcd8bbff7083690" },
"indent-blankline.nvim": { "branch": "master", "commit": "4541d690816cb99a7fc248f1486aa87f3abce91c" },
"inlay-hints.nvim": { "branch": "main", "commit": "006b0898f5d3874e8e528352103733142e705834" },
"lazy.nvim": { "branch": "main", "commit": "ed15f6b39422f46412212005f6d12c6f353b0293" },
"linediff.vim": { "branch": "main", "commit": "3925a50a02b4b1e7958807676f93e06b53c66e27" },
"lir.nvim": { "branch": "master", "commit": "969e95bd07ec315b5efc53af69c881278c2b74fa" },
"lsp_lines.nvim": { "branch": "main", "commit": "f53af96d4789eef39a082dbcce078d2bfc384ece" },
"lsp_signature.nvim": { "branch": "master", "commit": "17ff7a405fea8376b015b8ea7910d2e59958bf68" },
"lualine.nvim": { "branch": "master", "commit": "05d78e9fd0cdfb4545974a5aa14b1be95a86e9c9" },
"magma-nvim": { "branch": "main", "commit": "ff3deba8a879806a51c005e50782130246143d06" },
"markdown-preview.nvim": { "branch": "master", "commit": "02cc3874738bc0f86e4b91f09b8a0ac88aef8e96" },
"markdowny.nvim": { "branch": "main", "commit": "083782f05e67cc08c6378affec9f55a913ac55f4" },
Expand All @@ -72,6 +73,7 @@
"neotest-vim-test": { "branch": "master", "commit": "75c4228882ae4883b11bfce9b8383e637eb44192" },
"nightfox.nvim": { "branch": "main", "commit": "77aa7458d2b725c2d9ff55a18befe1b891ac473e" },
"noctis.nvim": { "branch": "main", "commit": "6a0c8d18e1f983ac8a179f7b9055db046eaedef0" },
"noice.nvim": { "branch": "main", "commit": "06d05c667356b91e10c6714b9f540d10ad27194a" },
"nordic.nvim": { "branch": "main", "commit": "683b24866856f9b883f73b8c10b11a54074f2a2f" },
"nui.nvim": { "branch": "main", "commit": "9e3916e784660f55f47daa6f26053ad044db5d6a" },
"null-ls.nvim": { "branch": "main", "commit": "db09b6c691def0038c456551e4e2772186449f35" },
Expand Down
2 changes: 1 addition & 1 deletion aspects/nvim/files/.config/nvim/lua/config/options.lua
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ opt.grepformat = "%f:%l:%c:%m"
opt.grepprg = "rg --vimgrep"
opt.ignorecase = true -- Ignore case
opt.inccommand = "nosplit" -- Preview incremental substitute
opt.laststatus = 0 -- No statusbar
opt.laststatus = 3 -- Make statusbar cover entire area
opt.list = true -- Show some invisible characters (tabs...
opt.mouse = "a" -- Enable mouse mode
opt.number = true -- Print line number
Expand Down
38 changes: 19 additions & 19 deletions aspects/nvim/files/.config/nvim/lua/plugins/lsp/null-ls.lua
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ local sources = {
formatting.sql_formatter,
formatting.stylua,
formatting.shellharden,
-- formatting.clang_format,
formatting.clang_format,
formatting.format_r,
formatting.prettier.with({
extra_filetypes = { "toml", "solidity" },
Expand All @@ -34,7 +34,7 @@ local sources = {
}),

diagnostics.yamllint,
-- diagnostics.cppcheck,
diagnostics.cppcheck,
diagnostics.shellcheck,
diagnostics.golangci_lint,
diagnostics.flake8,
Expand All @@ -43,24 +43,24 @@ local sources = {
code_actions.proselint,
code_actions.refactoring,

-- diagnostics.misspell.with({
-- filetypes = { "markdown", "text", "txt" },
-- args = { "$FILENAME" },
-- }),
-- diagnostics.write_good.with({
-- filetypes = { "markdown" },
-- extra_filetypes = { "txt", "text" },
-- args = { "--text=$TEXT", "--parse" },
-- command = "write-good",
-- }),
-- diagnostics.proselint.with({
-- filetypes = { "markdown", },
-- extra_filetypes = { "txt", "text" },
-- command = "proselint",
-- args = { "--json" },
-- }),
diagnostics.misspell.with({
filetypes = { "markdown", "text", "txt" },
args = { "$FILENAME" },
}),
diagnostics.write_good.with({
filetypes = { "markdown" },
extra_filetypes = { "txt", "text" },
args = { "--text=$TEXT", "--parse" },
command = "write-good",
}),
diagnostics.proselint.with({
filetypes = { "markdown", },
extra_filetypes = { "txt", "text" },
command = "proselint",
args = { "--json" },
}),

-- actions.proselint.with({ filetypes = { "markdown" }, command = "proselint", args = { "--json" } }),
actions.proselint.with({ filetypes = { "markdown" }, command = "proselint", args = { "--json" } }),

hover.dictionary,
hover.printenv,
Expand Down
102 changes: 81 additions & 21 deletions aspects/nvim/files/.config/nvim/lua/plugins/ui/init.lua
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,66 @@ return {
cmd = "ZenMode",
},

-- noicer ui
{
"folke/noice.nvim",
config = function()
local noice = require("noice")
noice.setup({
lsp = {
override = {
["vim.lsp.util.convert_input_to_markdown_lines"] = true,
["vim.lsp.util.stylize_markdown"] = true,
["cmp.entry.get_documentation"] = true,
},
hover = {
enabled = false,
view = nil,
opts = {},
},
signature = {
enabled = false,
auto_open = {
enabled = true,
trigger = true,
luasnip = true,
throttle = 50,
},
view = nil,
opts = {},
},
},
presets = {
bottom_search = false,
command_palette = true,
long_message_to_split = true,
inc_rename = false,
lsp_doc_border = false,
},
views = {
cmdline_popup = {
border = {
style = "rounded",
padding = { 0, 0 },
},
filter_options = {},
},
},
routes = {
{
filter = {
event = "UltiSnips#JumpForwads()",
kind = "",
find = "written",
},
opts = { skip = true },
},
},
})
end,
event = "VeryLazy",
},

{
"folke/twilight.nvim",
config = function()
Expand Down Expand Up @@ -244,27 +304,27 @@ return {
},
},

-- {
-- "b0o/incline.nvim",
-- event = "BufReadPre",
-- config = function()
-- -- local colors = require("tokyonight.colors").setup()
-- require("incline").setup({
-- highlight = {
-- groups = {
-- InclineNormal = { guibg = "#FC56B1", guifg = "000" },
-- InclineNormalNC = { guifg = "#FC56B1", guibg = "000" },
-- },
-- },
-- window = { margin = { vertical = 0, horizontal = 1 } },
-- render = function(props)
-- local filename = vim.fn.fnamemodify(vim.api.nvim_buf_get_name(props.buf), ":t")
-- local icon, color = require("nvim-web-devicons").get_icon_color(filename)
-- return { { icon, guifg = color }, { " " }, { filename } }
-- end,
-- })
-- end,
-- },
{
"b0o/incline.nvim",
event = "BufReadPre",
config = function()
-- local colors = require("tokyonight.colors").setup()
require("incline").setup({
highlight = {
groups = {
InclineNormal = { guibg = "#FC56B1", guifg = "000" },
InclineNormalNC = { guifg = "#FC56B1", guibg = "000" },
},
},
window = { margin = { vertical = 0, horizontal = 1 } },
render = function(props)
local filename = vim.fn.fnamemodify(vim.api.nvim_buf_get_name(props.buf), ":t")
local icon, color = require("nvim-web-devicons").get_icon_color(filename)
return { { icon, guifg = color }, { " " }, { filename } }
end,
})
end,
},

{
"NvChad/nvim-colorizer.lua",
Expand Down

0 comments on commit 4707f46

Please sign in to comment.