diff --git a/flake.nix b/flake.nix
index 96c59b1..5f215f1 100644
--- a/flake.nix
+++ b/flake.nix
@@ -115,13 +115,21 @@
             ./features/caches/oss.nix
             home-manager.darwinModules.home-manager
             {
+              # TODO: Refactor-DRY with Linux's home.nix
               home-manager.extraSpecialArgs = { inherit system inputs; };
               home-manager.users.srid = { pkgs, ... }: {
                 imports = [
                   ./home/git.nix
                   ./home/tmux.nix
                   ./home/neovim.nix
+                  ./home/starship.nix
                 ];
+                programs.zsh = {
+                  enable = true;
+                  shellAliases = {
+                    g = "${pkgs.git}/bin/git";
+                  };
+                };
                 home.stateVersion = "21.11";
               };
             }
diff --git a/home.nix b/home.nix
index 4eb0b6b..e35d305 100644
--- a/home.nix
+++ b/home.nix
@@ -4,6 +4,8 @@ rec {
     inputs.nix-doom-emacs.hmModule
     ./home/tmux.nix
     ./home/git.nix
+    ./home/neovim.nix
+    ./home/starship.nix
   ];
 
   home.packages = with pkgs; [
@@ -87,24 +89,6 @@ rec {
       };
     };
 
-    starship =
-      {
-        enable = true;
-        settings = {
-          username = {
-            format = "[$user](bold blue) ";
-            disabled = false;
-            show_always = true;
-          };
-          hostname = {
-            ssh_only = false;
-            format = "on [$hostname](bold red) ";
-            trim_at = ".companyname.com";
-            disabled = false;
-          };
-        };
-      };
-
     bat.enable = true;
     autojump.enable = false;
     zoxide.enable = true;
diff --git a/home/git.nix b/home/git.nix
index 4ee3bdd..2c033dc 100644
--- a/home/git.nix
+++ b/home/git.nix
@@ -11,7 +11,7 @@
       s = "status";
       st = "status";
       b = "branch";
-      p = "pull --rebase";
+      # p = "pull --rebase";
       pu = "push";
     };
     ignores = [ "*~" "*.swp" ];
diff --git a/home/starship.nix b/home/starship.nix
new file mode 100644
index 0000000..857e756
--- /dev/null
+++ b/home/starship.nix
@@ -0,0 +1,18 @@
+{
+  programs.starship = {
+    enable = true;
+    settings = {
+      username = {
+        format = "[$user](bold blue) ";
+        disabled = false;
+        show_always = true;
+      };
+      hostname = {
+        ssh_only = false;
+        format = "on [$hostname](bold red) ";
+        trim_at = ".companyname.com";
+        disabled = false;
+      };
+    };
+  };
+};
diff --git a/hosts/darwin.nix b/hosts/darwin.nix
index 47add03..00cc209 100644
--- a/hosts/darwin.nix
+++ b/hosts/darwin.nix
@@ -36,6 +36,7 @@
 
   nixpkgs.config.allowBroken = true;
 
+  # For home-manager to work.
   users.users.srid.name = "srid";
   users.users.srid.home = "/Users/srid";
 
@@ -48,7 +49,7 @@
   # nix.package = pkgs.nix;
 
   # Create /etc/bashrc that loads the nix-darwin environment.
-  programs.zsh.enable = true; # default shell on catalina
+  # programs.zsh.enable = true; # default shell on catalina
   # programs.fish.enable = true;
 
   # Used for backwards compatibility, please read the changelog before changing.