Add extra SSH configurations to Marauder

flake.nix

@@ -15,6 +15,7 @@
         common = import ./modules/common.nix;
         prompt = import ./modules/prompt.nix;
         server = import ./modules/server.nix;
+        zerotier = import ./modules/zerotier.nix;
       };
 
       nixosConfigurations = {
@@ -28,6 +29,11 @@
           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/backup.nix

@@ -1,11 +1,5 @@
 { pkgs, config, secrets, ... }:
 {
-  environment.systemPackages = with pkgs; [
-    restic
-    libnotify
-    backblaze-b2
-  ];
-
   systemd.services = {
     notify-backup-b2-failed = {
       description = "Notify on failed backup to B2";
@@ -26,8 +20,8 @@
 
   environment.etc = {
     "restic-env".text = ''
-      export B2_ACCOUNT_ID="${secrets.b2.accountId}"
-      export B2_ACCOUNT_KEY="${secrets.b2.accountKey}"
+      B2_ACCOUNT_ID="${secrets.b2.accountId}"
+      B2_ACCOUNT_KEY="${secrets.b2.accountKey}"
     '';
     "restic-password".text = secrets.restic.password;
   };

hosts/marauder/default.nix

@@ -3,11 +3,16 @@
   imports = [
     self.nixosModules.common
     self.nixosModules.prompt
+    self.nixosModules.zerotier
     ./backup.nix
     ./dev.nix
+    ./printing.nix
   ];
 
-  networking.hostName = "marauder";
+  networking = {
+    hostName = "marauder";
+    firewall.enable = false;
+  };
 
   fileSystems = {
     "/" = {
@@ -84,8 +89,11 @@
       ffmpeg
       (callPackage ./ffcheck.nix { })
 
-      # Productivity
+      # Misc
       obsidian
+      intiface-central
+      prismlauncher
+      blender
     ]);
   };
 
@@ -95,6 +103,23 @@
     dedicatedServer.openFirewall = true;
   };
 
+  programs.ssh.extraConfig = ''
+    Host quasar
+      HostName consortium.chat
+      IdentityFile ~/.ssh/LightsailDefaultKey-us-west-2.pem
+
+    Host monolith
+      HostName 10.243.210.154
+
+    Host fennbox
+      HostName 10.243.109.199
+      User fenn
+  '';
+
+  programs.nix-ld = {
+    enable = true;
+  };
+
   services.xserver = {
     enable = true;
     videoDrivers = [ "nvidia" ];

hosts/marauder/printing.nix

@@ -0,0 +1,16 @@
+{ pkgs, ... }:
+{
+  environment.systemPackages = with pkgs; [
+    system-config-printer
+  ];
+
+  services.printing = {
+    enable = true;
+  };
+
+  services.avahi = {
+    enable = true;
+    nssmdns4 = true;
+    openFirewall = true;
+  };
+}

hosts/monolith/default.nix

@@ -1,15 +1,17 @@
-{ self, ... }:
+{ self, pkgs, ... }:
 {
   imports = [
     self.nixosModules.common
     self.nixosModules.prompt
     self.nixosModules.server
+    self.nixosModules.zerotier
     ./dns.nix
   ];
 
   networking = {
     hostName = "monolith";
     hostId = "44551c32";
+    firewall.allowedTCPPorts = [ 8000 ];
   };
 
   fileSystems = {
@@ -38,6 +40,32 @@
     supportedFilesystems = [ "zfs" ];
   };
 
+  environment.systemPackages = with pkgs; [
+    rclone
+    beets
+    flac
+    screen
+    rustup
+    gcc
+    (callPackage ../marauder/ffcheck.nix { })
+  ];
+
+  services.jellyfin = {
+    enable = true;
+    openFirewall = true;
+  };
+
+  services.navidrome = {
+    enable = true;
+    openFirewall = true;
+    settings = {
+      Address = "0.0.0.0";
+      MusicFolder = "/library/music";
+      Scanner.GroupAlbumReleases = "true";
+      ScanSchedule = "0";
+    };
+  };
+
   promptEmoji = "🏰";
 
   time.timeZone = "America/Los_Angeles";

hosts/monolith/dns.nix

@@ -3,22 +3,16 @@
   systemd.services.update-dns = {
     serviceConfig.Type = "oneshot";
     description = "Update the leaf.ninja DNS records";
-    path = with pkgs; [ curl jq ];
+    path = with pkgs; [ curl ];
     script = ''
       public_ip=$(curl -s https://ifconfig.me/ip)
       endpoint="https://api.gandi.net/v5/livedns/domains/leaf.ninja/records"
-      curl -s \
+      curl \
         -X PUT \
         -H "Authorization: Bearer ${secrets.gandi.token}" \
         -H "Content-Type: application/json" \
         -d "{\"rrset_values\":[\"$public_ip\"]}" \
-        "$ENDPOINT/%2A/A" | jq
-      curl -s \
-        -X PUT \
-        -H "Authorization: Bearer ${secrets.gandi.token}" \
-        -H "Content-Type: application/json" \
-        -d "{\"rrset_values\":[\"$public_ip\"]}" \
-        "$ENDPOINT/%40/A" | jq
+        $endpoint/ostiary/A
     '';
   };
 

hosts/quasar/default.nix

@@ -0,0 +1,54 @@
+{ self, modulesPath, pkgs, config, secrets, ... }:
+{
+  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
+      '';
+      "admin.${config.networking.domain}".extraConfig = ''
+        root * ${pkgs.synapse-admin}
+        file_server
+      '';
+    };
+  };
+
+  services.matrix-synapse = {
+    enable = true;
+    settings = {
+      server_name = config.networking.domain;
+      serve_server_wellknown = true;
+      registration_shared_secret = secrets.synapse."consortium.chat".registration-shared-secret;
+      macaroon_secret_key = secrets.synapse."consortium.chat".macaroon-secret-key;
+      form_secret = secrets.synapse."consortium.chat".form-secret;
+    };
+  };
+
+  promptEmoji = "🌟";
+
+  time.timeZone = "America/Los_Angeles";
+
+  system.stateVersion = "24.05";
+}

modules/common.nix

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

modules/zerotier.nix

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