diff --git a/hosts/muon/configuration.nix b/hosts/muon/configuration.nix
index 107d5c3..bda7f8f 100644
--- a/hosts/muon/configuration.nix
+++ b/hosts/muon/configuration.nix
@@ -67,6 +67,11 @@ in {
   services.picom.enable = true;
   services.picom.opacityRules = ["50:name *= '^Cheat$'"];
 
+  # Turn off screen-saver
+  environment.extraInit = ''
+    xset s off -dpms
+  '';
+
   # Proprietary </3
   mods.unfree.steam.enable = true;
   mods.unfree.nvidia.enable = true;
diff --git a/modules/home/terminal/development.nix b/modules/home/terminal/development.nix
index 348bfa0..c110ceb 100644
--- a/modules/home/terminal/development.nix
+++ b/modules/home/terminal/development.nix
@@ -85,7 +85,7 @@ in {
                     {
                       pane = {
                         command = "zsh";
-                        args = ["-c" "nvim"];
+                        args = ["-c" "direnv exec . nvim"];
                       };
                     }
                   ];
@@ -98,9 +98,7 @@ in {
                   };
                   _children = [
                     {
-                      pane = {
-                        command = "zsh";
-                      };
+                      pane = {};
                     }
                   ];
                 };