diff --git a/flake.lock b/flake.lock
index 915f384..12ae7bf 100644
--- a/flake.lock
+++ b/flake.lock
@@ -545,6 +545,19 @@
         "url": "https://channels.nixos.org/nixpkgs-unstable/nixexprs.tar.xz"
       }
     },
+    "nixpkgs_3": {
+      "locked": {
+        "lastModified": 1782821651,
+        "narHash": "sha256-OBddwHNJ+qxOHaKih0bE2PXJeZHlzUC8WOHZrUcnFwY=",
+        "rev": "e52c192be9d7b2c4bd4aed326c8731b35f8bb75c",
+        "type": "tarball",
+        "url": "https://releases.nixos.org/nixpkgs/nixpkgs-26.11pre1025128.e52c192be9d7/nixexprs.tar.xz"
+      },
+      "original": {
+        "type": "tarball",
+        "url": "https://channels.nixos.org/nixpkgs-unstable/nixexprs.tar.xz"
+      }
+    },
     "nixvim": {
       "inputs": {
         "flake-parts": "flake-parts_2",
@@ -659,9 +672,7 @@
     },
     "tranquil-pds": {
       "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ]
+        "nixpkgs": "nixpkgs_3"
       },
       "locked": {
         "lastModified": 1782711090,
diff --git a/flake.nix b/flake.nix
index 27b5097..2645f92 100644
--- a/flake.nix
+++ b/flake.nix
@@ -29,10 +29,7 @@
       url = "github:Mic92/sops-nix";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    tranquil-pds = {
-      url = "git+https://tangled.org/tranquil.farm/tranquil-pds";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
+    tranquil-pds.url = "git+https://tangled.org/tranquil.farm/tranquil-pds";
     zen-browser = {
       url = "github:youwen5/zen-browser-flake";
       inputs.nixpkgs.follows = "nixpkgs";
diff --git a/modules/atproto/tranquil.nix b/modules/atproto/tranquil.nix
index 732f8e8..7e93fbd 100644
--- a/modules/atproto/tranquil.nix
+++ b/modules/atproto/tranquil.nix
@@ -1,29 +1,31 @@
 { inputs, ... }: {
   flake-file.inputs.tranquil-pds = {
     url = "git+https://tangled.org/tranquil.farm/tranquil-pds";
-    inputs.nixpkgs.follows = "nixpkgs";
   };
 
-  den.aspects.tranquil = {
+  den.aspects.tranquil = { user, ... }: {
     nixos = { config, ... }: {
       imports = [ inputs.tranquil-pds.nixosModules.default ];
 
       services.tranquil-pds = {
-        enable = false;
+        enable = true;
         database.createLocally = true;
         settings = {
           server.hostname = "pds.alexvds.com";
         };
 
-        environmentFiles = [ ];
+        environmentFiles = [ config.sops.secrets.tranquil-pds.path ];
       };
 
       sops = {
-        defaultSopsFile = ../../secrets/pds.yaml;
+        defaultSopsFile = ../../secrets/pds.env;
         secrets = {
           tranquil-pds = {
             format = "dotenv";
             key = "";
+
+            owner = user.name;
+            group = "wheel";
           };
         };
       };
diff --git a/modules/hosts/roost/roost.nix b/modules/hosts/roost/roost.nix
index c7fbd0b..0ab3aa6 100644
--- a/modules/hosts/roost/roost.nix
+++ b/modules/hosts/roost/roost.nix
@@ -9,7 +9,6 @@
       grub
       sops
       sops.recipient
-      tranquil
       sshd
     ];
 
diff --git a/modules/users/catbird.nix b/modules/users/catbird.nix
index 57c5c60..fe94e7d 100644
--- a/modules/users/catbird.nix
+++ b/modules/users/catbird.nix
@@ -10,6 +10,8 @@
       shell
       shell.bash
       shell.zsh
+
+      tranquil
     ];
 
     homeManager =