diff --git a/.envrc b/.envrc index 518353b..db880d2 100644 --- a/.envrc +++ b/.envrc @@ -57,8 +57,10 @@ if [[ ! -s .direnv/pull-date || "$now" != "$(cat .direnv/pull-date)" ]]; then )" # update_args+=(--output-lock-file "$tmp"/new-flake.lock) set -x - nix flake update "${update_args[@]}" || + nix flake update "${update_args[@]}" || { nix flake update "${update_args[@]}" --option access-tokens "" + nix flake prefetch-inputs --option access-tokens "" + } ) if command -v pueue >/dev/null && pueue status >&/dev/null; then # update and build shell in background diff --git a/flake.nix b/flake.nix index 9c469ff..d701fa5 100644 --- a/flake.nix +++ b/flake.nix @@ -322,7 +322,7 @@ inherit (input-views.inputs-edge.system-manager-edge.packages.${system}) system-manager; inherit (self.packages.${system}) nom-system-manager; envrc-pkgs = [ - # self.packages.${system}.nom-nixos-rebuild + # pkgs.nixos-rebuild-ng self.packages.${system}.nom-nixos-rebuild-ng # self.packages.${system}.nom-home-manager pkgs.nix-output-monitor @@ -342,7 +342,7 @@ pkgs.rsync ]); remoteenv = mkShell { } [ - # self.packages.${system}.nom-nixos-rebuild + # pkgs.nixos-rebuild-ng self.packages.${system}.nom-nixos-rebuild-ng # self.packages.${system}.nom-home-manager pkgs.age diff --git a/overlays/pbsdspkgs.nix b/overlays/pbsdspkgs.nix index 57946c8..09e08ea 100644 --- a/overlays/pbsdspkgs.nix +++ b/overlays/pbsdspkgs.nix @@ -15,7 +15,7 @@ let in { pbsds = lib.makeScope prev.newScope (pbsds: { - nom-nixos-rebuild = mkNomWrapper prev.nixos-rebuild; + # nom-nixos-rebuild = mkNomWrapper prev.nixos-rebuild; nom-nixos-rebuild-ng = mkNomWrapper prev.nixos-rebuild-ng; nom-home-manager = mkNomWrapper prev.home-manager; nom-system-manager = mkNomWrapper prev.system-manager; diff --git a/profiles/known-hosts/hosts.toml b/profiles/known-hosts/hosts.toml index 9253b86..e2f9f1d 100644 --- a/profiles/known-hosts/hosts.toml +++ b/profiles/known-hosts/hosts.toml @@ -78,7 +78,7 @@ ssh.listenPublicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIH03MEINNnjBvtmvN2QsC ["garp.tail9aac63.ts.net"] # gtx 3060 ti aliases = [ "garp.pbsds.net" ] buildMachine.systems = ["x86_64-linux", "i686-linux", "riscv64-linux"] -buildMachine.maxJobs = 2 # 8 threads 32GB +buildMachine.maxJobs = 2 # 8 threads 64GB buildMachine.speedFactor = 4 # i7-6700 buildMachine.supportedFeatures = ["kvm", "nixos-test", "cuda" ] #, "ccache" ] # no ccache because we have yet to setup distributed ccache buildMachine.protocol = "ssh-ng" diff --git a/profiles/mounts/meconium-nfs.nix b/profiles/mounts/meconium-nfs.nix index 7f98641..b836117 100644 --- a/profiles/mounts/meconium-nfs.nix +++ b/profiles/mounts/meconium-nfs.nix @@ -30,6 +30,7 @@ /* in joinSets (map (mkMount "/mnt/meconium" "100.113.27.44:/mnt/meconium" ) [ */ "" "/Backups" + "/Backups/yt" "/Backups/rocm.pbsds.net" "/blob" "/blob/attic"