diff --git a/modules/nix/default.nix b/modules/nix/default.nix
index 260ce90..6b77135 100644
--- a/modules/nix/default.nix
+++ b/modules/nix/default.nix
@@ -5,16 +5,15 @@
   ...
 }: {
   nix = {
-    settings = {
-      optimise.automatic = true;
-      auto-optimise-store = true;
+    optimise.automatic = true;
 
+    settings = {
+      auto-optimise-store = true;
       trusted-users = [
         "root"
         "ccr"
         "@wheel"
       ];
-
       # Disabled all the substituters, this should be managed at flakes level
       # trusted-public-keys = [
       #   "hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ="
diff --git a/secrets/cachix-personal-token.age b/secrets/cachix-personal-token.age
new file mode 100644
index 0000000..642f230
--- /dev/null
+++ b/secrets/cachix-personal-token.age
@@ -0,0 +1,34 @@
+age-encryption.org/v1
+-> ssh-rsa /AagBw
+DQIhTlQh0OFtUL5D6fGi9AKhPXsF3pFIEz/rEYuTh+oHMRrn04QX6cSS3d60Av7m
++ZDR8yxTp6dLr/qUJuF/as7TGC5dvxsKVLaEYvx540POdW1x5jntzMu/Z1m3b5FH
+u6EdTsvMmmVbQbpBV0TjkYoOlKGhyCYhPW1D92MPLzPhS20Nglty5LRZo04WLsH/
+p7wCyGLJmAQJ/RQPBsjJTY11nV5wWYNEcIeEydEgI0hrMylRPlHO/eDvxUSXVSMG
++emrflS8nfOYCrg8szCHVmElFWsxLiBVm1YQWmqA86U9OZCH1LED3ilWqem198dn
+J0wJWoIib7RBHgZCXgYbIXzYbom0nHIAqjMX3DCLD2z5nzE8KfOwj6j9LM2ot/qN
+NDbUNvCGk4S1GuRYucGmUI0J1YQeJxTirp+eTSUgqre8vKOU6P93U6yqJuU7tHVF
+YF9gUT+OuJbWoVKw7vAdiSlXEcRudB97Y/uBEGq8+EWO/1agMovEsQor6DC0lCzy
+t8Wj3tqIcrtFlnVXisozoZVeh1NS8xgSNliR2GLI8cKTTGZEzs97e9N0RihfjYXg
+o0lLL+h1dDlukTV9zT7m68MUc1X0hDtD4Ps28a6zdXOn7HfPsw/QVueAWXjXvpkg
+o6/IJiA0UnWwhXyGwDoBvV+b4rqxw6LbNM4Y8yLlYdA
+-> ssh-rsa QHr3/A
+PQjG9rdUSZ8bexe/ZeRB2Yy2LZI5+4WuK/rJmaelr3oLVavGtXtkbuTT0NPuZF1E
+4O0fOGfzUZJW7l0xa/9WbmLwI7MTKf+x3As5SpZAsXsrH4uUjwGpYmzeThyAkCGw
+z+1N9Xlb8BXY6V517TRo6AFayAVj3sitsUWbHwET/BfaVfs5ageu+MfZah+idJEH
+Fpht7HIs8ByRAhKPBNiUJcokCQR9cwLF7g4X7ooowbRiHM5dq5XywOY8wESTRpHW
+RWwGBJbf1GrDm5jGS0IabIBzyVCSntMXiKeej/11Sfi7+YhOdIBOqIafk0LhWaT6
+3iDRFeehTyCQ6I1rIC12gavuTL4NuWzz5WMyYpKClkxTV9CPIE/nvpFkNst88XGf
+fOA91uHBIngWIxm+a6BF5sDl5mJSVA9Mc23/S9Kq5Vt3ASvtm7B5+zE0nCAC+qAJ
+/bq+xXiE5wna/FChVdgLDlvpVfrvFqpBcGTqyBGL95CBJh49RZSE1MogjnP4Deki
+6DUYkIlOdDzVRJ1zxWcdr8v/kJIl3P3EWU3OrmNKJKzQq+WiHukrunj9Efe8scfj
+TwAjHt6u+f0d39lmarlqE6Wcny62jlBFs4zZ6sP7jHEi8ZZLoOp7qFm9iWeFgoXA
+3Ly3UesF5D2mRVh5c0YNulaZiGxHTpRB8/yfBUWx0mw
+-> ssh-ed25519 q+UPnA Y6kwts4ApCJA2fYz9kVLSD05lKp4QTtmhOzeSltqN3s
+U+sq0mCew6v7EjfVar/f5y5PxPszkmcpS65Rt894+bY
+-> ssh-ed25519 GVMLQg 4AYctv5uCic7J1XLC3TOoZaQfY75eApvw+kOBkREtVA
+X4H7I0p1pmPxj9J8mCol9uv6Op2hr4cZDStoqvJ0Rn0
+-> hM-grease
+Kn9bA3/b2mXixjygaE53w+7h87OSRNFrdE4+ex1pNffJA9RfO1Y5es3W78fCT5/p
+CSE
+--- zID4d0BvpHcDmsOAdH7YUTb/ETNRrsK4tOZXJ5o7DgQ
+`Q�_��a�Y�dYu�+��O�[���F�����[o}\��3�V�D���3��T�k�lI���®�n�LzS\�.���3�)7��S�a���"�
7)X�T	�\�~�z�����(�:����B�<U��l`���Q�8���X��#7N7<�x�S�W���tB��ܻ
<h�;
\ No newline at end of file
diff --git a/secrets/git-workspace-tokens.age b/secrets/git-workspace-tokens.age
index 9accbd9..71e629e 100644
Binary files a/secrets/git-workspace-tokens.age and b/secrets/git-workspace-tokens.age differ
diff --git a/secrets/magit-forge-github-token.age b/secrets/magit-forge-github-token.age
index be552b0..20c014d 100644
--- a/secrets/magit-forge-github-token.age
+++ b/secrets/magit-forge-github-token.age
@@ -1,34 +1,34 @@
 age-encryption.org/v1
 -> ssh-rsa /AagBw
-L2Lpd0rWhkOWqfZhL7195OWxZc+0mi4CsMIqBs43kJmZht2hIav0fagJ047bBMZ5
-cxbULYcwJnDBKZz0Sriag1vKAL+ldGTlNiAtMTAo4pceX8/iA41iCYVsa/uSUoHn
-eIoW3dN/dr/URf+0QyjYljO9EX6S7ZKxodqfiMUkmJSaag2+szom1G9gApzZN83X
-oTDGNAOGYvU/ldPCK9jXl4OH7OQegbFbRHGAUkHPpB6toEbusmlDi8fn/D9a7JAq
-0DwbsLCcT4S1BDAQfEN4fmTkgJy/nfLHFS1g9deDjgAylK1JWcHdV9Ex+nh6erGV
-EuIBaMD9vtZI+Kmmq0xkPAPXGvcKTDmUYzCDZb2mIq8DqH8NkTAcrH6Q3uoW/rHd
-cZSOr7sWChBPfcgC7mpvtSKpFoDEcNBqVT69/z9yu9829cr9F0FO8EcHcVvp/qgO
-4jSBfuMYVpirxNGNFpAImyKJunvnSZSK2RwX/Ipu1ymlKZjicOIXF1jcIW5x7EEs
-rqKsZoydHj8sS1Xd5bM5chLKRBsL8pnZntD92cjaUKhz/pjIZnx6vUfjsdhGedU8
-XG3KwLQtdEqDX2ZAckQZFa2dBs/3kkpR2v4Spek4/u3cGWLGQGA8wkBWo0UixoLB
-QVhm34OlgEUwjW48XfPVToKmd+A7iUZ9dBocLfEW6R8
+OU36QsKIRRpi4HQcgl79D06i7imBtHmcAMPRk/cyzbBxVKONyJ1rXtcbUMHN08WH
+ZSxw0Rd866InITBU42yZrweYncBNT3B3JNsRHodce9MRoiL9oMws5sCr0TZpFWhC
+5Jlom7Bek8ugv/JjQSUUmG4Lzqik+EPuLYrePuFS4e6c4ow0Fw6D+72C4/jWaWUi
+aSdGVb3q1crGhNRaphDAx4ucyjcZn8QDEp7injC0Y34oAVNT/V4oMVkxxv8x4twI
+twG9IZeHQue27Xb7zGmoKWCPAMJBR1tcVjL4Yqmtab0JOTXk2ccpfrzILojXLXq4
+QlY3js6H6+pfHp/QLyqFEJ6mNWPuVv17Mv/Q5EYIK3A1YQvbWzc74Zkl1fJTorvI
+8mb3ECbkY2Yhq1nkdPq5AIBn9ThsQ/FACbzo+wnNMdY1xA92BsBXn3JbuhSoqWGI
+nPqB5/32tY1PdnwTPhzC0P/9z7L6qCg6wDselloanEIkkXwWGBgv+6PZ/hsojpWf
+SjZI9Q1E4acyZputQ9Lt23Kgfk4rKDH098c5pbfPZ5++wYKWjI9eWidRlObLxvM2
+T/tHvg5CE9/Gky5sz4mysA4ukrCs5vQR5OFhOmSVzwJB8nZdayk+VgNyEykjjiZx
+aUOi04G//6xp6uQUOEh9NXoDX+fJzORe/heRSNUYj6Q
 -> ssh-rsa QHr3/A
-te/HLk+zfAG4+MOB5bB6J5M1mz+zLteZC4KknIPmXwfFrpgmzh1LykujBIwtl2ez
-XNM7dvsX7VFFNt1r033TqlVPEbwzcf5C8KpGKUctk3UORmVErbqcIYS/x+KkzR7H
-pi565rxB6yXE7zN3fK5Diqhe1TDb9BeLUVZPLtCo6QmWQ22lyt+50H72tvVX856N
-PooEx/vTE7MMcokpGCWeuQEXvk7V+rkgCTsGSblZlnBftRaSFoeX/g+RweMZHm7U
-yNfIodmgVQwaki+aZ6ceEpg6As6yFZuNhtNFreB93HnssiCKjBFLZzyOWNQ6xOOb
-l3v3PQwNSXKyixmFBbvl8FxyNjXeCPZAUfyxJEiV1mB0Jbm9RBz7ET9E6Zr38MPx
-j6DAbNyM2p+VaiRbtKAhs0CKxc8H2fAbuytG70K7m+3VzOEQWl0/QIglcwDIQhkT
-ZF7/aibRHDk7GyBVuxjwmdkqdPsRqgh+HYYy47Vffkio+ukxkeaP8Sr/4KaZlmiS
-G8OQO+h6AGkRC05HmEE+YN/3PhBf0ftQEtDevp3YGrvqpST1SMS0L2GRZ2jQ8A3U
-gIW128skLqtX93KzFK+N1A6EjPbdpV0ZYgqTLsFHTy6Z5s7FIKskDcsVDVfDYeNf
-f7dV/jVzd84I0UI+3uZ1YuYiJPSMRmuFDFmgtzUhZn0
--> ssh-ed25519 q+UPnA BhHjEVW7Rb92rRy0e2OnX9uIIk8mhxHtgvgov0k4P2U
-zx/PTSPbz2QHBEpsbVDrTwQRGxhb4nmt6ifSihnxAiI
--> ssh-ed25519 GVMLQg rxhOLvfV66Fna7+QrwMdVgLBufCJGye1b8zSmB5DyWY
-WwEYozhj4uNUa4zBVBQFojZEG0WkCmVrvmErauGZLfQ
--> wyR-grease "#<'2 {sp
-tDDDv7iDME2EsaJOWOavZO7jNlqdhkI1MV5CRc/a2tq4oPDYaTXKzl00u3Ta97Ca
-4fEtqkwRr+eT3e2iZICvrATi5xlFSqeFjrV5YNpbBQlusBK/njYv4A
---- vjabJh2rRDsBFnlvW+r/YwvGVb9k7HzQe9la0ZxFvW4
-���/fB��4����J�&�0�/�Gыf��N�K5���Aw<�R��������ó�;�]��VVtoч;
\ No newline at end of file
+PZUjVHmjEuzLo4HcI43XHYIMsl3L45Sgqrqvln8ACF9lGd8k/E1H2eIGuyK0LqDs
+Q5SsI96//x8wVi5emHr80rDectu/Ll3CjZH2xSlP1MpPNzVCK6oiFRIYnMcQda5Q
+EseQpKusgMiDEmY2yZqxISx4C5e4rnsvsZhCm5ZFaB+8ojsiukgEDLAdftgytD+C
+F/73m4B/kmfDpybBb4R12iUXjVDV4/dWLfkgEm1uNBpk2GiK7DsVQO/f7s5+Ueig
+cXAOT/cGhjMjAsJDAB0i/C6giQ7sxO4CM2EaBNCsGQ97AUfvpB61uG60+0UVvVTs
+1i9529cNqWGgFtE+1OLY3pBy2zHwoIP/mGYY/IhJaDdPYF+5OFP7VNgJ0ZcDaqwf
+clByrhZv9spf6YPhP/dhVHRAn8KiWzhjZljSE0qI3FAhYQFWoHgf9v4qfSI2skGe
+9l4BwxuYnrCwgodzgzhVjQWEsgJ2WwUtRLBB54ii6GpJlthRiEgVlfQ84bf+wPIz
+Uk+y/J3rRj7Mug0H0G7uD+nQfuQIpBC+KhLNSh6SwpP0rSQLY1ibXI7NE01Ciw7a
+cixjyaW6WW80aU+LZGaZUBp7TvcBkn9zZmEzJOY4xYwp/q20msyz9ua9lvN1+Et3
+jMtbpAxziaF9gLr9845DLGbUwuRqocymbugaDjKK9A4
+-> ssh-ed25519 q+UPnA uBCO+5Q1cgxvW2kMknG/awz9gN74Uz7RC/pXcDc+zww
+m05T89H+qMgwP25t4cjdMWCWGm7N4jVuir8MAKNibUo
+-> ssh-ed25519 GVMLQg 1Qnk4K8hHiOizrKRVljvylhAyOD68XeE2JyJlfVF/HM
+dbCx0+GzGtBIb+N84pgOWixLP18db0OR7XD1ftdQZlg
+-> VvPM-$-grease ]R P f?x}K"`& Hg2
+2pYHuifLxpkj3Mo1Gy8huG0MNFGai4b2BK4BUuEo1s6gOjqzJ0lh5b8f3YMeIEnb
+lxW0Ug4CTUGLNjU
+--- BybyLwJv9ibvHoz1+qPTMxyG6iHJUsGenqdKDTsHRG0
+�$���0��1Vj�$�B��g�I"�d�4�f��{�g=���hr�Y��X����A۔"f�5`�]
��Z2
\ No newline at end of file