diff --git a/flake.lock b/flake.lock
index 6619c00..24314dc 100644
--- a/flake.lock
+++ b/flake.lock
@@ -231,11 +231,19 @@
         "nixpkgs-stable": "nixpkgs-stable"
       },
       "locked": {
+<<<<<<< HEAD
         "lastModified": 1778263701,
         "narHash": "sha256-xZKbShdjwFvABcPn7hrTQnXPRItbT9cmQXhmODsuxDo=",
         "owner": "nix-community",
         "repo": "emacs-overlay",
         "rev": "5dab538fce92fd1fe70acecf34496fa85f81c1e9",
+=======
+        "lastModified": 1778695346,
+        "narHash": "sha256-tJ8O3sZHQBVfKQIn3eMFURf9VweW/0z4yQX2iXiUl+o=",
+        "owner": "nix-community",
+        "repo": "emacs-overlay",
+        "rev": "847cbbb49917ebf266477e0bbc1e800e58f69a2c",
+>>>>>>> 0d8dda762bd7d34bd9eb94f80cdd1854430e5279
         "type": "github"
       },
       "original": {
@@ -376,11 +384,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": {
@@ -577,11 +585,19 @@
         ]
       },
       "locked": {
+<<<<<<< HEAD
         "lastModified": 1778248595,
         "narHash": "sha256-dhFgEjoeJMYN/7OY6xfxS799YB4IjbbYXTjyGIJyLpc=",
         "owner": "nix-community",
         "repo": "home-manager",
         "rev": "fdb2ccba9d5e1238d32e0c4a3ec1a277efa80c1d",
+=======
+        "lastModified": 1778681890,
+        "narHash": "sha256-RK4sTgei29wBzLu+e4ljeixKutWhbMygFsdxdFKpZOU=",
+        "owner": "nix-community",
+        "repo": "home-manager",
+        "rev": "7654d90b94bab7eba3a52fd6f73b3f5a4c544fa2",
+>>>>>>> 0d8dda762bd7d34bd9eb94f80cdd1854430e5279
         "type": "github"
       },
       "original": {
@@ -625,11 +641,19 @@
         "xwayland-satellite-unstable": "xwayland-satellite-unstable"
       },
       "locked": {
+<<<<<<< HEAD
         "lastModified": 1778224717,
         "narHash": "sha256-lzpzFAinsI1YriR+iVDIDZVkps2oQw1LG2QvFcDVYCk=",
         "owner": "sodiboo",
         "repo": "niri-flake",
         "rev": "cb2fdda815a0c2c03f8a7fe7075c433d4ef37110",
+=======
+        "lastModified": 1778600236,
+        "narHash": "sha256-jWlIT+uKqKZoz6rNweobs/h6FfI5dKnC5OO7/3T7Tdw=",
+        "owner": "sodiboo",
+        "repo": "niri-flake",
+        "rev": "f525d3b0a684d463dc9cf5c59359b9e67a372939",
+>>>>>>> 0d8dda762bd7d34bd9eb94f80cdd1854430e5279
         "type": "github"
       },
       "original": {
@@ -658,11 +682,19 @@
     "niri-unstable": {
       "flake": false,
       "locked": {
+<<<<<<< HEAD
         "lastModified": 1778221858,
         "narHash": "sha256-+nZlx8MKCs973N9Bm0hNzFHjY+2lmBrBOQeTALeCRhI=",
         "owner": "YaLTeR",
         "repo": "niri",
         "rev": "0200670d9ee8cfbdb154e3e14d92b5ff61aedd59",
+=======
+        "lastModified": 1778389445,
+        "narHash": "sha256-9NyDMVf8ydUZGTzcPcLMQf0o1B3bte/00UGbuXHNWh8=",
+        "owner": "YaLTeR",
+        "repo": "niri",
+        "rev": "38191826cb1e5fb9051a7e141fefe4941a2b4bed",
+>>>>>>> 0d8dda762bd7d34bd9eb94f80cdd1854430e5279
         "type": "github"
       },
       "original": {
@@ -680,11 +712,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": {
@@ -741,11 +773,19 @@
     },
     "nixos-hardware": {
       "locked": {
+<<<<<<< HEAD
         "lastModified": 1778143761,
         "narHash": "sha256-lkesY6x2X2qxlqLM7CT2iM/0rP2JB7fruPN3h8POXmI=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
         "rev": "3bcaa367d4c550d687a17ac792fd5cda214ee871",
+=======
+        "lastModified": 1778593042,
+        "narHash": "sha256-xYGrSg6354UK2K4WSQd4+TfyvfqmvFbSY+ZtGQUXK0c=",
+        "owner": "NixOS",
+        "repo": "nixos-hardware",
+        "rev": "9bd7c80d43e258aaa607d83b43661df11444d808",
+>>>>>>> 0d8dda762bd7d34bd9eb94f80cdd1854430e5279
         "type": "github"
       },
       "original": {
@@ -757,11 +797,19 @@
     },
     "nixos-unstable-small": {
       "locked": {
+<<<<<<< HEAD
         "lastModified": 1778228972,
         "narHash": "sha256-L34YTBob9sdjnc+rd7nMC2X8ddw0LT4RfufnlFyArRU=",
         "owner": "nixos",
         "repo": "nixpkgs",
         "rev": "1c5503ba41146fb6b49ed9706823b30de7f3a78f",
+=======
+        "lastModified": 1778672786,
+        "narHash": "sha256-Blg88K1jwG+P0Mr27+rKMFCufdrWkV3wWh9AdYtz0FQ=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "eef00dfd8a712b34af845f9350bac681b1228bd1",
+>>>>>>> 0d8dda762bd7d34bd9eb94f80cdd1854430e5279
         "type": "github"
       },
       "original": {
@@ -804,11 +852,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": {
@@ -835,11 +883,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": {
@@ -850,11 +898,19 @@
     },
     "nixpkgs-stable": {
       "locked": {
+<<<<<<< HEAD
         "lastModified": 1778003029,
         "narHash": "sha256-q/nkKLDtHIyLjZpKhWk3cSK5IYsFqtMd6UtXF3ddjgA=",
         "owner": "NixOS",
         "repo": "nixpkgs",
         "rev": "0c88e1f2bdb93d5999019e99cb0e61e1fe2af4c5",
+=======
+        "lastModified": 1778430510,
+        "narHash": "sha256-Ti+ZBvW6yrWWAg2szExVTwCd4qOJ3KlVr1tFHfyfi8Q=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "8fd9daa3db09ced9700431c5b7ad0e8ba199b575",
+>>>>>>> 0d8dda762bd7d34bd9eb94f80cdd1854430e5279
         "type": "github"
       },
       "original": {
@@ -866,11 +922,19 @@
     },
     "nixpkgs-stable_2": {
       "locked": {
+<<<<<<< HEAD
         "lastModified": 1778003029,
         "narHash": "sha256-q/nkKLDtHIyLjZpKhWk3cSK5IYsFqtMd6UtXF3ddjgA=",
         "owner": "NixOS",
         "repo": "nixpkgs",
         "rev": "0c88e1f2bdb93d5999019e99cb0e61e1fe2af4c5",
+=======
+        "lastModified": 1778430510,
+        "narHash": "sha256-Ti+ZBvW6yrWWAg2szExVTwCd4qOJ3KlVr1tFHfyfi8Q=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "8fd9daa3db09ced9700431c5b7ad0e8ba199b575",
+>>>>>>> 0d8dda762bd7d34bd9eb94f80cdd1854430e5279
         "type": "github"
       },
       "original": {
@@ -898,11 +962,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": {
@@ -1057,11 +1121,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": {
@@ -1073,11 +1137,19 @@
     },
     "nixpkgs_8": {
       "locked": {
+<<<<<<< HEAD
         "lastModified": 1777954456,
         "narHash": "sha256-hGdgeU2Nk87RAuZyYjyDjFL6LK7dAZN5RE9+hrDTkDU=",
         "owner": "nixos",
         "repo": "nixpkgs",
         "rev": "549bd84d6279f9852cae6225e372cc67fb91a4c1",
+=======
+        "lastModified": 1778443072,
+        "narHash": "sha256-zi7/fsqM/kFdNuED//4WOCUtezGtKKqRNORjMvfwjnA=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "da5ad661ba4e5ef59ba743f0d112cbc30e474f32",
+>>>>>>> 0d8dda762bd7d34bd9eb94f80cdd1854430e5279
         "type": "github"
       },
       "original": {
@@ -1089,11 +1161,19 @@
     },
     "nixpkgs_9": {
       "locked": {
+<<<<<<< HEAD
         "lastModified": 1775710090,
         "narHash": "sha256-ar3rofg+awPB8QXDaFJhJ2jJhu+KqN/PRCXeyuXR76E=",
         "owner": "NixOS",
         "repo": "nixpkgs",
         "rev": "4c1018dae018162ec878d42fec712642d214fdfa",
+=======
+        "lastModified": 1777954456,
+        "narHash": "sha256-hGdgeU2Nk87RAuZyYjyDjFL6LK7dAZN5RE9+hrDTkDU=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "549bd84d6279f9852cae6225e372cc67fb91a4c1",
+>>>>>>> 0d8dda762bd7d34bd9eb94f80cdd1854430e5279
         "type": "github"
       },
       "original": {
@@ -1136,11 +1216,19 @@
         "systems": "systems_4"
       },
       "locked": {
+<<<<<<< HEAD
         "lastModified": 1775955139,
         "narHash": "sha256-/6pvoKhus6TjYWyWzlShMS4qFtH/QeCf7dCdGkKnp7I=",
         "owner": "mahlquistj",
         "repo": "octotype",
         "rev": "f7f788129b6cc5bf6c4684389a9ba8f4171cdcd2",
+=======
+        "lastModified": 1778404840,
+        "narHash": "sha256-9ydPPl+USi419cJ8uUqe3KPnpbEYZkk/vM+mZciafO8=",
+        "owner": "mahlquistj",
+        "repo": "octotype",
+        "rev": "7569b22e947840628923c16551947d4a22bef426",
+>>>>>>> 0d8dda762bd7d34bd9eb94f80cdd1854430e5279
         "type": "github"
       },
       "original": {
@@ -1290,11 +1378,19 @@
         "nixpkgs": "nixpkgs_10"
       },
       "locked": {
+<<<<<<< HEAD
         "lastModified": 1775877051,
         "narHash": "sha256-wpSQm2PD/w4uRo2wb8utk0b5hOBkkg/CZ1xICY+qB7M=",
         "owner": "oxalica",
         "repo": "rust-overlay",
         "rev": "08b4f3633471874c8894632ade1b78d75dbda002",
+=======
+        "lastModified": 1778296574,
+        "narHash": "sha256-DVmg1JCjG0VJTa+FF6tH6tkQChaxzK1EzPL98RiRWU0=",
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "rev": "1d634a90dffb59ec9ba52652de311b15528c1595",
+>>>>>>> 0d8dda762bd7d34bd9eb94f80cdd1854430e5279
         "type": "github"
       },
       "original": {
@@ -1345,11 +1441,19 @@
         "tinted-zed": "tinted-zed"
       },
       "locked": {
+<<<<<<< HEAD
         "lastModified": 1778104276,
         "narHash": "sha256-/DSSnU0LLmOTG/OCgGwYpxP6+5YvxRx2g/GhI4x6aCU=",
         "owner": "danth",
         "repo": "stylix",
         "rev": "18ed8d270231e067fe2739998479ed5d7c659c2c",
+=======
+        "lastModified": 1778680030,
+        "narHash": "sha256-1TY2s0CWtT0gl7bQmZUPEA6pmRBPCfPj7DNzHIXydG0=",
+        "owner": "danth",
+        "repo": "stylix",
+        "rev": "3401cf7a7d2ce7a3e3180ed4e7225056e7a05c7d",
+>>>>>>> 0d8dda762bd7d34bd9eb94f80cdd1854430e5279
         "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