diff --git a/home/apps/nautilus.nix b/home/apps/nautilus.nix
index 03dd2f8..ef1fcf6 100644
--- a/home/apps/nautilus.nix
+++ b/home/apps/nautilus.nix
@@ -1 +1 @@
-{pkgs, ...}: {home.packages = with pkgs; [gnome.nautilus];}
+{pkgs, ...}: {home.packages = with pkgs; [nautilus];}
diff --git a/home/gui/base/qt.nix b/home/gui/base/qt.nix
index 0b81cd0..1b6abaf 100644
--- a/home/gui/base/qt.nix
+++ b/home/gui/base/qt.nix
@@ -1,7 +1,7 @@
 {pkgs, ...}: {
   qt = {
     enable = true;
-    platformTheme = "gtk";
+    platformTheme.name = "gtk";
     style = {
       name = "adwaita-dark";
       package = pkgs.adwaita-qt;
diff --git a/home/gui/environments/gnome/default.nix b/home/gui/environments/gnome/default.nix
index 70daaf5..b43af93 100644
--- a/home/gui/environments/gnome/default.nix
+++ b/home/gui/environments/gnome/default.nix
@@ -29,7 +29,7 @@ in {
 
   home.packages = with pkgs; [
     dconf2nix
-    gnome.dconf-editor
+    dconf-editor
     xclip
   ];
 
diff --git a/home/gui/environments/sway/sway.nix b/home/gui/environments/sway/sway.nix
index 62b0971..9b95949 100644
--- a/home/gui/environments/sway/sway.nix
+++ b/home/gui/environments/sway/sway.nix
@@ -26,7 +26,7 @@ in {
   };
 
   home.pointerCursor = {
-    package = pkgs.gnome.adwaita-icon-theme;
+    package = gnome.adwaita-icon-theme;
     name = "Adwaita";
     size = 24;
 
diff --git a/profiles/fingerprint.nix b/profiles/fingerprint.nix
index d7f6a26..19f9a29 100644
--- a/profiles/fingerprint.nix
+++ b/profiles/fingerprint.nix
@@ -22,8 +22,8 @@ in {
         auth       required                    ${pkgs.fprintd}/lib/security/pam_fprintd.so
         auth       optional                    pam_permit.so
         auth       required                    pam_env.so
-        auth       [success=ok default=1]      ${pkgs.gnome.gdm}/lib/security/pam_gdm.so
-        auth       optional                    ${pkgs.gnome.gnome-keyring}/lib/security/pam_gnome_keyring.so
+        auth       [success=ok default=1]      ${pkgs.gdm}/lib/security/pam_gdm.so
+        auth       optional                    ${pkgs.gnome-keyring}/lib/security/pam_gnome_keyring.so
 
         account    include                     login
 
diff --git a/profiles/gaming/steam.nix b/profiles/gaming/steam.nix
index 9d5d6b6..a79792f 100644
--- a/profiles/gaming/steam.nix
+++ b/profiles/gaming/steam.nix
@@ -4,5 +4,5 @@
     remotePlay.openFirewall = true;
     dedicatedServer.openFirewall = true;
   };
-  hardware.opengl.driSupport32Bit = true;
+  hardware.graphics.enable32Bit = true;
 }
diff --git a/profiles/gui/environments/gnome/default.nix b/profiles/gui/environments/gnome/default.nix
index 1b7a354..16d5187 100644
--- a/profiles/gui/environments/gnome/default.nix
+++ b/profiles/gui/environments/gnome/default.nix
@@ -37,25 +37,25 @@ in {
     });
   '';
 
-  environment.gnome.excludePackages = [
-    pkgs.gnome.cheese
-    pkgs.gnome.gnome-music
-    pkgs.gnome.gnome-terminal
-    pkgs.gedit
-    pkgs.epiphany
-    pkgs.evince
-    pkgs.gnome.gnome-characters
-    pkgs.gnome.totem
-    pkgs.gnome.tali
-    pkgs.gnome.iagno
-    pkgs.gnome.hitori
-    pkgs.gnome.atomix
-    pkgs.gnome-tour
-    pkgs.gnome.geary
+  environment.gnome.excludePackages = with pkgs; [
+    cheese
+    gnome.gnome-music
+    gnome-terminal
+    gedit
+    epiphany
+    evince
+    gnome.gnome-characters
+    totem
+    gnome.tali
+    gnome.iagno
+    gnome.hitori
+    gnome.atomix
+    gnome-tour
+    gnome.geary
   ];
 
   environment.systemPackages = with pkgs; [
-    gnome.gnome-tweaks
+    gnome-tweaks
     gnomeExtensions.appindicator
     gnomeExtensions.just-perfection
 
diff --git a/profiles/usbAutoMount.nix b/profiles/usbAutoMount.nix
index 832f362..ebba47d 100644
--- a/profiles/usbAutoMount.nix
+++ b/profiles/usbAutoMount.nix
@@ -10,10 +10,10 @@
   '';
 
   encUSBUnmount = pkgs.writeShellScriptBin "enc_usb_unmount" ''
-      export MAPPER_NAME=''${MAPPER_NAME:-${encryptedUSB.mapperName}}
-      set -x
-      umount -flR ${encryptedUSB.mountpoint} || true
-      cryptsetup close $MAPPER_NAME || true
+    export MAPPER_NAME=''${MAPPER_NAME:-${encryptedUSB.mapperName}}
+    set -x
+    umount -flR ${encryptedUSB.mountpoint} || true
+    cryptsetup close $MAPPER_NAME || true
   '';
 in {
   environment.systemPackages = [encUSBMount encUSBUnmount];