chore(update)

config/config.nix

@@ -1,7 +1,7 @@
 {
   pkgs,
-  neovim-nightly-overlay,
-  system,
+  # neovim-nightly-overlay,
+  # system,
   ...
 }:
 {
@@ -52,7 +52,14 @@
       };
     };
 
-    package = neovim-nightly-overlay.packages."${system}".default;
+    # Temporarily disable neovim-nightly-overlay because it is causing these
+    # plugins to misbehave:
+    # - oil - broken from lualine
+    # - lualine - breaking oil buffers
+    # - telescope - search not populating
+    # - gitsigns - always causes exit 1 for nvim
+    # - vim-matchup? - buffers not updating properly
+    # package = neovim-nightly-overlay.packages."${system}".default;
 
     extraPackages = with pkgs; [
       coq
@@ -93,7 +100,8 @@
     # THERE IS NO WAY TO SET VISUAL LINE BREAK WIDTH?!?
     # https://www.reddit.com/r/neovim/comments/1anwa1y/nondestructively_set_line_wrap_width/
     opts = {
-      cmdheight = 0;
+      cmdheight = 1;
+      showmode = false;
       expandtab = true;
       guifont = "Maple Mono NF:h14";
       linebreak = true; # visually wrap lines by word, not char
@@ -105,13 +113,13 @@
       smartindent = true;
       softtabstop = 2;
       # spell = true;
-      # Not currently working. 
+      # Not currently working.
       # TODO: See other configurations on GitHub.
       spellfile = "~/.config/nvim/spell/en_us.utf-8.add";
       spelllang = "en_us";
       tabstop = 2;
-      # corrects command auto-complete to first show the completion list, then further tabs 
-      # will cause complete auto-complete 
+      # corrects command auto-complete to first show the completion list, then further tabs
+      # will cause complete auto-complete
       wildmode = "list,full";
     };
   };

config/plugins/lualine.nix

@@ -23,8 +23,8 @@
 
         # Available Sections:
         # A lot of these include reasonable extra logos/logic for display:
-        # branch, buffers, diagnostics, diff, encoding, fileformat, 
-        # filename, filesize, filetype, hostname, location, mode, 
+        # branch, buffers, diagnostics, diff, encoding, fileformat,
+        # filename, filesize, filetype, hostname, location, mode,
         # progress, searchcount, selectioncount, tabs, windows
         # Raw things:
         # %t (filename), %c (column), %l (line), %p (percentage), %{any expression}

config/plugins/markdown-table-sorter.nix

@@ -3,6 +3,7 @@ let
   markdown-table-sorter = pkgs.vimUtils.buildVimPlugin {
     name = "markdown-table-sorter";
     src = ../custom-plugins/markdown-table-sorter;
+    dependencies = [ pkgs.vimPlugins.nvim-treesitter ];
   };
 in
 {

config/plugins/nvim-colorizer.nix

@@ -4,17 +4,20 @@
   # https://github.com/norcalli/nvim-colorizer.lua
   # https://nix-community.github.io/nixvim/plugins/nvim-colorizer
   config = {
-    plugins.nvim-colorizer = {
+    plugins.colorizer = {
       enable = true;
-      userDefaultOptions = {
-        RGB = true;
-        RRGGBB = true;
-        names = true;
-        RRGGBBAA = true;
-        rgb_fn = true;
-        hsl_fn = true;
-        css = true;
-        css_fn = true;
+      settings = {
+        user_default_options = {
+          RGB = true;
+          RRGGBB = true;
+          names = true;
+          RRGGBBAA = true;
+          rgb_fn = true;
+          hsl_fn = true;
+          css = true;
+          css_fn = true;
+          tailwind = true;
+        };
       };
     };
   };

config/plugins/oil-git-status.nix

@@ -8,6 +8,7 @@ let
       rev = "839a1a287f5eb3ce1b07b50323032398e63f7ffa";
       hash = "sha256-pTAvkJPmT3eD3XWrYl6nyKSzeRFEHOi8iDCamF1D1Cg=";
     };
+    dependencies = [ pkgs.vimPlugins.oil-nvim ];
   };
 in
 {

config/plugins/supermaven.nix

@@ -1,23 +1,4 @@
 { pkgs, ... }:
-let
-  # TODO: replace with local version
-  # very fast and accurate auto-complete
-  # https://github.com/supermaven-inc/supermaven-nvim
-  supermaven-nvim = pkgs.vimUtils.buildVimPlugin {
-    name = "supermaven-nvim";
-    src = pkgs.fetchFromGitHub {
-      owner = "supermaven-inc";
-      repo = "supermaven-nvim";
-      rev = "07d20fce48a5629686aefb0a7cd4b25e33947d50";
-      hash = "sha256-1z3WKIiikQqoweReUyK5O8MWSRN5y95qcxM6qzlKMME=";
-    };
-    # TODO: how to get curl?!?
-    # nativeBuildInputs = [ pkgs.curl ];
-    # buildInputs = [ pkgs.curl ];
-    # extraPackages = [ pkgs.curl ];
-    # ^ these dont't work
-  };
-in
 {
   # AI auto-completion
   # https://github.com/supermaven-inc/supermaven-nvim
@@ -28,8 +9,6 @@ in
       ''
         require("supermaven-nvim").setup({})
       '';
-    extraPlugins = [ supermaven-nvim ];
-    # extraPackages = [ pkgs.curl ];
-    # ^ also doesn't work
+    extraPlugins = [ pkgs.vimPlugins.supermaven-nvim ];
   };
 }

config/plugins/vim-matchup.nix

@@ -5,9 +5,9 @@
   # https://nix-community.github.io/nixvim/plugins/vim-matchup
   config = {
     plugins.vim-matchup = {
-      treesitterIntegration = {
+      treesitter = {
         enable = true;
-        includeMatchWords = true;
+        include_match_words = true;
       };
       enable = true;
     };