diff --git a/flake.lock b/flake.lock index f085914..391c4df 100644 --- a/flake.lock +++ b/flake.lock @@ -1,32 +1,33 @@ { "nodes": { - "catppuccin-toolbox": { + "catppuccin-whiskers": { "inputs": { - "nixpkgs": "nixpkgs" + "nixpkgs": "nixpkgs", + "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1711976880, - "narHash": "sha256-YrPxB4wu70PmMGcETj9bxL7SkMj26EPQqtUBAWp0jiI=", + "lastModified": 1718378569, + "narHash": "sha256-rbPr5eSs99nS70J785SWO7tVBdiX/S7XUNHuo3aOQU4=", "owner": "catppuccin", - "repo": "toolbox", - "rev": "1d708ac628ba07264a579e385c88f984db741ffe", + "repo": "whiskers", + "rev": "dbec732f59224c802c648ece7849727d2c0cbf3b", "type": "github" }, "original": { "owner": "catppuccin", - "repo": "toolbox", + "repo": "whiskers", "type": "github" } }, "crane": { "inputs": { "flake-compat": "flake-compat", - "flake-utils": "flake-utils", + "flake-utils": "flake-utils_2", "nixpkgs": [ "git-view", "nixpkgs" ], - "rust-overlay": "rust-overlay" + "rust-overlay": "rust-overlay_2" }, "locked": { "lastModified": 1688082682, @@ -45,12 +46,12 @@ "crane_2": { "inputs": { "flake-compat": "flake-compat_2", - "flake-utils": "flake-utils_3", + "flake-utils": "flake-utils_4", "nixpkgs": [ "nekowinston-nur", "nixpkgs" ], - "rust-overlay": "rust-overlay_3" + "rust-overlay": "rust-overlay_4" }, "locked": { "lastModified": 1676846788, @@ -178,11 +179,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1687709756, - "narHash": "sha256-Y5wKlQSkgEK2weWdOu4J3riRd+kV/VCgHsqLNTTWQ/0=", + "lastModified": 1705309234, + "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", "owner": "numtide", "repo": "flake-utils", - "rev": "dbabf0ca0c0c4bce6ea5eaf65af5cb694d2082c7", + "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", "type": "github" }, "original": { @@ -210,6 +211,24 @@ } }, "flake-utils_3": { + "inputs": { + "systems": "systems_3" + }, + "locked": { + "lastModified": 1687709756, + "narHash": "sha256-Y5wKlQSkgEK2weWdOu4J3riRd+kV/VCgHsqLNTTWQ/0=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "dbabf0ca0c0c4bce6ea5eaf65af5cb694d2082c7", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_4": { "locked": { "lastModified": 1676283394, "narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=", @@ -224,9 +243,9 @@ "type": "github" } }, - "flake-utils_4": { + "flake-utils_5": { "inputs": { - "systems": "systems_3" + "systems": "systems_4" }, "locked": { "lastModified": 1687709756, @@ -242,9 +261,9 @@ "type": "github" } }, - "flake-utils_5": { + "flake-utils_6": { "inputs": { - "systems": "systems_4" + "systems": "systems_5" }, "locked": { "lastModified": 1701680307, @@ -263,9 +282,9 @@ "git-view": { "inputs": { "crane": "crane", - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils_3", "nixpkgs": "nixpkgs_2", - "rust-overlay": "rust-overlay_2" + "rust-overlay": "rust-overlay_3" }, "locked": { "lastModified": 1688345409, @@ -353,7 +372,7 @@ "inputs": { "crane": "crane_2", "flake-compat": "flake-compat_3", - "flake-utils": "flake-utils_4", + "flake-utils": "flake-utils_5", "icat": "icat", "nixpkgs": "nixpkgs_3", "wezterm-src": "wezterm-src" @@ -374,7 +393,7 @@ }, "neovim-flake": { "inputs": { - "flake-utils": "flake-utils_5", + "flake-utils": "flake-utils_6", "nixpkgs": [ "neovim-nightly-overlay", "nixpkgs" @@ -440,15 +459,15 @@ }, "nixpkgs": { "locked": { - "lastModified": 1708118438, - "narHash": "sha256-kk9/0nuVgA220FcqH/D2xaN6uGyHp/zoxPNUmPCMmEE=", - "owner": "NixOS", + "lastModified": 1717196966, + "narHash": "sha256-yZKhxVIKd2lsbOqYd5iDoUIwsRZFqE87smE2Vzf6Ck0=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "5863c27340ba4de8f83e7e3c023b9599c3cb3c80", + "rev": "57610d2f8f0937f39dbd72251e9614b1561942d8", "type": "github" }, "original": { - "owner": "NixOS", + "owner": "nixos", "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" @@ -535,7 +554,7 @@ }, "root": { "inputs": { - "catppuccin-toolbox": "catppuccin-toolbox", + "catppuccin-whiskers": "catppuccin-whiskers", "git-view": "git-view", "home-manager": "home-manager", "nekowinston-nur": "nekowinston-nur", @@ -546,6 +565,28 @@ } }, "rust-overlay": { + "inputs": { + "flake-utils": "flake-utils", + "nixpkgs": [ + "catppuccin-whiskers", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1717442957, + "narHash": "sha256-w0fqHofxM2hf3pGDXCPSdH0A09v6FgHm6I38nCWA96k=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "025e1742de4fa75b3fb63818bd9726d17da6a102", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, + "rust-overlay_2": { "inputs": { "flake-utils": [ "git-view", @@ -572,7 +613,7 @@ "type": "github" } }, - "rust-overlay_2": { + "rust-overlay_3": { "inputs": { "flake-utils": [ "git-view", @@ -597,7 +638,7 @@ "type": "github" } }, - "rust-overlay_3": { + "rust-overlay_4": { "inputs": { "flake-utils": [ "nekowinston-nur", @@ -684,6 +725,21 @@ "type": "github" } }, + "systems_5": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "wezterm-src": { "flake": false, "locked": { diff --git a/flake.nix b/flake.nix index ca66ac6..b2a141b 100644 --- a/flake.nix +++ b/flake.nix @@ -14,17 +14,19 @@ git-view.url = "github:sgoudham/git-view/v1.0.0"; neovim-nightly-overlay.url = "github:nix-community/neovim-nightly-overlay"; - catppuccin-toolbox.url = "github:catppuccin/toolbox"; + catppuccin-whiskers.url = "github:catppuccin/whiskers"; }; nixConfig = { extra-substituters = [ "https://nekowinston.cachix.org" "https://nix-community.cachix.org" + "https://catppuccin.cachix.org" ]; extra-trusted-public-keys = [ "nekowinston.cachix.org-1:lucpmaO+JwtoZj16HCO1p1fOv68s/RL1gumpVzRHRDs=" "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" + "catppuccin.cachix.org-1:noG/4HkbhJb+lUAdKrph6LaozJvAeEEZj4N732IysmU=" ]; extra-trusted-users = ["@wheel"]; warn-dirty = false; @@ -38,14 +40,14 @@ nix-index-database, neovim-nightly-overlay, git-view, - catppuccin-toolbox, + catppuccin-whiskers, ... }: let system = "x86_64-linux"; pkgs = nixpkgs.legacyPackages.${system}; overlays = final: prev: { git-view = git-view.packages.${system}.default; - whiskers = catppuccin-toolbox.packages.${pkgs.system}.whiskers; + whiskers = catppuccin-whiskers.packages.${pkgs.system}.default; nur = import nur { nurpkgs = prev; pkgs = prev;