wip

flake.nix

@@ -13,6 +13,11 @@
       inputs.nixpkgs.follows = "nixpkgs-unstable";
     };
 
+    darwin = {
+      url = "github:lnl7/nix-darwin";
+      inputs.nixpkgs.follows = "nixpkgs-unstable";
+    };
+
     nix-on-droid = {
       url = "github:nix-community/nix-on-droid/release-23.05";
       inputs.home-manager.follows = "home-manager";
@@ -82,7 +87,7 @@
       nixcfgLib = import ./lib {
         inherit inputs;
       };
-      inherit (inputs.flake-utils.lib.system) x86_64-linux;
+      inherit (inputs.flake-utils.lib.system) aarch64-darwin aarch64-linux x86_64-linux;
       inherit (nixpkgs.lib) listToAttrs;
     in
     with nixcfgLib;
@@ -91,16 +96,17 @@
         import ./lib { inputs = inputs // self.inputs; };
 
       homeConfigurations = listToAttrs [
-        (mkHome x86_64-linux "demo@non-nixos-vm")
-        (mkHome x86_64-linux "christian@non-nixos-vm")
+        (mkHome aarch64-darwin "christian@macos")
+        (mkHome x86_64-linux "christian@non-nixos")
+        (mkHome x86_64-linux "demo@non-nixos")
       ];
 
       nixosConfigurations = listToAttrs [
-        (mkNixos x86_64-linux "nixos-vm")
+        (mkNixos x86_64-linux "nixos")
       ];
 
       nixOnDroidConfigurations = listToAttrs [
-        (mkNixOnDroid "aarch64-linux" "nix-on-droid")
+        (mkNixOnDroid aarch64-linux "nix-on-droid")
       ];
 
       apps = mkForEachSystem [
@@ -163,9 +169,10 @@
             };
           }))
 
-        (mkBuild "build-nixos-vm" self.nixosConfigurations.nixos-vm.config.system.build.toplevel)
-        (mkBuild "build-demo@non-nixos-vm" self.homeConfigurations."demo@non-nixos-vm".activationPackage)
-        (mkBuild "build-christian@non-nixos-vm" self.homeConfigurations."christian@non-nixos-vm".activationPackage)
+        (mkBuild "build-christian@macos" self.homeConfigurations."christian@macos".activationPackage)
+        (mkBuild "build-christian@non-nixos" self.homeConfigurations."christian@non-nixos".activationPackage)
+        (mkBuild "build-demo@non-nixos" self.homeConfigurations."demo@non-nixos".activationPackage)
+        (mkBuild "build-nixos" self.nixosConfigurations.nixos.config.system.build.toplevel)
       ];
 
       devShells = mkForEachSystem [

home/base/default.nix

@@ -1,5 +1,11 @@
 { config, lib, ... }:
 
+let
+
+  inherit (config.custom.base.non-nixos) isDarwin;
+
+in
+
 {
   home = {
     homeDirectory = lib.mkDefault "/home/${config.home.username}";
@@ -11,7 +17,7 @@
     enableNixpkgsReleaseCheck = true;
   };
 
-  xdg.userDirs = {
+  xdg.userDirs = lib.mkIf isDarwin {
     enable = true;
     createDirectories = true;
   };

home/base/non-nixos/default.nix

@@ -16,6 +16,8 @@ in
       enable = mkEnableOption "Config for non NixOS systems";
 
       installNix = mkEnableOption "Nix installation" // { default = true; };
+
+      isDarwin = mkEnableOption "Darwin architecture (MacOS)";
     };
   };
 

home/roles/multimedia/default.nix

@@ -6,6 +6,8 @@ let
 
   cfg = config.custom.roles.multimedia;
 
+  inherit (config.custom.base.non-nixos) isDarwin;
+
 in
 
 {
@@ -26,6 +28,6 @@ in
     };
 
     programs.mpv.enable = true;
-    services.easyeffects.enable = true;
+    services.easyeffects.enable = !isDarwin;
   };
 }

hosts/macos/home-christian.nix

@@ -0,0 +1,22 @@
+{
+  custom = {
+    base.non-nixos = {
+      enable = true;
+      isDarwin = true;
+    };
+
+    users.christian.enable = true;
+
+    roles = {
+      dev.enable = true;
+      graphics.enable = true;
+      homeage.enable = true;
+      multimedia.enable = true;
+      office.enable = true;
+      ops.enable = true;
+      web.enable = true;
+    };
+  };
+
+  home.stateVersion = import ./state-version.nix;
+}

hosts/non-nixos/state-version.nix

@@ -0,0 +1 @@
+"23.11"

lib/builders/mkNixDarwin.nix

@@ -0,0 +1,26 @@
+{ inputs, system, pkgs, customLib, homeModules, name, ... }:
+
+inputs.darwin.lib.darwinSystem {
+  inherit system;
+
+  specialArgs = {
+    inherit homeModules inputs;
+  };
+
+  modules = [
+    "${inputs.self}/hosts/${name}"
+
+    {
+      custom.base.hostname = name;
+
+      lib.custom = customLib;
+
+      nixpkgs = {
+        inherit pkgs;
+      };
+    }
+  ]
+  ++ customLib.getRecursiveDefaultNixFileList ../../nixos
+  ++ customLib.getRecursiveDefaultNixFileList "${inputs.self}/nixos";
+}
+

lib/default.nix

@@ -4,10 +4,12 @@ let
 
   forEachSystem =
     let
-      inherit (inputs.flake-utils.lib.system) aarch64-linux x86_64-linux;
+      inherit (inputs.flake-utils.lib.system) aarch64-darwin aarch64-linux x86_64-darwin x86_64-linux;
     in
     inputs.nixpkgs.lib.genAttrs [
+      aarch64-darwin
       aarch64-linux
+      x86_64-darwin
       x86_64-linux
     ];
 
@@ -91,5 +93,6 @@ in
   mkGeneric = nameValuePairWrapper;
   mkHome = simpleWrapper ./builders/mkHome.nix;
   mkNixos = simpleWrapper ./builders/mkNixos.nix;
+  mkNixDarwin = simpleWrapper ./builders/mkNixDarwin.nix;
   mkNixOnDroid = simpleWrapper ./builders/mkNixOnDroid.nix;
 }