diff --git a/apps/update/default.nix b/apps/update/default.nix index 0f18ead8..01797537 100644 --- a/apps/update/default.nix +++ b/apps/update/default.nix @@ -15,7 +15,7 @@ in inherit (packageJSON) version; src = ./.; - npmDepsHash = "sha256-3fU6eS6CPqBhD1zmsHnZs7Pk2mEiucPMrOSdS81+Ml8="; + npmDepsHash = "sha256-Vl27uo1cwRNjZCcSZTMqZBEwZNwwiqik0sJo4PVxg3c="; runtimeInputs = [ (callPackage ../../nixosModules/docker/updateImage.nix {}) diff --git a/apps/update/package-lock.json b/apps/update/package-lock.json index 5f344708..6c25adf2 100644 Binary files a/apps/update/package-lock.json and b/apps/update/package-lock.json differ diff --git a/apps/update/package.json b/apps/update/package.json index 67f3a1e0..0aaac7d2 100644 --- a/apps/update/package.json +++ b/apps/update/package.json @@ -7,15 +7,14 @@ "build": "node_ver=$(node -v); esbuild src/app.ts --bundle --platform=node --target=\"node${node_ver:1:2}\" --outfile=out/bin/app.cjs" }, "dependencies": { - "@eslint/js": "9.13.0", - "@stylistic/eslint-plugin": "2.9.0", - "@types/eslint__js": "8.42.3", - "@types/node": "22.8.4", + "@eslint/js": "9.14.0", + "@stylistic/eslint-plugin": "2.10.1", + "@types/node": "22.9.0", "esbuild": "0.24.0", - "eslint": "9.13.0", + "eslint": "9.14.0", "eslint-plugin-jsdoc": "50.4.3", - "jiti": "2.3.3", + "jiti": "2.4.0", "typescript": "5.6.3", - "typescript-eslint": "8.12.2" + "typescript-eslint": "8.14.0" } } diff --git a/devices/nos/modules/docker/nextcloud/images/nginx.nix b/devices/nos/modules/docker/nextcloud/images/nginx.nix index 3fdf4a8a..dcf80c45 100644 --- a/devices/nos/modules/docker/nextcloud/images/nginx.nix +++ b/devices/nos/modules/docker/nextcloud/images/nginx.nix @@ -1,7 +1,7 @@ pkgs: pkgs.dockerTools.pullImage rec { imageName = "nginx"; - imageDigest = "sha256:28402db69fec7c17e179ea87882667f1e054391138f77ffaf0c3eb388efc3ffb"; + imageDigest = "sha256:5026c85d87419b6c3622622570ea5c25ab9f9bb48961554658272bbc18e518b1"; sha256 = "0zas3xrxlrr1qd3hc5p63q5hpja3cdfvv6alx10j8q489wn21m0s"; finalImageName = imageName; finalImageTag = "latest"; diff --git a/devices/nos/modules/docker/vaultwarden/images/vaultwarden.nix b/devices/nos/modules/docker/vaultwarden/images/vaultwarden.nix index a9eab292..84b73d9e 100644 --- a/devices/nos/modules/docker/vaultwarden/images/vaultwarden.nix +++ b/devices/nos/modules/docker/vaultwarden/images/vaultwarden.nix @@ -1,8 +1,8 @@ pkgs: pkgs.dockerTools.pullImage rec { imageName = "quay.io/vaultwarden/server"; - imageDigest = "sha256:7de8fd442afc26e4932a0b2521e2eec82db9f17667eef7b46fd9c2fa2e639de2"; - sha256 = "07scp48xbvhz1y7m6sfq2s2s9pij6kj94ngs8ypdj41kxqmnrk6s"; + imageDigest = "sha256:7271b8ceb729f9b46144c800125813dcc8d16bb6874217c48e59b22b45e47d7d"; + sha256 = "11770g5g821i6wblydjdy1mp2j5w1w0ajnz762ivhlfbwyvs1yzv"; finalImageName = imageName; finalImageTag = "latest"; } diff --git a/devices/nos/modules/subtitles/extract-subs/default.nix b/devices/nos/modules/subtitles/extract-subs/default.nix index 24909c73..ba5abdf3 100644 --- a/devices/nos/modules/subtitles/extract-subs/default.nix +++ b/devices/nos/modules/subtitles/extract-subs/default.nix @@ -11,7 +11,7 @@ extract-subs = buildNpmPackage { name = "${pname}-npm"; src = ./.; - npmDepsHash = "sha256-mIRn7MsQJCwBYNEL3IK4cV8X+kDouEdc9x59XWgUkYw="; + npmDepsHash = "sha256-WXkg4e5Nh3+haCbm+XJ1CB7rsA2uV/7eZUaOUl/NVk0="; nativeBuildInputs = [ nodejs_20 diff --git a/devices/nos/modules/subtitles/extract-subs/package-lock.json b/devices/nos/modules/subtitles/extract-subs/package-lock.json index 390a22c1..06a022d5 100644 Binary files a/devices/nos/modules/subtitles/extract-subs/package-lock.json and b/devices/nos/modules/subtitles/extract-subs/package-lock.json differ diff --git a/devices/nos/modules/subtitles/extract-subs/package.json b/devices/nos/modules/subtitles/extract-subs/package.json index 3d07ec09..365d7343 100644 --- a/devices/nos/modules/subtitles/extract-subs/package.json +++ b/devices/nos/modules/subtitles/extract-subs/package.json @@ -12,7 +12,7 @@ "typescript-eslint": "8.8.1" }, "dependencies": { - "@types/fluent-ffmpeg": "2.1.26", + "@types/fluent-ffmpeg": "2.1.27", "fluent-ffmpeg": "2.1.3" } } diff --git a/flake.lock b/flake.lock index 681666bc..fadff019 100644 Binary files a/flake.lock and b/flake.lock differ diff --git a/flake.nix b/flake.nix index ae66f8df..045d2955 100644 Binary files a/flake.nix and b/flake.nix differ diff --git a/inputs.nix b/inputs.nix index 94fcf474..5b716026 100644 --- a/inputs.nix +++ b/inputs.nix @@ -113,9 +113,6 @@ let hyprland = mkDep { owner = "hyprwm"; repo = "Hyprland"; - - # FIXME: https://github.com/hyprwm/Hyprland/issues/8410 - rev = "dca75db127fedc58fc85ae0e6e47162e3d5d16f9"; }; hyprland-plugins = mkHyprDep { diff --git a/nixosModules/ags-v2/config/package-lock.json b/nixosModules/ags-v2/config/package-lock.json index 84fc1355..ae011ea8 100644 Binary files a/nixosModules/ags-v2/config/package-lock.json and b/nixosModules/ags-v2/config/package-lock.json differ diff --git a/nixosModules/ags-v2/config/package.json b/nixosModules/ags-v2/config/package.json index b42f2c9e..f79b7cc9 100644 --- a/nixosModules/ags-v2/config/package.json +++ b/nixosModules/ags-v2/config/package.json @@ -3,15 +3,13 @@ "version": "0.0.0", "main": "app.ts", "dependencies": { - "@eslint/js": "9.13.0", - "@stylistic/eslint-plugin": "2.9.0", - "@types/eslint__js": "8.42.3", - "@types/node": "22.8.1", - "eslint": "9.13.0", + "@eslint/js": "9.14.0", + "@stylistic/eslint-plugin": "2.10.1", + "@types/node": "22.9.0", + "eslint": "9.14.0", "eslint-plugin-jsdoc": "50.4.3", "fzf": "0.5.2", - "jiti": "2.3.3", - "typescript": "5.6.3", - "typescript-eslint": "8.11.0" + "jiti": "2.4.0", + "typescript-eslint": "8.14.0" } } diff --git a/nixosModules/ags-v2/packages.nix b/nixosModules/ags-v2/packages.nix index d573b506..16e6fc8d 100644 --- a/nixosModules/ags-v2/packages.nix +++ b/nixosModules/ags-v2/packages.nix @@ -99,7 +99,7 @@ }) // { "${agsConfigDir}/node_modules".source = - buildNodeModules ./config "sha256-pK9S6qUjTIL0JDegYJlHSY5XEpLFKfA98MfZ59Q3IL4="; + buildNodeModules ./config "sha256-cyVdjRV1o/UvAPzXigNzXATq1mRmsXhDqnG4wnBzSXE="; "${agsConfigDir}/tsconfig.json".source = pkgs.writers.writeJSON "tsconfig.json" { "$schema" = "https://json.schemastore.org/tsconfig"; diff --git a/nixosModules/desktop/manager/ags.nix b/nixosModules/desktop/manager/ags.nix index 9f4a0c7b..43152918 100644 --- a/nixosModules/desktop/manager/ags.nix +++ b/nixosModules/desktop/manager/ags.nix @@ -56,7 +56,8 @@ in { flakeDir = config.environment.variables.FLAKE; modulesDir = "${lib.removePrefix "/home/${cfg.user}/" flakeDir}/nixosModules"; - nodeModules = config.home-manager.users.${cfg.user}.home.file."${modulesDir}/ags/config/node_modules".source + nodeModules = + config.home-manager.users.${cfg.user}.home.file."${modulesDir}/ags/config/node_modules".source or config.home-manager.users.${cfg.user}.home.file."${modulesDir}/ags-v2/config/node_modules".source; in pkgs.runCommandLocal "agsConfig" {} '' diff --git a/outputs.nix b/outputs.nix index 97077e91..060505e6 100644 --- a/outputs.nix +++ b/outputs.nix @@ -147,7 +147,22 @@ perSystem (pkgs: import ./apps {inherit inputs pkgs;}); - devShells = perSystem (pkgs: { + devShells = perSystem (pkgs: let + bumpNpmDeps = pkgs.writeShellApplication { + name = "bumpNpmDeps"; + runtimeInputs = builtins.attrValues { + inherit + (pkgs) + prefetch-npm-deps + nodejs_latest + ; + }; + text = '' + npm i --package-lock-only || true # this command will fail but still updates the main lockfile + prefetch-npm-deps ./package-lock.json + ''; + }; + in { default = pkgs.mkShell { packages = [ (pkgs.writeShellScriptBin "mkIso" '' @@ -172,38 +187,25 @@ typescript ; }) - ++ [ - (pkgs.writeShellApplication { - name = "bumpNpmDeps"; - runtimeInputs = builtins.attrValues { - inherit - (pkgs) - prefetch-npm-deps - nodejs_latest - ; - }; - text = '' - npm i --package-lock-only || true # this command will fail but still updates the main lockfile - prefetch-npm-deps ./package-lock.json - ''; - }) - ]; + ++ [bumpNpmDeps]; }; subtitles-dev = pkgs.mkShell { - packages = builtins.attrValues { - inherit - (pkgs) - nodejs_latest - ffmpeg-full - typescript - ; + packages = + (builtins.attrValues { + inherit + (pkgs) + nodejs_latest + ffmpeg-full + typescript + ; - inherit - (pkgs.nodePackages) - ts-node - ; - }; + inherit + (pkgs.nodePackages) + ts-node + ; + }) + ++ [bumpNpmDeps]; }; });