chore: update flake.lock
All checks were successful
Discord / discord commits (push) Has been skipped
All checks were successful
Discord / discord commits (push) Has been skipped
Flake Inputs: • Updated input 'agsV2': 'github:Aylur/ags/f89742e' (2024-11-08) → 'github:Aylur/ags/5ec5640' (2024-11-12) • Updated input 'astal': 'github:Aylur/astal/302fcae' (2024-11-08) → 'github:Aylur/astal/2a9bb96' (2024-11-12) • Updated input 'custom-sidebar-src': 'github:elchininet/custom-sidebar/6b18c2e' (2024-11-10) → 'github:elchininet/custom-sidebar/a4b3aac' (2024-11-12) • Updated input 'gpu-screen-recorder-src': 'git+https://repo.dec05eba.com/gpu-screen-recorder?ref=refs/heads/master&rev=f1b4979' (2024-11-09) → 'git+https://repo.dec05eba.com/gpu-screen-recorder?ref=refs/heads/master&rev=c8fdf2f' (2024-11-10) • Updated input 'hyprland': 'github:hyprwm/Hyprland/dca75db' (2024-11-09) → 'github:hyprwm/Hyprland/a29cfa7' (2024-11-12) • Updated input 'hyprland/hyprutils': 'github:hyprwm/hyprutils/3ce0cde' (2024-11-07) → 'github:hyprwm/hyprutils/60d3dec' (2024-11-09) • Updated input 'nix-gaming': 'github:fufexan/nix-gaming/faf26ec' (2024-11-10) → 'github:fufexan/nix-gaming/e9adb42' (2024-11-12) • Updated input 'nixpkgs-wayland': 'github:nix-community/nixpkgs-wayland/b6023d8' (2024-11-10) → 'github:nix-community/nixpkgs-wayland/e25b62b' (2024-11-11) • Updated input 'nvim-theme-src': 'github:Mofiqul/dracula.nvim/94fa788' (2024-10-16) → 'github:Mofiqul/dracula.nvim/e6128ec' (2024-11-11) • Updated input 'sops-nix': 'github:Mic92/sops-nix/f1675e3' (2024-11-10) → 'github:Mic92/sops-nix/4c91d52' (2024-11-11) • Updated input 'ts-for-gir-src': 'github:gjsify/ts-for-gir/ffa9e9a' (2024-11-10) → 'github:gjsify/ts-for-gir/f703cc1' (2024-11-11) • Updated input 'tuya-local-src': 'github:make-all/tuya-local/175c1cc' (2024-11-09) → 'github:make-all/tuya-local/2739992' (2024-11-11) Docker Images: • nginx latest: sha256:28402db69fec7c17e179ea87882667f1e054391138f77ffaf0c3eb388efc3ffb → sha256:5026c85d87419b6c3622622570ea5c25ab9f9bb48961554658272bbc18e518b1 • quay.io/vaultwarden/server latest: sha256:7de8fd442afc26e4932a0b2521e2eec82db9f17667eef7b46fd9c2fa2e639de2 → sha256:7271b8ceb729f9b46144c800125813dcc8d16bb6874217c48e59b22b45e47d7d
This commit is contained in:
parent
bfaaed6924
commit
54385f2fa9
16 changed files with 52 additions and 55 deletions
|
@ -15,7 +15,7 @@ in
|
||||||
inherit (packageJSON) version;
|
inherit (packageJSON) version;
|
||||||
|
|
||||||
src = ./.;
|
src = ./.;
|
||||||
npmDepsHash = "sha256-3fU6eS6CPqBhD1zmsHnZs7Pk2mEiucPMrOSdS81+Ml8=";
|
npmDepsHash = "sha256-Vl27uo1cwRNjZCcSZTMqZBEwZNwwiqik0sJo4PVxg3c=";
|
||||||
|
|
||||||
runtimeInputs = [
|
runtimeInputs = [
|
||||||
(callPackage ../../nixosModules/docker/updateImage.nix {})
|
(callPackage ../../nixosModules/docker/updateImage.nix {})
|
||||||
|
|
BIN
apps/update/package-lock.json
generated
BIN
apps/update/package-lock.json
generated
Binary file not shown.
|
@ -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"
|
"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.13.0",
|
"@eslint/js": "9.14.0",
|
||||||
"@stylistic/eslint-plugin": "2.9.0",
|
"@stylistic/eslint-plugin": "2.10.1",
|
||||||
"@types/eslint__js": "8.42.3",
|
"@types/node": "22.9.0",
|
||||||
"@types/node": "22.8.4",
|
|
||||||
"esbuild": "0.24.0",
|
"esbuild": "0.24.0",
|
||||||
"eslint": "9.13.0",
|
"eslint": "9.14.0",
|
||||||
"eslint-plugin-jsdoc": "50.4.3",
|
"eslint-plugin-jsdoc": "50.4.3",
|
||||||
"jiti": "2.3.3",
|
"jiti": "2.4.0",
|
||||||
"typescript": "5.6.3",
|
"typescript": "5.6.3",
|
||||||
"typescript-eslint": "8.12.2"
|
"typescript-eslint": "8.14.0"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
pkgs:
|
pkgs:
|
||||||
pkgs.dockerTools.pullImage rec {
|
pkgs.dockerTools.pullImage rec {
|
||||||
imageName = "nginx";
|
imageName = "nginx";
|
||||||
imageDigest = "sha256:28402db69fec7c17e179ea87882667f1e054391138f77ffaf0c3eb388efc3ffb";
|
imageDigest = "sha256:5026c85d87419b6c3622622570ea5c25ab9f9bb48961554658272bbc18e518b1";
|
||||||
sha256 = "0zas3xrxlrr1qd3hc5p63q5hpja3cdfvv6alx10j8q489wn21m0s";
|
sha256 = "0zas3xrxlrr1qd3hc5p63q5hpja3cdfvv6alx10j8q489wn21m0s";
|
||||||
finalImageName = imageName;
|
finalImageName = imageName;
|
||||||
finalImageTag = "latest";
|
finalImageTag = "latest";
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
pkgs:
|
pkgs:
|
||||||
pkgs.dockerTools.pullImage rec {
|
pkgs.dockerTools.pullImage rec {
|
||||||
imageName = "quay.io/vaultwarden/server";
|
imageName = "quay.io/vaultwarden/server";
|
||||||
imageDigest = "sha256:7de8fd442afc26e4932a0b2521e2eec82db9f17667eef7b46fd9c2fa2e639de2";
|
imageDigest = "sha256:7271b8ceb729f9b46144c800125813dcc8d16bb6874217c48e59b22b45e47d7d";
|
||||||
sha256 = "07scp48xbvhz1y7m6sfq2s2s9pij6kj94ngs8ypdj41kxqmnrk6s";
|
sha256 = "11770g5g821i6wblydjdy1mp2j5w1w0ajnz762ivhlfbwyvs1yzv";
|
||||||
finalImageName = imageName;
|
finalImageName = imageName;
|
||||||
finalImageTag = "latest";
|
finalImageTag = "latest";
|
||||||
}
|
}
|
||||||
|
|
|
@ -11,7 +11,7 @@
|
||||||
extract-subs = buildNpmPackage {
|
extract-subs = buildNpmPackage {
|
||||||
name = "${pname}-npm";
|
name = "${pname}-npm";
|
||||||
src = ./.;
|
src = ./.;
|
||||||
npmDepsHash = "sha256-mIRn7MsQJCwBYNEL3IK4cV8X+kDouEdc9x59XWgUkYw=";
|
npmDepsHash = "sha256-WXkg4e5Nh3+haCbm+XJ1CB7rsA2uV/7eZUaOUl/NVk0=";
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
nodejs_20
|
nodejs_20
|
||||||
|
|
Binary file not shown.
|
@ -12,7 +12,7 @@
|
||||||
"typescript-eslint": "8.8.1"
|
"typescript-eslint": "8.8.1"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@types/fluent-ffmpeg": "2.1.26",
|
"@types/fluent-ffmpeg": "2.1.27",
|
||||||
"fluent-ffmpeg": "2.1.3"
|
"fluent-ffmpeg": "2.1.3"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
BIN
flake.lock
BIN
flake.lock
Binary file not shown.
BIN
flake.nix
BIN
flake.nix
Binary file not shown.
|
@ -113,9 +113,6 @@ let
|
||||||
hyprland = mkDep {
|
hyprland = mkDep {
|
||||||
owner = "hyprwm";
|
owner = "hyprwm";
|
||||||
repo = "Hyprland";
|
repo = "Hyprland";
|
||||||
|
|
||||||
# FIXME: https://github.com/hyprwm/Hyprland/issues/8410
|
|
||||||
rev = "dca75db127fedc58fc85ae0e6e47162e3d5d16f9";
|
|
||||||
};
|
};
|
||||||
|
|
||||||
hyprland-plugins = mkHyprDep {
|
hyprland-plugins = mkHyprDep {
|
||||||
|
|
BIN
nixosModules/ags-v2/config/package-lock.json
generated
BIN
nixosModules/ags-v2/config/package-lock.json
generated
Binary file not shown.
|
@ -3,15 +3,13 @@
|
||||||
"version": "0.0.0",
|
"version": "0.0.0",
|
||||||
"main": "app.ts",
|
"main": "app.ts",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@eslint/js": "9.13.0",
|
"@eslint/js": "9.14.0",
|
||||||
"@stylistic/eslint-plugin": "2.9.0",
|
"@stylistic/eslint-plugin": "2.10.1",
|
||||||
"@types/eslint__js": "8.42.3",
|
"@types/node": "22.9.0",
|
||||||
"@types/node": "22.8.1",
|
"eslint": "9.14.0",
|
||||||
"eslint": "9.13.0",
|
|
||||||
"eslint-plugin-jsdoc": "50.4.3",
|
"eslint-plugin-jsdoc": "50.4.3",
|
||||||
"fzf": "0.5.2",
|
"fzf": "0.5.2",
|
||||||
"jiti": "2.3.3",
|
"jiti": "2.4.0",
|
||||||
"typescript": "5.6.3",
|
"typescript-eslint": "8.14.0"
|
||||||
"typescript-eslint": "8.11.0"
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -99,7 +99,7 @@
|
||||||
})
|
})
|
||||||
// {
|
// {
|
||||||
"${agsConfigDir}/node_modules".source =
|
"${agsConfigDir}/node_modules".source =
|
||||||
buildNodeModules ./config "sha256-pK9S6qUjTIL0JDegYJlHSY5XEpLFKfA98MfZ59Q3IL4=";
|
buildNodeModules ./config "sha256-cyVdjRV1o/UvAPzXigNzXATq1mRmsXhDqnG4wnBzSXE=";
|
||||||
|
|
||||||
"${agsConfigDir}/tsconfig.json".source = pkgs.writers.writeJSON "tsconfig.json" {
|
"${agsConfigDir}/tsconfig.json".source = pkgs.writers.writeJSON "tsconfig.json" {
|
||||||
"$schema" = "https://json.schemastore.org/tsconfig";
|
"$schema" = "https://json.schemastore.org/tsconfig";
|
||||||
|
|
|
@ -56,7 +56,8 @@ in {
|
||||||
|
|
||||||
flakeDir = config.environment.variables.FLAKE;
|
flakeDir = config.environment.variables.FLAKE;
|
||||||
modulesDir = "${lib.removePrefix "/home/${cfg.user}/" flakeDir}/nixosModules";
|
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;
|
or config.home-manager.users.${cfg.user}.home.file."${modulesDir}/ags-v2/config/node_modules".source;
|
||||||
in
|
in
|
||||||
pkgs.runCommandLocal "agsConfig" {} ''
|
pkgs.runCommandLocal "agsConfig" {} ''
|
||||||
|
|
40
outputs.nix
40
outputs.nix
|
@ -147,7 +147,22 @@
|
||||||
perSystem (pkgs:
|
perSystem (pkgs:
|
||||||
import ./apps {inherit inputs 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 {
|
default = pkgs.mkShell {
|
||||||
packages = [
|
packages = [
|
||||||
(pkgs.writeShellScriptBin "mkIso" ''
|
(pkgs.writeShellScriptBin "mkIso" ''
|
||||||
|
@ -172,26 +187,12 @@
|
||||||
typescript
|
typescript
|
||||||
;
|
;
|
||||||
})
|
})
|
||||||
++ [
|
++ [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
|
|
||||||
'';
|
|
||||||
})
|
|
||||||
];
|
|
||||||
};
|
};
|
||||||
|
|
||||||
subtitles-dev = pkgs.mkShell {
|
subtitles-dev = pkgs.mkShell {
|
||||||
packages = builtins.attrValues {
|
packages =
|
||||||
|
(builtins.attrValues {
|
||||||
inherit
|
inherit
|
||||||
(pkgs)
|
(pkgs)
|
||||||
nodejs_latest
|
nodejs_latest
|
||||||
|
@ -203,7 +204,8 @@
|
||||||
(pkgs.nodePackages)
|
(pkgs.nodePackages)
|
||||||
ts-node
|
ts-node
|
||||||
;
|
;
|
||||||
};
|
})
|
||||||
|
++ [bumpNpmDeps];
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue