From b5bcdf72cbc998550bf55af1842fe65f8c9ef0bf Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Sun, 2 Mar 2025 15:18:43 +0100
Subject: Revert "Switch back to flakes"

This reverts commit c0384c43821474d28af1d9696ceb473a0d769292.
---
 system/marvin.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'system/marvin.nix')

diff --git a/system/marvin.nix b/system/marvin.nix
index 44c1e9a5..2e88e0d2 100644
--- a/system/marvin.nix
+++ b/system/marvin.nix
@@ -1,8 +1,14 @@
-{ pkgs, ... }: {
+{ pkgs, ... }:
+let
+  srvos = import <srvos>;
+in
+{
   imports = [
     ./settings/darwin.nix
     ./settings/dev.nix
     ./settings/programs/shell.nix
+    <personal/modules/darwin/caddy>
+    srvos.modules.darwin.desktop
   ];
 
   services.caddy = {
@@ -24,6 +30,7 @@
     "/Users/alan/.local/state/nix/profile/bin/fish"
   ];
 
+  environment.darwinConfig = "/etc/nix-darwin/configuration.nix";
   environment.variables.LANG = "en_GB.UTF-8";
 
   launchd.user.envVariables = {
-- 
cgit 1.4.1