wip

acmcsufoss · Apr 17, 2024 · 0876341 · 0876341
1 parent aba7ed0
commit 0876341
Show file tree

Hide file tree

Showing 9 changed files with 33 additions and 55 deletions.
diff --git a/flake.nix b/flake.nix
@@ -74,24 +74,8 @@
 			};
 
 			nixosConfigurations = {
-				cirno = nixpkgs.lib.nixosSystem {
-					system = "x86_64-linux";
-					modules = [
-						({ ... }: { nixpkgs.overlays = [ overlays.default ]; })
-						./servers/base.nix
-						./servers/cirno/configuration.nix
-					];
-					specialArgs = inputs // { inherit self; };
-				};
-				cs306 = nixpkgs.lib.nixosSystem {
-					system = "x86_64-linux";
-					modules = [
-						({ ... }: { nixpkgs.overlays = [ overlays.default ]; })
-						./servers/base.nix
-						./servers/cs306/configuration.nix
-					];
-					specialArgs = inputs // { inherit self; };
-				};
+				cirno = import ./servers/cirno inputs;
+				cs306 = import ./servers/cs306 inputs;
 			};
 		}
 	);

diff --git a/packages/imports.nix b/packages/imports.nix
@@ -1,14 +1,10 @@
-{ config, pkgs, lib, ... }:
+{ ... }:
 
-let sources = import <acm-aws/nix/sources.nix> { };
-
-in {
+{
 	imports = [
 		./caddy/caddy.nix
 		./sysmet/sysmet.nix
 		./dischord/service.nix
 		./christmasd/service.nix
 	];
-
-	nixpkgs.overlays = import <acm-aws/nix/overlays.nix>;
 }
diff --git a/servers/base.nix b/servers/base.nix
@@ -1,11 +1,9 @@
-{ config, pkgs, lib, ... }:
+{ config, pkgs, lib, self, ... }:
 
-let sources = import ../nix/sources.nix;
-
-in {
+{
 	imports = [
-		<acm-aws/packages/imports.nix>
-		<acm-aws/nix/modules>
+		(self + "/packages/imports.nix")
+		(self + "/nix/modules")
 	];
 
 	services.journald = {
@@ -41,5 +39,10 @@ in {
 	];
 
 	# Deploy ./static to all servers.
-	deployment.staticPaths = [ ../static ];
+	deployment.staticPaths = [ (self + "/static") ];
+
+	# Add the flake's overlays to the system.
+	nixpkgs.overlays = [
+		self.overlays.${pkgs.system}.default
+	];
 }
diff --git a/servers/cirno/configuration.nix b/servers/cirno/configuration.nix
@@ -1,9 +1,9 @@
-{ config, lib, pkgs, modulesPath, ... }:
+{ config, lib, pkgs, modulesPath, self, ... }:
 
 {
 	imports = [
 		(modulesPath + "/virtualisation/amazon-image.nix")
-		<acm-aws/servers/base.nix>
+		(self + "/servers/base.nix")
 		./services.nix
 		./telemetry.nix
 	];

diff --git a/servers/cirno/default.nix b/servers/cirno/default.nix
@@ -1,8 +1,7 @@
-let
-	sources = import <acm-aws/nix/sources.nix>;
-in
+{ nixpkgs, ... }@inputs:
 
-import "${sources.nixpkgs}/nixos" {
+nixpkgs.lib.nixosSystem {
 	system = "x86_64-linux";
-	configuration = import ./configuration.nix;
+	modules = [ ./servers/cirno/configuration.nix ];
+	specialArgs = inputs;
 }
diff --git a/servers/cirno/main.tf b/servers/cirno/main.tf
@@ -71,8 +71,9 @@ resource "aws_instance" "cirno" {
 }
 
 module "deployment" {
-	source = "git::https://github.com/diamondburned/terraform-nixos.git//deploy_nixos?ref=9d26ace355b2ed7d64a253b11ab12395a1395030"
-	nixos_config = "${path.module}"
+	source = "github.com/tweag/terraform-nixos//deploy_nixos?ref=646cacb12439ca477c05315a7bfd49e9832bc4e3"
+	nixos_config = "cirno"
+	flake = true
 	target_host = var.host != null ? var.host : aws_instance.cirno.public_ip
 	ssh_private_key_file = var.ssh_private_key_file
 	ssh_agent = false

diff --git a/servers/cs306/configuration.nix b/servers/cs306/configuration.nix
@@ -1,13 +1,8 @@
-# Edit this configuration file to define what should be installed on
-# your system.	Help is available in the configuration.nix(5) man page
-# and in the NixOS manual (accessible by running ‘nixos-help’).
-
-{ config, pkgs, lib, ... }:
+{ config, pkgs, lib, self, ... }:
 
 {
-	imports = [ # Include the results of the hardware scan.
-		<acm-aws/servers/base.nix>
-		# <acm-aws/containers/cs306/test.nix>
+	imports = [
+		(self + "/servers/base.nix")
 		./hardware-configuration.nix
 		./services.nix
 		./recovery.nix

diff --git a/servers/cs306/default.nix b/servers/cs306/default.nix
@@ -1,8 +1,7 @@
-let
-	sources = import <acm-aws/nix/sources.nix>;
-in
+{ nixpkgs, ... }@inputs:
 
-import "${sources.nixpkgs}/nixos" {
+nixpkgs.lib.nixosSystem {
 	system = "x86_64-linux";
-	configuration = import ./configuration.nix;
+	modules = [ ./servers/cs306/configuration.nix ];
+	specialArgs = inputs;
 }
diff --git a/servers/cs306/main.tf b/servers/cs306/main.tf
@@ -9,8 +9,9 @@ variable "host" {
 }
 
 module "deployment" {
-	source = "git::https://github.com/diamondburned/terraform-nixos.git//deploy_nixos?ref=9d26ace355b2ed7d64a253b11ab12395a1395030"
-	nixos_config = "${path.module}"
+	source = "github.com/tweag/terraform-nixos//deploy_nixos?ref=646cacb12439ca477c05315a7bfd49e9832bc4e3"
+	nixos_config = "cs306"
+	flake = true
 	target_host = "${var.host}"
 	ssh_private_key_file = var.ssh_private_key_file
 	ssh_agent = false