diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-11-30 00:12:50 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-30 00:12:50 +0000 |
| commit | 17a17db64f88e2317d099c14f0f30f1ead327b05 (patch) | |
| tree | 0f268abc140a1d19e69f4aa2d4c385ec67bde396 /pkgs/data | |
| parent | a4f9b793a6008235c8eee8c93a5e69eec86a942b (diff) | |
| parent | c1fd97321933417f3ce5f77a41012083e07b9219 (diff) | |
| download | nixlib-17a17db64f88e2317d099c14f0f30f1ead327b05.tar nixlib-17a17db64f88e2317d099c14f0f30f1ead327b05.tar.gz nixlib-17a17db64f88e2317d099c14f0f30f1ead327b05.tar.bz2 nixlib-17a17db64f88e2317d099c14f0f30f1ead327b05.tar.lz nixlib-17a17db64f88e2317d099c14f0f30f1ead327b05.tar.xz nixlib-17a17db64f88e2317d099c14f0f30f1ead327b05.tar.zst nixlib-17a17db64f88e2317d099c14f0f30f1ead327b05.zip | |
Merge master into haskell-updates
Diffstat (limited to 'pkgs/data')
| -rw-r--r-- | pkgs/data/fonts/inter/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/data/fonts/mplus-outline-fonts/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/data/themes/catppuccin/default.nix | 14 |
3 files changed, 19 insertions, 7 deletions
diff --git a/pkgs/data/fonts/inter/default.nix b/pkgs/data/fonts/inter/default.nix index 46ab699fd398..0cbf67902f1c 100644 --- a/pkgs/data/fonts/inter/default.nix +++ b/pkgs/data/fonts/inter/default.nix @@ -2,19 +2,19 @@ stdenvNoCC.mkDerivation rec { pname = "inter"; - version = "3.19"; + version = "4.0"; src = fetchzip { url = "https://github.com/rsms/inter/releases/download/v${version}/Inter-${version}.zip"; stripRoot = false; - hash = "sha256-6kUQUTFtxiJEU6sYC6HzMwm1H4wvaKIoxoY3F6GJJa8="; + hash = "sha256-hFK7xFJt69n+98+juWgMvt+zeB9nDkc8nsR8vohrFIc="; }; installPhase = '' runHook preInstall - mkdir -p $out/share/fonts/opentype - cp */*.otf $out/share/fonts/opentype + mkdir -p $out/share/fonts/truetype + cp Inter.ttc InterVariable*.ttf $out/share/fonts/truetype runHook postInstall ''; diff --git a/pkgs/data/fonts/mplus-outline-fonts/default.nix b/pkgs/data/fonts/mplus-outline-fonts/default.nix index 93e508ecd43c..06d4f018e644 100644 --- a/pkgs/data/fonts/mplus-outline-fonts/default.nix +++ b/pkgs/data/fonts/mplus-outline-fonts/default.nix @@ -23,7 +23,7 @@ in meta = with lib; { description = "M+ Outline Fonts (legacy OSDN release)"; homepage = "https://mplus-fonts.osdn.jp"; - maintainers = with maintainers; [ henrytill uakci ]; + maintainers = with maintainers; [ uakci ]; platforms = platforms.all; license = licenses.mit; }; @@ -53,7 +53,7 @@ in meta = with lib; { description = "M+ Outline Fonts (GitHub release)"; homepage = "https://mplusfonts.github.io"; - maintainers = with maintainers; [ henrytill uakci ]; + maintainers = with maintainers; [ uakci ]; platforms = platforms.all; license = licenses.ofl; }; diff --git a/pkgs/data/themes/catppuccin/default.nix b/pkgs/data/themes/catppuccin/default.nix index 59e030eb9e0e..e8cdb0456d17 100644 --- a/pkgs/data/themes/catppuccin/default.nix +++ b/pkgs/data/themes/catppuccin/default.nix @@ -1,5 +1,5 @@ let - validThemes = [ "bat" "bottom" "btop" "hyprland" "k9s" "kvantum" "lazygit" "plymouth" "refind" "rofi" "waybar" ]; + validThemes = [ "bat" "bottom" "btop" "grub" "hyprland" "k9s" "kvantum" "lazygit" "plymouth" "refind" "rofi" "waybar" ]; in { fetchFromGitHub , lib @@ -40,6 +40,14 @@ let hash = "sha256-J3UezOQMDdxpflGax0rGBF/XMiKqdqZXuX4KMVGTxFk="; }; + grub = fetchFromGitHub { + name = "grub"; + owner = "catppuccin"; + repo = "grub"; + rev = "v1.0.0"; + hash = "sha256-/bSolCta8GCZ4lP0u5NVqYQ9Y3ZooYCNdTwORNvR7M0="; + }; + hyprland = fetchFromGitHub { name = "hyprland"; owner = "catppuccin"; @@ -140,6 +148,10 @@ stdenvNoCC.mkDerivation { mkdir -p $out/bottom cp "${sources.bottom}/themes/${variant}.toml" "$out/bottom/" + '' + lib.optionalString (lib.elem "grub" themeList) '' + mkdir -p $out/grub + cp -r ${sources.grub}/src/catppuccin-${variant}-grub-theme/* "$out/grub/" + '' + lib.optionalString (lib.elem "hyprland" themeList) '' mkdir -p $out/hyprland cp "${sources.hyprland}/themes/${variant}.conf" "$out/hyprland/" |