ryanccn/flake
1
0
Fork 0
mirror of https://github.com/ryanccn/flake.git synced 2026-01-26 19:56:29 +01:00
Code Activity

refactor: expose flake overlays

Browse source
This commit is contained in:
Ryan Cao 2024-02-17 10:04:58 +08:00
parent ff6c4c5d16
commit 9501f7769f
Signed by: ryanccn
SSH key fingerprint: SHA256:NtP/BlVhoQq4xU6BEcZeT8nIPvHntkJ3lIc2yB+F09E
6 changed files with 32 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

36
flake.lock generated
View file

@ -78,11 +78,11 @@
"rust-analyzer-src": "rust-analyzer-src" "rust-analyzer-src": "rust-analyzer-src"
}, },
"locked": { "locked": {
"lastModified": 1706941198, "lastModified": 1708064520,
"narHash": "sha256-t6/qloMYdknVJ9a3QzjylQIZnQfgefJ5kMim50B7dwA=", "narHash": "sha256-m0teYrbf7kAainkHBJ+zpClBNaTIOX6QNkn5W8on4uY=",
"owner": "nix-community", "owner": "nix-community",
"repo": "fenix", "repo": "fenix",
"rev": "28dbd8b43ea328ee708f7da538c63e03d5ed93c8", "rev": "2f24d67fad634ecf1820a73bb40d709eb12862bf",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -160,11 +160,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1707467182, "lastModified": 1708031129,
"narHash": "sha256-/Bw/xgCXfj4nXDd8Xq+r1kaorfsYkkomMf5w5MpsDyA=", "narHash": "sha256-EH20hJfNnc1/ODdDVat9B7aKm0B95L3YtkIRwKLvQG8=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "5b9156fa9a8b8beba917b8f9adbfd27bf63e16af", "rev": "3d6791b3897b526c82920a2ab5f61d71985b3cf8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -220,11 +220,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1706833576, "lastModified": 1707707289,
"narHash": "sha256-w7BL0EWRts+nD1lbLECIuz6fRzmmV+z8oWwoY7womR0=", "narHash": "sha256-YuDt/eSTXMEHv8jS8BEZJgqCcG8Tr3cyqaZjJFXZHsw=",
"owner": "LnL7", "owner": "LnL7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "bdbae6ecff8fcc322bf6b9053c0b984912378af7", "rev": "44f50a5ecaab72a61d5fd8e5c5717bc4bf9c25dd",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -235,11 +235,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1707451808, "lastModified": 1708001613,
"narHash": "sha256-UwDBUNHNRsYKFJzyTMVMTF5qS4xeJlWoeyJf+6vvamU=", "narHash": "sha256-woOmAXW05XnqlLn7dKzCkRAEOSOdA/Z2ndVvKcjid94=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "442d407992384ed9c0e6d352de75b69079904e4e", "rev": "085589047343aad800c4d305cf7b98e8a3d51ae2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -291,11 +291,11 @@
"ohmyzsh": { "ohmyzsh": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1707403294, "lastModified": 1707909248,
"narHash": "sha256-7S6UZCcUgBguoVaDWG4xGGQI2ePIVjz2L8aketzYbOw=", "narHash": "sha256-0bU/wJkICS+KwTMVzs/NqFJ0QBhiHiO6NLI9rCJbxv4=",
"owner": "ohmyzsh", "owner": "ohmyzsh",
"repo": "ohmyzsh", "repo": "ohmyzsh",
"rev": "fff073b55defed72a0a1aac4e853b165f208735b", "rev": "872b5cd4086a5547dbf788dda4e96ab3868cf59b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -328,11 +328,11 @@
"rust-analyzer-src": { "rust-analyzer-src": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1706875368, "lastModified": 1708018577,
"narHash": "sha256-KOBXxNurIU2lEmO6lR2A5El32X9x8ITt25McxKZ/Ew0=", "narHash": "sha256-B75VUqKvQeIqAUnYw4bGjY3xxrCqzRBJHLbmD0MAWEw=",
"owner": "rust-lang", "owner": "rust-lang",
"repo": "rust-analyzer", "repo": "rust-analyzer",
"rev": "8f6a72871ec87ed53cfe43a09fb284168a284e7e", "rev": "b9b0d29b8e69b02457cfabe20c4c69cdb45f3cc5",
"type": "github" "type": "github"
}, },
"original": { "original": {

5
flake.nix
View file

@ -88,6 +88,7 @@
}; };
outputs = { outputs = {
self,
nix-darwin, nix-darwin,
home-manager, home-manager,
darwin-custom-icons, darwin-custom-icons,
@ -101,8 +102,10 @@
]; ];
specialArgs = { specialArgs = {
inherit inputs; inherit self inputs;
}; };
}; };
overlays = import ./overlays;
}; };
} }

