@@ -87,7 +87,7 @@ P.S. You can delete this when you're done too. It's your config now! :)
8787-- Set <space> as the leader key
8888-- See `:help mapleader`
8989-- NOTE: Must happen before plugins are loaded (otherwise wrong leader will be used)
90- vim .g .mapleader = ' '
90+ vim .g .mapleader = ' , '
9191vim .g .maplocalleader = ' '
9292
9393-- Set to true if you have a Nerd Font installed and selected in the terminal
@@ -407,11 +407,15 @@ require('lazy').setup({
407407 -- You can put your default mappings / updates / etc. in here
408408 -- All the info you're looking for is in `:help telescope.setup()`
409409 --
410- -- defaults = {
411- -- mappings = {
412- -- i = { ['<c-enter>'] = 'to_fuzzy_refine' },
413- -- },
414- -- },
410+ defaults = {
411+ mappings = {
412+ i = {
413+ [' <c-enter>' ] = ' to_fuzzy_refine' ,
414+ [' <C-j>' ] = require (' telescope.actions' ).move_selection_next ,
415+ [' <C-k>' ] = require (' telescope.actions' ).move_selection_previous ,
416+ },
417+ },
418+ },
415419 -- pickers = {}
416420 extensions = {
417421 [' ui-select' ] = {
@@ -428,13 +432,13 @@ require('lazy').setup({
428432 local builtin = require ' telescope.builtin'
429433 vim .keymap .set (' n' , ' <leader>sh' , builtin .help_tags , { desc = ' [S]earch [H]elp' })
430434 vim .keymap .set (' n' , ' <leader>sk' , builtin .keymaps , { desc = ' [S]earch [K]eymaps' })
431- vim .keymap .set (' n' , ' <leader>sf ' , builtin .find_files , { desc = ' [S]earch [F]iles' })
435+ vim .keymap .set (' n' , ' <leader>tt ' , builtin .find_files , { desc = ' [S]earch [F]iles' })
432436 vim .keymap .set (' n' , ' <leader>ss' , builtin .builtin , { desc = ' [S]earch [S]elect Telescope' })
433437 vim .keymap .set (' n' , ' <leader>sw' , builtin .grep_string , { desc = ' [S]earch current [W]ord' })
434438 vim .keymap .set (' n' , ' <leader>sg' , builtin .live_grep , { desc = ' [S]earch by [G]rep' })
435439 vim .keymap .set (' n' , ' <leader>sd' , builtin .diagnostics , { desc = ' [S]earch [D]iagnostics' })
436440 vim .keymap .set (' n' , ' <leader>sr' , builtin .resume , { desc = ' [S]earch [R]esume' })
437- vim .keymap .set (' n' , ' <leader>s. ' , builtin .oldfiles , { desc = ' [S]earch Recent Files ("." for repeat)' })
441+ vim .keymap .set (' n' , ' <leader>; ' , builtin .oldfiles , { desc = ' [S]earch Recent Files ("." for repeat)' })
438442 vim .keymap .set (' n' , ' <leader><leader>' , builtin .buffers , { desc = ' [ ] Find existing buffers' })
439443
440444 -- Slightly advanced example of overriding default behavior and theme
@@ -553,7 +557,7 @@ require('lazy').setup({
553557 -- Jump to the definition of the word under your cursor.
554558 -- This is where a variable was first declared, or where a function is defined, etc.
555559 -- To jump back, press <C-t>.
556- map (' grd ' , require (' telescope.builtin' ).lsp_definitions , ' [G]oto [D]efinition' )
560+ map (' gd ' , require (' telescope.builtin' ).lsp_definitions , ' [G]oto [D]efinition' )
557561
558562 -- WARN: This is not Goto Definition, this is Goto Declaration.
559563 -- For example, in C this would take you to the header.
@@ -673,15 +677,52 @@ require('lazy').setup({
673677 local servers = {
674678 -- clangd = {},
675679 -- gopls = {},
676- -- pyright = {},
680+ pyright = {},
677681 -- rust_analyzer = {},
678682 -- ... etc. See `:help lspconfig-all` for a list of all the pre-configured LSPs
679683 --
680684 -- Some languages (like typescript) have entire language plugins that can be useful:
681685 -- https://github.com/pmizio/typescript-tools.nvim
682686 --
683687 -- But for many setups, the LSP (`ts_ls`) will work just fine
684- -- ts_ls = {},
688+ ts_ls = {
689+ cmd = { ' typescript-language-server' , ' --stdio' , ' --max_old_space_size=16384' },
690+ init_options = {
691+ maxTsServerMemory = 16384 ,
692+ preferences = {
693+ disableSuggestions = false ,
694+ includeCompletionsForModuleExports = true ,
695+ includeCompletionsWithInsertText = true ,
696+ },
697+ tsserver = {
698+ maxTsServerMemory = 16384 ,
699+ },
700+ },
701+ settings = {
702+ typescript = {
703+ inlayHints = {
704+ includeInlayParameterNameHints = ' all' ,
705+ includeInlayParameterNameHintsWhenArgumentMatchesName = false ,
706+ includeInlayFunctionParameterTypeHints = true ,
707+ includeInlayVariableTypeHints = true ,
708+ includeInlayPropertyDeclarationTypeHints = true ,
709+ includeInlayFunctionLikeReturnTypeHints = true ,
710+ includeInlayEnumMemberValueHints = true ,
711+ },
712+ },
713+ javascript = {
714+ inlayHints = {
715+ includeInlayParameterNameHints = ' all' ,
716+ includeInlayParameterNameHintsWhenArgumentMatchesName = false ,
717+ includeInlayFunctionParameterTypeHints = true ,
718+ includeInlayVariableTypeHints = true ,
719+ includeInlayPropertyDeclarationTypeHints = true ,
720+ includeInlayFunctionLikeReturnTypeHints = true ,
721+ includeInlayEnumMemberValueHints = true ,
722+ },
723+ },
724+ },
725+ },
685726 --
686727
687728 lua_ls = {
@@ -769,10 +810,11 @@ require('lazy').setup({
769810 formatters_by_ft = {
770811 lua = { ' stylua' },
771812 -- Conform can also run multiple formatters sequentially
772- -- python = { " isort", " black" },
813+ python = { ' isort' , ' black' },
773814 --
774815 -- You can use 'stop_after_first' to run the first available formatter from the list
775- -- javascript = { "prettierd", "prettier", stop_after_first = true },
816+ javascript = { ' prettierd' , ' prettier' , stop_after_first = true },
817+ typescript = { ' prettierd' , ' prettier' , stop_after_first = true },
776818 },
777819 },
778820 },
@@ -944,7 +986,7 @@ require('lazy').setup({
944986 main = ' nvim-treesitter.configs' , -- Sets main module to use for opts
945987 -- [[ Configure Treesitter ]] See `:help nvim-treesitter`
946988 opts = {
947- ensure_installed = { ' bash' , ' c' , ' diff' , ' html' , ' lua' , ' luadoc' , ' markdown' , ' markdown_inline' , ' query' , ' vim' , ' vimdoc' },
989+ ensure_installed = { ' bash' , ' c' , ' diff' , ' html' , ' lua' , ' luadoc' , ' markdown' , ' markdown_inline' , ' query' , ' vim' , ' vimdoc' , ' python ' },
948990 -- Autoinstall languages that are not installed
949991 auto_install = true ,
950992 highlight = {
@@ -979,6 +1021,8 @@ require('lazy').setup({
9791021 -- require 'kickstart.plugins.autopairs',
9801022 -- require 'kickstart.plugins.neo-tree',
9811023 -- require 'kickstart.plugins.gitsigns', -- adds gitsigns recommend keymaps
1024+ require ' custom.plugins.oil' ,
1025+ require ' custom.plugins.avante' ,
9821026
9831027 -- NOTE: The import below can automatically add your own plugins, configuration, etc from `lua/custom/plugins/*.lua`
9841028 -- This is the easiest way to modularize your config.
@@ -1014,3 +1058,12 @@ require('lazy').setup({
10141058
10151059-- The line beneath this is called `modeline`. See `:help modeline`
10161060-- vim: ts=2 sts=2 sw=2 et
1061+
1062+ -- SKYSTAR
1063+ --
1064+ require (' oil' ).setup ()
1065+
1066+ vim .keymap .set (' i' , ' jj' , ' <Esc>' )
1067+ vim .keymap .set (' n' , ' <leader>w' , ' :w<CR>' )
1068+ vim .keymap .set (' n' , ' <leader>n' , ' :enew<CR>' )
1069+ vim .keymap .set (' n' , ' <leader>pv' , ' :Oil<CR>' )
0 commit comments