diff --git a/init.lua b/init.lua index 776c6873..998f9ecf 100644 --- a/init.lua +++ b/init.lua @@ -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. diff --git a/lua/custom/plugins/init.lua b/lua/custom/plugins/init.lua index be0eb9d8..8c086776 100644 --- a/lua/custom/plugins/init.lua +++ b/lua/custom/plugins/init.lua @@ -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', '', '10k', { desc = 'Scroll up and center' }) +vim.keymap.set('n', '', '10j', { desc = 'Scroll down and center' }) +vim.keymap.set('n', '', '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', 'gg', neogit.open, { desc = 'Open Neogit' }) + + neogit.setup {} + end, + }, +}