diff --git a/apps/extract-subs/default.nix b/apps/extract-subs/default.nix index a9d27888..ca606b1d 100644 --- a/apps/extract-subs/default.nix +++ b/apps/extract-subs/default.nix @@ -5,7 +5,7 @@ }: buildApp { src = ./.; - npmDepsHash = "sha256-0NadIaeU2rU6xGR8eeWpEUZHE5qbuzE99/O1HNtW0ck="; + npmDepsHash = "sha256-GiqSQv5yv6DVYoyc74HUPMhDkqi3mn8s8KxHOLNs/Rg="; runtimeInputs = [ ffmpeg-full diff --git a/apps/extract-subs/package-lock.json b/apps/extract-subs/package-lock.json index e3faa2c5..6ca279c3 100644 Binary files a/apps/extract-subs/package-lock.json and b/apps/extract-subs/package-lock.json differ diff --git a/apps/extract-subs/package.json b/apps/extract-subs/package.json index bfd193c1..748acc30 100644 --- a/apps/extract-subs/package.json +++ b/apps/extract-subs/package.json @@ -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" } } diff --git a/apps/update-sources/default.nix b/apps/update-sources/default.nix index 2d66e625..b88148c9 100644 --- a/apps/update-sources/default.nix +++ b/apps/update-sources/default.nix @@ -7,7 +7,7 @@ }: buildApp { src = ./.; - npmDepsHash = "sha256-XXc5wCGFGtr1e6URp2yXsWEKVrh5GrXQ/+Eud3W8ks4="; + npmDepsHash = "sha256-orjmkJUATp2ppqHFNtrUg8PBPghYjQodEOI1/hhO3uU="; runtimeInputs = [ nodejs_latest diff --git a/apps/update-sources/package-lock.json b/apps/update-sources/package-lock.json index 6c5da6eb..0a54a5d1 100644 Binary files a/apps/update-sources/package-lock.json and b/apps/update-sources/package-lock.json differ diff --git a/apps/update-sources/package.json b/apps/update-sources/package.json index ef8a2936..3b42f430 100644 --- a/apps/update-sources/package.json +++ b/apps/update-sources/package.json @@ -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" } } diff --git a/flake.lock b/flake.lock index 70fe4d8e..e4ea72a7 100644 Binary files a/flake.lock and b/flake.lock differ diff --git a/nixosModules/ags/config/default.nix b/nixosModules/ags/config/default.nix index a7b1a0cd..e2da4441 100644 --- a/nixosModules/ags/config/default.nix +++ b/nixosModules/ags/config/default.nix @@ -1,3 +1,3 @@ { - npmDepsHash = "sha256-XNvj59XfO6f+04PatCOZ93tkkZ1K7jReZPqLGJL2Ojo="; + npmDepsHash = "sha256-lWQHsDi5SyjbKKfkrfnPo4W1CjGZIhNcSXA7FTb3zn0="; } diff --git a/nixosModules/ags/config/package-lock.json b/nixosModules/ags/config/package-lock.json index c6e09b64..8ebce395 100644 Binary files a/nixosModules/ags/config/package-lock.json and b/nixosModules/ags/config/package-lock.json differ diff --git a/nixosModules/ags/config/package.json b/nixosModules/ags/config/package.json index d9b7ea53..e28e79bb 100644 --- a/nixosModules/ags/config/package.json +++ b/nixosModules/ags/config/package.json @@ -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" } } diff --git a/nixosModules/base/locale/default.nix b/nixosModules/base/locale/default.nix index d78ea42e..ebac9743 100644 --- a/nixosModules/base/locale/default.nix +++ b/nixosModules/base/locale/default.nix @@ -4,7 +4,7 @@ pkgs, ... }: let - inherit (lib) attrValues mkIf; + inherit (lib) mkIf; cfg = config.roles.base; in @@ -20,33 +20,26 @@ in }; }; - packages = + packages = with pkgs; [ - (pkgs.nerdfonts.override { - fonts = [ - "JetBrainsMono" - "Go-Mono" - "Iosevka" - "NerdFontsSymbolsOnly" - "SpaceMono" - "Ubuntu" - "Noto" - ]; - }) + noto-fonts + noto-fonts-cjk-sans + noto-fonts-emoji + liberation_ttf + font-awesome + meslo-lgs-nf + jetbrains-mono + ubuntu_font_family ] - ++ (attrValues { - inherit - (pkgs) - noto-fonts - noto-fonts-cjk-sans - noto-fonts-emoji - liberation_ttf - font-awesome - 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. diff --git a/nixosModules/base/packages/default.nix b/nixosModules/base/packages/default.nix index 863c50a7..0a606c71 100644 --- a/nixosModules/base/packages/default.nix +++ b/nixosModules/base/packages/default.nix @@ -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 diff --git a/packages/gpu-screen-recorder/generic.nix b/packages/gpu-screen-recorder/generic.nix index 009b2fbd..49521d36 100644 --- a/packages/gpu-screen-recorder/generic.nix +++ b/packages/gpu-screen-recorder/generic.nix @@ -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 ] }" diff --git a/scopedPackages/firefox-addons/generated-firefox-addons.nix b/scopedPackages/firefox-addons/generated-firefox-addons.nix index c97a6129..bfca77bd 100644 --- a/scopedPackages/firefox-addons/generated-firefox-addons.nix +++ b/scopedPackages/firefox-addons/generated-firefox-addons.nix @@ -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.";