summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMinijackson <minijackson@riseup.net>2022-08-24 10:00:22 +0200
committerMinijackson <minijackson@riseup.net>2022-08-24 10:00:22 +0200
commitdfeced80d791327fdeb1efa2d9810466dc771cab (patch)
treecc0f6b644f28bb10b63ff9da16212b60f174276c
parent38e03a7a3ea6984c88ca69d2c2d953a186cb1e86 (diff)
downloadnixos-config-reborn-dfeced80d791327fdeb1efa2d9810466dc771cab.tar.gz
nixos-config-reborn-dfeced80d791327fdeb1efa2d9810466dc771cab.zip
vim: add neovide, open folds by default, enable TS navigation
-rw-r--r--common/vim.nix2
-rw-r--r--dotfiles/vim.lua2
2 files changed, 4 insertions, 0 deletions
diff --git a/common/vim.nix b/common/vim.nix
index 8245f99..3452bf8 100644
--- a/common/vim.nix
+++ b/common/vim.nix
@@ -185,6 +185,7 @@ in
185 185
186 environment.systemPackages = with pkgs.unstable; [ 186 environment.systemPackages = with pkgs.unstable; [
187 myNeovim 187 myNeovim
188 neovide
188 189
189 deadnix 190 deadnix
190 statix 191 statix
@@ -195,6 +196,7 @@ in
195 environment.sessionVariables = { 196 environment.sessionVariables = {
196 EDITOR = "nvim"; 197 EDITOR = "nvim";
197 MANPAGER = "nvim +Man!"; 198 MANPAGER = "nvim +Man!";
199 NEOVIDE_MULTIGRID = "1";
198 }; 200 };
199 201
200 home-manager.users.minijackson = { ... }: 202 home-manager.users.minijackson = { ... }:
diff --git a/dotfiles/vim.lua b/dotfiles/vim.lua
index a993e99..0231cc1 100644
--- a/dotfiles/vim.lua
+++ b/dotfiles/vim.lua
@@ -192,6 +192,7 @@ require("nvim-treesitter.configs").setup {
192 }, 192 },
193 refactor = { 193 refactor = {
194 highlight_definitions = { enable = true }, 194 highlight_definitions = { enable = true },
195 navigation = { enable = true },
195 }, 196 },
196 textobjects = { 197 textobjects = {
197 lsp_interop = { 198 lsp_interop = {
@@ -261,6 +262,7 @@ require("nvim-treesitter.configs").setup {
261 262
262vim.o.foldmethod = "expr" 263vim.o.foldmethod = "expr"
263vim.o.foldexpr = "nvim_treesitter#foldexpr()" 264vim.o.foldexpr = "nvim_treesitter#foldexpr()"
265vim.o.foldlevel = 99
264 266
265vim.api.nvim_set_hl(0, "TSCurrentScope", { 267vim.api.nvim_set_hl(0, "TSCurrentScope", {
266 bg = vim.g.current_gruvbox_colors.dark0_soft[1], 268 bg = vim.g.current_gruvbox_colors.dark0_soft[1],