diff --git a/modules/cross-platform/home-manager/shell.nix b/modules/cross-platform/home-manager/shell.nix
index 43a0244..ab052eb 100644
--- a/modules/cross-platform/home-manager/shell.nix
+++ b/modules/cross-platform/home-manager/shell.nix
@@ -33,8 +33,12 @@
     # Enable git
     programs.git = {
       enable = true;
-      userName = "Crony Akatsuki";
-      userEmail = "crony@cronyakatsuki.xyz";
+      settings = {
+        user = {
+          name = "Crony Akatsuki";
+          email = "crony@cronyakatsuki.xyz";
+        };
+      };
     };
 
     # Install fzf
diff --git a/modules/linux/home-manager/shell-additions.nix b/modules/linux/home-manager/shell-additions.nix
index 9ff5d60..9b6bdba 100644
--- a/modules/linux/home-manager/shell-additions.nix
+++ b/modules/linux/home-manager/shell-additions.nix
@@ -18,10 +18,10 @@
       nurl
       # termsonic
       # inputs.iamb.packages.x86_64-linux.default
-      inputs.agenix.packages.${system}.default
-      inputs.deploy-rs.packages.${system}.default
-      inputs.hb-downloader.packages.${system}.default
-      inputs.note.packages.${system}.default
+      inputs.agenix.packages.${stdenv.hostPlatform.system}.default
+      inputs.deploy-rs.packages.${stdenv.hostPlatform.system}.default
+      inputs.hb-downloader.packages.${stdenv.hostPlatform.system}.default
+      inputs.note.packages.${stdenv.hostPlatform.system}.default
       beets
       croc
     ];