diff --git a/.config/btop/btop.conf b/.config/btop/btop.conf index 1027fb6..96a4a3c 100644 --- a/.config/btop/btop.conf +++ b/.config/btop/btop.conf @@ -181,7 +181,7 @@ disk_free_priv = False show_io_stat = True #* Toggles io mode for disks, showing big graphs for disk read/write speeds. -io_mode = False +io_mode = True #* Set to True to show combined read/write io graphs in io mode. io_graph_combined = False diff --git a/.config/nvim/lua/plugins/editor/lsp.lua b/.config/nvim/lua/plugins/editor/lsp.lua index 57cce3b..bff3751 100644 --- a/.config/nvim/lua/plugins/editor/lsp.lua +++ b/.config/nvim/lua/plugins/editor/lsp.lua @@ -46,6 +46,7 @@ local setup_keymaps = function(client, bufnr) end nmap("gD", vim.lsp.buf.declaration, "[G]o to [D]eclaration") + nmap("gd", vim.lsp.buf.definition, "[G]o to [D]efinition") nmap("gi", vim.lsp.buf.implementation, "[G]o to [I]mplementation") nmap("gr", vim.lsp.buf.references, "[G]o to [R]eferences") nmap("", vim.lsp.buf.signature_help, "Signature Help") @@ -54,11 +55,10 @@ local setup_keymaps = function(client, bufnr) nmap("rn", vim.lsp.buf.rename, "[R]e[n]ame") nmap("ca", vim.lsp.buf.code_action, "[C]ode [A]ction") - if client.name == "tsserver" then - nmap("rf", ":TSLspRenameFile", "[R]ename [F]ile") + if client.name == "typescript-tools" then + nmap("mi", ":TSToolsAddMissingImports", "[M]issing [I]mports") + nmap("ui", ":TSToolsRemoveUnusedImport", "Remove [U]nused [I]mports") end - - nmap("gd", vim.lsp.buf.definition, "[G]o to [D]efinition") end local on_attach = function(client, bufnr) @@ -84,6 +84,7 @@ return { }, formatters_by_ft = { html = web_formatters, + css = web_formatters, javascript = web_formatters, javascriptreact = web_formatters, ["javascript.jsx"] = web_formatters, @@ -111,6 +112,10 @@ return { }) end, }, + { + "pmizio/typescript-tools.nvim", + requires = { "nvim-lua/plenary.nvim", "neovim/nvim-lspconfig" }, + }, { "neovim/nvim-lspconfig", event = { "BufReadPre", "BufNewFile" }, @@ -216,7 +221,7 @@ return { local ensure_installed = vim.tbl_keys(servers or {}) vim.list_extend(ensure_installed, { - "vtsls", + -- "vtsls", "stylua", "biome", "tsserver", @@ -234,13 +239,13 @@ return { local settings = server.settings or {} if server_name == "tsserver" then - -- using vtsls instead - return - end - - if server_name == "vtsls" then - local vtsls = require("vtsls") - lspconfig.vtsls.setup(vtsls.lspconfig) + local typescript_tools = require("typescript-tools") + typescript_tools.setup({ + on_attach = on_attach, + capabilities = capabilities, + settings = settings, + root_dir = lspconfig.util.root_pattern("tsconfig.json"), + }) return end diff --git a/.config/nvim/lua/plugins/workflow/navigation.lua b/.config/nvim/lua/plugins/workflow/navigation.lua index 473e70f..6afaa97 100644 --- a/.config/nvim/lua/plugins/workflow/navigation.lua +++ b/.config/nvim/lua/plugins/workflow/navigation.lua @@ -2,15 +2,15 @@ return { { "tpope/vim-unimpaired", event = "VeryLazy" }, { "jinh0/eyeliner.nvim", - event = "VeryLazy", + event = "ColorScheme", config = function() local colors = require("colors") - vim.api.nvim_set_hl(0, "EyelinerPrimary", { fg = colors.blue, bold = true, underline = true }) - vim.api.nvim_set_hl(0, "EyelinerSecondary", { fg = colors.purple, underline = true }) require("eyeliner").setup({ highlight_on_key = true, dim = true, }) + vim.api.nvim_set_hl(0, "EyelinerPrimary", { fg = colors.blue, bold = true, underline = true }) + vim.api.nvim_set_hl(0, "EyelinerSecondary", { fg = colors.purple, underline = true }) end, }, { diff --git a/.config/nvim/spell/en.utf-8.add b/.config/nvim/spell/en.utf-8.add index d606565..2d80c7f 100644 --- a/.config/nvim/spell/en.utf-8.add +++ b/.config/nvim/spell/en.utf-8.add @@ -1231,3 +1231,11 @@ in-term dueDate payDate companyId +fixedInterestPeriodType +maturityDateUnadjusted +datepicker +principalValueDate +saturday +consistent-type-assertions +eslint-disable-line +dot-notation diff --git a/.config/nvim/spell/en.utf-8.add.spl b/.config/nvim/spell/en.utf-8.add.spl index 063bd82..4d62469 100644 Binary files a/.config/nvim/spell/en.utf-8.add.spl and b/.config/nvim/spell/en.utf-8.add.spl differ