trying to fix auto indenting again

This commit is contained in:
dlond 2025-05-26 04:47:46 +12:00
parent 97ab584fe6
commit d619d03e56
2 changed files with 10 additions and 8 deletions

View File

@ -219,9 +219,6 @@ vim.api.nvim_create_autocmd('TextYankPost', {
end, end,
}) })
require 'custom.options'
require 'custom.keymaps'
-- [[ Install `lazy.nvim` plugin manager ]] -- [[ Install `lazy.nvim` plugin manager ]]
-- See `:help lazy.nvim.txt` or https://github.com/folke/lazy.nvim for more info -- See `:help lazy.nvim.txt` or https://github.com/folke/lazy.nvim for more info
local lazypath = vim.fn.stdpath 'data' .. '/lazy/lazy.nvim' local lazypath = vim.fn.stdpath 'data' .. '/lazy/lazy.nvim'
@ -301,7 +298,7 @@ require('lazy').setup({
-- Then, because we use the `opts` key (recommended), the configuration runs -- Then, because we use the `opts` key (recommended), the configuration runs
-- after the plugin has been loaded as `require(MODULE).setup(opts)`. -- after the plugin has been loaded as `require(MODULE).setup(opts)`.
{ -- Useful plugin to show you pending keybinds. { -- Useful plugin to show you pending keybinds.
'folke/which-key.nvim', 'folke/which-key.nvim',
event = 'VimEnter', -- Sets the loading event to 'VimEnter' event = 'VimEnter', -- Sets the loading event to 'VimEnter'
opts = { opts = {
@ -382,7 +379,7 @@ require('lazy').setup({
{ 'nvim-telescope/telescope-ui-select.nvim' }, { 'nvim-telescope/telescope-ui-select.nvim' },
-- Useful for getting pretty icons, but requires a Nerd Font. -- Useful for getting pretty icons, but requires a Nerd Font.
{ 'nvim-tree/nvim-web-devicons', enabled = vim.g.have_nerd_font }, { 'nvim-tree/nvim-web-devicons', enabled = vim.g.have_nerd_font },
}, },
config = function() config = function()
-- Telescope is a fuzzy finder that comes with a lot of different things that -- Telescope is a fuzzy finder that comes with a lot of different things that
@ -971,5 +968,9 @@ require('lazy').setup({
}, },
}) })
require 'custom.options'
require 'custom.keymaps'
require 'custom.utils'
-- The line beneath this is called `modeline`. See `:help modeline` -- The line beneath this is called `modeline`. See `:help modeline`
-- vim: ts=2 sts=2 sw=2 et -- vim: ts=2 sts=2 sw=2 et

View File

@ -4,11 +4,12 @@
vim.g.have_nerd_font = true vim.g.have_nerd_font = true
-- Indentation settings -- Indentation settings
vim.o.expandtab = true
vim.o.smartindent = true vim.o.smartindent = true
vim.o.autoindent = true vim.o.autoindent = true
vim.o.tabstop = 4 vim.o.expandtab = true
vim.o.shiftwidth = 4 vim.o.tabstop = 2
vim.o.shiftwidth = 2
vim.o.softtabstop = 2
-- Add any other custom vim.o or vim.g settings from your old config here -- Add any other custom vim.o or vim.g settings from your old config here
-- For example, if you changed defaults for: -- For example, if you changed defaults for: