diff --git a/flake.nix b/flake.nix
index ac7f9e6..08ceb9e 100644
--- a/flake.nix
+++ b/flake.nix
@@ -15,11 +15,6 @@
 
     agenix.url = "github:ryantm/agenix";
 
-    agenix-rekey = {
-      url = "github:oddlama/agenix-rekey";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-
     flake-utils.url = "github:numtide/flake-utils";
 
     spicetify-nix = {
@@ -42,7 +37,6 @@
       nixpkgs,
       nixos-hardware,
       agenix,
-      agenix-rekey,
       spicetify-nix,
       nix-index-database,
       private-config,
@@ -54,7 +48,6 @@
           inherit inputs;
           inherit spicetify-nix;
           inherit agenix;
-          inherit agenix-rekey;
           inherit private-config;
         };
 
@@ -63,22 +56,15 @@
         # List all Modules to load
         modules = [
           agenix.nixosModules.default
-          agenix-rekey.nixosModules.default
           nixos-hardware.nixosModules.framework-13-7040-amd
           nix-index-database.nixosModules.nix-index
           ./modules/utils/agenix/agenix.nix
           ./modules
           ./home
+          private-config.nixosModules.default
         ];
       };
 
-      agenix-rekey = agenix-rekey.configure {
-        userFlake = self;
-        nixosConfigurations = self.nixosConfigurations;
-        # Example for colmena:
-        # nixosConfigurations = ((colmena.lib.makeHive self.colmena).introspect (x: x)).nodes;
-      };
-
       formatter.x86_64-linux = nixpkgs.legacyPackages.x86_64-linux.nixfmt-rfc-style;
     };
 }
diff --git a/home/default.nix b/home/default.nix
index a1c530c..150a9a3 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -36,20 +36,19 @@
         accent = "mauve";
       };
 
-      imports =
-        [
-          inputs.catppuccin.homeModules.catppuccin
-          inputs.spicetify-nix.homeManagerModules.default
-          inputs.nix-index-database.homeModules.nix-index
-          # inputs.agenix.homeManagerModules.age
-          inputs.private-config.homeManagerModules.default
-        ]
-        ++ [
-          ./essentials
-          ./utils
-          ./misc_pkgs
-          ./wm
-        ];
+      imports = [
+        inputs.catppuccin.homeModules.catppuccin
+        inputs.spicetify-nix.homeManagerModules.default
+        inputs.nix-index-database.homeModules.nix-index
+        inputs.agenix.homeManagerModules.age
+        inputs.private-config.homeManagerModules.default
+      ]
+      ++ [
+        ./essentials
+        ./utils
+        ./misc_pkgs
+        ./wm
+      ];
     };
   };
 
