ryanccn/flake
1
0
Fork 0
mirror of https://github.com/ryanccn/flake.git synced 2025-12-06 08:10:43 +01:00
Code Activity

chore: update inputs and packages

Browse source
This commit is contained in:
Ryan Cao 2023-10-23 18:32:41 +08:00
parent 18f84a1825
commit e9925d0c42
Signed by: ryanccn
SSH key fingerprint: SHA256:NtP/BlVhoQq4xU6BEcZeT8nIPvHntkJ3lIc2yB+F09E
6 changed files with 27 additions and 77 deletions
Download patch file Download diff file Expand all files Collapse all files

44
flake.lock generated
View file

@ -62,11 +62,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1697208677, "lastModified": 1698002908,
"narHash": "sha256-1z4XJhidXiKcYAKDzzwjV8WhdNlcKDdcJlwTITYyIco=", "narHash": "sha256-Bge0FHsAQx1SQZyzpFl0EdgLC/RaYEToU2YVUMDlFvw=",
"owner": "Stonks3141", "owner": "Stonks3141",
"repo": "ctp-nix", "repo": "ctp-nix",
"rev": "4ade2040125e692e90204a073a07a6c7f3063ded", "rev": "5713b478b10c5ef703fd921d96ca6a3057c457b5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -82,11 +82,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1697677553, "lastModified": 1697840921,
"narHash": "sha256-ozj7HFo/1iQdzZ2U6tHP4QBW59eUbDZ/5HI8lLe9wos=", "narHash": "sha256-zXHwu104SQOxogkMgg+w22c3+zI/FvK83TAkfLmeKw0=",
"owner": "ipetkov", "owner": "ipetkov",
"repo": "crane", "repo": "crane",
"rev": "bc5fa8cd53ef32b9b827f24b993c42a8c4dd913b", "rev": "758ae442227103fa501276e8225609a11c99718e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -118,11 +118,11 @@
"rust-analyzer-src": "rust-analyzer-src" "rust-analyzer-src": "rust-analyzer-src"
}, },
"locked": { "locked": {
"lastModified": 1697782927, "lastModified": 1698042153,
"narHash": "sha256-OikLtn3e0kR5ztHJbLzS/5mUMadXfgRGKA1BDgcTa60=", "narHash": "sha256-X6qAg4SAMyi0Bg6HPeHkAufmYUeW/6N+ikIIVYOBu58=",
"owner": "nix-community", "owner": "nix-community",
"repo": "fenix", "repo": "fenix",
"rev": "e5f13bd304140705f6aba0f121cee7775d861897", "rev": "0fbf5652c9596038c0f4784d3e93d1f1a543e24b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -147,6 +147,7 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1697489714,
"narHash": "sha256-gyxlVSraZIVAyOaJk90fub4b8g1w4KXwqa1ecNAC7xA=", "narHash": "sha256-gyxlVSraZIVAyOaJk90fub4b8g1w4KXwqa1ecNAC7xA=",
"rev": "d72db6283e6b6bef7216c8586c16d9f648652400", "rev": "d72db6283e6b6bef7216c8586c16d9f648652400",
"revCount": 353, "revCount": 353,
@ -199,11 +200,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1697688028, "lastModified": 1697964592,
"narHash": "sha256-d9CAOd9W2iTrgB31a8Dvyp6Vgn/gxASCNrD4Z9yzUOY=", "narHash": "sha256-fua0LKNLkYYK2Dgdm9P+VPdqrVgDXUIx+EkQAQByhuc=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "c5c1ea85181d2bb44e46e8a944a8a3f56ad88f19", "rev": "219d268a69512ff520fe8da1739ac22d95d52355",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -274,11 +275,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1697730408, "lastModified": 1697915759,
"narHash": "sha256-Ww//zzukdTrwTrCUkaJA/NsaLEfUfQpWZXBdXBYfhak=", "narHash": "sha256-WyMj5jGcecD+KC8gEs+wFth1J1wjisZf8kVZH13f1Zo=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "ff0a5a776b56e0ca32d47a4a47695452ec7f7d80", "rev": "51d906d2341c9e866e48c2efcaac0f2d70bfd43e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -295,6 +296,7 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1695906663,
"narHash": "sha256-6gC3C0sYD9p706XZjRXvrCyH2x5vpLUKehxvbnHKZec=", "narHash": "sha256-6gC3C0sYD9p706XZjRXvrCyH2x5vpLUKehxvbnHKZec=",
"rev": "3bde992e4dd222078ce068a9313a86ff9bafab6e", "rev": "3bde992e4dd222078ce068a9313a86ff9bafab6e",
"revCount": 130, "revCount": 130,
@ -329,11 +331,11 @@
"rust-analyzer-src": { "rust-analyzer-src": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1697733402, "lastModified": 1698006371,
"narHash": "sha256-G5P/bwympglxbmgHbCSz9wQxn4TV5wwaXE5Pzsjgrrw=", "narHash": "sha256-/SkkJSywaPESyqCRIwmDNRNlons+uP8bUDCU4EjYWb4=",
"owner": "rust-lang", "owner": "rust-lang",
"repo": "rust-analyzer", "repo": "rust-analyzer",
"rev": "0cae1ca656f181ce78af7a25007f96b3ef5c166f", "rev": "10872952c03947124f8ccda7d7aa7930b7da32fe",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -353,11 +355,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1697767917, "lastModified": 1697940838,
"narHash": "sha256-9+FjCVE1Y7iUKohBF43yD05KoQB+FPcw/XL2rlKkjqY=", "narHash": "sha256-eyk92QqAoRNC0V99KOcKcBZjLPixxNBS0PRc4KlSQVs=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "679ea0878edc749f23516ea6d7ffa974c6304bf5", "rev": "a3e829c06eadf848f13d109c7648570ce37ebccd",
"type": "github" "type": "github"
}, },
"original": { "original": {

4
home/programs/glamour.nix
View file

@ -3,7 +3,5 @@
config, config,
... ...
}: { }: {
home.sessionVariables = { programs.glamour.catppuccin.enable = true;
GLAMOUR_STYLE = "${pkgs.ctp-glamour.${config.catppuccin.flavour}}/default.json";
};
} }

1
modules/nix.nix
View file

@ -36,7 +36,6 @@ in {
inputs.fh.overlays.default inputs.fh.overlays.default
flakeOverlays.ryan-mono-bin flakeOverlays.ryan-mono-bin
flakeOverlays.ibm-plex flakeOverlays.ibm-plex
flakeOverlays.ctp-glamour
]; ];
config.allowUnfree = true; config.allowUnfree = true;

