From 1234f9bd4c5b9593ba804d6d34ba20eda908f2ad Mon Sep 17 00:00:00 2001 From: yannickreiss Date: Wed, 21 May 2025 18:48:17 +0200 Subject: [PATCH] Update --- UltiSnips/python.snippets | 6 ++-- UltiSnips/verilog.snippets | 4 +++ lua/irc_client.lua | 11 +++++++ lua/linterconfiguration.lua | 10 +++--- lua/lspconfiguration.lua | 64 ++++++++++++++++++------------------ lua/plugconfig.lua | 5 +-- lua/plugins.lua | 1 - lua/screenkeyconfig.lua | 65 ------------------------------------- 8 files changed, 57 insertions(+), 109 deletions(-) create mode 100644 lua/irc_client.lua delete mode 100644 lua/screenkeyconfig.lua diff --git a/UltiSnips/python.snippets b/UltiSnips/python.snippets index 42f1c8a..1d4c2da 100644 --- a/UltiSnips/python.snippets +++ b/UltiSnips/python.snippets @@ -35,12 +35,12 @@ for param in params: snip.rv += f"\t\t@param {param}\n" ` Returns: - $4 + @return $4 """ $5 `!p -if t[4] != "": - snip.rv = f"\n return {t[4]}"` +if t[4] != "" and len(t[4].split(":")) > 1: + snip.rv = f"return {t[4].split(':')[0]}"` $0 endsnippet diff --git a/UltiSnips/verilog.snippets b/UltiSnips/verilog.snippets index 4165836..8dd98fb 100644 --- a/UltiSnips/verilog.snippets +++ b/UltiSnips/verilog.snippets @@ -61,3 +61,7 @@ snippet def "Definition/Constant" b \`define ${1:NAME} ${2:VALUE} $0 endsnippet + +snippet filename "Get Filename" b +// `pwd`/`!p snip.rv = fn` +endsnippet diff --git a/lua/irc_client.lua b/lua/irc_client.lua new file mode 100644 index 0000000..0415578 --- /dev/null +++ b/lua/irc_client.lua @@ -0,0 +1,11 @@ +require("irc").setup({ + servers = { + libera = { + nick = "ninachloe", + username = "ninachloe", + server = "irc.libera.chat", + port = 6667, + use_ssl = false, + }, + }, +}) diff --git a/lua/linterconfiguration.lua b/lua/linterconfiguration.lua index 82eba98..677dd5e 100644 --- a/lua/linterconfiguration.lua +++ b/lua/linterconfiguration.lua @@ -12,9 +12,7 @@ local linters = { ada = { "gnat", "gcc", "adals", "cspell" }, } -vim.g.ale_linters = linters -vim.g.ale_fix_on_save = 0 -vim.g.ale_fixers = { +local fixers = { ada = { "gnatpp" }, asm = { "gcc" }, bash = { "bashate" }, @@ -28,5 +26,9 @@ vim.g.ale_fixers = { haskell = { "fourmolu" }, } +vim.g.ale_linters = linters +vim.g.ale_fix_on_save = 0 +vim.g.ale_fixers = fixers + vim.keymap.set("n", "lf", ":ALEFix") -vim.keymap.set("n", "ld", ":ALEDetail") +vim.keymap.set("n", "lp", ":ALEFindReferences") diff --git a/lua/lspconfiguration.lua b/lua/lspconfiguration.lua index e68cf8c..01ba3d8 100644 --- a/lua/lspconfiguration.lua +++ b/lua/lspconfiguration.lua @@ -15,38 +15,38 @@ require("mason-lspconfig").setup({ }, }) -require("mason-lspconfig").setup_handlers({ - function(asm_lsp) - require("lspconfig")[asm_lsp].setup({}) - end, - function(clangd) - require("lspconfig")[clangd].setup({}) - end, - function(lua_ls) - require("lspconfig")[lua_ls].setup({}) - end, - function(hls) - require("lspconfig")[hls].setup({}) - end, - function(rust_analyzer) - require("lspconfig")[rust_analyzer].setup({}) - end, - function(vhdl_ls) - require("lspconfig")[vhdl_ls].setup({}) - end, - function(verible) - require("lspconfig")[verible].setup({}) - end, - function(vimls) - require("lspconfig")[vimls].setup({}) - end, - function(texlab) - require("lspconfig")[texlab].setup({}) - end, - function(als) - require("lspconfig")[als].setup({}) - end, -}) +-- require("mason-lspconfig").setup_handlers({ +-- function(asm_lsp) +-- require("lspconfig")[asm_lsp].setup({}) +-- end, +-- function(clangd) +-- require("lspconfig")[clangd].setup({}) +-- end, +-- function(lua_ls) +-- require("lspconfig")[lua_ls].setup({}) +-- end, +-- function(hls) +-- require("lspconfig")[hls].setup({}) +-- end, +-- function(rust_analyzer) +-- require("lspconfig")[rust_analyzer].setup({}) +-- end, +-- function(vhdl_ls) +-- require("lspconfig")[vhdl_ls].setup({}) +-- end, +-- function(verible) +-- require("lspconfig")[verible].setup({}) +-- end, +-- function(vimls) +-- require("lspconfig")[vimls].setup({}) +-- end, +-- function(texlab) +-- require("lspconfig")[texlab].setup({}) +-- end, +-- function(als) +-- require("lspconfig")[als].setup({}) +-- end, +-- }) require("lspconfig").verible.setup({ cmd = { "verible-verilog-ls", "--rules_config_search" }, diff --git a/lua/plugconfig.lua b/lua/plugconfig.lua index 0313007..7152507 100644 --- a/lua/plugconfig.lua +++ b/lua/plugconfig.lua @@ -29,7 +29,7 @@ require("ada_mode") -- require("mail") -- IRC configuration -require("irc_client") +-- require("irc_client") -- Misc configuration if vim == nil then @@ -56,9 +56,6 @@ vim.g.gitblame_date_format = "%r" -- Floating terminal vim.keymap.set("n", "", ":FloatermNew --height=0.9 --width=0.9 --wintype=float --name=terminal ") --- Key plugin -require("screenkeyconfig") - -- Set default colorscheme -- vim.cmd("colo vim-monokai-tasty") vim.cmd("colo vim-monokai-tasty") diff --git a/lua/plugins.lua b/lua/plugins.lua index bda1a0d..aa22564 100644 --- a/lua/plugins.lua +++ b/lua/plugins.lua @@ -57,7 +57,6 @@ return { "dense-analysis/ale", "f-person/git-blame.nvim", "dstein64/vim-startuptime", - "NStefan002/screenkey.nvim", "hiphish/rainbow-delimiters.nvim", -- Themes diff --git a/lua/screenkeyconfig.lua b/lua/screenkeyconfig.lua deleted file mode 100644 index 47659fb..0000000 --- a/lua/screenkeyconfig.lua +++ /dev/null @@ -1,65 +0,0 @@ -require("screenkey").setup({ - win_opts = { - row = vim.o.lines - vim.o.cmdheight - 1, - col = vim.o.columns - 1, - relative = "editor", - anchor = "SE", - width = 40, - height = 3, - border = "single", - title = "Screenkey", - title_pos = "center", - style = "minimal", - focusable = false, - noautocmd = true, - }, - compress_after = 3, - clear_after = 3, - disable = { - filetypes = {}, - buftypes = {}, - events = false, - }, - show_leader = true, - group_mappings = false, - display_infront = {}, - display_behind = {}, - filter = function(keys) - return keys - end, - keys = { - [""] = "󰌒", - [""] = "󰌑", - [""] = "Esc", - [""] = "␣", - [""] = "󰌥", - [""] = "Del", - [""] = "", - [""] = "", - [""] = "", - [""] = "", - [""] = "Home", - [""] = "End", - [""] = "PgUp", - [""] = "PgDn", - [""] = "Ins", - [""] = "󱊫", - [""] = "󱊬", - [""] = "󱊭", - [""] = "󱊮", - [""] = "󱊯", - [""] = "󱊰", - [""] = "󱊱", - [""] = "󱊲", - [""] = "󱊳", - [""] = "󱊴", - [""] = "󱊵", - [""] = "󱊶", - ["CTRL"] = "Ctrl", - ["ALT"] = "Alt", - ["SUPER"] = "󰘳", - [""] = "", - }, -}) - -vim.keymap.set("n", "kk", ":Screenkey")