Squash merge dev into master

This commit is contained in:
alsaiduq-lab 2025-06-01 07:14:51 -06:00
parent a009895ea0
commit cc87e2cb60
28 changed files with 294 additions and 256 deletions

View file

@ -0,0 +1,26 @@
{
pkgs,
lib,
...
}: {
binary-clock-font = pkgs.stden.mkDerivation {
pname = "binary-clock-font";
version = "1.0.0";
src = pkgs.fetchurl {
url = "https://github.com/jamessouth/polybar-binary-clock-fonts/raw/master/BinaryClockBoldMono.ttf";
sha256 = "0vxy23zr8r8faa5s7vy5bf8z2q7my39ghmd9ilk7aww9wqsrsjqx";
};
dontUnpack = true;
installPhase = ''
mkdir -p $out/share/fonts/truetype
cp $src $out/share/fonts/truetype/BinaryClockBoldMono.ttf
'';
meta = with lib; {
description = "A monospaced bold font for binary clocks";
homepage = "https://github.com/jamessouth/polybar-binary-clock-fonts";
license = licenses.ofl;
platforms = platforms.all;
maintainers = with maintainers; [cobray];
};
};
}

View file

@ -0,0 +1,26 @@
{
pkgs,
lib,
...
}: {
clear-sans = pkgs.stdenv.mkDerivation {
pname = "clear-sans";
version = "1.0";
src = pkgs.fetchurl {
url = "https://raw.githubusercontent.com/resir014/Clear-Sans-Webfont/97eec13/fonts/TTF/ClearSans-Regular.ttf";
sha256 = "0vzhy3l056gj5vkcs1kglr4mr0546fq093v78i4ri8xni7w1m0dv";
};
dontUnpack = true;
installPhase = ''
mkdir -p $out/share/fonts/truetype
cp $src $out/share/fonts/truetype/ClearSans-Regular.ttf
'';
meta = with lib; {
description = "Clear Sans font";
homepage = "https://github.com/intel/clear-sans";
license = licenses.apache;
maintainers = [cobray];
platforms = platforms.all;
};
};
}

View file

@ -2,6 +2,7 @@
pkgs,
lib,
rpcs3_latest,
customFontPkgs,
}: let
rpcs3Pkgs = pkgs.callPackage ./rpcs3 {
inherit lib rpcs3_latest;
@ -9,4 +10,5 @@
in {
inherit (rpcs3Pkgs) pugixml SDL3 rpcs3 rpcs3_latest;
fish-rust = pkgs.callPackage ./fish-rust {};
inherit (customFontPkgs) clear-sans binary-font;
}