diff --git a/secrets/patrick.passwd.age b/secrets/patrick.passwd.age
deleted file mode 100644
index fb811c8..0000000
--- a/secrets/patrick.passwd.age
+++ /dev/null
@@ -1,12 +0,0 @@
-age-encryption.org/v1
--> X25519 Ub9kushFyUiGgqBg6EELrG3RqaMyuIl5TclGS4og5jw
-qTidQ54jNLQ8ge4q6gnB61yg59fxf20RE/5j0kc/LeU
--> piv-p256 XTQkUA A+pbwPwiymxHhE6uLkaUi0KzPt/1zkY5iTXLAeVeoLPZ
-x+nX9T7RJgeShnFbGOeYUp5DsDcYIlfQQF+1YNMAvrY
--> piv-p256 ZFgiIw A5aXsAs/josvuRxRl9RUyRpOIECEsu0DPYO4FO2rqguv
-Wvh4Fwl5gcsbp8OCUkXoqFGYW+O+lG1g1E3s4zGQmmY
--> kG['(-grease
-pwvfbNEpRgk5flUMrx/8rIefRNbC+8pntHmoJD0CUM8rU7rX53OGyXiwrO42yEeO
-lzXqzf9KJjok3Iv1TBhmehWoNbyPanX/hFR0xgtSIWfkcYptqw
---- B5u7pwgmQOm6dmLtv9yiVRe35to0xqw0nTLyXWzmym4
-XL1�{�6O�C�p�E�H�<�G�P�W�S¿��i\�9-�x��Z�%su��N9�~3��L��'��v[���I��4��&�b��֋���W�%��3k�H�P��
\ No newline at end of file
diff --git a/secrets/root.passwd.age b/secrets/root.passwd.age
deleted file mode 100644
index dbe4825..0000000
--- a/secrets/root.passwd.age
+++ /dev/null
@@ -1,12 +0,0 @@
-age-encryption.org/v1
--> X25519 b/8FJSZrQnmmZAa3pd5+S6ny85tDC26v9Mmv4uo3xEI
-aObTeesKru9H65F1EXO//7cwxqZ3xRmWN4WPAK33y0A
--> piv-p256 XTQkUA ArgnRrNbgtg95zsDDvIA6rRUDodnPHJIEwRYGXmwx4XW
-jqM/jcOLVKallUn7eHXDO9zyWqHNSrZau+qNV8l+Wx8
--> piv-p256 ZFgiIw Ajvy6fO4GytAvZCS38h2wjKghK/XRaPu97QuL07bdiYz
-2HBGTQtIiktiAujhGfsM3nPu3hiRkJJKLHF3XxW6yCI
--> ikUP2{-grease kS(OEf]-
-qyzIhVtJfVroeCQhEnB290ffq1GNZQwVzL+7aU2lqStVhXdP5Y1sCJoo8YlHjt7c
-lZu5rKe2cosKjVZcORyzv4A
---- sYEWTZSkZ9a3zdQs9BDej9+wdvFUJbkSjUGWfWFOm7A
-�ӫ"�G�Uv��DG�0��y�q��N��E�^/�ٻu�%��q2ad��X΍��+�
�����<��$
z���J^��Le;]Fu
�4��^�����W�axhWX
^	�
\ No newline at end of file
diff --git a/secrets/secrets.nix.age b/secrets/secrets.nix.age
new file mode 100644
index 0000000..efb4f70
Binary files /dev/null and b/secrets/secrets.nix.age differ
diff --git a/users/patrick/default.nix b/users/patrick/default.nix
index 34a9844..27469e9 100644
--- a/users/patrick/default.nix
+++ b/users/patrick/default.nix
@@ -9,7 +9,6 @@
   imports = [
     ../../hosts/common/graphical/hyprland.nix
   ];
-  rekey.secrets.patrick.file = ../../secrets/patrick.passwd.age;
 
   users.users.patrick = {
     shell = pkgs.zsh;
@@ -18,7 +17,7 @@
     createHome = true;
     extraGroups = ["wheel" "audio" "video" "input"];
     group = "patrick";
-    passwordFile = config.rekey.secrets.patrick.path;
+    hashedPassword = config.secrets.secrets.global.users.patrick.passwordHash;
   };
   users.groups.patrick.gid = config.users.users.patrick.uid;
 
diff --git a/users/root/default.nix b/users/root/default.nix
index d4b36dc..2edc95e 100644
--- a/users/root/default.nix
+++ b/users/root/default.nix
@@ -4,14 +4,13 @@
   impermanence,
   ...
 }: {
-  rekey.secrets.root.file = ../../secrets/root.passwd.age;
   users.users.root = {
     shell = pkgs.zsh;
     openssh.authorizedKeys.keys = [
       "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDZixkix0KfKuq7Q19whS5FQQg51/AJGB5BiNF/7h/LM"
       "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHxD4GOrwrBTG4/qQhm5hoSB2CP7W9g1LPWP11oLGOjQ"
     ];
-    passwordFile = config.rekey.secrets.root.path;
+    hashedPassword = config.secrets.secrets.global.users.root.passwordHash;
   };
   home-manager.users.root = {
     imports = [