diff --git a/desktop/accounts.nix b/desktop/accounts.nix
new file mode 100644
index 0000000..b3a9b50
--- /dev/null
+++ b/desktop/accounts.nix
@@ -0,0 +1,105 @@
+{ config, lib, ... }:
+let
+  cfg = config.hd.desktop.accounts;
+  inherit (lib) mkEnableOption mkIf;
+in
+{
+  options.hd.desktop.accounts.enable = mkEnableOption "Accounts";
+  config = mkIf cfg.enable {
+    home = {
+      accounts.email.accounts = {
+        "Posteo" = rec {
+          primary = true;
+          address = "henridohmen@posteo.com";
+          realName = "Henri Dohmen";
+          smtp = {
+            tls.enable = true;
+            host = "posteo.de";
+            port = 465;
+          };
+          imap = {
+            tls.enable = true;
+            host = "posteo.de";
+            port = 993;
+          };
+          userName = address;
+          thunderbird.enable = true;
+          gpg.key = "AB79213B044674AE";
+        };
+
+        "Uni" = {
+          address = "henri.dohmen@stud.tu-darmstadt.de";
+          realName = "Henri Dohmen";
+          smtp = {
+            tls.enable = true;
+            host = "smtp.tu-darmstadt.de";
+            port = 465;
+          };
+          imap = {
+            tls.enable = true;
+            host = "imap.stud.tu-darmstadt.de";
+            port = 993;
+          };
+          userName = "hd48xebi";
+          thunderbird.enable = true;
+          gpg.key = "24FCE000F3470BAC";
+        };
+
+        "Proton" = rec {
+          address = "dohmenhenri@proton.me";
+          realName = "Henri Dohmen";
+          smtp = {
+            tls.enable = true;
+            tls.useStartTls = true;
+            host = "127.0.0.1";
+            port = 1025;
+          };
+          imap = {
+            tls.enable = true;
+            tls.useStartTls = true;
+            host = "127.0.0.1";
+            port = 1143;
+          };
+          userName = address;
+          thunderbird.enable = true;
+          gpg.key = "AB79213B044674AE";
+        };
+      };
+      accounts.calendar.accounts = {
+        "Privat" = {
+          primary = true;
+          thunderbird = {
+            enable = true;
+          };
+          remote = {
+            type = "caldav";
+            url = "https://posteo.de:8443/calendars/henridohmen/default";
+            userName = "henridohmen@posteo.com";
+          };
+        };
+        "Uni" = {
+          thunderbird = {
+            enable = true;
+          };
+          remote = {
+            type = "caldav";
+            url = "https://posteo.de:8443/calendars/henridohmen/zqrobi";
+            userName = "henridohmen@posteo.com";
+          };
+        };
+      };
+      accounts.contact.accounts = {
+        "Kontakte" = {
+          thunderbird = {
+            enable = true;
+          };
+          remote = {
+            type = "carddav";
+            url = "https://posteo.de:8843/addressbooks/henridohmen/default/";
+            userName = "henridohmen";
+          };
+        };
+      };
+    };
+  };
+}
diff --git a/desktop/default.nix b/desktop/default.nix
index 946448b..f1894ab 100644
--- a/desktop/default.nix
+++ b/desktop/default.nix
@@ -11,6 +11,7 @@ let
 in
 {
   imports = [
+    ./accounts.nix
     ./audio.nix
     ./fonts.nix
     ./gpg.nix
@@ -19,7 +20,6 @@ in
     ./services.nix
     ./software
     ./window-manager.nix
-    inputs.nixos-config-hidden.nixosModules.pc
   ];
 
   options = {
@@ -33,6 +33,7 @@ in
 
   config = mkIf cfg.enable {
     hd.desktop = {
+      accounts.enable = true;
       audio.enable = true;
       fonts.enable = true;
       gpg.enable = true;
diff --git a/desktop/gpg.nix b/desktop/gpg.nix
index ad40479..36bf219 100644
--- a/desktop/gpg.nix
+++ b/desktop/gpg.nix
@@ -19,6 +19,16 @@ in
       ];
       programs.gpg = {
         enable = true;
+        publicKeys = [
+          {
+            source = ../pgp/id-priv.pgp;
+            trust = 5;
+          }
+          {
+            source = ../pgp/id-uni.pgp;
+            trust = 5;
+          }
+        ];
       };
       services.gpg-agent = {
         enable = true;
diff --git a/flake.lock b/flake.lock
index b213aff..d22881c 100644
--- a/flake.lock
+++ b/flake.lock
@@ -111,11 +111,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1757920978,
-        "narHash": "sha256-Mv16aegXLulgyDunijP6SPFJNm8lSXb2w3Q0X+vZ9TY=",
+        "lastModified": 1760005512,
+        "narHash": "sha256-xJ/pn6d9aYa9Eco+zjX7OoxSmaFf82q22u1Rjii9Bp0=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "11cc5449c50e0e5b785be3dfcb88245232633eb8",
+        "rev": "685d8d85d051820164c809fbbc4c67474ee93d67",
         "type": "github"
       },
       "original": {
@@ -145,33 +145,13 @@
         "type": "github"
       }
     },
-    "nixos-config-hidden": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1757943476,
-        "narHash": "sha256-Exte/HLP2h1pUyIMBTDr+ehRBSqsORxDoM8F7lRQeGk=",
-        "ref": "refs/heads/main",
-        "rev": "2abdadcbbfae3e28b88057ca858058b82c5259e5",
-        "revCount": 13,
-        "type": "git",
-        "url": "ssh://git@github.com/henridoh/nixos-config-hidden"
-      },
-      "original": {
-        "type": "git",
-        "url": "ssh://git@github.com/henridoh/nixos-config-hidden"
-      }
-    },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1757891025,
-        "narHash": "sha256-NfiTk59huy/YK9H4W4wVwRYyiP2u86QqROM5KK4f5F4=",
+        "lastModified": 1759582739,
+        "narHash": "sha256-spZegilADH0q5OngM86u6NmXxduCNv5eX9vCiUPhOYc=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "4c38a024fa32e61db2be8573e5282b15d9733a79",
+        "rev": "3441b5242af7577230a78ffb03542add264179ab",
         "type": "github"
       },
       "original": {
@@ -183,11 +163,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1757745802,
-        "narHash": "sha256-hLEO2TPj55KcUFUU1vgtHE9UEIOjRcH/4QbmfHNF820=",
+        "lastModified": 1759831965,
+        "narHash": "sha256-vgPm2xjOmKdZ0xKA6yLXPJpjOtQPHfaZDRtH+47XEBo=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "c23193b943c6c689d70ee98ce3128239ed9e32d1",
+        "rev": "c9b6fb798541223bbb396d287d16f43520250518",
         "type": "github"
       },
       "original": {
@@ -203,7 +183,6 @@
         "colmena": "colmena",
         "flake-utils": "flake-utils",
         "home-manager": "home-manager_2",
-        "nixos-config-hidden": "nixos-config-hidden",
         "nixos-hardware": "nixos-hardware",
         "nixpkgs": "nixpkgs",
         "vscode-extensions": "vscode-extensions"
@@ -265,11 +244,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1757901553,
-        "narHash": "sha256-gW45THWkxnzWpPtjuaDeTnpKFB6i5cZmxk4WuGKhCNc=",
+        "lastModified": 1759974692,
+        "narHash": "sha256-8AN/Ps23Wx6CBEj7s5SKp8pVSA63BHlsAQICYF6Ac6E=",
         "owner": "nix-community",
         "repo": "nix-vscode-extensions",
-        "rev": "846f1334090a2c44d77850c00d0c17a27ad66618",
+        "rev": "6c39663c00cb3041d9567cfc103c29b46d0b3c98",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index a33bc11..7402912 100644
--- a/flake.nix
+++ b/flake.nix
@@ -11,10 +11,6 @@
       url = "github:nix-community/home-manager";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    nixos-config-hidden = {
-      url = "git+ssh://git@github.com/henridoh/nixos-config-hidden";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
     flake-utils.url = "github:numtide/flake-utils";
     agenix = {
       url = "github:ryantm/agenix";
@@ -35,7 +31,6 @@
       colmena,
       flake-utils,
       home-manager,
-      nixos-config-hidden,
       nixos-hardware,
       nixpkgs,
       vscode-extensions,
diff --git a/host/c2/default.nix b/host/c2/default.nix
index 87e3151..b54bac6 100644
--- a/host/c2/default.nix
+++ b/host/c2/default.nix
@@ -8,7 +8,7 @@
 
   imports = with inputs.nixos-hardware.nixosModules; [
     ./hardware-configuration.nix
-    common-cpu-intel
+    # common-cpu-intel
     common-pc-laptop
     common-pc-laptop-ssd
   ];
diff --git a/pgp/id-priv.pgp b/pgp/id-priv.pgp
new file mode 100644
index 0000000..7644095
--- /dev/null
+++ b/pgp/id-priv.pgp
@@ -0,0 +1,43 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+=HLjQ
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/pgp/id-uni.pgp b/pgp/id-uni.pgp
new file mode 100644
index 0000000..03df532
--- /dev/null
+++ b/pgp/id-uni.pgp
@@ -0,0 +1,39 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+=7+be
+-----END PGP PUBLIC KEY BLOCK-----