summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMinijackson <minijackson@riseup.net>2023-04-28 00:04:02 +0200
committerMinijackson <minijackson@riseup.net>2023-04-28 00:04:02 +0200
commit9f4db9f1b43c29203fd583f4086c48b94f497950 (patch)
tree6a765d7494cf1e71bcf7df1c257897577096b939
parentb2915d68a9a0a3f5fb7c59c689cac6b776ab576d (diff)
downloadnixos-config-reborn-9f4db9f1b43c29203fd583f4086c48b94f497950.tar.gz
nixos-config-reborn-9f4db9f1b43c29203fd583f4086c48b94f497950.zip
vim: use diffopt linematch:60 set EDITOR and related as normal profile var
-rw-r--r--common/vim.nix2
-rw-r--r--dotfiles/vim/lua/myConfig.lua5
2 files changed, 4 insertions, 3 deletions
diff --git a/common/vim.nix b/common/vim.nix
index 89d28b7..e6c0ab8 100644
--- a/common/vim.nix
+++ b/common/vim.nix
@@ -198,7 +198,7 @@ in {
198 vale 198 vale
199 ]; 199 ];
200 200
201 environment.sessionVariables = { 201 environment.variables = {
202 EDITOR = "nvim"; 202 EDITOR = "nvim";
203 MANPAGER = "nvim +Man!"; 203 MANPAGER = "nvim +Man!";
204 NEOVIDE_MULTIGRID = "true"; 204 NEOVIDE_MULTIGRID = "true";
diff --git a/dotfiles/vim/lua/myConfig.lua b/dotfiles/vim/lua/myConfig.lua
index 4411d8c..df1fb64 100644
--- a/dotfiles/vim/lua/myConfig.lua
+++ b/dotfiles/vim/lua/myConfig.lua
@@ -5,8 +5,11 @@ vim.o.undofile = true
5vim.o.backup = true 5vim.o.backup = true
6vim.opt.backupdir:remove "." 6vim.opt.backupdir:remove "."
7 7
8vim.opt.shortmess:append "A"
8vim.opt.shortmess:append "c" 9vim.opt.shortmess:append "c"
9 10
11vim.opt.diffopt:append "linematch:60"
12
10vim.o.mouse = "a" 13vim.o.mouse = "a"
11 14
12vim.o.ignorecase = true 15vim.o.ignorecase = true
@@ -21,8 +24,6 @@ vim.o.cindent = true
21vim.o.tabstop = 4 24vim.o.tabstop = 4
22vim.o.shiftwidth = 4 25vim.o.shiftwidth = 4
23 26
24vim.opt.shortmess:append "A"
25
26vim.o.inccommand = "split" 27vim.o.inccommand = "split"
27 28
28vim.o.scrolloff = 1 29vim.o.scrolloff = 1