1 files changed, 34 insertions, 3 deletions

diff --git a/accounts/gkleen@skadhi/default.nix b/accounts/gkleen@skadhi/default.nix
index 97faf86c..4c0c4028 100644
--- a/accounts/gkleen@skadhi/default.nix
+++ b/accounts/gkleen@skadhi/default.nix
@@ -1,4 +1,4 @@
-{ flake, userName, config, lib, ... }:
+{ flake, flakeInputs, userName, config, lib, ... }:
 let
   user = config.users.users.${userName};
 in {
@@ -9,7 +9,7 @@ in {
   config = {
     users.users.gkleen.group = "gkleen";
     users.groups.gkleen = {};
-    systemd.tmpfiles.settings.home-directories.${user.home} = lib.mkForce {
+    systemd.tmpfiles.settings.home-directories."/persistent/${user.home}" = lib.mkForce {
       v = {
         mode = user.homeMode;
         user = user.name;
@@ -17,8 +17,39 @@ in {
       };
     };
 
-    home-manager.users.${userName} = {
+    home-manager.users.${userName} = let sysConfig = config; in { config, ... }: {
+      imports = [
+        flakeInputs.nix-index-database.homeModules.nix-index
+      ];
+
       home.stateVersion = "26.05";
+
+      home.persistence."/persistent" = {
+        directories = [
+          "Downloads" "documents" "screenshots" "media"
+        ];
+      };
+
+      programs.zsh.dirHashes = let
+        flakeHashes = lib.mapAttrs' (n: v: lib.nameValuePair (inputNames.${n} or n) (toString v)) flakeInputs;
+        inputNames = {
+          self = "nixos";
+        };
+      in flakeHashes // {
+          docs = "$HOME/documents";
+          dl = "$HOME/Downloads";
+          scrot = "$HOME/screenshots";
+          media = "$HOME/media";
+        };
+      programs.starship.settings = {
+        directory.substitutions = lib.mapAttrs' (name: value: let
+          value' = builtins.unsafeDiscardStringContext value;
+          value'' = if lib.hasPrefix "$HOME/" value' then "~" + lib.removePrefix "$HOME" value' else value';
+        in lib.nameValuePair value'' "~${name}"
+        ) config.programs.zsh.dirHashes;
+      };
+
+      programs.nix-index.enable = true;
     };
   };
 }