swytch/dotfiles
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

Merge branch 'dev' into mercury

Browse Source 
dwm: update to 6.3 (fresh restart)
nvim: update to 0.7
    change keymap API
    update LSP installation
    lua tabstop=8->4
    remove unused plugins
This commit is contained in:
David JULIEN 2022-04-27 22:47:51 +02:00
commit ce0709a0b1
Signed by: swytch
GPG Key ID: 498590A3AA82A06F
20 changed files with 658 additions and 668 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
.config/nvim/after/ftplugin/c.lua
View File

@ -4,10 +4,10 @@
-- Description : c settings file -- Description : c settings file
local opt = vim.opt local opt = vim.opt
local g = vim.g local g = vim.g
opt.formatoptions = "trq1jp" opt.formatoptions = "trq1jp"
-- Snippets -- Snippets
local ls = require("luasnip") local ls = require("luasnip")
@ -21,14 +21,14 @@ local f = ls.function_node
local copy = utils.copy local copy = utils.copy
ls.snippets = { ls.snippets = {
c = { c = {
s("main", { s("main", {
t({ "int main(int argc, char* argv[])" }), t({ "int main(int argc, char* argv[])" }),
t({ "", "{", "\t" }), t({ "", "{", "\t" }),
i(0), i(0),
t({ "", "\treturn 0;"}), t({ "", "\treturn 0;"}),
t({ "", "}"}), t({ "", "}"}),
}), }),
s("fn", { s("fn", {
-- Simple static text. -- Simple static text.
t("//Parameters: "), t("//Parameters: "),
@ -43,9 +43,9 @@ ls.snippets = {
i(2, "int foo"), i(2, "int foo"),
-- Linebreak -- Linebreak
t({ ")", "{", "\t" }), t({ ")", "{", "\t" }),
i(0), i(0),
t({ "", "\treturn 0;"}), t({ "", "\treturn 0;"}),
t({ "", "}"}), t({ "", "}"}),
}), }),
}, },
} }

3
.config/nvim/after/ftplugin/lua.lua
View File

@ -6,4 +6,5 @@
local opt = vim.opt local opt = vim.opt
local g = vim.g local g = vim.g
opt.formatoptions = "trq1jp" opt.formatoptions = "trq1jp"
opt.tabstop = 4

185
.config/nvim/after/ftplugin/tex.lua
View File

@ -4,11 +4,10 @@
-- Description : tex filetype config -- Description : tex filetype config
local opt = vim.opt local opt = vim.opt
local g = vim.g
opt.formatoptions = "trq1jp" opt.formatoptions = "trq1jp"
opt.tabstop = 4 opt.tabstop = 4
-- Caps -- Caps
utils.map("i", "AA", "À") utils.map("i", "AA", "À")
@ -23,15 +22,15 @@ utils.map("i", "<Space>:", "\\,:")
local ls = require("luasnip") local ls = require("luasnip")
-- some shorthands... -- some shorthands...
local s = ls.snippet local s = ls.snippet
local sn = ls.snippet_node local sn = ls.snippet_node
local t = ls.text_node local t = ls.text_node
local i = ls.insert_node local i = ls.insert_node
local f = ls.function_node local f = ls.function_node
local c = ls.choice_node local c = ls.choice_node
local d = ls.dynamic_node local d = ls.dynamic_node
local copy = utils.copy local copy = utils.copy
-- 'recursive' dynamic snippet. Expands to some text followed by itself. -- 'recursive' dynamic snippet. Expands to some text followed by itself.
local function rec_ls() local function rec_ls()
@ -46,85 +45,85 @@ local function rec_ls()
end end
ls.snippets = { ls.snippets = {
tex = { tex = {
-- rec_ls is self-referencing. That makes this snippet 'infinite' eg. have as many -- rec_ls is self-referencing. That makes this snippet 'infinite' eg. have as many
-- \item as necessary by utilizing a choiceNode. -- \item as necessary by utilizing a choiceNode.
s("ls", { s("ls", {
t({ "\\begin{itemize}", "\t\\item " }), t({ "\\begin{itemize}", "\t\\item " }),
i(1), i(1),
t({ "" }), t({ "" }),
d(2, rec_ls, {}), d(2, rec_ls, {}),
t({ "", "\\end{itemize}", "" }), t({ "", "\\end{itemize}", "" }),
}), }),
s("lsl", { s("lsl", {
t({ "\\begin{itemize}[label=" }), t({ "\\begin{itemize}[label=" }),
i(1), i(1),
t( { "]", "\t\\item " }), t( { "]", "\t\\item " }),
i(2), i(2),
t({ "" }), t({ "" }),
d(3, rec_ls, {}), d(3, rec_ls, {}),
t({ "", "\\end{itemize}", "" }), t({ "", "\\end{itemize}", "" }),
}), }),
s("frm", { s("frm", {
t({ "\\begin{" }), t({ "\\begin{" }),
i(1), i(1),
t({ "}[" }), t({ "}[" }),
i(2), i(2),
t({ "]{" }), t({ "]{" }),
f(copy, 1), f(copy, 1),
t({ ":" }), t({ ":" }),
i(3, "foo"), i(3, "foo"),
t({ "}", "\t" }), t({ "}", "\t" }),
i(0), i(0),
t({ "", "\\end{" }), t({ "", "\\end{" }),
f(copy, 1), f(copy, 1),
t({ "}", "" }), t({ "}", "" }),
}), }),
s("env", { s("env", {
t({ "\\begin{" }), t({ "\\begin{" }),
i(1, "foo"), i(1, "foo"),
t({ "}", "\t" }), t({ "}", "\t" }),
i(2), i(2),
t({ "", "\\end{" }), t({ "", "\\end{" }),
f(copy,1), f(copy,1),
t({ "}"}), t({ "}"}),
}), }),
s("tikz", { s("tikz", {
t({ "\\begin{center}" }), t({ "\\begin{center}" }),
t({ "", "\t\\begin{tikzpicture}[main/.style = {draw,circle}]", "\t\t" }), t({ "", "\t\\begin{tikzpicture}[main/.style = {draw,circle}]", "\t\t" }),
i(1), i(1),
t({ "", "\t\\end{tikzpicture}", "\\end{center}" }), t({ "", "\t\\end{tikzpicture}", "\\end{center}" }),
}), }),
s("ra", { t( "\\rightarrow" )}), s("ra", { t( "\\rightarrow" )}),
s("Ra", { t("\\Rightarrow" )}), s("Ra", { t("\\Rightarrow" )}),
s("la", { t("\\leftarrow" )}), s("la", { t("\\leftarrow" )}),
s("La", { t("\\Leftarrow" )}), s("La", { t("\\Leftarrow" )}),
s("lra", { t("\\leftrightarrow" )}), s("lra", { t("\\leftrightarrow" )}),
s("Lra", { t("\\Leftrightarrow" )}), s("Lra", { t("\\Leftrightarrow" )}),
s("bb", { s("bb", {
t({ "\\textbf{" }), t({ "\\textbf{" }),
i(1), i(1),
t({ "}"}), t({ "}"}),
}), }),
s("tt", { s("tt", {
t({ "\\texttt{" }), t({ "\\texttt{" }),
i(1), i(1),
t({ "}"}), t({ "}"}),
}), }),
s("ii", { s("ii", {
t({ "\\textit{" }), t({ "\\textit{" }),
i(1), i(1),
t({ "}"}), t({ "}"}),
}), }),
s("uu", { s("uu", {
t({ "\\underline{" }), t({ "\\underline{" }),
i(1), i(1),
t({ "}"}), t({ "}"}),
}), }),
s("fsc", { s("fsc", {
t({ "\\textsc{" }), t({ "\\textsc{" }),
i(1), i(1),
t({ "}"}), t({ "}"}),
}), }),
}, },
} }

2
.config/nvim/lua/colorscheme.lua
View File

@ -9,5 +9,5 @@ local file = os.getenv("XDG_STATE_HOME") .. "/nvim_colorscheme"
local colorscheme = utils.lines_from(file)[0] local colorscheme = utils.lines_from(file)[0]
require("astronomy").setup { require("astronomy").setup {
variant = colorscheme, variant = colorscheme,
} }

12
.config/nvim/lua/globals.lua
View File

@ -6,13 +6,11 @@
local M = {} -- The module to export local M = {} -- The module to export
M = { M = {
lsp_path = vim.fn.stdpath("data").. "/lsp", -- misc
sign_error = "",
-- misc sign_warning = "",
sign_error = "", sign_hint = "",
sign_warning = "", sign_info = "",
sign_hint = "",
sign_info = "",
} }
-- Make it accessible everywhere -- Make it accessible everywhere

20
.config/nvim/lua/lsp/c.lua
View File

@ -1,20 +0,0 @@
-- Author : swytch
-- Created : Tuesday May 18, 2021 12:08:51 CET
-- License : GPLv3
-- Description : clangd config file for lsp
-- The nvim-cmp almost supports LSP's capabilities so You should advertise it to LSP servers..
local capabilities = vim.lsp.protocol.make_client_capabilities()
capabilities = require('cmp_nvim_lsp').update_capabilities(capabilities)
require("lspconfig").clangd.setup {
cmd = { "clangd",
"--background-index",
"--suggest-missing-includes",
"--clang-tidy",
"--header-insertion=iwyu"
},
-- The following example advertise capabilities to `clangd`.
capabilities = capabilities,
}

80
.config/nvim/lua/lsp/init.lua
View File

@ -1,80 +0,0 @@
-- Author : swytch
-- Created : Tuesday May 18, 2021 12:08:51 CET
-- License : GPLv3
-- Description : neovim lsp config file
local M = {}
vim.fn.sign_define(
"DiagnosticSignError",
{
texthl = "DiagnosticVirtualTextError",
text = globals.sign_error,
numhl = "DiagnosticSignError"
}
)
vim.fn.sign_define(
"DiagnosticSignWarn",
{
texthl = "DiagnosticVirtualTextWarn",
text = globals.sign_warning,
numhl = "DiagnosticSignWarn"
}
)
vim.fn.sign_define(
"DiagnosticSignHint",
{
texthl = "DiagnosticVirtualTextHint",
text = globals.sign_hint,
numhl = "DiagnosticSignHint"
}
)
vim.fn.sign_define(
"DiagnosticSignInfo",
{
texthl = "DiagnosticVirtualTextInfo",
text = globals.sign_info,
numhl = "DiagnosticSignInfo"
}
)
M.icons = {
Class = "",
Color = "",
Constant = " µ ",
Constructor = "",
Enum = "",
EnumMember = "",
Event = "",
Field = "",
File = "",
Folder = "",
Function = "",
Keyword = "",
Interface = "",
Method = "",
Module = "",
Operator = "",
Property = "",
Reference = "",
Snippet = "",
Struct = "",
Text = "",
TypeParameter = "",
Unit = "",
Value = "",
Variable = "",
}
function M.setup()
local kinds = vim.lsp.protocol.CompletionItemKind
for i, kind in ipairs(kinds) do
kinds[i] = M.icons[kind] or kind
end
local ft = vim.bo.filetype
if ft == "cpp" then ft = "c" end
require("lsp." .. ft) -- ./<ft>.lua
end
return M

40
.config/nvim/lua/lsp/lua.lua
View File

@ -1,40 +0,0 @@
-- Author : swytch
-- Created : Tuesday May 18, 2021 12:08:51 CET
-- License : GPLv3
-- Description : sumneko (lua) config file for lsp
-- set the path to the sumneko installation; if you previously installed via the now deprecated :LspInstall, use
local sumneko_root_path = vim.fn.stdpath("data") ..
"/lsp_servers/sumneko_lua/extension/server"
local sumneko_binary = sumneko_root_path .. "/bin/" .. "/lua-language-server"
local runtime_path = vim.split(package.path, ';')
table.insert(runtime_path, "lua/?.lua")
table.insert(runtime_path, "lua/?/init.lua")
require'lspconfig'.sumneko_lua.setup {
cmd = {sumneko_binary, "-E", sumneko_root_path .. "/main.lua"};
settings = {
Lua = {
runtime = {
-- Tell the language server which version of Lua you're using (most likely LuaJIT in the case of Neovim)
version = 'LuaJIT',
-- Setup your lua path
path = runtime_path,
},
diagnostics = {
-- Get the language server to recognize the `vim` global
globals = {"vim", "use", "globals", "utils"},
},
workspace = {
-- Make the server aware of Neovim runtime files
library = vim.api.nvim_get_runtime_file("", true),
},
-- Do not send telemetry data containing a randomized but unique identifier
telemetry = {
enable = false,
},
},
},
}

8
.config/nvim/lua/lsp/python.lua
View File

@ -1,8 +0,0 @@
-- Author : swytch
-- Created : Tuesday May 18, 2021 15:03:43 CET
-- License : GPLv3
-- Description : jedi (python) config file for lsp
require("lspconfig").jedi_language_server.setup{
cmd = { vim.fn.stdpath("data") .. "/lsp_servers/jedi_language_server/venv/bin/jedi-language-server" }
}

13
.config/nvim/lua/lsp/tex.lua
View File

@ -1,13 +0,0 @@
-- Author : swytch
-- Created : Saturday May 23, 2021 10:34:53 CET
-- License : GPLv3
-- Description : LaTeX config file for lsp
require("lspconfig").texlab.setup {
cmd = { vim.fn.stdpath("data") .. "/lsp_servers/latex/texlab" },
settings = {
build = {
executable = "pdflatex"
}
}
}

41
.config/nvim/lua/maps.lua
View File

@ -3,30 +3,31 @@
-- License : GPLv3 -- License : GPLv3
-- Description : neovim mappings file -- Description : neovim mappings file
utils.map("n", "<space>", "<leader>") vim.keymap.set({ "n", "v" }, "<space>", "<Nop>", { silent = true })
utils.map("n", "<leader>y", "\"+y") vim.g.mapleader = " "
utils.map("n", "<leader>p", "\"+P")
utils.map("n", "<leader><enter>", "<cmd>w! | !compiler %<CR>")
utils.map("n", "<leader>u", "<cmd>PackerSync<CR>")
utils.map("n", "<leader>c", "<cmd>ColorizerToggle<CR>")
-- LSP -- Dealing with word wrap
utils.map("n", "gd", "<cmd>lua vim.lsp.buf.definition()<CR>") vim.keymap.set("n", "k", "v:count == 0 ? 'gk' : 'k'",
utils.map("n", "gD", "<cmd>lua vim.lsp.buf.declaration()<CR>") { expr = true, silent = true })
utils.map("n", "gr", "<cmd>lua vim.lsp.buf.references()<CR>") vim.keymap.set("n", "j", "v:count == 0 ? 'gj' : 'j'",
utils.map("n", "gi", "<cmd>lua vim.lsp.buf.implementation()<CR>") { expr = true, silent = true })
utils.map("n", "<leader>ln", "<cmd>lua vim.diagnostic.goto_next()<CR>")
utils.map("n", "<leader>lp", "<cmd>lua vim.diagnostic.goto_prev()<CR>") vim.keymap.set("n", "<leader>y", "\"+y")
utils.map("n", "<leader>lf", "<cmd>lua vim.lsp.buf.formatting()<CR>") vim.keymap.set("n", "<leader>p", "\"+P")
vim.keymap.set("n", "<leader><enter>", "<cmd>w! | !compiler %<CR>")
vim.keymap.set("n", "<leader>u", function() require("packer").sync() end)
-- telescope -- telescope
utils.map("n", "<leader>ff", "<cmd>Telescope find_files<CR>") vim.keymap.set("n", "<leader>ff",
utils.map("n", "<leader>fb", "<cmd>Telescope buffers<CR>") function() require("telescope.builtin").find_files() end)
utils.map("n", "<leader>fl", "<cmd>Telescope live_grep<CR>") vim.keymap.set("n", "<leader>fb",
function() require("telescope.builtin").buffers() end)
vim.keymap.set("n", "<leader>fl",
function() require("telescope.builtin").live_grep() end)
-- colorscheme -- colorscheme
utils.map("n", "<C-s>", "<cmd>lua require(\"astronomy\").toggle_variant()<CR>") vim.keymap.set("n", "<C-s>",
function() require("astronomy").toggle_variant() end)
-- snippets -- snippets
utils.map("i", "<C-E>", "<Plug>luasnip-next-choice", {}) vim.keymap.set({ "i", "s" }, "<C-E>", "<Plug>luasnip-next-choice")
utils.map("s", "<C-E>", "<Plug>luasnip-next-choice", {})

132
.config/nvim/lua/plugin/cmp.lua
View File

@ -8,76 +8,76 @@ local luasnip = require("luasnip")
local cmp_autopairs = require('nvim-autopairs.completion.cmp') local cmp_autopairs = require('nvim-autopairs.completion.cmp')
local check_backspace = function() local check_backspace = function()
local line, col = unpack(vim.api.nvim_win_get_cursor(0)) local line, col = unpack(vim.api.nvim_win_get_cursor(0))
return col ~= 0 and return col ~= 0 and
vim.api.nvim_buf_get_lines(0, line - 1, line, true)[1]: vim.api.nvim_buf_get_lines(0, line - 1, line, true)[1]:
sub(col, col):match('%s') == nil sub(col, col):match('%s') == nil
end end
-- If you want insert `(` after select function or method item -- If you want insert `(` after select function or method item
cmp.event:on( 'confirm_done', cmp_autopairs.on_confirm_done({ map_char = { tex = '' } })) cmp.event:on( 'confirm_done', cmp_autopairs.on_confirm_done({ map_char = { tex = '' } }))
cmp.setup { cmp.setup {
completion = { completion = {
autocomplete = false autocomplete = false
}, },
sources = { sources = {
{ name = "path" }, { name = "path" },
{ name = "luasnip" }, { name = "luasnip" },
{ name = "nvim_lsp" }, { name = "nvim_lsp" },
{ name = "buffer" }, { name = "buffer" },
{ name = "nvim_lua" }, { name = "nvim_lua" },
{ name = "calc" }, { name = "calc" },
{ name = "spell" }, { name = "spell" },
{ name = "treesitter" }, { name = "treesitter" },
}, },
formatting = { formatting = {
format = function(entry, vim_item) format = function(entry, vim_item)
vim_item.menu = ({ vim_item.menu = ({
nvim_lsp = "[lsp]", nvim_lsp = "[lsp]",
nvim_lua = "[nvim]", nvim_lua = "[nvim]",
luasnip = "[snip]", luasnip = "[snip]",
path = "[path]", path = "[path]",
buffer = "[buff]", buffer = "[buff]",
calc = "[calc]", calc = "[calc]",
spell = "[spel]", spell = "[spel]",
treesitter = "[tree]", treesitter = "[tree]",
})[entry.source.name] })[entry.source.name]
return vim_item return vim_item
end, end,
}, },
snippet = { snippet = {
expand = function(args) expand = function(args)
require("luasnip").lsp_expand(args.body) require("luasnip").lsp_expand(args.body)
end, end,
}, },
mapping = { mapping = {
["<C-d>"] = cmp.mapping.scroll_docs(-4), ["<C-d>"] = cmp.mapping.scroll_docs(-4),
["<C-f>"] = cmp.mapping.scroll_docs(4), ["<C-f>"] = cmp.mapping.scroll_docs(4),
["<C-e>"] = cmp.mapping.close(), ["<C-e>"] = cmp.mapping.close(),
["<CR>"] = cmp.mapping.confirm({ ["<CR>"] = cmp.mapping.confirm({
behavior = cmp.ConfirmBehavior.Replace, behavior = cmp.ConfirmBehavior.Replace,
select = true, select = true,
}), }),
["<Tab>"] = cmp.mapping(function(fallback) ["<Tab>"] = cmp.mapping(function(fallback)
if cmp.visible() then if cmp.visible() then
cmp.select_next_item() cmp.select_next_item()
elseif luasnip.expand_or_jumpable() then elseif luasnip.expand_or_jumpable() then
luasnip.expand_or_jump() luasnip.expand_or_jump()
elseif check_backspace() then elseif check_backspace() then
cmp.complete() cmp.complete()
else else
fallback() fallback()
end end
end, { "i", "s" }), end, { "i", "s" }),
["<S-Tab>"] = cmp.mapping(function(fallback) ["<S-Tab>"] = cmp.mapping(function(fallback)
if cmp.visible() then if cmp.visible() then
cmp.select_prev_item() cmp.select_prev_item()
elseif luasnip.jumpable(-1) then elseif luasnip.jumpable(-1) then
luasnip.jump(-1) luasnip.jump(-1)
else else
fallback() fallback()
end end
end, { "i", "s" }), end, { "i", "s" }),
} }
} }

77
.config/nvim/lua/plugin/lsp_config.lua Normal file
View File

@ -0,0 +1,77 @@
-- Author : swytch
-- Created : Tuesday May 18, 2021 12:08:51 CET
-- License : GPLv3
-- Description : neovim lsp config file
local M = {}
vim.fn.sign_define(
"DiagnosticSignError",
{
texthl = "DiagnosticVirtualTextError",
text = globals.sign_error,
numhl = "DiagnosticSignError"
}
)
vim.fn.sign_define(
"DiagnosticSignWarn",
{
texthl = "DiagnosticVirtualTextWarn",
text = globals.sign_warning,
numhl = "DiagnosticSignWarn"
}
)
vim.fn.sign_define(
"DiagnosticSignHint",
{
texthl = "DiagnosticVirtualTextHint",
text = globals.sign_hint,
numhl = "DiagnosticSignHint"
}
)
vim.fn.sign_define(
"DiagnosticSignInfo",
{
texthl = "DiagnosticVirtualTextInfo",
text = globals.sign_info,
numhl = "DiagnosticSignInfo"
}
)
M.icons = {
Class = "",
Color = "",
Constant = " µ ",
Constructor = "",
Enum = "",
EnumMember = "",
Event = "",
Field = "",
File = "",
Folder = "",
Function = "",
Keyword = "",
Interface = "",
Method = "",
Module = "",
Operator = "",
Property = "",
Reference = "",
Snippet = "",
Struct = "",
Text = "",
TypeParameter = "",
Unit = "",
Value = "",
Variable = "",
}
function M.setup()
local kinds = vim.lsp.protocol.CompletionItemKind
for i, kind in ipairs(kinds) do
kinds[i] = M.icons[kind] or kind
end
end
return M

108
.config/nvim/lua/plugin/lsp_installer.lua
View File

@ -9,20 +9,18 @@ lsp_installer.settings {
ui = { ui = {
icons = { icons = {
server_installed = "✓", server_installed = "✓",
server_pending = "➜", server_pending = "o",
server_uninstalled = "✗" server_uninstalled = "x"
} }
} }
} }
local servers = { local servers = {
"bashls", "clangd",
"jedi_language_server",
"texlab",
"sumneko_lua", "sumneko_lua",
} }
for _, name in pairs(servers) do for _, name in ipairs(servers) do
local ok, server = lsp_installer.get_server(name) local ok, server = lsp_installer.get_server(name)
-- Check that the server is supported in nvim-lsp-installer -- Check that the server is supported in nvim-lsp-installer
if ok then if ok then
@ -33,15 +31,99 @@ for _, name in pairs(servers) do
end end
end end
local lsp_root_path = vim.fn.stdpath("data") .. "/lsp_servers/"
local runtime_path = vim.split(package.path, ';')
local clangd_binary = lsp_root_path .. "clangd/clangd/bin/clangd"
table.insert(runtime_path, "lua/?.lua")
table.insert(runtime_path, "lua/?/init.lua")
local enhance_server_opts = {
["clangd"] = function(opts)
opts.settings = {
cmd = { clangd_binary,
"--background-index",
"--suggest-missing-includes",
"--clang-tidy",
"--header-insertion=iwyu"
},
}
end,
["sumneko_lua"] = function(opts)
opts.settings = {
Lua = {
runtime = {
-- Tell the language server which version of Lua you're
-- using (most likely LuaJIT in the case of Neovim)
version = 'LuaJIT',
-- Setup your lua path
path = runtime_path,
},
diagnostics = {
-- Get the language server to recognize the `vim` global
globals = {
"vim",
"globals",
"utils"
},
},
workspace = {
-- Make the server aware of Neovim runtime files
library =
vim.api.nvim_get_runtime_file("", true),
},
-- Do not send telemetry data containing a randomized but
-- unique identifier
telemetry = {
enable = false,
},
},
}
end,
}
local on_attach = function(_, bufnr)
local opts = { buffer = bufnr }
vim.keymap.set("n", "gD", vim.lsp.buf.declaration, opts)
vim.keymap.set("n", "gd", vim.lsp.buf.definition, opts)
vim.keymap.set("n", "gr", vim.lsp.buf.references, opts)
vim.keymap.set("n", "K", vim.lsp.buf.hover, opts)
vim.keymap.set("n", "gi", vim.lsp.buf.implementation, opts)
vim.keymap.set("n", "<leader>ln", vim.diagnostic.goto_next, opts)
vim.keymap.set("n", "<leader>lp", vim.diagnostic.goto_prev, opts)
vim.keymap.set("n", "<leader>lf", vim.lsp.buf.formatting, opts)
vim.keymap.set("n", "<C-k>", vim.lsp.buf.signature_help, opts)
vim.keymap.set("n", "<leader>wa",
vim.lsp.buf.add_workspace_folder, opts)
vim.keymap.set("n", "<leader>wr",
vim.lsp.buf.remove_workspace_folder, opts)
vim.keymap.set("n", "<leader>wl", function()
vim.inspect(vim.lsp.buf.list_workspace_folders())
end, opts)
vim.keymap.set("n", "<leader>D", vim.lsp.buf.type_definition, opts)
vim.keymap.set("n", "<leader>rn", vim.lsp.buf.rename, opts)
vim.keymap.set("n", "<leader>ca", vim.lsp.buf.code_action, opts)
vim.keymap.set("n", "<leader>so",
require("telescope.builtin").lsp_document_symbols, opts)
end
-- nvim-cmp supports additional completion capabilities
local capabilities = vim.lsp.protocol.make_client_capabilities()
capabilities = require("cmp_nvim_lsp").update_capabilities(capabilities)
lsp_installer.on_server_ready(function(server) lsp_installer.on_server_ready(function(server)
local opts = {} -- Specify the default options which we'll use to setup all servers
local opts = {
on_attach = on_attach,
capabilities = capabilities,
}
-- (optional) Customize the options passed to the server if enhance_server_opts[server.name] then
-- if server.name == "tsserver" then -- Enhance the default opts with the server-specific ones
-- opts.root_dir = function() ... end enhance_server_opts[server.name](opts)
-- end end
-- This setup() function is exactly the same as lspconfig's setup function (:help lspconfig-quickstart)
server:setup(opts) server:setup(opts)
vim.cmd [[ do User LspAttachBuffers ]]
end) end)

