feat(nixosModules): add nixosProfiles

tao3k · Sep 20, 2023 · 02caac6 · 02caac6
1 parent 16f60ba
commit 02caac6
Show file tree

Hide file tree

Showing 7 changed files with 59 additions and 24 deletions.
diff --git a/examples/nixos/__nixosProfiles/bootstrap.nix b/examples/nixos/__nixosProfiles/bootstrap.nix
@@ -1,6 +1,4 @@
 {
-  boot.__profiles__.systemd-boot.enable = true;
-  # config.boot.__profiles__.systemd-initrd.enable = true;
   fileSystems."/" = {
     device = "/dev/disk/by-label/nixos";
   };

diff --git a/examples/nixos/default.nix b/examples/nixos/default.nix
@@ -5,21 +5,53 @@
 
   homeModules = super.pops.homeModules.outputsForTarget.nixosModules;
 
-  homeProfiles = super.pops.homeProfiles.outputs;
+  homeProfiles = super.pops.homeProfiles.outputsForTarget;
 
-  nixosProfiles = super.pops.nixosProfiles.outputs;
+  nixosProfiles = super.pops.nixosProfiles.outputsForTarget;
 
   nixosSuites =
     let
-      customProfiles = self.nixosProfiles { };
+      customProfiles = {
+        nix =
+          (self.nixosProfiles.dmerge {
+            nix.extraOptions = ''
+              allowed-uris = https://github.com/
+            '';
+          }).presets.nix;
+        boot =
+          (self.nixosProfiles.dmerge {
+            # boot.__profiles__.systemd-initrd.enable = true;
+            boot.__profiles__.systemd-boot.enable = true;
+          }).presets.boot;
+      };
     in
     lib.flatten [
       self.selfNixOSProfiles.bootstrap
-      self.nixosModules.boot
+
+      # self.nixosProfiles.default.presets.boot
+      customProfiles.boot
+
       self.nixosModules.programs.git
 
+      # (
+      #   {
+      #     lib,
+      #     config,
+      #     options,
+      #     ...
+      #   }@args:
+      #   {
+      #     options = {
+      #       __test__ = lib.mkOption {
+      #         type = lib.types.attrs;
+      #         default = ;
+      #       };
+      #     };
+      #   }
+      # )
+
       # --custom profiles
-      customProfiles.presets.nix
+      customProfiles.nix
 
       (selfLib.mkHome
         {
@@ -37,16 +69,17 @@
 
   homeSuites =
     let
-      customProfiles = self.homeProfiles {
-        presets.hyprland.default = {
-          wayland.windowManager.hyprland.__profiles__ = {
-            nvidia = true;
-          };
-        };
+      customProfiles = {
+        hyprland =
+          (self.homeProfiles.dmerge {
+            wayland.windowManager.hyprland.__profiles__ = {
+              nvidia = true;
+            };
+          }).presets.hyprland;
       };
     in
     [
-      customProfiles.presets.hyprland.default
+      customProfiles.hyprland
       # self.homeModules.wayland.windowManager.hyprland
     ];
 }
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -38,12 +38,11 @@
       loadHomeProfiles = loadHomeModules.addLoadExtender {
         src = ./nixos/homeProfiles;
         loader = haumea.lib.loaders.scoped;
-        type = "default";
+        type = "nixosProfiles";
       };
-      loadNixOSProfiles = loadNixOSModules.addLoadExtender {
+      loadNixOSProfiles = flops.lib.haumea.pops.default.setInit {
         src = ./nixos/nixosProfiles;
-        loader = haumea.lib.loaders.scoped;
-        type = "default";
+        type = "nixosProfiles";
       };
       lib = flops.lib.haumea.pops.default.setInit {
         src = ./lib;

diff --git a/nixos/nixosProfiles/bootstrap.nix b/nixos/nixosProfiles/bootstrap.nix
@@ -1 +1 @@
-[ ]
+{ default = [ ]; }
diff --git a/nixos/nixosProfiles/presets/boot.nix b/nixos/nixosProfiles/presets/boot.nix
@@ -0,0 +1,4 @@
+{
+  imports = [ POS.nixosModules.boot ];
+  boot.__profiles__.systemd-boot.enable = true;
+}
diff --git a/nixos/nixosProfiles/presets/nix.nix b/nixos/nixosProfiles/presets/nix.nix
@@ -1,5 +1,6 @@
-_:
-{ pkgs, ... }:
+let
+  inherit (moduleArgs) pkgs;
+in
 {
   nix = {
     package = pkgs.nixUnstable;