quickfix for https://github.com/NixOS/nixpkgs/issues/244159\#issuecom…

…ment-1640353626
heywoodlh · Jul 20, 2023 · 658d1b1 · 658d1b1
1 parent 6c4899a
commit 658d1b1
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/nixos/hosts/nix-ext-net/configuration.nix b/nixos/hosts/nix-ext-net/configuration.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ config, pkgs, lib, ... }:
 
 {
   imports =
@@ -75,5 +75,15 @@
     flake = "github:heywoodlh/nixos-configs#nix-ext-net";
   };
 
+  # Disable squid client on this system
+  # Prevents recursive dependencies
+  # I.E. squid not able to come up due to squid not being up
+  networking.proxy = {
+    default = lib.mkForce null;
+    httpProxy = lib.mkForce config.networking.proxy.default;
+    httpsProxy = lib.mkForce config.networking.proxy.default;
+    noProxy = lib.mkForce config.networking.proxy.default;
+  };
+
   system.stateVersion = "22.11";
 }
diff --git a/nixos/server.nix b/nixos/server.nix
@@ -56,6 +56,13 @@ in {
     pkgs.zsh
   ];
 
+  # Quick fix: https://github.com/NixOS/nixpkgs/issues/244159#issuecomment-1640353626
+  nix.nixPath = [
+    "nixpkgs=https://github.com/NixOS/nixpkgs/archive/b6bbc53029a31f788ffed9ea2d459f0bb0f0fbfc.tar.gz"
+    "nixos-config=/etc/nixos/configuration.nix"
+    "/nix/var/nix/profiles/per-user/root/channels"
+  ];
+
   # Enable Docker
   virtualisation = {
     docker.enable = true;