From 0d56231235a51a7fb0746caa4b471c4335fd7a41 Mon Sep 17 00:00:00 2001
From: Daniel Patterson <me@danielpatterson.dev>
Date: Sat, 23 Apr 2022 17:52:23 +0100
Subject: [PATCH] Use new i3utils package

---
 flake.lock                         | 57 ++++++++++++++++--------------
 flake.nix                          |  9 +++--
 hosts/common/default.nix           |  1 +
 hosts/common/graphical/default.nix |  4 +--
 4 files changed, 37 insertions(+), 34 deletions(-)

diff --git a/flake.lock b/flake.lock
index 1dc3e1d..31149cd 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,5 +1,20 @@
 {
   "nodes": {
+    "flake-utils": {
+      "locked": {
+        "lastModified": 1649676176,
+        "narHash": "sha256-OWKJratjt2RW151VUlJPRALb7OU2S5s+f0vLj4o1bHM=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "a4b154ebbdc88c8498a5c7b01589addc9e9cb678",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
@@ -7,11 +22,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1649984295,
-        "narHash": "sha256-55dgKGs7W8eC3s9GYewll9y4IlP/KAlSinjQwshNpxM=",
+        "lastModified": 1650478719,
+        "narHash": "sha256-308c2cM4hW9AW6dSQ080ycXGyEJGkG/OwOINkYL9Mnw=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "d49d68f4196d32c5039cb9e91d730cee894f6f14",
+        "rev": "93a69d07389311ffd6ce1f4d01836bbc2faec644",
         "type": "github"
       },
       "original": {
@@ -23,14 +38,17 @@
     },
     "i3utils": {
       "inputs": {
-        "nixpkgs": "nixpkgs"
+        "flake-utils": "flake-utils",
+        "nixpkgs": [
+          "nixpkgs"
+        ]
       },
       "locked": {
-        "lastModified": 1636667637,
-        "narHash": "sha256-qgjgowDhUF3Kb4KKzJGd5VtKEHkDqn4unEexPauPvgs=",
+        "lastModified": 1650731779,
+        "narHash": "sha256-VqnznIT19/+W5VaZN3JvQi6ILV9mFgSHccsvUdVz1bs=",
         "ref": "main",
-        "rev": "7c057b93965fb730f73628d46d509797a93e32d9",
-        "revCount": 10,
+        "rev": "595588fb1a6e47e284a41e7190ac171cf0e9b292",
+        "revCount": 11,
         "type": "git",
         "url": "https://git.sr.ht/~dpatterbee/i3utils"
       },
@@ -42,26 +60,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1635992396,
-        "narHash": "sha256-U3EKRCbgPgiNlqxG0wdw3XX5M3dF1nWqK6PPRazLe7s=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "16697754ebd07ed180fed5cd59dbc6e7b62776b8",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1649986882,
-        "narHash": "sha256-cNsInUFq1MbuvaEmv8x6jetWnmAU+osMpnwKumtjksI=",
+        "lastModified": 1650161686,
+        "narHash": "sha256-70ZWAlOQ9nAZ08OU6WY7n4Ij2kOO199dLfNlvO/+pf8=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "5181d5945eda382ff6a9ca3e072ed6ea9b547fee",
+        "rev": "1ffba9f2f683063c2b14c9f4d12c55ad5f4ed887",
         "type": "github"
       },
       "original": {
@@ -74,7 +77,7 @@
       "inputs": {
         "home-manager": "home-manager",
         "i3utils": "i3utils",
-        "nixpkgs": "nixpkgs_2"
+        "nixpkgs": "nixpkgs"
       }
     }
   },
diff --git a/flake.nix b/flake.nix
index c445086..4e5875a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -5,12 +5,13 @@
 		nixpkgs.url = "nixpkgs/nixos-unstable";
 
 		i3utils.url = "git+https://git.sr.ht/~dpatterbee/i3utils?ref=main";
+		i3utils.inputs.nixpkgs.follows = "nixpkgs";
 
 		home-manager.url = "github:nix-community/home-manager/master";
 		home-manager.inputs.nixpkgs.follows = "nixpkgs";
 	};
 
-	outputs = { nixpkgs, home-manager, i3utils, ... }: 
+	outputs = { nixpkgs, home-manager, i3utils, ... }@inputs: 
 	let
 		system = "x86_64-linux";
 
@@ -26,10 +27,6 @@
 			modules = [
 				./hosts/${hostname}/configuration.nix
 
-				({ pkgs, ... }: {
-					nixpkgs.overlays = [ i3utils.overlay ];
-				})
-
 				home-manager.nixosModules.home-manager
 				{
 					home-manager = {
@@ -39,6 +36,8 @@
 					};
 				}
 			];
+
+			specialArgs = {inherit inputs;};
 		};
 
 	in {
diff --git a/hosts/common/default.nix b/hosts/common/default.nix
index b76a852..ee4acda 100644
--- a/hosts/common/default.nix
+++ b/hosts/common/default.nix
@@ -12,6 +12,7 @@
   nix = {
     extraOptions = ''
       experimental-features = nix-command flakes
+      warn-dirty = false
     '';
   };
 
diff --git a/hosts/common/graphical/default.nix b/hosts/common/graphical/default.nix
index a4f4c4a..60f54c8 100644
--- a/hosts/common/graphical/default.nix
+++ b/hosts/common/graphical/default.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, ...}:
+{ config, pkgs, inputs, ...}:
 
 {
   security.pam.services.gdm.enableGnomeKeyring = true;
@@ -40,7 +40,7 @@
         extraPackages = with pkgs; [
           flameshot
           i3lock
-          i3utils
+          inputs.i3utils
         ];
       };
     };