diff --git a/ReadMe.md b/ReadMe.md
index 7b67206..66e3c9d 100644
--- a/ReadMe.md
+++ b/ReadMe.md
@@ -75,3 +75,4 @@ sops updatekeys secrets/default.yaml
 - <https://github.com/Xe/nixos-configs>
 - <https://github.com/jakehamilton/config>
 - <https://github.com/drupol/nixos-x260>
+- <https://github.com/gvolpe/nix-config>
diff --git a/flake.nix b/flake.nix
index 79246a0..7d33d8d 100644
--- a/flake.nix
+++ b/flake.nix
@@ -69,6 +69,34 @@
               };
             }
           );
+      inventory = [
+        {
+          system = "aarch64-linux";
+          host = "pi0";
+          user = "lab";
+        }
+        {
+          system = "x86_64-linux";
+          host = "apu";
+          user = "router";
+        }
+        {
+          system = "x86_64-linux";
+          host = "tower";
+          user = "gael";
+        }
+        {
+          system = "x86_64-linux";
+          host = "thinkpad";
+          user = "gael";
+        }
+        {
+          system = "x86_64-linux";
+          host = "iso";
+          user = "nixos";
+          iso = true;
+        }
+      ];
 
     in
     {
@@ -106,34 +134,8 @@
         };
       });
 
-      nixosConfigurations = myLib.os.mkNixosSystems [
-        {
-          system = "aarch64-linux";
-          host = "pi0";
-          user = "lab";
-        }
-        {
-          system = "x86_64-linux";
-          host = "apu";
-          user = "router";
-        }
-        {
-          system = "x86_64-linux";
-          host = "tower";
-          user = "gael";
-        }
-        {
-          system = "x86_64-linux";
-          host = "thinkpad";
-          user = "gael";
-        }
-        {
-          system = "x86_64-linux";
-          host = "iso";
-          user = "nixos";
-          iso = true;
-        }
-      ];
+      nixosConfigurations = myLib.os.mkNixosSystems inventory;
+      homeConfigurations = myLib.user.mkHomeManagerEnvironements inventory;
 
       packages = forSystems ({ pkgs, system }: pkgs.myPkgs);
 
diff --git a/lib/default.nix b/lib/default.nix
index 33414f0..cc3ca70 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -2,4 +2,5 @@
 
 {
   os = import ./os { inherit inputs; };
+  user = import ./user { inherit inputs; };
 }
diff --git a/lib/user/default.nix b/lib/user/default.nix
new file mode 100644
index 0000000..23f601d
--- /dev/null
+++ b/lib/user/default.nix
@@ -0,0 +1,19 @@
+{ inputs, ... }:
+
+let
+  inherit (inputs) self nixpkgs sops-nix nur home-manager udev-nix _1password-shell-plugins;
+in
+rec {
+  mkHomeManagerEnvironement = { system, host, user, iso ? false, ... }: home-manager.lib.homeManagerConfiguration {
+    modules = [ ];
+    pkgs = import nixpkgs { inherit system; };
+  };
+  mkHomeManagerEnvironements = environments: builtins.listToAttrs (
+    builtins.map
+      (environment: {
+        name = environment.user;
+        value = mkHomeManagerEnvironement environment;
+      })
+      environments
+  );
+}
diff --git a/users/gael/home.nix b/users/gael/home.nix
index fef4ae1..edf26f6 100644
--- a/users/gael/home.nix
+++ b/users/gael/home.nix
@@ -406,6 +406,8 @@
         };
         theme = {
           mode = "system";
+          dark = "Solarized Dark";
+          ligh = "Solarized Light";
         };
         load_direnv = "direct";
         ui_font_family = "JetBrains Mono";