diff --git a/configs/home-manager/kicad.nix b/configs/home-manager/kicad.nix
index a8aacb5..d8457e5 100644
--- a/configs/home-manager/kicad.nix
+++ b/configs/home-manager/kicad.nix
@@ -5,8 +5,8 @@
   lib,
   ...
 }: {
-    home.packages = with pkgs; [
-      (kicad.override {compressStep=false;})
-      interactive-html-bom
-    ];
+  home.packages = with pkgs; [
+    (kicad.override {compressStep = false;})
+    interactive-html-bom
+  ];
 }
diff --git a/configs/home-manager/shpool.nix b/configs/home-manager/shpool.nix
new file mode 100644
index 0000000..c3d2f95
--- /dev/null
+++ b/configs/home-manager/shpool.nix
@@ -0,0 +1,21 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}: {
+  services.shpool = {
+    enable = true;
+    settings = {
+      default_dir = ".";
+      prompt_prefix = "";
+      keybinding = [
+        {
+          action = "detach";
+          binding = "Ctrl-a d";
+        }
+      ];
+    };
+    systemd = true;
+  };
+}
diff --git a/configs/home-manager/starship.nix b/configs/home-manager/starship.nix
index 2ecab45..f8365a8 100644
--- a/configs/home-manager/starship.nix
+++ b/configs/home-manager/starship.nix
@@ -10,6 +10,7 @@
       format = lib.concatStrings [
         "[](color_orange)"
         "$shell"
+        "\${env_var.SHPOOL_SESSION_NAME}"
         "$username"
         "[@](bg:color_orange)"
         "$hostname"
@@ -43,6 +44,13 @@
         color_red = "#cc241d";
         color_yellow = "#d79921";
       };
