From 6a0c40e5673de7feac43ec34b2306f1e8af7c955 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Sun, 19 Jan 2025 13:39:06 -0600
Subject: [PATCH] overlays/nixpkgs-vim: add latest vim bump overlay

---
 flake.lock                 | 17 +++++++++++++++++
 flake.nix                  |  3 +++
 overlays/nixpkgs-vim.nix   |  5 +++++
 overlays/snacks.nix        | 18 ------------------
 overlays/todo-comments.nix | 13 -------------
 overlays/trouble-nvim.nix  | 13 -------------
 6 files changed, 25 insertions(+), 44 deletions(-)
 create mode 100644 overlays/nixpkgs-vim.nix
 delete mode 100644 overlays/snacks.nix
 delete mode 100644 overlays/todo-comments.nix
 delete mode 100644 overlays/trouble-nvim.nix

diff --git a/flake.lock b/flake.lock
index 1047b08..f45f535 100644
--- a/flake.lock
+++ b/flake.lock
@@ -470,6 +470,22 @@
         "type": "github"
       }
     },
+    "nixpkgs-vim": {
+      "locked": {
+        "lastModified": 1737323503,
+        "narHash": "sha256-IWL74kR6f1Z6FD0+GXPHRsQFHeFFvJnpviXhmprjM1A=",
+        "owner": "khaneliman",
+        "repo": "nixpkgs",
+        "rev": "5d467dda2524985a5e05739ef28891c2596ed72b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "khaneliman",
+        "ref": "vim",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "nixpkgs_2": {
       "locked": {
         "lastModified": 1730768919,
@@ -610,6 +626,7 @@
         "nixpkgs": "nixpkgs_3",
         "nixpkgs-lldb": "nixpkgs-lldb",
         "nixpkgs-master": "nixpkgs-master",
+        "nixpkgs-vim": "nixpkgs-vim",
         "nixvim": "nixvim",
         "pkgs-by-name-for-flake-parts": "pkgs-by-name-for-flake-parts",
         "treefmt-nix": "treefmt-nix_2"
diff --git a/flake.nix b/flake.nix
index bc33c38..3b4ef37 100644
--- a/flake.nix
+++ b/flake.nix
@@ -24,7 +24,10 @@
       url = "github:moyiz/blink-emoji.nvim";
       flake = false;
     };
+
+    # Nixpkgs overlays
     nixpkgs-master.url = "github:nixos/nixpkgs";
+    nixpkgs-vim.url = "github:khaneliman/nixpkgs/vim";
     nixpkgs-lldb.url = "github:paparodeo/nixpkgs/lldb-fixes";
   };
 
diff --git a/overlays/nixpkgs-vim.nix b/overlays/nixpkgs-vim.nix
new file mode 100644
index 0000000..c315577
--- /dev/null
+++ b/overlays/nixpkgs-vim.nix
@@ -0,0 +1,5 @@
+specialArgs: _self: super: {
+  inherit (specialArgs.flake.inputs.nixpkgs-vim.legacyPackages.${super.stdenv.system})
+    vimPlugins
+    ;
+}
diff --git a/overlays/snacks.nix b/overlays/snacks.nix
deleted file mode 100644
index 5463e75..0000000
--- a/overlays/snacks.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-_: _final: prev: {
-  vimPlugins = prev.vimPlugins // {
-    snacks-nvim = prev.vimPlugins.snacks-nvim.overrideAttrs (oldAttrs: {
-      version = "2025-01-18";
-      src = prev.fetchFromGitHub {
-        owner = "folke";
-        repo = "snacks.nvim";
-        rev = "74feefc52284e2ebf93ad815ec5aaeec918d4dc2";
-        sha256 = "sha256-TM/d8PSatlnQNw1DA8QgJaAcnjugNAj5Uim87W7vwjM=";
-      };
-      nvimSkipModule = oldAttrs.nvimSkipModule ++ [
-        "snacks.picker.config.highlights"
-        "snacks.picker.actions"
-        "snacks.picker.util.db"
-      ];
-    });
-  };
-}
diff --git a/overlays/todo-comments.nix b/overlays/todo-comments.nix
deleted file mode 100644
index a7c6661..0000000
--- a/overlays/todo-comments.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-_: _final: prev: {
-  vimPlugins = prev.vimPlugins // {
-    todo-comments-nvim = prev.vimPlugins.todo-comments-nvim.overrideAttrs {
-      version = "2025-01-14";
-      src = prev.fetchFromGitHub {
-        owner = "folke";
-        repo = "todo-comments.nvim";
-        rev = "304a8d204ee787d2544d8bc23cd38d2f929e7cc5";
-        sha256 = "0hrmiaxjp11200nds3y33brj8gpbn5ykd78jfy1jiash3d44xpva";
-      };
-    };
-  };
-}
diff --git a/overlays/trouble-nvim.nix b/overlays/trouble-nvim.nix
deleted file mode 100644
index 49452fa..0000000
--- a/overlays/trouble-nvim.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-_: _final: prev: {
-  vimPlugins = prev.vimPlugins // {
-    trouble-nvim = prev.vimPlugins.trouble-nvim.overrideAttrs {
-      version = "2025-01-15";
-      src = prev.fetchFromGitHub {
-        owner = "folke";
-        repo = "trouble.nvim";
-        rev = "50481f414bd3c1a40122c1d759d7e424d5fafe84";
-        sha256 = "14cvhnz4njzqydnbyf9iydsdhqvms4kajlvxgkr1gfkw6rw96r37";
-      };
-    };
-  };
-}