From e9548d885658ef8610b7bdd89974b4bb0bbc14df Mon Sep 17 00:00:00 2001 From: Chris Cochrun Date: Sun, 29 Jan 2023 07:04:46 -0600 Subject: [PATCH] fixing placement of nix.package option --- modules/base.nix | 1 - modules/desktop.nix | 1 - modules/servers.nix | 9 +++++++++ system/dalinar/configuration.nix | 4 ++++ system/kohlin/configuration.nix | 1 + 5 files changed, 14 insertions(+), 2 deletions(-) create mode 100644 modules/servers.nix diff --git a/modules/base.nix b/modules/base.nix index 3b96f02..6c7b58f 100644 --- a/modules/base.nix +++ b/modules/base.nix @@ -5,7 +5,6 @@ with lib; nix = { extraOptions = "experimental-features = nix-command flakes"; - package = pkgs.nixFlakes; gc = { automatic = true; dates = "weekly"; diff --git a/modules/desktop.nix b/modules/desktop.nix index 9bb6edd..906adc7 100644 --- a/modules/desktop.nix +++ b/modules/desktop.nix @@ -4,7 +4,6 @@ with lib; { nix = { - extraOptions = "experimental-features = nix-command flakes"; package = pkgs.nixVersions.unstable; }; diff --git a/modules/servers.nix b/modules/servers.nix new file mode 100644 index 0000000..b80f1c4 --- /dev/null +++ b/modules/servers.nix @@ -0,0 +1,9 @@ +{ pkgs, lib, config, ... }: + +with lib; +{ + nix = { + package = pkgs.nixFlakes; + } +} + diff --git a/system/dalinar/configuration.nix b/system/dalinar/configuration.nix index a86f71f..13ad1ee 100644 --- a/system/dalinar/configuration.nix +++ b/system/dalinar/configuration.nix @@ -5,6 +5,7 @@ [ # Include the results of the hardware scan. ./hardware-configuration.nix ../../modules/base.nix + ../../modules/servers.nix ../../pkgs/base-packages.nix ]; @@ -245,6 +246,9 @@ virtualHosts = { "workout.cochrun.xyz".extraConfig = '' reverse_proxy localhost:8001 + header { + Access-Control-Allow-Origin * + } ''; }; virtualHosts = { diff --git a/system/kohlin/configuration.nix b/system/kohlin/configuration.nix index 5bd761f..8e8e919 100644 --- a/system/kohlin/configuration.nix +++ b/system/kohlin/configuration.nix @@ -5,6 +5,7 @@ [ # Include the results of the hardware scan. ./hardware-configuration.nix ../../modules/base.nix + ../../modules/servers.nix ../../pkgs/base-packages.nix ];