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

get rid of mkSource

Browse source
This commit is contained in:
Sean Kovacs 2026-01-16 10:00:31 -05:00
commit dce7838b86
Signed by: sckova
GPG key ID: 00F325187C68651A
5 changed files with 13 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

17
flake.nix
View file

@ -108,13 +108,6 @@
allowUnfree = true; 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 = { mkNixosSystem = {
hostname, hostname,
system, system,
@ -142,13 +135,13 @@
niri.overlays.niri niri.overlays.niri
noctalia.overlays.default noctalia.overlays.default
nur.overlays.default nur.overlays.default
(import ./packages/overlay.nix)
(final: prev: { (final: prev: {
openmw-git = mkSource openmw; openmw-git = openmw;
catppuccin-discord-git = mkSource catppuccin-discord; catppuccin-discord-git = catppuccin-discord;
catppuccin-btop-git = mkSource catppuccin-btop; catppuccin-btop-git = catppuccin-btop;
catppuccin-mpv-git = mkSource catppuccin-mpv; catppuccin-mpv-git = catppuccin-mpv;
}) })
(import ./packages/overlay.nix)
]; ];
}; };
nix = { nix = {

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

@ -6,7 +6,7 @@
mergedConfig = pkgs.runCommand "mergedConfig" {} '' mergedConfig = pkgs.runCommand "mergedConfig" {} ''
mkdir -p $out mkdir -p $out
${pkgs.gnused}/bin/sed 's/#1e1e2e/#000000/g' \ ${pkgs.gnused}/bin/sed 's/#1e1e2e/#000000/g' \
${pkgs.catppuccin-mpv-git.src}/themes/${config.catppuccin.flavor}/${config.catppuccin.accent}.conf \ ${pkgs.catppuccin-mpv-git}/themes/${config.catppuccin.flavor}/${config.catppuccin.accent}.conf \
> $out/mpv.conf > $out/mpv.conf
''; '';
in { in {

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

@ -7,8 +7,8 @@
mkdir -p $out/themes mkdir -p $out/themes
${pkgs.gnused}/bin/sed 's/blankFlavor/${config.catppuccin.flavor}/g' \ ${pkgs.gnused}/bin/sed 's/blankFlavor/${config.catppuccin.flavor}/g' \
${./btop.conf} > $out/btop.conf ${./btop.conf} > $out/btop.conf
cp ${pkgs.catppuccin-btop-git.src}/themes/catppuccin_latte.theme $out/themes/ cp ${pkgs.catppuccin-btop-git}/themes/catppuccin_latte.theme $out/themes/
cp ${pkgs.catppuccin-btop-git.src}/themes/catppuccin_${config.catppuccin.flavor}.theme $out/themes/nixos.theme cp ${pkgs.catppuccin-btop-git}/themes/catppuccin_${config.catppuccin.flavor}.theme $out/themes/nixos.theme
''; '';
in { in {
home.file.".config/btop" = { home.file.".config/btop" = {

4
packages/catppuccin-discord/default.nix
View file

@ -10,9 +10,9 @@
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "catppuccin-discord"; pname = "catppuccin-discord";
version = "unstable-${catppuccin-discord-git.date}-${catppuccin-discord-git.version}"; version = "unstable-${catppuccin-discord-git.rev}";
src = catppuccin-discord-git.src; src = catppuccin-discord-git;
yarnOfflineCache = fetchYarnDeps { yarnOfflineCache = fetchYarnDeps {
yarnLock = "${src}/yarn.lock"; yarnLock = "${src}/yarn.lock";

5
packages/openmw/default.nix
View file

@ -3,6 +3,7 @@
openmw-git, openmw-git,
}: }:
openmw.overrideAttrs (oldAttrs: { openmw.overrideAttrs (oldAttrs: {
version = "unstable-${openmw-git.date}-${openmw-git.version}"; pname = "openmw-unstable";
src = openmw-git.src; version = "unstable-${openmw-git.rev}";
src = openmw-git;
}) })