clean up & formatting

This commit is contained in:
zegonix
2025-06-09 21:39:18 +02:00
parent 9bc3f37c50
commit dd43286949
4 changed files with 235 additions and 234 deletions

View File

@@ -32,6 +32,7 @@ blink=no
[colors] [colors]
background=1D1D20 background=1D1D20
foreground=D8D8D0 foreground=D8D8D0
alpha=0.9
regular0=181820 regular0=181820
regular1=E00010 regular1=E00010

View File

@@ -1,258 +1,258 @@
-- plugin for language servers -- plugin for language servers
return { return {
"neovim/nvim-lspconfig", "neovim/nvim-lspconfig",
dependencies = { dependencies = {
-- Automatically install LSPs and related tools to stdpath for Neovim -- Automatically install LSPs and related tools to stdpath for Neovim
{ "williamboman/mason.nvim", config = true }, -- NOTE: Must be loaded before dependants { "williamboman/mason.nvim", config = true }, -- NOTE: Must be loaded before dependants
"williamboman/mason-lspconfig.nvim", "williamboman/mason-lspconfig.nvim",
"WhoIsSethDaniel/mason-tool-installer.nvim", "WhoIsSethDaniel/mason-tool-installer.nvim",
-- Useful status updates for LSP. -- Useful status updates for LSP.
-- NOTE: `opts = {}` is the same as calling `require('fidget').setup({})` -- NOTE: `opts = {}` is the same as calling `require('fidget').setup({})`
{ {
"j-hui/fidget.nvim", "j-hui/fidget.nvim",
tag = "v1.4.0", tag = "v1.4.0",
opts = { opts = {
progress = { progress = {
display = { display = {
done_icon = "", -- Icon shown when all LSP progress tasks are complete done_icon = "", -- Icon shown when all LSP progress tasks are complete
}, },
}, },
notification = { notification = {
window = { window = {
winblend = 0, -- Background color opacity in the notification window winblend = 0, -- Background color opacity in the notification window
}, },
}, },
}, },
}, },
}, },
config = function() config = function()
vim.api.nvim_create_autocmd("LspAttach", { vim.api.nvim_create_autocmd("LspAttach", {
group = vim.api.nvim_create_augroup("kickstart-lsp-attach", { clear = true }), group = vim.api.nvim_create_augroup("kickstart-lsp-attach", { clear = true }),
-- Create a function that lets us more easily define mappings specific -- Create a function that lets us more easily define mappings specific
-- for LSP related items. It sets the mode, buffer and description for us each time. -- for LSP related items. It sets the mode, buffer and description for us each time.
callback = function(event) callback = function(event)
local map = function(keys, func, desc, mode) local map = function(keys, func, desc, mode)
mode = mode or "n" mode = mode or "n"
vim.keymap.set(mode, keys, func, { buffer = event.buf, desc = "LSP: " .. desc }) vim.keymap.set(mode, keys, func, { buffer = event.buf, desc = "LSP: " .. desc })
end end
-- Jump to the definition of the word under your cursor. -- Jump to the definition of the word under your cursor.
-- This is where a variable was first declared, or where a function is defined, etc. -- This is where a variable was first declared, or where a function is defined, etc.
-- To jump back, press <C-t>. -- To jump back, press <C-t>.
map("gd", require("telescope.builtin").lsp_definitions, "[G]oto [D]efinition") map("gd", require("telescope.builtin").lsp_definitions, "[G]oto [D]efinition")
-- Find references for the word under your cursor. -- Find references for the word under your cursor.
map("gr", require("telescope.builtin").lsp_references, "[G]oto [R]eferences") map("gr", require("telescope.builtin").lsp_references, "[G]oto [R]eferences")
-- Jump to the implementation of the word under your cursor. -- Jump to the implementation of the word under your cursor.
-- Useful when your language has ways of declaring types without an actual implementation. -- Useful when your language has ways of declaring types without an actual implementation.
map("gI", require("telescope.builtin").lsp_implementations, "[G]oto [I]mplementation") map("gI", require("telescope.builtin").lsp_implementations, "[G]oto [I]mplementation")
-- Jump to the type of the word under your cursor. -- Jump to the type of the word under your cursor.
-- Useful when you're not sure what type a variable is and you want to see -- Useful when you're not sure what type a variable is and you want to see
-- the definition of its *type*, not where it was *defined*. -- the definition of its *type*, not where it was *defined*.
map("<leader>D", require("telescope.builtin").lsp_type_definitions, "Type [D]efinition") map("<leader>D", require("telescope.builtin").lsp_type_definitions, "Type [D]efinition")
-- Fuzzy find all the symbols in your current document. -- Fuzzy find all the symbols in your current document.
-- Symbols are things like variables, functions, types, etc. -- Symbols are things like variables, functions, types, etc.
map("<leader>ds", require("telescope.builtin").lsp_document_symbols, "[D]ocument [S]ymbols") map("<leader>ds", require("telescope.builtin").lsp_document_symbols, "[D]ocument [S]ymbols")
-- Fuzzy find all the symbols in your current workspace. -- Fuzzy find all the symbols in your current workspace.
-- Similar to document symbols, except searches over your entire project. -- Similar to document symbols, except searches over your entire project.
map("<leader>ws", require("telescope.builtin").lsp_dynamic_workspace_symbols, "[W]orkspace [S]ymbols") map("<leader>ws", require("telescope.builtin").lsp_dynamic_workspace_symbols, "[W]orkspace [S]ymbols")
-- Rename the variable under your cursor. -- Rename the variable under your cursor.
-- Most Language Servers support renaming across files, etc. -- Most Language Servers support renaming across files, etc.
map("<leader>rn", vim.lsp.buf.rename, "[R]e[n]ame") map("<leader>rn", vim.lsp.buf.rename, "[R]e[n]ame")
-- Execute a code action, usually your cursor needs to be on top of an error -- Execute a code action, usually your cursor needs to be on top of an error
-- or a suggestion from your LSP for this to activate. -- or a suggestion from your LSP for this to activate.
map("<leader>ca", vim.lsp.buf.code_action, "[C]ode [A]ction", { "n", "x" }) map("<leader>ca", vim.lsp.buf.code_action, "[C]ode [A]ction", { "n", "x" })
-- Opens a popup that displays documentation about the word under your cursor -- Opens a popup that displays documentation about the word under your cursor
-- See `:help K` for why this keymap -- See `:help K` for why this keymap
map("K", vim.lsp.buf.hover, "[K]ontext - Show Tooltip") map("K", vim.lsp.buf.hover, "[K]ontext - Show Tooltip")
-- WARN: This is not Goto Definition, this is Goto Declaration. -- WARN: This is not Goto Definition, this is Goto Declaration.
-- For example, in C this would take you to the header. -- For example, in C this would take you to the header.
map("gD", vim.lsp.buf.declaration, "[G]oto [D]eclaration") map("gD", vim.lsp.buf.declaration, "[G]oto [D]eclaration")
map("<leader>df", vim.diagnostic.open_float, "show diagnostic in floating window") map("<leader>df", vim.diagnostic.open_float, "show diagnostic in floating window")
-- The following two autocommands are used to highlight references of the -- The following two autocommands are used to highlight references of the
-- word under your cursor when your cursor rests there for a little while. -- word under your cursor when your cursor rests there for a little while.
-- See `:help CursorHold` for information about when this is executed -- See `:help CursorHold` for information about when this is executed
-- --
-- When you move your cursor, the highlights will be cleared (the second autocommand). -- When you move your cursor, the highlights will be cleared (the second autocommand).
local client = vim.lsp.get_client_by_id(event.data.client_id) local client = vim.lsp.get_client_by_id(event.data.client_id)
if client and client.supports_method(vim.lsp.protocol.Methods.textDocument_documentHighlight) then if client and client.supports_method(vim.lsp.protocol.Methods.textDocument_documentHighlight) then
local highlight_augroup = vim.api.nvim_create_augroup("kickstart-lsp-highlight", { clear = false }) local highlight_augroup = vim.api.nvim_create_augroup("kickstart-lsp-highlight", { clear = false })
vim.api.nvim_create_autocmd({ "CursorHold", "CursorHoldI" }, { vim.api.nvim_create_autocmd({ "CursorHold", "CursorHoldI" }, {
buffer = event.buf, buffer = event.buf,
group = highlight_augroup, group = highlight_augroup,
callback = vim.lsp.buf.document_highlight, callback = vim.lsp.buf.document_highlight,
}) })
vim.api.nvim_create_autocmd({ "CursorMoved", "CursorMovedI" }, { vim.api.nvim_create_autocmd({ "CursorMoved", "CursorMovedI" }, {
buffer = event.buf, buffer = event.buf,
group = highlight_augroup, group = highlight_augroup,
callback = vim.lsp.buf.clear_references, callback = vim.lsp.buf.clear_references,
}) })
vim.api.nvim_create_autocmd("LspDetach", { vim.api.nvim_create_autocmd("LspDetach", {
group = vim.api.nvim_create_augroup("kickstart-lsp-detach", { clear = true }), group = vim.api.nvim_create_augroup("kickstart-lsp-detach", { clear = true }),
callback = function(event2) callback = function(event2)
vim.lsp.buf.clear_references() vim.lsp.buf.clear_references()
vim.api.nvim_clear_autocmds({ group = "kickstart-lsp-highlight", buffer = event2.buf }) vim.api.nvim_clear_autocmds({ group = "kickstart-lsp-highlight", buffer = event2.buf })
end, end,
}) })
end end
-- The following code creates a keymap to toggle inlay hints in your -- The following code creates a keymap to toggle inlay hints in your
-- code, if the language server you are using supports them -- code, if the language server you are using supports them
-- --
-- This may be unwanted, since they displace some of your code -- This may be unwanted, since they displace some of your code
if client and client.supports_method(vim.lsp.protocol.Methods.textDocument_inlayHint) then if client and client.supports_method(vim.lsp.protocol.Methods.textDocument_inlayHint) then
map("<leader>th", function() map("<leader>th", function()
vim.lsp.inlay_hint.enable(not vim.lsp.inlay_hint.is_enabled({ bufnr = event.buf })) vim.lsp.inlay_hint.enable(not vim.lsp.inlay_hint.is_enabled({ bufnr = event.buf }))
end, "[T]oggle Inlay [H]ints") end, "[T]oggle Inlay [H]ints")
end end
end, end,
}) })
local capabilities = vim.lsp.protocol.make_client_capabilities() local capabilities = vim.lsp.protocol.make_client_capabilities()
capabilities = vim.tbl_deep_extend("force", capabilities, require("cmp_nvim_lsp").default_capabilities()) capabilities = vim.tbl_deep_extend("force", capabilities, require("cmp_nvim_lsp").default_capabilities())
-- Enable the following language servers -- Enable the following language servers
local servers = { local servers = {
clangd = {}, clangd = {},
lua_ls = { lua_ls = {
-- cmd = {...}, -- cmd = {...},
-- filetypes = { ...}, -- filetypes = { ...},
-- capabilities = {}, -- capabilities = {},
settings = { settings = {
Lua = { Lua = {
completion = { completion = {
callSnippet = "Replace", callSnippet = "Replace",
}, },
runtime = { version = "LuaJIT" }, runtime = { version = "LuaJIT" },
workspace = { workspace = {
checkThirdParty = false, checkThirdParty = false,
library = { library = {
"${3rd}/luv/library", "${3rd}/luv/library",
unpack(vim.api.nvim_get_runtime_file("", true)), unpack(vim.api.nvim_get_runtime_file("", true)),
}, },
}, },
diagnostics = { disable = { "missing-fields" } }, diagnostics = { disable = { "missing-fields" } },
-- You can toggle below to ignore Lua_LS's noisy `missing-fields` warnings -- You can toggle below to ignore Lua_LS's noisy `missing-fields` warnings
-- diagnostics = { disable = { 'missing-fields' } }, -- diagnostics = { disable = { 'missing-fields' } },
}, },
}, },
}, },
pylsp = { pylsp = {
settings = { settings = {
pylsp = { pylsp = {
plugins = { plugins = {
pyflakes = { enabled = false }, pyflakes = { enabled = false },
pycodestyle = { enabled = false }, pycodestyle = { enabled = false },
autopep8 = { enabled = false }, autopep8 = { enabled = false },
yapf = { enabled = false }, yapf = { enabled = false },
mccabe = { enabled = false }, mccabe = { enabled = false },
pylsp_mypy = { enabled = false }, pylsp_mypy = { enabled = false },
pylsp_black = { enabled = false }, pylsp_black = { enabled = false },
pylsp_isort = { enabled = false }, pylsp_isort = { enabled = false },
}, },
}, },
}, },
}, },
ruff = { ruff = {
-- Notes on code actions: https://github.com/astral-sh/ruff-lsp/issues/119#issuecomment-1595628355 -- Notes on code actions: https://github.com/astral-sh/ruff-lsp/issues/119#issuecomment-1595628355
-- Get isort like behavior: https://github.com/astral-sh/ruff/issues/8926#issuecomment-1834048218 -- Get isort like behavior: https://github.com/astral-sh/ruff/issues/8926#issuecomment-1834048218
commands = { commands = {
RuffAutofix = { RuffAutofix = {
function() function()
vim.lsp.buf.execute_command({ vim.lsp.buf.execute_command({
command = "ruff.applyAutofix", command = "ruff.applyAutofix",
arguments = { arguments = {
{ uri = vim.uri_from_bufnr(0) }, { uri = vim.uri_from_bufnr(0) },
}, },
}) })
end, end,
description = "Ruff: Fix all auto-fixable problems", description = "Ruff: Fix all auto-fixable problems",
}, },
RuffOrganizeImports = { RuffOrganizeImports = {
function() function()
vim.lsp.buf.execute_command({ vim.lsp.buf.execute_command({
command = "ruff.applyOrganizeImports", command = "ruff.applyOrganizeImports",
arguments = { arguments = {
{ uri = vim.uri_from_bufnr(0) }, { uri = vim.uri_from_bufnr(0) },
}, },
}) })
end, end,
description = "Ruff: Format imports", description = "Ruff: Format imports",
}, },
}, },
}, },
rust_analyzer = { rust_analyzer = {
["rust-analyzer"] = { ["rust-analyzer"] = {
cargo = { cargo = {
features = "all", features = "all",
}, },
checkOnSave = true, checkOnSave = true,
check = { check = {
command = "clippy", command = "clippy",
}, },
}, },
}, },
} }
-- Ensure the servers and tools above are installed -- Ensure the servers and tools above are installed
require("mason").setup() require("mason").setup()
-- You can add other tools here that you want Mason to install -- You can add other tools here that you want Mason to install
-- for you, so that they are available from within Neovim. -- for you, so that they are available from within Neovim.
local ensure_installed = vim.tbl_keys(servers or {}) local ensure_installed = vim.tbl_keys(servers or {})
vim.list_extend(ensure_installed, { vim.list_extend(ensure_installed, {
"stylua", -- Used to format Lua code "stylua", -- Used to format Lua code
"clangd", "clangd",
"rust-analyzer", "rust-analyzer",
}) })
require("mason-tool-installer").setup({ ensure_installed = ensure_installed }) require("mason-tool-installer").setup({ ensure_installed = ensure_installed })
-- vim.cmd([[autocmd! ColorScheme * highlight NormalFloat guibg=#1f2335]]) -- vim.cmd([[autocmd! ColorScheme * highlight NormalFloat guibg=#1f2335]])
-- vim.cmd([[autocmd! ColorScheme * highlight FloatBorder guifg=white guibg=#1f2335]]) -- vim.cmd([[autocmd! ColorScheme * highlight FloatBorder guifg=white guibg=#1f2335]])
local border = { local border = {
{ "", "FloatBorder" }, { "", "FloatBorder" },
{ "", "FloatBorder" }, { "", "FloatBorder" },
{ "", "FloatBorder" }, { "", "FloatBorder" },
{ "", "FloatBorder" }, { "", "FloatBorder" },
{ "", "FloatBorder" }, { "", "FloatBorder" },
{ "", "FloatBorder" }, { "", "FloatBorder" },
{ "", "FloatBorder" }, { "", "FloatBorder" },
{ "", "FloatBorder" }, { "", "FloatBorder" },
} }
local orig_util_open_floating_preview = vim.lsp.util.open_floating_preview local orig_util_open_floating_preview = vim.lsp.util.open_floating_preview
function vim.lsp.util.open_floating_preview(contents, syntax, opts, ...) function vim.lsp.util.open_floating_preview(contents, syntax, opts, ...)
opts = opts or {} opts = opts or {}
opts.border = opts.border or border opts.border = opts.border or border
return orig_util_open_floating_preview(contents, syntax, opts, ...) return orig_util_open_floating_preview(contents, syntax, opts, ...)
end end
require("mason-lspconfig").setup({ require("mason-lspconfig").setup({
handlers = { handlers = {
function(server_name) function(server_name)
local server = servers[server_name] or {} local server = servers[server_name] or {}
-- This handles overriding only values explicitly passed -- This handles overriding only values explicitly passed
-- by the server configuration above. Useful when disabling -- by the server configuration above. Useful when disabling
-- certain features of an LSP (for example, turning off formatting for ts_ls) -- certain features of an LSP (for example, turning off formatting for ts_ls)
server.capabilities = vim.tbl_deep_extend("force", {}, capabilities, server.capabilities or {}) server.capabilities = vim.tbl_deep_extend("force", {}, capabilities, server.capabilities or {})
require("lspconfig")[server_name].setup(server) require("lspconfig")[server_name].setup(server)
end, end,
}, },
}) })
end, end,
} }

View File

@@ -2,7 +2,7 @@
source process-status.sh source process-status.sh
set_reminder() { function set_reminder {
message_reminder=$( message_reminder=$(
cat <<'EOF' cat <<'EOF'
enter reminder message to display when the timer rings enter reminder message to display when the timer rings
@@ -20,10 +20,10 @@ EOF
notify-send "ERROR" "[atd.service] is not running" notify-send "ERROR" "[atd.service] is not running"
fi fi
reminder="$(rofi -dmenu -theme ~/.config/rofi/themes/input-dialog-blue.rasi -mesg "${message_reminder}")" reminder="$(fuzzel --dmenu)"
if [[ -z "${reminder}" ]]; then return 1; fi if [[ -z "${reminder}" ]]; then return 1; fi
time="$(rofi -dmenu -theme ~/.config/rofi/themes/input-dialog-blue.rasi -mesg "${message_time}")" time="$(fuzzel --dmenu)"
if [[ -z "${time}" ]]; then return 1; fi if [[ -z "${time}" ]]; then return 1; fi
if ! $(echo "notify-send '${reminder}'" | at "${time}"); then if ! $(echo "notify-send '${reminder}'" | at "${time}"); then

View File

@@ -13,7 +13,7 @@ select_audio_sink() {
return 1 return 1
fi fi
selection="$(printf "%s\n" "${names[@]//\"/}" | rofi -dmenu -i --only-match)" selection="$(printf "%s\n" "${names[@]//\"/}" | fuzzel --dmenu)"
unset number unset number
for n in ${!names[@]}; do for n in ${!names[@]}; do