changes

2 files changed, 10 insertions, 30 deletions

diff --git a/hosts/mercury/config.nix b/hosts/mercury/config.nix
index 12518f4..d2164c4 100644
--- a/hosts/mercury/config.nix
+++ b/hosts/mercury/config.nix
@@ -2,12 +2,7 @@
   collinux = {
     theme = "catppuccin";
 
-    secrets = {
-      "gliese-key" = {
-        file = ../gliese-key.age;
-        owner = "collin";
-      };
-    };
+    secrets = {};
 
     user.useRun0 = true;
 
diff --git a/hosts/mercury/nixos.nix b/hosts/mercury/nixos.nix
index 3f5c0b0..8fcb504 100644
--- a/hosts/mercury/nixos.nix
+++ b/hosts/mercury/nixos.nix
@@ -1,19 +1,20 @@
 {
   lib,
   inputs,
-  config,
   ...
 }: {
   imports = [
     ./disks.nix
     ./battery.nix
-    # ./ai.nix
 
     inputs.nixos-facter-modules.nixosModules.facter
     inputs.lanzaboote.nixosModules.lanzaboote
   ];
 
   facter.reportPath = ./facter.json;
+  services.dbus.implementation = "broker";
+
+  environment.defaultPackages = lib.mkForce []; # im not a noob
 
   services.syncthing = {
     enable = true;
@@ -26,14 +27,14 @@
       name = "ganymede";
       user = "collin";
       monitoringPort = 20000;
-      extraArguments = "-N -D 9090 -L 4141:localhost:4141 collin@williamsfam.us.com";
+      extraArguments = "-N -D 9090 collin@williamsfam.us.com";
     }
   ];
-
-  services.dbus.implementation = "broker";
-
-  environment.defaultPackages = lib.mkForce []; # im not a noob
-
+  programs.ssh.extraConfig = ''
+    Host ganymede
+      HostName williamsfam.us.com
+      Port 22
+  '';
   security.pki.certificates = [
     ''
       -----BEGIN CERTIFICATE-----
@@ -50,22 +51,6 @@
     ''
   ];
 
-  programs.ssh.extraConfig = ''
-    Match host ganymede exec "nc -z -w1 192.168.50.2 2222"
-      HostName 192.168.50.2
-      Port 2222
-
-    Host ganymede
-      HostName williamsfam.us.com
-      Port 22
-
-    Host gliese
-      HostName 10.100.0.1
-      User green
-      IdentityFile ${config.collinux.secrets."gliese-key".path}
-      ProxyJump collin@ganymede
-  '';
-
   programs.firefox.policies.ExtensionSettings = {
     "foxyproxy@eric.h.jung" = {
       installation_mode = "force_installed";