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,95 +7,84 @@
       shell = "fish";
       pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILdsZyY3gu8IGB8MzMnLdh+ClDxQQ2RYG9rkeetIKq8n rafiq";
     };
-    hosts = {
+    hosts.darwin.venus.graphical = true;
-      darwin = {
+    hosts.nixos = {
-        venus = {
+      nemesis = {
-          graphical = true;
+        graphical = true;
-          machine.platform = "intel";
+        machine = {
+          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";
+          };
         };
-        hephaestus = {
+        extraCfg = {
-          graphical = true;
+          services.fwupd.enable = true; # FIXME: remove
-          machine.platform = "apple-silicon";
+          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;
+          };
         };
       };
-      nixos = {
+      apollo = {
-        nemesis = {
+        graphical = false;
-          graphical = true;
+        machine = {
-          machine = {
+          platform = "intel";
-            platform = "amd";
+          root.drive = "/dev/disk/by-id/nvme-eui.002538d221b47b01";
-            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 = {
-            services.fwupd.enable = true; # FIXME: remove
-            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 = {
+        extraCfg.server = {
-          graphical = false;
+          ddns = {
-          machine = {
+            enable = true;
-            platform = "intel";
+            domains = [
-            root.drive = "/dev/disk/by-id/nvme-eui.002538d221b47b01";
+              "aenyrathia.wiki"
+              "slayment.com"
+            ];
           };
-          extraCfg.server = {
+          web-servers = {
-            ddns = {
+            enableSSL = true;
+            nginx = {
               enable = true;
-              domains = [
+              proxies = [
-                "aenyrathia.wiki"
+                {
-                "slayment.com"
+                  source = "aenyrathia.wiki";
+                  target = "http://helios:5896";
+                }
+                {
+                  source = "il.bwfiq.com";
+                  target = "http://helios:2283";
+                }
               ];
             };
-            web-servers = {
+          };
-              enableSSL = true;
+          databases = {
-              nginx = {
+            mongodb.enable = true;
-                enable = true;
+            mysql.enable = true;
-                proxies = [
+            postgresql.enable = true;
-                  {
+          };
-                    source = "aenyrathia.wiki";
+          web-apps = {
-                    target = "http://helios:5896";
+            librechat = {
-                  }
+              enable = true;
-                  {
+              domain = "chat.bwfiq.com";
-                    source = "il.bwfiq.com";
-                    target = "http://helios:2283";
-                  }
-                ];
-              };
             };
-            databases = {
+            forgejo = {
-              mongodb.enable = true;
+              enable = true;
-              mysql.enable = true;
+              domain = "git.rrv.sh";
-              postgresql.enable = true;
+              openFirewall = 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,31 +5,19 @@ let
   inherit (lib.attrsets) mapAttrs';
 in
 {
-  flake.modules = {
+  flake.modules.nixos.default =
-    nixos.default =
+    { pkgs, ... }:
-      { pkgs, ... }:
+    {
-      {
+      programs = mapAttrs' (name: value: {
-        programs = mapAttrs' (name: value: {
+        name = value.shell;
-          name = value.shell;
+        value.enable = true;
-          value.enable = true;
+      }) cfg.manifest.users;
-        }) cfg.manifest.users;
+      users.users = forAllUsers' (_: value: { shell = pkgs.${value.shell}; });
-        users.users = forAllUsers' (_: value: { shell = pkgs.${value.shell}; });
+    };
-      };
+  flake.modules.homeManager.default =
-    darwin.default =
+    { config, ... }:
-      { pkgs, ... }:
+    {
-      {
+      programs.${cfg.manifest.users.${config.home.username}.shell}.enable = true;
-        programs = mapAttrs' (name: value: {
+      home.shell.enableShellIntegration = true;
-          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;