Messy

flake.nix

@@ -4,11 +4,13 @@
   inputs = {
     nixpkgs.url = "nixpkgs/nixos-unstable";
 
+    i3utils.url = "git+file:///home/daniel/go/src/i3utils";
+
     home-manager.url = "github:nix-community/home-manager/master";
     home-manager.inputs.nixpkgs.follows = "nixpkgs";
   };
 
-  outputs = { nixpkgs, home-manager, ... }: 
+  outputs = { nixpkgs, home-manager, i3utils, ... }: 
   let
     system = "x86_64-linux";
 
@@ -22,6 +24,17 @@
 
     lib = nixpkgs.lib;
 
+    hostSystem = { hostname }: lib.nixosSystem {
+      inherit system;
+
+      modules = [
+      	./hosts/${hostname}/configuration.nix
+	({ pkgs, ... }: {
+		nixpkgs.overlays = [ i3utils.overlay ];
+	})
+      ];
+    };
+
   in {
     homeConfigurations = {
       daniel = home-manager.lib.homeManagerConfiguration {
@@ -32,6 +45,9 @@
         configuration = {
           imports = [
             ./user/dingbox/home.nix
+            ({ pkgs, ... }: {
+              nixpkgs.overlays = [ i3utils.overlay ];
+            })
           ];
         };
         stateVersion = "21.05";
@@ -39,13 +55,8 @@
     };
 
     nixosConfigurations = {
-      dingbox = lib.nixosSystem {
-        inherit system;
-
-        modules = [
-          ./hosts/dingbox/configuration.nix
-        ];
-      };
+      dingbox = hostSystem { hostname = "dingbox"; };
+      miniding = hostSystem { hostname = "miniding"; };
     };
   };
 }