mirror of
https://github.com/hyprwm/hyprland-plugins.git
synced 2024-11-22 18:45:59 +01:00
Nix: use mkHyprlandPlugin from nixpkgs
This commit is contained in:
parent
8d3a0701a2
commit
93c93284c5
7 changed files with 101 additions and 70 deletions
|
@ -1,17 +1,15 @@
|
||||||
{
|
{
|
||||||
lib,
|
lib,
|
||||||
stdenv,
|
|
||||||
hyprland,
|
hyprland,
|
||||||
|
hyprlandPlugins,
|
||||||
}:
|
}:
|
||||||
stdenv.mkDerivation {
|
hyprlandPlugins.mkHyprlandPlugin {
|
||||||
pname = "borders-plus-plus";
|
pluginName = "borders-plus-plus";
|
||||||
version = "0.1";
|
version = "0.1";
|
||||||
src = ./.;
|
src = ./.;
|
||||||
|
|
||||||
inherit (hyprland) nativeBuildInputs;
|
inherit (hyprland) nativeBuildInputs;
|
||||||
|
|
||||||
buildInputs = [hyprland] ++ hyprland.buildInputs;
|
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
homepage = "https://github.com/hyprwm/hyprland-plugins";
|
homepage = "https://github.com/hyprwm/hyprland-plugins";
|
||||||
description = "Hyprland borders-plus-plus plugin";
|
description = "Hyprland borders-plus-plus plugin";
|
||||||
|
|
|
@ -1,17 +1,15 @@
|
||||||
{
|
{
|
||||||
lib,
|
lib,
|
||||||
stdenv,
|
|
||||||
hyprland,
|
hyprland,
|
||||||
|
hyprlandPlugins,
|
||||||
}:
|
}:
|
||||||
stdenv.mkDerivation {
|
hyprlandPlugins.mkHyprlandPlugin {
|
||||||
pname = "csgo-vulkan-fix";
|
pluginName = "csgo-vulkan-fix";
|
||||||
version = "0.1";
|
version = "0.1";
|
||||||
src = ./.;
|
src = ./.;
|
||||||
|
|
||||||
inherit (hyprland) nativeBuildInputs;
|
inherit (hyprland) nativeBuildInputs;
|
||||||
|
|
||||||
buildInputs = [hyprland] ++ hyprland.buildInputs;
|
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
homepage = "https://github.com/hyprwm/hyprland-plugins";
|
homepage = "https://github.com/hyprwm/hyprland-plugins";
|
||||||
description = "Hyprland CS:GO Vulkan fix";
|
description = "Hyprland CS:GO Vulkan fix";
|
||||||
|
|
49
flake.lock
49
flake.lock
|
@ -3,17 +3,18 @@
|
||||||
"hyprland": {
|
"hyprland": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"hyprland-protocols": "hyprland-protocols",
|
"hyprland-protocols": "hyprland-protocols",
|
||||||
|
"hyprlang": "hyprlang",
|
||||||
"nixpkgs": "nixpkgs",
|
"nixpkgs": "nixpkgs",
|
||||||
"systems": "systems",
|
"systems": "systems",
|
||||||
"wlroots": "wlroots",
|
"wlroots": "wlroots",
|
||||||
"xdph": "xdph"
|
"xdph": "xdph"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1706382674,
|
"lastModified": 1709802223,
|
||||||
"narHash": "sha256-wuSs8Tm9GweeCEGIwamdMMZmOPF+8WWMM1YdH6jdA/w=",
|
"narHash": "sha256-0tzkHwQ45ytvYjmqzjOi5TFnR0qaZRxOvzRZFhv7Oew=",
|
||||||
"owner": "hyprwm",
|
"owner": "hyprwm",
|
||||||
"repo": "Hyprland",
|
"repo": "Hyprland",
|
||||||
"rev": "bc7e488a4c7a4bfdd7bce66265fe8aea516fd2ed",
|
"rev": "77161fdbef72033ea1989e4c4d386a5732bd6bf0",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -51,16 +52,19 @@
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
"hyprland",
|
"hyprland",
|
||||||
"xdph",
|
|
||||||
"nixpkgs"
|
"nixpkgs"
|
||||||
|
],
|
||||||
|
"systems": [
|
||||||
|
"hyprland",
|
||||||
|
"systems"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1704287638,
|
"lastModified": 1709775675,
|
||||||
"narHash": "sha256-TuRXJGwtK440AXQNl5eiqmQqY4LZ/9+z/R7xC0ie3iA=",
|
"narHash": "sha256-G+gIMUQBtfbbrnsM/OPJzebdqKFP6typplNCE7X8Szw=",
|
||||||
"owner": "hyprwm",
|
"owner": "hyprwm",
|
||||||
"repo": "hyprlang",
|
"repo": "hyprlang",
|
||||||
"rev": "6624f2bb66d4d27975766e81f77174adbe58ec97",
|
"rev": "f1db1a7e1faee2a5c67d03b6bd283da82eed3730",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -71,11 +75,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1706191920,
|
"lastModified": 1709703039,
|
||||||
"narHash": "sha256-eLihrZAPZX0R6RyM5fYAWeKVNuQPYjAkCUBr+JNvtdE=",
|
"narHash": "sha256-6hqgQ8OK6gsMu1VtcGKBxKQInRLHtzulDo9Z5jxHEFY=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "ae5c332cbb5827f6b1f02572496b141021de335f",
|
"rev": "9df3e30ce24fd28c7b3e2de0d986769db5d6225d",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -87,7 +91,11 @@
|
||||||
},
|
},
|
||||||
"root": {
|
"root": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"hyprland": "hyprland"
|
"hyprland": "hyprland",
|
||||||
|
"systems": [
|
||||||
|
"hyprland",
|
||||||
|
"systems"
|
||||||
|
]
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"systems": {
|
"systems": {
|
||||||
|
@ -109,18 +117,18 @@
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"host": "gitlab.freedesktop.org",
|
"host": "gitlab.freedesktop.org",
|
||||||
"lastModified": 1706359063,
|
"lastModified": 1708558866,
|
||||||
"narHash": "sha256-5HUTG0p+nCJv3cn73AmFHRZdfRV5AD5N43g8xAePSKM=",
|
"narHash": "sha256-Mz6hCtommq7RQfcPnxLINigO4RYSNt23HeJHC6mVmWI=",
|
||||||
"owner": "wlroots",
|
"owner": "wlroots",
|
||||||
"repo": "wlroots",
|
"repo": "wlroots",
|
||||||
"rev": "00b869c1a96f300a8f25da95d624524895e0ddf2",
|
"rev": "0cb091f1a2d345f37d2ee445f4ffd04f7f4ec9e5",
|
||||||
"type": "gitlab"
|
"type": "gitlab"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"host": "gitlab.freedesktop.org",
|
"host": "gitlab.freedesktop.org",
|
||||||
"owner": "wlroots",
|
"owner": "wlroots",
|
||||||
"repo": "wlroots",
|
"repo": "wlroots",
|
||||||
"rev": "00b869c1a96f300a8f25da95d624524895e0ddf2",
|
"rev": "0cb091f1a2d345f37d2ee445f4ffd04f7f4ec9e5",
|
||||||
"type": "gitlab"
|
"type": "gitlab"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
@ -130,7 +138,10 @@
|
||||||
"hyprland",
|
"hyprland",
|
||||||
"hyprland-protocols"
|
"hyprland-protocols"
|
||||||
],
|
],
|
||||||
"hyprlang": "hyprlang",
|
"hyprlang": [
|
||||||
|
"hyprland",
|
||||||
|
"hyprlang"
|
||||||
|
],
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
"hyprland",
|
"hyprland",
|
||||||
"nixpkgs"
|
"nixpkgs"
|
||||||
|
@ -141,11 +152,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1706145785,
|
"lastModified": 1709299639,
|
||||||
"narHash": "sha256-j9MP4fv2U/vdRKAXXc2gyMTmYwVnHP6kHx1/y6jprrU=",
|
"narHash": "sha256-jYqJM5khksLIbqSxCLUUcqEgI+O2LdlSlcMEBs39CAU=",
|
||||||
"owner": "hyprwm",
|
"owner": "hyprwm",
|
||||||
"repo": "xdg-desktop-portal-hyprland",
|
"repo": "xdg-desktop-portal-hyprland",
|
||||||
"rev": "5a592647587cd20b9692a347df6939b6d371b3bb",
|
"rev": "2d2fb547178ec025da643db57d40a971507b82fe",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
82
flake.nix
82
flake.nix
|
@ -1,36 +1,66 @@
|
||||||
{
|
{
|
||||||
description = "Hyprland Plugins";
|
description = "Hyprland Plugins";
|
||||||
|
|
||||||
inputs.hyprland.url = "github:hyprwm/Hyprland";
|
inputs = {
|
||||||
|
hyprland.url = "github:hyprwm/Hyprland";
|
||||||
|
systems.follows = "hyprland/systems";
|
||||||
|
};
|
||||||
|
|
||||||
outputs = inputs: let
|
outputs = {
|
||||||
inherit (inputs.hyprland.inputs) nixpkgs;
|
self,
|
||||||
withPkgsFor = fn: nixpkgs.lib.genAttrs (builtins.attrNames inputs.hyprland.packages) (system: fn system nixpkgs.legacyPackages.${system});
|
hyprland,
|
||||||
|
systems,
|
||||||
|
...
|
||||||
|
}: let
|
||||||
|
inherit (hyprland.inputs) nixpkgs;
|
||||||
|
inherit (nixpkgs) lib;
|
||||||
|
eachSystem = lib.genAttrs (import systems);
|
||||||
|
|
||||||
|
pkgsFor = eachSystem (system:
|
||||||
|
import nixpkgs {
|
||||||
|
localSystem.system = system;
|
||||||
|
overlays = with self.overlays; [hyprland-plugins];
|
||||||
|
});
|
||||||
in {
|
in {
|
||||||
packages = withPkgsFor (system: pkgs: let
|
packages = eachSystem (system: {
|
||||||
hyprland = inputs.hyprland.packages.${system}.hyprland;
|
inherit (pkgsFor.${system}) borders-plus-plus csgo-vulkan-fix hyprbars hyprtrails hyprwinwrap;
|
||||||
buildPlugin = path: extraArgs:
|
|
||||||
pkgs.callPackage path {
|
|
||||||
inherit hyprland;
|
|
||||||
inherit (hyprland) stdenv;
|
|
||||||
}
|
|
||||||
// extraArgs;
|
|
||||||
in {
|
|
||||||
borders-plus-plus = buildPlugin ./borders-plus-plus {};
|
|
||||||
csgo-vulkan-fix = buildPlugin ./csgo-vulkan-fix {};
|
|
||||||
hyprbars = buildPlugin ./hyprbars {};
|
|
||||||
hyprtrails = buildPlugin ./hyprtrails {};
|
|
||||||
hyprwinwrap = buildPlugin ./hyprwinwrap {};
|
|
||||||
});
|
});
|
||||||
|
|
||||||
checks = withPkgsFor (system: pkgs: inputs.self.packages.${system});
|
overlays = {
|
||||||
|
default = self.overlays.hyprland-plugins;
|
||||||
|
mkHyprlandPlugin = lib.composeManyExtensions [
|
||||||
|
hyprland.overlays.default
|
||||||
|
(final: prev: {
|
||||||
|
hyprlandPlugins =
|
||||||
|
prev.hyprlandPlugins
|
||||||
|
// {
|
||||||
|
mkHyprlandPlugin = prev.hyprlandPlugins.mkHyprlandPlugin final.hyprland;
|
||||||
|
};
|
||||||
|
})
|
||||||
|
];
|
||||||
|
hyprland-plugins = lib.composeManyExtensions [
|
||||||
|
self.overlays.mkHyprlandPlugin
|
||||||
|
(final: prev: let
|
||||||
|
inherit (final) callPackage;
|
||||||
|
in {
|
||||||
|
borders-plus-plus = callPackage ./borders-plus-plus {};
|
||||||
|
csgo-vulkan-fix = callPackage ./csgo-vulkan-fix {};
|
||||||
|
hyprbars = callPackage ./hyprbars {};
|
||||||
|
hyprtrails = callPackage ./hyprtrails {};
|
||||||
|
hyprwinwrap = callPackage ./hyprwinwrap {};
|
||||||
|
})
|
||||||
|
];
|
||||||
|
};
|
||||||
|
|
||||||
devShells = withPkgsFor (system: pkgs: {
|
checks = eachSystem (system: self.packages.${system});
|
||||||
default = pkgs.mkShell.override {stdenv = pkgs.gcc13Stdenv;} {
|
|
||||||
name = "hyprland-plugins";
|
devShells = eachSystem (system:
|
||||||
buildInputs = [inputs.hyprland.packages.${system}.hyprland];
|
with pkgsFor.${system}; {
|
||||||
inputsFrom = [inputs.hyprland.packages.${system}.hyprland];
|
default = mkShell.override {stdenv = gcc13Stdenv;} {
|
||||||
};
|
name = "hyprland-plugins";
|
||||||
});
|
buildInputs = [hyprland.packages.${system}.hyprland];
|
||||||
|
inputsFrom = [hyprland.packages.${system}.hyprland];
|
||||||
|
};
|
||||||
|
});
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,17 +1,15 @@
|
||||||
{
|
{
|
||||||
lib,
|
lib,
|
||||||
stdenv,
|
|
||||||
hyprland,
|
hyprland,
|
||||||
|
hyprlandPlugins,
|
||||||
}:
|
}:
|
||||||
stdenv.mkDerivation {
|
hyprlandPlugins.mkHyprlandPlugin {
|
||||||
pname = "hyprbars";
|
pluginName = "hyprbars";
|
||||||
version = "0.1";
|
version = "0.1";
|
||||||
src = ./.;
|
src = ./.;
|
||||||
|
|
||||||
inherit (hyprland) nativeBuildInputs;
|
inherit (hyprland) nativeBuildInputs;
|
||||||
|
|
||||||
buildInputs = [hyprland] ++ hyprland.buildInputs;
|
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
homepage = "https://github.com/hyprwm/hyprland-plugins";
|
homepage = "https://github.com/hyprwm/hyprland-plugins";
|
||||||
description = "Hyprland window title plugin";
|
description = "Hyprland window title plugin";
|
||||||
|
|
|
@ -1,17 +1,15 @@
|
||||||
{
|
{
|
||||||
lib,
|
lib,
|
||||||
stdenv,
|
|
||||||
hyprland,
|
hyprland,
|
||||||
|
hyprlandPlugins,
|
||||||
}:
|
}:
|
||||||
stdenv.mkDerivation {
|
hyprlandPlugins.mkHyprlandPlugin {
|
||||||
pname = "hyprtrails";
|
pluginName = "hyprtrails";
|
||||||
version = "0.1";
|
version = "0.1";
|
||||||
src = ./.;
|
src = ./.;
|
||||||
|
|
||||||
inherit (hyprland) nativeBuildInputs;
|
inherit (hyprland) nativeBuildInputs;
|
||||||
|
|
||||||
buildInputs = [hyprland] ++ hyprland.buildInputs;
|
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
homepage = "https://github.com/hyprwm/hyprland-plugins";
|
homepage = "https://github.com/hyprwm/hyprland-plugins";
|
||||||
description = "Smooth trails behind moving windows for Hyprland";
|
description = "Smooth trails behind moving windows for Hyprland";
|
||||||
|
|
|
@ -1,17 +1,15 @@
|
||||||
{
|
{
|
||||||
lib,
|
lib,
|
||||||
stdenv,
|
|
||||||
hyprland,
|
hyprland,
|
||||||
|
hyprlandPlugins,
|
||||||
}:
|
}:
|
||||||
stdenv.mkDerivation {
|
hyprlandPlugins.mkHyprlandPlugin {
|
||||||
pname = "hyprwinwrap";
|
pluginName = "hyprwinwrap";
|
||||||
version = "0.1";
|
version = "0.1";
|
||||||
src = ./.;
|
src = ./.;
|
||||||
|
|
||||||
inherit (hyprland) nativeBuildInputs;
|
inherit (hyprland) nativeBuildInputs;
|
||||||
|
|
||||||
buildInputs = [hyprland] ++ hyprland.buildInputs;
|
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
homepage = "https://github.com/hyprwm/hyprland-plugins";
|
homepage = "https://github.com/hyprwm/hyprland-plugins";
|
||||||
description = "Hyprland version of xwinwrap";
|
description = "Hyprland version of xwinwrap";
|
||||||
|
|
Loading…
Reference in a new issue