From fd5e5e24ae0cac3c16a5d33ea54032fa41240b3d Mon Sep 17 00:00:00 2001
From: Alexander Szczepanski <alexander@szczepan.ski>
Date: Mon, 28 Oct 2024 14:06:27 +0100
Subject: [PATCH] mini-2024-10-28-14-06-27

---
 flake.lock | 36 ++++++++++++++++++++++++++++--------
 1 file changed, 28 insertions(+), 8 deletions(-)

diff --git a/flake.lock b/flake.lock
index 23ed12d..4d673fb 100644
--- a/flake.lock
+++ b/flake.lock
@@ -308,6 +308,7 @@
     "nixos-hardware": {
       "locked": {
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
         "lastModified": 1731797098,
         "narHash": "sha256-UhWmEZhwJZmVZ1jfHZFzCg+ZLO9Tb/v3Y6LC0UNyeTo=",
@@ -336,6 +337,13 @@
         "repo": "nixos-hardware",
         "rev": "22e8de2729f40d29a445c8baeaf22740b8b25daf",
 >>>>>>> c0051c2 (vps-arm-2024-10-23-10-10-15)
+=======
+        "lastModified": 1730068391,
+        "narHash": "sha256-jlAGtfMuI8pUUoUmNkm2P/38pOtHZdcAf3Az8XQLAf4=",
+        "owner": "nixos",
+        "repo": "nixos-hardware",
+        "rev": "6906ac67a1078cf950b8527341e229eeecb5bc30",
+>>>>>>> f36a48a (mini-2024-10-28-14-06-27)
         "type": "github"
       },
       "original": {
@@ -412,11 +420,11 @@
 =======
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1729357638,
-        "narHash": "sha256-66RHecx+zohbZwJVEPF7uuwHeqf8rykZTMCTqIrOew4=",
+        "lastModified": 1729973466,
+        "narHash": "sha256-knnVBGfTCZlQgxY1SgH0vn2OyehH9ykfF8geZgS95bk=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "bb8c2cf7ea0dd2e18a52746b2c3a5b0c73b93c22",
+        "rev": "cd3e8833d70618c4eea8df06f95b364b016d4950",
         "type": "github"
       },
       "original": {
@@ -428,12 +436,16 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1729413321,
-        "narHash": "sha256-I4tuhRpZFa6Fu6dcH9Dlo5LlH17peT79vx1y1SpeKt0=",
+        "lastModified": 1729880355,
+        "narHash": "sha256-RP+OQ6koQQLX5nw0NmcDrzvGL8HDLnyXt/jHhL1jwjM=",
         "owner": "nixos",
         "repo": "nixpkgs",
+<<<<<<< HEAD
         "rev": "1997e4aa514312c1af7e2bda7fad1644e778ff26",
 >>>>>>> c0051c2 (vps-arm-2024-10-23-10-10-15)
+=======
+        "rev": "18536bf04cd71abd345f9579158841376fdd0c5a",
+>>>>>>> f36a48a (mini-2024-10-28-14-06-27)
         "type": "github"
       },
       "original": {
@@ -448,11 +460,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1729449015,
-        "narHash": "sha256-Gf04dXB0n4q0A9G5nTGH3zuMGr6jtJppqdeljxua1fo=",
+        "lastModified": 1729973466,
+        "narHash": "sha256-knnVBGfTCZlQgxY1SgH0vn2OyehH9ykfF8geZgS95bk=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "89172919243df199fe237ba0f776c3e3e3d72367",
+        "rev": "cd3e8833d70618c4eea8df06f95b364b016d4950",
         "type": "github"
       },
       "original": {
@@ -514,6 +526,7 @@
       },
       "locked": {
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
         "lastModified": 1731954233,
         "narHash": "sha256-vvXx1m2Rsw7MkbKJdpcICzz4YPgZPApGKQGhNZfkhOI=",
@@ -542,6 +555,13 @@
         "repo": "sops-nix",
         "rev": "a4c33bfecb93458d90f9eb26f1cf695b47285243",
 >>>>>>> c0051c2 (vps-arm-2024-10-23-10-10-15)
+=======
+        "lastModified": 1729999681,
+        "narHash": "sha256-qm0uCtM9bg97LeJTKQ8dqV/FvqRN+ompyW4GIJruLuw=",
+        "owner": "mic92",
+        "repo": "sops-nix",
+        "rev": "1666d16426abe79af5c47b7c0efa82fd31bf4c56",
+>>>>>>> f36a48a (mini-2024-10-28-14-06-27)
         "type": "github"
       },
       "original": {