Skip to content

Commit 18009d3

Browse files
adamhjkadamhjk
committed
Lazy config
1 parent 3824342 commit 18009d3

File tree

6 files changed

+113
-22
lines changed

6 files changed

+113
-22
lines changed

‎init.lua

Lines changed: 23 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ P.S. You can delete this when you're done too. It's your config now :)
4141
-- Set <space> as the leader key
4242
-- See `:help mapleader`
4343
-- NOTE: Must happen before plugins are required (otherwise wrong leader will be used)
44-
vim.g.mapleader = ' '
45-
vim.g.maplocalleader = ' '
44+
vim.g.mapleader = ','
45+
vim.g.maplocalleader = ','
4646

4747
-- [[ Install `lazy.nvim` plugin manager ]]
4848
-- https://github.com/folke/lazy.nvim
@@ -112,7 +112,7 @@ require('lazy').setup({
112112
},
113113

114114
-- Useful plugin to show you pending keybinds.
115-
{ 'folke/which-key.nvim', opts = {} },
115+
{ 'folke/which-key.nvim', opts = {} },
116116
{
117117
-- Adds git related signs to the gutter, as well as utilities for managing changes
118118
'lewis6991/gitsigns.nvim',
@@ -191,6 +191,7 @@ require('lazy').setup({
191191
{
192192
-- Theme inspired by Atom
193193
'navarasu/onedark.nvim',
194+
opts = { style = 'warm' },
194195
priority = 1000,
195196
config = function()
196197
vim.cmd.colorscheme 'onedark'
@@ -203,7 +204,7 @@ require('lazy').setup({
203204
-- See `:help lualine.txt`
204205
opts = {
205206
options = {
206-
icons_enabled = false,
207+
icons_enabled = true,
207208
theme = 'onedark',
208209
component_separators = '|',
209210
section_separators = '',
@@ -265,7 +266,7 @@ require('lazy').setup({
265266
-- Uncomment the following line and add your plugins to `lua/custom/plugins/*.lua` to get going.
266267
--
267268
-- For additional information see: https://github.com/folke/lazy.nvim#-structuring-your-plugins
268-
-- { import = 'custom.plugins' },
269+
{ import = 'custom.plugins' },
269270
}, {})
270271

271272
-- [[ Setting options ]]
@@ -390,7 +391,7 @@ vim.api.nvim_create_user_command('LiveGrepGitRoot', live_grep_git_root, {})
390391

391392
-- See `:help telescope.builtin`
392393
vim.keymap.set('n', '<leader>?', require('telescope.builtin').oldfiles, { desc = '[?] Find recently opened files' })
393-
vim.keymap.set('n', '<leader><space>', require('telescope.builtin').buffers, { desc = '[ ] Find existing buffers' })
394+
vim.keymap.set('n', '<leader>b', require('telescope.builtin').buffers, { desc = '[b] Find existing buffers' })
394395
vim.keymap.set('n', '<leader>/', function()
395396
-- You can pass additional configuration to telescope to change theme, layout, etc.
396397
require('telescope.builtin').current_buffer_fuzzy_find(require('telescope.themes').get_dropdown {
@@ -405,13 +406,13 @@ local function telescope_live_grep_open_files()
405406
prompt_title = 'Live Grep in Open Files',
406407
}
407408
end
408-
vim.keymap.set('n', '<leader>s/', telescope_live_grep_open_files, { desc = '[S]earch [/] in Open Files' })
409+
vim.keymap.set('n', '<leader>of', telescope_live_grep_open_files, { desc = '[o,f] Grep in Open Files' })
409410
vim.keymap.set('n', '<leader>ss', require('telescope.builtin').builtin, { desc = '[S]earch [S]elect Telescope' })
410411
vim.keymap.set('n', '<leader>gf', require('telescope.builtin').git_files, { desc = 'Search [G]it [F]iles' })
411-
vim.keymap.set('n', '<leader>sf', require('telescope.builtin').find_files, { desc = '[S]earch [F]iles' })
412+
vim.keymap.set('n', '<leader>t', require('telescope.builtin').find_files, { desc = '[S]earch [F]iles' })
412413
vim.keymap.set('n', '<leader>sh', require('telescope.builtin').help_tags, { desc = '[S]earch [H]elp' })
413414
vim.keymap.set('n', '<leader>sw', require('telescope.builtin').grep_string, { desc = '[S]earch current [W]ord' })
414-
vim.keymap.set('n', '<leader>sg', require('telescope.builtin').live_grep, { desc = '[S]earch by [G]rep' })
415+
vim.keymap.set('n', '<leader>F', require('telescope.builtin').live_grep, { desc = '[S]earch by [G]rep' })
415416
vim.keymap.set('n', '<leader>sG', ':LiveGrepGitRoot<cr>', { desc = '[S]earch by [G]rep on Git Root' })
416417
vim.keymap.set('n', '<leader>sd', require('telescope.builtin').diagnostics, { desc = '[S]earch [D]iagnostics' })
417418
vim.keymap.set('n', '<leader>sr', require('telescope.builtin').resume, { desc = '[S]earch [R]esume' })
@@ -421,7 +422,7 @@ vim.keymap.set('n', '<leader>sr', require('telescope.builtin').resume, { desc =
421422
-- Defer Treesitter setup after first render to improve startup time of 'nvim {filename}'
422423
vim.defer_fn(function()
423424
require('nvim-treesitter.configs').setup {
424-
-- Add languages to be installed here that you want installed for treesitter
425+
-- Add languages to be installed herr that you want installed for treesitter
425426
ensure_installed = { 'c', 'cpp', 'go', 'lua', 'python', 'rust', 'tsx', 'javascript', 'typescript', 'vimdoc', 'vim', 'bash' },
426427

427428
-- Autoinstall languages that are not installed. Defaults to false (but you can change for yourself!)
@@ -502,25 +503,25 @@ local on_attach = function(_, bufnr)
502503
vim.keymap.set('n', keys, func, { buffer = bufnr, desc = desc })
503504
end
504505

505-
nmap('<leader>rn', vim.lsp.buf.rename, '[R]e[n]ame')
506-
nmap('<leader>ca', vim.lsp.buf.code_action, '[C]ode [A]ction')
506+
nmap('<leader>ln', vim.lsp.buf.rename, 'LSP [R]ename')
507+
nmap('<leader>la', vim.lsp.buf.code_action, 'LSP Code [A]ction')
507508

508509
nmap('gd', require('telescope.builtin').lsp_definitions, '[G]oto [D]efinition')
509510
nmap('gr', require('telescope.builtin').lsp_references, '[G]oto [R]eferences')
510511
nmap('gI', require('telescope.builtin').lsp_implementations, '[G]oto [I]mplementation')
511-
nmap('<leader>D', require('telescope.builtin').lsp_type_definitions, 'Type [D]efinition')
512-
nmap('<leader>ds', require('telescope.builtin').lsp_document_symbols, '[D]ocument [S]ymbols')
513-
nmap('<leader>ws', require('telescope.builtin').lsp_dynamic_workspace_symbols, '[W]orkspace [S]ymbols')
512+
nmap('<leader>lD', require('telescope.builtin').lsp_type_definitions, 'LSP Type [D]efinition')
513+
nmap('<leader>lds', require('telescope.builtin').lsp_document_symbols, 'LSP [D]ocument [S]ymbols')
514+
nmap('<leader>lws', require('telescope.builtin').lsp_dynamic_workspace_symbols, 'LSP [W]orkspace [S]ymbols')
514515

515516
-- See `:help K` for why this keymap
516517
nmap('K', vim.lsp.buf.hover, 'Hover Documentation')
517518
nmap('<C-k>', vim.lsp.buf.signature_help, 'Signature Documentation')
518519

519520
-- Lesser used LSP functionality
520521
nmap('gD', vim.lsp.buf.declaration, '[G]oto [D]eclaration')
521-
nmap('<leader>wa', vim.lsp.buf.add_workspace_folder, '[W]orkspace [A]dd Folder')
522-
nmap('<leader>wr', vim.lsp.buf.remove_workspace_folder, '[W]orkspace [R]emove Folder')
523-
nmap('<leader>wl', function()
522+
nmap('<leader>lwa', vim.lsp.buf.add_workspace_folder, 'LSP [W]orkspace [A]dd Folder')
523+
nmap('<leader>lwr', vim.lsp.buf.remove_workspace_folder, 'LSP [W]orkspace [R]emove Folder')
524+
nmap('<leader>lwl', function()
524525
print(vim.inspect(vim.lsp.buf.list_workspace_folders()))
525526
end, '[W]orkspace [L]ist Folders')
526527

@@ -533,7 +534,6 @@ end
533534
-- document existing key chains
534535
require('which-key').register {
535536
['<leader>c'] = { name = '[C]ode', _ = 'which_key_ignore' },
536-
['<leader>d'] = { name = '[D]ocument', _ = 'which_key_ignore' },
537537
['<leader>g'] = { name = '[G]it', _ = 'which_key_ignore' },
538538
['<leader>h'] = { name = 'Git [H]unk', _ = 'which_key_ignore' },
539539
['<leader>r'] = { name = '[R]ename', _ = 'which_key_ignore' },
@@ -565,9 +565,10 @@ local servers = {
565565
-- clangd = {},
566566
-- gopls = {},
567567
-- pyright = {},
568-
-- rust_analyzer = {},
569-
-- tsserver = {},
570-
-- html = { filetypes = { 'html', 'twig', 'hbs'} },
568+
rust_analyzer = {},
569+
tsserver = {},
570+
volar = {},
571+
html = { filetypes = { 'html', 'twig', 'hbs' } },
571572

572573
lua_ls = {
573574
Lua = {

‎lazy-lock.json

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
{
2+
"Comment.nvim": { "branch": "master", "commit": "0236521ea582747b58869cb72f70ccfa967d2e89" },
3+
"LuaSnip": { "branch": "master", "commit": "954c81b53989097faaff0fabc11c29575288c3e1" },
4+
"cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" },
5+
"cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" },
6+
"dressing.nvim": { "branch": "master", "commit": "8b7ae53d7f04f33be3439a441db8071c96092d19" },
7+
"fidget.nvim": { "branch": "main", "commit": "7dc62b9ce32ac0f21cfb510f243644ce28a39299" },
8+
"friendly-snippets": { "branch": "main", "commit": "53d3df271d031c405255e99410628c26a8f0d2b0" },
9+
"gitsigns.nvim": { "branch": "main", "commit": "6e05045fb1a4845fe44f5c54aafe024444c422ba" },
10+
"indent-blankline.nvim": { "branch": "master", "commit": "7206c77cb931f79885fc47f88ae18f99148392eb" },
11+
"lazy.nvim": { "branch": "main", "commit": "96584866b9c5e998cbae300594d0ccfd0c464627" },
12+
"lsp-inlayhints.nvim": { "branch": "main", "commit": "d981f65c9ae0b6062176f0accb9c151daeda6f16" },
13+
"lualine.nvim": { "branch": "master", "commit": "2248ef254d0a1488a72041cfb45ca9caada6d994" },
14+
"mason-lspconfig.nvim": { "branch": "main", "commit": "9453e3d6cd2ca45d96e20f343e8f1b927364b630" },
15+
"mason.nvim": { "branch": "main", "commit": "41e75af1f578e55ba050c863587cffde3556ffa6" },
16+
"neodev.nvim": { "branch": "main", "commit": "c4ce017bd4bacf60bf59330cec9e93c5d5e104a6" },
17+
"nvim-cmp": { "branch": "main", "commit": "41d7633e4146dce1072de32cea31ee31b056a131" },
18+
"nvim-lspconfig": { "branch": "master", "commit": "bd405e45c5fb122c16af8f87fa2dd7ab1981b243" },
19+
"nvim-treesitter": { "branch": "master", "commit": "a6c655629cad421e432aa84af32cbfe35375113a" },
20+
"nvim-treesitter-textobjects": { "branch": "master", "commit": "ec1c5bdb3d87ac971749fa6c7dbc2b14884f1f6a" },
21+
"nvim-web-devicons": { "branch": "master", "commit": "8b2e5ef9eb8a717221bd96cb8422686d65a09ed5" },
22+
"oil.nvim": { "branch": "master", "commit": "24027ed8d7f3ee5c38cfd713915e2e16d89e79b3" },
23+
"onedark.nvim": { "branch": "master", "commit": "c5476a091b0f1b4e853db91c91ff941f848a1cdd" },
24+
"plenary.nvim": { "branch": "master", "commit": "55d9fe89e33efd26f532ef20223e5f9430c8b0c0" },
25+
"telescope-fzf-native.nvim": { "branch": "main", "commit": "6c921ca12321edaa773e324ef64ea301a1d0da62" },
26+
"telescope.nvim": { "branch": "0.1.x", "commit": "d90956833d7c27e73c621a61f20b29fdb7122709" },
27+
"vim-fugitive": { "branch": "master", "commit": "46eaf8918b347906789df296143117774e827616" },
28+
"vim-rhubarb": { "branch": "master", "commit": "ee69335de176d9325267b0fd2597a22901d927b1" },
29+
"vim-sleuth": { "branch": "master", "commit": "1cc4557420f215d02c4d2645a748a816c220e99b" },
30+
"which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" }
31+
}

‎lua/custom/plugins/dressing.lua

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
return {
2+
'stevearc/dressing.nvim',
3+
opts = {},
4+
}

‎lua/custom/plugins/formatter.lua

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
return {
2+
'mhartington/formatter.nvim',
3+
keys = {
4+
{ "<leader>f", "<cmd>Format<cr>", desc = "Format" },
5+
},
6+
config = function()
7+
require("formatter").setup({
8+
logging = true,
9+
log_level = vim.log.levels.DEBUG,
10+
filetype = {
11+
lua = {
12+
require("formatter.filetypes.lua").stylua,
13+
},
14+
vue = function()
15+
local M = {}
16+
local defaults = require "formatter.defaults"
17+
local util = require "formatter.util"
18+
M.vue = util.withl(defaults.eslint_d, "vue")
19+
return M
20+
end,
21+
},
22+
["*"] = {
23+
require("formatter.filetypes.any").remove_trailing_whitespace,
24+
},
25+
})
26+
end
27+
}

‎lua/custom/plugins/lsp-inlayhints.lua

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
return {
2+
"lvimuser/lsp-inlayhints.nvim",
3+
config = function()
4+
require("lsp-inlayhints").setup();
5+
vim.api.nvim_create_augroup("LspAttach_inlayhints", {})
6+
vim.api.nvim_create_autocmd("LspAttach", {
7+
group = "LspAttach_inlayhints",
8+
callback = function(args)
9+
if not (args.data and args.data.client_id) then
10+
return
11+
end
12+
13+
local bufnr = args.buf
14+
local client = vim.lsp.get_client_by_id(args.data.client_id)
15+
require("lsp-inlayhints").on_attach(client, bufnr)
16+
end,
17+
})
18+
end,
19+
}

‎lua/custom/plugins/oil.lua

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
return {
2+
'stevearc/oil.nvim',
3+
opts = {},
4+
lazy = false,
5+
dependencies = { "nvim-tree/nvim-web-devicons" },
6+
keys = {
7+
{ "<leader>d", "<cmd>Oil<cr>", desc = "Oil" }
8+
},
9+
}

0 commit comments

Comments
 (0)