summaryrefslogtreecommitdiff
path: root/.config
diff options
context:
space:
mode:
Diffstat (limited to '.config')
-rw-r--r--.config/nvim/init.lua42
1 files changed, 41 insertions, 1 deletions
diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua
index 15cd652..d92a728 100644
--- a/.config/nvim/init.lua
+++ b/.config/nvim/init.lua
@@ -1,3 +1,9 @@
+if not vim.tbl_flatten then
+ vim.tbl_flatten = function(t)
+ return vim.iter(t):flatten():totable()
+ end
+end
+
vim.pack.add({
{ src = "https://github.com/neovim/nvim-lspconfig" },
@@ -65,7 +71,7 @@ vim.api.nvim_create_autocmd('LspAttach', {
require("nvim-treesitter").setup({
ensure_installed = {
"lua", "vim", "bash", "json", "python",
- "cpp", "css", "java", "c", "typst"
+ "cpp", "css", "java", "c", "typst", "r",
},
highlight = { enable = true },
})
@@ -101,6 +107,10 @@ vim.lsp.config("pyright", {
capabilities = capabilities,
})
+vim.lsp.config("bashls", {
+ capabilities = capabilities,
+ filetypes = { "sh", "zsh" },
+})
vim.lsp.config("clangd", {
capabilities = capabilities,
@@ -122,6 +132,14 @@ vim.lsp.config("tinymist", {
capabilities = capabilities,
})
+vim.lsp.config("r_language_server", {
+ capabilities = capabilities,
+ settings = {
+ filetypes = { "r", "rmd" },
+ },
+})
+
+
vim.lsp.enable({
"lua_ls",
"pyright",
@@ -130,6 +148,8 @@ vim.lsp.enable({
"cssls",
"ts_ls",
"tinymist",
+ "languageserver",
+ "bashls",
})
require("luasnip.loaders.from_vscode").lazy_load()
@@ -172,6 +192,7 @@ cmp.setup({
},
})
+
cmp.event:on("confirm_done", cmp_autopairs.on_confirm_done())
require("which-key").setup()
@@ -241,3 +262,22 @@ require("lualine").setup({
vim.cmd("colorscheme jellybeans")
-- vim.api.nvim_set_hl(0, "Normal", { bg = "#121212" })
+--
+
+
+local s = luasnip.snippet
+local t = luasnip.text_node
+local i = luasnip.insert_node
+
+luasnip.add_snippets("markdown", {
+ s("s#", { t("Switch# "), i(0) }),
+ s("sc", { t("Switch(config)# "), i(0) }),
+ s("sci", { t({ "", "Switch(config-if)# " }), i(0) }),
+ s("scir", { t({ "", "Switch(config-if-range)# " }), i(0) }),
+
+ s("r#", { t("Router# "), i(0) }),
+ s("rc", { t("Router(config)# "), i(0) }),
+ s("rci", { t({ "", "Router(config-if)# " }), i(0) }),
+ s("rcir", { t({ "", "Router(config-if-range)# " }), i(0) }),
+ s("rcr", { t({ "", "Router(config-router)# " }), i(0) }),
+})