@@ -91,7 +91,7 @@ vim.g.mapleader = ' '
9191vim .g .maplocalleader = ' '
9292
9393-- Set to true if you have a Nerd Font installed and selected in the terminal
94- vim .g .have_nerd_font = false
94+ vim .g .have_nerd_font = true -- ELB: enabling nerd font
9595
9696-- [[ Setting options ]]
9797-- See `:help vim.opt`
@@ -156,6 +156,12 @@ vim.opt.cursorline = true
156156-- Minimal number of screen lines to keep above and below the cursor.
157157vim .opt .scrolloff = 10
158158
159+ -- ELB: Set tabstop as 4 spaces
160+ vim .opt .tabstop = 4
161+ vim .opt .shiftwidth = 4
162+ vim .opt .softtabstop = 4
163+ vim .opt .cindent = true
164+
159165-- [[ Basic Keymaps ]]
160166-- See `:help vim.keymap.set()`
161167
@@ -189,6 +195,12 @@ vim.keymap.set('n', '<C-l>', '<C-w><C-l>', { desc = 'Move focus to the right win
189195vim .keymap .set (' n' , ' <C-j>' , ' <C-w><C-j>' , { desc = ' Move focus to the lower window' })
190196vim .keymap .set (' n' , ' <C-k>' , ' <C-w><C-k>' , { desc = ' Move focus to the upper window' })
191197
198+ -- ELB: Keybinds
199+
200+ -- ELB: Keybinds to make tabbing sane
201+ vim .keymap .set (' n' , ' gn' , ' <Cmd>tabnext<CR>' , { desc = ' Move to the previous tab' })
202+ vim .keymap .set (' n' , ' gp' , ' <Cmd>tabprevious<CR>' , { desc = ' Move to the next tab' })
203+
192204-- [[ Basic Autocommands ]]
193205-- See `:help lua-guide-autocommands`
194206
@@ -884,27 +896,35 @@ require('lazy').setup({
884896 end ,
885897 },
886898
887- { -- You can easily change to a different colorscheme.
888- -- Change the name of the colorscheme plugin below, and then
889- -- change the command in the config to whatever the name of that colorscheme is.
890- --
891- -- If you want to see what colorschemes are already installed, you can use `:Telescope colorscheme`.
892- ' folke/tokyonight.nvim' ,
893- priority = 1000 , -- Make sure to load this before all the other start plugins.
894- config = function ()
895- --- @diagnostic disable-next-line : missing-fields
896- require (' tokyonight' ).setup {
897- styles = {
898- comments = { italic = false }, -- Disable italics in comments
899- },
900- }
899+ -- ELB: Changing colorscheme to onedarkpro from tokyonight
900+ -- { -- You can easily change to a different colorscheme.
901+ -- -- Change the name of the colorscheme plugin below, and then
902+ -- -- change the command in the config to whatever the name of that colorscheme is.
903+ -- --
904+ -- -- If you want to see what colorschemes are already installed, you can use `:Telescope colorscheme`.
905+ -- 'folke/tokyonight.nvim',
906+ -- priority = 1000, -- Make sure to load this before all the other start plugins.
907+ -- init = function()
908+ -- -- Load the colorscheme here.
909+ -- -- Like many other themes, this one has different styles, and you could load
910+ -- -- any other, such as 'tokyonight-storm', 'tokyonight-moon', or 'tokyonight-day'.
911+ -- vim.cmd.colorscheme 'tokyonight-night'
912+ --
913+ -- -- You can configure highlights by doing something like:
914+ -- vim.cmd.hi 'Comment gui=none'
915+ -- end,
916+ -- },
917+ {
918+ ' olimorris/onedarkpro.nvim' ,
919+ priority = 1000 , -- Ensure it loads first
920+ init = function ()
921+ vim .cmd .colorscheme ' onedark'
901922
902- -- Load the colorscheme here.
903- -- Like many other themes, this one has different styles, and you could load
904- -- any other, such as 'tokyonight-storm', 'tokyonight-moon', or 'tokyonight-day'.
905- vim .cmd .colorscheme ' tokyonight-night'
923+ -- You can configure highlights by doing something like:
924+ vim .cmd .hi ' Comment gui=none'
906925 end ,
907926 },
927+ -- ELB: end of changing theme
908928
909929 -- Highlight todo, notes, etc in comments
910930 { ' folke/todo-comments.nvim' , event = ' VimEnter' , dependencies = { ' nvim-lua/plenary.nvim' }, opts = { signs = false } },
@@ -977,6 +997,8 @@ require('lazy').setup({
977997 -- place them in the correct locations.
978998
979999 -- NOTE: Next step on your Neovim journey: Add/Configure additional plugins for Kickstart
1000+ ' github/copilot.vim' , -- ELB: Adding copilot
1001+
9801002 --
9811003 -- Here are some example plugins that I've included in the Kickstart repository.
9821004 -- Uncomment any of the lines below to enable them (you will need to restart nvim).
0 commit comments