A few more changes
This commit is contained in:
parent
b7035c2140
commit
1d40dc0924
23
init.lua
23
init.lua
|
@ -64,6 +64,7 @@ require('custom.leader_shortcuts')
|
||||||
require('custom.treesitter')
|
require('custom.treesitter')
|
||||||
require('custom.which_key')
|
require('custom.which_key')
|
||||||
require('custom.lsp')
|
require('custom.lsp')
|
||||||
|
require('custom.prettier')
|
||||||
|
|
||||||
-- [[ Setting options ]]
|
-- [[ Setting options ]]
|
||||||
-- See `:help vim.o`
|
-- See `:help vim.o`
|
||||||
|
@ -156,28 +157,6 @@ require 'cmp'.setup {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
-- Configure prettier
|
|
||||||
local prettier = require("prettier")
|
|
||||||
|
|
||||||
prettier.setup({
|
|
||||||
bin = 'prettier', -- or `'prettierd'` (v0.23.3+)
|
|
||||||
filetypes = {
|
|
||||||
"css",
|
|
||||||
"graphql",
|
|
||||||
"html",
|
|
||||||
"javascript",
|
|
||||||
"javascriptreact",
|
|
||||||
"json",
|
|
||||||
"less",
|
|
||||||
"markdown",
|
|
||||||
"scss",
|
|
||||||
"typescript",
|
|
||||||
"typescriptreact",
|
|
||||||
"yaml",
|
|
||||||
},
|
|
||||||
})
|
|
||||||
|
|
||||||
|
|
||||||
-- nvim-cmp setup
|
-- nvim-cmp setup
|
||||||
local cmp = require 'cmp'
|
local cmp = require 'cmp'
|
||||||
local luasnip = require 'luasnip'
|
local luasnip = require 'luasnip'
|
||||||
|
|
|
@ -17,9 +17,21 @@ vim.keymap.set('n', '<leader>sd', require('telescope.builtin').diagnostics, { de
|
||||||
|
|
||||||
-- [[ Configure NvimTree ]]
|
-- [[ Configure NvimTree ]]
|
||||||
require("nvim-tree").setup()
|
require("nvim-tree").setup()
|
||||||
vim.keymap.set('n', '<leader>e', ":NvimTreeToggle<cr>", { desc = 'Toggle NvimTree' })
|
vim.keymap.set('n', '<leader>e', ":NvimTreeToggle<cr>", { desc = 'NvimTree' })
|
||||||
|
vim.keymap.set('n', '<leader>ee', ":NvimTreeToggle<cr>", { desc = 'NvimTree Toggle' })
|
||||||
vim.keymap.set('n', '<leader>ef', ':NvimTreeFindFile<cr>', { desc = 'Find file' })
|
vim.keymap.set('n', '<leader>ef', ':NvimTreeFindFile<cr>', { desc = 'Find file' })
|
||||||
vim.keymap.set('n', '<C-h>', '<C-n><left>')
|
vim.keymap.set('n', '<C-h>', '<C-n><left>')
|
||||||
vim.keymap.set('n', '<C-j>', '<C-n><up>')
|
vim.keymap.set('n', '<C-j>', '<C-n><up>')
|
||||||
vim.keymap.set('n', '<C-k>', '<C-n><down>')
|
vim.keymap.set('n', '<C-k>', '<C-n><down>')
|
||||||
vim.keymap.set('n', '<C-l>', '<C-n><right>')
|
vim.keymap.set('n', '<C-l>', '<C-n><right>')
|
||||||
|
|
||||||
|
vim.keymap.set('n', '<leader>d', vim.diagnostic.open_float, { desc = "Open floating diagnostic message" })
|
||||||
|
vim.keymap.set('n', '<leader>q', vim.diagnostic.setloclist, { desc = "Open diagnostics list" })
|
||||||
|
|
||||||
|
-- [[ Configuring vim tests ]]
|
||||||
|
vim.keymap.set('n', '<leader>t', ":VimTest<cr>", { desc = 'VimTest' })
|
||||||
|
vim.keymap.set('n', '<leader>tn', ":TestNearest", { desc = "Run Nearest test" })
|
||||||
|
vim.keymap.set('n', '<leader>tf', ":TestFile", { desc = "Run Current file" })
|
||||||
|
vim.keymap.set('n', '<leader>ts', ":TestSuite", { desc = "Run Test suite" })
|
||||||
|
vim.keymap.set('n', '<leader>tl', ":TestLast", { desc = "Runs the last test" })
|
||||||
|
vim.keymap.set('n', '<leader>tv', ":TestVisit", { desc = "Visit the file that was last run" })
|
||||||
|
|
|
@ -94,7 +94,17 @@ require('lazy').setup({
|
||||||
{ 'numToStr/Comment.nvim', opts = {} },
|
{ 'numToStr/Comment.nvim', opts = {} },
|
||||||
|
|
||||||
-- Fuzzy Finder (files, lsp, etc)
|
-- Fuzzy Finder (files, lsp, etc)
|
||||||
{ 'nvim-telescope/telescope.nvim', version = '*', dependencies = { 'nvim-lua/plenary.nvim' } },
|
{ 'nvim-telescope/telescope.nvim',
|
||||||
|
version = '*',
|
||||||
|
dependencies = {
|
||||||
|
'nvim-lua/plenary.nvim',
|
||||||
|
"nvim-telescope/telescope-live-grep-args.nvim",
|
||||||
|
},
|
||||||
|
|
||||||
|
config = function ()
|
||||||
|
require("telescope").load_extension("live_grep_args")
|
||||||
|
end
|
||||||
|
},
|
||||||
|
|
||||||
-- Fuzzy Finder Algorithm which requires local dependencies to be built.
|
-- Fuzzy Finder Algorithm which requires local dependencies to be built.
|
||||||
-- Only load if `make` is available. Make sure you have the system
|
-- Only load if `make` is available. Make sure you have the system
|
||||||
|
@ -179,4 +189,5 @@ require('lazy').setup({
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
{ "vim-test/vim-test" }
|
||||||
}, {})
|
}, {})
|
||||||
|
|
|
@ -0,0 +1,21 @@
|
||||||
|
-- Configure prettier
|
||||||
|
local prettier = require("prettier")
|
||||||
|
|
||||||
|
prettier.setup({
|
||||||
|
bin = 'prettier', -- or `'prettierd'` (v0.23.3+)
|
||||||
|
filetypes = {
|
||||||
|
"css",
|
||||||
|
"graphql",
|
||||||
|
"html",
|
||||||
|
"javascript",
|
||||||
|
"javascriptreact",
|
||||||
|
"json",
|
||||||
|
"less",
|
||||||
|
"markdown",
|
||||||
|
"scss",
|
||||||
|
"typescript",
|
||||||
|
"typescriptreact",
|
||||||
|
"yaml",
|
||||||
|
"ruby"
|
||||||
|
},
|
||||||
|
})
|
|
@ -67,6 +67,4 @@ require('nvim-treesitter.configs').setup {
|
||||||
-- Diagnostic keymaps
|
-- Diagnostic keymaps
|
||||||
vim.keymap.set('n', '[d', vim.diagnostic.goto_prev, { desc = "Go to previous diagnostic message" })
|
vim.keymap.set('n', '[d', vim.diagnostic.goto_prev, { desc = "Go to previous diagnostic message" })
|
||||||
vim.keymap.set('n', ']d', vim.diagnostic.goto_next, { desc = "Go to next diagnostic message" })
|
vim.keymap.set('n', ']d', vim.diagnostic.goto_next, { desc = "Go to next diagnostic message" })
|
||||||
vim.keymap.set('n', '<leader>e', vim.diagnostic.open_float, { desc = "Open floating diagnostic message" })
|
|
||||||
vim.keymap.set('n', '<leader>q', vim.diagnostic.setloclist, { desc = "Open diagnostics list" })
|
|
||||||
|
|
||||||
|
|
|
@ -4,6 +4,12 @@ wk.register({
|
||||||
name = "+Git",
|
name = "+Git",
|
||||||
h = {
|
h = {
|
||||||
name = "+Github",
|
name = "+Github",
|
||||||
|
o = {
|
||||||
|
name = "+OpenInGithub",
|
||||||
|
f = { "<cmd>OpenInGHFile", "Open File" },
|
||||||
|
l = { "<cmd>OpenInGHFileLines", "Open Lines" },
|
||||||
|
r = { "<cmd>OpenInGHRepo", "Open Repo" },
|
||||||
|
},
|
||||||
c = {
|
c = {
|
||||||
name = "+Commits",
|
name = "+Commits",
|
||||||
c = { "<cmd>GHCloseCommit<cr>", "Close" },
|
c = { "<cmd>GHCloseCommit<cr>", "Close" },
|
||||||
|
|
Loading…
Reference in New Issue