chore: bump all package.json files
All checks were successful
Discord / discord commits (push) Has been skipped

This commit is contained in:
matt1432 2024-10-12 13:09:59 -04:00
parent be56697645
commit 021e233da1
15 changed files with 79 additions and 206 deletions

View file

@ -16,7 +16,7 @@ in
inherit (packageJSON) version; inherit (packageJSON) version;
src = ./.; src = ./.;
npmDepsHash = "sha256-nYdr7jbe5wW9Rg0G4l5jbZg8G0o8DioeSGpx+8e0VZI="; npmDepsHash = "sha256-cg+U7MSeeSDrzSWfXAd69FBLN3R8n4+aCSggrdThZHw=";
runtimeInputs = [ runtimeInputs = [
(callPackage ../../nixosModules/docker/updateImage.nix {}) (callPackage ../../nixosModules/docker/updateImage.nix {})

Binary file not shown.

View file

@ -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"
}, },
"dependencies": { "dependencies": {
"@eslint/js": "9.11.1", "@eslint/js": "9.12.0",
"@stylistic/eslint-plugin": "2.8.0", "@stylistic/eslint-plugin": "2.9.0",
"@types/eslint__js": "8.42.3", "@types/eslint__js": "8.42.3",
"@types/node": "22.6.0", "@types/node": "22.7.5",
"esbuild": "0.24.0", "esbuild": "0.24.0",
"eslint": "9.11.1", "eslint": "9.12.0",
"eslint-plugin-jsdoc": "50.2.4", "eslint-plugin-jsdoc": "50.3.2",
"jiti": "1.21.6", "jiti": "2.3.3",
"typescript": "5.6.2", "typescript": "5.6.3",
"typescript-eslint": "8.7.0" "typescript-eslint": "8.8.1"
} }
} }

View file

