From 174172e847040150370a4a35686b72f2a3fcb8c0 Mon Sep 17 00:00:00 2001 From: chaos Date: Wed, 24 Jul 2024 17:24:41 +0100 Subject: [PATCH] move/rename default.nix files --- .../jellyfin/{default.nix => jellyfin.nix} | 0 .../containers/mail/{default.nix => mail.nix} | 0 .../mailserver/{default.nix => config.nix} | 0 .../storage/{default.nix => storage.nix} | 0 hosts/hetzner-arm/hetzner-arm.nix | 2 +- .../{gnome/default.nix => gnome.nix} | 0 profiles/nixos/firewallAllow/aria2c.nix | 22 ------------------- profiles/nixos/firewallAllow/httpCommon.nix | 4 ---- profiles/nixos/firewallAllow/soulseek.nix | 1 - profiles/nixos/firewallAllow/ssh.nix | 3 --- .../nixos/gui/{base/default.nix => base.nix} | 0 .../{gnome/default.nix => gnome.nix} | 0 profiles/nixos/gui/greeter/gdm.nix | 1 - profiles/nixos/gui/greeter/sddm.nix | 1 - profiles/nixos/{printing => }/printing.nix | 0 .../{pipewire/default.nix => pipewire.nix} | 0 profiles/nixos/{tor => }/tor.nix | 0 17 files changed, 1 insertion(+), 33 deletions(-) rename hosts/hetzner-arm/containers/jellyfin/{default.nix => jellyfin.nix} (100%) rename hosts/hetzner-arm/containers/mail/{default.nix => mail.nix} (100%) rename hosts/hetzner-arm/containers/mail/modules/mailserver/{default.nix => config.nix} (100%) rename hosts/hetzner-arm/containers/storage/{default.nix => storage.nix} (100%) rename profiles/home-manager/gui/environments/{gnome/default.nix => gnome.nix} (100%) delete mode 100644 profiles/nixos/firewallAllow/aria2c.nix delete mode 100644 profiles/nixos/firewallAllow/httpCommon.nix delete mode 100644 profiles/nixos/firewallAllow/soulseek.nix delete mode 100644 profiles/nixos/firewallAllow/ssh.nix rename profiles/nixos/gui/{base/default.nix => base.nix} (100%) rename profiles/nixos/gui/environments/{gnome/default.nix => gnome.nix} (100%) delete mode 100644 profiles/nixos/gui/greeter/gdm.nix delete mode 100644 profiles/nixos/gui/greeter/sddm.nix rename profiles/nixos/{printing => }/printing.nix (100%) rename profiles/nixos/sound/{pipewire/default.nix => pipewire.nix} (100%) rename profiles/nixos/{tor => }/tor.nix (100%) diff --git a/hosts/hetzner-arm/containers/jellyfin/default.nix b/hosts/hetzner-arm/containers/jellyfin/jellyfin.nix similarity index 100% rename from hosts/hetzner-arm/containers/jellyfin/default.nix rename to hosts/hetzner-arm/containers/jellyfin/jellyfin.nix diff --git a/hosts/hetzner-arm/containers/mail/default.nix b/hosts/hetzner-arm/containers/mail/mail.nix similarity index 100% rename from hosts/hetzner-arm/containers/mail/default.nix rename to hosts/hetzner-arm/containers/mail/mail.nix diff --git a/hosts/hetzner-arm/containers/mail/modules/mailserver/default.nix b/hosts/hetzner-arm/containers/mail/modules/mailserver/config.nix similarity index 100% rename from hosts/hetzner-arm/containers/mail/modules/mailserver/default.nix rename to hosts/hetzner-arm/containers/mail/modules/mailserver/config.nix diff --git a/hosts/hetzner-arm/containers/storage/default.nix b/hosts/hetzner-arm/containers/storage/storage.nix similarity index 100% rename from hosts/hetzner-arm/containers/storage/default.nix rename to hosts/hetzner-arm/containers/storage/storage.nix diff --git a/hosts/hetzner-arm/hetzner-arm.nix b/hosts/hetzner-arm/hetzner-arm.nix index d0e2df6..f9361f0 100644 --- a/hosts/hetzner-arm/hetzner-arm.nix +++ b/hosts/hetzner-arm/hetzner-arm.nix @@ -18,7 +18,7 @@ in { "storage" "mail" "jellyfin" - ] (name: ./containers + "/${name}")) + ] (name: ./containers + "/${name}/${name}.nix")) (with hosts.hetzner-arm.profiles; [ staticSites diff --git a/profiles/home-manager/gui/environments/gnome/default.nix b/profiles/home-manager/gui/environments/gnome.nix similarity index 100% rename from profiles/home-manager/gui/environments/gnome/default.nix rename to profiles/home-manager/gui/environments/gnome.nix diff --git a/profiles/nixos/firewallAllow/aria2c.nix b/profiles/nixos/firewallAllow/aria2c.nix deleted file mode 100644 index 17f343a..0000000 --- a/profiles/nixos/firewallAllow/aria2c.nix +++ /dev/null @@ -1,22 +0,0 @@ -{...}: { - networking.firewall.allowedTCPPortRanges = [ - { - from = 6881; - to = 6999; - } - { - from = 50101; - to = 50109; - } - ]; - networking.firewall.allowedUDPPortRanges = [ - { - from = 6881; - to = 6999; - } - { - from = 50101; - to = 50109; - } - ]; -} diff --git a/profiles/nixos/firewallAllow/httpCommon.nix b/profiles/nixos/firewallAllow/httpCommon.nix deleted file mode 100644 index ecb50b7..0000000 --- a/profiles/nixos/firewallAllow/httpCommon.nix +++ /dev/null @@ -1,4 +0,0 @@ -{...}: { - networking.firewall.allowedTCPPorts = [80 443]; - networking.firewall.allowedUDPPorts = [80 443]; -} diff --git a/profiles/nixos/firewallAllow/soulseek.nix b/profiles/nixos/firewallAllow/soulseek.nix deleted file mode 100644 index 33e14d5..0000000 --- a/profiles/nixos/firewallAllow/soulseek.nix +++ /dev/null @@ -1 +0,0 @@ -{...}: {networking.firewall.allowedTCPPorts = [2235];} diff --git a/profiles/nixos/firewallAllow/ssh.nix b/profiles/nixos/firewallAllow/ssh.nix deleted file mode 100644 index 3403c3e..0000000 --- a/profiles/nixos/firewallAllow/ssh.nix +++ /dev/null @@ -1,3 +0,0 @@ -{...}: { - networking.firewall.allowedTCPPorts = [22]; -} diff --git a/profiles/nixos/gui/base/default.nix b/profiles/nixos/gui/base.nix similarity index 100% rename from profiles/nixos/gui/base/default.nix rename to profiles/nixos/gui/base.nix diff --git a/profiles/nixos/gui/environments/gnome/default.nix b/profiles/nixos/gui/environments/gnome.nix similarity index 100% rename from profiles/nixos/gui/environments/gnome/default.nix rename to profiles/nixos/gui/environments/gnome.nix diff --git a/profiles/nixos/gui/greeter/gdm.nix b/profiles/nixos/gui/greeter/gdm.nix deleted file mode 100644 index 92e1d82..0000000 --- a/profiles/nixos/gui/greeter/gdm.nix +++ /dev/null @@ -1 +0,0 @@ -{}: {} diff --git a/profiles/nixos/gui/greeter/sddm.nix b/profiles/nixos/gui/greeter/sddm.nix deleted file mode 100644 index 92e1d82..0000000 --- a/profiles/nixos/gui/greeter/sddm.nix +++ /dev/null @@ -1 +0,0 @@ -{}: {} diff --git a/profiles/nixos/printing/printing.nix b/profiles/nixos/printing.nix similarity index 100% rename from profiles/nixos/printing/printing.nix rename to profiles/nixos/printing.nix diff --git a/profiles/nixos/sound/pipewire/default.nix b/profiles/nixos/sound/pipewire.nix similarity index 100% rename from profiles/nixos/sound/pipewire/default.nix rename to profiles/nixos/sound/pipewire.nix diff --git a/profiles/nixos/tor/tor.nix b/profiles/nixos/tor.nix similarity index 100% rename from profiles/nixos/tor/tor.nix rename to profiles/nixos/tor.nix