diff --git a/hosts/adrastea/configuration.nix b/hosts/adrastea/configuration.nix
index c384fa4..13483a2 100755
--- a/hosts/adrastea/configuration.nix
+++ b/hosts/adrastea/configuration.nix
@@ -86,7 +86,8 @@
   #   };
   # };
 
-  boot.initrd.luks.devices."luks-52d1be6d-b32f-41e0-a6d7-2ff52599fe7c".device = "/dev/disk/by-uuid/52d1be6d-b32f-41e0-a6d7-2ff52599fe7c";
+  boot.initrd.luks.devices."luks-52d1be6d-b32f-41e0-a6d7-2ff52599fe7c".device =
+    "/dev/disk/by-uuid/52d1be6d-b32f-41e0-a6d7-2ff52599fe7c";
 
   services.tlp.enable = true;
 
@@ -206,13 +207,6 @@
     curl
   ];
 
-  environment.variables = {
-    EDITOR = "nvim";
-  };
-
-  # tells electron apps to use Wayland
-  environment.sessionVariables.NIXOS_OZONE_WL = "1";
-
   # Some programs need SUID wrappers, can be configured further or are
   # started in user sessions.
   # programs.mtr.enable = true;
diff --git a/hosts/callisto/configuration.nix b/hosts/callisto/configuration.nix
index 4e592ad..387a949 100755
--- a/hosts/callisto/configuration.nix
+++ b/hosts/callisto/configuration.nix
@@ -140,9 +140,6 @@
     curl
   ];
 
-  environment.variables = {
-    EDITOR = "nvim";
-  };
   services.keyd = {
     enable = true;
     keyboards = {
@@ -177,9 +174,6 @@
 
   services.blueman.enable = true;
 
-  # tells electron apps to use Wayland
-  environment.sessionVariables.NIXOS_OZONE_WL = "1";
-
   # Some programs need SUID wrappers, can be configured further or are
   # started in user sessions.
   # programs.mtr.enable = true;
diff --git a/hosts/cassini/configuration.nix b/hosts/cassini/configuration.nix
index 5fc69a0..b76877d 100755
--- a/hosts/cassini/configuration.nix
+++ b/hosts/cassini/configuration.nix
@@ -58,13 +58,6 @@
     curl
   ];
 
-  environment.variables = {
-    EDITOR = "nvim";
-  };
-
-  # tells electron apps to use Wayland
-  environment.sessionVariables.NIXOS_OZONE_WL = "1";
-
   # Some programs need SUID wrappers, can be configured further or are
   # started in user sessions.
   # programs.mtr.enable = true;
diff --git a/hosts/demeter/configuration.nix b/hosts/demeter/configuration.nix
index 00f781f..ec0419f 100755
--- a/hosts/demeter/configuration.nix
+++ b/hosts/demeter/configuration.nix
@@ -53,7 +53,8 @@
     pkiBundle = "/etc/secureboot";
   };
 
-  boot.initrd.luks.devices."luks-af320a0f-b388-43f5-b5a3-af2b47cfc716".device = "/dev/disk/by-uuid/af320a0f-b388-43f5-b5a3-af2b47cfc716";
+  boot.initrd.luks.devices."luks-af320a0f-b388-43f5-b5a3-af2b47cfc716".device =
+    "/dev/disk/by-uuid/af320a0f-b388-43f5-b5a3-af2b47cfc716";
 
   networking.hostName = "demeter"; # Define your hostname.
   # networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.
@@ -166,13 +167,6 @@
     curl
   ];
 
-  environment.variables = {
-    EDITOR = "nvim";
-  };
-
-  # tells electron apps to use Wayland
-  environment.sessionVariables.NIXOS_OZONE_WL = "1";
-
   # Some programs need SUID wrappers, can be configured further or are
   # started in user sessions.
   # programs.mtr.enable = true;
diff --git a/modules/linux/core/default.nix b/modules/linux/core/default.nix
index 357d24f..f5377be 100644
--- a/modules/linux/core/default.nix
+++ b/modules/linux/core/default.nix
@@ -9,6 +9,15 @@
     inputs.viminal.packages.${pkgs.system}.default
   ];
 
+  environment.variables = {
+    EDITOR = "nvim";
+  };
+
+  # tells electron apps to use Wayland
+  environment.sessionVariables = {
+    NIXOS_OZONE_WL = "1";
+  };
+
   security.sudo.enable = false;
 
   security.doas = {