fix(darwin): set user shell

WARN: This commit message assumes the reason for disabling is darwin.

nix/configurations.nix

@@ -28,7 +28,10 @@ let
       name: value:
       if class == "nixos" then
         nixosSystem {
-          specialArgs.hostName = name;
+          specialArgs = {
+            inherit (config.flake) self;
+            hostName = name;
+          };
           modules = [
             cfg.modules.nixos.default
             inputs.home-manager.nixosModules.home-manager
@@ -38,11 +41,15 @@ let
         }
       else if class == "darwin" then
         darwinSystem {
-          specialArgs = { inherit (config.flake) self; };
+          specialArgs = {
+            inherit (config.flake) self;
+            hostName = name;
+          };
           modules = [
             cfg.modules.darwin.default
             inputs.home-manager.darwinModules.home-manager
             { home-manager = globalCfg name value; }
+            (value.extraCfg or { })
           ] ++ optional value.graphical cfg.modules.darwin.graphical;
         }
       else

nix/homes/rafiq/_nvf/languages.nix

@@ -4,7 +4,8 @@
   enableTreesitter = true;
   bash.enable = true;
   clang.enable = true;
-  csharp.enable = true;
+  # broken on macos
+  # csharp.enable = true;
   css.enable = true;
   go.enable = true;
   html.enable = true;

nix/manifest.nix

@@ -7,84 +7,95 @@
       shell = "fish";
       pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILdsZyY3gu8IGB8MzMnLdh+ClDxQQ2RYG9rkeetIKq8n rafiq";
     };
