From fc1934791b5b7aa81f13cbf533d897dc7558837d Mon Sep 17 00:00:00 2001
From: Nickiel12 <nickiel@nickiel.net>
Date: Thu, 22 Aug 2024 19:20:04 -0700
Subject: [PATCH] merged flake.lock changes

---
 flake.lock | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/flake.lock b/flake.lock
index 0a23845..c97e806 100644
--- a/flake.lock
+++ b/flake.lock
@@ -246,6 +246,7 @@
         "owner": "cachix",
         "repo": "git-hooks.nix",
         "rev": "f451c19376071a90d8c58ab1a953c6e9840527fd",
+>>>>>>> ed56ac1 (flake update)
         "type": "github"
       },
       "original": {
@@ -352,6 +353,7 @@
         "owner": "kmonad",
         "repo": "kmonad",
         "rev": "840af41fab33829ed03ba932aa017f8912e6fb75",
+>>>>>> ed56ac1 (flake update)
         "type": "github"
       },
       "original": {
@@ -520,11 +522,11 @@
     },
     "nixpkgs_6": {
       "locked": {
-        "lastModified": 1722087241,
-        "narHash": "sha256-2ShmEaFi0kJVOEEu5gmlykN5dwjWYWYUJmlRTvZQRpU=",
+        "lastModified": 1723688146,
+        "narHash": "sha256-sqLwJcHYeWLOeP/XoLwAtYjr01TISlkOfz+NG82pbdg=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "8c50662509100d53229d4be607f1a3a31157fa12",
+        "rev": "c3d4ac725177c030b1e289015989da2ad9d56af0",
         "type": "github"
       },
       "original": {