flake.nix

@@ -144,7 +144,6 @@
         (import ./overlays/neovim-plugins.nix inputs)
         (import ./overlays/calibre-web.nix)
         (import ./overlays/disko.nix inputs)
-        (import ./overlays/tree-sitter-bash.nix)
       ];
 
       # System types to support.

modules/common/neovim/config/lsp.nix

@@ -29,9 +29,6 @@
   lua = ''
     ${builtins.readFile ./lsp.lua}
 
-    -- Prevent infinite log size (change this when debugging)
-    vim.lsp.set_log_level("off")
-
     require("null-ls").setup({
         sources = {
             require("null-ls").builtins.formatting.stylua.with({ command = "${pkgs.stylua}/bin/stylua" }),

modules/common/neovim/config/misc.nix

@@ -11,7 +11,6 @@
 
   setup.Comment = { };
   setup.colorizer = { };
-  setup.glow = { };
 
   vim.o = {
     termguicolors = true; # Set to truecolor

modules/common/neovim/config/syntax.nix

@@ -3,28 +3,19 @@
   plugins = [
     (pkgs.vimPlugins.nvim-treesitter.withPlugins (_plugins:
       with pkgs.tree-sitter-grammars; [
-        tree-sitter-bash
-        tree-sitter-fish
         tree-sitter-hcl
-        tree-sitter-json
-        tree-sitter-lua
-        tree-sitter-markdown
-        tree-sitter-markdown-inline
-        tree-sitter-nix
         tree-sitter-python
+        tree-sitter-lua
+        tree-sitter-nix
+        tree-sitter-fish
         tree-sitter-toml
         tree-sitter-yaml
+        tree-sitter-json
       ]))
     pkgs.vimPlugins.vim-matchup # Better % jumping in languages
-    pkgs.vimPlugins.playground # Tree-sitter experimenting
     pkgs.vimPlugins.nginx-vim
     pkgs.vimPlugins.vim-helm
     pkgs.vimPlugins.vim-puppet
-    (pkgs.vimUtils.buildVimPluginFrom2Nix {
-      pname = "nmasur";
-      version = "0.1";
-      src = ../plugin;
-    })
   ];
 
   setup."nvim-treesitter.configs" = {

modules/common/neovim/package/default.nix

@@ -28,8 +28,6 @@
 
 { pkgs, colors, ... }:
 
-# Comes from nix2vim overlay:
-# https://github.com/gytis-ivaskevicius/nix2vim/blob/master/lib/neovim-builder.nix
 pkgs.neovimBuilder {
   package = pkgs.neovim-unwrapped;
   inherit colors;

modules/common/neovim/plugin/after/queries/nix/injections.scm

@@ -1,8 +0,0 @@
-expression: (apply_expression
-  function: (apply_expression
-    function: (select_expression
-      attrpath: (attrpath) @writeshell (#match? @writeshell "^writeShell.*$")
-      )
-    )
-  (indented_string_expression) @bash
-)

overlays/tree-sitter-bash.nix

@@ -1,16 +0,0 @@
-# Fix: bash highlighting doesn't work as of this commit:
-# https://github.com/NixOS/nixpkgs/commit/49cce41b7c5f6b88570a482355d9655ca19c1029
-
-_final: prev: {
-  tree-sitter-grammars = prev.tree-sitter-grammars // {
-    tree-sitter-bash = prev.tree-sitter-grammars.tree-sitter-bash.overrideAttrs
-      (old: {
-        src = prev.fetchFromGitHub {
-          owner = "tree-sitter";
-          repo = "tree-sitter-bash";
-          rev = "493646764e7ad61ce63ce3b8c59ebeb37f71b841";
-          sha256 = "sha256-gl5F3IeZa2VqyH/qFj8ey2pRbGq4X8DL5wiyvRrH56U=";
-        };
-      });
-  };
-}