diff --git a/hosts/hyacinth/kernel.nix b/hosts/hyacinth/kernel.nix
index 3e2d8d1..f410014 100644
--- a/hosts/hyacinth/kernel.nix
+++ b/hosts/hyacinth/kernel.nix
@@ -13,4 +13,8 @@
     ];
     kernelPackages = lib.mkForce (pkgs.linuxPackagesFor pkgs.me.linux-lava);
   };
+  hardware.amdgpu.overdrive = {
+    enable = true;
+    ppfeaturemask = "0xffffffff";
+  };
 }
diff --git a/modules/system/corectrl.nix b/modules/system/corectrl.nix
index c2ec98d..6f6ca01 100644
--- a/modules/system/corectrl.nix
+++ b/modules/system/corectrl.nix
@@ -1,9 +1,5 @@
 { ... }: {
   programs.corectrl = {
     enable = true;
-    gpuOverclock = {
-      enable = true;
-      ppfeaturemask = "0xffffffff";
-    };
   };
 }
diff --git a/modules/system/gui.nix b/modules/system/gui.nix
index e9443ab..7028dac 100644
--- a/modules/system/gui.nix
+++ b/modules/system/gui.nix
@@ -15,7 +15,6 @@
       hanazono
       noto-fonts
       noto-fonts-cjk-sans
-      noto-fonts-extra
       open-sans
       twemoji-color-font
       unifont
diff --git a/modules/system/packages-gui.nix b/modules/system/packages-gui.nix
index 9e6e946..78e778b 100644
--- a/modules/system/packages-gui.nix
+++ b/modules/system/packages-gui.nix
@@ -6,8 +6,8 @@
     ];
     programs.adb.enable = true;
     hardware.graphics.extraPackages = with pkgs; [
-      vaapiIntel
-      vaapiVdpau
+      intel-vaapi-driver
+      libva-vdpau-driver
       libvdpau-va-gl
     ];
     programs.light.enable = true;
diff --git a/modules/user/direnv.nix b/modules/user/direnv.nix
index 3f54b94..2329800 100644
--- a/modules/user/direnv.nix
+++ b/modules/user/direnv.nix
@@ -5,7 +5,7 @@
       enable = true;
     };
   };
-  programs.git.extraConfig.core.excludesFile = ".envrc";
+  programs.git.settings.core.excludesFile = ".envrc";
   # We can't use .source since hm manages this file too
   xdg.configFile."direnv/direnvrc".text = builtins.readFile ../../res/direnvrc;
   home.activation = {
diff --git a/modules/user/git.nix b/modules/user/git.nix
index 16a2cdd..adadf7e 100644
--- a/modules/user/git.nix
+++ b/modules/user/git.nix
@@ -1,13 +1,13 @@
 { ... }: {
   programs.git = {
     enable = true;
-    userName = "Cilly Leang";
-    userEmail = "me@lava.moe";
     signing = {
       key = "059F098EBF0E9A13E10A46BF6500251E087653C9";
       signByDefault = true;
     };
-    extraConfig = {
+    settings = {
+      user.name = "Cilly Leang";
+      user.email = "me@lava.moe";
       core.abbrev = 11;
       safe.directory = "/home/rin/Projects/flakes";
     };
diff --git a/modules/user/gpg.nix b/modules/user/gpg.nix
index 768c5d9..dba731f 100644
--- a/modules/user/gpg.nix
+++ b/modules/user/gpg.nix
@@ -5,6 +5,6 @@
   };
   services.gpg-agent = {
     enable = true;
-    pinentryPackage = pkgs.pinentry-gnome3;
+    pinentry.package = pkgs.pinentry-gnome3;
   };
 }
diff --git a/modules/user/zsh.nix b/modules/user/zsh.nix
index 54533b9..3fefce6 100644
--- a/modules/user/zsh.nix
+++ b/modules/user/zsh.nix
@@ -104,7 +104,7 @@ in {
   programs.command-not-found.enable = true;
   programs.zsh = {
     enable = true;
-    dotDir = ".config/zsh";
+    dotDir = "${config.xdg.configHome}/zsh";
 
     autocd = true;
     defaultKeymap = "viins";
diff --git a/users/rin/packages.nix b/users/rin/packages.nix
index 2299028..6e4d84a 100644
--- a/users/rin/packages.nix
+++ b/users/rin/packages.nix
@@ -57,7 +57,7 @@ in {
     swaybg
     (tetrio-desktop.override { withTetrioPlus = true; })
     texliveFull
-    tor-browser-bundle-bin
+    tor-browser
     transmission-remote-gtk
     vesktop
     virt-manager