diff --git a/modules/home/caem/core/default.nix b/modules/home/caem/core/default.nix
new file mode 100644
index 0000000..99b31f4
--- /dev/null
+++ b/modules/home/caem/core/default.nix
@@ -0,0 +1,6 @@
+{ lib, ... }:
+
+{
+  imports = lib.getModuleImports ./.;
+}
+
diff --git a/modules/home/caem/core/zsh.nix b/modules/home/caem/core/zsh.nix
new file mode 100644
index 0000000..6eca416
--- /dev/null
+++ b/modules/home/caem/core/zsh.nix
@@ -0,0 +1,15 @@
+{ config, ... }:
+
+{
+  programs.zsh = {
+    enable = true;
+    enableCompletion = true;
+    autosuggestions.enable = true;
+    syntaxHighlighting.enable = true;
+
+    history.size = 10000;
+    history.ignoreAllDups = true;
+    /* Not persisted on purpose */
+    history.path = "${config.xdg.cacheHome}/zsh_history";
+  };
+}
diff --git a/modules/nixos/desktop/gnome/default.nix b/modules/nixos/desktop/gnome/default.nix
index c02e6db..61ecd06 100644
--- a/modules/nixos/desktop/gnome/default.nix
+++ b/modules/nixos/desktop/gnome/default.nix
@@ -42,6 +42,9 @@
   ]);
 
   environment.persistence."/nix/persist" = {
+    directories = [
+      "/var/lib/AccountsService"
+    ];
     users."${username}" = {
       directories = [
         ".config/dconf"