diff --git a/modules/audio.nix b/modules/audio.nix
index 5057f90..9ae8e6e 100644
--- a/modules/audio.nix
+++ b/modules/audio.nix
@@ -20,12 +20,12 @@ in {
   # Set up Mopidy
   services.mopidy = {
     enable = true;
-    extensionPackages = [
-      pkgs.mopidy-mpd
-      pkgs.mopidy-soundcloud
-      pkgs.mopidy-youtube
-      pkgs.mopidy-somafm
-      pkgs.mopidy-local
+    extensionPackages = with pkgs; [
+      mopidy-mpd
+      mopidy-soundcloud
+      mopidy-youtube
+      mopidy-somafm
+      mopidy-local
     ];
     configuration = ''
       [audio]
diff --git a/modules/gui.nix b/modules/gui.nix
index 54325a8..8326b8a 100644
--- a/modules/gui.nix
+++ b/modules/gui.nix
@@ -13,7 +13,7 @@ in {
     };
     lightdm = {
       enable = true;
-      greeter.package = pkgs.lightdm_gtk_greeter;
+      greeter.enable = false;
     };
   };
 
diff --git a/modules/software.nix b/modules/software.nix
index c1733f6..42ccfdf 100644
--- a/modules/software.nix
+++ b/modules/software.nix
@@ -12,7 +12,7 @@
     gitAndTools.pass-git-helper
     pinentry-gtk2
     # Browsers
-    firefox-wayland
+    firefox
     ungoogled-chromium
     # LaTeX
     texlive.combined.scheme-full