From 5b6e7aee87d352718cbe6ed016b2b2eae5dfc734 Mon Sep 17 00:00:00 2001 From: Minijackson Date: Wed, 9 Jun 2021 09:58:50 +0200 Subject: vim: don't override local tabstop and shiftwidth --- common/vim.nix | 2 +- dotfiles/vim.lua | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/common/vim.nix b/common/vim.nix index ced8f81..63b916e 100644 --- a/common/vim.nix +++ b/common/vim.nix @@ -36,7 +36,7 @@ let inherit (config.vim) beforePlugins; customRC = '' - lua require("myConfig") + autocmd VimEnter * lua require("myConfig") ${cfg.extraConfig} ''; diff --git a/dotfiles/vim.lua b/dotfiles/vim.lua index ca346f8..84e4a7f 100644 --- a/dotfiles/vim.lua +++ b/dotfiles/vim.lua @@ -14,8 +14,7 @@ vim.o.smartcase = true vim.o.smartindent = true -vim.o.tabstop = 4 -vim.o.shiftwidth = 4 +-- tabstop and shiftwidth are set locally by individual filetypes vim.o.inccommand = "split" -- cgit v1.2.3