From 6dcbea491883d0b82fee28b0e0e67e529035e6ba Mon Sep 17 00:00:00 2001
From: kat witch <kat@kittywit.ch>
Date: Mon, 22 Feb 2021 05:33:05 +0000
Subject: [PATCH] Doing some more layout changes.

---
 .../hosts/athame/{services => }/bitwarden.nix |  0
 config/hosts/athame/configuration.nix         | 25 +++++------
 config/hosts/athame/{services => }/gitea.nix  |  0
 ...ardware-configuration.nix => hardware.nix} |  0
 config/hosts/athame/{services => }/matrix.nix |  0
 .../hosts/athame/{services => }/nextcloud.nix |  0
 .../hosts/athame/{services => }/postgres.nix  |  0
 config/hosts/athame/services/znc.nix          | 45 -------------------
 .../virtualHosts.nix => virtualhosts.nix}     |  0
 .../hosts/athame/{services => }/weechat.nix   |  0
 config/hosts/athame/znc.nix                   | 20 +++++++++
 config/hosts/boline/configuration.nix         |  2 +-
 ...ardware-configuration.nix => hardware.nix} |  0
 config/hosts/samhain/configuration.nix        |  6 +--
 ...ardware-configuration.nix => hardware.nix} |  0
 .../{services => }/thermal/kaede-power.sh     |  0
 .../{services => }/thermal/kaede-thermald.xml |  0
 .../{services => }/thermal/kaede-thermals.sh  |  0
 .../{services => }/thermal/thermal.nix        |  0
 .../samhain/{services => }/torrenting.nix     |  0
 config/hosts/yule/configuration.nix           |  2 +-
 ...ardware-configuration.nix => hardware.nix} |  0
 22 files changed, 37 insertions(+), 63 deletions(-)
 rename config/hosts/athame/{services => }/bitwarden.nix (100%)
 rename config/hosts/athame/{services => }/gitea.nix (100%)
 rename config/hosts/athame/{hardware-configuration.nix => hardware.nix} (100%)
 rename config/hosts/athame/{services => }/matrix.nix (100%)
 rename config/hosts/athame/{services => }/nextcloud.nix (100%)
 rename config/hosts/athame/{services => }/postgres.nix (100%)
 delete mode 100644 config/hosts/athame/services/znc.nix
 rename config/hosts/athame/{services/virtualHosts.nix => virtualhosts.nix} (100%)
 rename config/hosts/athame/{services => }/weechat.nix (100%)
 create mode 100644 config/hosts/athame/znc.nix
 rename config/hosts/boline/{hardware-configuration.nix => hardware.nix} (100%)
 rename config/hosts/samhain/{hardware-configuration.nix => hardware.nix} (100%)
 rename config/hosts/samhain/{services => }/thermal/kaede-power.sh (100%)
 rename config/hosts/samhain/{services => }/thermal/kaede-thermald.xml (100%)
 rename config/hosts/samhain/{services => }/thermal/kaede-thermals.sh (100%)
 rename config/hosts/samhain/{services => }/thermal/thermal.nix (100%)
 rename config/hosts/samhain/{services => }/torrenting.nix (100%)
 rename config/hosts/yule/{hardware-configuration.nix => hardware.nix} (100%)

diff --git a/config/hosts/athame/services/bitwarden.nix b/config/hosts/athame/bitwarden.nix
similarity index 100%
rename from config/hosts/athame/services/bitwarden.nix
rename to config/hosts/athame/bitwarden.nix
diff --git a/config/hosts/athame/configuration.nix b/config/hosts/athame/configuration.nix
index 1f59462d..a930ee63 100644
--- a/config/hosts/athame/configuration.nix
+++ b/config/hosts/athame/configuration.nix
@@ -1,24 +1,23 @@
 { config, pkgs, ... }:
 
