From 786c3efd417a60c5824fd604919d77e7e0415e34 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Sun, 11 Jun 2023 09:36:00 +0200 Subject: [PATCH] 22.11 fixup --- flake.lock | 110 ++++++++++++++++++--------- flake.nix | 2 +- profiles/code-remote/default.nix | 10 ++- profiles/remote-builders/default.nix | 2 +- 4 files changed, 84 insertions(+), 40 deletions(-) diff --git a/flake.lock b/flake.lock index 73887cb..db69385 100644 --- a/flake.lock +++ b/flake.lock @@ -4,15 +4,14 @@ "inputs": { "nixpkgs": [ "nixpkgs" - ], - "utils": "utils" + ] }, "locked": { - "lastModified": 1677533532, - "narHash": "sha256-2Ie47MONhIFOxvbLmwhmCCe/IoVDVd7YnoK61vu5Xy8=", + "lastModified": 1686391840, + "narHash": "sha256-5S0APl6Mfm6a37taHwvuf11UHnAX0+PnoWQbsYbMUnc=", "owner": "nix-community", "repo": "home-manager", - "rev": "305daba44a9df57738cffc67c08129005a25579a", + "rev": "0144ac418ef633bfc9dbd89b8c199ad3a617c59f", "type": "github" }, "original": { @@ -23,11 +22,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1677440795, - "narHash": "sha256-Kmjr95L42iioTItuA6nKCaObAXQvgRTPmj+62dx5OZg=", + "lastModified": 1686452266, + "narHash": "sha256-zLKiX0iu6jZFeZDpR1gE6fNyMr8eiM8GLnj9SoUCjFs=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "2a483ad9cd2d931ab52cd5f897c447beb8328bed", + "rev": "2a807ad6e8dc458db08588b78cc3c0f0ec4ff321", "type": "github" }, "original": { @@ -38,27 +37,43 @@ }, "nixpkgs": { "locked": { - "lastModified": 1677480869, - "narHash": "sha256-JqSHh8zE2ztj185hYYYx7+ML9DVNjDVMinTDbYP/iq0=", + "lastModified": 1686392259, + "narHash": "sha256-hqSS9hKhWldIZr1bBp9xKhIznnGPICGKzuehd2LH0UA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "02aa9854e20363b33932b5a9d4e87bc3c37ce820", + "rev": "ef24b2fa0c5f290a35064b847bc211f25cb85c88", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-22.11-small", + "ref": "nixos-22.11", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_2": { + "locked": { + "lastModified": 1680122840, + "narHash": "sha256-zCQ/9iFHzCW5JMYkkHMwgK1/1/kTMgCMHq4THPINpAU=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "a575c243c23e2851b78c00e9fa245232926ec32f", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-22.11", "repo": "nixpkgs", "type": "github" } }, "nur": { "locked": { - "lastModified": 1677556544, - "narHash": "sha256-ovD0wtZFEoukrJDCbG3MlmtLtU2kfA+QzacOpO5MdUU=", + "lastModified": 1686462208, + "narHash": "sha256-L58OUbCXtIzlBJ5QQBETWgPFgmekOwW99LhiyUp9Cto=", "owner": "nix-community", "repo": "NUR", - "rev": "d868fb8917694d695dcd9d88cf4b40c8eefd1677", + "rev": "416eb10d0850d5041169b70e57df91206f7a613d", "type": "github" }, "original": { @@ -67,13 +82,31 @@ "type": "github" } }, + "pbsds-papers": { + "inputs": { + "nixpkgs": "nixpkgs_2" + }, + "locked": { + "lastModified": 1685899253, + "narHash": "sha256-JFb/PwKS3+UG/uEghVJXnjhpP0tSnzrXBmN2LM1yyds=", + "ref": "refs/heads/main", + "rev": "58cfccabf3352dc7d9956adf59a3ae4cf9a19bdd", + "revCount": 422, + "type": "git", + "url": "ssh://git@github.com/pbsds/papers.git" + }, + "original": { + "type": "git", + "url": "ssh://git@github.com/pbsds/papers.git" + } + }, "pr-polaris14": { "locked": { - "lastModified": 1672706949, - "narHash": "sha256-7w8ylNEmeWX7++E6vECZ4nY6I0AGA/irT7eWQ7c7aX0=", + "lastModified": 1678925311, + "narHash": "sha256-ruz0MPR/FGpX69nqJFII1VP4LqPc2mjDUxyr11NeC9Y=", "owner": "pbsds", "repo": "nixpkgs", - "rev": "8d4e5e6a87684b3035a94d0e7e7c19d342448f68", + "rev": "cb4990ec84930308c79714daaa3a6f34d5c14538", "type": "github" }, "original": { @@ -83,46 +116,49 @@ "type": "github" } }, + "pr-remote-exec": { + "locked": { + "lastModified": 1681506994, + "narHash": "sha256-GQmdJqXACW7Jmf1NPyu+pO1iuyyFXxbYh4Q6JmY3iMU=", + "owner": "pbsds", + "repo": "nixpkgs", + "rev": "3be9b13e0e87c5f35ada163c9c2fd4cf2d9a9560", + "type": "github" + }, + "original": { + "owner": "pbsds", + "ref": "remote-exec-init", + "repo": "nixpkgs", + "type": "github" + } + }, "root": { "inputs": { "home-manager": "home-manager", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs", "nur": "nur", + "pbsds-papers": "pbsds-papers", "pr-polaris14": "pr-polaris14", + "pr-remote-exec": "pr-remote-exec", "unstable": "unstable" } }, "unstable": { "locked": { - "lastModified": 1677517442, - "narHash": "sha256-3EJINvDhfwlrMi7arwntVJ6uu6L+MApxyoUxUZ22uHQ=", + "lastModified": 1686412476, + "narHash": "sha256-inl9SVk6o5h75XKC79qrDCAobTD1Jxh6kVYTZKHzewA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7b6e7dd796f8fe17f673b7434e9366f2f7dbd67e", + "rev": "21951114383770f96ae528d0ae68824557768e81", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable-small", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } - }, - "utils": { - "locked": { - "lastModified": 1667395993, - "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 5e5a16b..21a7314 100644 --- a/flake.nix +++ b/flake.nix @@ -16,7 +16,7 @@ # TODO: somehow make these private repos optional (a lazy fetch would be nice) pbsds-papers.url = "git+ssh://git@github.com/pbsds/papers.git"; - pbsds-papers.flake = false; + #pbsds-papers.flake = false; # temporary stuff i want to use # TODO: can i fetch a subset of files if these? ^ diff --git a/profiles/code-remote/default.nix b/profiles/code-remote/default.nix index 5d4d369..ca32080 100644 --- a/profiles/code-remote/default.nix +++ b/profiles/code-remote/default.nix @@ -181,7 +181,8 @@ in { git gh hub micro ]) ++ (let - shell = import "${inputs.pbsds-papers}/shell.nix" { inherit pkgs; }; + #shell = import "${inputs.pbsds-papers}/shell.nix" { inherit pkgs; }; + shell = inputs.pbsds-papers.devShells.${pkgs.system}.default; in (with pkgs; [ imagemagick librsvg ]) # for some reason it isn't picked up from from shell.nix? ++ shell.buildInputs @@ -206,6 +207,13 @@ in { #proxyPass = "http://10.240.100.3:${toString container.services.code-server.port}"; proxyPass = "http://${config.containers.${container-name}.localAddress}:${toString container.services.code-server.port}"; proxyWebsockets = true; + # https://github.com/coder/code-server/issues/4443 + extraConfig = '' + proxy_set_header Host $host; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection upgrade; + proxy_set_header Accept-Encoding gzip; + ''; }; }; diff --git a/profiles/remote-builders/default.nix b/profiles/remote-builders/default.nix index 0a778bd..d4de3e6 100644 --- a/profiles/remote-builders/default.nix +++ b/profiles/remote-builders/default.nix @@ -32,7 +32,7 @@ let maxJobs = 4; # 8 cores #maxJobs = 1; # at least for big-parallel speedFactor = 1; - supportedFeatures = [ "kvm" "big-parallel" "nixos-test" ]; + supportedFeatures = [ "kvm" "big-parallel" ]; # TODO: "nixos-test" #mandatoryFeatures = [ ]; publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJ3QhTGS03Sqm6OeCEz5AIGqJnBttKaBqMgNXp3Md7t4"; }