diff --git a/nvim/lua/config/plugins/lsp/lspconfig.lua b/nvim/lua/config/plugins/lsp/lspconfig.lua index e26395a..34d13c6 100644 --- a/nvim/lua/config/plugins/lsp/lspconfig.lua +++ b/nvim/lua/config/plugins/lsp/lspconfig.lua @@ -29,7 +29,7 @@ return { keymap.set('n', 'gt', 'Telescope lsp_type_definitions', opts('Show LSP type definitions')) keymap.set({ 'n', 'v' }, 'ga', vim.lsp.buf.code_action, opts('Show available code actions')) wk.add({ - { 'r', group = 'Rename' }, + { 'r', group = 'Rename' }, { 'rn', vim.lsp.buf.rename, desc = 'Smart Rename' }, }) end, @@ -78,6 +78,24 @@ return { } }) end, + ['ts_ls'] = function() + lspconfig['ts_ls'].setup({ + capabilities = capabilities, + }) + end, + ['pyright'] = function() + lspconfig['pyright'].setup({ + capabilities = capabilities, + settings = { + python = { + analysis = { + useLibraryCodeForTypes = true, + typeCheckingMode = "basic", + } + } + } + }) + end, }) end } diff --git a/nvim/lua/config/plugins/lsp/mason.lua b/nvim/lua/config/plugins/lsp/mason.lua index a806010..dd83121 100644 --- a/nvim/lua/config/plugins/lsp/mason.lua +++ b/nvim/lua/config/plugins/lsp/mason.lua @@ -27,7 +27,7 @@ return { 'lua_ls', 'html', 'cssls', - 'pyright', + -- 'pyright', -- 'emmet_ls', 'bashls', 'ts_ls', @@ -38,8 +38,8 @@ return { ensure_installed = { 'prettier', 'isort', - 'black', - 'pylint', + -- 'black', + -- 'pylint', -- 'eslint_d', } }) diff --git a/nvim/lua/config/plugins/lsp/null-ls.lua b/nvim/lua/config/plugins/lsp/null-ls.lua index 71ff39d..35e93f8 100644 --- a/nvim/lua/config/plugins/lsp/null-ls.lua +++ b/nvim/lua/config/plugins/lsp/null-ls.lua @@ -10,8 +10,8 @@ return { null_ls.builtins.formatting.prettier.with({ filetypes = { 'javascript', 'typescript', 'typescriptreact', 'css', 'html', 'json', 'markdown', 'yaml' } }), - null_ls.builtins.formatting.black, - null_ls.builtins.formatting.djlint, + -- null_ls.builtins.formatting.black, + -- null_ls.builtins.formatting.djlint, null_ls.builtins.formatting.isort, null_ls.builtins.formatting.stylua, -- require('none-ls.diagnostics.eslint_d'), diff --git a/nvim/lua/config/plugins/nvim-tree.lua b/nvim/lua/config/plugins/nvim-tree.lua index e1bba09..db64ac5 100644 --- a/nvim/lua/config/plugins/nvim-tree.lua +++ b/nvim/lua/config/plugins/nvim-tree.lua @@ -13,6 +13,7 @@ return { nvim_tree.setup({ filters = { custom = { 'node_modules', '__pycache__' }, + exclude = { 'secrets' }, }, update_focused_file = { enable = true, diff --git a/starship.toml b/starship.toml deleted file mode 100644 index 983acba..0000000 --- a/starship.toml +++ /dev/null @@ -1,144 +0,0 @@ -format = """ -[](#9A348E)\ -$os\ -$username\ -[](bg:#DA627D fg:#9A348E)\ -$directory\ -[](fg:#DA627D bg:#FCA17D)\ -$git_branch\ -$git_status\ -[](fg:#FCA17D bg:#86BBD8)\ -$c\ -$elixir\ -$elm\ -$golang\ -$gradle\ -$haskell\ -$java\ -$julia\ -$nodejs\ -$nim\ -$rust\ -$scala\ -[](fg:#86BBD8 bg:#06969A)\ -$docker_context\ -[](fg:#06969A bg:#33658A)\ -$time\ -[ ](fg:#33658A)\ -""" - -# Disable the blank line at the start of the prompt -# add_newline = false - -# You can also replace your username with a neat symbol like  or disable this -# and use the os module below -[username] -show_always = true -style_user = "bg:#9A348E" -style_root = "bg:#9A348E" -format = '[$user ]($style)' -disabled = false - -# An alternative to the username module which displays a symbol that -# represents the current operating system -[os] -style = "bg:#9A348E" -disabled = true # Disabled by default - -[directory] -style = "bg:#DA627D" -format = "[ $path ]($style)" -truncation_length = 3 -truncation_symbol = "…/" - -# Here is how you can shorten some long paths by text replacement -# similar to mapped_locations in Oh My Posh: -[directory.substitutions] -"Documents" = "󰈙 " -"Downloads" = " " -"Music" = " " -"Pictures" = " " -# Keep in mind that the order matters. For example: -# "Important Documents" = " 󰈙 " -# will not be replaced, because "Documents" was already substituted before. -# So either put "Important Documents" before "Documents" or use the substituted version: -# "Important 󰈙 " = " 󰈙 " - -[c] -symbol = " " -style = "bg:#86BBD8" -format = '[ $symbol ($version) ]($style)' - -[docker_context] -symbol = " " -style = "bg:#06969A" -format = '[ $symbol $context ]($style)' - -[elixir] -symbol = " " -style = "bg:#86BBD8" -format = '[ $symbol ($version) ]($style)' - -[elm] -symbol = " " -style = "bg:#86BBD8" -format = '[ $symbol ($version) ]($style)' - -[git_branch] -symbol = "" -style = "bg:#FCA17D" -format = '[ $symbol $branch ]($style)' - -[git_status] -style = "bg:#FCA17D" -format = '[$all_status$ahead_behind ]($style)' - -[golang] -symbol = " " -style = "bg:#86BBD8" -format = '[ $symbol ($version) ]($style)' - -[gradle] -style = "bg:#86BBD8" -format = '[ $symbol ($version) ]($style)' - -[haskell] -symbol = " " -style = "bg:#86BBD8" -format = '[ $symbol ($version) ]($style)' - -[java] -symbol = " " -style = "bg:#86BBD8" -format = '[ $symbol ($version) ]($style)' - -[julia] -symbol = " " -style = "bg:#86BBD8" -format = '[ $symbol ($version) ]($style)' - -[nodejs] -symbol = "" -style = "bg:#86BBD8" -format = '[ $symbol ($version) ]($style)' - -[nim] -symbol = "󰆥 " -style = "bg:#86BBD8" -format = '[ $symbol ($version) ]($style)' - -[rust] -symbol = "" -style = "bg:#86BBD8" -format = '[ $symbol ($version) ]($style)' - -[scala] -symbol = " " -style = "bg:#86BBD8" -format = '[ $symbol ($version) ]($style)' - -[time] -disabled = false -time_format = "%R" # Hour:Minute Format -style = "bg:#33658A" -format = '[ ♥ $time ]($style)'