nix/configurations.nix

@@ -28,10 +28,7 @@ let
       name: value:
       if class == "nixos" then
         nixosSystem {
-          specialArgs = {
+          specialArgs.hostName = name;
-            inherit (config.flake) self;
-            hostName = name;
-          };
           modules = [
             cfg.modules.nixos.default
             inputs.home-manager.nixosModules.home-manager
@@ -41,15 +38,11 @@ let
         }
       else if class == "darwin" then
         darwinSystem {
-          specialArgs = {
+          specialArgs = { inherit (config.flake) self; };
-            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,8 +4,7 @@
   enableTreesitter = true;
   bash.enable = true;
   clang.enable = true;
-  # broken on macos
+  csharp.enable = true;
-  # csharp.enable = true;
   css.enable = true;
   go.enable = true;
   html.enable = true;

nix/manifest.nix

@@ -7,18 +7,8 @@
       shell = "fish";
       pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILdsZyY3gu8IGB8MzMnLdh+ClDxQQ2RYG9rkeetIKq8n rafiq";
     };
-    hosts = {
+    hosts.darwin.venus.graphical = true;
-      darwin = {
+    hosts.nixos = {
-        venus = {
-          graphical = true;
-          machine.platform = "intel";
-        };
-        hephaestus = {
-          graphical = true;
-          machine.platform = "apple-silicon";
-        };
-      };
-      nixos = {
       nemesis = {
         graphical = true;
         machine = {
@@ -100,5 +90,4 @@
       };
     };
   };
-  };
 }

nix/modules/cli/shell.nix

@@ -5,8 +5,7 @@ let
   inherit (lib.attrsets) mapAttrs';
 in
 {
-  flake.modules = {
+  flake.modules.nixos.default =
-    nixos.default =
     { pkgs, ... }:
     {
       programs = mapAttrs' (name: value: {
@@ -15,21 +14,10 @@ in
       }) cfg.manifest.users;
       users.users = forAllUsers' (_: value: { shell = pkgs.${value.shell}; });
     };
-    darwin.default =
+  flake.modules.homeManager.default =
-      { pkgs, ... }:
-      {
-        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,13 +12,9 @@
       nixpkgs.hostPlatform = "${arch}-linux";
     };
 
-  flake.modules.darwin.default =
+  flake.modules.darwin.default.nixpkgs = {
-    { hostName, ... }:
+    hostPlatform = "x86_64-darwin";
-    let
+    # config.allowUnsupportedSystem = true;
-      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,12 +14,7 @@ in
       persistDirs = [ "/var/lib/tailscale" ];
       sops.secrets."tailscale/client-secret".sopsFile = secrets + "/tailscale.yaml";
     };
-  flake.modules.darwin.default =
+  flake.modules.darwin.default = {
-    { pkgs, ... }:
+    services.tailscale.enable = true;
-    {
-      services.tailscale = {
-        enable = true;
-        package = pkgs.tailscale.overrideAttrs { doCheck = false; };
-      };
   };
 }

nix/modules/system/users.nix

@@ -1,9 +1,7 @@
-{ config, lib, ... }:
+{ config, ... }:
 let
   cfg = config.flake;
   inherit (cfg.lib.modules) userListToAttrs forAllUsers';
-  inherit (lib.lists) findFirstIndex;
-  inherit (builtins) attrNames;
 in
 {
   flake.modules.nixos.default =
@@ -36,13 +34,7 @@ in
   flake.modules.darwin.default =
     { config, ... }:
     {
-      users.knownUsers = attrNames cfg.manifest.users;
+      users.users = forAllUsers' (name: _: { home = "/Users/${name}"; });
-      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;