Merge branch 'main' into feat/wsl-neovim-update

nixos/flake.nix

@@ -3,6 +3,12 @@
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
     nixos-wsl.url = "github:nix-community/NixOS-WSL/main";
     vscode-server.url = "github:nix-community/nixos-vscode-server";
+
+    # nix-darwin for macOS
+    # (follows nixpkgs so both use the same channel)
+    nix-darwin.url = "github:nix-darwin/nix-darwin/master";
+    nix-darwin.inputs.nixpkgs.follows = "nixpkgs";
+
     # for later
     # home-manager.url = "github:nix-community/home-manager";
     # home-manager.inputs.nixpkgs.follows = "nixpkgs";
@@ -12,18 +18,18 @@
     nixpkgs,
     nixos-wsl,
     vscode-server,
+    nix-darwin,
     self,
     # home-manager,
     ...
   }: {
     nixosConfigurations = {
-
       wsl = nixpkgs.lib.nixosSystem {
         system = "x86_64-linux";
         modules = [
           nixos-wsl.nixosModules.default
           vscode-server.nixosModules.default
-          ./hosts/wsl.nix # previously configuration.nix
+          ./hosts/wsl.nix
           ./tmux.nix
           ./neovim.nix
           ./fish.nix
@@ -36,14 +42,27 @@
         modules = [
           nixos-wsl.nixosModules.default
           vscode-server.nixosModules.default
-          # ./hosts/macbookair.nix # previously configuration.nix
+          vscode-server.nixosModules.default
+          ./hosts/macbookair.nix
+          ./hardware-configuration.nix
           ./tmux.nix
           ./neovim.nix
           ./fish.nix
           # home-manager.nixosModules.default
         ];
       };
+    };
 
+    # macOS (nix-darwin) configuration
+    darwinConfigurations."Daniel-Macbook-Air" = nix-darwin.lib.darwinSystem {
+      modules = [
+        ./hosts/macos.nix
+        # TODO: nix-darwin lacks tmux options; move to Home Manager.x
+        # ./tmux.nix
+        # TODO: add neovim via homemanager, that should work the same for NixOS as Nix-Darwin
+        # ./neovim.nix # NOTE: Option only exists on NixOS.
+        ./fish.nix
+      ];
     };
   };
 }