diff --git a/home/misc_pkgs/packages.nix b/home/misc_pkgs/packages.nix
index ea6278a..fd1e523 100644
--- a/home/misc_pkgs/packages.nix
+++ b/home/misc_pkgs/packages.nix
@@ -1,6 +1,5 @@
 {
   pkgs,
-  agenix-rekey,
   ...
 }:
 {
@@ -73,8 +72,7 @@
     nix-output-monitor
     nil
     nh
-    # agenix.packages.${system}.default
-    agenix-rekey.packages.${system}.default
+    agenix.packages.${system}.default
     nixfmt-rfc-style
     nixpkgs-review
 
diff --git a/modules/utils/agenix/agenix.nix b/modules/utils/agenix/agenix.nix
deleted file mode 100644
index 56576c0..0000000
--- a/modules/utils/agenix/agenix.nix
+++ /dev/null
@@ -1,109 +0,0 @@
-{
-  config,
-  pkgs,
-  inputs,
-  ...
-}:
-{
-  # TODO: Get a token2 and set up https://github.com/oddlama/agenix-rekey
-  age = {
-    identityPaths = [ "/var/lib/persistent/host_id_ed25519" ];
-
-    rekey = {
-      agePlugins = [ pkgs.age-plugin-fido2-hmac ];
-
-      # Obtain this using `ssh-keyscan` or by looking it up in your ~/.ssh/known_hosts
-      hostPubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJynM8SLRXRrfGRJd43T4wabsOHFcWeeuTym9h7vl7Io";
-      # The path to the master identity used for decryption. See the option's description for more information.
-      masterIdentities = [ ./token2_hmac.pub ];
-      #masterIdentities = [ "/home/myuser/master-key" ]; # External master key
-      #masterIdentities = [
-      #  # It is possible to specify an identity using the following alternate syntax,
-      #  # this can be used to avoid unecessary prompts during encryption.
-      #  {
-      #    identity = "/home/myuser/master-key.age"; # Password protected external master key
-      #    pubkey = "age1qyqszqgpqyqszqgpqyqszqgpqyqszqgpqyqszqgpqyqszqgpqyqs3290gq"; # Specify the public key explicitly
-      #  }
-      #];
-      storageMode = "local";
-      # Choose a directory to store the rekeyed secrets for this host.
-      # This cannot be shared with other hosts. Please refer to this path
-      # from your flake's root directory and not by a direct path literal like ./secrets
-      localStorageDir = ./. + "/rekeyed/${config.networking.hostName}";
-    };
-
-    secrets = {
-      access-tokens-github.rekeyFile = ./secrets/gh_argstr.age;
-
-      fbda-wg-privkey.rekeyFile = ./secrets/fbda_wg_priv_key.age;
-      fbda-wg-psk.rekeyFile = ./secrets/fbda_wg_psk.age;
-
-      obvps-id = {
-        rekeyFile = ./secrets/1bvps.age;
-        path = "/home/rhea/.ssh/id_1bvps";
-        owner = "rhea";
-        symlink = false;
-      };
-
-      dn42git_token = {
-        rekeyFile = ./secrets/dn42git_token.age;
-        path = "/home/rhea/.ssh/id_dn42_etwas";
-        owner = "rhea";
-        symlink = false;
-      };
-
-      ncvps-id = {
-        rekeyFile = ./secrets/ncvps.age;
-        path = "/home/rhea/.ssh/id_ncvps";
-        owner = "rhea";
-        symlink = false;
-      };
-
-      gh_etwas = {
-        rekeyFile = ./secrets/gh_token.age;
-        path = "/home/rhea/.ssh/id_gh_etwas";
-        owner = "rhea";
-        symlink = false;
-      };
-
-      gcd_etwas = {
-        rekeyFile = ./secrets/gcd_etwas.age;
-        path = "/home/rhea/.ssh/id_gcd_etwas";
-        owner = "rhea";
-        symlink = false;
-      };
-
-      ebd_rhea = {
-        rekeyFile = ./secrets/ebd_token.age;
-        path = "/home/rhea/.ssh/id_ebd_rhea";
-        owner = "rhea";
-        symlink = false;
-      };
-
-      glrwth_tuda = {
-        rekeyFile = ./secrets/glrwth_token.age;
-        path = "/home/rhea/.ssh/id_glrwth_tuda";
-        owner = "rhea";
-        symlink = false;
-      };
-
-      etwas_sign_key = {
-        rekeyFile = ./secrets/sign_etwas.age;
-        path = "/home/rhea/.ssh/etwas_sign_key";
-        owner = "rhea";
-        symlink = false;
-      };
-
-      ffda_outoor_key = {
-        rekeyFile = ./secrets/ffda_token.age;
-        path = "/home/rhea/.ssh/id_ffda_outdoor";
-        owner = "rhea";
-        symlink = false;
-      };
-    };
-  };
-
-  nix.extraOptions = ''
-    !include ${config.age.secrets.access-tokens-github.path}
-  '';
-}
diff --git a/modules/utils/agenix/default.nix b/modules/utils/agenix/default.nix
deleted file mode 100644
index 6d00db9..0000000
--- a/modules/utils/agenix/default.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  imports = [
-    ./agenix.nix
-  ];
-}
diff --git a/modules/utils/agenix/rekeyed/rhea-laptop/0e7486035ac8720911ae08e068770fd8-gcd_etwas.age b/modules/utils/agenix/rekeyed/rhea-laptop/0e7486035ac8720911ae08e068770fd8-gcd_etwas.age
deleted file mode 100644
index 4e42c5a..0000000
Binary files a/modules/utils/agenix/rekeyed/rhea-laptop/0e7486035ac8720911ae08e068770fd8-gcd_etwas.age and /dev/null differ
diff --git a/modules/utils/agenix/rekeyed/rhea-laptop/3796530060742e02dec8258c831b607a-fbda-wg-privkey.age b/modules/utils/agenix/rekeyed/rhea-laptop/3796530060742e02dec8258c831b607a-fbda-wg-privkey.age
deleted file mode 100644
index 2c06366..0000000
Binary files a/modules/utils/agenix/rekeyed/rhea-laptop/3796530060742e02dec8258c831b607a-fbda-wg-privkey.age and /dev/null differ
diff --git a/modules/utils/agenix/rekeyed/rhea-laptop/40408494c83d98968e479aa395db52da-obvps-id.age b/modules/utils/agenix/rekeyed/rhea-laptop/40408494c83d98968e479aa395db52da-obvps-id.age
deleted file mode 100644
index 7030a14..0000000
Binary files a/modules/utils/agenix/rekeyed/rhea-laptop/40408494c83d98968e479aa395db52da-obvps-id.age and /dev/null differ
diff --git a/modules/utils/agenix/rekeyed/rhea-laptop/5bddd42c320acee77e20eb733d468315-ffda_outoor_key.age b/modules/utils/agenix/rekeyed/rhea-laptop/5bddd42c320acee77e20eb733d468315-ffda_outoor_key.age
deleted file mode 100644
index 57c19db..0000000
Binary files a/modules/utils/agenix/rekeyed/rhea-laptop/5bddd42c320acee77e20eb733d468315-ffda_outoor_key.age and /dev/null differ
diff --git a/modules/utils/agenix/rekeyed/rhea-laptop/75b8bbd64b17a040f92a8c09aa0a18b1-fbda-wg-psk.age b/modules/utils/agenix/rekeyed/rhea-laptop/75b8bbd64b17a040f92a8c09aa0a18b1-fbda-wg-psk.age
deleted file mode 100644
index c4667f3..0000000
--- a/modules/utils/agenix/rekeyed/rhea-laptop/75b8bbd64b17a040f92a8c09aa0a18b1-fbda-wg-psk.age
+++ /dev/null
@@ -1,8 +0,0 @@
-age-encryption.org/v1
--> ssh-ed25519 7JS6dg krvfE+Q3MyPk9atXqvWIZ34jdnLIuJ0SoocHwHiC9l0
-8DuWAGg+sp/22GVFxx5NIBp2NF3mk/9hs2uOBWx0Q9g
--> @-grease ]0mX_ M2]l G
-q/uLLUTyYlZpDQ
---- akYJCo6Fx7+mjZBYtwXI+4ji9+VHq+qtNHLjp051m/0
-�B��h��sGq��nw�덈����,'�vM��_�.�x@�~�7
-���A���n��?ϑ�$
�]�~3��U}�9
\ No newline at end of file
diff --git a/modules/utils/agenix/rekeyed/rhea-laptop/803e60da3826e0f3b5f311db436e944b-ebd_rhea.age b/modules/utils/agenix/rekeyed/rhea-laptop/803e60da3826e0f3b5f311db436e944b-ebd_rhea.age
deleted file mode 100644
index 638f6f0..0000000
Binary files a/modules/utils/agenix/rekeyed/rhea-laptop/803e60da3826e0f3b5f311db436e944b-ebd_rhea.age and /dev/null differ
diff --git a/modules/utils/agenix/rekeyed/rhea-laptop/9fb79d5c0e16eba378425e35191701e9-glrwth_tuda.age b/modules/utils/agenix/rekeyed/rhea-laptop/9fb79d5c0e16eba378425e35191701e9-glrwth_tuda.age
deleted file mode 100644
index 6ca2be0..0000000
Binary files a/modules/utils/agenix/rekeyed/rhea-laptop/9fb79d5c0e16eba378425e35191701e9-glrwth_tuda.age and /dev/null differ
diff --git a/modules/utils/agenix/rekeyed/rhea-laptop/b790376cb1623e6f029904629b93a04e-etwas_sign_key.age b/modules/utils/agenix/rekeyed/rhea-laptop/b790376cb1623e6f029904629b93a04e-etwas_sign_key.age
deleted file mode 100644
index 98785dc..0000000
Binary files a/modules/utils/agenix/rekeyed/rhea-laptop/b790376cb1623e6f029904629b93a04e-etwas_sign_key.age and /dev/null differ
diff --git a/modules/utils/agenix/rekeyed/rhea-laptop/b79f0747e29f24845755c1cb9934d9ea-gh_etwas.age b/modules/utils/agenix/rekeyed/rhea-laptop/b79f0747e29f24845755c1cb9934d9ea-gh_etwas.age
deleted file mode 100644
index 09464c0..0000000
Binary files a/modules/utils/agenix/rekeyed/rhea-laptop/b79f0747e29f24845755c1cb9934d9ea-gh_etwas.age and /dev/null differ
diff --git a/modules/utils/agenix/rekeyed/rhea-laptop/ef9af6b8ec4ce9e691e8ff00e4ed721e-dn42git_token.age b/modules/utils/agenix/rekeyed/rhea-laptop/ef9af6b8ec4ce9e691e8ff00e4ed721e-dn42git_token.age
deleted file mode 100644
index 65e4d4d..0000000
Binary files a/modules/utils/agenix/rekeyed/rhea-laptop/ef9af6b8ec4ce9e691e8ff00e4ed721e-dn42git_token.age and /dev/null differ
diff --git a/modules/utils/agenix/rekeyed/rhea-laptop/f37b05b6881299690623a2f000250d1e-ncvps-id.age b/modules/utils/agenix/rekeyed/rhea-laptop/f37b05b6881299690623a2f000250d1e-ncvps-id.age
deleted file mode 100644
index 6b14ea3..0000000
Binary files a/modules/utils/agenix/rekeyed/rhea-laptop/f37b05b6881299690623a2f000250d1e-ncvps-id.age and /dev/null differ
diff --git a/modules/utils/agenix/rekeyed/rhea-laptop/fe3b797d7fc54e6a24d4e9dcb049e626-access-tokens-github.age b/modules/utils/agenix/rekeyed/rhea-laptop/fe3b797d7fc54e6a24d4e9dcb049e626-access-tokens-github.age
deleted file mode 100644
index 1113654..0000000
--- a/modules/utils/agenix/rekeyed/rhea-laptop/fe3b797d7fc54e6a24d4e9dcb049e626-access-tokens-github.age
+++ /dev/null
@@ -1,9 +0,0 @@
-age-encryption.org/v1
--> ssh-ed25519 7JS6dg X4tDO/iunyQPRSCQElOeZ2Wggl1iVgXtsi1U4AiLIzs
-YhWzsL787a4tidiOfGm4wBEnextzg7q2T/NvSOYgHhs
--> )lD,-grease L s=]tTt0 %fL1
-Z8++T2G4ef9Rogaf1khv2rVNQC2ksRR+BV80ZCc4vRPfbocTbeYzLkKhlDNcBI7x
-uM6TGxU
---- BVxz5t84EgdJoqGCbd7r8y38wOPmQzW18DI+8M8Z9/U
-�
-6��9k"�MZ%���Y�@��)�;����߽�5I��d܊*��Wv���㿧�Wdއ�"TZV7xp|E+	U}B�r�P���<�o����G,Z���=R�95���&�v�(�h�Ҏl4����գ�I��a,��#0�ydzG����|��㈐�+_
\ No newline at end of file
diff --git a/modules/utils/agenix/secrets/1bvps.age b/modules/utils/agenix/secrets/1bvps.age
deleted file mode 100644
index 7bf8d3b..0000000
Binary files a/modules/utils/agenix/secrets/1bvps.age and /dev/null differ
diff --git a/modules/utils/agenix/secrets/dn42git_token.age b/modules/utils/agenix/secrets/dn42git_token.age
deleted file mode 100644
index 574d9c9..0000000
Binary files a/modules/utils/agenix/secrets/dn42git_token.age and /dev/null differ
diff --git a/modules/utils/agenix/secrets/ebd_token.age b/modules/utils/agenix/secrets/ebd_token.age
deleted file mode 100644
index 39764a0..0000000
Binary files a/modules/utils/agenix/secrets/ebd_token.age and /dev/null differ
diff --git a/modules/utils/agenix/secrets/fbda_wg_priv_key.age b/modules/utils/agenix/secrets/fbda_wg_priv_key.age
deleted file mode 100644
index 2075ca0..0000000
Binary files a/modules/utils/agenix/secrets/fbda_wg_priv_key.age and /dev/null differ
diff --git a/modules/utils/agenix/secrets/fbda_wg_psk.age b/modules/utils/agenix/secrets/fbda_wg_psk.age
deleted file mode 100644
index 4524af4..0000000
--- a/modules/utils/agenix/secrets/fbda_wg_psk.age
+++ /dev/null
@@ -1,7 +0,0 @@
-age-encryption.org/v1
--> X25519 9gg+So36zrxzTKZ+NKEE0Mi0+1PJhg25+h5TJCDCWCM
-oD9VMqfQQ8enVjUoHugRbaICHRcUILhhaMMfk4VkYLA
--> v_-grease )
-Ig
---- XuF9ikNgXeY3V4FBAfrSftQXmA1Jxm7DIU77EFyPt8A
-�π��a;�I}e�����c�I��m��$�z��mAT����	!ZQ�`�9�eK`�g�� �7���k�{��
\ No newline at end of file
diff --git a/modules/utils/agenix/secrets/ffda_token.age b/modules/utils/agenix/secrets/ffda_token.age
deleted file mode 100644
index b1ed0f3..0000000
Binary files a/modules/utils/agenix/secrets/ffda_token.age and /dev/null differ
diff --git a/modules/utils/agenix/secrets/gcd_etwas.age b/modules/utils/agenix/secrets/gcd_etwas.age
deleted file mode 100644
index 9d92621..0000000
Binary files a/modules/utils/agenix/secrets/gcd_etwas.age and /dev/null differ
diff --git a/modules/utils/agenix/secrets/gh_argstr.age b/modules/utils/agenix/secrets/gh_argstr.age
deleted file mode 100644
index 8263565..0000000
--- a/modules/utils/agenix/secrets/gh_argstr.age
+++ /dev/null
@@ -1,9 +0,0 @@
-age-encryption.org/v1
--> X25519 GKUURHej+ErV3IMimOmdGwFVPZ/h+QaqdjZPLxseNBY
-C1Pig/pPSJMk34PrH3mXbMwX9tMDKuelJ5ttUB5e3+k
--> $g:]dvYJ-grease
-1z69372dSEFbYg7Ny+Xn/6RAozi43aaSybJG/HScdMSzFvttJ7gYbZEStEo32MMm
-TjLKHwBX205vizvoeskIMdhp0Vr7vz894//0MEEJAeIbsVKV/eEUbw
---- FhK586dKqyoWab5v9kI7SW+Cg+ID+fYtlsrpidOA2PA
-�2R����K@lE0Ao��~�Wm��e\ )ZaJ��)p� ��"�1i����rQy2ݛ.��fn��MΟ�~���=��9׼X	*�\�>M�	BT���f� 
-d��D�����	W�:b�M���]�T�S��P���J�
2��� �aEՠ�5)߿c��
��
\ No newline at end of file
diff --git a/modules/utils/agenix/secrets/gh_token.age b/modules/utils/agenix/secrets/gh_token.age
deleted file mode 100644
index 634a6c3..0000000
Binary files a/modules/utils/agenix/secrets/gh_token.age and /dev/null differ
diff --git a/modules/utils/agenix/secrets/glrwth_token.age b/modules/utils/agenix/secrets/glrwth_token.age
deleted file mode 100644
index daef265..0000000
--- a/modules/utils/agenix/secrets/glrwth_token.age
+++ /dev/null
@@ -1,8 +0,0 @@
-age-encryption.org/v1
--> X25519 cRGm7gXPptdANVdI68CkmKmguojNn/8fI9KS3m/6wng
-p//dLMAqSr/UNYsmWCHy28hiMAFI2u4xyrZ0jb+yTQ4
--> wD%m*X*]-grease " qB0 9npD"
-vT2TiwtPdyYwvUxHusUhE8Ef4iqAzwkBzA+xmlW0UA7bgMe/7yMx9UsyRv4Qo3TL
-nQKDl4Z16SVXWXPUWXa4JiWhIXCrIQ
---- g9xrDSSxbAzvkNpHNMRAaBAPqHxRAE9Bw0fvTUV4UQ0
-��Yv���?��ˉE�
/:Y%~E6-{:�ıM�P��mNeeo���}F/�l��<a�.������R��<��Eg=:�Կ J�.?��P���^NzG��n�(Y�Z����q�g8��}Æ�y%w_�Ѣ����N=E���ƥ>1��ï�M.��/�F0�܄r�ς��#��  �D,��z�X�mOq��7��Of�m�'Y�R��MV$D�L���P�͎#X2~��p�~�z���khz�S��A�+ZՉ���J����n{AT�D�W&w+J�N�W����{˘ʚqW����XF��~�{����cl�+��$]�^� LԦ>w�ra*�� J;.��d=sDžӖ�(l������MJX?g�>T��f�;շ8�K��fh�芓�c$
)�Fy�!Ӑć7$�8��7��+B��%h�im�����r���J�K����U��{�
\ No newline at end of file
diff --git a/modules/utils/agenix/secrets/ncvps.age b/modules/utils/agenix/secrets/ncvps.age
deleted file mode 100644
index 10647ec..0000000
Binary files a/modules/utils/agenix/secrets/ncvps.age and /dev/null differ
diff --git a/modules/utils/agenix/secrets/sign_etwas.age b/modules/utils/agenix/secrets/sign_etwas.age
deleted file mode 100644
index 3823c7d..0000000
Binary files a/modules/utils/agenix/secrets/sign_etwas.age and /dev/null differ
diff --git a/modules/utils/agenix/token2_hmac.pub b/modules/utils/agenix/token2_hmac.pub
deleted file mode 100644
index b71b0a9..0000000
--- a/modules/utils/agenix/token2_hmac.pub
+++ /dev/null
@@ -1,2 +0,0 @@
-# public key: age13df3ep0jm5f5nd63rm9lqscclcq6ckkpah4s8jnr986c2qajuq8saw67ju
-AGE-PLUGIN-FIDO2-HMAC-1QQPQRFE05VSA89230US6NVEN6J07306NRQATZ7D5D3GUDERJXPHA22L3RMQM34HFCM5QVRSJTGJHD6PLG4LEWNZ0URE07450UKV5S3ZKMU8AHK7QE7JZD0T7SDW8TNLKDWWN929Q7LCRZ84HCX23TUCQ67377LLCKHU336CLSHS6UWGGJGQPEF44EN0V43P9EQJKJJWECJER5P0D7Y76MLG9
diff --git a/modules/utils/default.nix b/modules/utils/default.nix
index f82f53a..7f4f2b4 100644
--- a/modules/utils/default.nix
+++ b/modules/utils/default.nix
@@ -1,6 +1,5 @@
 {
   imports = [
-    ./agenix
     ./auth.nix
     ./docker.nix
     ./gnome.nix