Modules/Fish: Update abbrs for impermanent files discovery

home/modules/fish/default.nix

@@ -3,6 +3,7 @@
   lib,
   mylib,
   pkgs,
+  username,
   ...
 }: let
   inherit (config.modules) fish;
@@ -143,16 +144,30 @@ in {
             nd = "nix develop";
             nb = "nix build -L";
             nps = "nps -e";
-
-            newroot = "sudo fd --one-file-system --base-directory / --type f --hidden --exclude '{tmp,etc/passwd}'";
-            newhome = "sudo fd --one-file-system --base-directory /home/christoph --type f --hidden --exclude '{.cache}'";
           }
 
+          # Impermanence
+          # TODO: Those should be scripts
+          (let
+            fzfHome = "sudo fzf --preview 'bat --color=always --theme=ansi --style=numbers --line-range=:100 {}'";
+            fzfRoot = "sudo fzf --preview 'bat --color=always --theme=ansi --style=numbers --line-range=:100 /{}'";
+
+            cmdHome = "sudo fd --one-file-system --base-directory /home/${username} --type f --hidden --exclude \"{.cache}\"";
+            cmdRoot = "sudo fd --one-file-system --base-directory / --type f --hidden --exclude \"{tmp,etc/passwd}\"";
+
+            mvHome = "mkdir -p /persist/home/${username}/$(dirname {}) && mv {} /persist/home/${username}/$(dirname {})";
+            mvRoot = "sudo mkdir -p /persist/$(dirname {}) && sudo mv {} /persist/$(dirname {})";
+          in {
+            newroot = ''${cmdRoot} | ${fzfRoot} --header 'Press CTRL-R to reload, CTRL-M to move' --bind 'ctrl-r:reload(${cmdRoot}),ctrl-m:execute(${mvRoot})' '';
+
+            newhome = ''${cmdHome} | ${fzfHome} --header 'Press CTRL-R to reload, CTRL-M to move' --bind 'ctrl-r:reload(${cmdHome}),ctrl-m:execute(${mvHome})' '';
+          })
+
           # Abbrs only available if package is installed
 
           (abbrify pkgs.duf {
-            # df = "duf";
+            disks = "duf --hide-mp '/var/*,/etc/*,/usr/*,/home/christoph/.*'";
-            disks = "duf";
+            alldisks = "duf";
           })
 
           (abbrify pkgs.eza {

system/modules/impermanence/default.nix

@@ -55,8 +55,6 @@ in {
           (mkRDir "/etc/secureboot" m755)
           (mkRDir "/etc/ssh" m755)
 
-          (mkRDir "/nix/var" m755)
-
           # https://github.com/nix-community/impermanence/issues/253
           (mkRDir "/usr/systemd-placeholder" m755)
 
@@ -104,6 +102,7 @@ in {
             (mkUDir ".ollama" m755)
             (mkUDir ".var/app" m755)
             (mkUDir ".vim/undo" m755)
+            (mkUDir ".zotero" m755)
 
             (mkUDir ".cache/fish/generated_completions" m755)
             (mkUDir ".cache/nix-index" m755)
@@ -118,6 +117,7 @@ in {
             (mkUDir ".config/keepassxc" m755)
             (mkUDir ".config/Msty" m755)
             (mkUDir ".config/Nextcloud" m755)
+            (mkUDir ".config/Zeal" m755)
 
             (mkUDir ".local/share/direnv" m755)
             (mkUDir ".local/share/docker" m755)
@@ -143,13 +143,25 @@ in {
         homeGroup = builtins.toString config.users.groups.${config.users.users.${username}.group}.gid;
       in {
         description = "Fix impermanent home ownership";
-        wantedBy = ["home-manager-christoph.service"]; # Required for HM activation
+        wantedBy = ["home-manager-${username}.service"]; # Required for HM activation
-        before = ["home-manager-christoph.service"];
+        before = ["home-manager-${username}.service"];
         after = ["home.mount"];
         partOf = ["home.mount"];
         serviceConfig.Type = "oneshot";
 
         script = ''
+          # Don't chown if NFS shares are already mounted.
+          # This can happen outside of regular booting (e.g. nixos-rebuild switch),
+          # so we don't return an error.
+          nfs_mounts=$(grep ' nfs4 ' /proc/mounts)
+          if [ -n "$nfs_mounts" ]; then
+            echo "NFS shares are mounted into the home directory, aborting:"
+            echo "$nfs_mounts"
+            exit 0
+          else
+            echo "No NFS shares are mounted into the home directory, continuing..."
+          fi
+
           if [[ -d ${homeDir} ]]; then
             chown -R ${homeUser}:${homeGroup} ${homeDir}
             echo "Set ownership for ${homeDir} to ${homeUser}:${homeGroup}"