diff --git a/flake.lock b/flake.lock
index fb64598..0ced173 100755
--- a/flake.lock
+++ b/flake.lock
@@ -924,6 +924,22 @@
       }
     },
     "nixpkgs-stable_3": {
+      "locked": {
+        "lastModified": 1742268799,
+        "narHash": "sha256-IhnK4LhkBlf14/F8THvUy3xi/TxSQkp9hikfDZRD4Ic=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "da044451c6a70518db5b730fe277b70f494188f1",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-24.11",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs-stable_4": {
       "locked": {
         "lastModified": 1730741070,
         "narHash": "sha256-edm8WG19kWozJ/GqyYx2VjW99EdhjKwbY3ZwdlPAAlo=",
@@ -939,6 +955,22 @@
         "type": "github"
       }
     },
+    "nixpkgs-unstable": {
+      "locked": {
+        "lastModified": 1742288794,
+        "narHash": "sha256-Txwa5uO+qpQXrNG4eumPSD+hHzzYi/CdaM80M9XRLCo=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "b6eaf97c6960d97350c584de1b6dcff03c9daf42",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "nixpkgs_2": {
       "locked": {
         "lastModified": 1742288794,
@@ -1111,7 +1143,7 @@
           "steamdeck-lanzaboote",
           "nixpkgs"
         ],
-        "nixpkgs-stable": "nixpkgs-stable_3"
+        "nixpkgs-stable": "nixpkgs-stable_4"
       },
       "locked": {
         "lastModified": 1731363552,
@@ -1146,6 +1178,8 @@
         "nas-nixpkgs": "nas-nixpkgs",
         "nas-sops-nix": "nas-sops-nix",
         "nix-darwin": "nix-darwin",
+        "nixpkgs-stable": "nixpkgs-stable_3",
+        "nixpkgs-unstable": "nixpkgs-unstable",
         "pi4-home-manager": "pi4-home-manager",
         "pi4-impermanence": "pi4-impermanence",
         "pi4-nixos-hardware": "pi4-nixos-hardware",
diff --git a/flake.nix b/flake.nix
index b4d35d8..1ab556f 100755
--- a/flake.nix
+++ b/flake.nix
@@ -178,7 +178,6 @@
     # Nix hardware
     steamdeck-nixos-hardware = {
       url = "github:NixOS/nixos-hardware/master";
-      inputs.nixpkgs.follows = "steamdeck-nixpkgs";
     };
 
     # steam rom manager
@@ -197,6 +196,18 @@
       url = "github:LnL7/nix-darwin";
       inputs.nixpkgs.follows = "desktop-nixpkgs";
     };
+
+    #####################################################
+    #                    Common                         #
+    #####################################################
+
+    nixpkgs-unstable = {
+      url = "github:NixOS/nixpkgs/nixos-unstable";
+    };
+
+    nixpkgs-stable = {
+      url = "github:NixOS/nixpkgs/nixos-24.11";
+    };
   };
 
   outputs =
@@ -242,7 +253,11 @@
       steamdeck-steam-rom-manager,
 
       # MacBook
-      nix-darwin
+      nix-darwin,
+
+      # Common
+      nixpkgs-unstable,
+      nixpkgs-stable,
     }@inputs:
     let
       inherit (self) outputs;
diff --git a/hosts/default.nix b/hosts/default.nix
index 9d67503..d1c1a4d 100755
--- a/hosts/default.nix
+++ b/hosts/default.nix
@@ -104,6 +104,7 @@ in
       enable = lib.mkDefault true;
       enableSSHSupport = lib.mkDefault true;
     };
+    command-not-found.enable = lib.mkForce false;
   };
 
   environment.systemPackages = with pkgs; [
diff --git a/hosts/homeassistant/home.nix b/hosts/homeassistant/home.nix
index 929868c..22c719e 100755
--- a/hosts/homeassistant/home.nix
+++ b/hosts/homeassistant/home.nix
@@ -56,8 +56,6 @@ in
     aliases = gitAliases;
   };
 
-  programs.command-not-found.enable = true;
-
   home.packages = with pkgs; [
     age
     fastfetch
diff --git a/hosts/mac-nixos/home.nix b/hosts/mac-nixos/home.nix
index 6b151f0..347d84d 100755
--- a/hosts/mac-nixos/home.nix
+++ b/hosts/mac-nixos/home.nix
@@ -65,8 +65,6 @@ in
     };
   };
 
-  programs.command-not-found.enable = true;
-
   home.packages = with pkgs; [
     apple-cursor
     colloid-icon-theme
diff --git a/share/root-user/default.nix b/share/root-user/default.nix
index 8a2e6f4..5990e91 100755
--- a/share/root-user/default.nix
+++ b/share/root-user/default.nix
@@ -25,7 +25,6 @@ in
   home.stateVersion = "23.11";
 
   programs = {
-    command-not-found.enable = true;
     home-manager.enable = true;
 
     zsh = {