From 9926d0a507ead467443fa0c509027298e0dabcd9 Mon Sep 17 00:00:00 2001
From: Daylin Morgan <me@dayl.in>
Date: Fri, 16 Aug 2024 14:20:54 -0500
Subject: [PATCH] add utils meta package

---
 flake.lock             | 21 +++++++++++++++++++++
 flake.nix              |  8 ++++++--
 hosts/othalan/pkgs.nix | 22 ++++++++++++----------
 3 files changed, 39 insertions(+), 12 deletions(-)

diff --git a/flake.lock b/flake.lock
index 28df348..635459c 100644
--- a/flake.lock
+++ b/flake.lock
@@ -868,6 +868,7 @@
         "roc": "roc",
         "stable": "stable",
         "tsm": "tsm",
+        "utils": "utils",
         "zig-overlay": "zig-overlay",
         "zls": "zls"
       }
@@ -1062,6 +1063,26 @@
         "type": "github"
       }
     },
+    "utils": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1723840834,
+        "narHash": "sha256-GGxqfcJ7utcqaC7dVHQLWLLdZb0yrlGxhpzpZ8hqiWg=",
+        "ref": "refs/heads/main",
+        "rev": "d92e70162fdc052148eae8d07066ba1c33eab6b0",
+        "revCount": 5,
+        "type": "git",
+        "url": "https://git.dayl.in/daylin/utils.git"
+      },
+      "original": {
+        "type": "git",
+        "url": "https://git.dayl.in/daylin/utils.git"
+      }
+    },
     "xdph": {
       "inputs": {
         "hyprland-protocols": "hyprland-protocols",
diff --git a/flake.nix b/flake.nix
index 1da5f9e..df81c58 100644
--- a/flake.nix
+++ b/flake.nix
@@ -10,8 +10,10 @@
     nixos-wsl.url = "github:nix-community/NixOS-WSL";
     nix-index-database.url = "github:nix-community/nix-index-database";
 
-    lix.url = "https://git.lix.systems/lix-project/lix/archive/main.tar.gz";
-    lix.flake = false;
+    lix = {
+      url = "https://git.lix.systems/lix-project/lix/archive/main.tar.gz";
+      flake = false;
+    };
     lix-module = {
       url = "https://git.lix.systems/lix-project/nixos-module/archive/main.tar.gz";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -28,6 +30,7 @@
     f1multiviewer.url = "github:daylinmorgan/f1multiviewer-flake";
     tsm.url = "github:daylinmorgan/tsm?dir=nix";
     hyprman.url = "git+https://git.dayl.in/daylin/hyprman.git";
+    utils.url = "git+https://git.dayl.in/daylin/utils.git";
 
     hyprman.inputs.nixpkgs.follows = "nixpkgs";
     f1multiviewer.inputs.nixpkgs.follows = "nixpkgs";
@@ -35,6 +38,7 @@
     pixi.inputs.nixpkgs.follows = "nixpkgs";
     roc.inputs.nixpkgs.follows = "nixpkgs";
     tsm.inputs.nixpkgs.follows = "nixpkgs";
+    utils.inputs.nixpkgs.follows = "nixpkgs";
     zls.inputs.nixpkgs.follows = "nixpkgs";
     zls.inputs.zig-overlay.follows = "zig-overlay";
     zig-overlay.inputs.nixpkgs.follows = "nixpkgs";
diff --git a/hosts/othalan/pkgs.nix b/hosts/othalan/pkgs.nix
index aac387f..d939d00 100644
--- a/hosts/othalan/pkgs.nix
+++ b/hosts/othalan/pkgs.nix
@@ -1,12 +1,14 @@
-{ pkgs, ... }:
+{ pkgs, flake, ... }:
 {
-  environment.systemPackages = with pkgs; [
-    zk
-    quarto
-    cachix
-    graphviz
-    # nix-du # failing to build suddenly? 
-    # https://github.com/symphorien/nix-du/issues/23
-    # maybe llvm related?
-  ];
+  environment.systemPackages =
+    [ (flake.pkg "utils") ]
+    ++ (with pkgs; [
+      zk
+      quarto
+      cachix
+      graphviz
+      # nix-du # failing to build suddenly? 
+      # https://github.com/symphorien/nix-du/issues/23
+      # maybe llvm related?
+    ]);
 }