171
.config/nvim/lua/plugin/packer.lua
View File

@ -4,102 +4,101 @@
-- Description : neovim plugins file -- Description : neovim plugins file
local execute = vim.api.nvim_command local install_path = vim.fn.stdpath("data") .. "/site/pack/packer/start/packer.nvim"
local fn = vim.fn if vim.fn.empty(vim.fn.glob(install_path)) > 0 then
print("Cloning packer...")
local install_path = fn.stdpath("data").."/site/pack/packer/start/packer.nvim" PACKER_BOOTSTRAP = vim.fn.system({
"git",
if fn.empty(fn.glob(install_path)) > 0 then "clone",
fn.system({"git", "clone", "https://github.com/wbthomason/packer.nvim", install_path}) "--depth",
execute "packadd packer.nvim" "1",
"https://github.com/wbthomason/packer.nvim",
install_path,
})
vim.cmd([[packadd packer.nvim]])
print("Done.")
end end
local use = require("packer").use
return require("packer").startup(function() return require("packer").startup(function()
-- packer manages itself -- packer manages itself
use "wbthomason/packer.nvim" use "wbthomason/packer.nvim"
-- colorscheme -- colorscheme
use { use {
"~/.local/src/astronomy.nvim", "~/.local/src/astronomy.nvim",
config = function() require("colorscheme") end config = function() require("colorscheme") end
} }
-- tree-sitter -- tree-sitter
use { use {
"nvim-treesitter/nvim-treesitter", "nvim-treesitter/nvim-treesitter",
run = ":TSUpdate", run = ":TSUpdate",
config = function() require("plugin.treesitter") end config = function() require("plugin.treesitter") end
} }
-- fuzzy finder -- fuzzy finder
use { use {
"nvim-telescope/telescope.nvim", "nvim-telescope/telescope.nvim",
opt = true, requires = {
requires = { {
{ "nvim-lua/plenary.nvim",
"nvim-lua/plenary.nvim", },
opt = true {
}, "nvim-telescope/telescope-fzf-native.nvim",
{'nvim-telescope/telescope-fzf-native.nvim', run = "make"
opt = true, }
run = 'make' },
} }
},
cmd = "Telescope"
}
-- LSP -- LSP
use { use {
"williamboman/nvim-lsp-installer", "williamboman/nvim-lsp-installer",
cmd = { requires = {
"LspInstall", "neovim/nvim-lspconfig",
"LspInstallInfo" config = function()
}, require("plugin.lsp_config").setup() end
config = function() require("plugin.lsp_installer").setup() end },
} config = function() require("plugin.lsp_installer") end
}
use { -- auto completion
"neovim/nvim-lspconfig", use {
ft = { "c", "cpp", "lua", "python", "tex"}, "hrsh7th/nvim-cmp",
config = function() require("lsp").setup() end requires = {
} {
"L3MON4D3/LuaSnip",
config = function()
require("plugin.luasnip") end
},
"saadparwaiz1/cmp_luasnip",
"hrsh7th/cmp-nvim-lsp",
"hrsh7th/cmp-nvim-lua",
"hrsh7th/cmp-buffer",
"hrsh7th/cmp-path",
"hrsh7th/cmp-calc",
"ray-x/cmp-treesitter",
"f3fora/cmp-spell",
},
config = function() require("plugin.cmp") end
}
-- auto completion -- commenting, simplified
use { use {
"hrsh7th/nvim-cmp", "numToStr/Comment.nvim",
requires = { config = function() require("plugin.comment") end
{ }
"L3MON4D3/LuaSnip",
config = function()
require("plugin.luasnip") end
},
"saadparwaiz1/cmp_luasnip",
"hrsh7th/cmp-nvim-lsp",
"hrsh7th/cmp-nvim-lua",
"hrsh7th/cmp-buffer",
"hrsh7th/cmp-path",
"hrsh7th/cmp-calc",
"ray-x/cmp-treesitter",
"f3fora/cmp-spell",
},
config = function() require("plugin.cmp") end
}
-- commenting, simplified -- autopairs
use { use {
"numToStr/Comment.nvim", "windwp/nvim-autopairs",
config = function() require("plugin.comment") end config = function() require("nvim-autopairs").setup() end
} }
-- autopairs
use {
"windwp/nvim-autopairs",
config = function() require('nvim-autopairs').setup() end
}
-- display colors directly in editor -- automatically setup the config after cloning
use { if PACKER_BOOTSTRAP then
"norcalli/nvim-colorizer.lua", require("packer").sync()
cmd = "ColorizerToggle" end
}
end) end)

