diff --git a/config.default.nix b/config.default.nix
index cf73961..5fe6dcc 100644
--- a/config.default.nix
+++ b/config.default.nix
@@ -11,7 +11,7 @@
   terminal = {
     termFont = "JetBrainsMono Nerd Font"; # e.g., JetBrainsMono Nerd Font
     termSize = "20";
-    termShell = "fish";
+    termShell = "zsh";
     shellAliases = {
       ls = "ls --color=auto";
       update = ''
diff --git a/nixos/macos/darwin.nix b/nixos/macos/darwin.nix
index f5299e9..193a1d2 100644
--- a/nixos/macos/darwin.nix
+++ b/nixos/macos/darwin.nix
@@ -2,6 +2,7 @@
   pkgs,
   builder,
   terminal,
+  username,
   ...
 }: {
   # List packages installed in system profile. To search by name, run:
@@ -30,11 +31,11 @@
   # The platform the configuration will be used on.
   nixpkgs.hostPlatform = "aarch64-darwin";
 
-  users.users.lsoriano = {
-    name = "lsoriano";
-    home = "/Users/lsoriano";
+  users.users.${username} = {
+    name = "${username}";
+    home = "/Users/${username}";
     shell = pkgs.${terminal.termShell};
   };
 
-  home-manager.users.lsoriano = import ../../home/macos/home.nix;
+  home-manager.users.${username} = import ../../home/macos/home.nix;
 }