diff --git a/modules/core/stylix.nix b/modules/core/stylix.nix
index 48e231a..45af481 100644
--- a/modules/core/stylix.nix
+++ b/modules/core/stylix.nix
@@ -7,9 +7,6 @@
   stylix = {
     enable = true;
     base16Scheme = "${pkgs.base16-schemes}/share/themes/catppuccin-mocha.yaml";
-    targets = {
-      console.enable = false;
-      grub.enable = false;
-    };
+    targets.console.enable = false;
   };
 }
diff --git a/modules/home/gpg.nix b/modules/home/gpg.nix
index 5c75d91..57d5cd1 100644
--- a/modules/home/gpg.nix
+++ b/modules/home/gpg.nix
@@ -1,10 +1,5 @@
 {pkgs, ...}: {
-  programs.gpg = {
-    enable = true;
-    settings = {
-      keyserver = "hkps://keys.openpgp.org";
-    };
-  };
+  programs.gpg.enable = true;
   services.gpg-agent = {
     enable = true;
     enableSshSupport = true;
diff --git a/modules/home/retroarch.nix b/modules/home/retroarch.nix
index 4bee7d2..09c2409 100644
--- a/modules/home/retroarch.nix
+++ b/modules/home/retroarch.nix
@@ -1,11 +1,12 @@
 {pkgs, ...}: {
   home.packages = with pkgs; [
-    (retroarch.withCores (cores:
-      with cores; [
+    (retroarch.override {
+      cores = with libretro; [
         fceumm
         gambatte
         mgba
         snes9x
-      ]))
+      ];
+    })
   ];
 }