re-add gui programs

nixos/boxes/foryog/default.nix

@@ -6,6 +6,7 @@
     ../../backups.nix
     ../../boot.nix
     ../../git
+    ../../gui
     ../../kde
     ../../vim
     ../../zsh

nixos/gui/default.nix

@@ -1,13 +1,5 @@
-{
+{ config, pkgs, discord, inputs, nixpkgs-nixos-unstable
-  config,
+, nixpkgs-nixos-stable-and-unfree, nixpkgs-nixos-unstable-and-unfree, ... }: {
-  pkgs,
-  discord,
-  inputs,
-  nixpkgs-nixos-unstable,
-  nixpkgs-nixos-stable-and-unfree,
-  nixpkgs-nixos-unstable-and-unfree,
-  ...
-}: {
   security.chromiumSuidSandbox.enable = true;
 
   home-manager.users.cyryl = { ... }: {
@@ -18,19 +10,13 @@
         package = pkgs.gnome3.adwaita-icon-theme;
       };
     };
-    qt = {
+    qt = { enable = true; };
-      enable = true;
-      platformTheme = "gnome";
-      style.name = "adwaita-dark";
-      style.package = pkgs.adwaita-qt;
-    };
 
     imports = [ ];
 
     programs.chromium.enable = true;
     programs.firefox.enable = true;
-    home.packages =
+    home.packages = (with pkgs;
-      (with pkgs;
       with pkgs.gnome3;
       with pkgs.python39Packages; [
         anarchism
@@ -85,9 +71,12 @@
         yubikey-manager-qt
         yubikey-personalization
         yubikey-personalization-gui
-        ])
+      ]) ++ (with nixpkgs-nixos-unstable; [ gnucash thunderbird ])
-      ++ (with nixpkgs-nixos-unstable; [gnucash thunderbird])
       ++ [ nixpkgs-nixos-stable-and-unfree.discord ]
-      ++ (with nixpkgs-nixos-unstable-and-unfree; [hopper jetbrains.rust-rover jetbrains.clion]);
+      ++ (with nixpkgs-nixos-unstable-and-unfree; [
+        hopper
+        jetbrains.rust-rover
+        jetbrains.clion
+      ]);
   };
 }

nixos/kde/system.nix

@@ -1,10 +1,5 @@
-{
+{ config, pkgs, inputs, system, ... }:
-  config,
+let
-  pkgs,
-  inputs,
-  system,
-  ...
-}: let
   master = inputs.nixpkgs-master;
   pkgs = master.legacyPackages."${system}";
 in {
@@ -13,6 +8,7 @@ in {
 
   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; [ ];
 }

nixos/zsh/home.nix

@@ -1,8 +1,4 @@
-{
+{ config, pkgs, ... }: {
-  config,
-  pkgs,
-  ...
-}: {
   programs.atuin.enableZshIntegration = true;
   programs.zsh = {
     enable = true;
@@ -14,7 +10,7 @@
       share = true;
     };
 
-    enableAutosuggestions = true;
+    autosuggestion.enable = true;
     enableCompletion = true;
 
     oh-my-zsh = {