WIP RomRaider derivation

flake.nix

@@ -15,7 +15,6 @@
         common = import ./modules/common.nix;
         prompt = import ./modules/prompt.nix;
         server = import ./modules/server.nix;
-        zerotier = import ./modules/zerotier.nix;
       };
 
       nixosConfigurations = {
@@ -29,11 +28,6 @@
           modules = [ ./hosts/monolith ];
           specialArgs = { inherit self inputs secrets; };
         };
-        quasar = nixpkgs.lib.nixosSystem {
-          system = "x86_64-linux";
-          modules = [ ./hosts/quasar ];
-          specialArgs = { inherit self inputs secrets; };
-        };
       };
     };
 }

hosts/marauder/default.nix

@@ -3,10 +3,8 @@
   imports = [
     self.nixosModules.common
     self.nixosModules.prompt
-    self.nixosModules.zerotier
     ./backup.nix
     ./dev.nix
-    ./printing.nix
   ];
 
   networking.hostName = "marauder";
@@ -86,8 +84,9 @@
       ffmpeg
       (callPackage ./ffcheck.nix { })
 
-      # Productivity
+      # Misc
       obsidian
+      (callPackage ./romraider.nix { })
     ]);
   };
 

hosts/marauder/printing.nix

@@ -1,12 +0,0 @@
-{ ... }:
-{
-  services.printing = {
-    enable = true;
-  };
-
-  services.avahi = {
-    enable = true;
-    nssmdns4 = true;
-    openFirewall = true;
-  };
-}

hosts/marauder/romraider.nix

@@ -0,0 +1,24 @@
+{ stdenv, fetchFromGitHub, ant, jdk11, makeWrapper, jre }: stdenv.mkDerivation {
+  pname = "romraider";
+  version = "1.0.0";
+
+  src = fetchFromGitHub {
+    owner = "Romraider";
+    repo = "Romraider";
+    rev = "1.0.0-DEC01-2023";
+    hash = "sha256-KCG6D/+yupGahzPtZk1l9FK826MHZKdTuWoTCLC0ngY=";
+  };
+
+  JRE_DIR = jdk11;
+
+  nativeBuildInputs = [ ant jdk11 makeWrapper ];
+
+  buildPhase = "ant build-linux";
+
+  installPhase = ''
+    mkdir -p $out/{bin,share/java}
+    install build/linux/lib/RomRaider.jar $out/share/java/romraider.jar
+    makeWrapper ${jdk11}/bin/java $out/bin/romraider \
+      --add-flags "-jar $out/share/java/romraider.jar"
+  '';
+}

hosts/monolith/default.nix

@@ -4,7 +4,6 @@
     self.nixosModules.common
     self.nixosModules.prompt
     self.nixosModules.server
-    self.nixosModules.zerotier
     ./dns.nix
   ];
 

hosts/quasar/default.nix

@@ -1,47 +0,0 @@
-{ self, config, modulesPath, ... }:
-{
-  imports = [
-    "${modulesPath}/virtualisation/amazon-image.nix"
-    self.nixosModules.common
-    self.nixosModules.prompt
-    self.nixosModules.server
-  ];
-
-  networking = {
-    hostName = "quasar";
-    domain = "consortium.chat";
-    firewall.allowedTCPPorts = [ 80 443 ];
-  };
-
-  services.postgresql = {
-    enable = true;
-  };
-
-  services.caddy = {
-    enable = true;
-    virtualHosts = {
-      "${config.networking.domain}".extraConfig = ''
-        reverse_proxy localhost:8008
-        header Strict-Transport-Security "max-age=63072000; includeSubDomains;"
-      '';
-      "matrix.${config.networking.domain}".extraConfig = ''
-        reverse_proxy /_matrix/* localhost:8008
-        reverse_proxy /_synapse/client/* localhost:8008
-      '';
-    };
-  };
-
-  services.matrix-synapse = {
-    enable = true;
-    settings = {
-      server_name = config.networking.domain;
-      serve_server_wellknown = true;
-    };
-  };
-
-  promptEmoji = "🌟";
-
-  time.timeZone = "America/Los_Angeles";
-
-  system.stateVersion = "24.05";
-}

modules/common.nix

@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ pkgs, secrets, ... }:
 {
   nixpkgs.config.allowUnfree = true;
 
@@ -41,6 +41,11 @@
     '';
   };
 
+  services.zerotierone = {
+    enable = true;
+    joinNetworks = secrets.zerotier.networks;
+  };
+
   environment.systemPackages = with pkgs; [
     git-crypt
     jq

modules/zerotier.nix

@@ -1,7 +0,0 @@
-{ secrets, ... }:
-{
-  services.zerotierone = {
-    enable = true;
-    joinNetworks = secrets.zerotier.networks;
-  };
-}