@ -1,133 +0,0 @@
{
"env": {
"es2021": true
},
"extends": ["eslint:recommended", "plugin:@typescript-eslint/recommended"],
"parser": "@typescript-eslint/parser",
"overrides": [],
"parserOptions": {
"ecmaVersion": "latest",
"sourceType": "module"
},
"plugins": ["@stylistic", "@typescript-eslint"],
"rules": {
"array-callback-return": ["error", {
"allowImplicit": true,
"checkForEach": true
}],
"no-constructor-return": ["error"],
"no-unreachable-loop": ["error", { "ignore": [
"ForInStatement", "ForOfStatement"
]}],
"block-scoped-var": ["error"],
"class-methods-use-this": ["error"],
"curly": ["warn"],
"default-case-last": ["warn"],
"default-param-last": ["error"],
"eqeqeq": ["error", "smart"],
"func-names": ["warn", "never"],
"logical-assignment-operators": ["warn", "always"],
"no-array-constructor": ["error"],
"no-empty-function": ["warn"],
"no-empty-static-block": ["warn"],
"no-extend-native": ["error"],
"no-extra-bind": ["warn"],
"no-implicit-coercion": ["warn"],
"no-iterator": ["error"],
"no-labels": ["error"],
"no-lone-blocks": ["error"],
"no-lonely-if": ["error"],
"no-loop-func": ["error"],
"no-magic-numbers": ["error", {
"ignore": [-2, -1, 0.1, 0, 1, 2, 3, 10, 33, 66, 100, 255, 360, 450, 1000],
"ignoreDefaultValues": true,
"ignoreArrayIndexes": true
}],
"no-multi-assign": ["error"],
"no-new": ["error"],
"no-new-func": ["error"],
"no-new-wrappers": ["error"],
"no-object-constructor": ["error"],
"no-proto": ["error"],
"no-return-assign": ["error"],
"no-sequences": ["error"],
"no-shadow": ["error", { "builtinGlobals": true }],
"no-undef-init": ["warn"],
"no-undefined": ["error"],
"no-useless-constructor": ["warn"],
"no-useless-escape": ["off"],
"no-useless-return": ["error"],
"no-var": ["error"],
"no-void": ["error"],
"no-with": ["error"],
"object-shorthand": ["error", "always"],
"one-var": ["error", "never"],
"operator-assignment": ["warn", "always"],
"prefer-arrow-callback": ["error"],
"prefer-const": ["error"],
"prefer-object-has-own": ["error"],
"prefer-regex-literals": ["error"],
"prefer-template": ["warn"],
"no-unused-vars": "off",
"@typescript-eslint/no-unused-vars": "warn",
"@typescript-eslint/no-unsafe-declaration-merging": "off",
"@stylistic/array-bracket-newline": ["warn", "consistent"],
"@stylistic/array-bracket-spacing": ["warn", "never"],
"@stylistic/arrow-parens": ["warn", "always"],
"@stylistic/brace-style": ["warn", "stroustrup"],
"@stylistic/comma-dangle": ["warn", "always-multiline"],
"@stylistic/comma-spacing": ["warn", { "before": false, "after": true }],
"@stylistic/comma-style": ["error", "last"],
"@stylistic/dot-location": ["error", "property"],
"@stylistic/function-call-argument-newline": ["warn", "consistent"],
"@stylistic/function-paren-newline": ["warn", "consistent"],
"@stylistic/indent": ["warn", 4, {
"SwitchCase": 1,
"ignoreComments": true
}],
"@stylistic/key-spacing": ["warn", { "beforeColon": false, "afterColon": true }],
"@stylistic/keyword-spacing": ["warn", { "before": true }],
"@stylistic/linebreak-style": ["error", "unix"],
"@stylistic/lines-between-class-members": ["warn", "always", { "exceptAfterSingleLine": true }],
"@stylistic/max-len": ["warn", {
"code": 100,
"ignoreComments": true,
"ignoreTrailingComments": true,
"ignoreUrls": true
}],
"@stylistic/multiline-ternary": ["warn", "always-multiline"],
"@stylistic/new-parens": ["error"],
"@stylistic/no-mixed-operators": ["warn"],
"@stylistic/no-mixed-spaces-and-tabs": ["error"],
"@stylistic/no-multi-spaces": ["error"],
"@stylistic/no-tabs": ["error"],
"@stylistic/no-trailing-spaces": ["error"],
"@stylistic/no-whitespace-before-property": ["warn"],
"@stylistic/nonblock-statement-body-position": ["error", "below"],
"@stylistic/object-curly-newline": ["warn", { "consistent": true }],
"@stylistic/object-property-newline": ["warn", {"allowAllPropertiesOnSameLine": false}],
"@stylistic/object-curly-spacing": ["warn", "always"],
"@stylistic/operator-linebreak": ["warn", "after"],
"@stylistic/padded-blocks": ["error", "never"],
"@stylistic/padding-line-between-statements": ["warn",
{ "blankLine": "always", "prev": "*", "next": "return" },
{ "blankLine": "always", "prev": ["const", "let", "var"], "next": "*"},
{ "blankLine": "any", "prev": ["const", "let", "var"], "next": ["const", "let", "var"]},
{ "blankLine": "always", "prev": ["case", "default"], "next": "*" }
],
"@stylistic/quote-props": ["error", "consistent-as-needed"],
"@stylistic/quotes": ["error", "single", { "avoidEscape": true }],
"@stylistic/semi": ["error", "always"],
"@stylistic/semi-spacing": ["warn"],
"@stylistic/space-before-blocks": ["warn"],
"@stylistic/space-before-function-paren": ["warn", "never"],
"@stylistic/space-infix-ops": ["warn"],
"@stylistic/spaced-comment": ["warn", "always"],
"@stylistic/switch-colon-spacing": ["warn"],
"@stylistic/wrap-regex": ["warn"]
}
}

View file

@ -11,7 +11,7 @@
extract-subs = buildNpmPackage { extract-subs = buildNpmPackage {
name = "${pname}-npm"; name = "${pname}-npm";
src = ./.; src = ./.;
npmDepsHash = "sha256-O00VQPCUX6T+rtK3VcAibBipXFwNs4AFA3251qycPBQ="; npmDepsHash = "sha256-mIRn7MsQJCwBYNEL3IK4cV8X+kDouEdc9x59XWgUkYw=";
nativeBuildInputs = [ nativeBuildInputs = [
nodejs_20 nodejs_20
@ -46,6 +46,4 @@ in
text = '' text = ''
exec ${pname} "$@" exec ${pname} "$@"
''; '';
meta.mainProgram = pname;
} }

View file

@ -3,6 +3,7 @@ import { spawnSync as spawn } from 'child_process';
import { ISO6393To1 } from './lang-codes'; import { ISO6393To1 } from './lang-codes';
const SPAWN_OPTS = { const SPAWN_OPTS = {
shell: true, shell: true,
stdio: [process.stdin, process.stdout, process.stderr], stdio: [process.stdin, process.stdout, process.stderr],
@ -17,19 +18,8 @@ const SPAWN_OPTS = {
const video = process.argv[2]; const video = process.argv[2];
const languages = process.argv[3]?.split(','); const languages = process.argv[3]?.split(',');
const escapePath = (p: string): string => p.replaceAll("'", "'\\''");
// Check if there are 2 params const getSubPath = (baseName: string, sub: Ffmpeg.FfprobeStream): string => {
if (video && languages) {
main(escapePath(video));
}
else {
console.error('Error: no argument passed');
process.exit(1);
}
function getSubPath(baseName: string, sub: Ffmpeg.FfprobeStream): string {
const language = ISO6393To1.get(sub.tags.language); const language = ISO6393To1.get(sub.tags.language);
const forced = sub.disposition?.forced === 0 ? const forced = sub.disposition?.forced === 0 ?
@ -41,9 +31,9 @@ function getSubPath(baseName: string, sub: Ffmpeg.FfprobeStream): string {
'.sdh'; '.sdh';
return `${baseName}${forced}.${language}${hearingImpaired}.srt`; return `${baseName}${forced}.${language}${hearingImpaired}.srt`;
} };
function main(videoPath: string) { const main = (videoPath: string) => {
const subIndexes: number[] = []; const subIndexes: number[] = [];
const baseName = videoPath.split('/').at(-1)!.replace(/\.[^.]*$/, ''); const baseName = videoPath.split('/').at(-1)!.replace(/\.[^.]*$/, '');
@ -110,4 +100,15 @@ function main(videoPath: string) {
`'${videoPath}.bak'`, `'${videoPath}.bak'`,
], SPAWN_OPTS); ], SPAWN_OPTS);
}); });
};
const escapePath = (p: string): string => p.replaceAll("'", "'\\''");
// Check if there are 2 params
if (video && languages) {
main(escapePath(video));
}
else {
console.error('Error: no argument passed');
process.exit(1);
} }

