Compare commits
No commits in common. "286211b5c51db38e230edda78ecf021c82b89fa3" and "1ae537b572b15efa8a005d8caf3420d76e1250b1" have entirely different histories.
286211b5c5
...
1ae537b572
15 changed files with 61 additions and 65 deletions
|
@ -5,7 +5,7 @@
|
||||||
}:
|
}:
|
||||||
buildApp {
|
buildApp {
|
||||||
src = ./.;
|
src = ./.;
|
||||||
npmDepsHash = "sha256-GiqSQv5yv6DVYoyc74HUPMhDkqi3mn8s8KxHOLNs/Rg=";
|
npmDepsHash = "sha256-0NadIaeU2rU6xGR8eeWpEUZHE5qbuzE99/O1HNtW0ck=";
|
||||||
|
|
||||||
runtimeInputs = [
|
runtimeInputs = [
|
||||||
ffmpeg-full
|
ffmpeg-full
|
||||||
|
|
BIN
apps/extract-subs/package-lock.json
generated
BIN
apps/extract-subs/package-lock.json
generated
Binary file not shown.
|
@ -11,14 +11,14 @@
|
||||||
"fluent-ffmpeg": "2.1.3"
|
"fluent-ffmpeg": "2.1.3"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@eslint/js": "9.16.0",
|
"@eslint/js": "9.15.0",
|
||||||
"@stylistic/eslint-plugin": "2.11.0",
|
"@stylistic/eslint-plugin": "2.11.0",
|
||||||
"@types/node": "22.10.1",
|
"@types/node": "22.9.1",
|
||||||
"esbuild": "0.24.0",
|
"esbuild": "0.24.0",
|
||||||
"eslint": "9.16.0",
|
"eslint": "9.15.0",
|
||||||
"eslint-plugin-jsdoc": "50.6.0",
|
"eslint-plugin-jsdoc": "50.5.0",
|
||||||
"jiti": "2.4.1",
|
"jiti": "2.4.0",
|
||||||
"typescript": "5.7.2",
|
"typescript": "5.6.3",
|
||||||
"typescript-eslint": "8.16.0"
|
"typescript-eslint": "8.15.0"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
}:
|
}:
|
||||||
buildApp {
|
buildApp {
|
||||||
src = ./.;
|
src = ./.;
|
||||||
npmDepsHash = "sha256-orjmkJUATp2ppqHFNtrUg8PBPghYjQodEOI1/hhO3uU=";
|
npmDepsHash = "sha256-XXc5wCGFGtr1e6URp2yXsWEKVrh5GrXQ/+Eud3W8ks4=";
|
||||||
|
|
||||||
runtimeInputs = [
|
runtimeInputs = [
|
||||||
nodejs_latest
|
nodejs_latest
|
||||||
|
|
BIN
apps/update-sources/package-lock.json
generated
BIN
apps/update-sources/package-lock.json
generated
Binary file not shown.
|
@ -7,15 +7,15 @@
|
||||||
"build": "node_ver=$(node -v); esbuild src/app.ts --bundle --platform=node --target=\"node${node_ver:1:2}\" --outfile=out/bin/app.cjs"
|
"build": "node_ver=$(node -v); esbuild src/app.ts --bundle --platform=node --target=\"node${node_ver:1:2}\" --outfile=out/bin/app.cjs"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@eslint/js": "9.16.0",
|
"@eslint/js": "9.15.0",
|
||||||
"@stylistic/eslint-plugin": "2.11.0",
|
"@stylistic/eslint-plugin": "2.11.0",
|
||||||
"@types/node": "22.10.1",
|
"@types/node": "22.9.1",
|
||||||
"esbuild": "0.24.0",
|
"esbuild": "0.24.0",
|
||||||
"eslint": "9.16.0",
|
"eslint": "9.15.0",
|
||||||
"eslint-plugin-jsdoc": "50.6.0",
|
"eslint-plugin-jsdoc": "50.5.0",
|
||||||
"jiti": "2.4.1",
|
"jiti": "2.4.0",
|
||||||
"pkg-types": "1.2.1",
|
"pkg-types": "1.2.1",
|
||||||
"typescript": "5.7.2",
|
"typescript": "5.6.3",
|
||||||
"typescript-eslint": "8.16.0"
|
"typescript-eslint": "8.15.0"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
BIN
flake.lock
BIN
flake.lock
Binary file not shown.
|
@ -3,18 +3,15 @@ inputs: rec {
|
||||||
mkPkgs = {
|
mkPkgs = {
|
||||||
system,
|
system,
|
||||||
nixpkgs,
|
nixpkgs,
|
||||||
cfg ? {},
|
|
||||||
cudaSupport ? false,
|
cudaSupport ? false,
|
||||||
}:
|
}:
|
||||||
import nixpkgs {
|
import nixpkgs {
|
||||||
inherit system;
|
inherit system;
|
||||||
overlays = [inputs.self.overlays.build-failures] ++ (cfg.overlays or []);
|
overlays = [inputs.self.overlays.build-failures];
|
||||||
config =
|
config = {
|
||||||
{
|
inherit cudaSupport;
|
||||||
inherit cudaSupport;
|
allowUnfree = true;
|
||||||
allowUnfree = true;
|
};
|
||||||
}
|
|
||||||
// (cfg.config or {});
|
|
||||||
};
|
};
|
||||||
|
|
||||||
# Enable use of `nixpkgs.overlays` on both NixOS and NixOnDroid
|
# Enable use of `nixpkgs.overlays` on both NixOS and NixOnDroid
|
||||||
|
@ -23,13 +20,12 @@ inputs: rec {
|
||||||
system,
|
system,
|
||||||
}: ({config, ...}: let
|
}: ({config, ...}: let
|
||||||
pkgs = mkPkgs {
|
pkgs = mkPkgs {
|
||||||
cfg = config.nixpkgs;
|
|
||||||
inherit system cudaSupport;
|
inherit system cudaSupport;
|
||||||
inherit (inputs) nixpkgs;
|
inherit (inputs) nixpkgs;
|
||||||
};
|
};
|
||||||
inherit (pkgs.lib) mkForce;
|
inherit (pkgs.lib) composeManyExtensions mkForce;
|
||||||
in {
|
in {
|
||||||
_module.args.pkgs = mkForce pkgs;
|
_module.args.pkgs = mkForce (pkgs.extend (composeManyExtensions config.nixpkgs.overlays));
|
||||||
});
|
});
|
||||||
|
|
||||||
# Default system
|
# Default system
|
||||||
|
|
|
@ -1,3 +1,3 @@
|
||||||
{
|
{
|
||||||
npmDepsHash = "sha256-lWQHsDi5SyjbKKfkrfnPo4W1CjGZIhNcSXA7FTb3zn0=";
|
npmDepsHash = "sha256-XNvj59XfO6f+04PatCOZ93tkkZ1K7jReZPqLGJL2Ojo=";
|
||||||
}
|
}
|
||||||
|
|
BIN
nixosModules/ags/config/package-lock.json
generated
BIN
nixosModules/ags/config/package-lock.json
generated
Binary file not shown.
|
@ -3,13 +3,13 @@
|
||||||
"version": "0.0.0",
|
"version": "0.0.0",
|
||||||
"main": "app.ts",
|
"main": "app.ts",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@eslint/js": "9.16.0",
|
"@eslint/js": "9.15.0",
|
||||||
"@stylistic/eslint-plugin": "2.11.0",
|
"@stylistic/eslint-plugin": "2.11.0",
|
||||||
"@types/node": "22.10.1",
|
"@types/node": "22.9.1",
|
||||||
"eslint": "9.16.0",
|
"eslint": "9.15.0",
|
||||||
"eslint-plugin-jsdoc": "50.6.0",
|
"eslint-plugin-jsdoc": "50.5.0",
|
||||||
"fzf": "0.5.2",
|
"fzf": "0.5.2",
|
||||||
"jiti": "2.4.1",
|
"jiti": "2.4.0",
|
||||||
"typescript-eslint": "8.16.0"
|
"typescript-eslint": "8.15.0"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
pkgs,
|
pkgs,
|
||||||
...
|
...
|
||||||
}: let
|
}: let
|
||||||
inherit (lib) mkIf;
|
inherit (lib) attrValues mkIf;
|
||||||
|
|
||||||
cfg = config.roles.base;
|
cfg = config.roles.base;
|
||||||
in
|
in
|
||||||
|
@ -20,26 +20,33 @@ in
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
packages = with pkgs;
|
packages =
|
||||||
[
|
[
|
||||||
noto-fonts
|
(pkgs.nerdfonts.override {
|
||||||
noto-fonts-cjk-sans
|
fonts = [
|
||||||
noto-fonts-emoji
|
"JetBrainsMono"
|
||||||
liberation_ttf
|
"Go-Mono"
|
||||||
font-awesome
|
"Iosevka"
|
||||||
meslo-lgs-nf
|
"NerdFontsSymbolsOnly"
|
||||||
jetbrains-mono
|
"SpaceMono"
|
||||||
ubuntu_font_family
|
"Ubuntu"
|
||||||
|
"Noto"
|
||||||
|
];
|
||||||
|
})
|
||||||
]
|
]
|
||||||
++ (with pkgs.nerd-fonts; [
|
++ (attrValues {
|
||||||
jetbrains-mono
|
inherit
|
||||||
go-mono
|
(pkgs)
|
||||||
iosevka
|
noto-fonts
|
||||||
symbols-only
|
noto-fonts-cjk-sans
|
||||||
space-mono
|
noto-fonts-emoji
|
||||||
ubuntu
|
liberation_ttf
|
||||||
noto
|
font-awesome
|
||||||
]);
|
meslo-lgs-nf
|
||||||
|
jetbrains-mono
|
||||||
|
ubuntu_font_family
|
||||||
|
;
|
||||||
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
# Select internationalisation properties.
|
# Select internationalisation properties.
|
||||||
|
|
|
@ -22,13 +22,6 @@ in {
|
||||||
;
|
;
|
||||||
});
|
});
|
||||||
|
|
||||||
# FIXME: Omnisharp uses dotnet6
|
|
||||||
nixpkgs.config.permittedInsecurePackages = [
|
|
||||||
"dotnet-core-combined"
|
|
||||||
"dotnet-sdk-6.0.428"
|
|
||||||
"dotnet-sdk-wrapped-6.0.428"
|
|
||||||
];
|
|
||||||
|
|
||||||
environment.systemPackages =
|
environment.systemPackages =
|
||||||
(attrValues {
|
(attrValues {
|
||||||
inherit
|
inherit
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
{
|
{
|
||||||
lib,
|
lib,
|
||||||
gpu-screen-recorder-src,
|
gpu-screen-recorder-src,
|
||||||
addDriverRunpath,
|
addOpenGLRunpath,
|
||||||
dbus,
|
dbus,
|
||||||
ffmpeg,
|
ffmpeg,
|
||||||
libdrm,
|
libdrm,
|
||||||
|
@ -68,7 +68,7 @@ in
|
||||||
wrapProgram $out/bin/gpu-screen-recorder \
|
wrapProgram $out/bin/gpu-screen-recorder \
|
||||||
--prefix LD_LIBRARY_PATH : "${
|
--prefix LD_LIBRARY_PATH : "${
|
||||||
makeLibraryPath [
|
makeLibraryPath [
|
||||||
addDriverRunpath.driverLink
|
addOpenGLRunpath.driverLink
|
||||||
libglvnd
|
libglvnd
|
||||||
]
|
]
|
||||||
}"
|
}"
|
||||||
|
|
|
@ -103,10 +103,10 @@
|
||||||
};
|
};
|
||||||
"floccus" = buildFirefoxXpiAddon {
|
"floccus" = buildFirefoxXpiAddon {
|
||||||
pname = "floccus";
|
pname = "floccus";
|
||||||
version = "5.4.0";
|
version = "5.3.4";
|
||||||
addonId = "floccus@handmadeideas.org";
|
addonId = "floccus@handmadeideas.org";
|
||||||
url = "https://addons.mozilla.org/firefox/downloads/file/4397347/floccus-5.4.0.xpi";
|
url = "https://addons.mozilla.org/firefox/downloads/file/4389599/floccus-5.3.4.xpi";
|
||||||
sha256 = "b0ce34be12a6e7906e10199f3a85481cb116ad39d4cb98b9b9a81c1a0a5ce35b";
|
sha256 = "8a7c9e3626e0ab0a017a887b379d0af20e0653ecc05a5fbada17d0244629ba47";
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
homepage = "https://floccus.org";
|
homepage = "https://floccus.org";
|
||||||
description = "Sync your bookmarks and tabs across browsers via Nextcloud, any WebDAV service, any Git service, via a local file, via Google Drive.";
|
description = "Sync your bookmarks and tabs across browsers via Nextcloud, any WebDAV service, any Git service, via a local file, via Google Drive.";
|
||||||
|
|
Loading…
Reference in a new issue