2022-08-20

2 files changed, 19 insertions, 32 deletions

diff --git a/configurations/melian/default.nix b/configurations/melian/default.nix
index 6703d0f..710f26c 100644
--- a/configurations/melian/default.nix
+++ b/configurations/melian/default.nix
@@ -30,6 +30,7 @@ with lib; {
 
     games = {
       lutris.enable = true;
+      minecraft.client.enable = true;
       steam.enable = true;
     };
 
@@ -157,16 +158,16 @@ with lib; {
   };
 
   fileSystems = {
+    "/boot" = {
+      device = "/dev/disk/by-uuid/1083-C8A0";
+      fsType = "vfat";
+    };
+
     "/" = {
       device = "/dev/disk/by-uuid/bb8b09dc-cc67-47e5-8280-532b17a9e62a";
       fsType = "xfs";
       options = ["noatime"];
     };
-
-    "/boot" = {
-      device = "/dev/disk/by-uuid/1083-C8A0";
-      fsType = "vfat";
-    };
   };
 
   # NOTE This will make hibernation extremely hard if on an encrypted partition.
diff --git a/configurations/varda/default.nix b/configurations/varda/default.nix
index b9d84f7..f700df5 100644
--- a/configurations/varda/default.nix
+++ b/configurations/varda/default.nix
@@ -14,12 +14,13 @@ with lib; {
       client.enable = true;
     };
 
-    acme.enable = true;
+    games.minecraft.server.enable = true;
 
-    rss-bridge.enable = true;
-    radicale.enable = true;
+    acme.enable = true;
   };
 
+  systemd.services.minecraft-server.wantedBy = mkForce [];
+
   networking = let
     interface = "eth0";
   in {
@@ -51,41 +52,26 @@ with lib; {
   };
 
   boot = {
-    loader.grub = {
-      enable = true;
-      device = "/dev/sda";
-    };
-
-    initrd = {
-      luks.devices.nixos = {
-        device = "/dev/sda2";
-        allowDiscards = true;
-        bypassWorkqueues = true;
-      };
+    loader = {
+      efi.canTouchEfiVariables = true;
 
-      network = {
+      systemd-boot = {
         enable = true;
-        ssh = {
-          enable = true;
-          port = head config.services.openssh.ports;
-          hostKeys = map (k: k.path) config.services.openssh.hostKeys;
-          authorizedKeys = config.my.openssh.authorizedKeys.keys;
-        };
+        configurationLimit = 10;
       };
-
-      availableKernelModules = ["ata_piix" "sd_mod" "sr_mod" "uhci_hcd" "virtio_pci" "virtio_scsi"];
     };
+
+    initrd.availableKernelModules = ["ata_piix" "sd_mod" "sr_mod" "uhci_hcd" "virtio_pci" "virtio_scsi"];
   };
 
   fileSystems = {
     "/boot" = {
-      device = "LABEL=boot";
-      fsType = "xfs";
-      options = ["noatime"];
+      device = "/dev/disk/by-uuid/03FD-B6C0";
+      fsType = "vfat";
     };
 
     "/" = {
-      device = "LABEL=nixos";
+      device = "/dev/disk/by-uuid/b07e8273-915a-424c-8c55-cdc2bd482f49";
       fsType = "xfs";
       options = ["noatime"];
     };