48
overlays/ctp-glamour.nix
View file

@ -1,48 +0,0 @@
(_: prev: let
flavors = [
{
flavor = "latte";
hash = "sha256-V0LsRStF1vL+Tz8G6VaKiwiY/ZIsSkMc+f1WJAITYXU=";
}
{
flavor = "frappe";
hash = "sha256-YOatgYCJKuesVERHZVmF1xtzuLjyxCYstoWYqATq+NU=";
}
{
flavor = "macchiato";
hash = "sha256-CeSJvhjzHVTtlqgQLKOrdLXtp2OQlMh24IaA1QQiQCk=";
}
{
flavor = "mocha";
hash = "sha256-Tx2fQteL4wxhV+qHYZibakiYoEhS4HjyMO0yBcU/F6Q=";
}
];
in {
ctp-glamour = builtins.listToAttrs (builtins.map ({
flavor,
hash,
}: {
name = flavor;
value = prev.callPackage (
{
stdenvNoCC,
fetchurl,
}:
stdenvNoCC.mkDerivation rec {
pname = "ctp-glamour-${flavor}";
version = "1.0.0";
src = fetchurl {
url = "https://github.com/catppuccin/glamour/releases/download/v${version}/${flavor}.json";
inherit hash;
};
unpackPhase = ''
mkdir -p $out
cp $src $out/default.json
'';
}
) {};
})
flavors);
})

1
overlays/default.nix
View file

@ -1,5 +1,4 @@
{ {
ibm-plex = import ./ibm-plex.nix; ibm-plex = import ./ibm-plex.nix;
ryan-mono-bin = import ./ryan-mono-bin.nix; ryan-mono-bin = import ./ryan-mono-bin.nix;
ctp-glamour = import ./ctp-glamour.nix;
} }

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

@ -1,5 +1,5 @@
(_: prev: let (_: prev: let
version = "2023.09.28"; version = "2023.10.22";
mkFontVariant = { mkFontVariant = {
variant, variant,
@ -35,11 +35,11 @@
in { in {
ryan-mono-bin = mkFontVariant { ryan-mono-bin = mkFontVariant {
variant = "ryan-mono"; variant = "ryan-mono";
hash = "sha256-uDr7A1gEEazQWcqpH4YTNKycX6buE8QerECCrHXVbD8="; hash = "sha256-qF0dWDlhWZVIi/HIuRMpmQM+fD6pdQViwehHe6WXTmo=";
}; };
ryan-term-bin = mkFontVariant { ryan-term-bin = mkFontVariant {
variant = "ryan-term"; variant = "ryan-term";
hash = "sha256-91pS9CzbYKywOIrUwWJpXnl5lJKZVH4nSadCh8PQscU="; hash = "sha256-X6u5A0CnaZvAw/yP/3ERWUYM9USFAaHj8akayedwnLM=";
}; };
}) })