From c0f9666e78f728b34a201a2b096c554a153497f8 Mon Sep 17 00:00:00 2001
From: Kenichi Kamiya <kachick1@gmail.com>
Date: Wed, 23 Oct 2024 01:05:28 +0900
Subject: [PATCH] Backport kdl.vim package (#879)

https://github.com/NixOS/nixpkgs/pull/349031/commits/83e0aed01ebe77a0dc88c3d920e51ae139631199 has been merged here via GH-878
---
 home-manager/vim.nix     |  4 ++--
 pkgs/default.nix         |  2 --
 pkgs/kdl.vim/default.nix | 15 ---------------
 3 files changed, 2 insertions(+), 19 deletions(-)
 delete mode 100644 pkgs/kdl.vim/default.nix

diff --git a/home-manager/vim.nix b/home-manager/vim.nix
index 11c271aa..ffe208ed 100644
--- a/home-manager/vim.nix
+++ b/home-manager/vim.nix
@@ -1,7 +1,7 @@
 {
   pkgs,
   config,
-  homemade-pkgs,
+  edge-pkgs,
   ...
 }:
 
@@ -20,7 +20,7 @@
         iceberg-vim
         fzf-vim
       ])
-      ++ [ homemade-pkgs.kdl-vim ];
+      ++ [ edge-pkgs.vimPlugins.kdl-vim ];
 
     settings = {
       background = "dark";
diff --git a/pkgs/default.nix b/pkgs/default.nix
index e6df3847..c79f2ed8 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -66,8 +66,6 @@
   micro-everforest = pkgs.callPackage ./micro-everforest { };
   micro-catppuccin = pkgs.callPackage ./micro-catppuccin { };
 
-  kdl-vim = pkgs.callPackage ./kdl.vim { };
-
   nix-hash-url = pkgs.callPackage ./nix-hash-url { };
 
   gredit = pkgs.callPackage ./gredit { };
diff --git a/pkgs/kdl.vim/default.nix b/pkgs/kdl.vim/default.nix
deleted file mode 100644
index b4c345d5..00000000
--- a/pkgs/kdl.vim/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ pkgs, fetchFromGitHub }:
-
-pkgs.vimUtils.buildVimPlugin {
-  pname = "kdl.vim";
-  version = "2023-02-20";
-
-  src = fetchFromGitHub {
-    owner = "imsnif";
-    repo = "kdl.vim";
-    rev = "b84d7d3a15d8d30da016cf9e98e2cfbe35cddee5";
-    sha256 = "IajKK1EjrKs6b2rotOj+RlBBge9Ii2m/iuIuefnjAE4=";
-  };
-
-  meta.homepage = "https://github.com/imsnif/kdl.vim";
-}