switched to branch from base kickstart

This commit is contained in:
adamwm4 2025-04-15 17:19:52 -05:00
parent d350db2449
commit d40254d2b1
2 changed files with 72 additions and 5 deletions

View File

@ -966,11 +966,12 @@ require('lazy').setup({
-- Uncomment any of the lines below to enable them (you will need to restart nvim).
--
-- require 'kickstart.plugins.debug',
-- require 'kickstart.plugins.indent_line',
-- require 'kickstart.plugins.lint',
require 'kickstart.plugins.indent_line',
require 'kickstart.plugins.lint',
-- require 'kickstart.plugins.autopairs',
-- require 'kickstart.plugins.neo-tree',
-- require 'kickstart.plugins.gitsigns', -- adds gitsigns recommend keymaps
require 'kickstart.plugins.neo-tree',
require 'kickstart.plugins.gitsigns', -- adds gitsigns recommend keymaps
require 'custom.plugins.init',
-- NOTE: The import below can automatically add your own plugins, configuration, etc from `lua/custom/plugins/*.lua`
-- This is the easiest way to modularize your config.

View File

@ -2,4 +2,70 @@
-- I promise not to create any merge conflicts in this directory :)
--
-- See the kickstart.nvim README for more information
return {}
vim.opt.number = true
vim.opt.relativenumber = true
vim.opt.wrap = false
vim.keymap.set('n', '<C-k>', '10k', { desc = 'Scroll up and center' })
vim.keymap.set('n', '<C-j>', '10j', { desc = 'Scroll down and center' })
vim.keymap.set('n', '<C-c>', 'ggVGy', { desc = 'copy file', noremap = true })
return {
{
'catppuccin/nvim',
name = 'catppuccin',
priority = 1000,
config = function()
require('catppuccin').setup {
flavour = 'mocha',
integrations = {
telescope = true,
treesitter = true,
cmp = true,
gitsigns = true,
},
custom_highlights = function(colors)
return {
LineNr = { fg = colors.mauve },
CursorLineNr = { fg = colors.lavender, bold = true },
Visual = { bg = colors.surface1 },
TelescopeSelection = { bg = colors.surface1 },
}
end,
}
vim.cmd.colorscheme 'catppuccin'
end,
},
{
-- Set lualine as statusline
'nvim-lualine/lualine.nvim',
-- See `:help lualine.txt`
opts = {
options = {
icons_enabled = false,
theme = 'tokyo-night',
component_separators = '|',
section_separators = '',
},
},
},
{
'NeogitOrg/neogit',
dependencies = {
'nvim-lua/plenary.nvim',
'nvim-telescope/telescope.nvim',
'sindrets/diffview.nvim',
'ibhagwan/fzf-lua',
},
config = function()
local neogit = require 'neogit'
vim.keymap.set('n', '<leader>gg', neogit.open, { desc = 'Open Neogit' })
neogit.setup {}
end,
},
}