diff --git a/echidna.nix b/echidna.nix
index d13c02c..ed8923b 100644
--- a/echidna.nix
+++ b/echidna.nix
@@ -16,6 +16,7 @@ in {
     choose-pass
     # pkgs.khal
     pkgs.alacritty
+    pkgs.gopass
     pkgs.ansible
     pkgs.bat
     pkgs.black
@@ -46,7 +47,7 @@ in {
     pkgs.ncmpcpp
     pkgs.neofetch
     pkgs.neomutt
-    pkgs.neovim
+    # pkgs.neovim
     pkgs.newsboat
     pkgs.nixfmt
     pkgs.nodePackages.pyright
@@ -99,11 +100,14 @@ in {
 
   homebrew = {
     enable = true;
-    autoUpdate = true;
-    cleanup = "zap";
+    onActivation = {
+      cleanup = "zap";
+      autoUpdate = true;
+      upgrade = true;
+    };
     global = {
       brewfile = true;
-      noLock = true;
+      lockfiles = true;
     };
     casks = [ "kmbmpdc" "librewolf" "virtualbox" "bluetility" ];
     brews = [
@@ -114,6 +118,7 @@ in {
       "vitetris"
       "yabai"
       "skhd"
+      "neovim"
       "spacebar"
       "gnu-getopt"
       "coreutils"