2 files changed, 33 insertions, 11 deletions

diff --git a/accounts/gkleen@eostre.nix b/accounts/gkleen@eostre.nix
index dbe48ead..cad7e70b 100644
--- a/accounts/gkleen@eostre.nix
+++ b/accounts/gkleen@eostre.nix
@@ -4,20 +4,31 @@
     zsh utils tmux
   ];
 
-  config.home-manager.users.${userName} = {
-    nixpkgs.config = {
-      allowUnfree = true;
+  config = {
+    systemd.services."home-manager-${userName}" = {
+      bindsTo = ["home-${userName}.mount"];
+      after = ["home-${userName}.mount"];
     };
 
-    home.packages = with pkgs; [
-      thunderbird libreoffice element-desktop keepassxc
-    ];
+    systemd.mounts."home-${userName}" = {
+      wants = ["home-manager-${userName}.service"];
+    };
+
+    home-manager.users.${userName} = {
+      nixpkgs.config = {
+        allowUnfree = true;
+      };
+
+      home.packages = with pkgs; [
+        thunderbird libreoffice element-desktop keepassxc
+      ];
 
-    programs.firefox = {
-      enable = true;
-      profiles.default.settings = {
-        "dom.security.https_only_mode" = true;
-        "browser.cache.disk.enable" = false;
+      programs.firefox = {
+        enable = true;
+        profiles.default.settings = {
+          "dom.security.https_only_mode" = true;
+          "browser.cache.disk.enable" = false;
+        };
       };
     };
   };
diff --git a/accounts/mherold@eostre.nix b/accounts/mherold@eostre.nix
index ab1bf154..538a3903 100644
--- a/accounts/mherold@eostre.nix
+++ b/accounts/mherold@eostre.nix
@@ -4,6 +4,15 @@
       hashedPassword = lib.mkForce "$6$rounds=500000$TaikR1KI4CGveV0a$jLrBjNScflgniUiy87zxQ.IjnyK8K7FbYTW7L0k0EBVrdiImds26WwNjA6DrQpENALwPMzJVIK5BTie17fFVG.";
     };
 
+    systemd.services."home-manager-${userName}" = {
+      bindsTo = ["home-${userName}.mount"];
+      after = ["home-${userName}.mount"];
+    };
+
+    systemd.mounts."home-${userName}" = {
+      wants = ["home-manager-${userName}.service"];
+    };
+
     home-manager.users.${userName} = {
       nixpkgs.config = {
         allowUnfree = true;
@@ -13,6 +22,8 @@
         thunderbird libreoffice element-desktop keepassxc
       ];
 
+      home.keyboard.layout = "de";
+
       programs.firefox = {
         enable = true;
         profiles.default.settings = {