2
home/apps/vscode.nix
View file

@ -4,7 +4,7 @@
... ...
}: let }: let
extensions = [ extensions = [
"antfu.icons-carbon" # "antfu.icons-carbon"
"antfu.unocss" "antfu.unocss"
"astro-build.astro-vscode" "astro-build.astro-vscode"
"bierner.lit-html" "bierner.lit-html"

9
modules/nix.nix
View file

@ -1,11 +1,10 @@
{ {
self,
pkgs, pkgs,
inputs, inputs,
config, config,
... ...
}: let }: {
flakeOverlays = import ../overlays;
in {
services.nix-daemon.enable = true; services.nix-daemon.enable = true;
nix.package = pkgs.nix; nix.package = pkgs.nix;
@ -39,8 +38,8 @@ in {
inputs.choirpack.overlays.default inputs.choirpack.overlays.default
inputs.nyoom.overlays.default inputs.nyoom.overlays.default
inputs.fh.overlays.default inputs.fh.overlays.default
flakeOverlays.ryan-mono-bin self.overlays.ryan-mono-bin
flakeOverlays.ibm-plex self.overlays.ibm-plex
]; ];
config.allowUnfree = true; config.allowUnfree = true;

2
overlays/ibm-plex.nix
View file

@ -21,6 +21,7 @@
ttx "$medium_font" ttx "$medium_font"
sed -i 's/Medm/Medium/g' "$ttx_path" sed -i 's/Medm/Medium/g' "$ttx_path"
ttx -f "$ttx_path" ttx -f "$ttx_path"
rm "$ttx_path"
done done
semibold_fonts=$(fd --extension=otf SemiBold) semibold_fonts=$(fd --extension=otf SemiBold)
@ -33,6 +34,7 @@
ttx "$semibold_font" ttx "$semibold_font"
sed -i 's/SmBld/Semibold/g' "$ttx_path" sed -i 's/SmBld/Semibold/g' "$ttx_path"
ttx -f "$ttx_path" ttx -f "$ttx_path"
rm "$ttx_path"
done done
echo -e "''${ansi_green}Done!''${ansi_reset}" echo -e "''${ansi_green}Done!''${ansi_reset}"

7
overlays/ryan-mono-bin.nix
View file

@ -1,5 +1,5 @@
(_: prev: let (_: prev: let
version = "2024.02.15"; version = "2024.02.16";
mkFontVariant = { mkFontVariant = {
variant, variant,
@ -16,7 +16,6 @@
src = fetchzip { src = fetchzip {
url = "https://github.com/ryanccn/ryan-mono/releases/download/v${version}/${variant}.tar.xz"; url = "https://github.com/ryanccn/ryan-mono/releases/download/v${version}/${variant}.tar.xz";
stripRoot = false;
inherit hash; inherit hash;
}; };
@ -34,11 +33,11 @@
in { in {
ryan-mono-bin = mkFontVariant { ryan-mono-bin = mkFontVariant {
variant = "RyanMono"; variant = "RyanMono";
hash = "sha256-9ojd6qCMf+lGa//5ZmY/ob6sbJvkBLqWTjyz7I5Yr4M="; hash = "sha256-4h9T3r/kngeGUYMj6N05QFuvg0rPICqZBKDloB/WtMc=";
}; };
ryan-term-bin = mkFontVariant { ryan-term-bin = mkFontVariant {
variant = "RyanTerm"; variant = "RyanTerm";
hash = "sha256-23+qURL4jBzsnyglPrYYF2pBTkp/WpzR9GQ2nbuJC4E="; hash = "sha256-NBl4Z2JT88WbgcPuei3Jcfb5n7T89oWCzOm9vBtAmkc=";
}; };
}) })