mirror of
https://codeberg.org/leana8959/.files.git
synced 2025-12-06 14:49:14 +00:00
packages: rework package set organisation
make package set self referential collapse redundant files for package plumbing rework packages overlay and simplify scope update altiosevka font make altiosevka an overlay instead note invert package logic scope overlay unify package overlay logic fix overlay reference
This commit is contained in:
parent
d2bf46fcc4
commit
8e540bcfb9
17 changed files with 142 additions and 107 deletions
|
|
@ -1,26 +0,0 @@
|
|||
[buildPlans.altiosevka]
|
||||
family = "iosevka"
|
||||
spacing = "term"
|
||||
serifs = "sans"
|
||||
noLigation = true
|
||||
|
||||
[buildPlans.altiosevka.variants.design]
|
||||
capital-z = 'straight-serifless-with-crossbar'
|
||||
capital-q = 'crossing'
|
||||
lower-lambda = 'tailed-turn'
|
||||
seven = 'straight-serifless-crossbar'
|
||||
number-sign = 'slanted'
|
||||
ampersand = "et-tailed"
|
||||
dollar = 'open'
|
||||
cent = "open"
|
||||
percent = 'rings-continuous-slash-also-connected'
|
||||
# explicitly declare with-notch
|
||||
lig-equal-chain = 'with-notch'
|
||||
lig-hyphen-chain = 'with-notch'
|
||||
lig-plus-chain = 'with-notch'
|
||||
lig-double-arrow-bar = 'with-notch'
|
||||
lig-single-arrow-bar = 'with-notch'
|
||||
|
||||
[buildPlans.altiosevka.variants.italic]
|
||||
v = "cursive-serifless"
|
||||
w = "cursive-serifless"
|
||||
|
|
@ -1,17 +0,0 @@
|
|||
{iosevka}: let
|
||||
pname = "altiosevka";
|
||||
in
|
||||
(iosevka.overrideAttrs (_: {
|
||||
inherit pname;
|
||||
}))
|
||||
.override
|
||||
{
|
||||
set = pname;
|
||||
/*
|
||||
Guide: https://github.com/be5invis/Iosevka/blob/main/doc/custom-build.md
|
||||
|
||||
Use `term` spacing to avoid dashed arrow issue
|
||||
https://github.com/ryanoasis/nerd-fonts/issues/1018
|
||||
*/
|
||||
privateBuildPlan = builtins.readFile ./buildplan.toml;
|
||||
}
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
{
|
||||
sources ? import ../sources.nix,
|
||||
pkgs ? import sources.nixpkgs {},
|
||||
}: let
|
||||
inherit (pkgs) lib;
|
||||
in
|
||||
lib.mapAttrs
|
||||
(name: _: pkgs.callPackage (./by-name + "/${name}/package.nix") {})
|
||||
(
|
||||
lib.filterAttrs (_: type: type == "directory") (builtins.readDir ./by-name)
|
||||
)
|
||||
|
|
@ -1,3 +1,11 @@
|
|||
args:
|
||||
import ./top-level.nix args
|
||||
// import ./by-name.nix args
|
||||
{sources ? import ../sources.nix}: let
|
||||
scopeOverlay = overlay: final: prev: {export = prev.export or {} // overlay final prev;};
|
||||
in
|
||||
(
|
||||
import sources.nixpkgs {
|
||||
overlays = map scopeOverlay [
|
||||
(import ./overlay.nix)
|
||||
(import ../overlays/iosevka.nix)
|
||||
];
|
||||
}
|
||||
).export
|
||||
|
|
|
|||
7
nix/packages/overlay.nix
Normal file
7
nix/packages/overlay.nix
Normal file
|
|
@ -0,0 +1,7 @@
|
|||
final: prev: let
|
||||
inherit (prev) lib;
|
||||
in
|
||||
lib.mapAttrs (name: _: final.callPackage (./by-name + "/${name}/package.nix") {})
|
||||
(
|
||||
lib.filterAttrs (_: type: type == "directory") (builtins.readDir ./by-name)
|
||||
)
|
||||
|
|
@ -1,18 +0,0 @@
|
|||
{
|
||||
sources ? import ../sources.nix,
|
||||
pkgs ? import sources.nixpkgs {},
|
||||
...
|
||||
}: let
|
||||
iosevka-pin = import sources.pin-iosevka {};
|
||||
mkNerdFont = iosevka-pin.callPackage ../lib/mkNerdFont.nix {};
|
||||
in rec {
|
||||
# fonts
|
||||
altiosevka = iosevka-pin.callPackage ./altiosevka {};
|
||||
altiosevka-nerd-font-mono = mkNerdFont {
|
||||
font = altiosevka;
|
||||
extraArgs = [
|
||||
"--name {/.}-NFM"
|
||||
"--use-single-width-glyphs"
|
||||
];
|
||||
};
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue