Moved hosts to be a top level directory instead of under modules

6 files changed, 132 insertions, 0 deletions

diff --git a/hosts/herra/configuration.nix b/hosts/herra/configuration.nix
new file mode 100644
index 0000000..a9b1912
--- /dev/null
+++ b/hosts/herra/configuration.nix
@@ -0,0 +1,21 @@
+{
+  self,
+  inputs,
+  ...
+}: {
+  flake.nixosModules.herraConfiguration = {
+    pkgs,
+    lib,
+    ...
+  }: {
+    imports = [
+      self.nixosModules.herraHardware
+      inputs.home-manager.nixosModules.home-manager
+      self.nixosModules.system
+      self.nixosModules.ngeNiri # NeonGenesisEvangelion rice of niri
+      self.nixosModules.browser # Configured browser
+    ];
+
+    # ...
+  };
+}
diff --git a/hosts/herra/default.nix b/hosts/herra/default.nix
new file mode 100644
index 0000000..4e9c74e
--- /dev/null
+++ b/hosts/herra/default.nix
@@ -0,0 +1,11 @@
+{
+  self,
+  inputs,
+  ...
+}: {
+  flake.nixosConfigurations.herra = inputs.nixpkgs.lib.nixosSystem {
+    modules = [
+      self.nixosModules.herraConfiguration
+    ];
+  };
+}
diff --git a/hosts/herra/hardware.nix b/hosts/herra/hardware.nix
new file mode 100644
index 0000000..2ec7efb
--- /dev/null
+++ b/hosts/herra/hardware.nix
@@ -0,0 +1,54 @@
+{
+  self,
+  inputs,
+  ...
+}: {
+  flake.nixosModules.herraHardware = {
+    config,
+    lib,
+    pkgs,
+    modulesPath,
+    ...
+  }: {
+    # Do not modify this file!  It was generated by ‘nixos-generate-config’
+    # and may be overwritten by future invocations.  Please make changes
+    # to /etc/nixos/configuration.nix instead.
+
+    imports = [
+      (modulesPath + "/installer/scan/not-detected.nix")
+    ];
+
+    boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "nvme" "thunderbolt" "usbhid" "usb_storage" "sd_mod"];
+    boot.initrd.kernelModules = [];
+    boot.kernelModules = ["kvm-intel"];
+    boot.extraModulePackages = [];
+
+    fileSystems."/" = {
+      device = "/dev/disk/by-uuid/229a13d8-159e-40b6-915a-606c32e3ca79";
+      fsType = "btrfs";
+      options = ["subvol=@"];
+    };
+
+    fileSystems."/home" = {
+      device = "/dev/disk/by-uuid/229a13d8-159e-40b6-915a-606c32e3ca79";
+      fsType = "btrfs";
+      options = ["subvol=@home"];
+    };
+
+    fileSystems."/boot" = {
+      device = "/dev/disk/by-uuid/03F6-F782";
+      fsType = "vfat";
+      options = ["fmask=0077" "dmask=0077"];
+    };
+
+    fileSystems."/nix" = {
+      device = "/dev/disk/by-uuid/28fb6b6d-fb64-4a42-80af-88ce7b081258";
+      fsType = "btrfs";
+    };
+
+    swapDevices = [];
+
+    nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+    hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+  };
+}
diff --git a/hosts/mystra/configuration.nix b/hosts/mystra/configuration.nix
new file mode 100644
index 0000000..0185c19
--- /dev/null
+++ b/hosts/mystra/configuration.nix
@@ -0,0 +1,19 @@
+{
+  self,
+  inputs,
+  ...
+}: {
+  flake.nixosModules.mystraConfiguration = {
+    pkgs,
+    lib,
+    ...
+  }: {
+    imports = [
+      self.nixosModules.mystraHardware
+      self.nixosModules.system
+      self.nixosModules.niri
+    ];
+
+    # ...
+  };
+}
diff --git a/hosts/mystra/default.nix b/hosts/mystra/default.nix
new file mode 100644
index 0000000..5a7fad5
--- /dev/null
+++ b/hosts/mystra/default.nix
@@ -0,0 +1,12 @@
+{
+  self,
+  inputs,
+  ...
+}: {
+  flake.nixosConfigurations.mystra = inputs.nixpkgs.lib.nixosSystem {
+    modules = [
+      self.nixosModules.mystraConfiguration
+      inputs.nixos-hardware.nixosModules.lenovo-thinkpad-x220
+    ];
+  };
+}
diff --git a/hosts/mystra/hardware.nix b/hosts/mystra/hardware.nix
new file mode 100644
index 0000000..6599d7f
--- /dev/null
+++ b/hosts/mystra/hardware.nix
@@ -0,0 +1,15 @@
+{
+  self,
+  inputs,
+  ...
+}: {
+  flake.nixosModules.mystraHardware = {
+    config,
+    lib,
+    pkgs,
+    modulesPath,
+    ...
+  }: {
+    # TODO: Insert hardware config generated by Mystra
+  };
+}