6 files changed, 53 insertions, 26 deletions
diff --git a/hosts/ganymede/config.nix b/hosts/ganymede/config.nix
index b67d057..bd990e8 100644
--- a/hosts/ganymede/config.nix
+++ b/hosts/ganymede/config.nix
@@ -8,6 +8,11 @@
         owner = "wpa_supplicant";
       };
 
+      "gliese-key" = {
+        file = ../gliese-key.age;
+        owner = "collin";
+      };
+
       "caddy-env".file = ./secrets/caddy-env.age;
 
       "collin-copyparty-password" = {
@@ -22,11 +27,6 @@
         file = ./secrets/wireguard-pk.age;
         owner = "systemd-network";
       };
-
-      "copilot-token" = {
-        file = ./secrets/copilot-token.age;
-        owner = "copilot-api";
-      };
     };
 
     terminal = {
@@ -118,11 +118,6 @@
         enable = true;
         envFile = config.collinux.secrets."caddy-env".path;
       };
-
-      copilot-api = {
-        enable = true;
-        githubToken = config.collinux.secrets."copilot-token".path;
-      };
     };
   };
 }
diff --git a/hosts/ganymede/nixos.nix b/hosts/ganymede/nixos.nix
index f4d8d1b..043f67a 100644
--- a/hosts/ganymede/nixos.nix
+++ b/hosts/ganymede/nixos.nix
@@ -60,6 +60,7 @@
   };
 
   # deploy user
+  nix.settings.trusted-users = ["deploy"];
   users.groups."deploy" = {};
   users.users."deploy" = {
     isSystemUser = true;
@@ -90,7 +91,7 @@
     Host gliese
       HostName 10.100.0.1
       User green
-      IdentityFile ~/Gliese_key_2.pem
+      IdentityFile ${config.collinux.secrets."gliese-key".path}
   '';
 
   # merge logs from subdomains
diff --git a/hosts/gliese-key.age b/hosts/gliese-key.age
new file mode 100644
index 0000000..6fc5ce5
--- /dev/null
+++ b/hosts/gliese-key.age
@@ -0,0 +1,18 @@
+-----BEGIN AGE ENCRYPTED FILE-----
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IGF6QmlsZyA0RCtu
+NWFrbW0zTU53Rk05NzRUUG1oRG4rK05EM1pnYTYwaEpCYWZBbFFrCmM3TmtRandq
+TnBVVk9ZRm1oMzlIajR1b1RJdHl4MERtbkw1MmQ3em55cncKLT4gc3NoLWVkMjU1
+MTkgSmc0eVdRIGJPcG56L3c0QUovSVJsVDlrTkJhNTBaSXlzQkkweU1mcTB5dEtK
+SDhKekUKaWEzdTUvbU5seVkvZUJDQW9XTVQ1bEJzWU5XVU5VREhIMnFxd0FRWHhS
+dwotPiAyQC1ncmVhc2UgLE85NyBOZ2ssbmIKMEN1MWNWL2dWZwotLS0gazN5U0xM
+ZjhXV1B2MmlhUm5rQXJGcWJKcVRUdXZ5Z3cxWEN2a3FVdEJWMAqoHBpRSjJB1CKI
+fWVLuRxB5c/gBXoiE8VfQ7O5v1JN6ZJ7C9m+d6PcgSKaCjEgPdnRxxe7JCDc3dUS
+cnebY/h7q+vAkLTqvtuiBMw67c5p79/EW7FpN6Wzzmc9wIHvbPf0zsn4EOqfc24I
+cuB55uviE0//E3Xh6iRvvx5XEgSBUGLeycZa5P0fmUJUOhG9CtJya4D2tB6huyNK
+2+dJgQdFkXghinzPQimnDXYhoD7PTM6yGaJQdrB0GT6lXMCBlRB9p2uEArrVYhJu
+/vAXFsGxENjI7XvH1RabM1gLN7Eytq/ptz+9/S/sMQ4D4FPp3L2gHklEqepOv3Df
+z1b7PA5aOQj3+jlpcAUkfKtgA32vT7KddlRXQWHzC7VyuEpGjT+qydNet+tBW5Z6
+DDNc/LJ/sNvOsBQE2wqvi4/bLpAG2By6CKrZYZrE+l1zJMWkbT6QnOR9/aby15am
+iSq4agnTdxsx3JrJ+V5thUyDNrAIY/DQg0rLfoGy37g877vENco+3USdoOeRJjHD
+1yRjq39y8h4EQCyeaAx0h3MQEJMiReHxbQ==
+-----END AGE ENCRYPTED FILE-----
diff --git a/hosts/mercury/config.nix b/hosts/mercury/config.nix
index e5d8720..418b9fe 100644
--- a/hosts/mercury/config.nix
+++ b/hosts/mercury/config.nix
@@ -2,11 +2,19 @@
   collinux = {
     theme = "catppuccin";
 
+    secrets = {
+      "gliese-key" = {
+        file = ../gliese-key.age;
+        owner = "collin";
+      };
+    };
+
     user.useRun0 = true;
 
     desktop = {
       wallpaper = ./wallpapers/abstract-swirls.jpg;
       gtk.enable = true;
+
       greetd = {
         enable = true;
         autologin.enable = true;
@@ -24,6 +32,7 @@
       programs = {
         firefox.enable = true;
         foot.enable = true;
+        tofi.enable = true;
 
         research.enable = true;
       };
diff --git a/hosts/mercury/hjem.nix b/hosts/mercury/hjem.nix
index 1839625..1e87ddd 100644
--- a/hosts/mercury/hjem.nix
+++ b/hosts/mercury/hjem.nix
@@ -8,9 +8,7 @@
     prismlauncher
     mpv
 
-    claude-code
-
-    lagrange
+    opencode
 
     musescore
     vital
@@ -43,16 +41,4 @@
 
     socks5-addr = "localhost:1666"
   '';
-
-  files.".claude/settings.json".text = builtins.toJSON {
-    env = {
-      ANTHROPIC_BASE_URL = "http://localhost:4141";
-      ANTHROPIC_AUTH_TOKEN = "sk-dummy";
-      ANTHROPIC_MODEL = "claude-sonnet-4.5";
-      ANTHROPIC_DEFAULT_HAIKU_MODEL = "gpt-5-mini";
-      DISABLE_NON_ESSENTIAL_MODEL_CALLS = "1";
-      CLAUDE_CODE_DISABLE_NONESSENTIAL_TRAFFIC = "1";
-      CLAUDE_CODE_ATTRIBUTION_HEADER = "0";
-    };
-  };
 }
diff --git a/hosts/mercury/nixos.nix b/hosts/mercury/nixos.nix
index 5d8a63f..46153ae 100644
--- a/hosts/mercury/nixos.nix
+++ b/hosts/mercury/nixos.nix
@@ -1,6 +1,8 @@
 {
   lib,
+  pkgs,
   inputs,
+  config,
   ...
 }: {
   imports = [
@@ -29,6 +31,8 @@
     }
   ];
 
+  services.dbus.implementation = "broker";
+
   environment.defaultPackages = lib.mkForce []; # im not a noob
 
   security.pki.certificates = [
@@ -55,8 +59,22 @@
     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
   '';
 
+  ## UUGGGG I DINT"W ATNT TO DO THIS
+  programs.nix-ld = {
+    enable = true;
+    libraries = with pkgs; [
+      libGL
+    ];
+  };
+
   programs.firefox.policies.ExtensionSettings = {
     "foxyproxy@eric.h.jung" = {
       installation_mode = "force_installed";