aboutsummaryrefslogtreecommitdiff
path: root/nvim
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--nvim/lazy-lock.json36
-rw-r--r--nvim/lua/config/options.lua4
-rw-r--r--nvim/lua/plugins/lspsaga.lua3
-rw-r--r--nvim/lua/plugins/mini-starter.lua7
-rw-r--r--nvim/lua/plugins/nvim-lspconfig.lua150
-rw-r--r--nvim/lua/plugins/nvim-parinfer.lua5
-rw-r--r--nvim/lua/plugins/telescope.lua41
7 files changed, 155 insertions, 91 deletions
diff --git a/nvim/lazy-lock.json b/nvim/lazy-lock.json
new file mode 100644
index 0000000..1d36ca4
--- /dev/null
+++ b/nvim/lazy-lock.json
@@ -0,0 +1,36 @@
+{
+ "Comment.nvim": { "branch": "master", "commit": "e30b7f2008e52442154b66f7c519bfd2f1e32acb" },
+ "cmp-buffer": { "branch": "main", "commit": "b74fab3656eea9de20a9b8116afa3cfc4ec09657" },
+ "cmp-nvim-lsp": { "branch": "main", "commit": "a8912b88ce488f411177fc8aed358b04dc246d7b" },
+ "cmp-path": { "branch": "main", "commit": "c6635aae33a50d6010bf1aa756ac2398a2d54c32" },
+ "indent-blankline.nvim": { "branch": "master", "commit": "005b56001b2cb30bfa61b7986bc50657816ba4ba" },
+ "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" },
+ "lazydev.nvim": { "branch": "main", "commit": "2367a6c0a01eb9edb0464731cc0fb61ed9ab9d2c" },
+ "lspkind.nvim": { "branch": "master", "commit": "d79a1c3299ad0ef94e255d045bed9fa26025dab6" },
+ "lspsaga.nvim": { "branch": "main", "commit": "920b1253e1a26732e53fac78412f6da7f674671d" },
+ "lua-utils.nvim": { "branch": "main", "commit": "e565749421f4bbb5d2e85e37c3cef9d56553d8bd" },
+ "lualine.nvim": { "branch": "master", "commit": "0c6cca9f2c63dadeb9225c45bc92bb95a151d4af" },
+ "mini.icons": { "branch": "main", "commit": "397ed3807e96b59709ef3292f0a3e253d5c1dc0a" },
+ "mini.starter": { "branch": "main", "commit": "03a124f307ebfb9fd05a0e6503d30605c32a9e1a" },
+ "nabla.nvim": { "branch": "master", "commit": "9b69b709063ccf40ac36fabb4fff7d90b3736475" },
+ "neopywal": { "branch": "master", "commit": "09188d79b45694141ec779d05cbcc75f994639d1" },
+ "neorg": { "branch": "main", "commit": "e206c9642f4a115cd836e76c98ef785623d335bc" },
+ "noice.nvim": { "branch": "main", "commit": "0427460c2d7f673ad60eb02b35f5e9926cf67c59" },
+ "nui.nvim": { "branch": "main", "commit": "7cd18e73cfbd70e1546931b7268b3eebaeff9391" },
+ "nvim-autopairs": { "branch": "master", "commit": "4d74e75913832866aa7de35e4202463ddf6efd1b" },
+ "nvim-cmp": { "branch": "main", "commit": "b5311ab3ed9c846b585c0c15b7559be131ec4be9" },
+ "nvim-lspconfig": { "branch": "master", "commit": "036885e8e5456d3907626b634693234f628afef6" },
+ "nvim-nio": { "branch": "master", "commit": "21f5324bfac14e22ba26553caf69ec76ae8a7662" },
+ "nvim-parinfer": { "branch": "master", "commit": "5ca09287ab3f4144f78ff7977fabc27466f71044" },
+ "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" },
+ "nvim-web-devicons": { "branch": "master", "commit": "1fb58cca9aebbc4fd32b086cb413548ce132c127" },
+ "oil.nvim": { "branch": "master", "commit": "08c2bce8b00fd780fb7999dbffdf7cd174e896fb" },
+ "pathlib.nvim": { "branch": "main", "commit": "57e5598af6fe253761c1b48e0b59b7cd6699e2c1" },
+ "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" },
+ "telescope.nvim": { "branch": "master", "commit": "b4da76be54691e854d3e0e02c36b0245f945c2c7" },
+ "todo-comments.nvim": { "branch": "main", "commit": "304a8d204ee787d2544d8bc23cd38d2f929e7cc5" },
+ "toggleterm.nvim": { "branch": "main", "commit": "9a88eae817ef395952e08650b3283726786fb5fb" },
+ "vim-highlightedyank": { "branch": "master", "commit": "285a61425e79742997bbde76a91be6189bc988fb" },
+ "vim-illuminate": { "branch": "master", "commit": "0d1e93684da00ab7c057410fecfc24f434698898" },
+ "which-key.nvim": { "branch": "main", "commit": "370ec46f710e058c9c1646273e6b225acf47cbed" }
+}
diff --git a/nvim/lua/config/options.lua b/nvim/lua/config/options.lua
index bf92bb5..deeeb2e 100644
--- a/nvim/lua/config/options.lua
+++ b/nvim/lua/config/options.lua
@@ -1,9 +1,9 @@
local opt = vim.opt
-- Indent
-opt.softtabstop = 2
+opt.tabstop = 2
opt.shiftwidth = 2
-opt.expandtab = true
+opt.expandtab = false
opt.smartindent = true
opt.wrap = false
diff --git a/nvim/lua/plugins/lspsaga.lua b/nvim/lua/plugins/lspsaga.lua
index d6faadc..b87260a 100644
--- a/nvim/lua/plugins/lspsaga.lua
+++ b/nvim/lua/plugins/lspsaga.lua
@@ -1,4 +1,7 @@
local config = function()
+ vim.diagnostic.config({
+ severity_sort = true,
+ })
require("lspsaga").setup({
ui = {
code_action = "",
diff --git a/nvim/lua/plugins/mini-starter.lua b/nvim/lua/plugins/mini-starter.lua
index 1532c73..8b216a1 100644
--- a/nvim/lua/plugins/mini-starter.lua
+++ b/nvim/lua/plugins/mini-starter.lua
@@ -177,6 +177,13 @@ Quotes = {
The question of whether computers can think is like the question of whether submarines can swim.
~ Edsger Dijkstra
]],
+ [[
+ Of course, I'd also suggest that whoever was the genius who thought it was a good idea to read
+ things ONE F*CKING BYTE AT A TIME with system calls for each byte should be retroactively aborted.
+ Who the f*ck does idiotic things like that? How did they not die as babies, considering that they
+ were likely too stupid to find a tit to suck on?
+ ~ Linus Torvalds
+ ]]
}
diff --git a/nvim/lua/plugins/nvim-lspconfig.lua b/nvim/lua/plugins/nvim-lspconfig.lua
index 22435e6..639734e 100644
--- a/nvim/lua/plugins/nvim-lspconfig.lua
+++ b/nvim/lua/plugins/nvim-lspconfig.lua
@@ -1,5 +1,5 @@
local config = function()
- local lspconfig = require("lspconfig")
+ local lsp = vim.lsp
local capabilities = require("cmp_nvim_lsp").default_capabilities()
-- setting custom signs
@@ -9,85 +9,107 @@ local config = function()
vim.fn.sign_define(hl, { text = icon, texthl = hl, numhl = "" })
end
- local on_attach = function(client, bufnr)
- local keymap = vim.keymap
- local lsp = vim.lsp
- local opts = { noremap = true, silent = true, buffer = bufnr, desc = "" }
+ vim.api.nvim_create_autocmd('LspAttach', {
+ callback = function(ev)
+ local client = lsp.get_client_by_id(ev.data.client_id)
+ local keymap = vim.keymap
+ local opts = { noremap = true, silent = true, buffer = ev.buf, desc = "" }
- -- setting custom keymaps
- opts.desc = "Finder"
- keymap.set("n", "<Space>lf", ":Lspsaga finder<Enter>", opts) -- go to definition
- opts.desc = "Peek Definition (Lspsaga)"
- keymap.set("n", "<Space>lp", ":Lspsaga peek_definition<Enter>", opts) -- peak definition
- opts.desc = "Goto Definition (Lspsaga)"
- keymap.set("n", "<Space>lg", ":Lspsaga goto_definition<Enter>", opts) -- go to definition
- opts.desc = "Code Action (Lspsaga)"
- keymap.set("n", "<Space>la", ":Lspsaga code_action<Enter>", opts) -- see available code actions
- opts.desc = "Rename (Lspsaga)"
- keymap.set("n", "<Space>lr", ":Lspsaga rename<Enter>", opts) -- smart rename
- opts.desc = "Hover Documentation (Lspsaga)"
- keymap.set("n", "<Space>lk", lsp.buf.hover, opts) -- show documentation for what is under cursor
- opts.desc = "Outline (Lspsaga)"
- keymap.set("n", "<Space>lo", ":Lspsaga outline<Enter>", opts) -- show outline
- opts.desc = "Diagnostic (Lspsaga)"
- keymap.set("n", "<Space>ld", ":Lspsaga show_workspace_diagnostics<Enter>", opts) -- show diagnostics
+ -- setting custom keymaps
+ opts.desc = "Finder"
+ keymap.set("n", "<Space>lf", ":Lspsaga finder<Enter>", opts) -- go to definition
+ opts.desc = "Peek Definition (Lspsaga)"
+ keymap.set("n", "<Space>lp", ":Lspsaga peek_definition<Enter>", opts) -- peak definition
+ opts.desc = "Goto Definition (Lspsaga)"
+ keymap.set("n", "<Space>lg", ":Lspsaga goto_definition<Enter>", opts) -- go to definition
+ opts.desc = "Code Action (Lspsaga)"
+ keymap.set("n", "<Space>la", ":Lspsaga code_action<Enter>", opts) -- see available code actions
+ opts.desc = "Rename (Lspsaga)"
+ keymap.set("n", "<Space>lr", ":Lspsaga rename<Enter>", opts) -- smart rename
+ opts.desc = "Hover Documentation (Lspsaga)"
+ keymap.set("n", "<Space>lk", lsp.buf.hover, opts) -- show documentation for what is under cursor
+ opts.desc = "Outline (Lspsaga)"
+ keymap.set("n", "<Space>lo", ":Lspsaga outline<Enter>", opts) -- show outline
+ opts.desc = "Diagnostic (Lspsaga)"
+ keymap.set("n", "<Space>ld", ":Lspsaga show_workspace_diagnostics<Enter>", opts) -- show diagnostics
- keymap.del("n", "K", { buffer = bufnr })
-
- -- enable auto formatting on save
- if client.supports_method("textDocument/formatting") then
- vim.api.nvim_create_autocmd("BufWritePre", {
- buffer = bufnr,
- callback = function()
- vim.lsp.buf.format({ async = true })
- end,
- })
+ -- enable auto formatting on save
+ if client ~= nil and client:supports_method("textDocument/formatting") then
+ vim.api.nvim_create_autocmd("BufWritePre", {
+ buffer = ev.buf,
+ callback = function()
+ lsp.buf.format({ async = true })
+ end,
+ })
+ end
end
- end
+ })
- -- efm server configuration
- -- lspconfig.efm.setup({
- -- init_options = {
- -- documentFormatting = true,
- -- documentRangeFormatting = true,
- -- hover = true,
- -- documentSymbol = true,
- -- codeAction = true,
- -- completion = true,
- -- },
- -- })
- -- clangd server configuration
- lspconfig.clangd.setup({
- on_attach = on_attach,
+ vim.api.nvim_create_autocmd('LspDetach', {
+ callback = function(ev)
+ local client = lsp.get_client_by_id(ev.data.client_id)
+ local keymap = vim.keymap
+ keymap.del("n", "<Space>lf")
+ keymap.del("n", "<Space>lp")
+ keymap.del("n", "<Space>lg")
+ keymap.del("n", "<Space>la")
+ keymap.del("n", "<Space>lr")
+ keymap.del("n", "<Space>lk")
+ keymap.del("n", "<Space>lo")
+ keymap.del("n", "<Space>ld")
+ if client ~= nil and client:supports_method('textDocument/formatting') then
+ vim.api.nvim_clear_autocmds({
+ event = 'BufWritePre',
+ buffer = ev.buf,
+ })
+ end
+ end,
+ })
+
+ -- C/C++
+ lsp.enable("clangd")
+ lsp.config("clangd", {
+ capabilities = capabilities,
+ })
+ -- Rust
+ lsp.enable("rust_analyzer")
+ lsp.config("rust_analyzer", {
capabilities = capabilities,
})
- -- rust analyzer server configuration
- lspconfig.rust_analyzer.setup({
- on_attach = on_attach,
+ -- Haskell
+ lsp.enable("hls")
+ lsp.config("hls", {
capabilities = capabilities,
+ settings = {
+ ['haskell'] = {
+ cabalFormattingProvider = "cabal-fmt",
+ formattingProvider = "ormolu"
+ },
+ },
})
- -- haskell-language-server configuration
- lspconfig.hls.setup({
- on_attach = on_attach,
+ -- Lua
+ lsp.enable("lua_ls")
+ lsp.config("lua_ls", {
capabilities = capabilities,
})
- -- lua-language-server configuration
- lspconfig.lua_ls.setup({
- on_attach = on_attach,
+ -- JavaScript/Typescript
+ lsp.enable("ts_ls")
+ lsp.config("ts_ls", {
capabilities = capabilities,
})
- lspconfig.ts_ls.setup({
- on_attach = on_attach,
+ -- CSS
+ lsp.enable("cssls")
+ lsp.config("cssls", {
capabilities = capabilities,
})
- -- cssls-language-server configuration
- lspconfig.cssls.setup({
- on_attach = on_attach,
+ -- Meson
+ lsp.enable("mesonlsp")
+ lsp.config("mesonlsp", {
capabilities = capabilities,
})
- -- mesonlsp configuration
- lspconfig.mesonlsp.setup({
- on_attach = on_attach,
+ -- Zig
+ lsp.enable("zls")
+ lsp.config("zls", {
capabilities = capabilities,
})
end
diff --git a/nvim/lua/plugins/nvim-parinfer.lua b/nvim/lua/plugins/nvim-parinfer.lua
new file mode 100644
index 0000000..8775f83
--- /dev/null
+++ b/nvim/lua/plugins/nvim-parinfer.lua
@@ -0,0 +1,5 @@
+return {
+ "gpanders/nvim-parinfer",
+ lazy = true,
+ ft = "lisp"
+}
diff --git a/nvim/lua/plugins/telescope.lua b/nvim/lua/plugins/telescope.lua
index bc29d8c..0f6d853 100644
--- a/nvim/lua/plugins/telescope.lua
+++ b/nvim/lua/plugins/telescope.lua
@@ -10,36 +10,27 @@ local init = function()
opts.desc = "All commands (Telescope)"
keymap.set("n", "<Space>ta", ":Telescope<Enter>", opts) -- All commands
opts.desc = "Find words (Telescope)"
- keymap.set("n", "<Space>tg", ":Telescope live_grep<Enter>", opts) -- Find words
+ keymap.set("n", "<Space>tw", ":Telescope live_grep<Enter>", opts) -- Find words
opts.desc = "Buffers (Telescope)"
keymap.set("n", "<Space>tb", ":Telescope buffers<Enter>", opts) -- Buffers
end
-local opts = {
- defaults = {
- mappings = {
- i = {
- ["<C-j>"] = "move_selection_next",
- ["<C-k>"] = "move_selection_previous",
+local config = function()
+ require("telescope").setup({
+ defaults = require("telescope.themes").get_ivy(),
+ pickers = {
+ find_files = {
+ hidden = true,
},
+ builtin = {
+ previewer = false,
+ },
+ help_tags = {
+ previewer = false,
+ }
},
- },
- picker = {
- find_files = {
- theme = "dropdown",
- previewer = false,
- hidden = true,
- },
- live_grep = {
- theme = "dropdown",
- previewer = false,
- },
- find_buffers = {
- theme = "dropdown",
- previewer = false,
- },
- },
-}
+ })
+end
return {
"nvim-telescope/telescope.nvim",
@@ -47,5 +38,5 @@ return {
lazy = true,
cmd = "Telescope",
init = init,
- opts = opts,
+ config = config,
}
generated by cgit v1.2.3 (git 2.39.1) at 2026-04-16 06:31:48 +0000