From bd445b3809e6e78910e1a07109ff8bf333a6efbe Mon Sep 17 00:00:00 2001
From: matt1432 <matt@nelim.org>
Date: Thu, 16 Jan 2025 11:36:11 -0500
Subject: [PATCH] feat(flake): reduce duplicated inputs in flake.lock

---
 flake.lock         | Bin 57618 -> 55607 bytes
 flake.nix          | Bin 12165 -> 12999 bytes
 inputs/default.nix |  18 +++++++++++++++---
 inputs/lib.nix     |   5 ++++-
 4 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/flake.lock b/flake.lock
index 551ce4dca677ed75383c7f82dc5ac7df5e07ac0c..53040a5fcbdf55dde546fefb633dc60ed5a4e41a 100644
GIT binary patch
delta 500
zcmbPqh<W=a<_#&5ldWY{IgE{sjVw$JOeZrc%WC_jIy;ACIJ*WIr#j~t<>+f0nP>a?
zd7B3ol}9-ldU`n*MWhuam6_%jhE5L55}V8_Wv!8xW?`6^Y-whelw_2gm}+KWX=0XQ
znwnyomTY2aX_97XmST{WmYO_yqL(*NgURG`>ME1-mDo1lkqhJ8?4j{kX!AweL(GiP
zlWjC)ColFBoxH$JeDVSnp~-9gxHms>l;@dz)I*&;y(qCDBQtsOLO<!v?{D)nP7dgB
zn>@kOa`Og%S&qp|TLmWX4i^AvpENabvv0(G8B{UN$@MziljFNHH@_<VzyZ`OG;xCY
z=K99@Y?G7YgxQkwa|;qnCI;FAm6?Dn1}e?i%-I>kjUp|!xnYX0FsjhxXUi?2=CPR@
zm>3(FO%9Zn)AH2!FRgGdk0=kyG)>QQ3n;F1E(;6N_DpjtE^*WjjBqXRC^gI|D^7Qr
zTo@)kdBRHL$+11`>Xs&{sb;3;X=Vn-Mk$tt#%ZYrsc9ybi7APR<|f7#1}0|4rbz}#
zlOMYKY@V=ElVx(u6tT&=QaqDym+);qxOM~U<UQfWn+rC7W}NJ$!9RJTqx|N?tsAug
Das{<h

delta 1293
zcma)6-ESL35LX)F*a^_kR7sOGUsePrsqNeQ*u6^>5!WAa;v|mK)NVo`+PmAcFS*#R
zV;kEvDCG%>3N@X=6B6N}5>ge>a!9-(f`n9F5zp`^RPcxp;_@Z6NJw32r5TNWJM)|0
z%zpPx^SvLNAL%_X85s9q1&ch!M1;Mb{?X0qh7rq<Oeng%YLz)9l#S%ke5sshERwRq
zr43T87j+>yhoI^6Zg|==;o}U2mn6m^jTa=OX+%c|YaHP<RX~KulCBGaDhTjLf5HKX
zu;U(q-JuqbUn^`CX?dN8x4uX2XUn+q;$>W)gu~kxr(UoI@0GTp)8j3%YPe9zm%Zad
z5`olEXKR_3RBBmp`{%wKEt&ztqMIyNQ3Fn)K_gf+^LeHRnO?BA%Ox5-4xf?;q5u~_
zK@Q2(aA^Cfsv|#94Z}|*Ci*qQAPmXOPzeog7b+!<1)OYwYy*bfJ~;T+{cLjoe-i&+
z#?u#?TDqR=r{MIH^AJP?#A8`F(se9WvP?D`m$*=+O0#q;TFuPQL~(>qhVs#+N<=Nh
zA}gV2B&bK>@O~F8emo5Ay@NhMHgrLeM9sjG#;`#RLFaT)(sUkklER#8aD-8K{DI{F
zE}e;M|J9rEz%Jhf>4Vqc{ew2!8hLV|wU{%tZAb8q$q{&W+yx8gI^oxu4p8D=*uC0!
zZ2x_oIKY>V?S?ex5)}^f0)##r7^}vE_3bpDT$oN}S5_Cx+HB%IP2QL_tBrcPR;uun
zCTn4yTTPy@Sf3q$8Qk{<))^HHm2wUn!il<$c~Ql>sPY(LhoUNSoS-R?>YalV%tiPu
z<g*d^sTs_Jez=@|b8oHPerICv<@4TLy;#bY=oy#CN~ir~`YR8FA9~^Z&g*-3W!ts%
z`(?-PJh#r@+nKT#3M(GhMxkobJkXJJE3aUMNE{q$1EcBKa;Bs<BGzg>7LThaWF?l&
zNbu&(@a#;<EZ#_%;cKyLvJpzc-e$MEk)s8J<+IRH>4ipp*vCX?=9o%&S;dq}8kIFk
zBS;}4BS=y-UN?{~YsS&~`OeUm`TQmr&JuXHXt`w8{CT>?fNouKUhj3f;0RT_;P8NA
zZ5-C_w8KBeHn2t#_S4$F3*LV4$_YnUl)7PRq8}CtIs22{wf3V>^Sa=*U%hjq({Xy>
z(=QZ9Sl`}V;*w;U$0GdT9UP6VhNj1g(`6wUwNe{wI~>Ze`OOpw2lH1^VL3jxl#(^J
zh>+7RXE1N=kNc=Z6^sO#Fd|VVikilA21h00I9Sk~jZ-8AOZfQ5xwS7G4W+&N<uA=J
WUv=9bK6un(8xQ|%vOhZbdhB0G;jRDx

diff --git a/flake.nix b/flake.nix
index 5ce1be92dfb8f9e5d4659c81c838debb87887f3d..f82fdf477d1bfcb34024fe4eb4fa6ad780c68017 100644
GIT binary patch
delta 504
zcmZpTKc2cFhD|9sKer&UM8Q^}no9u;^2_s5i-3Hk)Rg?3;*z4o$@c8xY!GFe4cV@;
zX%`fw>H_(>nI*az`T5z!dTIGNIr-(qAWdj;ll3?qC)e?dZw}(sW8_FLN-W68OfH`M
zkx!Bf#!<4~T+DZrX<`7cL0)EsZhB@(Mro36Vsc4lejbX^n6i@tWF0oA3N~@*lB!K_
za<zQI=5#3zCO%XPCl_+Z2x8bYxj;&5bH2<}MwPUj#B8wdfq{nXZ)9<xv-BqO3aD=O
zk&9(gLzcm%0~iJi6n3!iqJ-;2J9%QQb5Kc6OwP!xP_l+bVo_>AJ}5eXo`c2_&`+BU
HRYSM{%JZ)*

delta 71
zcmV-N0J#6hWrbg`Tn4ko2C4>==nzb^^9?Qmvsn+g0+K5&vyKvi2$Me`BC~B9W&*Q#
d9+d%;e+fvFYa2ha!yq04vk)V%1hbkbEeh__8S?-D

diff --git a/inputs/default.nix b/inputs/default.nix
index 655e51b3..c4b918e5 100644
--- a/inputs/default.nix
+++ b/inputs/default.nix
@@ -29,7 +29,11 @@ let
       repo = "nurl";
     };
 
-    # These are here to make sure all 'systems' are the same
+    # These are here to make sure all 'systems' and popular inputs are the same
+    flake-compat = mkInput {
+      owner = "edolstra";
+      repo = "flake-compat";
+    };
     flake-utils = mkInput {
       owner = "numtide";
       repo = "flake-utils";
@@ -47,6 +51,15 @@ let
       owner = "nix-community";
       repo = "lib-aggregate";
     };
+    nix-github-actions = mkDep {
+      owner = "nix-community";
+      repo = "nix-github-actions";
+    };
+    pre-commit-hooks = mkDep {
+      owner = "cachix";
+      repo = "git-hooks.nix";
+      inputs.flake-compat.follows = "flake-compat";
+    };
   };
 
   overlays = {
@@ -133,11 +146,10 @@ let
         repo = "hyprpaper";
 
         inputs = {
+          hyprgraphics.follows = "hyprland/hyprgraphics";
           hyprlang.follows = "hyprland/hyprlang";
           hyprutils.follows = "hyprland/hyprutils";
           hyprwayland-scanner.follows = "hyprland/hyprwayland-scanner";
-          nixpkgs.follows = "hyprland/nixpkgs";
-          systems.follows = "hyprland/systems";
         };
       };
 
diff --git a/inputs/lib.nix b/inputs/lib.nix
index 112c802e..adc160b7 100644
--- a/inputs/lib.nix
+++ b/inputs/lib.nix
@@ -34,11 +34,14 @@ in rec {
       info
       {inherit type;}
       (mkOverride "systems")
+      (mkOverride "flake-compat")
       (mkOverride "flake-utils")
       (mkOverride "flake-parts")
-      (mkOverride "treefmt-nix")
       (mkOverride "lib-aggregate")
       (mkOverride "nix-eval-jobs")
+      (mkOverride "nix-github-actions")
+      (mkOverride "pre-commit-hooks")
+      (mkOverride "treefmt-nix")
     ];
 
   mkDep = info: mkInput (recursiveUpdate info {inputs.nixpkgs.follows = "nixpkgs";});