diff --git a/flake.nix b/flake.nix
index ed3c502..88d15c0 100644
--- a/flake.nix
+++ b/flake.nix
@@ -19,21 +19,22 @@
   };
 
   inputs = {
-    fenix = {
-      url                    = "github:nix-community/fenix";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
 
     home-manager = {
       url                    = "github:nix-community/home-manager";
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
+    fenix = {
+      url                    = "github:nix-community/fenix";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
     hyprland.url = "github:hyprwm/Hyprland";
-    nixpkgs.url  = "github:NixOS/nixpkgs/nixos-unstable";
   };
 
-  outputs = { fenix, home-manager, nixpkgs, ... } @ inputs: let
+  outputs = { nixpkgs, home-manager, fenix, ... } @ inputs: let
     machines = [
       ./machines/enka
     ];
@@ -74,7 +75,9 @@
 
     # HOME
     homeConfiguration = userName: attributes: systemConfiguration {
-      home-manager.users.${userName} = attributes;
+      home-manager.users = builtins.foldl' lib.recursiveUpdate {} (builtins.map (userName: {
+        ${userName} = attributes;
+      }) (if builtins.isList userName then userName else [ userName ]));
     };
 
     homePackages = userName: packages: homeConfiguration userName {
diff --git a/machines/enka/bat/default.nix b/machines/enka/bat/default.nix
index 5b344a2..924583a 100644
--- a/machines/enka/bat/default.nix
+++ b/machines/enka/bat/default.nix
@@ -4,7 +4,7 @@
   bat
 ])
 
-(homeConfiguration "nixos" {
+(homeConfiguration [ "nixos" "root" ] {
   programs.nushell.environmentVariables = {
     MANPAGER = ''"bat --plain --language man"'';
     PAGER    = ''"bat --plain"'';
diff --git a/machines/enka/default.nix b/machines/enka/default.nix
index 7d3f24c..eca3324 100644
--- a/machines/enka/default.nix
+++ b/machines/enka/default.nix
@@ -10,7 +10,7 @@
   system.stateVersion = "23.05";
 })
 
-(homeConfiguration "nixos" {
+(homeConfiguration [ "nixos" "root" ] {
   home.stateVersion = "23.05";
 })
 
diff --git a/machines/enka/git/default.nix b/machines/enka/git/default.nix
index 6256f26..eaf990e 100644
--- a/machines/enka/git/default.nix
+++ b/machines/enka/git/default.nix
@@ -1,6 +1,6 @@
 { homeConfiguration, enabled, ... }:
 
-homeConfiguration "nixos" {
+homeConfiguration [ "nixos" "root" ] {
   programs.nushell.shellAliases = {
     g    = "git";
     ga   = "git add";
diff --git a/machines/enka/helix/default.nix b/machines/enka/helix/default.nix
index e6aaf61..5643ed1 100644
--- a/machines/enka/helix/default.nix
+++ b/machines/enka/helix/default.nix
@@ -1,6 +1,6 @@
 { lib, pkgs, homeConfiguration, homePackages, enabled, ... }: lib.recursiveUpdate
 
-(homeConfiguration "nixos" {
+(homeConfiguration [ "nixos" "root" ] {
   programs.nushell.environmentVariables.EDITOR = "hx";
 
   programs.helix = enabled {
@@ -38,7 +38,7 @@
 
     settings.keys = lib.recursiveUpdate
 
-    (builtins.foldl' (x: y: lib.recursiveUpdate x y) {} (builtins.map (mode: { ${mode} = {
+    (builtins.foldl' lib.recursiveUpdate {} (builtins.map (mode: { ${mode} = {
       C-h = "move_prev_word_start";
       C-l = "move_next_word_end";
       C-k = "move_visual_line_up";
@@ -50,7 +50,7 @@
       C-down  = "move_visual_line_down";
     }; }) [ "insert" "normal" "select" ]))
 
-    (builtins.foldl' (x: y: lib.recursiveUpdate x y) {} (builtins.map (mode: {
+    (builtins.foldl' lib.recursiveUpdate {} (builtins.map (mode: {
       ${mode}.D = "extend_to_line_end";
     }) [ "normal" "select" ]));
   };
diff --git a/machines/enka/nushell/default.nix b/machines/enka/nushell/default.nix
index 850c2c7..9c6e7e8 100644
--- a/machines/enka/nushell/default.nix
+++ b/machines/enka/nushell/default.nix
@@ -4,7 +4,7 @@
   users.users.nixos.shell = pkgs.nushell;
 })
 
-(homeConfiguration "nixos" {
+(homeConfiguration [ "nixos" "root" ] {
   programs.starship = enabled {};
 
   programs.nushell = enabled {
diff --git a/machines/enka/python/default.nix b/machines/enka/python/default.nix
index a98122c..29a78cb 100644
--- a/machines/enka/python/default.nix
+++ b/machines/enka/python/default.nix
@@ -9,7 +9,7 @@
   poetry
 ])
 
-(homeConfiguration "nixos" {
+(homeConfiguration [ "nixos" "root" ] {
   programs.nushell.shellAliases = {
     venv = "virtualenv venv";
   };
diff --git a/machines/enka/steck/default.nix b/machines/enka/steck/default.nix
index 68790b6..f2ddaff 100644
--- a/machines/enka/steck/default.nix
+++ b/machines/enka/steck/default.nix
@@ -4,6 +4,6 @@
   steck
 ])
 
-(homeConfiguration "nixos" {
+(homeConfiguration [ "nixos" "root" ] {
   programs.nushell.shellAliases.share = "steck paste";
 })