diff --git a/flake.nix b/flake.nix
index 390770a..ae7a38a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -19,7 +19,7 @@
   outputs = { self, home-manager, nixpkgs, neovim-nightly-overlay, nur, ... }@inputs:
     let
       utils = import ./utils.nix { inherit nixpkgs home-manager inputs; };
-      pkgs = import nixpkgs {};
+      pkgs = import nixpkgs { };
     in
     with utils;
     {
@@ -31,12 +31,6 @@
         (builtins.attrNames (builtins.readDir ./modules)));
 
       nixosConfigurations = builtins.mapAttrs (name: value: (mkMachine name value self.nixosModules)) (importConfig ./machines);
-      
-      #legacyPackages."x86_64-linux"."mosh" = import ./packages/mosh/default.nix;
-
 
     };
-
-
-
 }
diff --git a/machines/lisa.nix b/machines/lisa.nix
index b8fcd3d..91d487d 100644
--- a/machines/lisa.nix
+++ b/machines/lisa.nix
@@ -13,15 +13,22 @@
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ ];
   boot.extraModulePackages = [ ];
-  home-manager.users.julien = {
-    home.username = "julien";
-    home.homeDirectory = "/home/julien";
-    home.stateVersion = "21.11";
-    imports = [ ../home-manager-modules/mails/default.nix ../home-manager-modules/neovim/default.nix  ../home-manager-modules/git/default.nix ];
+#  home-manager.users.julien = {
+ #   home.username = "julien";
+  #  home.homeDirectory = "/home/julien";
+   # home.stateVersion = "21.11";
+    #imports = [ ../home-manager-modules/mails/default.nix ../home-manager-modules/neovim/default.nix  ../home-manager-modules/git/default.nix ];
+    #luj.programs.neovim.enable = true;
+   # luj.programs.git.enable = true;
+
+ # };
+ luj.hmgr.julien = {
     luj.programs.neovim.enable = true;
     luj.programs.git.enable = true;
 
-  };
+ };
+
+
 
   fileSystems."/" =
     {
diff --git a/machines/newton.nix b/machines/newton.nix
index 2441449..7eba21d 100644
--- a/machines/newton.nix
+++ b/machines/newton.nix
@@ -4,20 +4,17 @@ let
 in
 {
 
-  home-manager.users.julien = {
-    home.username = "julien";
-    home.homeDirectory = "/home/julien";
-    home.stateVersion = "21.11";
-    imports = [ ../home-manager-modules/mails/default.nix ../home-manager-modules/neovim/default.nix ../home-manager-modules/git/default.nix ];
+
+  luj.hmgr.julien = {
+    luj.programs.neovim.enable = true;
+    luj.programs.git.enable = true;
     luj.emails = {
       enable = true;
       backend.enable = true;
     };
-
-    luj.programs.neovim.enable = true;
-    luj.programs.git.enable = true;
-
   };
+
+
   boot.loader.grub.enable = true;
   boot.loader.grub.version = 2;
   boot.supportedFilesystems = [ "zfs" ];
@@ -75,7 +72,6 @@ in
 
 
 
-  # Define a user account. Don't forget to set a password with ‘passwd’.
 
  
   # Open ports in the firewall.
diff --git a/modules/hmgr/default.nix b/modules/hmgr/default.nix
new file mode 100644
index 0000000..220ec6b
--- /dev/null
+++ b/modules/hmgr/default.nix
@@ -0,0 +1,24 @@
+{ config, pkgs, lib, ... }:
+let
+  cfg = config.luj.hmgr;
+in
+with lib;
+{
+  options.luj.hmgr = mkOption {
+    type = with types; attrsOf anything;
+  };
+
+  config = {
+    home-manager.users =
+      lib.mapAttrs
+        (name: value:
+          {
+            imports = with builtins; map (x: ../../home-manager-modules + "/${x}/default.nix") (attrNames (readDir ../../home-manager-modules)); 
+            home.username = "${name}";
+            home.homeDirectory = "/home/${name}";
+            home.stateVersion = "21.11";
+          } // value)
+        cfg;
+  };
+}  
+