diff --git a/flake.lock b/flake.lock
index bc09795..22ade5a 100644
--- a/flake.lock
+++ b/flake.lock
@@ -277,11 +277,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1737926801,
-        "narHash": "sha256-un7IETRNjUm83jM5Gd/7BO4rCzzkom46O0FDMo5toaI=",
+        "lastModified": 1738033138,
+        "narHash": "sha256-qlIM8A3bdL9c6PexhpS+QyZLO9y/8a3V75HVyJgDE5Q=",
         "owner": "lnl7",
         "repo": "nix-darwin",
-        "rev": "62ba0a22426721c94e08f0779ed8235d5672869b",
+        "rev": "349a74c66c596ef97ee97b4d80a3ca61227b6120",
         "type": "github"
       },
       "original": {
@@ -345,6 +345,22 @@
         "type": "github"
       }
     },
+    "nixpkgs-rpi": {
+      "locked": {
+        "lastModified": 1736883708,
+        "narHash": "sha256-uQ+NQ0/xYU0N1CnXsa2zghgNaOPxWpMJXSUJJ9W7140=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "eb62e6aa39ea67e0b8018ba8ea077efe65807dc8",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "eb62e6aa39ea67e0b8018ba8ea077efe65807dc8",
+        "type": "github"
+      }
+    },
     "nixvim": {
       "inputs": {
         "devshell": "devshell",
@@ -362,11 +378,11 @@
         "treefmt-nix": "treefmt-nix"
       },
       "locked": {
-        "lastModified": 1738051551,
-        "narHash": "sha256-HIKvX5ofJMJCQ4CS7ZbL3kEmBjhoc34qOwG4s4Bxvio=",
+        "lastModified": 1738066434,
+        "narHash": "sha256-XnXAOrbwa46w/hjYe2+OmRMWJZTD+DuzXxBx0Osfw3Q=",
         "owner": "nix-community",
         "repo": "nixvim",
-        "rev": "a64048e9f5f323c9bc5de29e759ff0531a114604",
+        "rev": "635adc07fa3c09c0c9aa9e43ebb0874abe002292",
         "type": "github"
       },
       "original": {
@@ -459,7 +475,7 @@
         "libcamera-src": "libcamera-src",
         "libpisp-src": "libpisp-src",
         "nixpkgs": [
-          "nixpkgs"
+          "nixpkgs-rpi"
         ],
         "rpi-bluez-firmware-src": "rpi-bluez-firmware-src",
         "rpi-firmware-nonfree-src": "rpi-firmware-nonfree-src",
@@ -490,6 +506,7 @@
         "home-manager": "home-manager",
         "nixos-hardware": "nixos-hardware",
         "nixpkgs": "nixpkgs",
+        "nixpkgs-rpi": "nixpkgs-rpi",
         "nixvim": "nixvim",
         "osbm-nvim": "osbm-nvim",
         "raspberry-pi-nix": "raspberry-pi-nix",
diff --git a/flake.nix b/flake.nix
index a80bfb0..09ad3dc 100644
--- a/flake.nix
+++ b/flake.nix
@@ -21,6 +21,7 @@
     };
     nixos-hardware.url = "github:NixOS/nixos-hardware/master";
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
+    nixpkgs-rpi.url = "github:NixOS/nixpkgs/eb62e6aa39ea67e0b8018ba8ea077efe65807dc8"; # TODO: fix this later
     nixvim = {
       url = "github:nix-community/nixvim";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -33,7 +34,7 @@
     };
     raspberry-pi-nix = {
       url = "github:nix-community/raspberry-pi-nix";
-      inputs.nixpkgs.follows = "nixpkgs";
+      inputs.nixpkgs.follows = "nixpkgs-rpi";
     };
     vscode-server = {
       url = "github:nix-community/nixos-vscode-server";
@@ -50,6 +51,7 @@
     home-manager,
     raspberry-pi-nix,
     nixos-hardware,
+    nixpkgs-rpi,
     ...
   }: {
     nixosConfigurations = let
@@ -101,7 +103,7 @@
           }
         ];
       };
-      pochita = nixpkgs.lib.nixosSystem {
+      pochita = nixpkgs-rpi.lib.nixosSystem {
         modules = [
           ./hosts/pochita/configuration.nix
           raspberry-pi-nix.nixosModules.raspberry-pi
@@ -120,7 +122,7 @@
           inherit system-label;
         };
       };
-      pochita-sd = nixpkgs.lib.nixosSystem {
+      pochita-sd = nixpkgs-rpi.lib.nixosSystem {
         modules = [
           ./hosts/pochita-sd/configuration.nix
           raspberry-pi-nix.nixosModules.raspberry-pi