From 242df62d39796e753053dc7040d6762428f8216e Mon Sep 17 00:00:00 2001
From: prescientmoon <git@moonythm.dev>
Date: Tue, 11 Jun 2024 11:43:35 +0200
Subject: [PATCH] Some indentation nvim tweaks
---
home/features/neovim/config/ftplugin/tex.lua | 2 --
home/features/neovim/config/lazy-lock.json | 1 +
home/features/neovim/default.nix | 15 +++++++++++++--
3 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/home/features/neovim/config/ftplugin/tex.lua b/home/features/neovim/config/ftplugin/tex.lua
index 4cee6a3..d1998bf 100644
--- a/home/features/neovim/config/ftplugin/tex.lua
+++ b/home/features/neovim/config/ftplugin/tex.lua
@@ -93,5 +93,3 @@ local expanded = scrap.expand_many(abolishAbbreviations)
A.manyLocalAbbr(abbreviations)
A.manyLocalAbbr(expanded)
-
-vim.opt_local.list = false -- The lsp usese tabs for formatting
diff --git a/home/features/neovim/config/lazy-lock.json b/home/features/neovim/config/lazy-lock.json
index 278b69e..6c68c7d 100644
--- a/home/features/neovim/config/lazy-lock.json
+++ b/home/features/neovim/config/lazy-lock.json
@@ -45,6 +45,7 @@
"plenary": { "branch": "master", "commit": "4f71c0c4a196ceb656c824a70792f3df3ce6bb6d" },
"purescript": { "branch": "main", "commit": "82348352e6568fcc0385bd7c99a8ead3a479feea" },
"rust-tools": { "branch": "master", "commit": "676187908a1ce35ffcd727c654ed68d851299d3e" },
+ "rzip": { "branch": "master", "commit": "f65400fed27b27c7cff7ef8d428c4e5ff749bf28" },
"scrap": { "branch": "main", "commit": "cc8453ed613932c744c3d1ec42f379b78bd8b92c" },
"ssr": { "branch": "main", "commit": "bb323ba621ac647b4ac5638b47666e3ef3c279e1" },
"telescope": { "branch": "master", "commit": "d90956833d7c27e73c621a61f20b29fdb7122709" },
diff --git a/home/features/neovim/default.nix b/home/features/neovim/default.nix
index cc93771..2fb95fe 100644
--- a/home/features/neovim/default.nix
+++ b/home/features/neovim/default.nix
@@ -40,7 +40,7 @@ let
vim.opt = {
# Basic options
joinspaces = false; # No double spaces with join (mapped to qj in my config)
- list = true; # Show some invisible characters
+ list = false; # I don't want to show things like tabs
cmdheight = 0; # Hide command line when it's not getting used
spell = true; # Spell checker
@@ -976,7 +976,10 @@ let
opts.format_on_save.lsp_fallback = true;
opts.formatters_by_ft = let prettier = [ [ "prettierd" "prettier" ] ]; in
{
- "*" = [ "codespell" "trim_whitespace" ];
+ "*" = [
+ # "codespell" # this one causes issues sometimes
+ "trim_whitespace"
+ ];
lua = [ "stylua" ];
python = [ "ruff_format" ];
@@ -1395,6 +1398,14 @@ let
};
};
# }}}
+ # {{{ typescript support
+ # Required for yarn PNP to work
+ rzip = {
+ package = "lbrayner/vim-rzip";
+ cond = blacklist "vscode";
+ event = "VeryLazy";
+ };
+ # }}}
# }}}
# {{{ external
# These plugins integrate neovim with external services