diff --git a/_sources/generated.json b/_sources/generated.json index ffe8a10..572cf3f 100644 --- a/_sources/generated.json +++ b/_sources/generated.json @@ -39,7 +39,7 @@ }, "catppuccin-zsh-fsh": { "cargoLocks": null, - "date": "2023-07-11", + "date": "2024-03-10", "extract": null, "name": "catppuccin-zsh-fsh", "passthru": null, @@ -49,12 +49,12 @@ "fetchSubmodules": false, "leaveDotGit": false, "name": null, - "rev": "7cdab58bddafe0565f84f6eaf2d7dd109bd6fc18", - "sha256": "sha256-31lh+LpXGe7BMZBhRWvvbOTkwjOM77FPNaGy6d26hIA=", + "rev": "d2a1ba1d4aa36edfa34ed687bd84ef1e2db481b7", + "sha256": "sha256-DYWpivDyhW9ZZD2tqpQgXFz7u947mKOUvvz+RQnVslU=", "type": "git", "url": "https://github.com/catppuccin/zsh-fsh" }, - "version": "7cdab58bddafe0565f84f6eaf2d7dd109bd6fc18" + "version": "d2a1ba1d4aa36edfa34ed687bd84ef1e2db481b7" }, "nekowinston-wezterm-bar": { "cargoLocks": null, diff --git a/_sources/generated.nix b/_sources/generated.nix index 4b9cfba..1bb0412 100644 --- a/_sources/generated.nix +++ b/_sources/generated.nix @@ -29,16 +29,16 @@ }; catppuccin-zsh-fsh = { pname = "catppuccin-zsh-fsh"; - version = "7cdab58bddafe0565f84f6eaf2d7dd109bd6fc18"; + version = "d2a1ba1d4aa36edfa34ed687bd84ef1e2db481b7"; src = fetchgit { url = "https://github.com/catppuccin/zsh-fsh"; - rev = "7cdab58bddafe0565f84f6eaf2d7dd109bd6fc18"; + rev = "d2a1ba1d4aa36edfa34ed687bd84ef1e2db481b7"; fetchSubmodules = false; deepClone = false; leaveDotGit = false; - sha256 = "sha256-31lh+LpXGe7BMZBhRWvvbOTkwjOM77FPNaGy6d26hIA="; + sha256 = "sha256-DYWpivDyhW9ZZD2tqpQgXFz7u947mKOUvvz+RQnVslU="; }; - date = "2023-07-11"; + date = "2024-03-10"; }; nekowinston-wezterm-bar = { pname = "nekowinston-wezterm-bar"; diff --git a/flake.lock b/flake.lock index 747902e..aca1128 100644 --- a/flake.lock +++ b/flake.lock @@ -207,6 +207,26 @@ "type": "github" } }, + "nix-deno": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1706786668, + "narHash": "sha256-MDbSYWjitdx9Cqyzc0JPLWDvIeX109i4VZPwdkWAyHY=", + "owner": "nekowinston", + "repo": "nix-deno", + "rev": "a5664f47572c365e8ef31d8b3a6c8abfe88648ce", + "type": "github" + }, + "original": { + "owner": "nekowinston", + "repo": "nix-deno", + "type": "github" + } + }, "nix-index-database": { "inputs": { "nixpkgs": [ @@ -336,6 +356,7 @@ "flake-utils": "flake-utils", "home-manager": "home-manager", "nekowinston-nur": "nekowinston-nur", + "nix-deno": "nix-deno", "nix-index-database": "nix-index-database", "nix-vscode-extensions": "nix-vscode-extensions", "nixpkgs": "nixpkgs_2", diff --git a/flake.nix b/flake.nix index 0a44fe1..16d637c 100644 --- a/flake.nix +++ b/flake.nix @@ -127,6 +127,10 @@ inputs.nixpkgs.follows = "nixpkgs"; }; nekowinston-nur.url = "github:nekowinston/nur"; + nix-deno = { + url = "github:nekowinston/nix-deno"; + inputs.nixpkgs.follows = "nixpkgs"; + }; catppuccin-vsc = { url = "github:catppuccin/vscode"; inputs.nixpkgs.follows = "nixpkgs"; diff --git a/home/apps/zsh.nix b/home/apps/zsh.nix index fc84228..a3dc358 100644 --- a/home/apps/zsh.nix +++ b/home/apps/zsh.nix @@ -10,6 +10,46 @@ inherit (plugin) file src; }) plugins); + overrides = { + mocha = { + rosewater = "#ece3e1"; + flamingo = "#e1d2d2"; + pink = "#ddccd8"; + mauve = "#bbb2c9"; + red = "#c4a2aa"; + maroon = "#cbadb1"; + peach = "#d5beb4"; + yellow = "#ece3d3"; + green = "#b9ddb6"; + teal = "#badad4"; + sky = "#b8d4db"; + sapphire = "#a9c0ce"; + blue = "#aab3c7"; + lavender = "#bfc1d2"; + text = "#d3d6e1"; + subtext1 = "#bec2d2"; + subtext0 = "#a8adc3"; + overlay2 = "#9299b4"; + overlay1 = "#7c84a5"; + overlay0 = "#686f94"; + surface2 = "#555a7b"; + surface1 = "#434664"; + surface0 = "#30314b"; + base = "#101010"; + mantle = "#090909"; + crust = "#080808"; + }; + }; + ctpZshFsh = pkgs.denoPlatform.mkDenoDerivation { + inherit (srcs.catppuccin-zsh-fsh) pname version src; + buildPhase = '' + deno run -A ./build.ts --overrides '${builtins.toJSON overrides}' + ''; + installPhase = '' + mkdir -p $out + cp ./themes/* $out/ + ''; + }; in { programs = { atuin = { @@ -184,5 +224,5 @@ in { }; }; - xdg.configFile."fsh".source = "${srcs.catppuccin-zsh-fsh.src}/themes"; + xdg.configFile."fsh".source = "${ctpZshFsh}"; } diff --git a/nvfetcher.toml b/nvfetcher.toml index a3510b9..a546395 100644 --- a/nvfetcher.toml +++ b/nvfetcher.toml @@ -8,6 +8,7 @@ fetch.git = "https://github.com/catppuccin/wezterm" [catppuccin-zsh-fsh] src.git = "https://github.com/catppuccin/zsh-fsh" +src.branch = "build/deno-builder" fetch.git = "https://github.com/catppuccin/zsh-fsh" [nekowinston-wezterm-bar] diff --git a/pkgs/overlays.nix b/pkgs/overlays.nix index 07307e3..ebabcf9 100644 --- a/pkgs/overlays.nix +++ b/pkgs/overlays.nix @@ -1,5 +1,6 @@ {inputs}: [ inputs.catppuccin-vsc.overlays.default + inputs.nix-deno.overlays.default inputs.nix-vscode-extensions.overlays.default (final: prev: let srcs = prev.callPackages ../_sources/generated.nix {};