diff --git a/configuration.kuro.nix b/configuration.kuro.nix
index ab7ca68e..b0e0d03a 100644
--- a/configuration.kuro.nix
+++ b/configuration.kuro.nix
@@ -41,7 +41,7 @@
   networking.hostName = "kuro";
   networking.networkmanager.enable = true;
 
-  services.xserver.videoDrivers = [ "nvidiaBeta" ];
+  services.xserver.videoDrivers = [ "nvidia" ];
 
   # For ergodox ez
   environment = {
diff --git a/default.nix b/default.nix
index 0209e9e3..159ba66c 100644
--- a/default.nix
+++ b/default.nix
@@ -44,7 +44,7 @@
     ];
     # These are the defaults, but some applications are buggy when these lack
     # explicit values.
-    sessionVariables = {
+    variables = {
       XDG_CONFIG_HOME = "$HOME/.config";
       XDG_CACHE_HOME = "$HOME/.cache";
       XDG_DATA_HOME = "$HOME/.local/share";
diff --git a/modules/shell/gnupg.nix b/modules/shell/gnupg.nix
index 43083d55..f9fafe49 100644
--- a/modules/shell/gnupg.nix
+++ b/modules/shell/gnupg.nix
@@ -4,9 +4,7 @@
   environment = {
     extraInit = ''
       export GNUPGHOME="$XDG_CONFIG_HOME/gnupg"
-      if [ ! -d "$GNUPGHOME" ]; then
-         mkdir -p "$GNUPGHOME" -m 700
-      fi
+      mkdir -p "$GNUPGHOME" -m 700
     '';
 
     systemPackages = with pkgs; [