jta changes

5 files changed, 19 insertions, 25 deletions

diff --git a/hosts/ganymede/caddy.nix b/hosts/ganymede/caddy.nix
index 8f4fe94..d10910c 100644
--- a/hosts/ganymede/caddy.nix
+++ b/hosts/ganymede/caddy.nix
@@ -9,7 +9,7 @@
         "github.com/tailscale/caddy-tailscale@v0.0.0-20251204171825-f070d146dd61"
         "github.com/caddy-dns/porkbun@v0.3.1"
       ];
-      hash = "sha256-RM7yd4LV2r6Z4CjwZdzPND28bYbPwfzNMIxZwiYHOsM=";
+      hash = "sha256-n0HVlpCkJITyEPc+ml7zCcYw9gy3r1YAXertd6zc2o0=";
     });
 
     globalConfig = ''
diff --git a/hosts/ganymede/config.nix b/hosts/ganymede/config.nix
index f4c4430..03235f0 100644
--- a/hosts/ganymede/config.nix
+++ b/hosts/ganymede/config.nix
@@ -10,10 +10,10 @@
 
       "caddy-env".file = ./secrets/caddy-env.age;
 
-      "collin-copyparty-password" = {
-        file = ./secrets/collin-copyparty-password.age;
-        owner = "copyparty";
-      };
+      # "collin-copyparty-password" = {
+      #   file = ./secrets/collin-copyparty-password.age;
+      #   owner = "copyparty";
+      # };
       "collin-forgejo-password" = {
         file = ./secrets/collin-forgejo-password.age;
         owner = "forgejo";
@@ -78,18 +78,18 @@
         enable = true;
         privateUrl = "bittorrent.ganymede";
       };
-      copyparty = {
-        enable = true;
-        listenAddr = "0.0.0.0";
-        publicUrl = "up.williamsfam.us.com";
-        privateUrl = "files.ganymede";
+      # 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;
-        };
-      };
+      #   users.collin = {
+      #     isAdmin = true;
+      #     passwordFile = config.collinux.secrets."collin-copyparty-password".path;
+      #     hasPublicDir = true;
+      #   };
+      # };
 
       jta = {
         enable = true;
diff --git a/hosts/ganymede/nixos.nix b/hosts/ganymede/nixos.nix
index a706b5f..415509a 100644
--- a/hosts/ganymede/nixos.nix
+++ b/hosts/ganymede/nixos.nix
@@ -32,7 +32,7 @@
   services.fail2ban.enable = true;
 
   # merge logs from subdomains
-  services.caddy.virtualHosts."up.williamsfam.us.com".logFormat = lib.mkForce ''
+  services.caddy.virtualHosts."jta.williamsfam.us.com".logFormat = lib.mkForce ''
     output file /var/log/caddy/access-williamsfam.us.com.log
   '';
 
diff --git a/hosts/mercury/hjem.nix b/hosts/mercury/hjem.nix
index 91e9c4b..7084251 100644
--- a/hosts/mercury/hjem.nix
+++ b/hosts/mercury/hjem.nix
@@ -1,6 +1,6 @@
 {pkgs, ...}: {
   packages = with pkgs; [
-    obsidian
+    # obsidian
     anki
     libreoffice-qt
     musescore
@@ -22,13 +22,6 @@
       terminal = false;
       categories = ["Application"];
     })
-
-    (pkgs.writeShellScriptBin "battery.sh" ''
-      energy_now=$(cat /sys/class/power_supply/BAT0/energy_now)
-      energy_full=$(cat /sys/class/power_supply/BAT0/energy_full)
-      percentage=$((energy_now * 100 / energy_full))
-      printf "%.0f%%" "$percentage"
-    '')
   ];
 
   files.".config/captive-browser.toml".text = ''
diff --git a/hosts/mercury/nixos.nix b/hosts/mercury/nixos.nix
index 6459fdb..7db48b4 100644
--- a/hosts/mercury/nixos.nix
+++ b/hosts/mercury/nixos.nix
@@ -21,6 +21,7 @@
     user = "collin";
     dataDir = "/home/collin/.local/syncthing";
   };
+  programs.kdeconnect.enable = true;
 
   fileSystems."/home/collin/ganymede" = {
     device = "collin@ganymede:/media";