Fix mounting /scratch
Eelco Dolstra committed
Apr 20, 2021 at 17:43 UTC
2cd3261e37e3ac4e5befaac5891df4848f29365f
3 files changed
+8
-3
bastion/flake.nix
+1
-1
@@ -7,7 +7,7 @@
7
8
nixopsConfigurations.default =
9
{ inherit nixpkgs; }
10
- // import ./network.nix { inherit self nix nixops nixos-channel-scripts; };
10
+ // import ./network.nix { inherit self nixpkgs nix nixops nixos-channel-scripts; };
11
12
};
13
}
bastion/network.nix
+5
-2
@@ -1,4 +1,4 @@
1
-flakes @ { self, nix, nixops, nixos-channel-scripts }:
1
+flakes @ { self, nixpkgs, nix, nixops, nixos-channel-scripts }:
2
3
let
4
region = "eu-west-1";
@@ -128,6 +128,9 @@ in
128
system.configurationRevision = flakes.self.rev
129
or (throw "Cannot deploy from an unclean source tree!");
130
131
+ nix.registry.nixpkgs.flake = flakes.nixpkgs;
132
+ nix.nixPath = [ "nixpkgs=${flakes.nixpkgs}" ];
133
+
134
nixpkgs.overlays =
135
[ nix.overlay
136
nixops.overlay
@@ -167,7 +170,7 @@ in
170
fileSystems."/scratch" =
171
{ autoFormat = true;
172
fsType = "ext4";
170
- device = "/dev/xvdh";
173
+ device = "/dev/nvme1n1";
174
ec2.disk = resources.ebsVolumes.scratch;
175
};
176
delft/network.nix
+2
@@ -48,6 +48,8 @@ in {
48
{ system.configurationRevision = flakes.self.rev
49
or (throw "Cannot deploy from an unclean source tree!");
50
nixpkgs.overlays = [ flakes.nix.overlay ];
51
+ nix.registry.nixpkgs.flake = flakes.nixpkgs;
52
+ nix.nixPath = [ "nixpkgs=${flakes.nixpkgs}" ];
53
}
54
];
55
};