diff --git a/config/darwin.nix b/config/darwin.nix
index dbb7fae..9fd3b25 100644
--- a/config/darwin.nix
+++ b/config/darwin.nix
@@ -14,6 +14,7 @@
     onActivation.cleanup = "zap";
     brews = [
       "wireguard-tools"
+      "bitwarden-cli"
       "coreutils"
       "watch"
     ];
@@ -21,6 +22,7 @@
       "scroll-reverser"
       "google-chrome"
       "instantview"
+      "bitwarden"
       "tailscale"
       "discord"
       "iterm2"
@@ -106,6 +108,8 @@
 
     # Full Screen Window
     cmd - f : yabai -m window --toggle zoom-fullscreen
+    ctrl - f : osascript -e 'tell application "System Events" to set frontApp to name of first application process whose frontmost is true' \
+                         -e 'tell application "System Events" to tell process frontApp to click menu item "Find…" of menu 1 of menu item "Find" of menu "Edit" of menu bar item "Edit" of menu bar 1'
 
     # Close window with i3 keybinding
     cmd - q : yabai -m window --close
diff --git a/home/darwin.nix b/home/darwin.nix
index 276f26a..acd00cc 100644
--- a/home/darwin.nix
+++ b/home/darwin.nix
@@ -1,18 +1,9 @@
-{ pkgs, lib, config, ... }:
-let
-  mypkgs = import ../packages/all-packages.nix {
-    inherit pkgs lib config;
-  };
-in {
+{ ... }: {
   home = {
     username = "jadenmaxwell";
     homeDirectory = "/Users/jadenmaxwell";
   };
 
-  home.packages = with mypkgs; [
-    bitwarden-cli-bin
-  ];
-
   imports = [
     ./shared.nix
     ./neovim.nix
diff --git a/packages/all-packages.nix b/packages/all-packages.nix
index cbe0104..7c11d72 100644
--- a/packages/all-packages.nix
+++ b/packages/all-packages.nix
@@ -1,5 +1,4 @@
 { pkgs, lib, config, ... }: rec {
   tpm = pkgs.callPackage ./tpm {};
   evil-winrm = pkgs.callPackage ./evil-winrm {};
-  bitwarden-cli-bin = pkgs.callPackage ./bitwarden-cli-bin {};
 }
diff --git a/packages/bitwarden-cli-bin/default.nix b/packages/bitwarden-cli-bin/default.nix
deleted file mode 100644
index 5a23616..0000000
--- a/packages/bitwarden-cli-bin/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ lib, stdenv, fetchzip }: stdenv.mkDerivation rec {
-
-  pname = "bitwarden-cli-bin";
-  version = "2024.8.2";
-
-  src = fetchzip {
-    url = "https://github.com/bitwarden/clients/releases/download/cli-v${version}/bw-macos-${version}.zip";
-    hash = "sha256-obJVIJ2n5lEXsjn7RQ+lIraHnBcn4vsU6LaAV4NPBSU=";
-  };
-
-  doCheck = true;
-  dontStrip = true;
-
-  installPhase = ''
-  mkdir -p $out/bin
-  cp -rv $src/bw $out/bin/bw
-  '';
-
-  meta = with lib; {
-    description = "Secure and free password manager for all of your devices";
-    homepage = "https://bitwarden.com";
-    license = lib.licenses.gpl3Only;
-    mainProgram = "bw";
-    platforms = platforms.darwin;
-  };
-}