diff --git a/flake.lock b/flake.lock index efcfd78..8c61d39 100644 --- a/flake.lock +++ b/flake.lock @@ -364,6 +364,144 @@ "type": "github" } }, + "bblauncher-src": { + "flake": false, + "locked": { + "lastModified": 1775601719, + "narHash": "sha256-L3G2DxchadDitZ2d9xE/Q60g9kGyDZjbwcYKth1e/Ww=", + "ref": "refs/tags/Release15.01", + "rev": "612aeb0bafcb93028737b156d7a488bff611e400", + "revCount": 493, + "submodules": true, + "type": "git", + "url": "https://github.com/rainmakerv3/BB_Launcher" + }, + "original": { + "ref": "refs/tags/Release15.01", + "submodules": true, + "type": "git", + "url": "https://github.com/rainmakerv3/BB_Launcher" + } + }, + "catppuccin-bat": { + "flake": false, + "locked": { + "lastModified": 1710456315, + "narHash": "sha256-POoW2sEM6jiymbb+W/9DKIjDM1Buu1HAmrNP0yC2JPg=", + "owner": "catppuccin", + "repo": "bat", + "rev": "b19bea35a85a32294ac4732cad5b0dc6495bed32", + "type": "github" + }, + "original": { + "owner": "catppuccin", + "repo": "bat", + "rev": "b19bea35a85a32294ac4732cad5b0dc6495bed32", + "type": "github" + } + }, + "catppuccin-fish": { + "flake": false, + "locked": { + "lastModified": 1698929621, + "narHash": "sha256-Dc/zdxfzAUM5NX8PxzfljRbYvO9f9syuLO8yBr+R3qg=", + "owner": "catppuccin", + "repo": "fish", + "rev": "0ce27b518e8ead555dec34dd8be3df5bd75cff8e", + "type": "github" + }, + "original": { + "owner": "catppuccin", + "repo": "fish", + "rev": "0ce27b518e8ead555dec34dd8be3df5bd75cff8e", + "type": "github" + } + }, + "catppuccin-hyprland": { + "flake": false, + "locked": { + "lastModified": 1702668781, + "narHash": "sha256-9BhZq9J1LmHfAPBqOr64chiAEzS+YV6zqe9ma95V3no=", + "owner": "catppuccin", + "repo": "hyprland", + "rev": "fc228737d3d0c12e34a7fa155a0fc3192e5e4017", + "type": "github" + }, + "original": { + "owner": "catppuccin", + "repo": "hyprland", + "rev": "fc228737d3d0c12e34a7fa155a0fc3192e5e4017", + "type": "github" + } + }, + "catppuccin-newsboat": { + "flake": false, + "locked": { + "lastModified": 1666070943, + "narHash": "sha256-czvR3bVZ0NfBmuu0JixalS7B1vf1uEGSTSUVVTclKxI=", + "owner": "catppuccin", + "repo": "newsboat", + "rev": "be3d0ee1ba0fc26baf7a47c2aa7032b7541deb0f", + "type": "github" + }, + "original": { + "owner": "catppuccin", + "repo": "newsboat", + "rev": "be3d0ee1ba0fc26baf7a47c2aa7032b7541deb0f", + "type": "github" + } + }, + "catppuccin-starship": { + "flake": false, + "locked": { + "lastModified": 1689246850, + "narHash": "sha256-nsRuxQFKbQkyEI4TXgvAjcroVdG+heKX5Pauq/4Ota0=", + "owner": "catppuccin", + "repo": "starship", + "rev": "5629d2356f62a9f2f8efad3ff37476c19969bd4f", + "type": "github" + }, + "original": { + "owner": "catppuccin", + "repo": "starship", + "rev": "5629d2356f62a9f2f8efad3ff37476c19969bd4f", + "type": "github" + } + }, + "catppuccin-waybar": { + "flake": false, + "locked": { + "lastModified": 1662347643, + "narHash": "sha256-vfwfBE3iqIN1cGoItSssR7h0z6tuJAhNarkziGFlNBw=", + "owner": "catppuccin", + "repo": "waybar", + "rev": "55068360899193d0acf0ca0c30d0e6184dfb74a1", + "type": "github" + }, + "original": { + "owner": "catppuccin", + "ref": "v1.0", + "repo": "waybar", + "type": "github" + } + }, + "catppuccin-yazi": { + "flake": false, + "locked": { + "lastModified": 1754506012, + "narHash": "sha256-zkL46h1+U9ThD4xXkv1uuddrlQviEQD3wNZFRgv7M8Y=", + "owner": "catppuccin", + "repo": "yazi", + "rev": "043ffae14e7f7fcc136636d5f2c617b5bc2f5e31", + "type": "github" + }, + "original": { + "owner": "catppuccin", + "repo": "yazi", + "rev": "043ffae14e7f7fcc136636d5f2c617b5bc2f5e31", + "type": "github" + } + }, "cinny": { "flake": false, "locked": { @@ -381,6 +519,23 @@ "type": "github" } }, + "codex-src": { + "flake": false, + "locked": { + "lastModified": 1776282225, + "narHash": "sha256-wjiUMox9V5tFggNgaFyHXWhRlpPerK7W+U/eR2Ddbbc=", + "owner": "openai", + "repo": "codex", + "rev": "d65ed92a5e440972626965d0af9a6345179783bc", + "type": "github" + }, + "original": { + "owner": "openai", + "ref": "rust-v0.121.0", + "repo": "codex", + "type": "github" + } + }, "crane": { "locked": { "lastModified": 1762538466, @@ -2157,6 +2312,23 @@ "type": "github" } }, + "libfprint-cs9711-src": { + "flake": false, + "locked": { + "lastModified": 1767286623, + "narHash": "sha256-JygOJ3SybXKR3CjLxLbAZDaYCl9LuQYDQfFC8Si5oaw=", + "owner": "archeYR", + "repo": "libfprint-CS9711", + "rev": "c2d163fbb06d33e80a5177815bb0b8ca2f01739f", + "type": "github" + }, + "original": { + "owner": "archeYR", + "repo": "libfprint-CS9711", + "rev": "c2d163fbb06d33e80a5177815bb0b8ca2f01739f", + "type": "github" + } + }, "lichtfeld": { "inputs": { "flake-utils": "flake-utils_10", @@ -2962,6 +3134,23 @@ "type": "github" } }, + "ollama-src": { + "flake": false, + "locked": { + "lastModified": 1775526437, + "narHash": "sha256-o9iCqdOfNMxfIyThQAOSSQZE2ZyBuyJWFr6wqvQo1A0=", + "owner": "ollama", + "repo": "ollama", + "rev": "8c8f8f3450d39735355fc6cd7f2e436c8aa42ab1", + "type": "github" + }, + "original": { + "owner": "ollama", + "ref": "v0.20.3", + "repo": "ollama", + "type": "github" + } + }, "onepassword-shell-plugins": { "inputs": { "nixpkgs": [ @@ -3036,7 +3225,16 @@ "anyrun-hyprwin": "anyrun-hyprwin", "anyrun-nixos-options": "anyrun-nixos-options", "arion": "arion", + "bblauncher-src": "bblauncher-src", + "catppuccin-bat": "catppuccin-bat", + "catppuccin-fish": "catppuccin-fish", + "catppuccin-hyprland": "catppuccin-hyprland", + "catppuccin-newsboat": "catppuccin-newsboat", + "catppuccin-starship": "catppuccin-starship", + "catppuccin-waybar": "catppuccin-waybar", + "catppuccin-yazi": "catppuccin-yazi", "cinny": "cinny", + "codex-src": "codex-src", "crates-io-index": "crates-io-index", "crates-nix": "crates-nix", "d2": "d2", @@ -3054,6 +3252,7 @@ "iamb": "iamb", "ironbar": "ironbar", "lanzaboote": "lanzaboote", + "libfprint-cs9711-src": "libfprint-cs9711-src", "lichtfeld": "lichtfeld", "music-player": "music-player", "musnix": "musnix", @@ -3069,12 +3268,18 @@ "nixvim": "nixvim", "nno": "nno", "nur": "nur", + "ollama-src": "ollama-src", "onepassword-shell-plugins": "onepassword-shell-plugins", "servius-website": "servius-website", + "shadps4-diegolix29-src": "shadps4-diegolix29-src", + "shadps4-prerelease-src": "shadps4-prerelease-src", + "shadps4-src": "shadps4-src", + "shitpost-src": "shitpost-src", "sops-nix": "sops-nix", "stylix": "stylix", "tangled-core": "tangled-core", "tmux-float": "tmux-float", + "tmux-super-fingers-src": "tmux-super-fingers-src", "tree-sitter-d2": "tree-sitter-d2", "tree-sitter-just": "tree-sitter-just", "tree-sitter-nu": "tree-sitter-nu", @@ -3374,6 +3579,82 @@ "url": "https://git.darksailor.dev/servius/servius.neocities.org" } }, + "shadps4-diegolix29-src": { + "flake": false, + "locked": { + "lastModified": 1777104482, + "narHash": "sha256-p9ojy1bymNEDJMjETtagK4NFH3YoxfjL3A9/AWxe8sI=", + "ref": "main", + "rev": "6e87e74924cf61b55bef8c96d09513cb3ae23625", + "revCount": 6068, + "submodules": true, + "type": "git", + "url": "https://github.com/diegolix29/shadPS4" + }, + "original": { + "ref": "main", + "rev": "6e87e74924cf61b55bef8c96d09513cb3ae23625", + "submodules": true, + "type": "git", + "url": "https://github.com/diegolix29/shadPS4" + } + }, + "shadps4-prerelease-src": { + "flake": false, + "locked": { + "lastModified": 1777150620, + "narHash": "sha256-XvKatA1t7HiYAelYljfz3oVxNXsISw+ltkxlpcD6siI=", + "ref": "main", + "rev": "a762f70df3fc23185540f88724b261b065e5d979", + "revCount": 3855, + "submodules": true, + "type": "git", + "url": "https://github.com/shadps4-emu/shadPS4" + }, + "original": { + "ref": "main", + "rev": "a762f70df3fc23185540f88724b261b065e5d979", + "submodules": true, + "type": "git", + "url": "https://github.com/shadps4-emu/shadPS4" + } + }, + "shadps4-src": { + "flake": false, + "locked": { + "lastModified": 1773732142, + "narHash": "sha256-0s5I3yYjuKD7KoYY2UJHx45kIv9pHuy6ids5iTNc5ks=", + "ref": "refs/tags/v.0.15.0", + "rev": "4d62930075925f5ff7c1d0d9db015e2b0b588397", + "revCount": 3726, + "submodules": true, + "type": "git", + "url": "https://github.com/shadps4-emu/shadPS4" + }, + "original": { + "ref": "refs/tags/v.0.15.0", + "submodules": true, + "type": "git", + "url": "https://github.com/shadps4-emu/shadPS4" + } + }, + "shitpost-src": { + "flake": false, + "locked": { + "lastModified": 1763839570, + "narHash": "sha256-EVis06rmHq1jJK0FVsbgi7TOru7GtEUpbx0PjU2AKEo=", + "ref": "refs/heads/master", + "rev": "68d972f68cab8f68916b94df05b7ab6a7da4a1da", + "revCount": 1, + "type": "git", + "url": "https://git.darksailor.dev/servius/adarkdayinmylife.public" + }, + "original": { + "rev": "68d972f68cab8f68916b94df05b7ab6a7da4a1da", + "type": "git", + "url": "https://git.darksailor.dev/servius/adarkdayinmylife.public" + } + }, "sops-nix": { "inputs": { "nixpkgs": [ @@ -3966,6 +4247,23 @@ "type": "github" } }, + "tmux-super-fingers-src": { + "flake": false, + "locked": { + "lastModified": 1696324843, + "narHash": "sha256-iKfx9Ytk2vSuINvQTB6Kww8Vv7i51cFEnEBHLje+IJw=", + "owner": "artemave", + "repo": "tmux_super_fingers", + "rev": "518044ef78efa1cf3c64f2e693fef569ae570ddd", + "type": "github" + }, + "original": { + "owner": "artemave", + "repo": "tmux_super_fingers", + "rev": "518044ef78efa1cf3c64f2e693fef569ae570ddd", + "type": "github" + } + }, "tree-sitter-d2": { "flake": false, "locked": { diff --git a/flake.nix b/flake.nix index 3a6bd5c..79cce2b 100644 --- a/flake.nix +++ b/flake.nix @@ -189,6 +189,73 @@ url = "github:uttarayan21/lichtfeld-nix"; inputs.nixpkgs.follows = "nixpkgs"; }; + + # Pinned source inputs (replace fetchFromGitHub/fetchgit). Update with `nix flake update `. + bblauncher-src = { + url = "git+https://github.com/rainmakerv3/BB_Launcher?ref=refs/tags/Release15.01&submodules=1"; + flake = false; + }; + shadps4-src = { + url = "git+https://github.com/shadps4-emu/shadPS4?ref=refs/tags/v.0.15.0&submodules=1"; + flake = false; + }; + shadps4-prerelease-src = { + # Original tag: Pre-release-shadPS4-2026-04-25-a762f70 (auto-deleted upstream — pin commit SHA) + url = "git+https://github.com/shadps4-emu/shadPS4?ref=main&rev=a762f70df3fc23185540f88724b261b065e5d979&submodules=1"; + flake = false; + }; + shadps4-diegolix29-src = { + url = "git+https://github.com/diegolix29/shadPS4?ref=main&rev=6e87e74924cf61b55bef8c96d09513cb3ae23625&submodules=1"; + flake = false; + }; + codex-src = { + url = "github:openai/codex/rust-v0.121.0"; + flake = false; + }; + ollama-src = { + url = "github:ollama/ollama/v0.20.3"; + flake = false; + }; + tmux-super-fingers-src = { + url = "github:artemave/tmux_super_fingers/518044ef78efa1cf3c64f2e693fef569ae570ddd"; + flake = false; + }; + libfprint-cs9711-src = { + url = "github:archeYR/libfprint-CS9711/c2d163fbb06d33e80a5177815bb0b8ca2f01739f"; + flake = false; + }; + catppuccin-bat = { + url = "github:catppuccin/bat/b19bea35a85a32294ac4732cad5b0dc6495bed32"; + flake = false; + }; + catppuccin-hyprland = { + url = "github:catppuccin/hyprland/fc228737d3d0c12e34a7fa155a0fc3192e5e4017"; + flake = false; + }; + catppuccin-starship = { + url = "github:catppuccin/starship/5629d2356f62a9f2f8efad3ff37476c19969bd4f"; + flake = false; + }; + catppuccin-fish = { + url = "github:catppuccin/fish/0ce27b518e8ead555dec34dd8be3df5bd75cff8e"; + flake = false; + }; + catppuccin-waybar = { + url = "github:catppuccin/waybar/v1.0"; + flake = false; + }; + catppuccin-newsboat = { + url = "github:catppuccin/newsboat/be3d0ee1ba0fc26baf7a47c2aa7032b7541deb0f"; + flake = false; + }; + catppuccin-yazi = { + url = "github:catppuccin/yazi/043ffae14e7f7fcc136636d5f2c617b5bc2f5e31"; + flake = false; + }; + shitpost-src = { + url = "git+https://git.darksailor.dev/servius/adarkdayinmylife.public?rev=68d972f68cab8f68916b94df05b7ab6a7da4a1da"; + flake = false; + }; # nix-proton-cachyos = { # url = "github:uttarayan21/nix-proton-cachyos"; # inputs.nixpkgs.follows = "nixpkgs"; diff --git a/home/services/ironbar/default.nix b/home/services/ironbar/default.nix index e590e6a..05a3d49 100644 --- a/home/services/ironbar/default.nix +++ b/home/services/ironbar/default.nix @@ -98,13 +98,7 @@ }; }; style = let - catppuccin = pkgs.fetchFromGitHub { - owner = "catppuccin"; - repo = "waybar"; - rev = "v1.0"; - sha256 = "sha256-vfwfBE3iqIN1cGoItSssR7h0z6tuJAhNarkziGFlNBw"; - }; - mocha = builtins.readFile "${catppuccin}/mocha.css"; + mocha = builtins.readFile "${inputs.catppuccin-waybar}/mocha.css"; in mocha + builtins.readFile ./ironbar.css; }; diff --git a/nixos/tako/services/shitpost.nix b/nixos/tako/services/shitpost.nix index cb29ad0..383b36d 100644 --- a/nixos/tako/services/shitpost.nix +++ b/nixos/tako/services/shitpost.nix @@ -1,13 +1,6 @@ -{pkgs, ...}: let - src = pkgs.fetchgit { - url = "https://git.darksailor.dev/servius/adarkdayinmylife.public"; - # repo = "adarkdayinmy.life"; - rev = "68d972f68cab8f68916b94df05b7ab6a7da4a1da"; - sha256 = "sha256-EVis06rmHq1jJK0FVsbgi7TOru7GtEUpbx0PjU2AKEo="; - }; -in { +{inputs, ...}: { services.caddy.virtualHosts."adarkdayinmy.life".extraConfig = '' - root * ${src}/ + root * ${inputs.shitpost-src}/ file_server ''; } diff --git a/overlays/ai.nix b/overlays/ai.nix index 3254dcd..58c0955 100644 --- a/overlays/ai.nix +++ b/overlays/ai.nix @@ -1,20 +1,15 @@ -{...}: final: prev: let +{inputs, ...}: final: prev: let # Upstream v0.20.3 dropped the /bin/{mkdir,cat,chmod} string literals from # cmd/launch/{openclaw,hermes}_test.go, so nixpkgs' postPatch --replace-fail # blows up. Override postPatch to only run the version bump + rm -r app. - ollamaOverride = oldAttrs: rec { + ollamaOverride = oldAttrs: { version = "0.20.3"; - src = final.fetchFromGitHub { - owner = "ollama"; - repo = "ollama"; - tag = "v${version}"; - hash = "sha256-o9iCqdOfNMxfIyThQAOSSQZE2ZyBuyJWFr6wqvQo1A0="; - }; + src = inputs.ollama-src; vendorHash = "sha256-Lc1Ktdqtv2VhJQssk8K1UOimeEjVNvDWePE9WkamCos="; postPatch = '' substituteInPlace version/version.go \ - --replace-fail 0.0.0 '${version}' + --replace-fail 0.0.0 '0.20.3' rm -r app '' + final.lib.optionalString final.stdenv.hostPlatform.isDarwin '' @@ -25,13 +20,8 @@ in { codex = prev.codex.overrideAttrs (oldAttrs: rec { version = "0.121.0"; - src = final.fetchFromGitHub { - owner = "openai"; - repo = "codex"; - tag = "rust-v${version}"; - hash = "sha256-wjiUMox9V5tFggNgaFyHXWhRlpPerK7W+U/eR2Ddbbc="; - }; - sourceRoot = "${src.name}/codex-rs"; + src = inputs.codex-src; + sourceRoot = "source/codex-rs"; cargoDeps = final.rustPlatform.fetchCargoVendor { inherit src sourceRoot; name = "${oldAttrs.pname}-${version}-vendor.tar.gz"; diff --git a/overlays/gaming.nix b/overlays/gaming.nix index d303932..bc0adc4 100644 --- a/overlays/gaming.nix +++ b/overlays/gaming.nix @@ -1,14 +1,11 @@ -{...}: final: prev: { +{inputs, ...}: final: prev: let + # Format flake input lastModifiedDate ("YYYYMMDDHHMMSS") as ISO-8601 UTC. + isoDate = d: "${builtins.substring 0 4 d}-${builtins.substring 4 2 d}-${builtins.substring 6 2 d}T${builtins.substring 8 2 d}:${builtins.substring 10 2 d}:${builtins.substring 12 2 d}Z"; +in { bblauncher = final.stdenv.mkDerivation { pname = "BBLauncher"; version = "15.01"; - src = final.fetchFromGitHub { - owner = "rainmakerv3"; - repo = "BB_Launcher"; - rev = "Release15.01"; - sha256 = "sha256-L3G2DxchadDitZ2d9xE/Q60g9kGyDZjbwcYKth1e/Ww="; - fetchSubmodules = true; - }; + src = inputs.bblauncher-src; nativeBuildInputs = [ final.cmake final.pkg-config @@ -50,22 +47,15 @@ ]; }; - shadps4 = prev.shadps4.overrideAttrs (oldAttrs: rec { + shadps4 = prev.shadps4.overrideAttrs (oldAttrs: { version = "0.15.0"; - src = final.fetchFromGitHub { - owner = "shadps4-emu"; - repo = "shadPS4"; - tag = "v.${version}"; - hash = "sha256-ZYY8PlHEz6jj000Lrllqsk4Da6/CnNdSQHx1+89+yZM="; - fetchSubmodules = true; - leaveDotGit = true; - postFetch = '' - cd "$out" - git rev-parse --short=8 HEAD > $out/COMMIT - date -u -d "@$(git log -1 --pretty=%ct)" "+%Y-%m-%dT%H:%M:%SZ" > $out/SOURCE_DATE_EPOCH - find "$out" -name .git -print0 | xargs -0 rm -rf + src = inputs.shadps4-src; + postPatch = + (oldAttrs.postPatch or "") + + '' + echo "${builtins.substring 0 8 inputs.shadps4-src.rev}" > COMMIT + echo "${isoDate inputs.shadps4-src.lastModifiedDate}" > SOURCE_DATE_EPOCH ''; - }; buildInputs = with final; [ alsa-lib boost @@ -135,13 +125,7 @@ shadps4-prerelease = final.shadps4.overrideAttrs (oldAttrs: { version = "prerelease-2026-04-24"; - src = final.fetchFromGitHub { - owner = "shadps4-emu"; - repo = "shadPS4"; - rev = "Pre-release-shadPS4-2026-04-25-a762f70"; - hash = "sha256-NLnQ6LB6ar15WsG2wpqWoQm8TpRh4WwHZrVDComn6Nk="; - fetchSubmodules = true; - }; + src = inputs.shadps4-prerelease-src; patches = (oldAttrs.patches or []) ++ [ @@ -161,13 +145,7 @@ shadps4-diegolix29 = final.shadps4.overrideAttrs (oldAttrs: { version = "diegolix29-2026-04-25"; - src = final.fetchFromGitHub { - owner = "diegolix29"; - repo = "shadPS4"; - rev = "6e87e74924cf61b55bef8c96d09513cb3ae23625"; - hash = "sha256-E8/gzD1QeqK/xcbueK0Jox549ZRYNbTrZUwjfCU1qPI="; - fetchSubmodules = true; - }; + src = inputs.shadps4-diegolix29-src; patches = (oldAttrs.patches or []) ++ [ diff --git a/overlays/system-libs.nix b/overlays/system-libs.nix index 6245959..9e79b6a 100644 --- a/overlays/system-libs.nix +++ b/overlays/system-libs.nix @@ -1,4 +1,4 @@ -{...}: final: prev: { +{inputs, ...}: final: prev: { # openldap's test017-syncreplication-refresh is timing-sensitive and flakes on # the loaded gitea-runner host. Skip the upstream test suite — the library is fine. openldap = prev.openldap.overrideAttrs (_: { @@ -8,12 +8,7 @@ # https://github.com/archeYR/libfprint-CS9711/commits/cs9711-rebase/ libfprint = prev.libfprint.overrideAttrs (oldAttrs: { version = "git"; - src = final.fetchFromGitHub { - owner = "archeYR"; - repo = "libfprint-CS9711"; - rev = "c2d163fbb06d33e80a5177815bb0b8ca2f01739f"; - sha256 = "sha256-JygOJ3SybXKR3CjLxLbAZDaYCl9LuQYDQfFC8Si5oaw"; - }; + src = inputs.libfprint-cs9711-src; buildInputs = oldAttrs.buildInputs ++ [final.nss_latest]; nativeBuildInputs = oldAttrs.nativeBuildInputs diff --git a/overlays/terminal.nix b/overlays/terminal.nix index 57eb809..2e1967a 100644 --- a/overlays/terminal.nix +++ b/overlays/terminal.nix @@ -5,12 +5,7 @@ tmux-super-fingers = final.pkgs.tmuxPlugins.mkTmuxPlugin { pluginName = "tmux-super-fingers"; version = "v1-2024-02-14"; - src = final.pkgs.fetchFromGitHub { - owner = "artemave"; - repo = "tmux_super_fingers"; - rev = "518044ef78efa1cf3c64f2e693fef569ae570ddd"; - sha256 = "sha256-iKfx9Ytk2vSuINvQTB6Kww8Vv7i51cFEnEBHLje+IJw="; - }; + src = inputs.tmux-super-fingers-src; }; }; tmux-float = inputs.tmux-float.packages.${prev.stdenv.hostPlatform.system}.default; diff --git a/overlays/themes.nix b/overlays/themes.nix index 3806a21..3e9cd05 100644 --- a/overlays/themes.nix +++ b/overlays/themes.nix @@ -1,5 +1,8 @@ {inputs, ...}: final: prev: { - catppuccinThemes = import ../themes/catppuccin.nix {pkgs = final.pkgs;}; + catppuccinThemes = import ../themes/catppuccin.nix { + inherit inputs; + pkgs = final.pkgs; + }; nix-index-database = final.runCommandLocal "nix-index-database" {} '' mkdir -p $out ln -s ${inputs.nix-index-database.legacyPackages.${prev.stdenv.hostPlatform.system}.database} $out/files diff --git a/themes/catppuccin.nix b/themes/catppuccin.nix index aa527c7..d252822 100644 --- a/themes/catppuccin.nix +++ b/themes/catppuccin.nix @@ -1,75 +1,58 @@ -{pkgs, ...}: let +{ + pkgs, + inputs, + ... +}: let mkCatppuccin = { - owner ? "catppuccin", - version ? "0.0.1", item, - rev ? "main", - sha256 ? pkgs.lib.fakeSha256, + src, + version ? "0.0.1", override ? null, }: pkgs.stdenv.mkDerivation { - inherit version override; + inherit version override src; pname = item; - # TODO: Move to subflake - # NOTE: It might not make sense to move this to subflake - src = pkgs.fetchFromGitHub { - inherit owner rev sha256; - repo = item; - }; buildPhase = '' echo "Building Cattppucin for ${item}..." mkdir -p $out cp -r ./* $out/ ''; }; - - flavors = ["latte" "frappe" "macchiato" "mocha"]; - mapFlavor = flavorMap: - (flavor: { - name = flavor; - value = flavorMap flavor; - }) - flavors; in { bat = mkCatppuccin { item = "bat"; - rev = "b19bea35a85a32294ac4732cad5b0dc6495bed32"; - sha256 = "sha256-POoW2sEM6jiymbb+W/9DKIjDM1Buu1HAmrNP0yC2JPg"; + src = inputs.catppuccin-bat; }; hyprland = mkCatppuccin { item = "hyprland"; - rev = "fc228737d3d0c12e34a7fa155a0fc3192e5e4017"; - sha256 = "sha256-9BhZq9J1LmHfAPBqOr64chiAEzS+YV6zqe9ma95V3no"; + src = inputs.catppuccin-hyprland; }; starship = mkCatppuccin { item = "starship"; - rev = "5629d2356f62a9f2f8efad3ff37476c19969bd4f"; - sha256 = "sha256-nsRuxQFKbQkyEI4TXgvAjcroVdG+heKX5Pauq/4Ota0"; + src = inputs.catppuccin-starship; }; fish = mkCatppuccin { item = "fish"; - rev = "0ce27b518e8ead555dec34dd8be3df5bd75cff8e"; - sha256 = "sha256-Dc/zdxfzAUM5NX8PxzfljRbYvO9f9syuLO8yBr+R3qg"; + src = inputs.catppuccin-fish; }; ironbar = mkCatppuccin { item = "waybar"; - rev = "v1.0"; - sha256 = "sha256-vfwfBE3iqIN1cGoItSssR7h0z6tuJAhNarkziGFlNBw"; + src = inputs.catppuccin-waybar; }; + newsboat = mkCatppuccin { item = "newsboat"; - rev = "be3d0ee1ba0fc26baf7a47c2aa7032b7541deb0f"; - sha256 = "sha256-czvR3bVZ0NfBmuu0JixalS7B1vf1uEGSTSUVVTclKxI"; + src = inputs.catppuccin-newsboat; }; + # https://github.com/catppuccin/yazi yazi = mkCatppuccin { item = "yazi"; - rev = "043ffae14e7f7fcc136636d5f2c617b5bc2f5e31"; - sha256 = "sha256-zkL46h1+U9ThD4xXkv1uuddrlQviEQD3wNZFRgv7M8Y="; + src = inputs.catppuccin-yazi; }; gtk = pkgs.catppuccin-gtk.override {