View file

@ -1,14 +1,18 @@
{ {
"devDependencies": { "devDependencies": {
"@stylistic/eslint-plugin": "^1.4.0", "@eslint/js": "9.12.0",
"@types/node": "^20.10.5", "@stylistic/eslint-plugin": "2.9.0",
"@typescript-eslint/eslint-plugin": "^6.9.1", "@types/eslint__js": "8.42.3",
"@typescript-eslint/parser": "^6.9.1", "@types/node": "22.7.5",
"eslint": "^8.52.0", "eslint": "9.12.0",
"typescript": "^5.3.3" "eslint-plugin-jsdoc": "50.3.2",
"fzf": "0.5.2",
"jiti": "2.3.3",
"typescript": "5.6.3",
"typescript-eslint": "8.8.1"
}, },
"dependencies": { "dependencies": {
"@types/fluent-ffmpeg": "^2.1.24", "@types/fluent-ffmpeg": "2.1.26",
"fluent-ffmpeg": "^2.1.2" "fluent-ffmpeg": "2.1.3"
} }
} }

Binary file not shown.

View file

@ -4,15 +4,15 @@
"main": "config.js", "main": "config.js",
"type": "module", "type": "module",
"dependencies": { "dependencies": {
"@eslint/js": "9.11.1", "@eslint/js": "9.12.0",
"@stylistic/eslint-plugin": "2.8.0", "@stylistic/eslint-plugin": "2.9.0",
"@types/eslint__js": "8.42.3", "@types/eslint__js": "8.42.3",
"@types/node": "22.6.0", "@types/node": "22.7.5",
"eslint": "9.11.1", "eslint": "9.12.0",
"eslint-plugin-jsdoc": "50.2.4", "eslint-plugin-jsdoc": "50.3.2",
"fzf": "0.5.2", "fzf": "0.5.2",
"jiti": "1.21.6", "jiti": "2.3.3",
"typescript": "5.6.2", "typescript": "5.6.3",
"typescript-eslint": "8.7.0" "typescript-eslint": "8.8.1"
} }
} }

View file

@ -110,7 +110,7 @@ in {
''; '';
"${agsConfigDir}/config/node_modules".source = "${agsConfigDir}/config/node_modules".source =
buildNodeModules ./config "sha256-Xv8p7XfUoEJIDf3/78MG6xLoUBSobjmjYwzno+YzP8o="; buildNodeModules ./config "sha256-4ybtwyZs7AgIYiGm1RuWwEgrnkxAqIEkPZjJJfQV/6I=";
} }
// (import ./icons.nix {inherit pkgs agsConfigDir;}) // (import ./icons.nix {inherit pkgs agsConfigDir;})
); );
@ -139,7 +139,9 @@ in {
})); }));
}; };
wayland.windowManager.hyprland = { wayland.windowManager.hyprland = let
runAgs = "pgrep ags -a | grep '/bin/gjs' && ags";
in {
settings = { settings = {
animations = { animations = {
bezier = [ bezier = [
@ -167,18 +169,18 @@ in {
]; ];
bind = [ bind = [
"$mainMod SHIFT, E , exec, ags -t win-powermenu" "$mainMod SHIFT, E , exec, ${runAgs} -t win-powermenu"
"$mainMod , D , exec, ags -t win-applauncher" "$mainMod , D , exec, ${runAgs} -t win-applauncher"
"$mainMod , V , exec, ags -t win-clipboard" "$mainMod , V , exec, ${runAgs} -t win-clipboard"
" , Print, exec, ags -t win-screenshot" " , Print, exec, ${runAgs} -t win-screenshot"
]; ];
binde = [ binde = [
## Brightness control ## Brightness control
", XF86MonBrightnessUp , exec, ags -r 'Brightness.screen += 0.05'" ", XF86MonBrightnessUp , exec, ${runAgs} -r 'Brightness.screen += 0.05'"
", XF86MonBrightnessDown, exec, ags -r 'Brightness.screen -= 0.05'" ", XF86MonBrightnessDown, exec, ${runAgs} -r 'Brightness.screen -= 0.05'"
]; ];
bindn = [" , Escape , exec, ags -r 'closeAll()'"]; bindn = [" , Escape , exec, ${runAgs} -r 'closeAll()'"];
bindr = ["CAPS, Caps_Lock, exec, ags -r 'Brightness.fetchCapsState()'"]; bindr = ["CAPS, Caps_Lock, exec, ${runAgs} -r 'Brightness.fetchCapsState()'"];
}; };
}; };
}) })

