update jupiter and setup minecraft server

3 files changed, 39 insertions, 16 deletions

diff --git a/hosts/jupiter/config.nix b/hosts/jupiter/config.nix
index d8c2037..c5ab464 100644
--- a/hosts/jupiter/config.nix
+++ b/hosts/jupiter/config.nix
@@ -6,6 +6,7 @@
 
     extraSystemModules = [
       ./system.nix
+      inputs.hjem.nixosModules.default
     ];
   };
 
@@ -14,7 +15,6 @@
 
     user = {
       name = "collin";
-      email = "96917990+bluedragon1221@users.noreply.github.com";
       password = "$y$j9T$08yFysn8jr9K4Wk.hYXbG0$NzY9vIbNknJViA..Jw.vF8wmQtBgEZZU.cdLQOmDvU2";
     };
 
@@ -23,22 +23,14 @@
 
       programs = {
         firefox.enable = true;
+        blackbox.enable = true;
       };
     };
 
     terminal = {
-      theme = "adwaita";
-
-      terminalEmulators.blackbox.enable = true;
-
       shells.fish.enable = true;
 
       programs = {
-        bat.enable = true;
-        eza.enable = true;
-        fzf.enable = true;
-
-        nh.enable = true;
         lazygit.enable = true;
 
         starship = {
@@ -50,18 +42,32 @@
           enable = true;
           hardMode = false;
         };
+
+        git = {
+          enable = true;
+          userName = "Collin Williams";
+          userEmail = "96917990+bluedragon1221@users.noreply.github.com";
+        };
       };
     };
 
     boot = {
-      theme = "default";
       bootloader = "systemd-boot";
       plymouth.enable = true;
     };
 
-    networking = {
-      enable = true;
-      wifiDaemon = "networkmanager"; # apparently gnome doesn't support iwd
+    services = {
+      networking = {
+        enable = true;
+        wifiDaemon = "networkmanager"; # apparently gnome doesn't support iwd
+      };
+
+      audio = {
+        enable = true;
+        pulse.enable = true;
+      };
+
+      bluetooth.enable = true;
     };
   };
 }
diff --git a/hosts/jupiter/minecraft.nix b/hosts/jupiter/minecraft.nix
new file mode 100644
index 0000000..f4a6b2a
--- /dev/null
+++ b/hosts/jupiter/minecraft.nix
@@ -0,0 +1,18 @@
+{
+  networking.firewall.allowedUDPPorts = [19132];
+  virtualisation.oci-containers.containers = {
+    "Minecraft" = {
+      environment = {
+        EULA = "TRUE";
+        SERVER_NAME = "YServer";
+        TZ = "America/Chicago";
+        VERSION = "LATEST";
+        ALLOW_CHEATS = "false";
+        DIFFICULTY = "1";
+      };
+      image = "itzg/minecraft-bedrock-server";
+      ports = ["0.0.0.0:19132:19132/udp"];
+      volumes = ["/srv/minecraft/:/data"];
+    };
+  };
+}
diff --git a/hosts/jupiter/system.nix b/hosts/jupiter/system.nix
index faef253..cb59c1b 100644
--- a/hosts/jupiter/system.nix
+++ b/hosts/jupiter/system.nix
@@ -2,11 +2,10 @@
   imports = [
     inputs.disko.nixosModules.disko
     ./disks.nix
+    ./minecraft.nix
 
     inputs.nixos-facter-modules.nixosModules.facter
     {facter.reportPath = ./facter.json;}
-
-    ../../system/nix.nix
   ];
 
   systemd.network.wait-online.enable = false; # fix for weird wifi issue