chaos/nixfiles
1
0
Fork 0
Code Issues 2 Releases Activity

updates, piped frontend switched to pnpm not yarn, fixed scripts

Browse source
This commit is contained in:
Chaos 2023-07-09 20:07:31 +01:00
parent 86c1d583a2
commit cdd6cffa23
No known key found for this signature in database
10 changed files with 5168 additions and 772 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
extras/mk-enc-usb.nix
View file

@ -5,7 +5,7 @@
cryptsetup, cryptsetup,
e2fsprogs, e2fsprogs,
}: let }: let
usb_data = import ../hosts/lappy/hardware/usb_data.nix {}; usb_data = import ../data/usb_data.nix {};
in in
stdenv.mkDerivation { stdenv.mkDerivation {
name = "mk-enc-usb"; name = "mk-enc-usb";

2
extras/mk-normal-enc-ssd.nix
View file

@ -6,7 +6,7 @@
e2fsprogs, e2fsprogs,
dosfstools, dosfstools,
}: let }: let
ssd_data = import ../hosts/normal-enc/hardware/ssd_data.nix {}; ssd_data = import ../data/normal_drive_data.nix {};
in in
stdenv.mkDerivation { stdenv.mkDerivation {
name = "mk-normal-enc-ssd"; name = "mk-normal-enc-ssd";

24
flake.lock
View file

@ -47,11 +47,11 @@
"systems": "systems" "systems": "systems"
}, },
"locked": { "locked": {
"lastModified": 1685518550, "lastModified": 1687709756,
"narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=", "narHash": "sha256-Y5wKlQSkgEK2weWdOu4J3riRd+kV/VCgHsqLNTTWQ/0=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef", "rev": "dbabf0ca0c0c4bce6ea5eaf65af5cb694d2082c7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -119,11 +119,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1686778999, "lastModified": 1688218897,
"narHash": "sha256-3qBtOJdznerw33LgwJTSUL6u8/j1Ot83fcc0f6oHKmk=", "narHash": "sha256-qIBOgrUoQjWzbzC/SOQDGQHnyNkFPGnV3FWOgGKYNGY=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "e0034971f9def16bbc32124147787bc0f09f0e59", "rev": "7a0e9a67824aa05f972459aefc2caafe6fdc0f88",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -176,11 +176,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1686592866, "lastModified": 1688049487,
"narHash": "sha256-riGg89eWhXJcPNrQGcSwTEEm7CGxWC06oSX44hajeMw=", "narHash": "sha256-100g4iaKC9MalDjUW9iN6Jl/OocTDtXdeAj7pEGIRh4=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "0eeebd64de89e4163f4d3cf34ffe925a5cf67a05", "rev": "4bc72cae107788bf3f24f30db2e2f685c9298dc9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -192,11 +192,11 @@
}, },
"nur": { "nur": {
"locked": { "locked": {
"lastModified": 1686807758, "lastModified": 1688217966,
"narHash": "sha256-0Kg2VqEZzrwZubTrtj+fu77F/IftkDH6ZESwe4ZXkfw=", "narHash": "sha256-79TZUKNEdJORiPe77wmCd9zd5SITpw7xcDmGRKhQQfY=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "53bdfe0d57ba919516d99906d18db3a6f96b53f2", "rev": "6b5b11e0557dee1a174eaaa6571b460c651cccad",
"type": "github" "type": "github"
}, },
"original": { "original": {

2
home/base/zsh.nix
View file

@ -4,7 +4,7 @@ in {
home.packages = with pkgs; [exa bat ripgrep vault age]; home.packages = with pkgs; [exa bat ripgrep vault age];
programs.zsh = { programs.zsh = {
enable = true; enable = true;
enableSyntaxHighlighting = true; syntaxHighlighting.enable = true;
enableAutosuggestions = true; enableAutosuggestions = true;
oh-my-zsh = { oh-my-zsh = {
enable = true; enable = true;

2
overlay/piped/backend/deps.nix
View file

@ -56,5 +56,5 @@ in
outputHashAlgo = "sha256"; outputHashAlgo = "sha256";
outputHashMode = "recursive"; outputHashMode = "recursive";
outputHash = "sha256-KhvijeYTkXSRMQm9r4emxhr2oGvsqJ9Fjqnz41qwtFk="; outputHash = "sha256-qTwBcpCjD+4Ejhp6V55wGnCBaKImEaK/L0zFxNkp19o=";
} }

3
overlay/piped/frontend/default.nix
View file

@ -19,7 +19,7 @@ in
}; };
packageJSON = "${src}/package.json"; packageJSON = "${src}/package.json";
yarnLock = "${src}/yarn.lock"; yarnLock = ./yarn.lock;
yarnNix = ./yarn.nix; yarnNix = ./yarn.nix;
patchPhase = '' patchPhase = ''
@ -35,6 +35,7 @@ in
buildPhase = '' buildPhase = ''
runHook preBuild runHook preBuild
cp ${./yarn.lock} yarn.lock
yarn --offline build yarn --offline build
runHook postBuild runHook postBuild
''; '';

4335
overlay/piped/frontend/yarn.lock Normal file
View file

File diff suppressed because it is too large Load diff

1554
overlay/piped/frontend/yarn.nix
View file

File diff suppressed because it is too large Load diff

12
overlay/piped/meta.json
View file

@ -1,14 +1,14 @@
{ {
"frontend": { "frontend": {
"rev": "6f060151f21e087fe5c5aacf6527237fd713362e", "rev": "8df66abb0202372ef9b3e58b778586f709764e87",
"sha256": "sha256-rYy1b+9uOqCVuKaSnt4aV286vvMR9xs4T7uzl49GdL8=" "sha256": "sha256-xU4FxmMbt2T2s2J8fc86cUMup/wSI53F4VEqrb4O6L8="
}, },
"backend": { "backend": {
"rev": "a694e8d9d3344417b4e177f93da54fb9368a83a6", "rev": "93a5b8478e7783a7fbf697e405de943212cf6aa2",
"sha256": "sha256-4FrnGZquD3ufuoP89BK/XqFBS0adiQLM4gB5n1Wruv0=" "sha256": "sha256-BdBSWNXt6Q+xwGezk0E51cu2V24Pp/64HslyDegvN4k="
}, },
"proxy": { "proxy": {
"rev": "8c2797110bf21c641004690499d9cd59bc6a1190", "rev": "831d7da257caef233347beb0c0f004ba084d3425",
"sha256": "sha256-VkG5sHcKzIudY8LQpBKXYLj+6v8r6Lj01tlVw8u0sTk=" "sha256": "sha256-x+nNGhYfXDyL8KKrgd18AJmeis13W5KMaGeJiSJepIM="
} }
} }

4
overlay/piped/update.sh
View file

@ -1,5 +1,5 @@
#!/usr/bin/env nix-shell #!/usr/bin/env nix-shell
#!nix-shell -i bash -p curl jq git moreutils yarn2nix nix nix-prefetch #!nix-shell -i bash -p curl jq git moreutils yarn2nix nodejs_20 yarn nix nix-prefetch
set -euo pipefail set -euo pipefail
BASE_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) BASE_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
@ -27,7 +27,9 @@ if [ "$new_frontend_rev" != "$old_frontend_rev" ] || [ "${FORCE_UPDATE-}" != ""
git clone https://github.com/TeamPiped/Piped git clone https://github.com/TeamPiped/Piped
pushd Piped pushd Piped
git reset --hard "$new_frontend_rev" git reset --hard "$new_frontend_rev"
yarn install --mode update-lockfile
nix run "github:NixOS/nixpkgs/nixos-unstable#yarn2nix" > "${BASE_DIR}/frontend/yarn.nix" nix run "github:NixOS/nixpkgs/nixos-unstable#yarn2nix" > "${BASE_DIR}/frontend/yarn.nix"
cp yarn.lock "${BASE_DIR}/frontend/yarn.lock"
popd popd
popd popd
fi fi