-let unstable = import <nixos-unstable> { };
-in {
+{
   imports = [
-    ./hardware-configuration.nix
+    ./hardware.nix
     # db 
-    ./services/postgres.nix
+    ./postgres.nix
     # nginx
     ../../services/nginx.nix
-    ./services/virtualHosts.nix
+    ./virtualhosts.nix
     # services
-    ./services/gitea.nix
-    ./services/nextcloud.nix
-    ./services/bitwarden.nix
-    # comms services
-    ./services/znc.nix
-    ./services/weechat.nix
-    ./services/matrix.nix
+    ./gitea.nix
+    ./nextcloud.nix
+    ./bitwarden.nix
+    # comms
+    ./znc.nix
+    ./weechat.nix
+    ./matrix.nix
   ];
-  
+
   meta.deploy.ssh.host = "athame.kittywit.ch";
 
   boot.loader.grub.enable = true;
diff --git a/config/hosts/athame/services/gitea.nix b/config/hosts/athame/gitea.nix
similarity index 100%
rename from config/hosts/athame/services/gitea.nix
rename to config/hosts/athame/gitea.nix
diff --git a/config/hosts/athame/hardware-configuration.nix b/config/hosts/athame/hardware.nix
similarity index 100%
rename from config/hosts/athame/hardware-configuration.nix
rename to config/hosts/athame/hardware.nix
diff --git a/config/hosts/athame/services/matrix.nix b/config/hosts/athame/matrix.nix
similarity index 100%
rename from config/hosts/athame/services/matrix.nix
rename to config/hosts/athame/matrix.nix
diff --git a/config/hosts/athame/services/nextcloud.nix b/config/hosts/athame/nextcloud.nix
similarity index 100%
rename from config/hosts/athame/services/nextcloud.nix
rename to config/hosts/athame/nextcloud.nix
diff --git a/config/hosts/athame/services/postgres.nix b/config/hosts/athame/postgres.nix
similarity index 100%
rename from config/hosts/athame/services/postgres.nix
rename to config/hosts/athame/postgres.nix
diff --git a/config/hosts/athame/services/znc.nix b/config/hosts/athame/services/znc.nix
deleted file mode 100644
index 9e213e7d..00000000
--- a/config/hosts/athame/services/znc.nix
+++ /dev/null
@@ -1,45 +0,0 @@
-{ config, pkgs, ... }:
-
-let secrets = (import ../../../../secrets.nix);
-in {
-  services.znc = {
-    enable = true;
-    mutable = false;
-    useLegacyConfig = false;
-    openFirewall = false;
-    config = {
-      Listener.l = {
-        Port = 5000;
-        SSL = false;
-        AllowWeb = true;
-      };
-      modules = [ "webadmin" "adminlog" ];
-      User.kat = {
-        Admin = true;
-        Nick = secrets.hosts.athame.znc.nick;
-        AltNick = secrets.hosts.athame.znc.altNick;
-        Network.freenode = {
-          Server = "chat.freenode.net +6697 ${secrets.hosts.athame.znc.freenode.password}";
-          Chan = secrets.hosts.athame.znc.freenode.channels;
-          Nick = secrets.hosts.athame.znc.freenode.nick;
-          AltNick = secrets.hosts.athame.znc.freenode.altNick;
-          JoinDelay = 2;
-          LoadModule = [ "simple_away" "nickserv" ];
-        };
-        Network.espernet = {
-          Server = "anarchy.esper.net +6697 ${secrets.hosts.athame.znc.espernet.password}";
-          Chan = secrets.hosts.athame.znc.espernet.channels;
-          Nick = secrets.hosts.athame.znc.espernet.nick;
-          AltNick = secrets.hosts.athame.znc.espernet.altNick;
-          JoinDelay = 2;
-          LoadModule = [ "simple_away" "nickserv" ];
-        };
-        Pass.password = {
-          Method = secrets.hosts.athame.znc.password.method;
-          Hash = secrets.hosts.athame.znc.password.hash;
-          Salt = secrets.hosts.athame.znc.password.salt;
-        };
-      };
-    };
-  };
-}
diff --git a/config/hosts/athame/services/virtualHosts.nix b/config/hosts/athame/virtualhosts.nix
similarity index 100%
rename from config/hosts/athame/services/virtualHosts.nix
rename to config/hosts/athame/virtualhosts.nix
diff --git a/config/hosts/athame/services/weechat.nix b/config/hosts/athame/weechat.nix
similarity index 100%
rename from config/hosts/athame/services/weechat.nix
rename to config/hosts/athame/weechat.nix
diff --git a/config/hosts/athame/znc.nix b/config/hosts/athame/znc.nix
new file mode 100644
index 00000000..6e451fd6
--- /dev/null
+++ b/config/hosts/athame/znc.nix
@@ -0,0 +1,20 @@
+{ config, pkgs, ... }:
+
+let secrets = (import ../../../../secrets.nix);
+in {
+  services.znc = {
+    enable = true;
+    mutable = false;
+    useLegacyConfig = false;
+    openFirewall = false;
+    config = {
+      Listener.l = {
+        Port = 5000;
+        SSL = false;
+        AllowWeb = true;
+      };
+      modules = [ "webadmin" "adminlog" ];
+      User = secrets.hosts.athame.znc;
+    };
+  };
+}
diff --git a/config/hosts/boline/configuration.nix b/config/hosts/boline/configuration.nix
index cdb8062f..624eb97f 100644
--- a/config/hosts/boline/configuration.nix
+++ b/config/hosts/boline/configuration.nix
@@ -2,7 +2,7 @@
 
 {
   imports = [
-    ./hardware-configuration.nix
+    ./hardware.nix
     #./wireguard.nix
   ];
 
diff --git a/config/hosts/boline/hardware-configuration.nix b/config/hosts/boline/hardware.nix
similarity index 100%
rename from config/hosts/boline/hardware-configuration.nix
rename to config/hosts/boline/hardware.nix
diff --git a/config/hosts/samhain/configuration.nix b/config/hosts/samhain/configuration.nix
index d5fb8cbb..328eb649 100644
--- a/config/hosts/samhain/configuration.nix
+++ b/config/hosts/samhain/configuration.nix
@@ -3,10 +3,10 @@
 {
   imports = [
     ../../services/zfs.nix
-    ./hardware-configuration.nix
+    ./hardware.nix
     ../../services/nginx.nix
-    ./services/thermal/thermal.nix
-    ./services/torrenting.nix
+    ./thermal/thermal.nix
+    ./torrenting.nix
   ];
 
   meta.deploy.profiles =
diff --git a/config/hosts/samhain/hardware-configuration.nix b/config/hosts/samhain/hardware.nix
similarity index 100%
rename from config/hosts/samhain/hardware-configuration.nix
rename to config/hosts/samhain/hardware.nix
diff --git a/config/hosts/samhain/services/thermal/kaede-power.sh b/config/hosts/samhain/thermal/kaede-power.sh
similarity index 100%
rename from config/hosts/samhain/services/thermal/kaede-power.sh
rename to config/hosts/samhain/thermal/kaede-power.sh
diff --git a/config/hosts/samhain/services/thermal/kaede-thermald.xml b/config/hosts/samhain/thermal/kaede-thermald.xml
similarity index 100%
rename from config/hosts/samhain/services/thermal/kaede-thermald.xml
rename to config/hosts/samhain/thermal/kaede-thermald.xml
diff --git a/config/hosts/samhain/services/thermal/kaede-thermals.sh b/config/hosts/samhain/thermal/kaede-thermals.sh
similarity index 100%
rename from config/hosts/samhain/services/thermal/kaede-thermals.sh
rename to config/hosts/samhain/thermal/kaede-thermals.sh
diff --git a/config/hosts/samhain/services/thermal/thermal.nix b/config/hosts/samhain/thermal/thermal.nix
similarity index 100%
rename from config/hosts/samhain/services/thermal/thermal.nix
rename to config/hosts/samhain/thermal/thermal.nix
diff --git a/config/hosts/samhain/services/torrenting.nix b/config/hosts/samhain/torrenting.nix
similarity index 100%
rename from config/hosts/samhain/services/torrenting.nix
rename to config/hosts/samhain/torrenting.nix
diff --git a/config/hosts/yule/configuration.nix b/config/hosts/yule/configuration.nix
index 67a7e23d..71ad021a 100644
--- a/config/hosts/yule/configuration.nix
+++ b/config/hosts/yule/configuration.nix
@@ -2,7 +2,7 @@
 
 {
   imports = [
-    ./hardware-configuration.nix
+    ./hardware.nix
     ../../services/zfs.nix
   ];
 
diff --git a/config/hosts/yule/hardware-configuration.nix b/config/hosts/yule/hardware.nix
similarity index 100%
rename from config/hosts/yule/hardware-configuration.nix
rename to config/hosts/yule/hardware.nix