sckova/nix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

move all url fetches into main flake

Browse source
This commit is contained in:
Sean Kovacs 2026-01-15 22:39:47 -05:00
commit 431ff32240
Signed by: sckova
GPG key ID: 00F325187C68651A
7 changed files with 144 additions and 72 deletions
Download patch file Download diff file Expand all files Collapse all files

51
flake.lock generated
View file

@ -73,6 +73,54 @@
"type": "github"
}
},
"catppuccin-btop": {
"flake": false,
"locked": {
"lastModified": 1727050041,
"narHash": "sha256-mEGZwScVPWGu+Vbtddc/sJ+mNdD2kKienGZVUcTSl+c=",
"owner": "catppuccin",
"repo": "btop",
"rev": "f437574b600f1c6d932627050b15ff5153b58fa3",
"type": "github"
},
"original": {
"owner": "catppuccin",
"repo": "btop",
"type": "github"
}
},
"catppuccin-discord": {
"flake": false,
"locked": {
"lastModified": 1768037813,
"narHash": "sha256-ExRNnxvG2PSGmpuaPxzCKL6GK6ETs7Gq4Roa74HXp+s=",
"owner": "catppuccin",
"repo": "discord",
"rev": "0fcfe2e15ed91f8c5f1f3c6855f3b2024f78d86c",
"type": "github"
},
"original": {
"owner": "catppuccin",
"repo": "discord",
"type": "github"
}
},
"catppuccin-mpv": {
"flake": false,
"locked": {
"lastModified": 1754544320,
"narHash": "sha256-oUheJNWk2R6gNEmkK8H6PWX0iofx2KMGDoFWtnr420A=",
"owner": "catppuccin",
"repo": "mpv",
"rev": "08e90daf511eee2c10c98f0031b51bb9de240d60",
"type": "github"
},
"original": {
"owner": "catppuccin",
"repo": "mpv",
"type": "github"
}
},
"catppuccin-palette": {
"locked": {
"lastModified": 1760672867,
@ -536,6 +584,9 @@
"inputs": {
"apple-silicon": "apple-silicon",
"catppuccin": "catppuccin",
"catppuccin-btop": "catppuccin-btop",
"catppuccin-discord": "catppuccin-discord",
"catppuccin-mpv": "catppuccin-mpv",
"catppuccin-palette": "catppuccin-palette",
"home-manager": "home-manager",
"niri": "niri",

34
flake.nix
View file

@ -61,6 +61,21 @@
url = "gitlab:OpenMW/openmw";
flake = false;
};
catppuccin-discord = {
url = "github:catppuccin/discord";
flake = false;
};
catppuccin-btop = {
url = "github:catppuccin/btop";
flake = false;
};
catppuccin-mpv = {
url = "github:catppuccin/mpv";
flake = false;
};
};
outputs = {
@ -78,6 +93,9 @@
nixvim,
apple-silicon,
openmw,
catppuccin-discord,
catppuccin-btop,
catppuccin-mpv,
...
}: let
# All systems we want to support for the generic VM
@ -90,6 +108,13 @@
allowUnfree = true;
};
# Helper to create source metadata
mkSource = src: {
inherit src;
version = src.shortRev or src.rev or "unknown";
date = src.lastModifiedDate or "unknown";
};
mkNixosSystem = {
hostname,
system,
@ -119,11 +144,10 @@
nur.overlays.default
(import ./packages/overlay.nix)
(final: prev: {
openmw-git = {
src = openmw;
version = openmw.shortRev or openmw.rev or "unknown";
date = openmw.lastModifiedDate or "unknown";
};
openmw-git = mkSource openmw;
catppuccin-discord-git = mkSource catppuccin-discord;
catppuccin-btop-git = mkSource catppuccin-btop;
catppuccin-mpv-git = mkSource catppuccin-mpv;
})
];
};

51
home/graphical/discord/default.nix
View file

