From 9b6992a7a607a31be8c9334113c5a289177972a0 Mon Sep 17 00:00:00 2001
From: Skyler Grey <skyler3665@gmail.com>
Date: Fri, 9 Jun 2023 12:46:05 +0200
Subject: [PATCH] Rebase in changes from development branch

---
 flake.lock | 24 ++++++++++++------------
 flake.nix  |  6 +++---
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/flake.lock b/flake.lock
index 1627be6..4435c97 100644
--- a/flake.lock
+++ b/flake.lock
@@ -12,15 +12,15 @@
       "locked": {
         "lastModified": 1686252801,
         "narHash": "sha256-ASguQr5onfE7HzawjAvhck2y7NDZ3bdhqFC8O3/XrXU=",
-        "owner": "clicksminuteper",
-        "repo": "nixfiles",
+        "ref": "refs/heads/production",
         "rev": "7f3559f9a56d28b8f5352040f18305082a6dacc0",
-        "type": "github"
+        "revCount": 53,
+        "type": "git",
+        "url": "ssh://git@github.com/clicksminuteper/nixfiles"
       },
       "original": {
-        "owner": "clicksminuteper",
-        "repo": "nixfiles",
-        "type": "github"
+        "type": "git",
+        "url": "ssh://git@github.com/clicksminuteper/nixfiles"
       }
     },
     "deploy-rs": {
@@ -193,15 +193,15 @@
       "locked": {
         "lastModified": 1686173255,
         "narHash": "sha256-G9HiMDCnK+YeIb+lpLxsRg+/Kk2pz/PSlEtFe8Yi138=",
-        "owner": "clicksminuteper",
-        "repo": "pnpm2nix",
+        "ref": "refs/heads/master",
         "rev": "f91bc86c6d2b1c2c3c4f476835b5ec01b750e898",
-        "type": "github"
+        "revCount": 98,
+        "type": "git",
+        "url": "ssh://git@github.com/clicksminuteper/pnpm2nix"
       },
       "original": {
-        "owner": "clicksminuteper",
-        "repo": "pnpm2nix",
-        "type": "github"
+        "type": "git",
+        "url": "ssh://git@github.com/clicksminuteper/pnpm2nix"
       }
     },
     "root": {
diff --git a/flake.nix b/flake.nix
index 8a6f7d7..8c57619 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,8 +2,8 @@
   description = "A basic flake with a shell";
   inputs.nixpkgs.follows = "clicks-server/nixpkgs";
   inputs.flake-utils.url = "github:numtide/flake-utils";
-  inputs.clicks-server.url = "github:clicksminuteper/nixfiles";
-  inputs.pnpm2nix.url = "github:clicksminuteper/pnpm2nix";
+  inputs.clicks-server.url = "git+ssh://git@github.com/clicksminuteper/nixfiles";
+  inputs.pnpm2nix.url = "git+ssh://git@github.com/clicksminuteper/pnpm2nix";
 
   inputs.pnpm2nix.inputs.nixpkgs.follows = "nixpkgs";
 
@@ -68,4 +68,4 @@
         config.Cmd = [ "${nucleus}/bin/nucleus" ];
       };
     });
-}
\ No newline at end of file
+}