diff --git a/base.nix b/base.nix
index a25d5c6..9613b49 100644
--- a/base.nix
+++ b/base.nix
@@ -46,7 +46,6 @@
     git
     gnugrep
     gnutar
-    neofetch
     python3
     ripgrep
     rsync
diff --git a/flake.lock b/flake.lock
index efb66d1..5453ce7 100644
--- a/flake.lock
+++ b/flake.lock
@@ -57,14 +57,14 @@
     },
     "matrix-synapse-next": {
       "inputs": {
-        "nixpkgs-lib": "nixpkgs-lib"
+        "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1701507532,
-        "narHash": "sha256-Zzv8OFB7iilzDGe6z2t/j8qRtR23TN3N8LssGsvRWEA=",
+        "lastModified": 1710311999,
+        "narHash": "sha256-s0pT1NyrMgeolUojXXcnXQDymN7m80GTF7itCv0ZH20=",
         "owner": "dali99",
         "repo": "nixos-matrix-modules",
-        "rev": "046194cdadc50d81255a9c57789381ed1153e2b1",
+        "rev": "6c9b67974b839740e2a738958512c7a704481157",
         "type": "github"
       },
       "original": {
@@ -80,11 +80,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1706833576,
-        "narHash": "sha256-w7BL0EWRts+nD1lbLECIuz6fRzmmV+z8oWwoY7womR0=",
+        "lastModified": 1710717205,
+        "narHash": "sha256-Wf3gHh5uV6W1TV/A8X8QJf99a5ypDSugY4sNtdJDe0A=",
         "owner": "lnl7",
         "repo": "nix-darwin",
-        "rev": "bdbae6ecff8fcc322bf6b9053c0b984912378af7",
+        "rev": "bcc8afd06e237df060c85bad6af7128e05fd61a3",
         "type": "github"
       },
       "original": {
@@ -98,14 +98,14 @@
       "inputs": {
         "flake-compat": "flake-compat",
         "flake-utils": "flake-utils",
-        "nixpkgs": "nixpkgs"
+        "nixpkgs": "nixpkgs_2"
       },
       "locked": {
-        "lastModified": 1707354851,
-        "narHash": "sha256-EavLrnN9VlqqTabq+XDEvK2hV0XzZ3eCorsO5MvaWro=",
+        "lastModified": 1710638386,
+        "narHash": "sha256-8etSpxJaCYBWTViHqQRR6o76WfDX2CuD1o2UQXQrwao=",
         "owner": "Infinidoge",
         "repo": "nix-minecraft",
-        "rev": "ca6b8974161fee88608ff2addf1cb7655f17d165",
+        "rev": "8f292bc64336ac9559d33c9a074a214d783a4c8e",
         "type": "github"
       },
       "original": {
@@ -115,6 +115,37 @@
       }
     },
     "nixpkgs": {
+      "locked": {
+        "lastModified": 1706098335,
+        "narHash": "sha256-r3dWjT8P9/Ah5m5ul4WqIWD8muj5F+/gbCdjiNVBKmU=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "a77ab169a83a4175169d78684ddd2e54486ac651",
+        "type": "github"
+      },
+      "original": {
+        "id": "nixpkgs",
+        "ref": "nixos-23.11",
+        "type": "indirect"
+      }
+    },
+    "nixpkgs-stable": {
+      "locked": {
+        "lastModified": 1710628718,
+        "narHash": "sha256-y+l3eH53UlENaYa1lmnCBHusZb1kxBEFd2/c7lDsGpw=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "6dc11d9859d6a18ab0c5e5829a5b8e4810658de3",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "release-23.11",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_2": {
       "locked": {
         "lastModified": 1698318101,
         "narHash": "sha256-gUihHt3yPD7bVqg+k/UVHgngyaJ3DMEBchbymBMvK1E=",
@@ -130,44 +161,13 @@
         "type": "github"
       }
     },
-    "nixpkgs-lib": {
+    "nixpkgs_3": {
       "locked": {
-        "lastModified": 1673743903,
-        "narHash": "sha256-sloY6KYyVOozJ1CkbgJPpZ99TKIjIvM+04V48C04sMQ=",
-        "owner": "nix-community",
-        "repo": "nixpkgs.lib",
-        "rev": "7555e2dfcbac1533f047021f1744ac8871150f9f",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "nixpkgs.lib",
-        "type": "github"
-      }
-    },
-    "nixpkgs-stable": {
-      "locked": {
-        "lastModified": 1707391491,
-        "narHash": "sha256-TyDXcq8Z3slMNeyeF+ke0BzISWuM6NrBklr7XyiRbZA=",
+        "lastModified": 1710695816,
+        "narHash": "sha256-3Eh7fhEID17pv9ZxrPwCLfqXnYP006RKzSs0JptsN84=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "bc6cb3d59b7aab88e967264254f8c1aa4c0284e9",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "release-23.11",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1707238373,
-        "narHash": "sha256-WKxT0yLzWbFZwYi92lI0yWJpYtRaFSWHGX8QXzejapw=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "fb0c047e30b69696acc42e669d02452ca1b55755",
+        "rev": "614b4613980a522ba49f0d194531beddbb7220d3",
         "type": "github"
       },
       "original": {
@@ -183,7 +183,7 @@
         "matrix-synapse-next": "matrix-synapse-next",
         "nix-darwin": "nix-darwin",
         "nix-minecraft": "nix-minecraft",
-        "nixpkgs": "nixpkgs_2",
+        "nixpkgs": "nixpkgs_3",
         "sops-nix": "sops-nix",
         "unstable": "unstable",
         "voyager-addons": "voyager-addons"
@@ -197,11 +197,11 @@
         "nixpkgs-stable": "nixpkgs-stable"
       },
       "locked": {
-        "lastModified": 1707397511,
-        "narHash": "sha256-pYqXcTjcPC/go3FzT1dYtYsbmzAjO1MHhT/xgiI6J7o=",
+        "lastModified": 1710644594,
+        "narHash": "sha256-RquCuzxfy4Nr8DPbdp3D/AsbYep21JgQzG8aMH9jJ4A=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "2168851d58595431ee11ebfc3a49d60d318b7312",
+        "rev": "83b68a0e8c94b72cdd0a6e547a14ca7eb1c03616",
         "type": "github"
       },
       "original": {
@@ -227,11 +227,11 @@
     },
     "unstable": {
       "locked": {
-        "lastModified": 1707092692,
-        "narHash": "sha256-ZbHsm+mGk/izkWtT4xwwqz38fdlwu7nUUKXTOmm4SyE=",
+        "lastModified": 1710631334,
+        "narHash": "sha256-rL5LSYd85kplL5othxK5lmAtjyMOBg390sGBTb3LRMM=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "faf912b086576fd1a15fca610166c98d47bc667e",
+        "rev": "c75037bbf9093a2acb617804ee46320d6d1fea5a",
         "type": "github"
       },
       "original": {
diff --git a/home/base.nix b/home/base.nix
index 2b04a57..c3ad1c3 100644
--- a/home/base.nix
+++ b/home/base.nix
@@ -5,6 +5,12 @@
     ./zsh.nix
   ];
 
+  home.packages = with pkgs; [
+    bottom
+    unstable.ncdu
+    neofetch
+  ];
+
   programs.nix-index = {
     enable = true;
     enableZshIntegration = true;
diff --git a/hosts/burnham/home.nix b/hosts/burnham/home.nix
index 84fa68e..963c567 100644
--- a/hosts/burnham/home.nix
+++ b/hosts/burnham/home.nix
@@ -1,12 +1,5 @@
 { pkgs, lib, ... }:
 {
-  home.packages = with pkgs; [
-    bat
-    bottom
-    ncdu
-    neofetch
-  ];
-
   imports = [
     ./../../home/base.nix
   ];
diff --git a/hosts/defiant/home.nix b/hosts/defiant/home.nix
index 84fa68e..5fb52d5 100644
--- a/hosts/defiant/home.nix
+++ b/hosts/defiant/home.nix
@@ -1,11 +1,5 @@
 { pkgs, lib, ... }:
 {
-  home.packages = with pkgs; [
-    bat
-    bottom
-    ncdu
-    neofetch
-  ];
 
   imports = [
     ./../../home/base.nix
diff --git a/hosts/edison/home.nix b/hosts/edison/home.nix
index 22976b4..e1f89f2 100644
--- a/hosts/edison/home.nix
+++ b/hosts/edison/home.nix
@@ -1,11 +1,6 @@
 { pkgs, lib, ... }:
 {
   home.packages = with pkgs; [
-    bat
-    bottom
-    mumble
-    ncdu
-    neofetch
     nix-index
   ];
 
diff --git a/hosts/voyager/home.nix b/hosts/voyager/home.nix
index 84fa68e..963c567 100644
--- a/hosts/voyager/home.nix
+++ b/hosts/voyager/home.nix
@@ -1,12 +1,5 @@
 { pkgs, lib, ... }:
 {
-  home.packages = with pkgs; [
-    bat
-    bottom
-    ncdu
-    neofetch
-  ];
-
   imports = [
     ./../../home/base.nix
   ];
diff --git a/hosts/worf/configuration.nix b/hosts/worf/configuration.nix
index 72eaabf..39ead9a 100644
--- a/hosts/worf/configuration.nix
+++ b/hosts/worf/configuration.nix
@@ -44,6 +44,7 @@
   # System packages for all users
   environment = {
     systemPackages = with pkgs; [
+      eza
       findutils
       gnugrep
       jq
diff --git a/hosts/worf/home.nix b/hosts/worf/home.nix
index f570e99..3645b91 100644
--- a/hosts/worf/home.nix
+++ b/hosts/worf/home.nix
@@ -18,19 +18,14 @@
     ripes
     spotify
 
-    bat
     borgbackup
-    bottom
     cocoapods
     gnutar
-    ncdu
-    neofetch
     nix-index
     nodejs
     pinentry
     rbw
     tldr
-    eza
     zellij
 
     pandoc
diff --git a/hosts/worf/yabai.nix b/hosts/worf/yabai.nix
index fe3964d..c4d8f1c 100644
--- a/hosts/worf/yabai.nix
+++ b/hosts/worf/yabai.nix
@@ -5,7 +5,7 @@ let
 in {
   services.yabai = {
     enable = true;
-    package = pkgs.yabai;
+    package = pkgs.unstable.yabai;
     enableScriptingAddition = true;
     config = {
       layout = "bsp";