diff --git a/nixos/boxes/foryog/default.nix b/nixos/boxes/foryog/default.nix
index f6ff2840..e721d442 100644
--- a/nixos/boxes/foryog/default.nix
+++ b/nixos/boxes/foryog/default.nix
@@ -6,6 +6,7 @@
     ../../backups.nix
     ../../boot.nix
     ../../git
+    ../../gui
     ../../kde
     ../../vim
     ../../zsh
diff --git a/nixos/gui/default.nix b/nixos/gui/default.nix
index 58988b40..7e3c2b6f 100644
--- a/nixos/gui/default.nix
+++ b/nixos/gui/default.nix
@@ -1,16 +1,8 @@
-{
-  config,
-  pkgs,
-  discord,
-  inputs,
-  nixpkgs-nixos-unstable,
-  nixpkgs-nixos-stable-and-unfree,
-  nixpkgs-nixos-unstable-and-unfree,
-  ...
-}: {
+{ config, pkgs, discord, inputs, nixpkgs-nixos-unstable
+, nixpkgs-nixos-stable-and-unfree, nixpkgs-nixos-unstable-and-unfree, ... }: {
   security.chromiumSuidSandbox.enable = true;
 
-  home-manager.users.cyryl = {...}: {
+  home-manager.users.cyryl = { ... }: {
     gtk = {
       enable = true;
       iconTheme = {
@@ -18,76 +10,73 @@
         package = pkgs.gnome3.adwaita-icon-theme;
       };
     };
-    qt = {
-      enable = true;
-      platformTheme = "gnome";
-      style.name = "adwaita-dark";
-      style.package = pkgs.adwaita-qt;
-    };
+    qt = { enable = true; };
 
-    imports = [];
+    imports = [ ];
 
     programs.chromium.enable = true;
     programs.firefox.enable = true;
-    home.packages =
-      (with pkgs;
-        with pkgs.gnome3;
-        with pkgs.python39Packages; [
-          anarchism
-          calibre
-          cheese
-          digikam
-          electrum
-          element-desktop
-          eog
-          evince
-          fontconfig
-          freecad
-          ghidra-bin
-          gimp
-          glxinfo
-          gnome-screenshot
-          gparted
-          inkscape
-          kdenlive
-          koreader
-          krusader
-          libreoffice
-          mediainfo
-          mindforger
-          modem-manager-gui
-          nautilus
-          nyxt
-          obs-studio
-          openscad
-          passff-host
-          pdfarranger
-          pkgs.gsettings-desktop-schemas
-          pkgs.shotwell
-          qcad
-          qemu
-          remmina
-          signal-desktop
-          simple-scan
-          spotify
-          ssb-patchwork
-          tigervnc
-          tlaplusToolbox
-          tlaps
-          uefitool
-          vlc
-          winePackages.full
-          wireshark
-          wsjtx
-          xclip
-          xidlehook
-          yubico-piv-tool
-          yubikey-manager-qt
-          yubikey-personalization
-          yubikey-personalization-gui
-        ])
-      ++ (with nixpkgs-nixos-unstable; [gnucash thunderbird])
-      ++ [nixpkgs-nixos-stable-and-unfree.discord]
-      ++ (with nixpkgs-nixos-unstable-and-unfree; [hopper jetbrains.rust-rover jetbrains.clion]);
+    home.packages = (with pkgs;
+      with pkgs.gnome3;
+      with pkgs.python39Packages; [
+        anarchism
+        calibre
+        cheese
+        digikam
+        electrum
+        element-desktop
+        eog
+        evince
+        fontconfig
+        freecad
+        ghidra-bin
+        gimp
+        glxinfo
+        gnome-screenshot
+        gparted
+        inkscape
+        kdenlive
+        koreader
+        krusader
+        libreoffice
+        mediainfo
+        mindforger
+        modem-manager-gui
+        nautilus
+        nyxt
+        obs-studio
+        openscad
+        passff-host
+        pdfarranger
+        pkgs.gsettings-desktop-schemas
+        pkgs.shotwell
+        qcad
+        qemu
+        remmina
+        signal-desktop
+        simple-scan
+        spotify
+        ssb-patchwork
+        tigervnc
+        tlaplusToolbox
+        tlaps
+        uefitool
+        vlc
+        winePackages.full
+        wireshark
+        wsjtx
+        xclip
+        xidlehook
+        yubico-piv-tool
+        yubikey-manager-qt
+        yubikey-personalization
+        yubikey-personalization-gui
+      ]) ++ (with nixpkgs-nixos-unstable; [ gnucash thunderbird ])
+      ++ [ nixpkgs-nixos-stable-and-unfree.discord ]
+      ++ (with nixpkgs-nixos-unstable-and-unfree; [
+        hopper
+        jetbrains.rust-rover
+        jetbrains.clion
+      ]);
   };
 }
diff --git a/nixos/kde/system.nix b/nixos/kde/system.nix
index fca8e7b7..6d70bb6a 100644
--- a/nixos/kde/system.nix
+++ b/nixos/kde/system.nix
@@ -1,18 +1,14 @@
-{
-  config,
-  pkgs,
-  inputs,
-  system,
-  ...
-}: let
+{ config, pkgs, inputs, system, ... }:
+let
   master = inputs.nixpkgs-master;
   pkgs = master.legacyPackages."${system}";
 in {
-  disabledModules = [];
-  imports = [];
+  disabledModules = [ ];
+  imports = [ ];
 
   services.flatpak.enable = true;
 
+  services.desktopManager.plasma6.enable = true;
   services.xserver = {
     enable = true;
     displayManager.sddm = {
@@ -20,7 +16,6 @@ in {
       enableHidpi = true;
       wayland.enable = true;
     };
-    desktopManager.plasma6.enable = true;
   };
-  users.users.cyryl.packages = with pkgs; [];
+  users.users.cyryl.packages = with pkgs; [ ];
 }
diff --git a/nixos/zsh/home.nix b/nixos/zsh/home.nix
index 5e7a41ba..56686764 100644
--- a/nixos/zsh/home.nix
+++ b/nixos/zsh/home.nix
@@ -1,8 +1,4 @@
-{
-  config,
-  pkgs,
-  ...
-}: {
+{ config, pkgs, ... }: {
   programs.atuin.enableZshIntegration = true;
   programs.zsh = {
     enable = true;
@@ -14,12 +10,12 @@
       share = true;
     };
 
-    enableAutosuggestions = true;
+    autosuggestion.enable = true;
     enableCompletion = true;
 
     oh-my-zsh = {
       enable = true;
-      plugins = ["vi-mode" "git" "python" "history-substring-search" "tmux"];
+      plugins = [ "vi-mode" "git" "python" "history-substring-search" "tmux" ];
     };
 
     initExtra = ''
@@ -69,7 +65,7 @@
   programs.direnv = {
     enable = true;
     enableZshIntegration = true;
-    nix-direnv = {enable = true;};
+    nix-direnv = { enable = true; };
   };
 
   home.file.".config/starship.toml".text = ''