diff --git a/flake.nix b/flake.nix
index 66ffd911..eb6ca6a7 100644
--- a/flake.nix
+++ b/flake.nix
@@ -28,7 +28,7 @@
       systemModules ? [],
       homeModules ? [],
     }: let
-      shell = "zsh";
+      defaultUserShell = "zsh";
       specialArgs = {
         inherit hostName user;
         accentColour = "base0E"; # magenta
@@ -72,7 +72,7 @@
               };
               nixpkgs.config.allowUnfree = true;
               networking = {inherit hostName;};
-              programs.${shell}.enable = true;
+              programs.${defaultUserShell}.enable = true;
               system = {
                 inherit stateVersion;
                 autoUpgrade = {
@@ -88,7 +88,7 @@
                 };
               };
               users = {
-                defaultUserShell = pkgs.${shell};
+                defaultUserShell = pkgs.${defaultUserShell};
                 users = let
                   authorizedKeys.keys = [
                     "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINI1dWlS16Keil0MGPWmMsBzx8F9ylfz+fRwxUr8/tZ/ ion"
@@ -100,6 +100,7 @@
                   root.openssh = {inherit authorizedKeys;};
                   ${user} = {
                     group = "users";
+                    shell = pkgs.nushell;
                     isNormalUser = true;
                     description = "Evie Litherland-Smith";
                     extraGroups = ["networkmanager" "wheel" "video" "input" "uinput"];
diff --git a/home/default.nix b/home/default.nix
index 30127ddb..13f625d6 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -30,7 +30,7 @@
       enable = true;
       git = true;
       icons = true;
-      enableAliases = true;
+      enableAliases = false;
       extraOptions = ["--octal-permissions"];
     };
     readline = {
diff --git a/home/emacs/default.nix b/home/emacs/default.nix
index e4b0ab40..2cec0124 100644
--- a/home/emacs/default.nix
+++ b/home/emacs/default.nix
@@ -11,9 +11,11 @@
     package = pkgs.emacs29-pgtk;
     extraConfig = with builtins;
     with config; let
+      shell = "${pkgs.zsh}/bin/zsh";
       font = "${stylix.fonts.monospace.name}-${toString stylix.fonts.sizes.applications}";
       alpha = "${toString (floor (mul stylix.opacity.applications 100))}";
     in ''
+      (customize-set-variable 'shell-file-name "${shell}")
       (add-to-list 'initial-frame-alist '(font . "${font}"))
       (add-to-list 'default-frame-alist '(font . "${font}"))
       (add-to-list 'initial-frame-alist '(alpha-background . ${alpha}))
diff --git a/home/nushell/config.nu b/home/nushell/config.nu
index 83318c62..0f89da5c 100644
--- a/home/nushell/config.nu
+++ b/home/nushell/config.nu
@@ -2,6 +2,6 @@ $env.config = {
   show_banner: false,
   edit_mode: emacs,
   table: {
-    mode: compact,
+    mode: rounded,
   },
 }