From 386cf05f4246c4b5f74836dd9f0f657b943979e4 Mon Sep 17 00:00:00 2001
From: cy <cy@cy7.sh>
Date: Thu, 13 Mar 2025 21:09:04 -0400
Subject: [PATCH] overlay garage

---
 flake.lock          | 33 +++++++++++++++++++++++++++++++++
 flake.nix           | 12 ++++++++++++
 overlay/default.nix |  5 ++++-
 3 files changed, 49 insertions(+), 1 deletion(-)

diff --git a/flake.lock b/flake.lock
index e40aeed..bd1a4e5 100644
--- a/flake.lock
+++ b/flake.lock
@@ -342,6 +342,38 @@
         "type": "github"
       }
     },
+    "garage": {
+      "inputs": {
+        "crane": [
+          "crane"
+        ],
+        "flake-compat": [
+          "flake-compat"
+        ],
+        "flake-utils": [
+          "flake-utils"
+        ],
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "rust-overlay": [
+          "rust-overlay"
+        ]
+      },
+      "locked": {
+        "lastModified": 1741360584,
+        "narHash": "sha256-5UkuvKllBRhU943imyc0jHDXQDVhIFx5WWUr3qrLEWQ=",
+        "owner": "deuxfleurs-org",
+        "repo": "garage",
+        "rev": "c96be1a9a8aa3b51075678888b80c2414ead2909",
+        "type": "github"
+      },
+      "original": {
+        "owner": "deuxfleurs-org",
+        "repo": "garage",
+        "type": "github"
+      }
+    },
     "git-hooks": {
       "inputs": {
         "flake-compat": [
@@ -1002,6 +1034,7 @@
         "flake-compat": "flake-compat_2",
         "flake-parts": "flake-parts_2",
         "flake-utils": "flake-utils",
+        "garage": "garage",
         "home-manager": "home-manager",
         "lanzaboote": "lanzaboote",
         "lix": "lix",
diff --git a/flake.nix b/flake.nix
index a07ce00..494ce4f 100644
--- a/flake.nix
+++ b/flake.nix
@@ -88,6 +88,16 @@
         crane.follows = "crane";
       };
     };
+    garage = {
+      url = "github:deuxfleurs-org/garage";
+      inputs = {
+        nixpkgs.follows = "nixpkgs";
+        rust-overlay.follows = "rust-overlay";
+        crane.follows = "crane";
+        flake-compat.follows = "flake-compat";
+        flake-utils.follows = "flake-utils";
+      };
+    };
 
     nvim-github-theme = {
       url = "github:projekt0n/github-nvim-theme";
@@ -105,11 +115,13 @@
       "https://nix-community.cachix.org"
       "https://cache.garnix.io"
       "https://cything.cachix.org"
+      "https://cache.cy7.sh/main"
     ];
     extra-trusted-public-keys = [
       "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
       "cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g="
       "cything.cachix.org-1:xqW1W5NNL+wrM9wfSELb0MLj/harD2ZyB4HbdaMyvPI="
+      "main:Ku31HoEWcBtfggge2VGj+QTkVrQuIwRIMGyfV/5VQP0="
     ];
     builders-use-substitutes = true;
   };
diff --git a/overlay/default.nix b/overlay/default.nix
index b3cdb56..1df98bd 100644
--- a/overlay/default.nix
+++ b/overlay/default.nix
@@ -19,7 +19,10 @@ in
       pixelflasher = nixpkgsFrom inputs.pixelflasher "pixelflasher";
       attic-server = pkgFrom inputs.attic "attic-server";
       attic = pkgFrom inputs.attic "attic";
+      garage = ((pkgFrom inputs.garage "default").overrideAttrs {
+          meta.mainProgram = "garage";
+      });
     }
   )
 ]
-++ importedOverlays
\ No newline at end of file
+++ importedOverlays