diff --git a/flake.lock b/flake.lock
index a59cba4..7b1356b 100644
--- a/flake.lock
+++ b/flake.lock
@@ -22,11 +22,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1636274622,
-        "narHash": "sha256-tZYuGhqcfH7piCsrUrIYM0P3oPJcoBxGkuxeFNVxkCc=",
+        "lastModified": 1636520380,
+        "narHash": "sha256-gBiQ8+AQG6Dia34rqJDuqs6VFe/J1SjIhOZBeTXCKQI=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "2917ef23b398a22ee33fb34b5766b28728228ab1",
+        "rev": "1e5c8e9bff00d0844bc3d25d1a98eab5633e600b",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 2508c4d..4061bb4 100644
--- a/flake.nix
+++ b/flake.nix
@@ -35,10 +35,8 @@
       ];
     };
 
-  in {
-    homeConfigurations = {
-      daniel = home-manager.lib.homeManagerConfiguration {
-        inherit system pkgs;
+    daniel = home-manager.lib.homeManagerConfiguration {
+      inherit system pkgs;
 
         username = "daniel";
         homeDirectory = "/home/daniel";
@@ -52,6 +50,32 @@
         };
         stateVersion = "21.05";
       };
+
+      mkUserConf = { hostname, extraPackages ? [] }:
+      home-manager.lib.homeManagerConfiguration {
+          inherit system pkgs;
+
+          username = "daniel";
+          homeDirectory = "/home/daniel";
+          configuration = {
+            imports = [
+              ./user/daniel/home.nix
+              ({ pkgs, ... }: {
+                nixpkgs.overlays = [ i3utils.overlay ];
+              })
+            ] ++ extraPackages;
+          };
+          stateVersion = "21.05";
+        };
+
+
+  in {
+    homeConfigurations = {
+      daniel-dingbox = mkUserConf { hostname = "dingbox"; };
+      daniel-miniding = mkUserConf {
+        hostname = "miniding";
+	extraSauce = [ ./user/host-specific/miniding ];
+      };
     };
 
     nixosConfigurations = {
diff --git a/user/host-specific/miniding/default.nix b/user/host-specific/miniding/default.nix
new file mode 100644
index 0000000..c8d2b44
--- /dev/null
+++ b/user/host-specific/miniding/default.nix
@@ -0,0 +1,10 @@
+{ config, lib, pkgs, ...}:
+
+let
+	mod = "Mod4";
+in {
+	services.picom = {
+		enable = true;
+		vSync = true;
+	};
+}
diff --git a/user/progs/i3/default.nix b/user/progs/i3/default.nix
index 7df8119..7484da4 100644
--- a/user/progs/i3/default.nix
+++ b/user/progs/i3/default.nix
@@ -3,11 +3,6 @@
 let
 	mod = "Mod4";
 in {
-	services.picom = {
-		enable = true;
-		vSync = true;
-	};
-
 	xsession.windowManager.i3 = {
 		enable = true;
 		config = {