|
|
@ -164,7 +164,8 @@ vim.keymap.set('n', '<Esc>', '<cmd>nohlsearch<CR>')
|
|
|
|
-- Diagnostic keymaps
|
|
|
|
-- Diagnostic keymaps
|
|
|
|
vim.keymap.set('n', '<leader>qq', '<CMD>q!<CR>', { desc = 'Quit all without close' })
|
|
|
|
vim.keymap.set('n', '<leader>qq', '<CMD>q!<CR>', { desc = 'Quit all without close' })
|
|
|
|
vim.keymap.set('n', '<C-s>', '<CMD>w<CR>', { desc = 'Save a file' })
|
|
|
|
vim.keymap.set('n', '<C-s>', '<CMD>w<CR>', { desc = 'Save a file' })
|
|
|
|
vim.keymap.set('n', '<leader>e', vim.diagnostic.open_float, { desc = 'Show diagnostic [E]rror messages' })
|
|
|
|
vim.keymap.set('n', '<leader>e', '<CMD>Oil<CR>', { desc = 'Open folder structure with Oil' })
|
|
|
|
|
|
|
|
vim.keymap.set('n', '<leader>E', vim.diagnostic.open_float, { desc = 'Show diagnostic [E]rror messages' })
|
|
|
|
vim.keymap.set('n', '<leader>q', vim.diagnostic.setloclist, { desc = 'Open diagnostic [Q]uickfix list' })
|
|
|
|
vim.keymap.set('n', '<leader>q', vim.diagnostic.setloclist, { desc = 'Open diagnostic [Q]uickfix list' })
|
|
|
|
|
|
|
|
|
|
|
|
-- Exit terminal mode in the builtin terminal with a shortcut that is a bit easier
|
|
|
|
-- Exit terminal mode in the builtin terminal with a shortcut that is a bit easier
|
|
|
@ -221,6 +222,7 @@ vim.cmd 'set expandtab'
|
|
|
|
vim.cmd 'set tabstop=2'
|
|
|
|
vim.cmd 'set tabstop=2'
|
|
|
|
vim.cmd 'set softtabstop=2'
|
|
|
|
vim.cmd 'set softtabstop=2'
|
|
|
|
vim.cmd 'set shiftwidth=2'
|
|
|
|
vim.cmd 'set shiftwidth=2'
|
|
|
|
|
|
|
|
|
|
|
|
--
|
|
|
|
--
|
|
|
|
require('lazy').setup({
|
|
|
|
require('lazy').setup({
|
|
|
|
-- NOTE: Plugins can be added with a link (or for a github repo: 'owner/repo' link).
|
|
|
|
-- NOTE: Plugins can be added with a link (or for a github repo: 'owner/repo' link).
|
|
|
@ -804,27 +806,27 @@ require('lazy').setup({
|
|
|
|
end,
|
|
|
|
end,
|
|
|
|
},
|
|
|
|
},
|
|
|
|
|
|
|
|
|
|
|
|
{ -- You can easily change to a different colorscheme.
|
|
|
|
-- { -- You can easily change to a different colorscheme.
|
|
|
|
-- Change the name of the colorscheme plugin below, and then
|
|
|
|
-- Change the name of the colorscheme plugin below, and then
|
|
|
|
-- change the command in the config to whatever the name of that colorscheme is.
|
|
|
|
-- change the command in the config to whatever the name of that colorscheme is.
|
|
|
|
--
|
|
|
|
--
|
|
|
|
-- If you want to see what colorschemes are already installed, you can use `:Telescope colorscheme`.
|
|
|
|
-- If you want to see what colorschemes are already installed, you can use `:Telescope colorscheme`.
|
|
|
|
'folke/tokyonight.nvim',
|
|
|
|
-- 'folke/tokyonight.nvim',
|
|
|
|
priority = 1000, -- Make sure to load this before all the other start plugins.
|
|
|
|
-- priority = 1000, -- Make sure to load this before all the other start plugins.
|
|
|
|
opts = {
|
|
|
|
-- opts = {
|
|
|
|
transparent = true,
|
|
|
|
-- transparent = true,
|
|
|
|
},
|
|
|
|
-- },
|
|
|
|
|
|
|
|
|
|
|
|
init = function()
|
|
|
|
-- init = function()
|
|
|
|
-- Load the colorscheme here.
|
|
|
|
-- Load the colorscheme here.
|
|
|
|
-- Like many other themes, this one has different styles, and you could load
|
|
|
|
-- Like many other themes, this one has different styles, and you could load
|
|
|
|
-- any other, such as 'tokyonight-storm', 'tokyonight-moon', or 'tokyonight-day'.
|
|
|
|
-- any other, such as 'tokyonight-storm', 'tokyonight-moon', or 'tokyonight-day'.
|
|
|
|
vim.cmd.colorscheme 'tokyonight-night'
|
|
|
|
-- vim.cmd.colorscheme 'tokyonight-night'
|
|
|
|
|
|
|
|
|
|
|
|
-- You can configure highlights by doing something like:
|
|
|
|
-- You can configure highlights by doing something like:
|
|
|
|
vim.cmd.hi 'Comment gui=none'
|
|
|
|
-- vim.cmd.hi 'Comment gui=none'
|
|
|
|
end,
|
|
|
|
-- end,
|
|
|
|
},
|
|
|
|
-- },
|
|
|
|
|
|
|
|
|
|
|
|
-- Highlight todo, notes, etc in comments
|
|
|
|
-- Highlight todo, notes, etc in comments
|
|
|
|
{ 'folke/todo-comments.nvim', event = 'VimEnter', dependencies = { 'nvim-lua/plenary.nvim' }, opts = { signs = false } },
|
|
|
|
{ 'folke/todo-comments.nvim', event = 'VimEnter', dependencies = { 'nvim-lua/plenary.nvim' }, opts = { signs = false } },
|
|
|
@ -933,7 +935,7 @@ require('lazy').setup({
|
|
|
|
--
|
|
|
|
--
|
|
|
|
-- Uncomment the following line and add your plugins to `lua/custom/plugins/*.lua` to get going.
|
|
|
|
-- Uncomment the following line and add your plugins to `lua/custom/plugins/*.lua` to get going.
|
|
|
|
-- For additional information, see `:help lazy.nvim-lazy.nvim-structuring-your-plugins`
|
|
|
|
-- For additional information, see `:help lazy.nvim-lazy.nvim-structuring-your-plugins`
|
|
|
|
-- { import = 'custom.plugins' },
|
|
|
|
{ import = 'custom.plugins' },
|
|
|
|
}, {
|
|
|
|
}, {
|
|
|
|
ui = {
|
|
|
|
ui = {
|
|
|
|
-- If you are using a Nerd Font: set icons to an empty table which will use the
|
|
|
|
-- If you are using a Nerd Font: set icons to an empty table which will use the
|
|
|
@ -956,5 +958,6 @@ require('lazy').setup({
|
|
|
|
},
|
|
|
|
},
|
|
|
|
})
|
|
|
|
})
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
vim.cmd.colorscheme 'catppuccin'
|
|
|
|
-- The line beneath this is called `modeline`. See `:help modeline`
|
|
|
|
-- The line beneath this is called `modeline`. See `:help modeline`
|
|
|
|
-- vim: ts=2 sts=2 sw=2 et
|
|
|
|
-- vim: ts=2 sts=2 sw=2 et
|
|
|
|