feat(coc-stylelint): use my flake instead of the overlays

This commit is contained in:
matt1432 2023-10-26 20:47:49 -04:00
parent c122b79aef
commit 32466b94fd
7 changed files with 30 additions and 61 deletions

View file

@ -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;

View file

@ -56,7 +56,6 @@ in
bat
stylelint-lsp
nil
];
extraPython3Packages = with pkgs.python311Packages; [

View file

@ -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 {};
})

View file

@ -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}";
}

View file

@ -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;
}

View file

@ -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",

View file

@ -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