jta, other changes

4 files changed, 20 insertions, 7 deletions

diff --git a/hosts/ganymede/config.nix b/hosts/ganymede/config.nix
index c4d9109..f4c4430 100644
--- a/hosts/ganymede/config.nix
+++ b/hosts/ganymede/config.nix
@@ -69,11 +69,6 @@
         privateUrl = "git.ganymede";
       };
 
-      # agate = {
-      #   enable = true;
-      #   publicUrl = "williamsfam.us.com";
-      # };
-
       minecraft = {
         enable = true;
         listenAddr = "0.0.0.0";
@@ -96,6 +91,11 @@
         };
       };
 
+      jta = {
+        enable = true;
+        publicUrl = "jta.williamsfam.us.com";
+      };
+
       caddy = {
         enable = true;
         envFile = config.collinux.secrets."caddy-env".path;
diff --git a/hosts/mercury/config.nix b/hosts/mercury/config.nix
index d2164c4..852c393 100644
--- a/hosts/mercury/config.nix
+++ b/hosts/mercury/config.nix
@@ -23,7 +23,7 @@
         components = {
           fuzzel.enable = true;
           dunst.enable = true;
-          tofi.enable = true;
+          # tofi.enable = true;
         };
       };
 
diff --git a/hosts/mercury/hjem.nix b/hosts/mercury/hjem.nix
index afdf861..91e9c4b 100644
--- a/hosts/mercury/hjem.nix
+++ b/hosts/mercury/hjem.nix
@@ -7,11 +7,11 @@
 
     prismlauncher
     mpv
-    bluetuith
 
     opencode
 
     (pkgs.callPackage ../../pkgs/yo {})
+    (pkgs.callPackage ../../pkgs/yokey {})
 
     captive-browser # https://words.filippo.io/captive-browser
     (pkgs.makeDesktopItem {
diff --git a/hosts/mercury/nixos.nix b/hosts/mercury/nixos.nix
index 8fcb504..6459fdb 100644
--- a/hosts/mercury/nixos.nix
+++ b/hosts/mercury/nixos.nix
@@ -22,6 +22,19 @@
     dataDir = "/home/collin/.local/syncthing";
   };
 
+  fileSystems."/home/collin/ganymede" = {
+    device = "collin@ganymede:/media";
+    fsType = "fuse.sshfs";
+    options = [
+      "identityfile=/home/collin/.ssh/id_ed25519"
+      "idmap=user"
+      "x-systemd.automount" #< mount the filesystem automatically on first access
+      "allow_other" #< don't restrict access to only the user which `mount`s it (because that's probably systemd who mounts it, not you)
+      "user" #< allow manual `mount`ing, as ordinary user.
+    ];
+  };
+  boot.supportedFilesystems."fuse.sshfs" = true;
+
   services.autossh.sessions = [
     {
       name = "ganymede";