chris/dotfiles
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

fixing placement of nix.package option

Browse source
This commit is contained in:
Chris Cochrun 2023-01-29 07:04:46 -06:00
parent f1e8518dbd
commit e9548d8856
5 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
modules/base.nix
View file

@ -5,7 +5,6 @@ with lib;
nix = { nix = {
extraOptions = "experimental-features = nix-command flakes"; extraOptions = "experimental-features = nix-command flakes";
package = pkgs.nixFlakes;
gc = { gc = {
automatic = true; automatic = true;
dates = "weekly"; dates = "weekly";

1
modules/desktop.nix
View file

@ -4,7 +4,6 @@ with lib;
{ {
nix = { nix = {
extraOptions = "experimental-features = nix-command flakes";
package = pkgs.nixVersions.unstable; package = pkgs.nixVersions.unstable;
}; };

9
modules/servers.nix Normal file
View file

@ -0,0 +1,9 @@
{ pkgs, lib, config, ... }:
with lib;
{
nix = {
package = pkgs.nixFlakes;
}
}

4
system/dalinar/configuration.nix
View file

@ -5,6 +5,7 @@
[ # Include the results of the hardware scan. [ # Include the results of the hardware scan.
./hardware-configuration.nix ./hardware-configuration.nix
../../modules/base.nix ../../modules/base.nix
../../modules/servers.nix
../../pkgs/base-packages.nix ../../pkgs/base-packages.nix
]; ];
@ -245,6 +246,9 @@
virtualHosts = { virtualHosts = {
"workout.cochrun.xyz".extraConfig = '' "workout.cochrun.xyz".extraConfig = ''
reverse_proxy localhost:8001 reverse_proxy localhost:8001
header {
Access-Control-Allow-Origin *
}
''; '';
}; };
virtualHosts = { virtualHosts = {

1
system/kohlin/configuration.nix
View file

@ -5,6 +5,7 @@
[ # Include the results of the hardware scan. [ # Include the results of the hardware scan.
./hardware-configuration.nix ./hardware-configuration.nix
../../modules/base.nix ../../modules/base.nix
../../modules/servers.nix
../../pkgs/base-packages.nix ../../pkgs/base-packages.nix
]; ];