@@ -72,7 +72,7 @@ require('lazy').setup({
72
72
},
73
73
},
74
74
75
- { -- Theme inspired by Atom
75
+ { -- Theme
76
76
' rebelot/kanagawa.nvim' ,
77
77
priority = 1000 ,
78
78
config = function ()
@@ -135,8 +135,8 @@ require('lazy').setup({
135
135
-- NOTE: Next Step on Your Neovim Journey: Add/Configure additional "plugins" for kickstart
136
136
-- These are some example plugins that I've included in the kickstart repository.
137
137
-- Uncomment any of the lines below to enable them.
138
- -- require 'kickstart.plugins.autoformat',
139
- -- require 'kickstart.plugins.debug',
138
+ require ' kickstart.plugins.autoformat' ,
139
+ require ' kickstart.plugins.debug' ,
140
140
141
141
-- NOTE: The import below automatically adds your own plugins, configuration, etc from `lua/custom/plugins/*.lua`
142
142
-- You can use this folder to prevent any conflicts with this init.lua if you're interested in keeping
@@ -230,28 +230,46 @@ pcall(require('telescope').load_extension, 'fzf')
230
230
-- See `:help telescope.builtin`
231
231
vim .keymap .set (' n' , ' <leader>?' , require (' telescope.builtin' ).oldfiles , { desc = ' [?] Find recently opened files' })
232
232
vim .keymap .set (' n' , ' <leader><space>' , require (' telescope.builtin' ).buffers , { desc = ' [ ] Find existing buffers' })
233
- vim .keymap .set (' n' , ' <leader>/ ' , function ()
233
+ vim .keymap .set (' n' , ' <leader>f ' , function ()
234
234
-- You can pass additional configuration to telescope to change theme, layout, etc.
235
235
require (' telescope.builtin' ).current_buffer_fuzzy_find (require (' telescope.themes' ).get_dropdown {
236
236
winblend = 10 ,
237
237
previewer = false ,
238
238
})
239
239
end , { desc = ' [/] Fuzzily search in current buffer' })
240
240
241
- vim .keymap .set (' n' , ' <leader>sf' , require (' telescope.builtin' ).find_files , { desc = ' [S]earch [F]iles' })
242
- vim .keymap .set (' n' , ' <leader>sh' , require (' telescope.builtin' ).help_tags , { desc = ' [S]earch [H]elp' })
243
- vim .keymap .set (' n' , ' <leader>sw' , require (' telescope.builtin' ).grep_string , { desc = ' [S]earch current [W]ord' })
244
- vim .keymap .set (' n' , ' <leader>sg' , require (' telescope.builtin' ).live_grep , { desc = ' [S]earch by [G]rep' })
245
- vim .keymap .set (' n' , ' <leader>sd' , require (' telescope.builtin' ).diagnostics , { desc = ' [S]earch [D]iagnostics' })
241
+ vim .keymap .set (' n' , ' <leader>d' , require (' telescope.builtin' ).live_grep , { desc = ' [S]earch by [G]rep' })
242
+ vim .keymap .set (' n' , ' <leader>s' , require (' telescope.builtin' ).find_files , { desc = ' [S]earch [F]iles' })
243
+ vim .keymap .set (' n' , ' <leader>h' , require (' telescope.builtin' ).help_tags , { desc = ' [S]earch [H]elp' })
244
+ vim .keymap .set (' n' , ' <leader>q' , " :Neotree<CR>" , { desc = ' Neotree focus' })
245
+
246
+ -- VIM NAVIGATION
247
+ vim .keymap .set (' n' , ' <C-h>' , ' :wincmd h<CR>' , { desc = ' Move to left window' })
248
+ vim .keymap .set (' n' , ' <C-j>' , ' :wincmd j<CR>' , { desc = ' Move to bottom window' })
249
+ vim .keymap .set (' n' , ' <C-k>' , ' :wincmd k<CR>' , { desc = ' Move to top window' })
250
+ vim .keymap .set (' n' , ' <C-l>' , ' :wincmd l<CR>' , { desc = ' Move to right window' })
251
+
252
+ -- VIM REPLACE BASE KEYMAPS
253
+ vim .keymap .set (' v' , ' z' , ' "*x :let @+=@*<CR>' , { noremap = true , silent = true , desc = ' Cut' })
254
+ vim .keymap .set (' v' , ' e' , ' "*y :let @+=@*<CR>' , { noremap = true , silent = true , desc = ' Copy' })
255
+ vim .keymap .set (' n' , ' r' , ' "+p' , { noremap = true , silent = true , desc = ' Paste' })
256
+
257
+ vim .keymap .set (' v' , ' K' , ' :move \' <-2<CR>gv-gv' , { noremap = true , silent = true , desc = ' Move line up' })
258
+ vim .keymap .set (' v' , ' J' , ' :move \' >+1<CR>gv-gv' , { noremap = true , silent = true , desc = ' Move line down' })
259
+
260
+
261
+ -- vim.keymap.set('n', '<leader>qr', require('telescope.builtin').resume, {desc= '[S]earch [R]esume'})
262
+ -- vim.keymap.set('n', '<leader>qw', require('telescope.builtin').grep_string, { desc = '[S]earch current [W]ord' })
263
+ -- vim.keymap.set('n', '<leader>qd', require('telescope.builtin').diagnostics, { desc = '[S]earch [D]iagnostics' })
246
264
247
265
-- [[ Configure Treesitter ]]
248
266
-- See `:help nvim-treesitter`
249
267
require (' nvim-treesitter.configs' ).setup {
250
268
-- Add languages to be installed here that you want installed for treesitter
251
- ensure_installed = { ' c' , ' cpp' , ' go' , ' lua' , ' python' , ' rust' , ' tsx' , ' typescript' , ' help' , ' vim' },
269
+ ensure_installed = { ' c' , ' cpp' , ' go' , ' lua' , ' python' , ' rust' , ' tsx' , ' typescript' , ' help' , ' vim' , ' gitignore ' , ' graphql ' , ' javascript ' , ' html ' , ' json ' , ' markdown ' , ' regex ' , ' scss ' , ' svelte ' , ' css ' },
252
270
253
271
-- Autoinstall languages that are not installed. Defaults to false (but you can change for yourself!)
254
- auto_install = false ,
272
+ auto_install = true ,
255
273
256
274
highlight = { enable = true },
257
275
indent = { enable = true , disable = { ' python' } },
@@ -311,10 +329,10 @@ require('nvim-treesitter.configs').setup {
311
329
}
312
330
313
331
-- Diagnostic keymaps
314
- vim .keymap .set (' n' , ' [d' , vim .diagnostic .goto_prev , { desc = " Go to previous diagnostic message" })
315
- vim .keymap .set (' n' , ' ]d' , vim .diagnostic .goto_next , { desc = " Go to next diagnostic message" })
316
- vim .keymap .set (' n' , ' <leader>e' , vim .diagnostic .open_float , { desc = " Open floating diagnostic message" })
317
- vim .keymap .set (' n' , ' <leader>q' , vim .diagnostic .setloclist , { desc = " Open diagnostics list" })
332
+ -- vim.keymap.set('n', '[d', vim.diagnostic.goto_prev, { desc = "Go to previous diagnostic message" })
333
+ -- vim.keymap.set('n', ']d', vim.diagnostic.goto_next, { desc = "Go to next diagnostic message" })
334
+ -- vim.keymap.set('n', '<leader>e', vim.diagnostic.open_float, { desc = "Open floating diagnostic message" })
335
+ -- vim.keymap.set('n', '<leader>q', vim.diagnostic.setloclist, { desc = "Open diagnostics list" })
318
336
319
337
-- LSP settings.
320
338
-- This function gets run when an LSP connects to a particular buffer.
@@ -334,26 +352,26 @@ local on_attach = function(_, bufnr)
334
352
end
335
353
336
354
nmap (' <leader>rn' , vim .lsp .buf .rename , ' [R]e[n]ame' )
337
- nmap (' <leader>ca' , vim .lsp .buf .code_action , ' [C]ode [A]ction' )
355
+ -- nmap('<leader>ca', vim.lsp.buf.code_action, '[C]ode [A]ction')
338
356
339
- nmap (' gd ' , vim .lsp .buf .definition , ' [G]oto [D]efinition' )
340
- nmap (' gr ' , require (' telescope.builtin' ).lsp_references , ' [G]oto [R]eferences' )
341
- nmap (' gI ' , vim .lsp .buf .implementation , ' [G]oto [I]mplementation' )
357
+ nmap (' gr ' , vim .lsp .buf .definition , ' [G]oto [D]efinition' )
358
+ nmap (' ge ' , require (' telescope.builtin' ).lsp_references , ' [G]oto [R]eferences' )
359
+ nmap (' gz ' , vim .lsp .buf .implementation , ' [G]oto [I]mplementation' )
342
360
nmap (' <leader>D' , vim .lsp .buf .type_definition , ' Type [D]efinition' )
343
- nmap (' <leader>ds' , require (' telescope.builtin' ).lsp_document_symbols , ' [D]ocument [S]ymbols' )
344
- nmap (' <leader>ws' , require (' telescope.builtin' ).lsp_dynamic_workspace_symbols , ' [W]orkspace [S]ymbols' )
361
+ -- nmap('<leader>ds', require('telescope.builtin').lsp_document_symbols, '[D]ocument [S]ymbols')
362
+ -- nmap('<leader>ws', require('telescope.builtin').lsp_dynamic_workspace_symbols, '[W]orkspace [S]ymbols')
345
363
346
364
-- See `:help K` for why this keymap
347
- nmap (' K' , vim .lsp .buf .hover , ' Hover Documentation' )
348
- nmap (' <C-k>' , vim .lsp .buf .signature_help , ' Signature Documentation' )
365
+ nmap (' <leader> K' , vim .lsp .buf .hover , ' Hover Documentation' )
366
+ -- nmap('<C-k>', vim.lsp.buf.signature_help, 'Signature Documentation')
349
367
350
368
-- Lesser used LSP functionality
351
- nmap (' gD' , vim .lsp .buf .declaration , ' [G]oto [D]eclaration' )
352
- nmap (' <leader>wa' , vim .lsp .buf .add_workspace_folder , ' [W]orkspace [A]dd Folder' )
353
- nmap (' <leader>wr' , vim .lsp .buf .remove_workspace_folder , ' [W]orkspace [R]emove Folder' )
354
- nmap (' <leader>wl' , function ()
355
- print (vim .inspect (vim .lsp .buf .list_workspace_folders ()))
356
- end , ' [W]orkspace [L]ist Folders' )
369
+ -- nmap('gD', vim.lsp.buf.declaration, '[G]oto [D]eclaration')
370
+ -- nmap('<leader>wa', vim.lsp.buf.add_workspace_folder, '[W]orkspace [A]dd Folder')
371
+ -- nmap('<leader>wr', vim.lsp.buf.remove_workspace_folder, '[W]orkspace [R]emove Folder')
372
+ -- nmap('<leader>wl', function()
373
+ -- print(vim.inspect(vim.lsp.buf.list_workspace_folders()))
374
+ -- end, '[W]orkspace [L]ist Folders')
357
375
358
376
-- Create a command `:Format` local to the LSP buffer
359
377
vim .api .nvim_buf_create_user_command (bufnr , ' Format' , function (_ )
@@ -370,9 +388,17 @@ local servers = {
370
388
-- clangd = {},
371
389
-- gopls = {},
372
390
-- pyright = {},
373
- -- rust_analyzer = {},
374
- -- tsserver = {},
375
-
391
+ rust_analyzer = {},
392
+ tsserver = {},
393
+ cssls = {},
394
+ cssmodules_ls = {},
395
+ graphql = {},
396
+ html = {},
397
+ jsonls = {},
398
+ marksman = {},
399
+ pyright = {},
400
+ svelte = {},
401
+ tailwindcss = {},
376
402
lua_ls = {
377
403
Lua = {
378
404
workspace = { checkThirdParty = false },
0 commit comments