diff --git a/modules/default.nix b/modules/default.nix
index d9ea73cd..c68bc712 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -9,7 +9,7 @@ inputs: let inherit (inputs) topInputs; in
     topInputs.nix-flatpak.nixosModules.nix-flatpak
     topInputs.chaotic.nixosModules.default
     { config.chaotic.nyx.overlay.onTopOf = "user-pkgs"; }
-    topInputs.catppuccin.homeModules.catppuccin
+    topInputs.catppuccin.nixosModules.catppuccin
     topInputs.aagl.nixosModules.default
     topInputs.nixvirt.nixosModules.default
     (inputs:
@@ -19,7 +19,7 @@ inputs: let inherit (inputs) topInputs; in
         home-manager.sharedModules =
         [
           topInputs.plasma-manager.homeManagerModules.plasma-manager
-          topInputs.catppuccin.homeManagerModules.catppuccin
+          topInputs.catppuccin.homeModules.catppuccin
         ];
       };
     })
diff --git a/modules/packages/winapps/default.nix b/modules/packages/winapps/default.nix
index d04b001c..ca07e94e 100644
--- a/modules/packages/winapps/default.nix
+++ b/modules/packages/winapps/default.nix
@@ -13,7 +13,7 @@ inputs:
       (inputs.pkgs.runCommand "winapps-windows" {}
       ''
         mkdir -p $out/share/applications
-        cp ${inputs.pkgs.substituteAll { src = ./windows.desktop; path = inputs.topInputs.winapps; }} \
+        cp ${inputs.pkgs.replaceVars ./windows.desktop { path = inputs.topInputs.winapps; }} \
           $out/share/applications/windows.desktop
       '')
     ]
diff --git a/modules/services/fz-new-order/default.nix b/modules/services/fz-new-order/default.nix
index b6caed82..b4a32b74 100644
--- a/modules/services/fz-new-order/default.nix
+++ b/modules/services/fz-new-order/default.nix
@@ -35,11 +35,8 @@ inputs:
           WorkingDirectory = "/var/lib/fz-new-order";
           ExecStart =
             let
-              src = inputs.pkgs.substituteAll
-              {
-                src = ./main.cpp;
-                config_file = inputs.config.sops.templates."fz-new-order/config.json".path;
-              };
+              src = inputs.pkgs.replaceVars ./main.cpp
+                { config_file = inputs.config.sops.templates."fz-new-order/config.json".path; };
               binary = inputs.pkgs.stdenv.mkDerivation
               {
                 name = "fz-new-order";
diff --git a/modules/user/chn/plasma/autostart.nix b/modules/user/chn/plasma/autostart.nix
index f112d1b3..d907f44c 100644
--- a/modules/user/chn/plasma/autostart.nix
+++ b/modules/user/chn/plasma/autostart.nix
@@ -19,7 +19,7 @@ inputs:
           yakuake = rec
           {
             fileName = "org.kde.yakuake.desktop";
-            path = "${inputs.pkgs.yakuake}/share/applications/${fileName}";
+            path = "${inputs.pkgs.kdePackages.yakuake}/share/applications/${fileName}";
           };
           telegram = rec
           {
@@ -38,7 +38,7 @@ inputs:
           kmail = rec
           {
             fileName = "org.kde.kmail2.desktop";
-            path = "${inputs.pkgs.kmail}/share/applications/${fileName}";
+            path = "${inputs.pkgs.kdePackages.kmail}/share/applications/${fileName}";
           };
           discord = rec
           {
diff --git a/modules/user/chn/plasma/konsole.nix b/modules/user/chn/plasma/konsole.nix
index eb7395ff..3aed5759 100644
--- a/modules/user/chn/plasma/konsole.nix
+++ b/modules/user/chn/plasma/konsole.nix
@@ -65,7 +65,7 @@ inputs:
       };
       home.file.".local/share/konsole/Breeze.colorscheme".text = builtins.replaceStrings
         [ "Opacity=1" ] [ "Opacity=0.9\nBlur=true" ]
-        (builtins.readFile "${inputs.pkgs.konsole}/share/konsole/Breeze.colorscheme");
+        (builtins.readFile "${inputs.pkgs.kdePackages.konsole}/share/konsole/Breeze.colorscheme");
     };
     environment.persistence."/nix/rootfs/current".users.chn.directories =
       [ ".local/share/konsole" ".local/share/yakuake" ];
diff --git a/packages/chn-bsub/default.nix b/packages/chn-bsub/default.nix
index 933f2fd2..8049042d 100644
--- a/packages/chn-bsub/default.nix
+++ b/packages/chn-bsub/default.nix
@@ -1,8 +1,4 @@
-{
-  stdenv, lib, sbatchConfig ? null, substituteAll, runCommand,
-  cmake, pkg-config, ftxui, biu
-}:
-stdenv.mkDerivation
+{ stdenv, lib, sbatchConfig ? null, runCommand, cmake, pkg-config, ftxui, biu }: stdenv.mkDerivation
 {
   name = "chn-bsub";
   src = ./.;
diff --git a/packages/matplotplusplus.nix b/packages/matplotplusplus.nix
index ead05f63..4f12eac3 100644
--- a/packages/matplotplusplus.nix
+++ b/packages/matplotplusplus.nix
@@ -1,6 +1,4 @@
-{
-  stdenv, src, cmake, pkg-config, substituteAll
-}: stdenv.mkDerivation
+{ stdenv, src, cmake, pkg-config }: stdenv.mkDerivation
 {
   name = "matplotplusplus";
   inherit src;