From 310fdf8de53d98ddd3a56936c131186e25814f0f Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Tue, 29 Oct 2024 22:37:49 -0400
Subject: use lz.n (#69)

* remove bufferline & some cmp sources

* factor things out of after/ folder

This is bad practice or something

* make sure ftdetect plugins aren't loaded multiple times

* use lz.n

* mini.pairs -> mini.surround

* flake: cleanup checks

* ftplugin: enforce spaces in nix files
---
 neovim.nix | 69 +++++++++++++++++++++++++++++---------------------------------
 1 file changed, 32 insertions(+), 37 deletions(-)

(limited to 'neovim.nix')

diff --git a/neovim.nix b/neovim.nix
index 4b62e6c..74dc667 100644
--- a/neovim.nix
+++ b/neovim.nix
@@ -1,82 +1,77 @@
 {
   lib,
-  neovimUtils,
-  vimPlugins,
-  wrapNeovimUnstable,
-  neovim-unwrapped,
   actionlint,
-  getchoo-neovim-config,
   glow,
+  neovim-unwrapped,
+  neovimUtils,
   nil,
   nixfmt-rfc-style,
   nodePackages,
-  ripgrep,
   shellcheck,
   shfmt,
   statix,
   typos-lsp,
-  vim-tera,
+  vimPlugins,
+  wrapNeovimUnstable,
+
+  getchoo-neovim-config,
 }:
+
 let
   plugins = with vimPlugins; [
     getchoo-neovim-config
 
-    # coding
+    # lazy loader
+    lz-n
+
+    # Editing
+    flash-nvim
+    glow-nvim
+    mini-nvim
+
+    nvim-treesitter.withAllGrammars
+
+    # UI
+    catppuccin-nvim
+    indent-blankline-nvim
+    lualine-nvim
+
+    # Coding
     nvim-cmp
     luasnip
     cmp-async-path
     cmp-buffer
-    cmp_luasnip
     cmp-nvim-lsp
-    cmp-rg
 
     crates-nvim
     gitsigns-nvim
     nvim-lint
-
-    # editing
-    flash-nvim
-    glow-nvim
-    mini-nvim
-
     telescope-nvim # dependent on >
     plenary-nvim
 
-    nvim-treesitter.withAllGrammars
-
-    vim-tera
-
-    # ui
-    bufferline-nvim # dependent on >
-    nvim-web-devicons
-
-    catppuccin-nvim
-    indent-blankline-nvim
-    lualine-nvim
-
-    # lsp
+    # LSP
     fidget-nvim
-    nvim-lspconfig
     lsp-format-nvim
+    nvim-lspconfig
     trouble-nvim
   ];
 
   extraPackages = [
-    glow # glow.nvim
+    # External programs
+    glow
 
-    ripgrep # cmp
+    # LSP
+    ## General
+    typos-lsp
 
-    # lsp
+    ## Language-specific
     nodePackages.bash-language-server
     shellcheck
     shfmt
-
     nil
     nixfmt-rfc-style
 
-    typos-lsp
-
-    ## linters
+    # Linters
     nodePackages.alex
     actionlint
     statix
-- 
cgit v1.2.3