uncommented gitsigns
This commit is contained in:
parent
d25b3799db
commit
198370ae5b
33
init.lua
33
init.lua
|
@ -91,6 +91,9 @@ I hope you enjoy your Neovim journey,
|
||||||
-- NOTE: Must happen before plugins are loaded (otherwise wrong leader will be used)
|
-- NOTE: Must happen before plugins are loaded (otherwise wrong leader will be used)
|
||||||
P.S. You can delete this when you're done too. It's your config now! :)
|
P.S. You can delete this when you're done too. It's your config now! :)
|
||||||
--]]
|
--]]
|
||||||
|
vim.g.db_ui_env_variable_url = 'postgres'
|
||||||
|
vim.g.db_ui_env_variable_name = 'test'
|
||||||
|
|
||||||
vim.cmd [[ autocmd VimEnter * Neotree position=left ]]
|
vim.cmd [[ autocmd VimEnter * Neotree position=left ]]
|
||||||
--AUTO RELOAD ON SAVE
|
--AUTO RELOAD ON SAVE
|
||||||
vim.api.nvim_create_autocmd('BufWritePost', {
|
vim.api.nvim_create_autocmd('BufWritePost', {
|
||||||
|
@ -349,14 +352,14 @@ require('lazy').setup({
|
||||||
|
|
||||||
-- Alternatively, use `config = function() ... end` for full control over the configuration.
|
-- Alternatively, use `config = function() ... end` for full control over the configuration.
|
||||||
-- If you prefer to call `setup` explicitly, use:
|
-- If you prefer to call `setup` explicitly, use:
|
||||||
-- {
|
{
|
||||||
-- 'lewis6991/gitsigns.nvim',
|
'lewis6991/gitsigns.nvim',
|
||||||
-- config = function()
|
config = function()
|
||||||
-- require('gitsigns').setup({
|
require('gitsigns').setup {
|
||||||
-- -- Your gitsigns configuration here
|
-- Your gitsigns configuration here
|
||||||
-- })
|
}
|
||||||
-- end,
|
end,
|
||||||
-- }
|
},
|
||||||
--
|
--
|
||||||
-- Here is a more advanced example where we pass configuration
|
-- Here is a more advanced example where we pass configuration
|
||||||
-- options to `gitsigns.nvim`.
|
-- options to `gitsigns.nvim`.
|
||||||
|
@ -585,7 +588,7 @@ require('lazy').setup({
|
||||||
config = function()
|
config = function()
|
||||||
require('mason').setup()
|
require('mason').setup()
|
||||||
require('mason-lspconfig').setup {
|
require('mason-lspconfig').setup {
|
||||||
ensure_installed = { 'ts_ls', 'lua_ls', 'eslint' },
|
ensure_installed = { 'ts_ls', 'lua_ls', 'eslint_lsp' },
|
||||||
automatic_installation = true,
|
automatic_installation = true,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -593,8 +596,6 @@ require('lazy').setup({
|
||||||
|
|
||||||
-- Setup tsserver
|
-- Setup tsserver
|
||||||
lspconfig.ts_ls.setup {}
|
lspconfig.ts_ls.setup {}
|
||||||
|
|
||||||
-- Setup other servers similarly
|
|
||||||
end,
|
end,
|
||||||
},
|
},
|
||||||
-- Mason must be loaded before its dependents so we need to set it up here.
|
-- Mason must be loaded before its dependents so we need to set it up here.
|
||||||
|
@ -904,7 +905,8 @@ require('lazy').setup({
|
||||||
-- python = { "isort", "black" },
|
-- python = { "isort", "black" },
|
||||||
--
|
--
|
||||||
-- You can use 'stop_after_first' to run the first available formatter from the list
|
-- You can use 'stop_after_first' to run the first available formatter from the list
|
||||||
-- javascript = { "prettierd", "prettier", stop_after_first = true },
|
javascript = { 'prettier', stop_after_first = true },
|
||||||
|
typescript = { 'prettier', stop_after_first = true },
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
@ -1048,12 +1050,11 @@ require('lazy').setup({
|
||||||
|
|
||||||
-- vim.cmd.colorscheme 'tokyonight-night'
|
-- vim.cmd.colorscheme 'tokyonight-night'
|
||||||
-- vim.cmd.colorscheme 'kanagawa'
|
-- vim.cmd.colorscheme 'kanagawa'
|
||||||
vim.cmd.colorscheme 'material-palenight'
|
vim.cmd.colorscheme 'material-deep-ocean'
|
||||||
-- vim.cmd.colorscheme 'obscure'
|
-- vim.cmd.colorscheme 'obscure'
|
||||||
-- vim.cmd.colorscheme 'rose-pine'
|
-- vim.cmd.colorscheme 'rose-pine'
|
||||||
-- 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,
|
||||||
},
|
},
|
||||||
|
|
||||||
|
@ -1110,8 +1111,6 @@ require('lazy').setup({
|
||||||
'html',
|
'html',
|
||||||
'lua',
|
'lua',
|
||||||
'luadoc',
|
'luadoc',
|
||||||
'markdown',
|
|
||||||
'markdown_inline',
|
|
||||||
'query',
|
'query',
|
||||||
'vim',
|
'vim',
|
||||||
'vimdoc',
|
'vimdoc',
|
||||||
|
@ -1151,7 +1150,6 @@ require('lazy').setup({
|
||||||
-- - Show your current context: https://github.com/nvim-treesitter/nvim-treesitter-context
|
-- - Show your current context: https://github.com/nvim-treesitter/nvim-treesitter-context
|
||||||
-- - Treesitter + textobjects: https://github.com/nvim-treesitter/nvim-treesitter-textobjects
|
-- - Treesitter + textobjects: https://github.com/nvim-treesitter/nvim-treesitter-textobjects
|
||||||
end,
|
end,
|
||||||
|
|
||||||
},
|
},
|
||||||
|
|
||||||
-- The following comments only work if you have downloaded the kickstart repo, not just copy pasted the
|
-- The following comments only work if you have downloaded the kickstart repo, not just copy pasted the
|
||||||
|
@ -1175,7 +1173,6 @@ 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
|
||||||
|
|
|
@ -0,0 +1,17 @@
|
||||||
|
return {
|
||||||
|
'kristijanhusak/vim-dadbod-ui',
|
||||||
|
dependencies = {
|
||||||
|
{ 'tpope/vim-dadbod', lazy = true },
|
||||||
|
{ 'kristijanhusak/vim-dadbod-completion', ft = { 'sql', 'mysql', 'plsql' }, lazy = true }, -- Optional
|
||||||
|
},
|
||||||
|
cmd = {
|
||||||
|
'DBUI',
|
||||||
|
'DBUIToggle',
|
||||||
|
'DBUIAddConnection',
|
||||||
|
'DBUIFindBuffer',
|
||||||
|
},
|
||||||
|
init = function()
|
||||||
|
-- Your DBUI configuration
|
||||||
|
vim.g.db_ui_use_nerd_fonts = 1
|
||||||
|
end,
|
||||||
|
}
|
|
@ -5,9 +5,7 @@ return {
|
||||||
event = { 'BufReadPre', 'BufNewFile' },
|
event = { 'BufReadPre', 'BufNewFile' },
|
||||||
config = function()
|
config = function()
|
||||||
local lint = require 'lint'
|
local lint = require 'lint'
|
||||||
lint.linters_by_ft = {
|
lint.linters_by_ft = {}
|
||||||
markdown = { 'markdownlint' },
|
|
||||||
}
|
|
||||||
|
|
||||||
-- To allow other plugins to add linters to require('lint').linters_by_ft,
|
-- To allow other plugins to add linters to require('lint').linters_by_ft,
|
||||||
-- instead set linters_by_ft like this:
|
-- instead set linters_by_ft like this:
|
||||||
|
|
Loading…
Reference in New Issue