all repos — nixfiles @ b5bcdf72cbc998550bf55af1842fe65f8c9ef0bf

System and user configuration, managed by nix and home-manager

Revert "Switch back to flakes" This reverts commit c0384c43821474d28af1d9696ceb473a0d769292.

Alan Pearce
commit

b5bcdf72cbc998550bf55af1842fe65f8c9ef0bf

parent

734a3cebed8dd4be66a546179dbda890abc5a10d

1 file changed, 8 insertions(+), 1 deletion(-)

changed files
M system/marvin.nixsystem/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 @@ fish
"/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 = {