From 79fecb8688876a831ae1357afe771e58b61162ef Mon Sep 17 00:00:00 2001 From: Alexander Muszynski Date: Fri, 29 Nov 2024 15:36:20 -0500 Subject: [PATCH] nov29 commit --- init.lua | 14 +++++++------- lua/custom/plugins/init.lua | 8 ++++++++ lua/custom/plugins/typescript-tools.lua | 13 +++++++++++++ 3 files changed, 28 insertions(+), 7 deletions(-) create mode 100644 lua/custom/plugins/typescript-tools.lua diff --git a/init.lua b/init.lua index 6cece01..8917428 100644 --- a/init.lua +++ b/init.lua @@ -129,7 +129,7 @@ vim.opt.smartcase = true vim.opt.signcolumn = 'yes' -- Decrease update time -vim.opt.updatetime = 250 +vim.opt.updatetime = 100 -- Decrease mapped sequence wait time -- Displays which-key popup sooner @@ -152,7 +152,7 @@ vim.opt.inccommand = 'split' vim.opt.cursorline = true -- Minimal number of screen lines to keep above and below the cursor. -vim.opt.scrolloff = 10 +vim.opt.scrolloff = 12 -- [[ Basic Keymaps ]] -- See `:help vim.keymap.set()` @@ -426,7 +426,7 @@ require('lazy').setup({ -- Useful status updates for LSP. -- NOTE: `opts = {}` is the same as calling `require('fidget').setup({})` - -- { 'j-hui/fidget.nvim', opts = {} }, + { 'j-hui/fidget.nvim', opts = {} }, -- `neodev` configures Lua LSP for your Neovim config, runtime and plugins -- used for completion, annotations and signatures of Neovim apis @@ -621,7 +621,6 @@ require('lazy').setup({ 'css-lsp', 'prettier', 'prettierd', - 'typescript-language-server', -- Python 'ruff', 'pyright', @@ -669,7 +668,7 @@ require('lazy').setup({ -- Disable "format_on_save lsp_fallback" for languages that don't -- have a well standardized coding style. You can add additional -- languages here or re-enable it for the disabled ones. - local disable_filetypes = { c = true, cpp = true, typescript = true, javascript = true } + local disable_filetypes = { c = true, cpp = true, typescript = true } return { timeout_ms = 500, lsp_fallback = not disable_filetypes[vim.bo[bufnr].filetype], @@ -684,7 +683,7 @@ require('lazy').setup({ -- is found. markdown = { 'markdownlint', 'marksman' }, javascript = { { 'prettierd', 'prettier' } }, - typescript = { { 'eslint', 'prettierd', 'prettier' } }, + typescript = { { 'prettierd', 'prettier' } }, typescriptreact = { { 'prettierd', 'prettier' } }, }, }, @@ -807,12 +806,13 @@ require('lazy').setup({ -- -- If you want to see what colorschemes are already installed, you can use `:Telescope colorscheme`. 'folke/tokyonight.nvim', - opts = { transparent_background = true }, + opts = { transparent = true, styles = { sidebars = 'transparent', floats = 'transparent' } }, init = function() -- Load the colorscheme here. -- Like many other themes, this one has different styles, and you could load -- any other, such as 'tokyonight-storm', 'tokyonight-moon', or 'tokyonight-day'. vim.cmd.colorscheme 'tokyonight-night' + vim.o.termguicolors = true -- You can configure highlights by doing something like: vim.cmd.hi 'Comment gui=none' diff --git a/lua/custom/plugins/init.lua b/lua/custom/plugins/init.lua index a8047e1..be4957a 100644 --- a/lua/custom/plugins/init.lua +++ b/lua/custom/plugins/init.lua @@ -12,4 +12,12 @@ return { end, ft = { 'markdown' }, }, + { + 'navarasu/onedark.nvim', + opts = { + style = 'warm', + transparent = true, + term_colors = true, + }, + }, } diff --git a/lua/custom/plugins/typescript-tools.lua b/lua/custom/plugins/typescript-tools.lua new file mode 100644 index 0000000..3c68729 --- /dev/null +++ b/lua/custom/plugins/typescript-tools.lua @@ -0,0 +1,13 @@ +local opts = { + settings = { + tsserver_file_preferences = { + quotePreference = 'single', + }, + }, +} + +return { + 'pmizio/typescript-tools.nvim', + dependencies = { 'nvim-lua/plenary.nvim', 'neovim/nvim-lspconfig' }, + opts = opts, +}