Reformat everything
All checks were successful
/ test (push) Successful in 32s

This commit is contained in:
Andrea Ciceri 2024-09-20 11:37:17 +02:00
parent 5f644d0ccd
commit a394b9cefd
Signed by: aciceri
SSH key fingerprint: SHA256:/AagBweyV4Hlfg9u092n8hbHwD5fcB6A3qhDiDA65Rg
167 changed files with 2795 additions and 2122 deletions

View file

@ -4,16 +4,18 @@
config,
self,
...
}: {
}:
{
options.fleet = {
overlays = let
overlayType = lib.mkOptionType {
name = "nixpkgs-overlay";
description = "nixpkgs overlay";
check = lib.isFunction;
merge = lib.mergeOneOption;
};
in
overlays =
let
overlayType = lib.mkOptionType {
name = "nixpkgs-overlay";
description = "nixpkgs overlay";
check = lib.isFunction;
merge = lib.mergeOneOption;
};
in
lib.mkOption {
description = "Nixpkgs overlays to apply at flake level (not in hosts)";
type = lib.types.listOf overlayType;
@ -30,27 +32,25 @@
description = "Packages that are broken on a given system";
type = lib.types.attrsOf (lib.types.listOf lib.types.str);
default = {
aarch64-linux = ["llm-workflow-engine"];
x86_64-linux = [];
aarch64-linux = [ "llm-workflow-engine" ];
x86_64-linux = [ ];
};
};
};
config.perSystem = {
system,
lib,
pkgs,
...
}: {
_module.args.pkgs =
lib.foldl
(legacyPackages: legacyPackages.extend)
inputs.nixpkgs.legacyPackages.${system}
config.fleet.overlays;
config.perSystem =
{
system,
lib,
pkgs,
...
}:
{
_module.args.pkgs = lib.foldl (
legacyPackages: legacyPackages.extend
) inputs.nixpkgs.legacyPackages.${system} config.fleet.overlays;
packages =
builtins.removeAttrs
(lib.mapAttrs'
packages = builtins.removeAttrs (lib.mapAttrs'
(name: value: {
inherit name;
value = pkgs.callPackage "${self}/packages/${name}" {
@ -60,9 +60,7 @@
packagePath = "packages/${name}";
};
})
(lib.filterAttrs
(_: type: type == "directory")
(builtins.readDir "${self}/packages")))
config.fleet.brokenPackages.${system};
};
(lib.filterAttrs (_: type: type == "directory") (builtins.readDir "${self}/packages"))
) config.fleet.brokenPackages.${system};
};
}

View file

@ -6,5 +6,5 @@
writeShellApplication {
name = "deploy";
text = builtins.readFile ./deploy.sh;
runtimeInputs = [nixos-rebuild];
runtimeInputs = [ nixos-rebuild ];
}

View file

@ -8,5 +8,5 @@ writers.writePython3Bin "garmin-collector" {
prometheus-client
garminconnect
];
flakeIgnore = ["E501"];
flakeIgnore = [ "E501" ];
} (builtins.readFile ./garmin-collector.py)

View file

@ -5,60 +5,63 @@
packagePath,
fetchFromGitHub,
...
}: let
}:
let
src = fetchFromGitHub {
owner = "llm-workflow-engine";
repo = "llm-workflow-engine";
rev = "v0.18.10";
hash = "sha256-q9tCPQvGtufSL+E0h5gB0pA1CaKB9nUL1Hf5cmImZz8";
};
module = {
config,
lib,
dream2nix,
...
}: {
imports = [
dream2nix.modules.dream2nix.pip
];
name = "llm-workflow-engine";
version = "0.18.10";
paths = {
inherit projectRoot;
package = packagePath;
};
mkDerivation = {
src = src;
propagatedBuildInputs = [
config.pip.drvs.setuptools.public
module =
{
config,
lib,
dream2nix,
...
}:
{
imports = [
dream2nix.modules.dream2nix.pip
];
};
buildPythonPackage = {
format = lib.mkForce "pyproject";
pythonImportsCheck = [
"lwe"
];
catchConflicts = false;
};
name = "llm-workflow-engine";
version = "0.18.10";
pip = {
pypiSnapshotDate = "2024-04-25";
requirementsFiles = [
"${src}/requirements.txt"
];
requirementsList = [
"setuptools"
];
flattenDependencies = true;
paths = {
inherit projectRoot;
package = packagePath;
};
mkDerivation = {
src = src;
propagatedBuildInputs = [
config.pip.drvs.setuptools.public
];
};
buildPythonPackage = {
format = lib.mkForce "pyproject";
pythonImportsCheck = [
"lwe"
];
catchConflicts = false;
};
pip = {
pypiSnapshotDate = "2024-04-25";
requirementsFiles = [
"${src}/requirements.txt"
];
requirementsList = [
"setuptools"
];
flattenDependencies = true;
};
};
};
in
dream2nix.lib.evalModules {
specialArgs.dream2nix = dream2nix;
packageSets.nixpkgs = pkgs;
modules = [module];
}
dream2nix.lib.evalModules {
specialArgs.dream2nix = dream2nix;
packageSets.nixpkgs = pkgs;
modules = [ module ];
}

View file

@ -4,7 +4,8 @@
fetchFromGitHub,
zip,
unzip,
}: let
}:
let
spotify-adblock = rustPlatform.buildRustPackage {
pname = "spotify-adblock";
version = "1.0.3";
@ -33,21 +34,22 @@
'';
};
in
spotify.overrideAttrs (
old: {
buildInputs = (old.buildInputs or []) ++ [zip unzip];
postInstall =
(old.postInstall or "")
+ ''
ln -s ${spotify-adblock}/lib/libspotifyadblock.so $libdir
sed -i "s:^Name=Spotify.*:Name=Spotify-adblock:" "$out/share/spotify/spotify.desktop"
wrapProgram $out/bin/spotify \
--set LD_PRELOAD "${spotify-adblock}/lib/libspotifyadblock.so"
spotify.overrideAttrs (old: {
buildInputs = (old.buildInputs or [ ]) ++ [
zip
unzip
];
postInstall =
(old.postInstall or "")
+ ''
ln -s ${spotify-adblock}/lib/libspotifyadblock.so $libdir
sed -i "s:^Name=Spotify.*:Name=Spotify-adblock:" "$out/share/spotify/spotify.desktop"
wrapProgram $out/bin/spotify \
--set LD_PRELOAD "${spotify-adblock}/lib/libspotifyadblock.so"
# Hide placeholder for advert banner
${unzip}/bin/unzip -p $out/share/spotify/Apps/xpui.spa xpui.js | sed 's/adsEnabled:\!0/adsEnabled:false/' > $out/share/spotify/Apps/xpui.js
${zip}/bin/zip --junk-paths --update $out/share/spotify/Apps/xpui.spa $out/share/spotify/Apps/xpui.js
rm $out/share/spotify/Apps/xpui.js
'';
}
)
# Hide placeholder for advert banner
${unzip}/bin/unzip -p $out/share/spotify/Apps/xpui.spa xpui.js | sed 's/adsEnabled:\!0/adsEnabled:false/' > $out/share/spotify/Apps/xpui.js
${zip}/bin/zip --junk-paths --update $out/share/spotify/Apps/xpui.spa $out/share/spotify/Apps/xpui.js
rm $out/share/spotify/Apps/xpui.js
'';
})