From 8b1c513e7fd213f633749b280e94a01742bb3aa8 Mon Sep 17 00:00:00 2001
From: Gabriel Arazas <foodogsquared@foodogsquared.one>
Date: Sat, 6 Jan 2024 19:11:19 +0800
Subject: [PATCH] apps/run-workflow-with-vm: update host config

---
 apps/run-workflow-with-vm/configuration.nix | 42 +++++++++++----------
 1 file changed, 23 insertions(+), 19 deletions(-)

diff --git a/apps/run-workflow-with-vm/configuration.nix b/apps/run-workflow-with-vm/configuration.nix
index d705645c..ab5e6410 100644
--- a/apps/run-workflow-with-vm/configuration.nix
+++ b/apps/run-workflow-with-vm/configuration.nix
@@ -1,31 +1,25 @@
+# A very basic NixOS VM configuration intended for testing out the given
+# workflow module. It's a good thing the baseline for the configuration is not
+# tedious to set up for simpler configs like this.
 { workflow }:
 
 let
   pkgs = import <nixpkgs> { };
   config' = import <config> { inherit pkgs; };
-  lib = pkgs.lib.extend (self: super:
-    let
-      publicLib = import <config/lib> { lib = super; };
-    in
-    {
-      inherit (publicLib) countAttrs getSecrets attachSopsPathPrefix;
-
-      # Until I figure out how to properly add them only for their respective
-      # environment, this is the working solution for now. Not really perfect
-      # since we use one nixpkgs instance for each configuration (home-manager or
-      # otherwise).
-      private = publicLib
-        // import <config/lib/private.nix> { lib = self; }
-        // import <config/lib/home-manager.nix> { lib = self; };
-    });
+  lib = pkgs.lib.extend (import <config/lib/extras/extend-lib.nix>);
 
   modules = import <config/modules/nixos> { inherit lib; isInternal = true; };
   hmModules = import <config/modules/home-manager> { inherit lib; isInternal = true; };
+  extraArgs = {
+    nix-colors = import <nix-colors> { };
+  };
 in
 import <nixpkgs/nixos/lib/eval-config.nix> {
   inherit lib;
   modules = modules ++ [
     <home-manager/nixos>
+    <disko/module.nix>
+    <sops-nix/modules/sops>
     <nixos-generators/formats/vm.nix>
     <nixos-generators/format-module.nix>
     ({ config, lib, pkgs, ... }: {
@@ -48,11 +42,18 @@ import <nixpkgs/nixos/lib/eval-config.nix> {
       ];
 
       config = {
-        home-manager.sharedModules = hmModules;
+        home-manager.sharedModules = hmModules ++ [
+          <sops-nix/modules/home-manager/sops.nix>
+          ({ config, lib, ... }: {
+            _module.args = extraArgs;
 
-        _module.args = {
-          nix-colors = import <nix-colors> { };
-        };
+            nixpkgs.overlays = [
+              config'.overlays.default
+            ];
+          })
+        ];
+
+        _module.args = extraArgs;
 
         virtualisation.qemu.options = [
           "-vga virtio"
@@ -66,6 +67,9 @@ import <nixpkgs/nixos/lib/eval-config.nix> {
         ];
 
         system.stateVersion = "23.11";
+
+        home-manager.useUserPackages = lib.mkDefault true;
+        home-manager.useGlobalPkgs = lib.mkDefault true;
       };
     })
   ];