diff --git a/default.nix b/default.nix
index ca462d5..7306079 100644
--- a/default.nix
+++ b/default.nix
@@ -1,7 +1,5 @@
 let
-  inherit (builtins) mapAttrs;
-  inherit (builtins) filter;
-  inherit (builtins) currentSystem;
+  inherit (builtins) currentSystem filter mapAttrs;
 
   # https://github.com/andir/npins?tab=readme-ov-file#using-the-nixpkgs-fetchers
   src = import ./npins;
@@ -14,7 +12,6 @@ let
 
   mkSystem = system: hostname:
     import (src.nixpkgs + "/nixos/lib/eval-config.nix") {
-      system = currentSystem;
       specialArgs = {
         inherit sources;
         self = ./.;
diff --git a/hosts/temperance/programs.nix b/hosts/temperance/programs.nix
index 7e8725d..4d1f8bd 100644
--- a/hosts/temperance/programs.nix
+++ b/hosts/temperance/programs.nix
@@ -9,7 +9,6 @@
       bubblewrap
       cachix
       calc
-      emacs
       calibre
       carapace
       comma
diff --git a/packages/nushell/config.nu b/packages/nushell/config.nu
index 738e2e3..65a7547 100644
--- a/packages/nushell/config.nu
+++ b/packages/nushell/config.nu
@@ -316,7 +316,7 @@ if not ($env_vars_file | path exists) {
 }
 
 def switch [] {
-  nh os switch --file ($env.NH_FLAKE | path join default.nix) (open /etc/hostname)
+  nh os switch --file ($env.NH_FLAKE | path join default.nix) (open /etc/hostname | str trim)
 }
 
 # fix sudo by prepending /run/wrappers/bin to the PATH.