diff --git a/init.lua b/init.lua index 29a92e9a..d6392c09 100644 --- a/init.lua +++ b/init.lua @@ -240,6 +240,7 @@ vim.o.hlsearch = false -- Make line numbers default vim.wo.number = true +vim.wo.relativenumber = true -- Enable mouse mode vim.o.mouse = 'a' @@ -274,6 +275,13 @@ vim.o.termguicolors = true vim.wo.scrolloff = 8 +vim.o.tabstop = 2 +vim.o.softtabstop = 2 +vim.o.shiftwidth = 2 +vim.o.expandtab = true + + + -- [[ Basic Keymaps ]] -- Keymaps for better default experience diff --git a/lazy-lock.json b/lazy-lock.json index 6176bffb..0601f479 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -28,7 +28,6 @@ "todo-comments.nvim": { "branch": "main", "commit": "4a6737a8d70fe1ac55c64dfa47fcb189ca431872" }, "vim-fugitive": { "branch": "master", "commit": "46eaf8918b347906789df296143117774e827616" }, "vim-go": { "branch": "master", "commit": "1401b576c6ac382529188d3d26cff866139f2f9a" }, - "vim-polyglot": { "branch": "master", "commit": "bc8a81d3592dab86334f27d1d43c080ebf680d42" }, "vim-rhubarb": { "branch": "master", "commit": "ee69335de176d9325267b0fd2597a22901d927b1" }, "vim-sleuth": { "branch": "master", "commit": "1cc4557420f215d02c4d2645a748a816c220e99b" }, "vim-svelte": { "branch": "main", "commit": "0e93ec53c3667753237282926fec626785622c1c" }, diff --git a/lua/custom/plugins/init.lua b/lua/custom/plugins/init.lua index bbf7e4ee..64c48ef0 100644 --- a/lua/custom/plugins/init.lua +++ b/lua/custom/plugins/init.lua @@ -2,7 +2,6 @@ -- I promise not to create any merge conflicts in this directory :) -- -- See the kickstart.nvim README for more information -vim.g.polyglot_disabled = { 'sleuth' } -- Disable sleuth plugin from polyglot return { -- nvim-autopairs configuration @@ -39,7 +38,7 @@ return { { 'fatih/vim-go' }, - { 'sheerun/vim-polyglot' }, + -- { 'sheerun/vim-polyglot' }, { 'evanleck/vim-svelte' },