diff --git a/home/programs/coding/R.nix b/home/programs/coding/R.nix
index cc71bc0..95d6447 100644
--- a/home/programs/coding/R.nix
+++ b/home/programs/coding/R.nix
@@ -3,7 +3,7 @@ let
   colors = config.lib.stylix.colors.withHashtag;
 in
 {
-  home.packages = with (import ../../../pkgs/R.nix pkgs); [
+  home.packages = with (pkgs.callPackage ../../../pkgs/R.nix { }); [
     (config.lib.misc.addFlags
       "--enable-features=UseOzonePlatform --ozone-platform=wayland --use-gl=angle --wayland-text-input-version=3"
       "rstudio"
diff --git a/home/programs/desktop/fonts.nix b/home/programs/desktop/fonts.nix
index cc2df16..9220a73 100644
--- a/home/programs/desktop/fonts.nix
+++ b/home/programs/desktop/fonts.nix
@@ -1,13 +1,7 @@
 { pkgs, lib, ... }:
 {
   home.packages = [
-    (import ../../../pkgs/fonts/kose.nix {
-      inherit pkgs lib;
-      inherit (pkgs) stdenvNoCC;
-    })
-    (import ../../../pkgs/fonts/hugmetight.nix {
-      inherit pkgs lib;
-      inherit (pkgs) stdenvNoCC;
-    })
+    (pkgs.callPackage ../../../pkgs/fonts/kose.nix { })
+    (pkgs.callPackage ../../../pkgs/fonts/hugmetight.nix { })
   ];
 }
diff --git a/home/programs/network/zjuconnect.nix b/home/programs/network/zjuconnect.nix
index e002731..1c74f4f 100644
--- a/home/programs/network/zjuconnect.nix
+++ b/home/programs/network/zjuconnect.nix
@@ -1,8 +1,6 @@
 { pkgs, ... }:
 let
-  zju-connect = import ../../../pkgs/zju-connect.nix {
-    inherit (pkgs) lib buildGoModule fetchFromGitHub;
-  };
+  zju-connect = pkgs.callPackage ../../../pkgs/zju-connect.nix { };
   zjuconnect = pkgs.writeShellScriptBin "zjuconnect" ''exec ${zju-connect}/bin/zju-connect --config ~/.config/zju-connect/config.toml'';
 in
 {
diff --git a/home/programs/utils/eye-candy.nix b/home/programs/utils/eye-candy.nix
index a5d2a8d..4458997 100644
--- a/home/programs/utils/eye-candy.nix
+++ b/home/programs/utils/eye-candy.nix
@@ -4,7 +4,7 @@
   ...
 }:
 let
-  edenfetch = import ../../../pkgs/edenfetch.nix { inherit (pkgs) lib fetchFromGitHub rustPlatform; };
+  edenfetch = pkgs.callPackage ../../../pkgs/edenfetch.nix { };
 in
 {
   home.packages = with pkgs; [
diff --git a/os/programs/swhkd.nix b/os/programs/swhkd.nix
index d1d9111..cf80a66 100644
--- a/os/programs/swhkd.nix
+++ b/os/programs/swhkd.nix
@@ -1,14 +1,6 @@
 { pkgs, ... }:
 let
-  swhkd = import ../../pkgs/swhkd.nix {
-    inherit (pkgs)
-      lib
-      rustPlatform
-      fetchFromGitHub
-      pkg-config
-      udev
-      ;
-  };
+  swhkd = pkgs.callPackage ../../pkgs/swhkd.nix { };
 in
 {
   environment.systemPackages = [
diff --git a/pkgs/R.nix b/pkgs/R.nix
index 2cccae1..91d2b2c 100644
--- a/pkgs/R.nix
+++ b/pkgs/R.nix
@@ -1,6 +1,10 @@
-pkgs:
+{
+  rPackages,
+  rWrapper,
+  rstudioWrapper,
+}:
 let
-  rPkgs = with pkgs.rPackages; [
+  rPkgs = with rPackages; [
     ggplot2
     dplyr
     tidyverse
@@ -13,10 +17,10 @@ let
   ];
 in
 {
-  myR = pkgs.rWrapper.override {
+  myR = rWrapper.override {
     packages = rPkgs;
   };
-  myRstudio = pkgs.rstudioWrapper.override {
+  myRstudio = rstudioWrapper.override {
     packages = rPkgs;
   };
 }