diff --git a/hosts/marauder/default.nix b/hosts/marauder/default.nix
index 04dfc81..347d566 100755
--- a/hosts/marauder/default.nix
+++ b/hosts/marauder/default.nix
@@ -62,43 +62,49 @@ in
     };
   };
 
-  environment.systemPackages = [
-    ffcheck
-    inputs.shelvacu.packages.x86_64-linux.sm64coopdx
-  ] ++ (with pkgs; [
-    # Chat clients
-    discord
-    slack
-    element-desktop
-    telegram-desktop
+  environment = {
+    variables = {
+      EDITOR = "nano";
+      VISUAL = "code --wait";
+    };
+    systemPackages = [
+      ffcheck
+      inputs.shelvacu.packages.x86_64-linux.sm64coopdx
+    ] ++ (with pkgs; [
+      # Chat clients
+      discord
+      slack
+      element-desktop
+      telegram-desktop
 
-    # Browsers
-    firefox
-    filezilla
+      # Browsers
+      firefox
+      filezilla
 
-    # Coding
-    vscode
-    kotlin
-    rustup
-    pyenv
-    gcc
-    nixd
-    nixpkgs-fmt
+      # Coding
+      vscode
+      kotlin
+      rustup
+      pyenv
+      gcc
+      nixd
+      nixpkgs-fmt
 
-    # Art and 3D
-    inkscape
-    gimp
-    krita
-    openscad-unstable
-    bambu-studio
+      # Art and 3D
+      inkscape
+      gimp
+      krita
+      openscad-unstable
+      bambu-studio
 
-    # Multimedia
-    vlc
-    ffmpeg
+      # Multimedia
+      vlc
+      ffmpeg
 
-    # Productivity
-    obsidian
-  ]);
+      # Productivity
+      obsidian
+    ]);
+  };
 
   programs.steam = {
     enable = true;