Switch to zsh, use specialArgs to pass shell name around to update everywhere at the same time

flake.nix

@@ -23,17 +23,19 @@
     nixpkgs,
     home-manager,
     ...
-  } @ inputs: {
+  } @ inputs: let
+    shell = "zsh";
+  in {
     nixosConfigurations = let
       userConfig = {
         isNormalUser = true;
         description = "Evie Litherland-Smith";
         group = "users";
         extraGroups = ["networkmanager" "wheel" "video"];
-        shell = pkgs.fish;
+        shell = pkgs.${shell};
         openssh.authorizedKeys.keys = import ./auth/authorized_keys.nix;
       };
-      specialArgs = {inherit inputs userConfig;};
+      specialArgs = {inherit inputs shell userConfig;};
       waybar-experimental-overlay = final: prev: {
         waybar = prev.waybar.overrideAttrs (oldAttrs: {
           mesonFlags = oldAttrs.mesonFlags ++ ["-Dexperimental=true"];
@@ -72,7 +74,10 @@
         };
     };
     homeConfigurations = let
-      extraSpecialArgs = {inherit inputs;};
+      extraSpecialArgs = {
+        inherit inputs;
+        shellConfig = ./home/shell/${shell}.nix;
+      };
     in {
       # NixOS home configurations
       "xenia@Vanguard" = let

hosts/Ronin/home.nix

@@ -1,9 +1,13 @@
-{pkgs, ...}: let
+{
+  pkgs,
+  shellConfig,
+  ...
+}: let
   username = "elitherl";
   homeDirectory = "/home/${username}";
 in {
   imports = [
-    ../../home/shell/fish.nix
+    shellConfig
     ../../home/git/work.nix
     ../../home/ssh/work.nix
     ../../home/tui

hosts/common.nix

@@ -1,4 +1,8 @@
-{pkgs, ...}: let
+{
+  pkgs,
+  shell,
+  ...
+}: let
   flakeURL = "git+https://git.xenia.me.uk/xenia/nixos.git?ref=main";
 in {
   nix = {
@@ -21,7 +25,7 @@ in {
     localBinInPath = true;
     shellAliases = {
       ll = "ls -laF";
-      gg = "gitui";
+      gg = "${pkgs.gitui}/bin/gitui";
       nosu = "sudo nixos-rebuild switch --flake ${flakeURL}";
       hms = "${pkgs.home-manager}/bin/home-manager switch --flake ${flakeURL}";
     };
@@ -31,9 +35,9 @@ in {
   services.power-profiles-daemon.enable = true;
   virtualisation.podman.enable = true;
   programs = {
+    ${shell}.enable = true;
     ssh.startAgent = true;
     dconf.enable = true;
-    fish.enable = true;
   };
   fonts = {
     fonts = with pkgs; [