diff --git a/flake.lock b/flake.lock index e5b9e95..4c63ad4 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,15 @@ "nodes": { "attic": { "inputs": { - "crane": "crane", + "crane": [ + "crane" + ], "flake-compat": [ "flake-compat" ], - "flake-utils": "flake-utils", + "flake-utils": [ + "flake-utils" + ], "nixpkgs": [ "nixpkgs" ], @@ -54,25 +58,24 @@ "crane": { "inputs": { "flake-compat": [ - "attic", "flake-compat" ], "flake-utils": [ - "attic", "flake-utils" ], "nixpkgs": [ - "attic", "nixpkgs" ], - "rust-overlay": "rust-overlay" + "rust-overlay": [ + "rust-overlay" + ] }, "locked": { - "lastModified": 1677892403, - "narHash": "sha256-/Wi0L1spSWLFj+UQxN3j0mPYMoc7ZoAujpUF/juFVII=", + "lastModified": 1691803597, + "narHash": "sha256-khWW1Owzselq5o816Lb7x624d6QGnv+kpronK3ndkr4=", "owner": "ipetkov", "repo": "crane", - "rev": "105e27adb70a9890986b6d543a67761cbc1964a2", + "rev": "7809d369710abb17767b624f9e72b500373580bc", "type": "github" }, "original": { @@ -118,12 +121,15 @@ } }, "flake-utils": { + "inputs": { + "systems": "systems" + }, "locked": { - "lastModified": 1667395993, - "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", + "lastModified": 1689068808, + "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=", "owner": "numtide", "repo": "flake-utils", - "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", + "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4", "type": "github" }, "original": { @@ -188,36 +194,65 @@ "type": "github" } }, + "nyoom": { + "inputs": { + "crane": [ + "crane" + ], + "flake-utils": [ + "flake-utils" + ], + "nixpkgs": [ + "nixpkgs" + ], + "rust-overlay": [ + "rust-overlay" + ] + }, + "locked": { + "lastModified": 1691816321, + "narHash": "sha256-QaOKS7VZAXb/3jtF8e2xKM5twU16PDudTg2zJ4xgA4g=", + "owner": "ryanccn", + "repo": "nyoom", + "rev": "b2fe3bfdcce64df0a076f68cae07b7de96853000", + "type": "github" + }, + "original": { + "owner": "ryanccn", + "repo": "nyoom", + "type": "github" + } + }, "root": { "inputs": { "attic": "attic", "catppuccin": "catppuccin", + "crane": "crane", "discord-applemusic-rich-presence": "discord-applemusic-rich-presence", "flake-compat": "flake-compat", + "flake-utils": "flake-utils", "home-manager": "home-manager", "nix-darwin": "nix-darwin", - "nixpkgs": "nixpkgs" + "nixpkgs": "nixpkgs", + "nyoom": "nyoom", + "rust-overlay": "rust-overlay" } }, "rust-overlay": { "inputs": { "flake-utils": [ - "attic", - "crane", "flake-utils" ], "nixpkgs": [ - "attic", - "crane", "nixpkgs" ] }, "locked": { - "lastModified": 1675391458, - "narHash": "sha256-ukDKZw922BnK5ohL9LhwtaDAdCsJL7L6ScNEyF1lO9w=", + "lastModified": 1691806075, + "narHash": "sha256-yuq7cNkFOQse4WwLw0rUiXhG58aI6eyXKfcTw5Act/I=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "383a4acfd11d778d5c2efcf28376cbd845eeaedf", + "rev": "b87a7db512340dea25e95f444db29e9264ff7a63", "type": "github" }, "original": { @@ -225,6 +260,21 @@ "repo": "rust-overlay", "type": "github" } + }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 252770c..3ab8fc1 100644 --- a/flake.nix +++ b/flake.nix @@ -17,6 +17,8 @@ url = "github:zhaofengli/attic"; inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs-stable.follows = "nixpkgs"; + inputs.crane.follows = "crane"; + inputs.flake-utils.follows = "flake-utils"; inputs.flake-compat.follows = "flake-compat"; }; @@ -31,6 +33,32 @@ inputs.nixpkgs.follows = "nixpkgs"; }; + nyoom = { + url = "github:ryanccn/nyoom"; + inputs.nixpkgs.follows = "nixpkgs"; + inputs.crane.follows = "crane"; + inputs.rust-overlay.follows = "rust-overlay"; + inputs.flake-utils.follows = "flake-utils"; + }; + + rust-overlay = { + url = "github:oxalica/rust-overlay"; + inputs.nixpkgs.follows = "nixpkgs"; + inputs.flake-utils.follows = "flake-utils"; + }; + + crane = { + url = "github:ipetkov/crane"; + inputs.nixpkgs.follows = "nixpkgs"; + inputs.rust-overlay.follows = "rust-overlay"; + inputs.flake-utils.follows = "flake-utils"; + inputs.flake-compat.follows = "flake-compat"; + }; + + flake-utils = { + url = "github:numtide/flake-utils"; + }; + flake-compat = { url = "github:edolstra/flake-compat"; flake = false; @@ -44,6 +72,7 @@ home-manager, attic, catppuccin, + nyoom, discord-applemusic-rich-presence, ... }: let diff --git a/system.nix b/system.nix index 9f21b97..e4ffc6f 100644 --- a/system.nix +++ b/system.nix @@ -3,6 +3,7 @@ attic, catppuccin, discord-applemusic-rich-presence, + nyoom, ... }: { environment.systemPackages = with pkgs; [ @@ -35,6 +36,8 @@ rustfmt clippy + pkgs.nyoom + age asciinema bat @@ -96,6 +99,7 @@ overlays = [ attic.overlays.default discord-applemusic-rich-presence.overlays.default + nyoom.overlays.default (import ./overlays/ryan-mono-bin.nix) ];