diff --git a/home-manager/asahi/default.nix b/home-manager/asahi/default.nix
index 4950b82..63e3b17 100644
--- a/home-manager/asahi/default.nix
+++ b/home-manager/asahi/default.nix
@@ -4,24 +4,31 @@
 
 { inputs, withSystem, ... }:
 {
-  flake.homeConfigurations = {
-    asahi = withSystem "aarch64-linux" (
-      { pkgs, ... }:
-      inputs.home-manager.lib.homeManagerConfiguration {
-        inherit pkgs;
-        extraSpecialArgs = { inherit inputs pkgs; };
-        modules = [
-          { nixpkgs.overlays = [ inputs.nur.overlays.default ]; }
-          inputs.lix-module.nixosModules.default
-          inputs.sops-nix.homeManagerModules.sops
-          inputs.stylix.homeModules.stylix
-          inputs.catppuccin.homeModules.catppuccin
-          ../base.nix
-          ./home.nix
-        ];
-      }
-    );
-  };
+  flake.homeConfigurations =
+    let
+      system = "aarch64-linux";
+    in
+    {
+      asahi = withSystem system (
+        { pkgs, ... }:
+        inputs.home-manager.lib.homeManagerConfiguration {
+          inherit pkgs;
+          extraSpecialArgs = {
+            inherit inputs pkgs;
+            system = system;
+          };
+          modules = [
+            { nixpkgs.overlays = [ inputs.nur.overlays.default ]; }
+            inputs.lix-module.nixosModules.default
+            inputs.sops-nix.homeManagerModules.sops
+            inputs.stylix.homeModules.stylix
+            inputs.catppuccin.homeModules.catppuccin
+            ../base.nix
+            ./home.nix
+          ];
+        }
+      );
+    };
   perSystem = {
     pre-commit.settings.excludes = [ "home-manager/asahi/vencord.nix" ];
     treefmt.settings.global.excludes = [ "home-manager/asahi/vencord.nix" ];
diff --git a/home-manager/base.nix b/home-manager/base.nix
index 1991b4c..fe343ed 100644
--- a/home-manager/base.nix
+++ b/home-manager/base.nix
@@ -7,6 +7,7 @@
   inputs,
   lib,
   pkgs,
+  system,
   ...
 }:
 
@@ -128,6 +129,7 @@ in
     };
     helix = {
       enable = true;
+      package = inputs.helix.packages.${system}.helix;
       defaultEditor = true;
       settings = {
         editor.soft-wrap = {
diff --git a/home-manager/raspi/default.nix b/home-manager/raspi/default.nix
index d2de30a..02edd45 100644
--- a/home-manager/raspi/default.nix
+++ b/home-manager/raspi/default.nix
@@ -4,21 +4,25 @@
 
 { inputs, withSystem, ... }:
 {
-  flake.homeConfigurations = {
-    raspi = withSystem "aarch64-linux" (
-      { pkgs, ... }:
-      inputs.home-manager.lib.homeManagerConfiguration {
-        inherit pkgs;
-        extraSpecialArgs = { inherit inputs pkgs; };
-        modules = [
-          inputs.lix-module.nixosModules.default
-          inputs.sops-nix.homeManagerModules.sops
-          inputs.stylix.homeModules.stylix
-          inputs.catppuccin.homeModules.catppuccin
-          ../base.nix
-          ./home.nix
-        ];
-      }
-    );
-  };
+  flake.homeConfigurations =
+    let
+      system = "aarch64-linux";
+    in
+    {
+      raspi = withSystem system (
+        { pkgs, ... }:
+        inputs.home-manager.lib.homeManagerConfiguration {
+          inherit pkgs;
+          extraSpecialArgs = { inherit inputs pkgs system; };
+          modules = [
+            inputs.lix-module.nixosModules.default
+            inputs.sops-nix.homeManagerModules.sops
+            inputs.stylix.homeModules.stylix
+            inputs.catppuccin.homeModules.catppuccin
+            ../base.nix
+            ./home.nix
+          ];
+        }
+      );
+    };
 }