diff --git a/flake.lock b/flake.lock
index d40fad9..6ee46a8 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2,31 +2,16 @@
   "nodes": {
     "affinity-nix": {
       "inputs": {
-<<<<<<< HEAD
-        "elemental-wine-source": "elemental-wine-source",
-=======
         "corefonts": "corefonts",
         "crane": "crane",
         "elemental-wine-source": "elemental-wine-source",
         "fenix": "fenix",
->>>>>>> 4827e2d (updates?)
         "flake-compat": "flake-compat",
         "flake-parts": "flake-parts",
         "git-hooks": "git-hooks",
         "nixpkgs": "nixpkgs_2",
         "nixpkgs-wine": "nixpkgs-wine",
         "on-linux": "on-linux",
-<<<<<<< HEAD
-        "plugin-loader": "plugin-loader",
-        "treefmt-nix": "treefmt-nix"
-      },
-      "locked": {
-        "lastModified": 1773962509,
-        "narHash": "sha256-DAHcc8ghdDEX+xHPjuKf7qXSL/5G9NqP3mrq5jAKFi0=",
-        "owner": "mrshmllow",
-        "repo": "affinity-nix",
-        "rev": "494090443b8086f14ce851ecba8463800176c1c1",
-=======
         "plugin-loader-src": "plugin-loader-src",
         "treefmt-nix": "treefmt-nix"
       },
@@ -36,7 +21,6 @@
         "owner": "mrshmllow",
         "repo": "affinity-nix",
         "rev": "f76f97513153a753718aa1423e84b4cb8ea4c185",
->>>>>>> 4827e2d (updates?)
         "type": "github"
       },
       "original": {
@@ -51,19 +35,11 @@
         "poetry2nix": "poetry2nix"
       },
       "locked": {
-<<<<<<< HEAD
-        "lastModified": 1775413891,
-        "narHash": "sha256-U8CWiakalkP9ftAAaHZmgFtTiNieVHFCpFs9NYNw7hQ=",
-        "owner": "sdaqo",
-        "repo": "anipy-cli",
-        "rev": "f9e936584101a265c19939e8c4a185eb35171719",
-=======
         "lastModified": 1777813213,
         "narHash": "sha256-6fTRVdrMoD90E2mlENev8D8GRNXBLEjIZaE3sRKRLf8=",
         "owner": "sdaqo",
         "repo": "anipy-cli",
         "rev": "2db2fe0cfc943dc46cb335cc86782fb9a397cb7a",
->>>>>>> 4827e2d (updates?)
         "type": "github"
       },
       "original": {
@@ -110,19 +86,11 @@
     "base16-helix": {
       "flake": false,
       "locked": {
-<<<<<<< HEAD
-        "lastModified": 1760703920,
-        "narHash": "sha256-m82fGUYns4uHd+ZTdoLX2vlHikzwzdu2s2rYM2bNwzw=",
-        "owner": "tinted-theming",
-        "repo": "base16-helix",
-        "rev": "d646af9b7d14bff08824538164af99d0c521b185",
-=======
         "lastModified": 1776754714,
         "narHash": "sha256-E3OAK27smtATTmX45uoTSRsVD+Y+ZiVVfgM/tjpbtYg=",
         "owner": "tinted-theming",
         "repo": "base16-helix",
         "rev": "4d508123037e7851ad36ebf7d9c48b0e9e1eb581",
->>>>>>> 4827e2d (updates?)
         "type": "github"
       },
       "original": {
@@ -187,8 +155,6 @@
         "type": "github"
       }
     },
-<<<<<<< HEAD
-=======
     "corefonts": {
       "flake": false,
       "locked": {
@@ -220,25 +186,16 @@
         "type": "github"
       }
     },
->>>>>>> 4827e2d (updates?)
     "darkly": {
       "inputs": {
         "nixpkgs": "nixpkgs_6"
       },
       "locked": {
-<<<<<<< HEAD
-        "lastModified": 1774304439,
-        "narHash": "sha256-6q2+HSOh3ZWLBnBkaKVgAuJJlHF+ny1bI6zatZaj+x0=",
-        "owner": "Bali10050",
-        "repo": "Darkly",
-        "rev": "79e8943147d7d5afa0db956776607ca366491fb7",
-=======
         "lastModified": 1777242021,
         "narHash": "sha256-BYew41wJQ8kG71+4eIvStBbmKf++WJnPCh3Lab2jOjw=",
         "owner": "Bali10050",
         "repo": "Darkly",
         "rev": "158eb5afa70c3e2a96ca58a8bc512ae65aecaa4b",
->>>>>>> 4827e2d (updates?)
         "type": "github"
       },
       "original": {
@@ -274,19 +231,11 @@
         "nixpkgs-stable": "nixpkgs-stable"
       },
       "locked": {
-<<<<<<< HEAD
-        "lastModified": 1775725758,
-        "narHash": "sha256-2GY9HgO6t5Y8B1A5+B3wOJ4hz6DcukDr6ySOWtjiLVc=",
+        "lastModified": 1778695346,
+        "narHash": "sha256-tJ8O3sZHQBVfKQIn3eMFURf9VweW/0z4yQX2iXiUl+o=",
         "owner": "nix-community",
         "repo": "emacs-overlay",
-        "rev": "849682305f0da62f51ae1f260ede513a7e22466b",
-=======
-        "lastModified": 1778263701,
-        "narHash": "sha256-xZKbShdjwFvABcPn7hrTQnXPRItbT9cmQXhmODsuxDo=",
-        "owner": "nix-community",
-        "repo": "emacs-overlay",
-        "rev": "5dab538fce92fd1fe70acecf34496fa85f81c1e9",
->>>>>>> 4827e2d (updates?)
+        "rev": "847cbbb49917ebf266477e0bbc1e800e58f69a2c",
         "type": "github"
       },
       "original": {
@@ -321,16 +270,6 @@
         "type": "github"
       }
     },
-<<<<<<< HEAD
-    "firefox-gnome-theme": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1775176642,
-        "narHash": "sha256-2veEED0Fg7Fsh81tvVDNYR6SzjqQxa7hbi18Jv4LWpM=",
-        "owner": "rafaelmardojai",
-        "repo": "firefox-gnome-theme",
-        "rev": "179704030c5286c729b5b0522037d1d51341022c",
-=======
     "fenix": {
       "inputs": {
         "nixpkgs": [
@@ -361,7 +300,6 @@
         "owner": "rafaelmardojai",
         "repo": "firefox-gnome-theme",
         "rev": "0f8ba203d475587f477e7ae12661bd8459e225b7",
->>>>>>> 4827e2d (updates?)
         "type": "github"
       },
       "original": {
@@ -420,19 +358,11 @@
         "nixpkgs-lib": "nixpkgs-lib"
       },
       "locked": {
-<<<<<<< HEAD
-        "lastModified": 1769996383,
-        "narHash": "sha256-AnYjnFWgS49RlqX7LrC4uA+sCCDBj0Ry/WOJ5XWAsa0=",
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "rev": "57928607ea566b5db3ad13af0e57e921e6b12381",
-=======
         "lastModified": 1777988971,
         "narHash": "sha256-qIoWPDs+0/8JecyYgE3gpKQxW/4bLW/gp45vow9ioCQ=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
         "rev": "0678d8986be1661af6bb555f3489f2fdfc31f6ff",
->>>>>>> 4827e2d (updates?)
         "type": "github"
       },
       "original": {
@@ -446,11 +376,11 @@
         "nixpkgs-lib": "nixpkgs-lib_2"
       },
       "locked": {
-        "lastModified": 1775087534,
-        "narHash": "sha256-91qqW8lhL7TLwgQWijoGBbiD4t7/q75KTi8NxjVmSmA=",
+        "lastModified": 1777988971,
+        "narHash": "sha256-qIoWPDs+0/8JecyYgE3gpKQxW/4bLW/gp45vow9ioCQ=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "3107b77cd68437b9a76194f0f7f9c55f2329ca5b",
+        "rev": "0678d8986be1661af6bb555f3489f2fdfc31f6ff",
         "type": "github"
       },
       "original": {
@@ -567,19 +497,11 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-<<<<<<< HEAD
-        "lastModified": 1769939035,
-        "narHash": "sha256-Fok2AmefgVA0+eprw2NDwqKkPGEI5wvR+twiZagBvrg=",
-        "owner": "cachix",
-        "repo": "git-hooks.nix",
-        "rev": "a8ca480175326551d6c4121498316261cbb5b260",
-=======
         "lastModified": 1776796298,
         "narHash": "sha256-PcRvlWayisPSjd0UcRQbhG8Oqw78AcPE6x872cPRHN8=",
         "owner": "cachix",
         "repo": "git-hooks.nix",
         "rev": "3cfd774b0a530725a077e17354fbdb87ea1c4aad",
->>>>>>> 4827e2d (updates?)
         "type": "github"
       },
       "original": {
@@ -655,19 +577,11 @@
         ]
       },
       "locked": {
-<<<<<<< HEAD
-        "lastModified": 1775683737,
-        "narHash": "sha256-oBYyowo6yfgb95Z78s3uTnAd9KkpJpwzjJbfnpLaM2Y=",
+        "lastModified": 1778681890,
+        "narHash": "sha256-RK4sTgei29wBzLu+e4ljeixKutWhbMygFsdxdFKpZOU=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "7ba4ee4228ed36123c7cb75d50524b43514ef992",
-=======
-        "lastModified": 1778248595,
-        "narHash": "sha256-dhFgEjoeJMYN/7OY6xfxS799YB4IjbbYXTjyGIJyLpc=",
-        "owner": "nix-community",
-        "repo": "home-manager",
-        "rev": "fdb2ccba9d5e1238d32e0c4a3ec1a277efa80c1d",
->>>>>>> 4827e2d (updates?)
+        "rev": "7654d90b94bab7eba3a52fd6f73b3f5a4c544fa2",
         "type": "github"
       },
       "original": {
@@ -711,19 +625,11 @@
         "xwayland-satellite-unstable": "xwayland-satellite-unstable"
       },
       "locked": {
-<<<<<<< HEAD
-        "lastModified": 1775710668,
-        "narHash": "sha256-pi2TWoWZR22vzr5RBAgIdl1LDwgLX+fh+Hqngt/Kkt8=",
+        "lastModified": 1778600236,
+        "narHash": "sha256-jWlIT+uKqKZoz6rNweobs/h6FfI5dKnC5OO7/3T7Tdw=",
         "owner": "sodiboo",
         "repo": "niri-flake",
-        "rev": "bef414577a6a745543989716df478afec96486bd",
-=======
-        "lastModified": 1778224717,
-        "narHash": "sha256-lzpzFAinsI1YriR+iVDIDZVkps2oQw1LG2QvFcDVYCk=",
-        "owner": "sodiboo",
-        "repo": "niri-flake",
-        "rev": "cb2fdda815a0c2c03f8a7fe7075c433d4ef37110",
->>>>>>> 4827e2d (updates?)
+        "rev": "f525d3b0a684d463dc9cf5c59359b9e67a372939",
         "type": "github"
       },
       "original": {
@@ -752,19 +658,11 @@
     "niri-unstable": {
       "flake": false,
       "locked": {
-<<<<<<< HEAD
-        "lastModified": 1775561155,
-        "narHash": "sha256-TK2IrqQivRcwqJa0suZMbcsN17CtA8Uu0v7CDnLATb0=",
+        "lastModified": 1778389445,
+        "narHash": "sha256-9NyDMVf8ydUZGTzcPcLMQf0o1B3bte/00UGbuXHNWh8=",
         "owner": "YaLTeR",
         "repo": "niri",
-        "rev": "599db847f857b8a7ff78ce02f15acab5d5d9fee1",
-=======
-        "lastModified": 1778221858,
-        "narHash": "sha256-+nZlx8MKCs973N9Bm0hNzFHjY+2lmBrBOQeTALeCRhI=",
-        "owner": "YaLTeR",
-        "repo": "niri",
-        "rev": "0200670d9ee8cfbdb154e3e14d92b5ff61aedd59",
->>>>>>> 4827e2d (updates?)
+        "rev": "38191826cb1e5fb9051a7e141fefe4941a2b4bed",
         "type": "github"
       },
       "original": {
@@ -782,11 +680,11 @@
         "nixpkgs-unstable": "nixpkgs-unstable"
       },
       "locked": {
-        "lastModified": 1767721199,
-        "narHash": "sha256-UzRxDiJlopBGPTjyhCdMP+QdTwXK+l+y45urXCyH69A=",
+        "lastModified": 1778603697,
+        "narHash": "sha256-da2UUYhmvo9tASz+Lsd6ns5IiNgIn8HIA9BIUGa81Lc=",
         "owner": "fort-nix",
         "repo": "nix-bitcoin",
-        "rev": "5b532698ce9e8bd79b07d77ab4fc60e1a8408f73",
+        "rev": "407796c767d526836b87ac1430ee965bd3b90a8b",
         "type": "github"
       },
       "original": {
@@ -843,19 +741,11 @@
     },
     "nixos-hardware": {
       "locked": {
-<<<<<<< HEAD
-        "lastModified": 1775490113,
-        "narHash": "sha256-2ZBhDNZZwYkRmefK5XLOusCJHnoeKkoN95hoSGgMxWM=",
+        "lastModified": 1778593042,
+        "narHash": "sha256-xYGrSg6354UK2K4WSQd4+TfyvfqmvFbSY+ZtGQUXK0c=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "c775c2772ba56e906cbeb4e0b2db19079ef11ff7",
-=======
-        "lastModified": 1778143761,
-        "narHash": "sha256-lkesY6x2X2qxlqLM7CT2iM/0rP2JB7fruPN3h8POXmI=",
-        "owner": "NixOS",
-        "repo": "nixos-hardware",
-        "rev": "3bcaa367d4c550d687a17ac792fd5cda214ee871",
->>>>>>> 4827e2d (updates?)
+        "rev": "9bd7c80d43e258aaa607d83b43661df11444d808",
         "type": "github"
       },
       "original": {
@@ -867,19 +757,11 @@
     },
     "nixos-unstable-small": {
       "locked": {
-<<<<<<< HEAD
-        "lastModified": 1775728626,
-        "narHash": "sha256-EhIPCT/tFqqPt4DMQZAUJj953GOZMjlBZq91zj/XWsk=",
+        "lastModified": 1778672786,
+        "narHash": "sha256-Blg88K1jwG+P0Mr27+rKMFCufdrWkV3wWh9AdYtz0FQ=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "0c33d38e5790d4bbf65f0a7f1ac7fe58d2e361f4",
-=======
-        "lastModified": 1778228972,
-        "narHash": "sha256-L34YTBob9sdjnc+rd7nMC2X8ddw0LT4RfufnlFyArRU=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "1c5503ba41146fb6b49ed9706823b30de7f3a78f",
->>>>>>> 4827e2d (updates?)
+        "rev": "eef00dfd8a712b34af845f9350bac681b1228bd1",
         "type": "github"
       },
       "original": {
@@ -891,19 +773,11 @@
     },
     "nixpkgs": {
       "locked": {
-<<<<<<< HEAD
-        "lastModified": 1764947035,
-        "narHash": "sha256-EYHSjVM4Ox4lvCXUMiKKs2vETUSL5mx+J2FfutM7T9w=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "a672be65651c80d3f592a89b3945466584a22069",
-=======
         "lastModified": 1770073757,
         "narHash": "sha256-Vy+G+F+3E/Tl+GMNgiHl9Pah2DgShmIUBJXmbiQPHbI=",
         "owner": "NixOS",
         "repo": "nixpkgs",
         "rev": "47472570b1e607482890801aeaf29bfb749884f6",
->>>>>>> 4827e2d (updates?)
         "type": "github"
       },
       "original": {
@@ -930,11 +804,11 @@
     },
     "nixpkgs-25_05": {
       "locked": {
-        "lastModified": 1767051569,
-        "narHash": "sha256-0MnuWoN+n1UYaGBIpqpPs9I9ZHW4kynits4mrnh1Pk4=",
+        "lastModified": 1767313136,
+        "narHash": "sha256-16KkgfdYqjaeRGBaYsNrhPRRENs0qzkQVUooNHtoy2w=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "40ee5e1944bebdd128f9fbada44faefddfde29bd",
+        "rev": "ac62194c3917d5f474c1a844b6fd6da2db95077d",
         "type": "github"
       },
       "original": {
@@ -946,19 +820,11 @@
     },
     "nixpkgs-lib": {
       "locked": {
-<<<<<<< HEAD
-        "lastModified": 1769909678,
-        "narHash": "sha256-cBEymOf4/o3FD5AZnzC3J9hLbiZ+QDT/KDuyHXVJOpM=",
-        "owner": "nix-community",
-        "repo": "nixpkgs.lib",
-        "rev": "72716169fe93074c333e8d0173151350670b824c",
-=======
         "lastModified": 1777168982,
         "narHash": "sha256-GOkGPcboWE9BmGCRMLX3worL4EMnsnG8MyKmXNeYuhQ=",
         "owner": "nix-community",
         "repo": "nixpkgs.lib",
         "rev": "f5901329dade4a6ea039af1433fb087bd9c1fe14",
->>>>>>> 4827e2d (updates?)
         "type": "github"
       },
       "original": {
@@ -969,11 +835,11 @@
     },
     "nixpkgs-lib_2": {
       "locked": {
-        "lastModified": 1774748309,
-        "narHash": "sha256-+U7gF3qxzwD5TZuANzZPeJTZRHS29OFQgkQ2kiTJBIQ=",
+        "lastModified": 1777168982,
+        "narHash": "sha256-GOkGPcboWE9BmGCRMLX3worL4EMnsnG8MyKmXNeYuhQ=",
         "owner": "nix-community",
         "repo": "nixpkgs.lib",
-        "rev": "333c4e0545a6da976206c74db8773a1645b5870a",
+        "rev": "f5901329dade4a6ea039af1433fb087bd9c1fe14",
         "type": "github"
       },
       "original": {
@@ -984,19 +850,11 @@
     },
     "nixpkgs-stable": {
       "locked": {
-<<<<<<< HEAD
-        "lastModified": 1775595990,
-        "narHash": "sha256-OEf7YqhF9IjJFYZJyuhAypgU+VsRB5lD4DuiMws5Ltc=",
+        "lastModified": 1778430510,
+        "narHash": "sha256-Ti+ZBvW6yrWWAg2szExVTwCd4qOJ3KlVr1tFHfyfi8Q=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "4e92bbcdb030f3b4782be4751dc08e6b6cb6ccf2",
-=======
-        "lastModified": 1778003029,
-        "narHash": "sha256-q/nkKLDtHIyLjZpKhWk3cSK5IYsFqtMd6UtXF3ddjgA=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "0c88e1f2bdb93d5999019e99cb0e61e1fe2af4c5",
->>>>>>> 4827e2d (updates?)
+        "rev": "8fd9daa3db09ced9700431c5b7ad0e8ba199b575",
         "type": "github"
       },
       "original": {
@@ -1008,19 +866,11 @@
     },
     "nixpkgs-stable_2": {
       "locked": {
-<<<<<<< HEAD
-        "lastModified": 1775595990,
-        "narHash": "sha256-OEf7YqhF9IjJFYZJyuhAypgU+VsRB5lD4DuiMws5Ltc=",
+        "lastModified": 1778430510,
+        "narHash": "sha256-Ti+ZBvW6yrWWAg2szExVTwCd4qOJ3KlVr1tFHfyfi8Q=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "4e92bbcdb030f3b4782be4751dc08e6b6cb6ccf2",
-=======
-        "lastModified": 1778003029,
-        "narHash": "sha256-q/nkKLDtHIyLjZpKhWk3cSK5IYsFqtMd6UtXF3ddjgA=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "0c88e1f2bdb93d5999019e99cb0e61e1fe2af4c5",
->>>>>>> 4827e2d (updates?)
+        "rev": "8fd9daa3db09ced9700431c5b7ad0e8ba199b575",
         "type": "github"
       },
       "original": {
@@ -1048,11 +898,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1767364772,
-        "narHash": "sha256-fFUnEYMla8b7UKjijLnMe+oVFOz6HjijGGNS1l7dYaQ=",
+        "lastModified": 1777826146,
+        "narHash": "sha256-wQ/iN5Zp5VIa3ebBibijPnLyKhor+xEbDy4d0goa9Zs=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "16c7794d0a28b5a37904d55bcca36003b9109aaa",
+        "rev": "73c703c22422b8951895a960959dbbaca7296492",
         "type": "github"
       },
       "original": {
@@ -1127,19 +977,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-<<<<<<< HEAD
-        "lastModified": 1769789167,
-        "narHash": "sha256-kKB3bqYJU5nzYeIROI82Ef9VtTbu4uA3YydSk/Bioa8=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "62c8382960464ceb98ea593cb8321a2cf8f9e3e5",
-=======
         "lastModified": 1777954456,
         "narHash": "sha256-hGdgeU2Nk87RAuZyYjyDjFL6LK7dAZN5RE9+hrDTkDU=",
         "owner": "nixos",
         "repo": "nixpkgs",
         "rev": "549bd84d6279f9852cae6225e372cc67fb91a4c1",
->>>>>>> 4827e2d (updates?)
         "type": "github"
       },
       "original": {
@@ -1151,19 +993,11 @@
     },
     "nixpkgs_3": {
       "locked": {
-<<<<<<< HEAD
-        "lastModified": 1767364772,
-        "narHash": "sha256-fFUnEYMla8b7UKjijLnMe+oVFOz6HjijGGNS1l7dYaQ=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "16c7794d0a28b5a37904d55bcca36003b9109aaa",
-=======
         "lastModified": 1770107345,
         "narHash": "sha256-tbS0Ebx2PiA1FRW8mt8oejR0qMXmziJmPaU1d4kYY9g=",
         "owner": "nixos",
         "repo": "nixpkgs",
         "rev": "4533d9293756b63904b7238acb84ac8fe4c8c2c4",
->>>>>>> 4827e2d (updates?)
         "type": "github"
       },
       "original": {
@@ -1223,11 +1057,11 @@
     },
     "nixpkgs_7": {
       "locked": {
-        "lastModified": 1767480499,
-        "narHash": "sha256-8IQQUorUGiSmFaPnLSo2+T+rjHtiNWc+OAzeHck7N48=",
+        "lastModified": 1777673416,
+        "narHash": "sha256-5c2POKPOjU40Kh0MirOdScBLG0bu9TAuPYAtPRNZMBs=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "30a3c519afcf3f99e2c6df3b359aec5692054d92",
+        "rev": "26ef669cffa904b6f6832ab57b77892a37c1a671",
         "type": "github"
       },
       "original": {
@@ -1239,19 +1073,11 @@
     },
     "nixpkgs_8": {
       "locked": {
-<<<<<<< HEAD
-        "lastModified": 1775423009,
-        "narHash": "sha256-vPKLpjhIVWdDrfiUM8atW6YkIggCEKdSAlJPzzhkQlw=",
+        "lastModified": 1778443072,
+        "narHash": "sha256-zi7/fsqM/kFdNuED//4WOCUtezGtKKqRNORjMvfwjnA=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "68d8aa3d661f0e6bd5862291b5bb263b2a6595c9",
-=======
-        "lastModified": 1777954456,
-        "narHash": "sha256-hGdgeU2Nk87RAuZyYjyDjFL6LK7dAZN5RE9+hrDTkDU=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "549bd84d6279f9852cae6225e372cc67fb91a4c1",
->>>>>>> 4827e2d (updates?)
+        "rev": "da5ad661ba4e5ef59ba743f0d112cbc30e474f32",
         "type": "github"
       },
       "original": {
@@ -1263,19 +1089,11 @@
     },
     "nixpkgs_9": {
       "locked": {
-<<<<<<< HEAD
-        "lastModified": 1775036866,
-        "narHash": "sha256-ZojAnPuCdy657PbTq5V0Y+AHKhZAIwSIT2cb8UgAz/U=",
+        "lastModified": 1777954456,
+        "narHash": "sha256-hGdgeU2Nk87RAuZyYjyDjFL6LK7dAZN5RE9+hrDTkDU=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "6201e203d09599479a3b3450ed24fa81537ebc4e",
-=======
-        "lastModified": 1775710090,
-        "narHash": "sha256-ar3rofg+awPB8QXDaFJhJ2jJhu+KqN/PRCXeyuXR76E=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "4c1018dae018162ec878d42fec712642d214fdfa",
->>>>>>> 4827e2d (updates?)
+        "rev": "549bd84d6279f9852cae6225e372cc67fb91a4c1",
         "type": "github"
       },
       "original": {
@@ -1297,19 +1115,11 @@
         ]
       },
       "locked": {
-<<<<<<< HEAD
-        "lastModified": 1775228139,
-        "narHash": "sha256-ebbeHmg+V7w8050bwQOuhmQHoLOEOfqKzM1KgCTexK4=",
-        "owner": "nix-community",
-        "repo": "NUR",
-        "rev": "601971b9c89e0304561977f2c28fa25e73aa7132",
-=======
         "lastModified": 1777598946,
         "narHash": "sha256-X239dAGaU1+gfDj8jKH8GzlqKMcxaVfXOio+uzBOkeE=",
         "owner": "nix-community",
         "repo": "NUR",
         "rev": "5d55af01c0f86be583931fe99207fc56c14134b3",
->>>>>>> 4827e2d (updates?)
         "type": "github"
       },
       "original": {
@@ -1326,19 +1136,11 @@
         "systems": "systems_4"
       },
       "locked": {
-<<<<<<< HEAD
-        "lastModified": 1775350197,
-        "narHash": "sha256-K9u+gYoyG1BcTXjkpaqyECyKokbPc3VtNgxTP3NwRWI=",
+        "lastModified": 1778404840,
+        "narHash": "sha256-9ydPPl+USi419cJ8uUqe3KPnpbEYZkk/vM+mZciafO8=",
         "owner": "mahlquistj",
         "repo": "octotype",
-        "rev": "60a9757107600d2af22857b968a88308594ebc2e",
-=======
-        "lastModified": 1775955139,
-        "narHash": "sha256-/6pvoKhus6TjYWyWzlShMS4qFtH/QeCf7dCdGkKnp7I=",
-        "owner": "mahlquistj",
-        "repo": "octotype",
-        "rev": "f7f788129b6cc5bf6c4684389a9ba8f4171cdcd2",
->>>>>>> 4827e2d (updates?)
+        "rev": "7569b22e947840628923c16551947d4a22bef426",
         "type": "github"
       },
       "original": {
@@ -1351,19 +1153,11 @@
     "on-linux": {
       "flake": false,
       "locked": {
-<<<<<<< HEAD
-        "lastModified": 1769366983,
-        "narHash": "sha256-uBLHcm0WP8n4ms7eV05wt4mc9uvUo9OVMM/41lW+u8Q=",
-        "owner": "seapear",
-        "repo": "AffinityOnLinux",
-        "rev": "c3909c9e265f8091b9b0b26d8f51815a0a19e547",
-=======
         "lastModified": 1772699425,
         "narHash": "sha256-xhqkN2I5r+Ty2k8HEsLg5e8Eaazb0Qyioqjs87BQOnY=",
         "owner": "seapear",
         "repo": "AffinityOnLinux",
         "rev": "a0c4421946709c24c3f371fcbf15a45b814f188c",
->>>>>>> 4827e2d (updates?)
         "type": "github"
       },
       "original": {
@@ -1372,18 +1166,6 @@
         "type": "github"
       }
     },
-<<<<<<< HEAD
-    "plugin-loader": {
-      "flake": false,
-      "locked": {
-        "narHash": "sha256-mixBa/xIfSIrSS3+bGqznXxSE6h8s7e2xoJM2g4eXhg=",
-        "type": "file",
-        "url": "https://github.com/noahc3/AffinityPluginLoader/releases/download/v0.2.0/affinitypluginloader-plus-winefix.tar.xz"
-      },
-      "original": {
-        "type": "file",
-        "url": "https://github.com/noahc3/AffinityPluginLoader/releases/download/v0.2.0/affinitypluginloader-plus-winefix.tar.xz"
-=======
     "plugin-loader-src": {
       "flake": false,
       "locked": {
@@ -1399,7 +1181,6 @@
         "ref": "v0.3.0",
         "repo": "AffinityPluginLoader",
         "type": "github"
->>>>>>> 4827e2d (updates?)
       }
     },
     "poetry2nix": {
@@ -1466,8 +1247,6 @@
         "stylix": "stylix"
       }
     },
-<<<<<<< HEAD
-=======
     "rust-analyzer-src": {
       "flake": false,
       "locked": {
@@ -1485,7 +1264,6 @@
         "type": "github"
       }
     },
->>>>>>> 4827e2d (updates?)
     "rust-overlay": {
       "inputs": {
         "nixpkgs": [
@@ -1512,19 +1290,11 @@
         "nixpkgs": "nixpkgs_10"
       },
       "locked": {
-<<<<<<< HEAD
-        "lastModified": 1775272153,
-        "narHash": "sha256-FwYb64ysv8J2TxaqsYYcDyHAHBUEaQlriPMWPMi1K7M=",
+        "lastModified": 1778296574,
+        "narHash": "sha256-DVmg1JCjG0VJTa+FF6tH6tkQChaxzK1EzPL98RiRWU0=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "740fb0203b2852917b909a72b948d34d0b171ec0",
-=======
-        "lastModified": 1775877051,
-        "narHash": "sha256-wpSQm2PD/w4uRo2wb8utk0b5hOBkkg/CZ1xICY+qB7M=",
-        "owner": "oxalica",
-        "repo": "rust-overlay",
-        "rev": "08b4f3633471874c8894632ade1b78d75dbda002",
->>>>>>> 4827e2d (updates?)
+        "rev": "1d634a90dffb59ec9ba52652de311b15528c1595",
         "type": "github"
       },
       "original": {
@@ -1575,19 +1345,11 @@
         "tinted-zed": "tinted-zed"
       },
       "locked": {
-<<<<<<< HEAD
-        "lastModified": 1775429060,
-        "narHash": "sha256-wbFF5cRxQOCzL/wHOKYm21t5AHPH2Lfp0mVPCOAvEoc=",
+        "lastModified": 1778680030,
+        "narHash": "sha256-1TY2s0CWtT0gl7bQmZUPEA6pmRBPCfPj7DNzHIXydG0=",
         "owner": "danth",
         "repo": "stylix",
-        "rev": "d27951a6539951d87f75cf0a7cda8a3a24016019",
-=======
-        "lastModified": 1778104276,
-        "narHash": "sha256-/DSSnU0LLmOTG/OCgGwYpxP6+5YvxRx2g/GhI4x6aCU=",
-        "owner": "danth",
-        "repo": "stylix",
-        "rev": "18ed8d270231e067fe2739998479ed5d7c659c2c",
->>>>>>> 4827e2d (updates?)
+        "rev": "3401cf7a7d2ce7a3e3180ed4e7225056e7a05c7d",
         "type": "github"
       },
       "original": {
@@ -1691,19 +1453,11 @@
     "tinted-schemes": {
       "flake": false,
       "locked": {
-<<<<<<< HEAD
-        "lastModified": 1772661346,
-        "narHash": "sha256-4eu3LqB9tPqe0Vaqxd4wkZiBbthLbpb7llcoE/p5HT0=",
-        "owner": "tinted-theming",
-        "repo": "schemes",
-        "rev": "13b5b0c299982bb361039601e2d72587d6846294",
-=======
         "lastModified": 1777041405,
         "narHash": "sha256-BAGZ7ObFV/9Z61OJZun7ifPyhkuHqNuW1QIhQ8LuzCo=",
         "owner": "tinted-theming",
         "repo": "schemes",
         "rev": "5f868b3a338b6904c47f3833b9c411be641983a8",
->>>>>>> 4827e2d (updates?)
         "type": "github"
       },
       "original": {
@@ -1715,19 +1469,11 @@
     "tinted-tmux": {
       "flake": false,
       "locked": {
-<<<<<<< HEAD
-        "lastModified": 1772934010,
-        "narHash": "sha256-x+6+4UvaG+RBRQ6UaX+o6DjEg28u4eqhVRM9kpgJGjQ=",
-        "owner": "tinted-theming",
-        "repo": "tinted-tmux",
-        "rev": "c3529673a5ab6e1b6830f618c45d9ce1bcdd829d",
-=======
         "lastModified": 1777169200,
         "narHash": "sha256-h7dDbIzP5hDr9v97w9PL6jdAgXawmj6krcH+959rqpU=",
         "owner": "tinted-theming",
         "repo": "tinted-tmux",
         "rev": "f798c2dce44ef815bb6b8f05a82135c7942d35ac",
->>>>>>> 4827e2d (updates?)
         "type": "github"
       },
       "original": {
@@ -1739,19 +1485,11 @@
     "tinted-zed": {
       "flake": false,
       "locked": {
-<<<<<<< HEAD
-        "lastModified": 1772909925,
-        "narHash": "sha256-jx/5+pgYR0noHa3hk2esin18VMbnPSvWPL5bBjfTIAU=",
-        "owner": "tinted-theming",
-        "repo": "base16-zed",
-        "rev": "b4d3a1b3bcbd090937ef609a0a3b37237af974df",
-=======
         "lastModified": 1777463218,
         "narHash": "sha256-Bhkozqtq3BKLqWTlmKm8uAptfX4aRGI8QX3eEL54Vpc=",
         "owner": "tinted-theming",
         "repo": "base16-zed",
         "rev": "5768d08ed2e7944a26a958868cdb073cb8856dae",
->>>>>>> 4827e2d (updates?)
         "type": "github"
       },
       "original": {
@@ -1765,19 +1503,11 @@
         "nixpkgs": "nixpkgs_3"
       },
       "locked": {
-<<<<<<< HEAD
-        "lastModified": 1769691507,
-        "narHash": "sha256-8aAYwyVzSSwIhP2glDhw/G0i5+wOrren3v6WmxkVonM=",
-        "owner": "numtide",
-        "repo": "treefmt-nix",
-        "rev": "28b19c5844cc6e2257801d43f2772a4b4c050a1b",
-=======
         "lastModified": 1775636079,
         "narHash": "sha256-pc20NRoMdiar8oPQceQT47UUZMBTiMdUuWrYu2obUP0=",
         "owner": "numtide",
         "repo": "treefmt-nix",
         "rev": "790751ff7fd3801feeaf96d7dc416a8d581265ba",
->>>>>>> 4827e2d (updates?)
         "type": "github"
       },
       "original": {
diff --git a/home/home.nix b/home/home.nix
index 0954cb8..30dfd70 100644
--- a/home/home.nix
+++ b/home/home.nix
@@ -210,7 +210,6 @@ in {
   qt = {
     enable = true;
     style.package = with pkgs; [
-      darkly-qt5
       darkly
     ];
     platformTheme.name = "qtct";
diff --git a/pkgs/desktop-packages.nix b/pkgs/desktop-packages.nix
index 57e7c05..99cf597 100644
--- a/pkgs/desktop-packages.nix
+++ b/pkgs/desktop-packages.nix
@@ -135,7 +135,7 @@
     # unclutter-xfixes
     bluez-tools
     networkmanager_dmenu
-    plasma5Packages.qt5ct
+    kdePackages.qt6ct
     xdg-desktop-portal-cosmic
     # kdePackages.xdg-desktop-portal-kde
     # lxappearance