From f7064635004510d487cd2612ecbe3811746117bd Mon Sep 17 00:00:00 2001 From: Richie Cahill Date: Fri, 25 Oct 2024 16:47:36 -0400 Subject: [PATCH] moved common out of systems --- .../file_server/sites/000-default.conf | 0 {systems/common => common}/global/default.nix | 0 {systems/common => common}/global/docker.nix | 0 {systems/common => common}/global/fail2ban.nix | 0 {systems/common => common}/global/libs.nix | 0 {systems/common => common}/global/locale.nix | 0 {systems/common => common}/global/nh.nix | 0 {systems/common => common}/global/nix.nix | 0 {systems/common => common}/global/programs.nix | 0 .../global/snapshot_config.toml | 0 .../global/snapshot_manager.nix | 0 {systems/common => common}/global/ssh.nix | 0 {systems/common => common}/optional/desktop.nix | 0 {systems/common => common}/optional/libvirt.nix | 0 {systems/common => common}/optional/scanner.nix | 0 .../common => common}/optional/ssh_decrypt.nix | 0 {systems/common => common}/optional/steam.nix | 0 .../optional/syncthing_base.nix | 0 .../common => common}/optional/systemd-boot.nix | 0 {systems/common => common}/optional/update.nix | 0 {systems/common => common}/optional/yubikey.nix | 0 {systems/common => common}/optional/zerotier.nix | 0 systems/bob/default.nix | 16 ++++++++-------- systems/jeeves/arch_mirror.nix | 2 +- systems/jeeves/default.nix | 8 ++++---- systems/rhapsody-in-green/default.nix | 12 ++++++------ 26 files changed, 19 insertions(+), 19 deletions(-) rename {systems/common => common}/docker_templates/file_server/sites/000-default.conf (100%) rename {systems/common => common}/global/default.nix (100%) rename {systems/common => common}/global/docker.nix (100%) rename {systems/common => common}/global/fail2ban.nix (100%) rename {systems/common => common}/global/libs.nix (100%) rename {systems/common => common}/global/locale.nix (100%) rename {systems/common => common}/global/nh.nix (100%) rename {systems/common => common}/global/nix.nix (100%) rename {systems/common => common}/global/programs.nix (100%) rename {systems/common => common}/global/snapshot_config.toml (100%) rename {systems/common => common}/global/snapshot_manager.nix (100%) rename {systems/common => common}/global/ssh.nix (100%) rename {systems/common => common}/optional/desktop.nix (100%) rename {systems/common => common}/optional/libvirt.nix (100%) rename {systems/common => common}/optional/scanner.nix (100%) rename {systems/common => common}/optional/ssh_decrypt.nix (100%) rename {systems/common => common}/optional/steam.nix (100%) rename {systems/common => common}/optional/syncthing_base.nix (100%) rename {systems/common => common}/optional/systemd-boot.nix (100%) rename {systems/common => common}/optional/update.nix (100%) rename {systems/common => common}/optional/yubikey.nix (100%) rename {systems/common => common}/optional/zerotier.nix (100%) diff --git a/systems/common/docker_templates/file_server/sites/000-default.conf b/common/docker_templates/file_server/sites/000-default.conf similarity index 100% rename from systems/common/docker_templates/file_server/sites/000-default.conf rename to common/docker_templates/file_server/sites/000-default.conf diff --git a/systems/common/global/default.nix b/common/global/default.nix similarity index 100% rename from systems/common/global/default.nix rename to common/global/default.nix diff --git a/systems/common/global/docker.nix b/common/global/docker.nix similarity index 100% rename from systems/common/global/docker.nix rename to common/global/docker.nix diff --git a/systems/common/global/fail2ban.nix b/common/global/fail2ban.nix similarity index 100% rename from systems/common/global/fail2ban.nix rename to common/global/fail2ban.nix diff --git a/systems/common/global/libs.nix b/common/global/libs.nix similarity index 100% rename from systems/common/global/libs.nix rename to common/global/libs.nix diff --git a/systems/common/global/locale.nix b/common/global/locale.nix similarity index 100% rename from systems/common/global/locale.nix rename to common/global/locale.nix diff --git a/systems/common/global/nh.nix b/common/global/nh.nix similarity index 100% rename from systems/common/global/nh.nix rename to common/global/nh.nix diff --git a/systems/common/global/nix.nix b/common/global/nix.nix similarity index 100% rename from systems/common/global/nix.nix rename to common/global/nix.nix diff --git a/systems/common/global/programs.nix b/common/global/programs.nix similarity index 100% rename from systems/common/global/programs.nix rename to common/global/programs.nix diff --git a/systems/common/global/snapshot_config.toml b/common/global/snapshot_config.toml similarity index 100% rename from systems/common/global/snapshot_config.toml rename to common/global/snapshot_config.toml diff --git a/systems/common/global/snapshot_manager.nix b/common/global/snapshot_manager.nix similarity index 100% rename from systems/common/global/snapshot_manager.nix rename to common/global/snapshot_manager.nix diff --git a/systems/common/global/ssh.nix b/common/global/ssh.nix similarity index 100% rename from systems/common/global/ssh.nix rename to common/global/ssh.nix diff --git a/systems/common/optional/desktop.nix b/common/optional/desktop.nix similarity index 100% rename from systems/common/optional/desktop.nix rename to common/optional/desktop.nix diff --git a/systems/common/optional/libvirt.nix b/common/optional/libvirt.nix similarity index 100% rename from systems/common/optional/libvirt.nix rename to common/optional/libvirt.nix diff --git a/systems/common/optional/scanner.nix b/common/optional/scanner.nix similarity index 100% rename from systems/common/optional/scanner.nix rename to common/optional/scanner.nix diff --git a/systems/common/optional/ssh_decrypt.nix b/common/optional/ssh_decrypt.nix similarity index 100% rename from systems/common/optional/ssh_decrypt.nix rename to common/optional/ssh_decrypt.nix diff --git a/systems/common/optional/steam.nix b/common/optional/steam.nix similarity index 100% rename from systems/common/optional/steam.nix rename to common/optional/steam.nix diff --git a/systems/common/optional/syncthing_base.nix b/common/optional/syncthing_base.nix similarity index 100% rename from systems/common/optional/syncthing_base.nix rename to common/optional/syncthing_base.nix diff --git a/systems/common/optional/systemd-boot.nix b/common/optional/systemd-boot.nix similarity index 100% rename from systems/common/optional/systemd-boot.nix rename to common/optional/systemd-boot.nix diff --git a/systems/common/optional/update.nix b/common/optional/update.nix similarity index 100% rename from systems/common/optional/update.nix rename to common/optional/update.nix diff --git a/systems/common/optional/yubikey.nix b/common/optional/yubikey.nix similarity index 100% rename from systems/common/optional/yubikey.nix rename to common/optional/yubikey.nix diff --git a/systems/common/optional/zerotier.nix b/common/optional/zerotier.nix similarity index 100% rename from systems/common/optional/zerotier.nix rename to common/optional/zerotier.nix diff --git a/systems/bob/default.nix b/systems/bob/default.nix index 77e5e55..f20b09c 100644 --- a/systems/bob/default.nix +++ b/systems/bob/default.nix @@ -1,14 +1,14 @@ { imports = [ ../../users/richie - ../common/global - ../common/optional/desktop.nix - ../common/optional/scanner.nix - ../common/optional/steam.nix - ../common/optional/syncthing_base.nix - ../common/optional/systemd-boot.nix - ../common/optional/zerotier.nix - ../common/optional/yubikey.nix + ../../common/global + ../../common/optional/desktop.nix + ../../common/optional/scanner.nix + ../../common/optional/steam.nix + ../../common/optional/syncthing_base.nix + ../../common/optional/systemd-boot.nix + ../../common/optional/zerotier.nix + ../../common/optional/yubikey.nix ./hardware.nix ./nvidia.nix ./syncthing.nix diff --git a/systems/jeeves/arch_mirror.nix b/systems/jeeves/arch_mirror.nix index efe7fbf..3f51c98 100644 --- a/systems/jeeves/arch_mirror.nix +++ b/systems/jeeves/arch_mirror.nix @@ -14,7 +14,7 @@ in virtualisation.oci-containers.containers.arch_mirror = { image = "ubuntu/apache2:latest"; 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" ]; ports = [ "800:80" ]; diff --git a/systems/jeeves/default.nix b/systems/jeeves/default.nix index 996644a..38b2fa8 100644 --- a/systems/jeeves/default.nix +++ b/systems/jeeves/default.nix @@ -4,10 +4,10 @@ in { imports = [ ../../users/richie - ../common/global - ../common/optional/ssh_decrypt.nix - ../common/optional/syncthing_base.nix - ../common/optional/zerotier.nix + ../../common/global + ../../common/optional/ssh_decrypt.nix + ../../common/optional/syncthing_base.nix + ../../common/optional/zerotier.nix ./arch_mirror.nix ./docker ./hardware.nix diff --git a/systems/rhapsody-in-green/default.nix b/systems/rhapsody-in-green/default.nix index 32565bb..74bfa15 100644 --- a/systems/rhapsody-in-green/default.nix +++ b/systems/rhapsody-in-green/default.nix @@ -2,12 +2,12 @@ { imports = [ ../../users/richie - ../common/global - ../common/optional/desktop.nix - ../common/optional/syncthing_base.nix - ../common/optional/systemd-boot.nix - ../common/optional/yubikey.nix - ../common/optional/zerotier.nix + ../../common/global + ../../common/optional/desktop.nix + ../../common/optional/syncthing_base.nix + ../../common/optional/systemd-boot.nix + ../../common/optional/yubikey.nix + ../../common/optional/zerotier.nix ./hardware.nix ./syncthing.nix inputs.nixos-hardware.nixosModules.framework-13-7040-amd