From db7c6cc7aad2de4f32e135f9e8521691441e3c48 Mon Sep 17 00:00:00 2001
From: chn <chn@chn.moe>
Date: Wed, 21 Jun 2023 21:18:25 +0800
Subject: [PATCH] update world

---
 flake.lock | 44 ++++++--------------------------------------
 1 file changed, 6 insertions(+), 38 deletions(-)

diff --git a/flake.lock b/flake.lock
index 2af32470..ee7f2a44 100644
--- a/flake.lock
+++ b/flake.lock
@@ -10,19 +10,11 @@
         ]
       },
       "locked": {
-<<<<<<< HEAD
-        "lastModified": 1686500461,
-        "narHash": "sha256-r06ks/3dmCCOyBTqedp5LOgsFsqTmpNMyhWxH0tUKoM=",
-        "owner": "ezKEa",
-        "repo": "aagl-gtk-on-nix",
-        "rev": "18145e8cd922ea0816c8a7abe492cfb70dda5828",
-=======
         "lastModified": 1687187485,
         "narHash": "sha256-nZiRloVB7URumUwRAdCJA+CetNYd1/OraliqZwjdu7c=",
         "owner": "ezKEa",
         "repo": "aagl-gtk-on-nix",
         "rev": "0ebaea25dd776d479a99e7f786ed2052410072b4",
->>>>>>> main
         "type": "github"
       },
       "original": {
@@ -93,19 +85,11 @@
         ]
       },
       "locked": {
-<<<<<<< HEAD
-        "lastModified": 1686778999,
-        "narHash": "sha256-3qBtOJdznerw33LgwJTSUL6u8/j1Ot83fcc0f6oHKmk=",
-        "owner": "nix-community",
-        "repo": "home-manager",
-        "rev": "e0034971f9def16bbc32124147787bc0f09f0e59",
-=======
         "lastModified": 1687337969,
         "narHash": "sha256-5b58eo7Eku2ae+62HHHTbHtwe4jlS44JfYCDulGdopg=",
         "owner": "nix-community",
         "repo": "home-manager",
         "rev": "9ce6977fe76fb408042a432e314764f8d1d86263",
->>>>>>> main
         "type": "github"
       },
       "original": {
@@ -164,19 +148,11 @@
         ]
       },
       "locked": {
-<<<<<<< HEAD
-        "lastModified": 1686740472,
-        "narHash": "sha256-b668DY2qGdBCUwIkk6Z32bcpCsUISQJrEEvhtn1gGgY=",
-        "owner": "Mic92",
-        "repo": "nix-index-database",
-        "rev": "e11c61073b777e025993c5ef63ddbf776a9cca15",
-=======
         "lastModified": 1687097842,
         "narHash": "sha256-NPAaRZx5foWLgIPfEaiEZMr9JIlEQhLEVEXpx09341Q=",
         "owner": "Mic92",
         "repo": "nix-index-database",
         "rev": "c8210cb3fcde6860255b54ddba74dc177e6232cd",
->>>>>>> main
         "type": "github"
       },
       "original": {
@@ -198,19 +174,11 @@
         ]
       },
       "locked": {
-<<<<<<< HEAD
-        "lastModified": 1686792204,
-        "narHash": "sha256-nuNalSaeb77kb1M1p9UnWE2/ckE6z25zLyKBb62Ykhs=",
-        "owner": "nix-community",
-        "repo": "nix-vscode-extensions",
-        "rev": "b03bae8a54cd3a92d1458bd3a34132582539cd05",
-=======
         "lastModified": 1687310615,
         "narHash": "sha256-5+WVkoqF+wuhoZ4O+lU7e4/+0JxELJby4043MWiiyTc=",
         "owner": "nix-community",
         "repo": "nix-vscode-extensions",
         "rev": "5603dd6e616e380b954ffe25e1d90569d3521e7c",
->>>>>>> main
         "type": "github"
       },
       "original": {
@@ -276,11 +244,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1687352118,
-        "narHash": "sha256-DL/LPfooL7JiskjcdW0beVwBgAa3O94xU3TTP668frg=",
+        "lastModified": 1687353209,
+        "narHash": "sha256-TOkS3rXo02Q2Ee34n/yUG1DufYyvk+n62h+roCeA7DQ=",
         "owner": "CHN-beta",
         "repo": "nixpkgs",
-        "rev": "5305c1a02681a385637d760d95ffe35fefa0f23b",
+        "rev": "1394c0cb5b58c1c6043c09daf1bd1b6ecd0c4bcd",
         "type": "github"
       },
       "original": {
@@ -292,11 +260,11 @@
     },
     "nur": {
       "locked": {
-        "lastModified": 1687351640,
-        "narHash": "sha256-uur6Euh2d5XO9Ai3uLF4QeMChm3NSnfczuiw2Moekdo=",
+        "lastModified": 1687352478,
+        "narHash": "sha256-vMXSNPRlBoZfvBM5AsJWl4kOqdMeArw4Jf8L1L3FWsI=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "4d286be612dab4e7b61ac4c84ee3d544b6d8520a",
+        "rev": "df4604971171682d14dc49e71106f9e2ba1f3512",
         "type": "github"
       },
       "original": {