From 411a0e3e74ab36633c9ea32ef64d7b6101b78e23 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20B=C3=A4dorf?= <hello@benjaminbaedorf.eu>
Date: Thu, 21 Oct 2021 20:06:57 +0200
Subject: [PATCH] Add basic ISO setup

---
 flake.lock                     | 17 ++++++++++++++++-
 flake.nix                      |  2 +-
 modules/x-os/boot.nix          |  8 +++++++-
 profiles/installed/default.nix | 10 ++++++++++
 4 files changed, 34 insertions(+), 3 deletions(-)
 create mode 100644 profiles/installed/default.nix

diff --git a/flake.lock b/flake.lock
index c9cfb53..488c04d 100644
--- a/flake.lock
+++ b/flake.lock
@@ -245,6 +245,21 @@
         "type": "github"
       }
     },
+    "flake-utils_3": {
+      "locked": {
+        "lastModified": 1623875721,
+        "narHash": "sha256-A8BU7bjS5GirpAUv4QA+QnJ4CceLHkcXdRp4xITDB0s=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "f7e004a55b120c02ecb6219596820fcd32ca8772",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
     "home": {
       "inputs": {
         "nixpkgs": [
@@ -359,7 +374,7 @@
     },
     "nix-dram": {
       "inputs": {
-        "flake-utils": "flake-utils_2",
+        "flake-utils": "flake-utils_3",
         "nixpkgs": "nixpkgs"
       },
       "locked": {
diff --git a/flake.nix b/flake.nix
index 030ff24..a513d8c 100644
--- a/flake.nix
+++ b/flake.nix
@@ -129,7 +129,7 @@
             };
             suites = with profiles; rec {
               base = [ core users.nixos users.root ];
-              pubsolaros = [ core base-user users.root ];
+              pubsolaros = [ core installed base-user users.root ];
               anonymous = [ pubsolaros users.nixos ];
             };
           };
diff --git a/modules/x-os/boot.nix b/modules/x-os/boot.nix
index 5068590..131dec8 100644
--- a/modules/x-os/boot.nix
+++ b/modules/x-os/boot.nix
@@ -9,6 +9,12 @@ with lib; {
       type = types.str;
       description = "Keyfile location";
     };
+
+    pub-solar.x-os.enableBootLoader = mkOption {
+      type = types.bool;
+      default = false;
+      description = "Whether to include the grub bootloader. Turn this off for ISO images.";
+    };
   };
 
   config = {
@@ -31,7 +37,7 @@ with lib; {
       efi.efiSysMountPoint = "/boot/efi";
 
       grub = {
-        enable = true;
+        enable = cfg.enableBootLoader;
         version = 2;
         device = "nodev";
         efiSupport = true;
diff --git a/profiles/installed/default.nix b/profiles/installed/default.nix
new file mode 100644
index 0000000..322c309
--- /dev/null
+++ b/profiles/installed/default.nix
@@ -0,0 +1,10 @@
+{ self, config, lib, pkgs, ... }:
+let inherit (lib) fileContents;
+in
+{
+  imports = [ ../cachix ];
+  config = {
+    pub-solar.printing.enable = true;
+    pub-solar.x-os.enableBootLoader = true;
+  };
+}