diff --git a/nix/nas/configuration.nix b/nix/nas/configuration.nix
index edf1659..fab1308 100644
--- a/nix/nas/configuration.nix
+++ b/nix/nas/configuration.nix
@@ -43,7 +43,7 @@
     };
     supportedFilesystems = ["zfs"];
     kernelModules = [ "coretemp" "kvm-amd" "it87" ];
-    zfs.extraPools = ["Primary"];
+    zfs.extraPools = ["tank"];
   };
 
   services = {
@@ -84,11 +84,11 @@
           environmentFile = config.age.secrets.restic-b2-credentials.path;
           repository = "s3:s3.us-west-000.backblazeb2.com/gsimmer-backup";
           paths = [
-            "/Primary/gabriel/projects"
-            "/Primary/gabriel/org"
-            "/Primary/gabriel/Backup/Pictures"
-            "/Primary/gabriel/Photos"
-            "/Primary/shared"
+            "/tank/gabriel/projects"
+            "/tank/gabriel/org"
+            "/tank/gsimmer/Backup/Pictures"
+            "/tank/gsimmer/Photos"
+            "/tank/shared"
           ];
           timerConfig = {
             OnCalendar = "daily";
@@ -115,8 +115,8 @@
           environmentFile = config.age.secrets.restic-b2-credentials.path;
           repository = "s3:s3.us-west-000.backblazeb2.com/bsimmer-backup";
           paths = [
-            "\"/Primary/becki/VRChat\ Avatars\""
-            "/Primary/becki/Pictures"
+            "\"/tank/becki/VRChat\ Avatars\""
+            "/tank/becki/Pictures"
           ];
           timerConfig = {
             OnCalendar = "daily";
@@ -144,8 +144,8 @@
           environmentFile = config.age.secrets.restic-b2-credentials.path;
           repository = "s3:s3.us-west-000.backblazeb2.com/gsimmer-app-backup";
           paths = [
-            "/Primary/k3scluster"
-            "/Primary/gitea"
+            "/tank/k3scluster"
+            "/tank/forgejo"
           ];
           timerConfig = {
             OnCalendar = "daily";
@@ -175,7 +175,7 @@
       overrideDevices = false;
       overrideFolders = false;
       user = "gsimmer";
-      dataDir = "/Primary/gabriel";
+      dataDir = "/tank/gsimmer";
       guiAddress = "100.116.48.47:8384";
     };
     prometheus.exporters = {
@@ -237,7 +237,7 @@
   '';
       shares = {
         media = {
-          path = "/Primary/media";
+          path = "/tank/media";
           browseable = "yes";
           "read only" = "no";
           "guest ok" = "yes";
@@ -245,7 +245,7 @@
           "directory mask" = "0755";
         };
         becki = {
-          path = "/Primary/becki";
+          path = "/tank/becki";
           browseable = "yes";
           "read only" = "no";
           "guest ok" = "no";
@@ -254,7 +254,7 @@
           "admin users" = "becki";
         };
         shared = {
-          path = "/Primary/shared";
+          path = "/tank/shared";
           browseable = "yes";
           "read only" = "no";
           "guest ok" = "no";
@@ -262,7 +262,7 @@
           "directory mask" = "0755";
         };
         gabriel = {
-          path = "/Primary/gabriel";
+          path = "/tank/gsimmer";
           browseable = "yes";
           "read only" = "no";
           "guest ok" = "no";
@@ -350,7 +350,7 @@
     };
     gitea = {
       enable = true;
-      stateDir = "/Primary/gitea";
+      stateDir = "/tank/forgejo";
       package = pkgs.forgejo;
       settings = {
         DEFAULT = {
@@ -506,7 +506,7 @@
     gsimmer = {
       shell = pkgs.fish;
       isNormalUser = true;
-      home = "/Primary/gabriel";
+      home = "/tank/gsimmer";
       extraGroups = [ "wheel" "libvirtd" "qemu-libvirtd" ];
       openssh.authorizedKeys.keys = let
         authorizedKeys = pkgs.fetchurl {
@@ -519,7 +519,7 @@
     becki = {
       shell = pkgs.fish;
       isNormalUser = true;
-      home = "/Primary/becki";
+      home = "/tank/becki";
     };
     root.openssh.authorizedKeys.keys = let
         authorizedKeys = pkgs.fetchurl {
diff --git a/nix/nas/home.nix b/nix/nas/home.nix
index b9cd4b2..96984ab 100644
--- a/nix/nas/home.nix
+++ b/nix/nas/home.nix
@@ -2,7 +2,7 @@
 
 {
   home.username = "gsimmer";
-  home.homeDirectory = "/Primary/gabriel";
+  home.homeDirectory = "/tank/gsimmer";
 
   nixpkgs.config.allowUnfree = true;
 
@@ -33,17 +33,6 @@ if test "$TERM" = "dumb"
   function fish_title; end
 end
     '';
-    plugins = [
-      {
-        name = "z";
-        src = pkgs.fetchFromGitHub {
-          owner = "jethrokuan";
-          repo = "z";
-          rev = "e0e1b9dfdba362f8ab1ae8c1afc7ccf62b89f7eb";
-          sha256 = "0dbnir6jbwjpjalz14snzd3cgdysgcs3raznsijd6savad3qhijc";
-        };
-      }
-    ];
   };
   
   programs.direnv = {
@@ -60,7 +49,7 @@ end
     enable = true;
   };
   
-  home.packages = with pkgs; [ ];
+  home.packages = with pkgs; [ atuin ];
 
   # This value determines the Home Manager release that your
   # configuration is compatible with. This helps avoid breakage