+      env_var.SHPOOL_SESSION_NAME = {
+        disabled = false;
+        symbol = "🌊";
+        variable = "SHPOOL_SESSION_NAME";
+        format = "[$symbol$env_value ]($style)";
+        style = "bg:color_orange";
+      };
       hostname = {
         ssh_only = false;
         ssh_symbol = "🌐";
diff --git a/hosts/altostratus/default.nix b/hosts/altostratus/default.nix
index 3fc49be..04fa6a7 100644
--- a/hosts/altostratus/default.nix
+++ b/hosts/altostratus/default.nix
@@ -24,7 +24,7 @@ inputs.nixpkgs.lib.nixosSystem {
       ...
     }: {
       hardware.enableRedistributableFirmware = true;
-      nixpkgs.hostPlatform ="x86_64-linux";
+      nixpkgs.hostPlatform = "x86_64-linux";
       host.details = {
         user = "gabe";
         fullName = "Gabe Venberg";
diff --git a/hosts/cirrostratus/default.nix b/hosts/cirrostratus/default.nix
index 77d240c..51beb94 100644
--- a/hosts/cirrostratus/default.nix
+++ b/hosts/cirrostratus/default.nix
@@ -39,7 +39,7 @@ inputs.nixpkgs.lib.nixosSystem {
         fullName = "Gabe Venberg";
         gui.enable = false;
       };
-      nixpkgs.hostPlatform ="x86_64-linux";
+      nixpkgs.hostPlatform = "x86_64-linux";
       boot.zfs.extraPools = ["storage"];
       networking.hostName = "cirrostratus"; # Define your hostname.
       networking.hostId = "1b9da0b9";
diff --git a/hosts/cirrus/default.nix b/hosts/cirrus/default.nix
index 8a82edd..07afea4 100644
--- a/hosts/cirrus/default.nix
+++ b/hosts/cirrus/default.nix
@@ -35,7 +35,7 @@ inputs.nixpkgs.lib.nixosSystem {
         gui.enable = false;
         isVm = true;
       };
-      nixpkgs.hostPlatform ="x86_64-linux";
+      nixpkgs.hostPlatform = "x86_64-linux";
       networking.hostName = "cirrus"; # Define your hostname.
       networking.hostId = "908b80b6";
       networking.useNetworkd = true;
diff --git a/hosts/cumulus/default.nix b/hosts/cumulus/default.nix
index 639cdab..5060696 100644
--- a/hosts/cumulus/default.nix
+++ b/hosts/cumulus/default.nix
@@ -32,7 +32,7 @@ inputs.nixpkgs.lib.nixosSystem {
         "rockchipdrm"
         "phy_rockchip_pcie"
       ];
-      nixpkgs.hostPlatform ="aarch64-linux";
+      nixpkgs.hostPlatform = "aarch64-linux";
       hardware.enableRedistributableFirmware = true;
       host.details = {
         user = "gabe";
diff --git a/hosts/harmatan/default.nix b/hosts/harmatan/default.nix
index a97d02c..4b8e23c 100644
--- a/hosts/harmatan/default.nix
+++ b/hosts/harmatan/default.nix
@@ -30,7 +30,7 @@ inputs.nixpkgs.lib.nixosSystem {
       lib,
       ...
     }: {
-      nixpkgs.hostPlatform ="x86_64-linux";
+      nixpkgs.hostPlatform = "x86_64-linux";
       host.details = {
         user = "gabe";
         fullName = "Gabe Venberg";
diff --git a/modules/home-manager/git.nix b/modules/home-manager/git.nix
index f396947..4941a4e 100644
--- a/modules/home-manager/git.nix
+++ b/modules/home-manager/git.nix
@@ -30,7 +30,7 @@
   config = lib.mkIf config.user.git.enable {
     programs.delta = {
       enable = true;
-      enableGitIntegration=true;
+      enableGitIntegration = true;
       options = {
         side-by-side = true;
         line-numbers = true;
diff --git a/packages/aarch64-iso.nix b/packages/aarch64-iso.nix
index c208e63..c39bcba 100644
--- a/packages/aarch64-iso.nix
+++ b/packages/aarch64-iso.nix
@@ -36,7 +36,7 @@
         "${modulesPath}/installer/scan/detected.nix"
         "${modulesPath}/installer/scan/not-detected.nix"
       ];
-      nixpkgs.hostPlatform ="aarch64-linux";
+      nixpkgs.hostPlatform = "aarch64-linux";
       host.details = {
         user = "gabe";
         fullName = "Gabe Venberg";
diff --git a/packages/iso.nix b/packages/iso.nix
index 292cc8d..5d8f41b 100644
--- a/packages/iso.nix
+++ b/packages/iso.nix
@@ -33,7 +33,7 @@
         "${modulesPath}/installer/scan/detected.nix"
         "${modulesPath}/installer/scan/not-detected.nix"
       ];
-      nixpkgs.hostPlatform ="x86_64-linux";
+      nixpkgs.hostPlatform = "x86_64-linux";
       host.details = {
         user = "gabe";
         fullName = "Gabe Venberg";
diff --git a/packages/proxmox.nix b/packages/proxmox.nix
index fc2d727..f381d3b 100644
--- a/packages/proxmox.nix
+++ b/packages/proxmox.nix
@@ -17,7 +17,7 @@
       ...
     }: {
       imports = ["${modulesPath}/virtualisation/proxmox-lxc.nix"];
-      nixpkgs.hostPlatform ="x86_64-linux";
+      nixpkgs.hostPlatform = "x86_64-linux";
       proxmoxLXC.manageHostName = false;
       boot.loader.grub.enable = lib.mkForce false;
       boot.loader.systemd-boot.enable = lib.mkForce false;
diff --git a/packages/rpi3-sd-image.nix b/packages/rpi3-sd-image.nix
index a644f9a..284752e 100644
--- a/packages/rpi3-sd-image.nix
+++ b/packages/rpi3-sd-image.nix
@@ -23,7 +23,7 @@
       ...
     }: {
       imports = ["${modulesPath}/installer/sd-card/sd-image-aarch64.nix"];
-      nixpkgs.hostPlatform ="aarch64-linux";
+      nixpkgs.hostPlatform = "aarch64-linux";
       hardware.enableRedistributableFirmware = true;
       host.details = {
         user = "gabe";
diff --git a/roles/home-manager/minimal-terminal.nix b/roles/home-manager/minimal-terminal.nix
index 5aec744..dd98b10 100644
--- a/roles/home-manager/minimal-terminal.nix
+++ b/roles/home-manager/minimal-terminal.nix
@@ -10,8 +10,8 @@
     ../../configs/home-manager/direnv.nix
     ../../configs/home-manager/ssh-agent.nix
     ../../configs/home-manager/zsh.nix
-    ../../configs/home-manager/zellij
     ../../configs/home-manager/yazi.nix
+    ../../configs/home-manager/shpool.nix
   ];
 
   user = {
diff --git a/roles/home-manager/music-prod.nix b/roles/home-manager/music-prod.nix
index 5c29562..6e768aa 100644
--- a/roles/home-manager/music-prod.nix
+++ b/roles/home-manager/music-prod.nix
@@ -6,11 +6,11 @@
 }: {
   # when it gets packaged, will want cadquery and build123d
   home.packages = with pkgs; [
-  ardour
-  cardinal
-  vmpk
-  bespokesynth
-  surge
-  helio-workstation
+    ardour
+    cardinal
+    vmpk
+    bespokesynth
+    surge
+    helio-workstation
   ];
 }
diff --git a/roles/home-manager/terminal.nix b/roles/home-manager/terminal.nix
index a4e4266..70de2ff 100644
--- a/roles/home-manager/terminal.nix
+++ b/roles/home-manager/terminal.nix
@@ -7,6 +7,7 @@
 }: {
   imports = [
     ./minimal-terminal.nix
+    ../../configs/home-manager/zellij
     ../../configs/home-manager/nushell
     ../../configs/home-manager/starship.nix
     ../../configs/home-manager/zk.nix