diff --git a/home-manager/common.nix b/home-manager/common.nix
index 49c0842..ebf57bf 100644
--- a/home-manager/common.nix
+++ b/home-manager/common.nix
@@ -3,26 +3,9 @@
   fonts.fontconfig.enable = true;
 
   home.packages = with pkgs; [
-    feh
     clang
     cargo
     neofetch
-    #microsoft-edge
-    #nextcloud-client
-    #bitwarden-cli
-    #bitwarden
-    #discord
-
-    # Emacs
-    cmake
-    isync
-    ispell
-    mu
-
-    # fonts
-    fira-code
-    fira-code-symbols
-    meslo-lgs-nf
   ];
 
   programs = {
diff --git a/home-manager/darwin-home.nix b/home-manager/darwin-home.nix
index 96385d7..053aa23 100644
--- a/home-manager/darwin-home.nix
+++ b/home-manager/darwin-home.nix
@@ -7,10 +7,9 @@
 
   imports = [
     ./common.nix
+    ./emacs.nix
     ./zsh.nix
   ];
 
-  programs.emacs.package = pkgs.emacs-macport;
-
   home.stateVersion = "23.11";
 }
diff --git a/home-manager/emacs.nix b/home-manager/emacs.nix
index 84b22df..6eb7097 100644
--- a/home-manager/emacs.nix
+++ b/home-manager/emacs.nix
@@ -1,4 +1,15 @@
 { inputs, config, pkgs, ... }: {
+  home.packages = with pkgs; [
+    cmake
+    isync
+    ispell
+    ledger
+    mu
+
+    fira-code
+    fira-code-symbols
+  ];
+
   programs.emacs = {
     enable = true;
     extraPackages = epkgs: with epkgs; [
diff --git a/home-manager/nixos-home.nix b/home-manager/nixos-home.nix
index 6a6fefc..35a9bad 100644
--- a/home-manager/nixos-home.nix
+++ b/home-manager/nixos-home.nix
@@ -11,6 +11,10 @@
     ./zsh.nix
   ];
 
+  home.packages = with pkgs; [
+    feh
+  ];
+
   gtk = {
     enable = true;
     theme = {
@@ -19,10 +23,6 @@
     };
   };
 
-  programs = {
-    command-not-found.enable = true;
-  };
-
   home.file = {
     ".Xresources".source = ../dotfiles/.Xresources;
     ".scripts/brightness.sh".source = ../dotfiles/.scripts/brightness.sh;
diff --git a/home-manager/zsh.nix b/home-manager/zsh.nix
index b5c12aa..648bd96 100644
--- a/home-manager/zsh.nix
+++ b/home-manager/zsh.nix
@@ -1,4 +1,9 @@
 { inputs, config, pkgs, ... }: {
+
+  home.packages = with pkgs; [
+    meslo-lgs-nf
+  ];
+
   programs.zsh = {
     enable = true;
     enableCompletion = true;
diff --git a/nixos/configuration.nix b/nixos/configuration.nix
index f390d00..0c495c9 100644
--- a/nixos/configuration.nix
+++ b/nixos/configuration.nix
@@ -112,6 +112,10 @@
     vim
     git
     picom
+    microsoft-edge
+    nextcloud-client
+    bitwarden-cli
+    bitwarden
   ];
 
   fonts.packages = with pkgs; [
diff --git a/nixos/darwin-configuration.nix b/nixos/darwin-configuration.nix
index 9d680d3..52179fb 100644
--- a/nixos/darwin-configuration.nix
+++ b/nixos/darwin-configuration.nix
@@ -4,7 +4,23 @@
   nix.settings.experimental-features = ["nix-command" "flakes"];
 
   nixpkgs.config.allowUnfree = true;
-  environment.systemPackages = with pkgs; [];
+  environment.systemPackages = with pkgs; [
+    git
+    iterm2
+    discord
+    docker
+  ];
+
+  homebrew = {
+    enable = true;
+    casks = [
+      "microsoft-edge"
+      "bitwarden"
+      "tailscale"
+      "nextcloud"
+      "nordvpn"
+    ];
+  };
 
   # Auto upgrade nix package and the daemon service.
   services.nix-daemon.enable = true;