diff --git a/init.lua b/init.lua index 8396240c..78dd186f 100644 --- a/init.lua +++ b/init.lua @@ -91,7 +91,7 @@ vim.g.mapleader = ' ' vim.g.maplocalleader = ' ' -- Set to true if you have a Nerd Font installed and selected in the terminal -vim.g.have_nerd_font = false +vim.g.have_nerd_font = true -- [[ Setting options ]] -- See `:help vim.opt` @@ -102,6 +102,7 @@ vim.g.have_nerd_font = false vim.opt.number = true -- You can also add relative line numbers, to help with jumping. -- Experiment for yourself to see if you like it! + vim.opt.relativenumber = true -- Enable mouse mode, can be useful for resizing splits for example! @@ -189,7 +190,7 @@ vim.keymap.set('n', '', '', { desc = 'Move focus to the right win vim.keymap.set('n', '', '', { desc = 'Move focus to the lower window' }) vim.keymap.set('n', '', '', { desc = 'Move focus to the upper window' }) ---NvimTree Toggle +-- NvimTree Toggle vim.keymap.set('n', '', ':NvimTreeToggle', { noremap = true, silent = true }) -- [[ Basic Autocommands ]] @@ -846,7 +847,7 @@ require('lazy').setup({ -- 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`. - 'folke/tokyonight.nvim', + 'folke/tokyonight.nvim', priority = 1000, -- Make sure to load this before all the other start plugins. init = function() -- Load the colorscheme here. @@ -857,14 +858,14 @@ require('lazy').setup({ -- You can configure highlights by doing something like: vim.cmd.hi 'Comment gui=none' end, - }, - + }, + -- Highlight todo, notes, etc in comments { 'folke/todo-comments.nvim', event = 'VimEnter', dependencies = { 'nvim-lua/plenary.nvim' }, opts = { signs = false } }, { -- Collection of various small independent plugins/modules 'echasnovski/mini.nvim', - config = function() + config = function() -- Better Around/Inside textobjects -- -- Examples: @@ -934,14 +935,13 @@ require('lazy').setup({ -- Here are some example plugins that I've included in the Kickstart repository. -- 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.autopairs', - -- require 'kickstart.plugins.neo-tree', + require 'kickstart.plugins.debug', + require 'kickstart.plugins.indent_line', + require 'kickstart.plugins.lint', + require 'kickstart.plugins.autopairs', -- require 'kickstart.plugins.gitsigns', -- adds gitsigns recommend keymaps - -- NOTE: The import below can automatically add your own plugins, configuration, etc from `lua/custom/plugins/*.lua` + -- NOTE: The import below cantomatically add your own plugins, configuration, etc from `lua/custom/plugins/*.lua` -- This is the easiest way to modularize your config. -- -- Uncomment the following line and add your plugins to `lua/custom/plugins/*.lua` to get going. diff --git a/lua/custom/plugins/init.lua b/lua/custom/plugins/init.lua index 9deb06ee..87fa5ec0 100644 --- a/lua/custom/plugins/init.lua +++ b/lua/custom/plugins/init.lua @@ -14,8 +14,8 @@ return { disable_netrw = true, -- Disable netrw hijack_netrw = true, -- Hijack netrw for nvim-tree view = { - side = 'left', - width = 30, + side = 'right', -- Position of the tree + width = 40, }, renderer = { icons = { @@ -45,4 +45,14 @@ return { } end, }, + + -- Add lazygit.nvim plugin + { + 'kdheepak/lazygit.nvim', + dependencies = { 'nvim-lua/plenary.nvim' }, + cmd = { 'LazyGit' }, + keys = { + { 'gg', 'LazyGit', desc = 'Open LazyGit' }, + }, + }, }