summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMinijackson <minijackson@riseup.net>2021-06-09 09:58:50 +0200
committerMinijackson <minijackson@riseup.net>2021-06-09 09:58:50 +0200
commit5b6e7aee87d352718cbe6ed016b2b2eae5dfc734 (patch)
tree80a3210d9d926a5068bb0798a2c0c84ea69a4de3
parentb8a237c4d84c3d0709b12d8bea350380adfa51cb (diff)
downloadnixos-config-reborn-5b6e7aee87d352718cbe6ed016b2b2eae5dfc734.tar.gz
nixos-config-reborn-5b6e7aee87d352718cbe6ed016b2b2eae5dfc734.zip
vim: don't override local tabstop and shiftwidth
-rw-r--r--common/vim.nix2
-rw-r--r--dotfiles/vim.lua3
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
36 inherit (config.vim) beforePlugins; 36 inherit (config.vim) beforePlugins;
37 37
38 customRC = '' 38 customRC = ''
39 lua require("myConfig") 39 autocmd VimEnter * lua require("myConfig")
40 40
41 ${cfg.extraConfig} 41 ${cfg.extraConfig}
42 ''; 42 '';
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
14 14
15vim.o.smartindent = true 15vim.o.smartindent = true
16 16
17vim.o.tabstop = 4 17-- tabstop and shiftwidth are set locally by individual filetypes
18vim.o.shiftwidth = 4
19 18
20vim.o.inccommand = "split" 19vim.o.inccommand = "split"
21 20