From 32466b94fded362700e8edd7dc3bac44b17d7d74 Mon Sep 17 00:00:00 2001
From: matt1432 <matt@nelim.org>
Date: Thu, 26 Oct 2023 20:47:49 -0400
Subject: [PATCH] feat(coc-stylelint): use my flake instead of the overlays

---
 common/default.nix                         |  6 ++++-
 common/modules/neovim/default.nix          |  1 -
 common/overlays/default.nix                | 10 --------
 common/overlays/pkgs/coc-stylelintplus.nix | 28 ----------------------
 common/overlays/pkgs/stylelint-lsp.nix     | 21 ----------------
 flake.lock                                 | 21 ++++++++++++++++
 flake.nix                                  |  4 ++++
 7 files changed, 30 insertions(+), 61 deletions(-)
 delete mode 100644 common/overlays/pkgs/coc-stylelintplus.nix
 delete mode 100644 common/overlays/pkgs/stylelint-lsp.nix

diff --git a/common/default.nix b/common/default.nix
index dc39427..49948e1 100644
--- a/common/default.nix
+++ b/common/default.nix
@@ -7,6 +7,7 @@
 , nur
 , nix-melt
 , nurl
+, coc-stylelintplus
 , pkgs
 , ...
 }: {
@@ -39,7 +40,10 @@
       exact = false;
     };
   };
-  nixpkgs.overlays = [ nixpkgs-wayland.overlay ];
+  nixpkgs.overlays = [
+    nixpkgs-wayland.overlay
+    coc-stylelintplus.overlay
+  ];
 
   nh = {
     enable = true;
diff --git a/common/modules/neovim/default.nix b/common/modules/neovim/default.nix
index 9b1f3bc..1a2539f 100644
--- a/common/modules/neovim/default.nix
+++ b/common/modules/neovim/default.nix
@@ -56,7 +56,6 @@ in
 
         bat
 
-        stylelint-lsp
         nil
       ];
       extraPython3Packages = with pkgs.python311Packages; [
diff --git a/common/overlays/default.nix b/common/overlays/default.nix
index 7eb3cb2..61689c6 100644
--- a/common/overlays/default.nix
+++ b/common/overlays/default.nix
@@ -11,16 +11,6 @@
     (import ./blueberry.nix)
     (import ./vencord.nix)
 
-    (final: prev: {
-      vimPlugins = prev.vimPlugins.extend (final': prev': {
-        coc-stylelintplus = prev.callPackage ./pkgs/coc-stylelintplus.nix {};
-      });
-    })
-
-    (final: prev: {
-      stylelint-lsp = final.callPackage ./pkgs/stylelint-lsp.nix {};
-    })
-
     (final: prev: {
       spotifywm = final.callPackage ./pkgs/spotifywm.nix {};
     })
diff --git a/common/overlays/pkgs/coc-stylelintplus.nix b/common/overlays/pkgs/coc-stylelintplus.nix
deleted file mode 100644
index a7ea966..0000000
--- a/common/overlays/pkgs/coc-stylelintplus.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ vimUtils
-, buildNpmPackage
-, fetchFromGitHub
-}: let
-  buildVimPlugin = vimUtils.buildVimPlugin;
-  name = "coc-stylelintplus";
-  rev = "7945d0c2a26da13b7d1aa6e0681ddac088b22d3b";
-
-  nodePkg = buildNpmPackage {
-    name = name;
-    src = fetchFromGitHub {
-      owner = "matt1432";
-      repo = name;
-      rev = rev;
-      hash = "sha256-tdNE0taHuvZ7Gg9RXz5TWKB/ujpGO1tMzWHIj3O9vOw=";
-    };
-
-    npmDepsHash = "sha256-r9JdzGjdf36vyRQeGDt0ZttF/PSCQBYfn472EiSpEXg=";
-
-    dontNpmBuild = true;
-    makeCacheWritable = true;
-  };
-in
-buildVimPlugin {
-  pname = name;
-  version = rev;
-  src = "${nodePkg}/lib/node_modules/${name}";
-}
diff --git a/common/overlays/pkgs/stylelint-lsp.nix b/common/overlays/pkgs/stylelint-lsp.nix
deleted file mode 100644
index e947996..0000000
--- a/common/overlays/pkgs/stylelint-lsp.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ lib
-, buildNpmPackage
-, fetchFromGitHub
-}:
-
-buildNpmPackage rec {
-  name = "stylelint-lsp";
-  pname = "stylelint-lsp";
-
-  src = fetchFromGitHub {
-    owner = "matt1432";
-    repo = pname;
-    rev = "279a4a5c53e79b7f7cbb6bdf60cca5ed8135c0a2";
-    hash = "sha256-myQ2jr+XY/fKuT2NE29OZd4uJZlfWFGbxnUr1SUZEW0=";
-  };
-
-  npmDepsHash = "sha256-P8S6EO//6daUYKQ3GTZDmwah7KD0+mRyhy2ruFERx0I=";
-
-  dontNpmBuild = true;
-  makeCacheWritable = true;
-}
diff --git a/flake.lock b/flake.lock
index dad5e8c..0c1cc4f 100644
--- a/flake.lock
+++ b/flake.lock
@@ -20,6 +20,26 @@
         "type": "github"
       }
     },
+    "coc-stylelintplus": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1698358884,
+        "narHash": "sha256-gpqZucyZujTq7bclWcU/F8Zp7jae0V21mI58yBhKeJ4=",
+        "owner": "matt1432",
+        "repo": "coc-stylelintplus",
+        "rev": "5653e8d99b950a6ef199f3048a567b8df7999434",
+        "type": "github"
+      },
+      "original": {
+        "owner": "matt1432",
+        "repo": "coc-stylelintplus",
+        "type": "github"
+      }
+    },
     "flake-compat": {
       "flake": false,
       "locked": {
@@ -649,6 +669,7 @@
     "root": {
       "inputs": {
         "ags": "ags",
+        "coc-stylelintplus": "coc-stylelintplus",
         "home-manager": "home-manager",
         "hyprgrass": "hyprgrass",
         "hyprland": "hyprland",
diff --git a/flake.nix b/flake.nix
index fce6d16..e5db041 100644
--- a/flake.nix
+++ b/flake.nix
@@ -42,6 +42,10 @@
       url = "github:nix-community/nurl";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+    coc-stylelintplus = {
+      url = "github:matt1432/coc-stylelintplus";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
   };
 
   outputs = { self, nixpkgs, home-manager, nur, nix-gaming, ... }@attrs: let