diff --git a/hosts/toaster/default.nix b/hosts/toaster/default.nix
index 1e50822..2290e5e 100644
--- a/hosts/toaster/default.nix
+++ b/hosts/toaster/default.nix
@@ -51,6 +51,8 @@
     factorio
   ];
 
+  services.emacs.defaultEditor = false;
+
   # This value determines the NixOS release from which the default
   # settings for stateful data, like file locations and database versions
   # on your system were taken. It‘s perfectly fine and recommended to leave
diff --git a/modules/basic-tools/default.nix b/modules/basic-tools/default.nix
index 906107c..19b319c 100644
--- a/modules/basic-tools/default.nix
+++ b/modules/basic-tools/default.nix
@@ -11,7 +11,6 @@
     bat
     fd
     file
-    git
     gnupg
     glow
     htop
@@ -38,7 +37,7 @@
     sshfs
     whois
     mtr
-  ];
+  ] ++ (if config.networking.hostName == "toaster" then [ gitFull ] else [ git ]);
 
   environment.variables =
     let