Pallas: fixes

home/hosts/Pallas.nix

@@ -1,8 +1,11 @@
-{ pkgs, lib, config, ... }:
+args@{ pkgs, lib, config, ... }:
 
+let
+  secret = import ../../secret/hosts/Pallas.nix;
+in
 {
   imports = [
-    #../config/fonts
+    ../config/fonts
 
     ../programs/fish.nix
     ../programs/nushell.nix
@@ -29,7 +32,7 @@
 
     ../programs/jq.nix
 
-    #(import ../programs/firefox.nix (args // { inherit secret; }))
+    (import ../programs/firefox.nix (args // { inherit secret; }))
 
     ../programs/scripts.nix
 

home/programs/fish.nix

@@ -84,8 +84,10 @@ in
 
         switch $os
             case Darwin
+                set -f nix_hostname (scutil --get LocalHostName)
                 set -f config_dir "$HOME/.config/nixpkgs"
             case Linux
+                set -f nix_hostname (hostname -s)
                 set -f config_dir /etc/nixos
             case '*'
                 echo "Unsupported OS"
@@ -100,7 +102,7 @@ in
         end
 
         if test "$other_hostname" = ""
-            just deploy-local-machine (hostname -s)
+            just deploy-local-machine "$nix_hostname"
         else
             just deploy-remote-machine "$other_hostname"
         end

home/programs/scripts/nixpkgs-switch

@@ -1,13 +1,14 @@
 #!/usr/bin/env fish
 
 set -f nix_os (uname)
-set -f nix_hostname (hostname -s)
 set -f other_hostname $argv[1]
 
 switch $nix_os
     case Darwin
+        set -f nix_hostname (scutil --get LocalHostName)
         set -f config_dir "$HOME/.config/nixpkgs"
     case Linux
+        set -f nix_hostname (hostname -s)
         set -f config_dir /etc/nixos
     case '*'
         echo "Unsupported OS"

system/darwin/fake-homebrew.nix

@@ -7,7 +7,7 @@
 
       current_user="$USER"
       sudo -H mkdir -p /opt/homebrew/bin
-      sudo -H chown $current_user:staff /opt/homebrew/bin
+      sudo -H chown "$current_user:staff" /opt/homebrew/bin
 
       sudo -H -u "$current_user" ln -sfn ${lib.getExe pkgs.python3} /opt/homebrew/bin/python3
     '';