-    hosts.darwin.venus.graphical = true;
+    hosts = {
-    hosts.nixos = {
+      darwin = {
-      nemesis = {
+        venus = {
-        graphical = true;
+          graphical = true;
-        machine = {
+          machine.platform = "intel";
-          platform = "amd";
-          gpu = "nvidia";
-          root.drive = "/dev/disk/by-id/nvme-CT2000P3SSD8_2325E6E77434";
-          monitors.main = {
-            id = "desc:OOO AN-270W04K";
-            resolution = "3840x2160";
-            refresh-rate = "60";
-            scale = "2";
-          };
         };
-        extraCfg = {
+        hephaestus = {
-          services.fwupd.enable = true; # FIXME: remove
+          graphical = true;
-          machine = {
+          machine.platform = "apple-silicon";
-            bluetooth.enable = true;
-            usb.automount = true;
-            virtualisation = {
-              podman.enable = true;
-              podman.distrobox.enable = true;
-            };
-          };
-          server.web-apps = {
-            comfy-ui.enable = true;
-            sd-webui-forge.enable = true;
-          };
         };
       };
-      apollo = {
+      nixos = {
-        graphical = false;
+        nemesis = {
-        machine = {
+          graphical = true;
-          platform = "intel";
+          machine = {
-          root.drive = "/dev/disk/by-id/nvme-eui.002538d221b47b01";
+            platform = "amd";
-        };
+            gpu = "nvidia";
-        extraCfg.server = {
+            root.drive = "/dev/disk/by-id/nvme-CT2000P3SSD8_2325E6E77434";
-          ddns = {
+            monitors.main = {
-            enable = true;
+              id = "desc:OOO AN-270W04K";
-            domains = [
+              resolution = "3840x2160";
-              "aenyrathia.wiki"
+              refresh-rate = "60";
-              "slayment.com"
+              scale = "2";
-            ];
+            };
           };
-          web-servers = {
+          extraCfg = {
-            enableSSL = true;
+            services.fwupd.enable = true; # FIXME: remove
-            nginx = {
+            machine = {
+              bluetooth.enable = true;
+              usb.automount = true;
+              virtualisation = {
+                podman.enable = true;
+                podman.distrobox.enable = true;
+              };
+            };
+            server.web-apps = {
+              comfy-ui.enable = true;
+              sd-webui-forge.enable = true;
+            };
+          };
+        };
+        apollo = {
+          graphical = false;
+          machine = {
+            platform = "intel";
+            root.drive = "/dev/disk/by-id/nvme-eui.002538d221b47b01";
+          };
+          extraCfg.server = {
+            ddns = {
               enable = true;
-              proxies = [
+              domains = [
-                {
+                "aenyrathia.wiki"
-                  source = "aenyrathia.wiki";
+                "slayment.com"
-                  target = "http://helios:5896";
-                }
-                {
-                  source = "il.bwfiq.com";
-                  target = "http://helios:2283";
-                }
               ];
             };
-          };
+            web-servers = {
-          databases = {
+              enableSSL = true;
-            mongodb.enable = true;
+              nginx = {
-            mysql.enable = true;
+                enable = true;
-            postgresql.enable = true;
+                proxies = [
-          };
+                  {
-          web-apps = {
+                    source = "aenyrathia.wiki";
-            librechat = {
+                    target = "http://helios:5896";
-              enable = true;
+                  }
-              domain = "chat.bwfiq.com";
+                  {
+                    source = "il.bwfiq.com";
+                    target = "http://helios:2283";
+                  }
+                ];
+              };
             };
-            forgejo = {
+            databases = {
-              enable = true;
+              mongodb.enable = true;
-              domain = "git.rrv.sh";
+              mysql.enable = true;
-              openFirewall = true;
+              postgresql.enable = true;
+            };
+            web-apps = {
+              librechat = {
+                enable = true;
+                domain = "chat.bwfiq.com";
+              };
+              forgejo = {
+                enable = true;
+                domain = "git.rrv.sh";
+                openFirewall = true;
+              };
+              rrv-sh.enable = true;
+              rrv-sh.domain = "rrv.sh";
             };
-            rrv-sh.enable = true;
-            rrv-sh.domain = "rrv.sh";
           };
         };
       };

nix/modules/cli/shell.nix

@@ -5,19 +5,31 @@ let
   inherit (lib.attrsets) mapAttrs';
 in
 {
-  flake.modules.nixos.default =
+  flake.modules = {
-    { pkgs, ... }:
+    nixos.default =
-    {
+      { pkgs, ... }:
-      programs = mapAttrs' (name: value: {
+      {
-        name = value.shell;
+        programs = mapAttrs' (name: value: {
-        value.enable = true;
+          name = value.shell;
-      }) cfg.manifest.users;
+          value.enable = true;
-      users.users = forAllUsers' (_: value: { shell = pkgs.${value.shell}; });
+        }) cfg.manifest.users;
-    };
+        users.users = forAllUsers' (_: value: { shell = pkgs.${value.shell}; });
-  flake.modules.homeManager.default =
+      };
-    { config, ... }:
+    darwin.default =
-    {
+      { pkgs, ... }:
-      programs.${cfg.manifest.users.${config.home.username}.shell}.enable = true;
+      {
-      home.shell.enableShellIntegration = true;
+        programs = mapAttrs' (name: value: {
-    };
+          name = value.shell;
+          value.enable = true;
+        }) cfg.manifest.users;
+        users.users = forAllUsers' (_: value: { shell = pkgs.${value.shell}; });
+        environment.shells = [ pkgs.fish ];
+      };
+    homeManager.default =
+      { config, ... }:
+      {
+        programs.${cfg.manifest.users.${config.home.username}.shell}.enable = true;
+        home.shell.enableShellIntegration = true;
+      };
+  };
 }

nix/modules/machine/platform.nix

@@ -12,9 +12,13 @@
       nixpkgs.hostPlatform = "${arch}-linux";
     };
 
-  flake.modules.darwin.default.nixpkgs = {
+  flake.modules.darwin.default =
-    hostPlatform = "x86_64-darwin";
+    { hostName, ... }:
-    # config.allowUnsupportedSystem = true;
+    let
-  };
+      inherit (config.flake.manifest.hosts.darwin.${hostName}.machine) platform;
-
+      arch = if platform == "intel" then "x86_64" else "aarch64";
+    in
+    {
+      nixpkgs.hostPlatform = "${arch}-darwin";
+    };
 }

nix/modules/networking/tailscale.nix

@@ -14,7 +14,12 @@ in
       persistDirs = [ "/var/lib/tailscale" ];
       sops.secrets."tailscale/client-secret".sopsFile = secrets + "/tailscale.yaml";
     };
-  flake.modules.darwin.default = {
+  flake.modules.darwin.default =
-    services.tailscale.enable = true;
+    { pkgs, ... }:
-  };
+    {
+      services.tailscale = {
+        enable = true;
+        package = pkgs.tailscale.overrideAttrs { doCheck = false; };
+      };
+    };
 }

nix/modules/system/users.nix

@@ -1,7 +1,9 @@
-{ config, ... }:
+{ config, lib, ... }:
 let
   cfg = config.flake;
   inherit (cfg.lib.modules) userListToAttrs forAllUsers';
+  inherit (lib.lists) findFirstIndex;
+  inherit (builtins) attrNames;
 in
 {
   flake.modules.nixos.default =
@@ -34,7 +36,13 @@ in
   flake.modules.darwin.default =
     { config, ... }:
     {
-      users.users = forAllUsers' (name: _: { home = "/Users/${name}"; });
+      users.knownUsers = attrNames cfg.manifest.users;
+      users.users = forAllUsers' (
+        name: _: {
+          home = "/Users/${name}";
+          uid = 501 + (findFirstIndex (x: x == name) null (attrNames cfg.manifest.users));
+        }
+      );
       home-manager.users = forAllUsers' (
         name: _: {
           home.username = name;