16
.config/nvim/lua/plugin/treesitter.lua
View File

@ -4,12 +4,12 @@
-- Description : treesitter config file -- Description : treesitter config file
require("nvim-treesitter.configs").setup { require("nvim-treesitter.configs").setup {
ensure_installed = { "c", "lua", "python", "bash", "latex", "verilog" }, ensure_installed = { "c", "lua", "python", "bash" },
ignore_install = { "javascript" }, ignore_install = { "javascript" },
highlight = { highlight = {
enable = true, enable = true,
}, },
indent = { indent = {
enable = true, enable = true,
}, },
} }

62
.config/nvim/lua/settings.lua
View File

@ -7,7 +7,7 @@ local opt = vim.opt
local g = vim.g local g = vim.g
-- general -- general
opt.wildignore = { opt.wildignore = {
".git", ".git",
"*.o", "*.class", "*.o", "*.class",
"*.jpg", "*.jpeg", "*.png", "*.jpg", "*.jpeg", "*.png",
@ -18,41 +18,41 @@ opt.wildmode = { "longest", "full" }
opt.wildoptions = "pum" opt.wildoptions = "pum"
-- editor -- editor
opt.lazyredraw = true opt.lazyredraw = true
opt.splitright = true opt.splitright = true
opt.splitbelow = true opt.splitbelow = true
opt.scrolloff = 4 opt.scrolloff = 4
opt.termguicolors = true opt.termguicolors = true
opt.background = "dark" opt.background = "dark"
opt.cursorline = true opt.cursorline = true
opt.shortmess = opt.shortmess:append { c = true } opt.shortmess = opt.shortmess:append { c = true }
opt.number = true opt.number = true
opt.relativenumber = true opt.relativenumber = true
opt.signcolumn = "yes" opt.signcolumn = "yes"
opt.listchars = { opt.listchars = {
tab = "<->", tab = "<->",
nbsp = "␣", nbsp = "␣",
trail = "·", trail = "·",
extends = ">", extends = ">",
precedes = "<", precedes = "<",
} }
opt.showmatch = true opt.showmatch = true
opt.ignorecase = true opt.ignorecase = true
opt.smartcase = true opt.smartcase = true
opt.inccommand = "split" opt.inccommand = "split"
opt.completeopt = { "menuone", "noselect" } opt.completeopt = { "menuone", "noselect" }
-- statusline -- statusline
opt.laststatus = 2 opt.laststatus = 2
opt.showmode = false opt.showmode = false
-- text, tabs, indents -- text, tabs, indents
opt.textwidth = 79 opt.textwidth = 79
opt.shiftwidth = 8 opt.shiftwidth = 8
opt.softtabstop = -1 opt.softtabstop = -1
opt.expandtab = true opt.expandtab = true
opt.shiftwidth = 0 opt.shiftwidth = 0
opt.backspace = { "indent", "eol", "start" } opt.backspace = { "indent", "eol", "start" }
-- augroups -- augroups
utils.create_augroup({ utils.create_augroup({

318
.config/nvim/lua/statusline.lua
View File

@ -6,204 +6,204 @@
local function gen_section(hl_string, items) local function gen_section(hl_string, items)
local out = "" local out = ""
for _, item in pairs(items) do for _, item in pairs(items) do
if item ~= "" then if item ~= "" then
out = out .. " " .. item out = out .. " " .. item
end
end
if out ~="" then
return hl_string .. out .. " "
else
return out
end end
end
if out ~="" then
return hl_string .. out .. " "
else
return out
end
end end
-- sensible names for vim modes -- sensible names for vim modes
local function get_mode(m) local function get_mode(m)
local mode_group = { local mode_group = {
["n"] = "Normal", ["n"] = "Normal",
["no"] = "O-Pending", ["no"] = "O-Pending",
["nov"] = "O-Pending", ["nov"] = "O-Pending",
["noV"] = "O-Pending", ["noV"] = "O-Pending",
["no"] = "O-Pending", ["no"] = "O-Pending",
["niI"] = "Normal", ["niI"] = "Normal",
["niR"] = "Normal", ["niR"] = "Normal",
["niV"] = "Normal", ["niV"] = "Normal",
["v"] = "Visual", ["v"] = "Visual",
["V"] = "V-Line", ["V"] = "V-Line",
[""] = "V-Block", [""] = "V-Block",
["s"] = "Select", ["s"] = "Select",
["S"] = "S-Line", ["S"] = "S-Line",
[""] = "S-Block", [""] = "S-Block",
["i"] = "Insert", ["i"] = "Insert",
["ic"] = "Insert", ["ic"] = "Insert",
["ix"] = "Insert", ["ix"] = "Insert",
["R"] = "Replace", ["R"] = "Replace",
["Rc"] = "Replace", ["Rc"] = "Replace",
["Rv"] = "V-Replace", ["Rv"] = "V-Replace",
["Rx"] = "Replace", ["Rx"] = "Replace",
["c"] = "Command", ["c"] = "Command",
["cv"] = "Ex", ["cv"] = "Ex",
["ce"] = "Ex", ["ce"] = "Ex",
["r"] = "Prompt", ["r"] = "Prompt",
["rm"] = "Prompt", ["rm"] = "Prompt",
["r?"] = "Prompt", ["r?"] = "Prompt",
["!"] = "Shell", ["!"] = "Shell",
["t"] = "Terminal", ["t"] = "Terminal",
} }
return mode_group[m] or "None" return mode_group[m] or "None"
end end
local function get_mode_display_name(m) local function get_mode_display_name(m)
local mode = { local mode = {
["Normal"] = "[ NRM ]", ["Normal"] = "[ NRM ]",
["O-Pending"] = "[ OTR ]", ["O-Pending"] = "[ OTR ]",
["Visual"] = "[ VSL ]", ["Visual"] = "[ VSL ]",
["V-Line"] = "[ V·L ]", ["V-Line"] = "[ V·L ]",
["V-Block"] = "[ V·B ]", ["V-Block"] = "[ V·B ]",
["Select"] = "[ SEL ]", ["Select"] = "[ SEL ]",
["S-Line"] = "[ S·L ]", ["S-Line"] = "[ S·L ]",
["S-Block"] = "[ S·B ]", ["S-Block"] = "[ S·B ]",
["Insert"] = "[ INS ]", ["Insert"] = "[ INS ]",
["Replace"] = "[ RPL ]", ["Replace"] = "[ RPL ]",
["Command"] = "[ CMD ]", ["Command"] = "[ CMD ]",
["Prompt"] = "[ PMT ]", ["Prompt"] = "[ PMT ]",
["Shell"] = "[ SHL ]", ["Shell"] = "[ SHL ]",
["Terminal"] = "[ TRM ]", ["Terminal"] = "[ TRM ]",
["None"] = "[ --- ]" ["None"] = "[ --- ]"
} }
return mode[m] return mode[m]
end end
-- get the highlight group for a mode group -- get the highlight group for a mode group
local function get_mode_color(m) local function get_mode_color(m)
local color = { local color = {
["Normal"] = "%#NormalMode#", ["Normal"] = "%#NormalMode#",
["O-Pending"] = "%#NormalMode#", ["O-Pending"] = "%#NormalMode#",
["Visual"] = "%#VisualMode#", ["Visual"] = "%#VisualMode#",
["V-Line"] = "%#VisualMode#", ["V-Line"] = "%#VisualMode#",
["V-Block"] = "%#VisualMode#", ["V-Block"] = "%#VisualMode#",
["Select"] = "%#NormalMode#", ["Select"] = "%#NormalMode#",
["S-Line"] = "%#NormalMode#", ["S-Line"] = "%#NormalMode#",
["S-Block"] = "%#NormalMode#", ["S-Block"] = "%#NormalMode#",
["Insert"] = "%#InsertMode#", ["Insert"] = "%#InsertMode#",
["Replace"] = "%#ReplaceMode#", ["Replace"] = "%#ReplaceMode#",
["Command"] = "%#CommandMode#", ["Command"] = "%#CommandMode#",
["Prompt"] = "%#NormalMode#", ["Prompt"] = "%#NormalMode#",
["Shell"] = "%#NormalMode#", ["Shell"] = "%#NormalMode#",
["Terminal"] = "%#NormalMode#", ["Terminal"] = "%#NormalMode#",
["None"] = "%#NormalMode#" ["None"] = "%#NormalMode#"
} }
return color[m] return color[m]
end end
-- from https://github.com/nvim-lua/lsp-status.nvim/blob/master/lua/lsp-status/diagnostics.lua -- from https://github.com/nvim-lua/lsp-status.nvim/blob/master/lua/lsp-status/diagnostics.lua
local function get_lsp_diagnostics(bufnr) local function get_lsp_diagnostics(bufnr)
local result = {} local result = {}
local levels = { local levels = {
errors = "Error", errors = "Error",
warnings = "Warn", warnings = "Warn",
info = "Info", info = "Info",
hints = "Hint" hints = "Hint"
} }
for k, level in pairs(levels) do for k, level in pairs(levels) do
local count = 0 local count = 0
local diags = vim.diagnostic.get(bufnr, { severity = level }) local diags = vim.diagnostic.get(bufnr, { severity = level })
for _, _ in pairs(diags) do for _, _ in pairs(diags) do
count = count + 1 count = count + 1
end
result[k] = count
end end
result[k] = count
end
return result return result
end end
local function process_diagnostics(prefix, n, hl) local function process_diagnostics(prefix, n, hl)
if n > 0 then if n > 0 then
return hl .. prefix .. n return hl .. prefix .. n
else else
return "" return ""
end end
end end
local function spell_check() local function spell_check()
if vim.wo.spell then if vim.wo.spell then
local lang = vim.o.spelllang local lang = vim.o.spelllang
return "[SPELL=" .. lang .. "]" return "[SPELL=" .. lang .. "]"
else else
return "" return ""
end end
end end
local function statusline_focused() local function statusline_focused()
local diagnostics = get_lsp_diagnostics() local diagnostics = get_lsp_diagnostics()
local mode = vim.fn.mode() local mode = vim.fn.mode()
local mg = get_mode(mode) local mg = get_mode(mode)
local accent_color = get_mode_color(mg) local accent_color = get_mode_color(mg)
local left = table.concat { local left = table.concat {
gen_section(accent_color, {get_mode_display_name(mg)}), gen_section(accent_color, {get_mode_display_name(mg)}),
gen_section("%#Middle#", {"%f"}), gen_section("%#Middle#", {"%f"}),
gen_section("%#Bottom#", {"%m", "%r"}), gen_section("%#Bottom#", {"%m", "%r"}),
gen_section( gen_section(
"%#Alert#", "%#Alert#",
{ {
process_diagnostics( process_diagnostics(
globals.sign_error .. " ", globals.sign_error .. " ",
diagnostics.errors, diagnostics.errors,
"%#DiagnosticVirtualTextError#" "%#DiagnosticVirtualTextError#"
), ),
process_diagnostics( process_diagnostics(
globals.sign_warning .. " ", globals.sign_warning .. " ",
diagnostics.warnings, diagnostics.warnings,
"%#DiagnosticVirtualTextWarn#" "%#DiagnosticVirtualTextWarn#"
), ),
process_diagnostics( process_diagnostics(
globals.sign_info .. " ", globals.sign_info .. " ",
diagnostics.info, diagnostics.info,
"%#DiagnosticVirtualTextInfo#" "%#DiagnosticVirtualTextInfo#"
) )
}
)
} }
local right = table.concat { )
gen_section( }
"%#Bottom#", local right = table.concat {
{ gen_section(
spell_check(), "%#Bottom#",
vim.bo.filetype {
} spell_check(),
), vim.bo.filetype
gen_section("%#Middle#", {"%03.p%%"}),
gen_section("%#Top#", {"-%03.c-"})
} }
),
gen_section("%#Middle#", {"%03.p%%"}),
gen_section("%#Top#", {"-%03.c-"})
}
return table.concat { return table.concat {
left, left,
"%#Statusline#", "%#Statusline#",
"%=", "%=",
right right
} }
end end
local function statusline_not_focused() local function statusline_not_focused()
return table.concat { return table.concat {
gen_section("%#StatuslineNF#", {"%f", "%m"}), gen_section("%#StatuslineNF#", {"%f", "%m"}),
"%=", "%=",
gen_section("%#StatuslineNF#", {"%03.p%%"}), gen_section("%#StatuslineNF#", {"%03.p%%"}),
gen_section("%#StatuslineNF#", {"-%03.c-"}) gen_section("%#StatuslineNF#", {"-%03.c-"})
} }
end end
function _G.gen_statusline() function _G.gen_statusline()
if vim.g.statusline_winid == vim.fn.win_getid() then if vim.g.statusline_winid == vim.fn.win_getid() then
return statusline_focused() return statusline_focused()
else else
return statusline_not_focused() return statusline_not_focused()
end end
end end
vim.o.statusline = "%!luaeval(\"gen_statusline()\")" vim.o.statusline = "%!luaeval(\"gen_statusline()\")"

6
.config/nvim/lua/utils.lua
View File

@ -22,12 +22,6 @@ function M.add_rtp(path)
rtp = rtp .. "," .. path rtp = rtp .. "," .. path
end end
-- map a key with optional options
function M.map(mode, keys, action, options)
options = options or {}
vim.api.nvim_set_keymap(mode, keys, action, options)
end
-- see if a file exists -- see if a file exists
function M.file_exists(file) function M.file_exists(file)
local f = io.open(file, "rb") local f = io.open(file, "rb")

2
.local/src/dwm

@ -1 +1 @@
Subproject commit f8ad07e02878adfbdab1241869630d608566c5c0 Subproject commit 82003c8dad7b966ab65f339749fb4272eafb8f4b