View file

@ -37,7 +37,7 @@ self: {
}) })
// { // {
"${configDir}/node_modules".source = "${configDir}/node_modules".source =
buildNodeModules ./. "sha256-WjCfS8iEw5Mjor/sQ2t+i0Q1pqVpSDEDbbgrKwK+3cg="; buildNodeModules ./. "sha256-u2LDbIKA32urN/NqqJrdAl46pUloPaoa5HoYDRJDh1k=";
"${configDir}/tsconfig.json".source = pkgs.writers.writeJSON "tsconfig.json" { "${configDir}/tsconfig.json".source = pkgs.writers.writeJSON "tsconfig.json" {
"$schema" = "https://json.schemastore.org/tsconfig"; "$schema" = "https://json.schemastore.org/tsconfig";

Binary file not shown.

View file

@ -3,14 +3,14 @@
"version": "0.0.0", "version": "0.0.0",
"main": "app.ts", "main": "app.ts",
"dependencies": { "dependencies": {
"@eslint/js": "9.11.1", "@eslint/js": "9.12.0",
"@stylistic/eslint-plugin": "2.8.0", "@stylistic/eslint-plugin": "2.9.0",
"@types/eslint__js": "8.42.3", "@types/eslint__js": "8.42.3",
"@types/node": "22.6.0", "@types/node": "22.7.5",
"eslint": "9.11.1", "eslint": "9.12.0",
"eslint-plugin-jsdoc": "50.2.4", "eslint-plugin-jsdoc": "50.3.2",
"jiti": "1.21.6", "jiti": "2.3.3",
"typescript": "5.6.2", "typescript": "5.6.3",
"typescript-eslint": "8.7.0" "typescript-eslint": "8.8.1"
} }
} }

View file

@ -1,4 +1,4 @@
import { Gtk, idle, timeout, Widget } from 'astal'; import { Gtk, timeout, Widget } from 'astal';
import AstalHyprland from 'gi://AstalHyprland?version=0.1'; import AstalHyprland from 'gi://AstalHyprland?version=0.1';
const Hyprland = AstalHyprland.get_default(); const Hyprland = AstalHyprland.get_default();
@ -23,7 +23,7 @@ const Workspace = ({ id = 0 }) => (
valign={Gtk.Align.CENTER} valign={Gtk.Align.CENTER}
className="button" className="button"
setup={(self) => idle(() => { setup={(self) => {
const update = ( const update = (
_: Widget.Box, _: Widget.Box,
client?: AstalHyprland.Client, client?: AstalHyprland.Client,
@ -37,10 +37,10 @@ const Workspace = ({ id = 0 }) => (
return; return;
} }
const isThisUrgent = client && const isUrgent = client &&
client.get_workspace().get_id() === id; client.get_workspace().get_id() === id;
if (isThisUrgent) { if (isUrgent) {
self.toggleClassName('urgent', true); self.toggleClassName('urgent', true);
// Only show for a sec when urgent is current workspace // Only show for a sec when urgent is current workspace
@ -52,6 +52,7 @@ const Workspace = ({ id = 0 }) => (
} }
}; };
update(self);
self self
.hook(Hyprland, 'event', () => update(self)) .hook(Hyprland, 'event', () => update(self))
@ -63,7 +64,7 @@ const Workspace = ({ id = 0 }) => (
self.toggleClassName('urgent', false); self.toggleClassName('urgent', false);
} }
}); });
})} }}
/> />
</eventbox> </eventbox>
</revealer> </revealer>