diff --git a/Droidnix/flake.nix b/Droidnix/flake.nix
index f37a3320f..9d5e55ecc 100644
--- a/Droidnix/flake.nix
+++ b/Droidnix/flake.nix
@@ -56,7 +56,10 @@
             {
               home-manager.useGlobalPkgs = true;
               home-manager.useUserPackages = true;
-              home-manager.extraSpecialArgs = { inherit user inputs; flakeRoot = ./.; };
+              home-manager.extraSpecialArgs = {
+                inherit user inputs;
+                flakeRoot = ./.;
+              };
             }
 
             # Catppuccin theme module
@@ -66,18 +69,24 @@
             ./generated/top.nix
 
             # Ensure Home Manager is enabled for the user
-            ({ config, pkgs, ... }: {
-              programs.home-manager.enable = true;
-              systemd.users.services."home-manager-${user.username}" = {
-                description = "Home Manager service for ${user.username}";
-                wantedBy = [ "multi-user.target" ];
-                serviceConfig.Type = "oneshot";
-                serviceConfig.RemainAfterExit = true;
-                serviceConfig.ExecStart = "${pkgs.home-manager}/bin/home-manager switch --flake ${self}#${user.username}@${machine}";
-              };
-            })
+            (
+              { config, pkgs, ... }:
+              {
+                programs.home-manager.enable = true;
+                systemd.users.services."home-manager-${user.username}" = {
+                  description = "Home Manager service for ${user.username}";
+                  wantedBy = [ "multi-user.target" ];
+                  serviceConfig.Type = "oneshot";
+                  serviceConfig.RemainAfterExit = true;
+                  serviceConfig.ExecStart = "${pkgs.home-manager}/bin/home-manager switch --flake ${self}#${user.username}@${machine}";
+                };
+              }
+            )
           ];
-          specialArgs = { inherit user inputs; flakeRoot = ./.; };
+          specialArgs = {
+            inherit user inputs;
+            flakeRoot = ./.;
+          };
         }
       );
 
@@ -85,8 +94,9 @@
       homeConfigurations = lib.genAttrs (map (machine: user.username + "@" + machine) machines) (
         userMachine:
         let
-          username = lib.splitString "@" userMachine !!"";
-          machine = lib.splitString "@" userMachine !!"";
+          parts = lib.splitString "@" userMachine;
+          username = builtins.elemAt parts 0;
+          machine = builtins.elemAt parts 1;
         in
         home-manager.lib.homeManagerConfiguration {
           inherit system;
@@ -94,7 +104,10 @@
             inherit inputs user;
             pkgs = import nixpkgs { inherit system; };
           };
-          extraSpecialArgs = { inherit user inputs; flakeRoot = ./.; };
+          extraSpecialArgs = {
+            inherit user inputs;
+            flakeRoot = ./.;
+          };
         }
       );