default.nix

@@ -1,5 +1,7 @@
 let
-  inherit (builtins) currentSystem filter mapAttrs;
+  inherit (builtins) mapAttrs;
+  inherit (builtins) filter;
+  inherit (builtins) currentSystem;
 
   # https://github.com/andir/npins?tab=readme-ov-file#using-the-nixpkgs-fetchers
   src = import ./npins;
@@ -12,6 +14,7 @@ let
 
   mkSystem = system: hostname:
     import (src.nixpkgs + "/nixos/lib/eval-config.nix") {
+      system = currentSystem;
       specialArgs = {
         inherit sources;
         self = ./.;

hosts/temperance/programs.nix

@@ -9,6 +9,7 @@
       bubblewrap
       cachix
       calc
+      emacs
       calibre
       carapace
       comma

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 | str trim)
+  nh os switch --file ($env.NH_FLAKE | path join default.nix) (open /etc/hostname)
 }
 
 # fix sudo by prepending /run/wrappers/bin to the PATH.