merge with the laptop

1 files changed, 6 insertions, 30 deletions

diff --git a/flake.lock b/flake.lock
index 91c2be7..2614606 100644
--- a/flake.lock
+++ b/flake.lock
@@ -157,35 +157,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1769289524,
-        "narHash": "sha256-6Cwtvzrw79cOk1lCzN2aKSVrpgSOSQoYhyMmhXXZjTA=",
+        "lastModified": 1769381762,
+        "narHash": "sha256-Mf/8jPJvFXIL8s/gtSrU8PgXJy5Vz7seIU4D7WJmG0M=",
         "owner": "nix-community",
         "repo": "home-manager",
-<<<<<<< Updated upstream
-        "rev": "2539eba97a6df237d75617c25cd2dbef92df3d5b",
-=======
-        "rev": "27a6182347ccae90a88231ae0dc5dfa7d15815bb",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "home-manager",
-        "type": "github"
-      }
-    },
-    "home-manager_2": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1767901774,
-        "narHash": "sha256-Zf21x7yWdFI2lwNRcO76FjoKlB2sRCxNTW97ekeftvo=",
-        "owner": "nix-community",
-        "repo": "home-manager",
-        "rev": "37158e52675b77da7d2eab3579011659eaedde1d",
->>>>>>> Stashed changes
+        "rev": "2590268ca7627a3ec1a9c9422983495cea51e2e1",
         "type": "github"
       },
       "original": {
@@ -422,11 +398,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1769374365,
-        "narHash": "sha256-H0dhx+rq1FT4tJcOXWLebdkuabTaWli8fXS1FarpDjc=",
+        "lastModified": 1769379906,
+        "narHash": "sha256-btQxa6MLgJcAlwivGK++cGzrvlyIXFRc3++qR5EuZ3Y=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "3cbc1fcdea9eac0fdf862b853c77c3ea175e5e59",
+        "rev": "3f0038c142806f43915c5d7c5dcd94782896705a",
         "type": "github"
       },
       "original": {