chore: update flake lockfile

2025-07-24 22:59:29 -07:00
parent d2ca9ded39
commit e1da9c2533
4 changed files with 38 additions and 30 deletions
--- a/nix/flake.lock
+++ b/nix/flake.lock
@@ -83,19 +83,11 @@
        ]
      },
      "locked": {
-<<<<<<< Updated upstream
-        "lastModified": 1752780124,
-        "narHash": "sha256-5dn97vIYxn6VozKePOQSDxVCsrl38nDdMJXx86KIJH0=",
+        "lastModified": 1753288231,
+        "narHash": "sha256-WcMW9yUDfER8kz4NdCaaI/ep0Ef91L+Nf7MetNzHZc4=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "c718918222bdb104397762dea67e6b397a7927fe",
-=======
-        "lastModified": 1751990210,
-        "narHash": "sha256-krWErNDl9ggMLSfK00Q2BcoSk3+IRTSON/DiDgUzzMw=",
-        "owner": "nix-community",
-        "repo": "home-manager",
-        "rev": "218da00bfa73f2a61682417efe74549416c16ba6",
->>>>>>> Stashed changes
+        "rev": "7b5a978e00273b8676c530c03d315f5b75fae564",
        "type": "github"
      },
      "original": {
@@ -163,19 +155,11 @@
    },
    "nixpkgs_2": {
      "locked": {
-<<<<<<< Updated upstream
-        "lastModified": 1752620740,
-        "narHash": "sha256-f3pO+9lg66mV7IMmmIqG4PL3223TYMlnlw+pnpelbss=",
+        "lastModified": 1753345091,
+        "narHash": "sha256-CdX2Rtvp5I8HGu9swBmYuq+ILwRxpXdJwlpg8jvN4tU=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "32a4e87942101f1c9f9865e04dc3ddb175f5f32e",
-=======
-        "lastModified": 1751792365,
-        "narHash": "sha256-J1kI6oAj25IG4EdVlg2hQz8NZTBNYvIS0l4wpr9KcUo=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "1fd8bada0b6117e6c7eb54aad5813023eed37ccb",
->>>>>>> Stashed changes
+        "rev": "3ff0e34b1383648053bba8ed03f201d3466f90c9",
        "type": "github"
      },
      "original": {
@@ -245,19 +229,11 @@
        ]
      },
      "locked": {
-<<<<<<< Updated upstream
        "lastModified": 1752544651,
        "narHash": "sha256-GllP7cmQu7zLZTs9z0J2gIL42IZHa9CBEXwBY9szT0U=",
        "owner": "Mic92",
        "repo": "sops-nix",
        "rev": "2c8def626f54708a9c38a5861866660395bb3461",
-=======
-        "lastModified": 1751606940,
-        "narHash": "sha256-KrDPXobG7DFKTOteqdSVeL1bMVitDcy7otpVZWDE6MA=",
-        "owner": "Mic92",
-        "repo": "sops-nix",
-        "rev": "3633fc4acf03f43b260244d94c71e9e14a2f6e0d",
->>>>>>> Stashed changes
        "type": "github"
      },
      "original": {