diff --git a/flake.lock b/flake.lock
index 73850c29..e9230861 100644
--- a/flake.lock
+++ b/flake.lock
@@ -179,19 +179,11 @@
         ]
       },
       "locked": {
-<<<<<<< Updated upstream
-        "lastModified": 1728763831,
-        "narHash": "sha256-KOp33tls7jRAhcmu77aVxKpSMou8QgK0BC+Y3sYLuGo=",
-        "owner": "nix-community",
-        "repo": "disko",
-        "rev": "b6215392ec3bd05e9ebfbb2f7945c414096fce8f",
-=======
         "lastModified": 1729010169,
         "narHash": "sha256-AjgIlXcreagCs6ltT8mzI1UYEiYgfhlwe4Tl3taxQSU=",
         "owner": "nix-community",
         "repo": "disko",
         "rev": "9ab6ae4e632016caac1c7e82e15b12b8c672ed76",
->>>>>>> Stashed changes
         "type": "github"
       },
       "original": {
@@ -570,19 +562,11 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-<<<<<<< Updated upstream
-        "lastModified": 1728679815,
-        "narHash": "sha256-3IXvY30zzFq7lHFujMupPz3TiPXo8o8qiIjkXUvznCI=",
-        "owner": "Jovian-Experiments",
-        "repo": "Jovian-NixOS",
-        "rev": "e4f4d7832cc559389b93798c1f0d615e3816f4ef",
-=======
         "lastModified": 1728974938,
         "narHash": "sha256-pTPEx6WlM+nJVGrRUGx7Di4ljZMwE9HfvlZ6f3NzNfo=",
         "owner": "Jovian-Experiments",
         "repo": "Jovian-NixOS",
         "rev": "23170582b0658e6afd913149a58863af3a57b376",
->>>>>>> Stashed changes
         "type": "github"
       },
       "original": {
@@ -603,19 +587,11 @@
         "rust-overlay": "rust-overlay"
       },
       "locked": {
-<<<<<<< Updated upstream
-        "lastModified": 1728632221,
-        "narHash": "sha256-LnBVdKPsreziZkYbeFqiSYP7tPFlprt9ej2QGd2aNlw=",
-        "owner": "nix-community",
-        "repo": "lanzaboote",
-        "rev": "3326a0b3974fc04d991990f6497fe1a7d9892439",
-=======
         "lastModified": 1729028850,
         "narHash": "sha256-eOhjiU+3TCaSYZESYhU2ZTUQKrBcer9cQ/XpVkergAg=",
         "owner": "nix-community",
         "repo": "lanzaboote",
         "rev": "bd01eac8c7cfa9b7e25304f0e7f0fed80de63f9d",
->>>>>>> Stashed changes
         "type": "github"
       },
       "original": {
@@ -630,19 +606,11 @@
         "nixpkgs-lib": "nixpkgs-lib"
       },
       "locked": {
-<<<<<<< Updated upstream
-        "lastModified": 1728216729,
-        "narHash": "sha256-HsisE2yMld0LckvQ3v/00bXFg11E5Q2XI8taPUewDPA=",
-        "owner": "nix-community",
-        "repo": "lib-aggregate",
-        "rev": "6c4cf448d33ce86bcc06c6d50bcecc33666105ee",
-=======
         "lastModified": 1728821524,
         "narHash": "sha256-Tc4g0n0WxGLLUJYJwrhSE3/l05xUcREEx9y+R4Gi4RA=",
         "owner": "nix-community",
         "repo": "lib-aggregate",
         "rev": "8921856c37862428741a29cfd4c98c4893ca407d",
->>>>>>> Stashed changes
         "type": "github"
       },
       "original": {
@@ -739,19 +707,11 @@
     },
     "nixlib": {
       "locked": {
-<<<<<<< Updated upstream
-        "lastModified": 1728176478,
-        "narHash": "sha256-px3Q0W//c+mZ4kPMXq4poztsjtXM1Ja1rN+825YMDUQ=",
-        "owner": "nix-community",
-        "repo": "nixpkgs.lib",
-        "rev": "b61309c3c1b6013d36299bc8285612865b3b9e4c",
-=======
         "lastModified": 1728781282,
         "narHash": "sha256-hUP9oxmnOmNnKcDOf5Y55HQ+NnoT0+bLWHLQWLLw9Ks=",
         "owner": "nix-community",
         "repo": "nixpkgs.lib",
         "rev": "16340f605f4e8e5cf07fd74dcbe692eee2d4f51b",
->>>>>>> Stashed changes
         "type": "github"
       },
       "original": {
@@ -768,19 +728,11 @@
         ]
       },
       "locked": {
-<<<<<<< Updated upstream
-        "lastModified": 1728522165,
-        "narHash": "sha256-UQpsJ0Ev6JBGsCYRlS2oOVvb+eWcDD0xTV3RVlqbeVU=",
-        "owner": "nix-community",
-        "repo": "nixos-generators",
-        "rev": "40c8d30c490414910fc63626ad1b67af7db40cd3",
-=======
         "lastModified": 1728867876,
         "narHash": "sha256-NCyOA8WZNoojmXH+kBDrQj3LwvakYNzSc0h+LTXkmPE=",
         "owner": "nix-community",
         "repo": "nixos-generators",
         "rev": "fdf142111597f6c6283cf5ffe092b6293a3911d0",
->>>>>>> Stashed changes
         "type": "github"
       },
       "original": {
@@ -823,19 +775,11 @@
     },
     "nixpkgs-lib": {
       "locked": {
-<<<<<<< Updated upstream
-        "lastModified": 1728176478,
-        "narHash": "sha256-px3Q0W//c+mZ4kPMXq4poztsjtXM1Ja1rN+825YMDUQ=",
-        "owner": "nix-community",
-        "repo": "nixpkgs.lib",
-        "rev": "b61309c3c1b6013d36299bc8285612865b3b9e4c",
-=======
         "lastModified": 1728781282,
         "narHash": "sha256-hUP9oxmnOmNnKcDOf5Y55HQ+NnoT0+bLWHLQWLLw9Ks=",
         "owner": "nix-community",
         "repo": "nixpkgs.lib",
         "rev": "16340f605f4e8e5cf07fd74dcbe692eee2d4f51b",
->>>>>>> Stashed changes
         "type": "github"
       },
       "original": {
@@ -878,19 +822,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-<<<<<<< Updated upstream
-        "lastModified": 1728492678,
-        "narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "5633bcff0c6162b9e4b5f1264264611e950c8ec7",
-=======
         "lastModified": 1728888510,
         "narHash": "sha256-nsNdSldaAyu6PE3YUA+YQLqUDJh+gRbBooMMekZJwvI=",
         "owner": "NixOS",
         "repo": "nixpkgs",
         "rev": "a3c0b3b21515f74fd2665903d4ce6bc4dc81c77c",
->>>>>>> Stashed changes
         "type": "github"
       },
       "original": {
@@ -907,19 +843,11 @@
         "nixpkgs": "nixpkgs_4"
       },
       "locked": {
-<<<<<<< Updated upstream
-        "lastModified": 1728757472,
-        "narHash": "sha256-AM37viNRyjiPo8l+MgjtuBbLQbZ14UdqUsQZQYC7v8Q=",
-        "owner": "nix-community",
-        "repo": "nixpkgs-wayland",
-        "rev": "f31d5880ded44894e6c14e04d3a2dc624c542756",
-=======
         "lastModified": 1729027943,
         "narHash": "sha256-o3+ewMrevE4J2YJg8QAbqTS7HVrzQqhaV3WFCHTbwZ4=",
         "owner": "nix-community",
         "repo": "nixpkgs-wayland",
         "rev": "9b5a5691436324f6b4eed2211af688551a6071e9",
->>>>>>> Stashed changes
         "type": "github"
       },
       "original": {
@@ -930,19 +858,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-<<<<<<< Updated upstream
-        "lastModified": 1728627514,
-        "narHash": "sha256-r+SF9AnHrTg+bk6YszoKfV9lgyw+yaFUQe0dOjI0Z2o=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "c505ebf777526041d792a49d5f6dd4095ea391a7",
-=======
         "lastModified": 1728909085,
         "narHash": "sha256-WLxED18lodtQiayIPDE5zwAfkPJSjHJ35UhZ8h3cJUg=",
         "owner": "NixOS",
         "repo": "nixpkgs",
         "rev": "c0b1da36f7c34a7146501f684e9ebdf15d2bebf8",
->>>>>>> Stashed changes
         "type": "github"
       },
       "original": {
@@ -969,19 +889,11 @@
     },
     "nixpkgs_4": {
       "locked": {
-<<<<<<< Updated upstream
-        "lastModified": 1728492678,
-        "narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "5633bcff0c6162b9e4b5f1264264611e950c8ec7",
-=======
         "lastModified": 1728888510,
         "narHash": "sha256-nsNdSldaAyu6PE3YUA+YQLqUDJh+gRbBooMMekZJwvI=",
         "owner": "nixos",
         "repo": "nixpkgs",
         "rev": "a3c0b3b21515f74fd2665903d4ce6bc4dc81c77c",
->>>>>>> Stashed changes
         "type": "github"
       },
       "original": {
@@ -1067,19 +979,11 @@
     },
     "nur": {
       "locked": {
-<<<<<<< Updated upstream
-        "lastModified": 1728778053,
-        "narHash": "sha256-cMrvP6KtU70EZXJaG60ASzjia1CoEKN1UuX5BpS93Uw=",
+        "lastModified": 1729051801,
+        "narHash": "sha256-zh6TN4svngtanJVz2Gsf/ReDNMgOqdDKBOQCcEvvRaw=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "c6b7ef33feea3c22ef420ebdf97f547a34d16adf",
-=======
-        "lastModified": 1729035911,
-        "narHash": "sha256-MD81qtqfNYzbKssBk6hmozn3sB/qR+LL1Tx8qQE6+9U=",
-        "owner": "nix-community",
-        "repo": "NUR",
-        "rev": "64079c912fb1734bf1f06ba4754ae8a1b6fa6e25",
->>>>>>> Stashed changes
+        "rev": "b578d2f4c64c59936403472f503d594a31a91163",
         "type": "github"
       },
       "original": {
@@ -1096,19 +1000,11 @@
         ]
       },
       "locked": {
-<<<<<<< Updated upstream
-        "lastModified": 1728750492,
-        "narHash": "sha256-9IHlIsH4gLqQjS2lFbEnsl/ItdqzBBLWLsyXS0k0jf8=",
-        "owner": "pjones",
-        "repo": "plasma-manager",
-        "rev": "c6d4b6f3e0138c08f37d66fcfbcbe37dab08f108",
-=======
         "lastModified": 1729011811,
         "narHash": "sha256-lNzTx9nUEaezJJ77Zm1IkOzTdak9i1n+EP08Z4Ef7xY=",
         "owner": "pjones",
         "repo": "plasma-manager",
         "rev": "a9960fef15f27eb24ab172290c3febc2f1e66fd9",
->>>>>>> Stashed changes
         "type": "github"
       },
       "original": {