@ -3,56 +3,7 @@
pkgs,
...
}: let
catppuccin-discord-src = pkgs.fetchFromGitHub {
owner = "catppuccin";
repo = "discord";
rev = "1b2dffbabf75a294a0fb9245f9f7244a853e7ada";
hash = "sha256-LdUPnnbbSwgaw37FJD2s1vPiTaISaYbtOWRxQIekQkQ=";
};
yarnOfflineCache = pkgs.fetchYarnDeps {
yarnLock = "${catppuccin-discord-src}/yarn.lock";
hash = "sha256-BhE3aKyA/LBErjWx+lbEVb/CIXhqHkXbV+9U2djIBhs=";
};
catppuccin-discord-pkg = pkgs.stdenv.mkDerivation {
pname = "catppuccin-discord";
version = "unstable";
src = catppuccin-discord-src;
nativeBuildInputs = with pkgs; [
yarn
nodejs
fixup-yarn-lock
nodePackages.sass
];
postPatch = ''
substituteInPlace package.json \
--replace-fail "--no-charset --no-source-map" ""
'';
configurePhase = ''
export HOME=$TMPDIR
yarn config --offline set yarn-offline-mirror ${yarnOfflineCache}
fixup-yarn-lock yarn.lock
yarn install --offline --frozen-lockfile --ignore-scripts --ignore-platform
'';
buildPhase = ''
yarn --offline build
yarn --offline release
'';
installPhase = ''
mkdir -p $out
find .
cp -r dist/* $out
'';
};
catppuccin-discord = "${catppuccin-discord-pkg}/dist/catppuccin-${config.catppuccin.flavor}-${config.catppuccin.accent}.theme.css";
catppuccin-discord = "${pkgs.catppuccin-discord}/share/catppuccin-discord/catppuccin-${config.catppuccin.flavor}-${config.catppuccin.accent}.theme.css";
mergedThemes = pkgs.runCommand "mergedConfig" {} ''
mkdir -p $out

9
home/graphical/mpv/default.nix
View file

@ -3,17 +3,10 @@
pkgs,
...
}: let
catppuccin-mpv = pkgs.fetchFromGitHub {
owner = "catppuccin";
repo = "mpv";
rev = "08e90daf511eee2c10c98f0031b51bb9de240d60";
sha256 = "sha256-oUheJNWk2R6gNEmkK8H6PWX0iofx2KMGDoFWtnr420A=";
};
mergedConfig = pkgs.runCommand "mergedConfig" {} ''
mkdir -p $out
${pkgs.gnused}/bin/sed 's/#1e1e2e/#000000/g' \
${catppuccin-mpv}/themes/${config.catppuccin.flavor}/${config.catppuccin.accent}.conf \
${pkgs.catppuccin-mpv-git.src}/themes/${config.catppuccin.flavor}/${config.catppuccin.accent}.conf \
> $out/mpv.conf
'';
in {

11
home/terminal/btop/default.nix
View file

@ -3,19 +3,12 @@
pkgs,
...
}: let
catppuccin-btop = pkgs.fetchFromGitHub {
owner = "catppuccin";
repo = "btop";
rev = "f437574b600f1c6d932627050b15ff5153b58fa3";
sha256 = "sha256-mEGZwScVPWGu+Vbtddc/sJ+mNdD2kKienGZVUcTSl+c=";
};
mergedConfig = pkgs.runCommand "mergedConfig" {} ''
mkdir -p $out/themes
${pkgs.gnused}/bin/sed 's/blankFlavor/${config.catppuccin.flavor}/g' \
${./btop.conf} > $out/btop.conf
cp ${catppuccin-btop}/themes/catppuccin_latte.theme $out/themes/
cp ${catppuccin-btop}/themes/catppuccin_${config.catppuccin.flavor}.theme $out/themes/nixos.theme
cp ${pkgs.catppuccin-btop-git.src}/themes/catppuccin_latte.theme $out/themes/
cp ${pkgs.catppuccin-btop-git.src}/themes/catppuccin_${config.catppuccin.flavor}.theme $out/themes/nixos.theme
'';
in {
home.file.".config/btop" = {

57
packages/catppuccin-discord/default.nix Normal file
View file

@ -0,0 +1,57 @@
{
lib,
stdenv,
fetchYarnDeps,
yarn,
nodejs,
fixup-yarn-lock,
nodePackages,
catppuccin-discord-git,
}:
stdenv.mkDerivation rec {
pname = "catppuccin-discord";
version = "unstable-${catppuccin-discord-git.date}-${catppuccin-discord-git.version}";
src = catppuccin-discord-git.src;
yarnOfflineCache = fetchYarnDeps {
yarnLock = "${src}/yarn.lock";
hash = "sha256-BhE3aKyA/LBErjWx+lbEVb/CIXhqHkXbV+9U2djIBhs=";
};
nativeBuildInputs = [
yarn
nodejs
fixup-yarn-lock
nodePackages.sass
];
postPatch = ''
substituteInPlace package.json \
--replace-fail "--no-charset --no-source-map" ""
'';
configurePhase = ''
export HOME=$TMPDIR
yarn config --offline set yarn-offline-mirror ${yarnOfflineCache}
fixup-yarn-lock yarn.lock
yarn install --offline --frozen-lockfile --ignore-scripts --ignore-platform
'';
buildPhase = ''
yarn --offline build
yarn --offline release
'';
installPhase = ''
mkdir -p $out/share/catppuccin-discord
cp -r dist/dist/* $out/share/catppuccin-discord/
'';
meta = {
description = "Soothing pastel theme for Discord";
homepage = "https://github.com/catppuccin/discord";
license = lib.licenses.mit;
platforms = lib.platforms.all;
};
}

3
packages/overlay.nix
View file

@ -1,5 +1,8 @@
final: prev: {
spotify-webapp = final.callPackage ./spotify-webapp {};
catppuccin-discord = final.callPackage ./catppuccin-discord {
inherit (final) catppuccin-discord-git;
};
openmw = final.callPackage ./openmw {
openmw = prev.openmw;
inherit (final) openmw-git;