moved common out of systems

This commit is contained in:
2024-10-25 16:47:36 -04:00
parent 84ad676d17
commit f706463500
26 changed files with 19 additions and 19 deletions

View File

@@ -1,14 +1,14 @@
{ {
imports = [ imports = [
../../users/richie ../../users/richie
../common/global ../../common/global
../common/optional/desktop.nix ../../common/optional/desktop.nix
../common/optional/scanner.nix ../../common/optional/scanner.nix
../common/optional/steam.nix ../../common/optional/steam.nix
../common/optional/syncthing_base.nix ../../common/optional/syncthing_base.nix
../common/optional/systemd-boot.nix ../../common/optional/systemd-boot.nix
../common/optional/zerotier.nix ../../common/optional/zerotier.nix
../common/optional/yubikey.nix ../../common/optional/yubikey.nix
./hardware.nix ./hardware.nix
./nvidia.nix ./nvidia.nix
./syncthing.nix ./syncthing.nix

View File

@@ -14,7 +14,7 @@ in
virtualisation.oci-containers.containers.arch_mirror = { virtualisation.oci-containers.containers.arch_mirror = {
image = "ubuntu/apache2:latest"; image = "ubuntu/apache2:latest";
volumes = [ volumes = [
"${../common/docker_templates}/file_server/sites/:/etc/apache2/sites-enabled/" "${../../common/docker_templates}/file_server/sites/:/etc/apache2/sites-enabled/"
"${vars.media_mirror}:/data" "${vars.media_mirror}:/data"
]; ];
ports = [ "800:80" ]; ports = [ "800:80" ];

View File

@@ -4,10 +4,10 @@ in
{ {
imports = [ imports = [
../../users/richie ../../users/richie
../common/global ../../common/global
../common/optional/ssh_decrypt.nix ../../common/optional/ssh_decrypt.nix
../common/optional/syncthing_base.nix ../../common/optional/syncthing_base.nix
../common/optional/zerotier.nix ../../common/optional/zerotier.nix
./arch_mirror.nix ./arch_mirror.nix
./docker ./docker
./hardware.nix ./hardware.nix

View File

@@ -2,12 +2,12 @@
{ {
imports = [ imports = [
../../users/richie ../../users/richie
../common/global ../../common/global
../common/optional/desktop.nix ../../common/optional/desktop.nix
../common/optional/syncthing_base.nix ../../common/optional/syncthing_base.nix
../common/optional/systemd-boot.nix ../../common/optional/systemd-boot.nix
../common/optional/yubikey.nix ../../common/optional/yubikey.nix
../common/optional/zerotier.nix ../../common/optional/zerotier.nix
./hardware.nix ./hardware.nix
./syncthing.nix ./syncthing.nix
inputs.nixos-hardware.nixosModules.framework-13-7040-amd inputs.nixos-hardware.nixosModules.framework-13-7040-amd