LOTS OF TEMP STUFF

1 files changed, 22 insertions, 47 deletions

diff --git a/hosts/ganymede/config.nix b/hosts/ganymede/config.nix
index 94d67ec..47b7f49 100644
--- a/hosts/ganymede/config.nix
+++ b/hosts/ganymede/config.nix
@@ -9,19 +9,6 @@
       };
 
       "caddy-env".file = ./secrets/caddy-env.age;
-
-      # "collin-copyparty-password" = {
-      #   file = ./secrets/collin-copyparty-password.age;
-      #   owner = "copyparty";
-      # };
-      "collin-forgejo-password" = {
-        file = ./secrets/collin-forgejo-password.age;
-        owner = "forgejo";
-      };
-      "wireguard-pk" = {
-        file = ./secrets/wireguard-pk.age;
-        owner = "systemd-network";
-      };
     };
 
     terminal = {
@@ -41,6 +28,7 @@
         ip = "192.168.50.2/24";
         gateway = "192.168.50.1";
       };
+
       wireless.static = {
         ssid = "williams";
         pskFile = config.collinux.secrets."williams-psk".path;
@@ -50,58 +38,45 @@
     services = {
       sshd = {
         enable = true;
-        port = 22;
-        listenAddr = "0.0.0.0";
-        rootLogin = true;
-      };
+        public = true;
 
-      goaccess = {
-        enable = true;
-        privateUrl = "stats.ganymede";
-      };
-      btopweb = {
-        enable = true;
-        privateUrl = "btop.ganymede";
-      };
-
-      cgit = {
-        enable = true;
-        privateUrl = "git.ganymede";
+        conf.rootLogin = true;
       };
 
       minecraft = {
         enable = true;
-        listenAddr = "0.0.0.0";
+        public = true;
       };
 
-      ngircd.enable = true;
-
-      qbittorrent = {
+      ngircd = {
         enable = true;
-        privateUrl = "bittorrent.ganymede";
+        public = true;
       };
-      # copyparty = {
-      #   enable = true;
-      #   listenAddr = "0.0.0.0";
-      #   publicUrl = "up.williamsfam.us.com";
-      #   privateUrl = "files.ganymede";
-
-      #   users.collin = {
-      #     isAdmin = true;
-      #     passwordFile = config.collinux.secrets."collin-copyparty-password".path;
-      #     hasPublicDir = true;
-      #   };
-      # };
 
       jta = {
         enable = true;
         publicUrl = "jta.williamsfam.us.com";
       };
-
       ganyupload = {
         enable = true;
         publicUrl = "upld.williamsfam.us.com";
       };
+      goaccess = {
+        enable = true;
+        privateUrl = "stats.ganymede";
+      };
+      btopweb = {
+        enable = true;
+        privateUrl = "btop.ganymede";
+      };
+      qbittorrent = {
+        enable = true;
+        privateUrl = "bittorrent.ganymede";
+      };
+      cgit = {
+        enable = true;
+        privateUrl = "git.ganymede";
+      };
 
       caddy = {
         enable = true;