Add support for macOS

flake.nix

@@ -2,13 +2,16 @@
   description = "soxin: opiniated configs for everyone";
 
   inputs = {
+    darwin.url = "github:lnl7/nix-darwin/master";
     deploy-rs.url = "github:serokell/deploy-rs";
     flake-utils-plus.url = "github:gytis-ivaskevicius/flake-utils-plus/v1.1.0";
     nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
     nixpkgs.url = "github:NixOS/nixpkgs";
     nur.url = "github:nix-community/NUR";
     sops-nix.url = "github:Mic92/sops-nix";
 
+    darwin.inputs.nixpkgs.follows = "nixpkgs";
+
     home-manager = {
       url = "github:nix-community/home-manager";
       inputs.nixpkgs.follows = "nixpkgs";

lib/system-flake.nix

@@ -1,4 +1,5 @@
-{ deploy-rs
+{ darwin
+, deploy-rs
 , home-manager
 , flake-utils-plus
 , nixpkgs
@@ -34,6 +35,9 @@
   # NixOS specific modules.
 , extraNixosModules ? [ ]
 
+  # nix-darwin specific modules.
+, extraNixDarwinModules ? [ ]
+
   # The global extra arguments are included in both NixOS and home-manager.
 , globalSpecialArgs ? { }
 
@@ -43,6 +47,9 @@
   # NixOS specific extra arguments.
 , nixosSpecialArgs ? { }
 
+  # nix-darwin specific extra arguments.
+, nixDarwinSpecialArgs ? { }
+
   # Evaluates to `packages.<system>.<pname> = <unstable-channel-reference>.<pname>`.
 , packagesBuilder ? (_: { })
 
@@ -59,8 +66,18 @@ let
   soxincfg = inputs.self;
 
   inherit (nixpkgs) lib;
-  inherit (lib) asserts filterAttrs mapAttrs optionalAttrs optionals recursiveUpdate singleton;
   inherit (builtins) removeAttrs;
+  inherit (lib)
+    asserts
+    filterAttrs
+    mapAttrs
+    mkOption
+    optionalAttrs
+    optionals
+    recursiveUpdate
+    singleton
+    types
+    ;
 
   otherArguments = removeAttrs args [
     "self"
@@ -72,43 +89,192 @@ let
     "extraGlobalModules"
     "extraHomeManagerModules"
     "extraNixosModules"
+    "extraNixDarwinModules"
     "globalSpecialArgs"
     "hmSpecialArgs"
     "nixosSpecialArgs"
+    "nixDarwinSpecialArgs"
     "packagesBuilder"
     "sharedOverlays"
   ];
 
   # generate each host by injecting special arguments and the given host
   # without certain soxin-only attributes.
   hosts' =
-    mapAttrs
-      (hostname: host: (recursiveUpdate
-        {
-          specialArgs = {
-            inherit soxin soxincfg home-manager;
-
-            # the mode allows us to tell at what level we are within the modules.
-            mode = "NixOS";
-          }
-          # include the global special arguments.
-          // globalSpecialArgs
-          # include the NixOS special arguments.
-          // nixosSpecialArgs;
-        }
-
-        # pass along the hosts minus the deploy key that's specific to soxin.
-        (removeAttrs host [ "deploy" ])
-      ))
-      hosts;
+    let
+      darwinHosts =
+        let
+          darwinOnlyHosts = filterAttrs (n: host: host.mode == "nix-darwin") hosts;
+
+          # Build host with darwinSystem. `removeAttrs` workaround due to https://github.com/LnL7/nix-darwin/issues/319
+          builder = args: darwin.lib.darwinSystem (builtins.removeAttrs args [ "system" ]);
+
+          # Setup the output
+          output = "darwinConfigurations";
+        in
+        mapAttrs
+          (_: host:
+            # setup the default attributes, users can override it by passing them through their host definition.
+            { inherit builder output; }
+            //
+            (recursiveUpdate
+              # pass along the hosts minus few keys that are implementation detail to soxin.
+              (removeAttrs host [ "deploy" "mode" ])
+
+              {
+                specialArgs =
+                  {
+                    inherit
+                      home-manager
+                      soxin
+                      soxincfg
+                      ;
+
+                    inherit (host)
+                      mode
+                      ;
+                  }
+                  # include the specialArgs that were passed in.
+                  // (host.specialArgs or { })
+                  # include the global special arguments.
+                  // globalSpecialArgs
+                  # include the NixDarwin special arguments.
+                  // nixDarwinSpecialArgs
+                ;
+
+                modules =
+                  (host.modules or [ ])
+                  # include sops
+                  # ++ (optionals withSops (singleton sops-nix.nixosModules.sops))
+                  # TODO: include sops above, or remove if unsupported.
+                  # include sane flake defaults from flake-utils-plus which sets sane `nix.*` defaults.
+                  # Please refer to implementation/readme in
+                  # github:gytis-ivaskevicius/flake-utils-plus for more details.
+                  #
+                  ++ (singleton flake-utils-plus.nixosModules.saneFlakeDefaults)
+                  # include the nix-darwin modules
+                  ++ extraNixDarwinModules
+                  # include Soxin modules
+                  ++ (singleton soxin.nixosModule)
+                  # include home-manager modules
+                  ++ (singleton home-manager.darwinModules.home-manager)
+                  # configure home-manager
+                  ++ (singleton {
+                    # tell home-manager to use the global (as in NixOS system-level) pkgs and
+                    # install all  user packages through the users.users.<name>.packages.
+                    home-manager.useGlobalPkgs = true;
+                    home-manager.useUserPackages = true;
+
+                    home-manager.extraSpecialArgs = {
+                      inherit soxin soxincfg home-manager;
+
+                      # the mode allows us to tell at what level we are within the modules.
+                      mode = "home-manager";
+                    }
+                    # include the global special arguments.
+                    // globalSpecialArgs
+                    # include the home-manager special arguments.
+                    // hmSpecialArgs;
+
+                    home-manager.sharedModules =
+                      # include the global modules
+                      extraGlobalModules
+                      # include the home-manager modules
+                      ++ extraHomeManagerModules
+                      # include Soxin module
+                      ++ (singleton soxin.nixosModule);
+                  })
+                ;
+              }
+            ))
+          darwinOnlyHosts;
+
+      nixosHosts =
+        let
+          nixosOnlyHosts = filterAttrs (n: host: host.mode == "NixOS") hosts;
+        in
+        mapAttrs
+          (_: host: (recursiveUpdate
+            # pass along the hosts minus few keys that are implementation detail to soxin.
+            (removeAttrs host [ "deploy" "mode" ])
+
+            {
+              specialArgs =
+                {
+                  inherit
+                    home-manager
+                    soxin
+                    soxincfg
+                    ;
+
+                  inherit (host)
+                    mode
+                    ;
+                }
+                # include the specialArgs that were passed in.
+                // (host.specialArgs or { })
+                # include the global special arguments.
+                // globalSpecialArgs
+                # include the NixOS special arguments.
+                // nixosSpecialArgs
+              ;
+
+              modules =
+                (host.modules or [ ])
+                # include sops
+                ++ (optionals withSops (singleton sops-nix.nixosModules.sops))
+                # include sane flake defaults from flake-utils-plus which sets sane `nix.*` defaults.
+                # Please refer to implementation/readme in
+                # github:gytis-ivaskevicius/flake-utils-plus for more details.
+                ++ (singleton flake-utils-plus.nixosModules.saneFlakeDefaults)
+                # include the NixOS modules
+                ++ extraNixosModules
+                # include Soxin modules
+                ++ (singleton soxin.nixosModule)
+                # include home-manager modules
+                ++ (singleton home-manager.nixosModules.home-manager)
+                # configure home-manager
+                ++ (singleton {
+                  # tell home-manager to use the global (as in NixOS system-level) pkgs and
+                  # install all  user packages through the users.users.<name>.packages.
+                  home-manager.useGlobalPkgs = true;
+                  home-manager.useUserPackages = true;
+
+                  home-manager.extraSpecialArgs = {
+                    inherit soxin soxincfg home-manager;
+
+                    # the mode allows us to tell at what level we are within the modules.
+                    mode = "home-manager";
+                  }
+                  # include the global special arguments.
+                  // globalSpecialArgs
+                  # include the home-manager special arguments.
+                  // hmSpecialArgs;
+
+                  home-manager.sharedModules =
+                    # include the global modules
+                    extraGlobalModules
+                    # include the home-manager modules
+                    ++ extraHomeManagerModules
+                    # include Soxin module
+                    ++ (singleton soxin.nixosModule);
+                })
+              ;
+            }
+          ))
+          nixosOnlyHosts;
+
+      # TODO: add support for home-manager modes
+    in
+    darwinHosts // nixosHosts;
 
   # Generate the deployment nodes.
   deploy.nodes =
     let
       # filter out hosts without a deploy attribute.
       deploy-hosts = filterAttrs (n: v: (v.deploy or { }) != { }) hosts;
     in
-    mapAttrs (hostname: host: host.deploy) deploy-hosts;
+    mapAttrs (_: host: host.deploy) deploy-hosts;
 
   soxinSystemFlake = {
     # inherit the required fields as-is
@@ -198,46 +364,9 @@ let
         modules =
           # include the modules that are passed in
           (hostDefaults.modules or [ ])
-            # include sops
-            ++ (optionals withSops (singleton sops-nix.nixosModules.sops))
             # include the global modules
             ++ extraGlobalModules
-            # include sane flake defaults from flake-utils-plus which sets sane `nix.*` defaults.
-            # Please refer to implementation/readme in
-            # github:gytis-ivaskevicius/flake-utils-plus for more details.
-            ++ (singleton flake-utils-plus.nixosModules.saneFlakeDefaults)
-            # include the NixOS modules
-            ++ extraNixosModules
-            # include Soxin modules
-            ++ (singleton soxin.nixosModule)
-            # include home-manager modules
-            ++ (singleton home-manager.nixosModules.home-manager)
-            # configure home-manager
-            ++ (singleton {
-            # tell home-manager to use the global (as in NixOS system-level) pkgs and
-            # install all  user packages through the users.users.<name>.packages.
-            home-manager.useGlobalPkgs = true;
-            home-manager.useUserPackages = true;
-
-            home-manager.extraSpecialArgs = {
-              inherit soxin soxincfg home-manager;
-
-              # the mode allows us to tell at what level we are within the modules.
-              mode = "home-manager";
-            }
-            # include the global special arguments.
-            // globalSpecialArgs
-            # include the home-manager special arguments.
-            // hmSpecialArgs;
-
-            home-manager.sharedModules =
-              # include the global modules
-              extraGlobalModules
-                # include the home-manager modules
-                ++ extraHomeManagerModules
-                # include Soxin module
-                ++ (singleton soxin.nixosModule);
-          });
+        ;
       };
   }
   // (optionalAttrs withDeploy {
@@ -256,7 +385,7 @@ flake-utils-plus.lib.systemFlake (recursiveUpdate soxinSystemFlake otherArgument
   # TODO: Let flake-utils-plus.lib.systemFlake handle the home-managers by using the host's builder function
   // {
   homeConfigurations = (mapAttrs
-    (hostname: host: soxin.lib.homeManagerConfiguration (host // {
+    (_: host: soxin.lib.homeManagerConfiguration (host // {
       inherit inputs;
       hmModules =
         # include the global modules

modules/programs/keybase/default.nix

@@ -16,9 +16,9 @@ in
   };
 
   config = mkIf cfg.enable (mkMerge [
-    {
+    (optionalAttrs (mode == "NixOS" || mode == "home-manager") {
       services.keybase.enable = true;
       services.kbfs.enable = cfg.enableFs;
-    }
+    })
   ]);
 }