diff --git a/desktop/gnome/default.nix b/desktop/gnome/default.nix
index 261f59a..8d735b3 100644
--- a/desktop/gnome/default.nix
+++ b/desktop/gnome/default.nix
@@ -15,6 +15,10 @@
     xkbOptions = "caps:swapescape";
   };
 
+  environment.systemPackages = [
+    pkgs.wl-clipboard
+  ];
+
   # Enable CUPS to print documents.
   # services.printing.enable = true;
   fonts = {
diff --git a/user/programs/firefox/default.nix b/user/programs/firefox/default.nix
index c9859f2..fd7746c 100644
--- a/user/programs/firefox/default.nix
+++ b/user/programs/firefox/default.nix
@@ -34,9 +34,9 @@
           react-devtools
           reduxdevtools
           hoppscotch
-          bitwarden
           grammarly
           vimium
+          onepassword-password-manager
         ];
       };
     };
diff --git a/user/programs/neovim/default.nix b/user/programs/neovim/default.nix
index d1dd0ec..613745f 100644
--- a/user/programs/neovim/default.nix
+++ b/user/programs/neovim/default.nix
@@ -11,6 +11,9 @@ let
   };
 in {
   programs.neovim.enable = true;
+  home.packages = [
+    pkgs.marksman
+  ];
   home.file = {
     ".config/nvim" = {
       source = astronvim;
diff --git a/user/programs/terminal/files/zshrc b/user/programs/terminal/files/zshrc
index c8355fa..aed4d59 100644
--- a/user/programs/terminal/files/zshrc
+++ b/user/programs/terminal/files/zshrc
@@ -32,9 +32,6 @@ if [ -d $HOME/.shellrc/rc.d ]; then
   for file in $HOME/.shellrc/rc.d/*.sh; do
     source $file
   done
-  for file in $HOME/.shellrc/rc.d/*.zsh; do
-    source $file
-  done
 fi
 
 # Load all files from .shell/zshrc.d directory
@@ -48,6 +45,10 @@ if [[ -n "$SSH_CONNECTION" ]] ;then
   export PINENTRY_USER_DATA="USE_CURSES=1"
 fi
 
+if [ -f $HOME/.systemrc ]; then
+  source $HOME/.systemrc
+fi
+
 
 [ -f ~/.env ] && source ~/.env