diff --git a/home/darwin.nix b/home/darwin.nix
index bb537e2..ece66f8 100644
--- a/home/darwin.nix
+++ b/home/darwin.nix
@@ -4,7 +4,13 @@
     homeDirectory = "/Users/${user.primary.userName}";
     stateVersion = "23.11";
   };
-  programs.home-manager.enable = true;
+  programs = {
+    home-manager.enable = true;
+    fzf.enable = true;
+    lazygit.enable = true;
+    nix-index.enable = true;
+    zoxide.enable = true;
+  };
 
-  imports = [./programs/neovim.nix];
+  imports = [./programs/neovim.nix ./programs/zsh.nix ./programs/tmux.nix ./programs/starship.nix ./programs/exa.nix ./programs/direnv.nix ./programs/bat.nix ./programs/git.nix];
 }
diff --git a/home/programs/git.nix b/home/programs/git.nix
index ff25c73..b4a642b 100644
--- a/home/programs/git.nix
+++ b/home/programs/git.nix
@@ -1,4 +1,4 @@
-{...}: let
+{pkgs, ...}: let
   user = (import ../../secrets.nix).users;
 in {
   programs.git = {
@@ -6,7 +6,10 @@ in {
     diff-so-fancy = {
       enable = true;
     };
-    userEmail = user.primary.emailAddress;
+    userEmail =
+      if pkgs.stdenv.isLinux
+      then user.primary.emailAddress
+      else user.primary.workEmail;
     userName = user.primary.realName;
     signing = {
       key = user.primary.pgpFingerprint;
diff --git a/home/programs/neovim.nix b/home/programs/neovim.nix
index f0c00ec..30623a3 100644
--- a/home/programs/neovim.nix
+++ b/home/programs/neovim.nix
@@ -1,9 +1,12 @@
 {pkgs, ...}: {
-  xdg.desktopEntries = if pkgs.stdenv.isLinux then {
-    "nvim".name = "Neovim wrapper";
-    "nvim".exec = "nvim %F";
-    "nvim".noDisplay = true;
-  } else {};
+  xdg.desktopEntries =
+    if pkgs.stdenv.isLinux
+    then {
+      "nvim".name = "Neovim wrapper";
+      "nvim".exec = "nvim %F";
+      "nvim".noDisplay = true;
+    }
+    else {};
   programs.neovim = {
     enable = true;
     viAlias = true;
diff --git a/home/programs/zsh.nix b/home/programs/zsh.nix
index 291b139..183d8af 100644
--- a/home/programs/zsh.nix
+++ b/home/programs/zsh.nix
@@ -17,19 +17,24 @@
     initExtra = ''
       bindkey -v '^?' backward-delete-char
     '';
-    profileExtra = ''
-      if [ -z $DISPLAY ] && [ "$(tty)" = "/dev/tty1" ] ; then
-        exec ${pkgs.hyprland}/bin/Hyprland
-      fi
-    '';
+    profileExtra =
+      if pkgs.stdenv.isLinux
+      then ''
+        if [ -z $DISPLAY ] && [ "$(tty)" = "/dev/tty1" ] ; then
+          exec ${pkgs.hyprland}/bin/Hyprland
+        fi
+      ''
+      else "";
     shellAliases = {
       cat = "bat";
-      cd = "z";
       cp = "cp -v";
       grep = "grep --color=auto";
       ln = "ln -v";
       mv = "mv -v";
-      rebuild_system = "sudo nixos-rebuild --flake /persist/home/.nixos-config#Skipper --cores 0";
+      rebuild_system =
+        if pkgs.stdenv.isLinux
+        then "sudo nixos-rebuild --flake /persist/home/.nixos-config#Skipper --cores 0"
+        else "home-manager --flake /Users/adtya/Projects/nixos-config#adtya@Alex --cores 0";
     };
   };
 }
diff --git a/home/wm/addon/waybar/default.nix b/home/wm/addon/waybar/default.nix
index 4422934..f19b738 100644
--- a/home/wm/addon/waybar/default.nix
+++ b/home/wm/addon/waybar/default.nix
@@ -1,7 +1,4 @@
-{
-  pkgs,
-  ...
-}: {
+{pkgs, ...}: {
   programs.waybar = {
     enable = true;
     package = pkgs.waybar.overrideAttrs (oldAttrs: {
diff --git a/secrets.nix b/secrets.nix
index 422aa58..ad537c4 100644
Binary files a/secrets.nix and b/secrets.nix differ