Compare commits
2 commits
1ae537b572
...
286211b5c5
| Author | SHA1 | Date | |
|---|---|---|---|
| 286211b5c5 | |||
| 6e6b22c456 |
15 changed files with 65 additions and 61 deletions
|
|
@ -5,7 +5,7 @@
|
|||
}:
|
||||
buildApp {
|
||||
src = ./.;
|
||||
npmDepsHash = "sha256-0NadIaeU2rU6xGR8eeWpEUZHE5qbuzE99/O1HNtW0ck=";
|
||||
npmDepsHash = "sha256-GiqSQv5yv6DVYoyc74HUPMhDkqi3mn8s8KxHOLNs/Rg=";
|
||||
|
||||
runtimeInputs = [
|
||||
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"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@eslint/js": "9.15.0",
|
||||
"@eslint/js": "9.16.0",
|
||||
"@stylistic/eslint-plugin": "2.11.0",
|
||||
"@types/node": "22.9.1",
|
||||
"@types/node": "22.10.1",
|
||||
"esbuild": "0.24.0",
|
||||
"eslint": "9.15.0",
|
||||
"eslint-plugin-jsdoc": "50.5.0",
|
||||
"jiti": "2.4.0",
|
||||
"typescript": "5.6.3",
|
||||
"typescript-eslint": "8.15.0"
|
||||
"eslint": "9.16.0",
|
||||
"eslint-plugin-jsdoc": "50.6.0",
|
||||
"jiti": "2.4.1",
|
||||
"typescript": "5.7.2",
|
||||
"typescript-eslint": "8.16.0"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
}:
|
||||
buildApp {
|
||||
src = ./.;
|
||||
npmDepsHash = "sha256-XXc5wCGFGtr1e6URp2yXsWEKVrh5GrXQ/+Eud3W8ks4=";
|
||||
npmDepsHash = "sha256-orjmkJUATp2ppqHFNtrUg8PBPghYjQodEOI1/hhO3uU=";
|
||||
|
||||
runtimeInputs = [
|
||||
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"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@eslint/js": "9.15.0",
|
||||
"@eslint/js": "9.16.0",
|
||||
"@stylistic/eslint-plugin": "2.11.0",
|
||||
"@types/node": "22.9.1",
|
||||
"@types/node": "22.10.1",
|
||||
"esbuild": "0.24.0",
|
||||
"eslint": "9.15.0",
|
||||
"eslint-plugin-jsdoc": "50.5.0",
|
||||
"jiti": "2.4.0",
|
||||
"eslint": "9.16.0",
|
||||
"eslint-plugin-jsdoc": "50.6.0",
|
||||
"jiti": "2.4.1",
|
||||
"pkg-types": "1.2.1",
|
||||
"typescript": "5.6.3",
|
||||
"typescript-eslint": "8.15.0"
|
||||
"typescript": "5.7.2",
|
||||
"typescript-eslint": "8.16.0"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
BIN
flake.lock
BIN
flake.lock
Binary file not shown.
|
|
@ -3,15 +3,18 @@ inputs: rec {
|
|||
mkPkgs = {
|
||||
system,
|
||||
nixpkgs,
|
||||
cfg ? {},
|
||||
cudaSupport ? false,
|
||||
}:
|
||||
import nixpkgs {
|
||||
inherit system;
|
||||
overlays = [inputs.self.overlays.build-failures];
|
||||
config = {
|
||||
overlays = [inputs.self.overlays.build-failures] ++ (cfg.overlays or []);
|
||||
config =
|
||||
{
|
||||
inherit cudaSupport;
|
||||
allowUnfree = true;
|
||||
};
|
||||
}
|
||||
// (cfg.config or {});
|
||||
};
|
||||
|
||||
# Enable use of `nixpkgs.overlays` on both NixOS and NixOnDroid
|
||||
|
|
@ -20,12 +23,13 @@ inputs: rec {
|
|||
system,
|
||||
}: ({config, ...}: let
|
||||
pkgs = mkPkgs {
|
||||
cfg = config.nixpkgs;
|
||||
inherit system cudaSupport;
|
||||
inherit (inputs) nixpkgs;
|
||||
};
|
||||
inherit (pkgs.lib) composeManyExtensions mkForce;
|
||||
inherit (pkgs.lib) mkForce;
|
||||
in {
|
||||
_module.args.pkgs = mkForce (pkgs.extend (composeManyExtensions config.nixpkgs.overlays));
|
||||
_module.args.pkgs = mkForce pkgs;
|
||||
});
|
||||
|
||||
# Default system
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
{
|
||||
npmDepsHash = "sha256-XNvj59XfO6f+04PatCOZ93tkkZ1K7jReZPqLGJL2Ojo=";
|
||||
npmDepsHash = "sha256-lWQHsDi5SyjbKKfkrfnPo4W1CjGZIhNcSXA7FTb3zn0=";
|
||||
}
|
||||
|
|
|
|||
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",
|
||||
"main": "app.ts",
|
||||
"dependencies": {
|
||||
"@eslint/js": "9.15.0",
|
||||
"@eslint/js": "9.16.0",
|
||||
"@stylistic/eslint-plugin": "2.11.0",
|
||||
"@types/node": "22.9.1",
|
||||
"eslint": "9.15.0",
|
||||
"eslint-plugin-jsdoc": "50.5.0",
|
||||
"@types/node": "22.10.1",
|
||||
"eslint": "9.16.0",
|
||||
"eslint-plugin-jsdoc": "50.6.0",
|
||||
"fzf": "0.5.2",
|
||||
"jiti": "2.4.0",
|
||||
"typescript-eslint": "8.15.0"
|
||||
"jiti": "2.4.1",
|
||||
"typescript-eslint": "8.16.0"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
pkgs,
|
||||
...
|
||||
}: let
|
||||
inherit (lib) attrValues mkIf;
|
||||
inherit (lib) mkIf;
|
||||
|
||||
cfg = config.roles.base;
|
||||
in
|
||||
|
|
@ -20,23 +20,8 @@ in
|
|||
};
|
||||
};
|
||||
|
||||
packages =
|
||||
packages = with pkgs;
|
||||
[
|
||||
(pkgs.nerdfonts.override {
|
||||
fonts = [
|
||||
"JetBrainsMono"
|
||||
"Go-Mono"
|
||||
"Iosevka"
|
||||
"NerdFontsSymbolsOnly"
|
||||
"SpaceMono"
|
||||
"Ubuntu"
|
||||
"Noto"
|
||||
];
|
||||
})
|
||||
]
|
||||
++ (attrValues {
|
||||
inherit
|
||||
(pkgs)
|
||||
noto-fonts
|
||||
noto-fonts-cjk-sans
|
||||
noto-fonts-emoji
|
||||
|
|
@ -45,8 +30,16 @@ in
|
|||
meslo-lgs-nf
|
||||
jetbrains-mono
|
||||
ubuntu_font_family
|
||||
;
|
||||
});
|
||||
]
|
||||
++ (with pkgs.nerd-fonts; [
|
||||
jetbrains-mono
|
||||
go-mono
|
||||
iosevka
|
||||
symbols-only
|
||||
space-mono
|
||||
ubuntu
|
||||
noto
|
||||
]);
|
||||
};
|
||||
|
||||
# Select internationalisation properties.
|
||||
|
|
|
|||
|
|
@ -22,6 +22,13 @@ in {
|
|||
;
|
||||
});
|
||||
|
||||
# FIXME: Omnisharp uses dotnet6
|
||||
nixpkgs.config.permittedInsecurePackages = [
|
||||
"dotnet-core-combined"
|
||||
"dotnet-sdk-6.0.428"
|
||||
"dotnet-sdk-wrapped-6.0.428"
|
||||
];
|
||||
|
||||
environment.systemPackages =
|
||||
(attrValues {
|
||||
inherit
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
lib,
|
||||
gpu-screen-recorder-src,
|
||||
addOpenGLRunpath,
|
||||
addDriverRunpath,
|
||||
dbus,
|
||||
ffmpeg,
|
||||
libdrm,
|
||||
|
|
@ -68,7 +68,7 @@ in
|
|||
wrapProgram $out/bin/gpu-screen-recorder \
|
||||
--prefix LD_LIBRARY_PATH : "${
|
||||
makeLibraryPath [
|
||||
addOpenGLRunpath.driverLink
|
||||
addDriverRunpath.driverLink
|
||||
libglvnd
|
||||
]
|
||||
}"
|
||||
|
|
|
|||
|
|
@ -103,10 +103,10 @@
|
|||
};
|
||||
"floccus" = buildFirefoxXpiAddon {
|
||||
pname = "floccus";
|
||||
version = "5.3.4";
|
||||
version = "5.4.0";
|
||||
addonId = "floccus@handmadeideas.org";
|
||||
url = "https://addons.mozilla.org/firefox/downloads/file/4389599/floccus-5.3.4.xpi";
|
||||
sha256 = "8a7c9e3626e0ab0a017a887b379d0af20e0653ecc05a5fbada17d0244629ba47";
|
||||
url = "https://addons.mozilla.org/firefox/downloads/file/4397347/floccus-5.4.0.xpi";
|
||||
sha256 = "b0ce34be12a6e7906e10199f3a85481cb116ad39d4cb98b9b9a81c1a0a5ce35b";
|
||||
meta = with lib; {
|
||||
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.";
|
||||
|
|
|
|||
Loading…
Reference in a new issue