Doing some more layout changes.

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;

config/hosts/athame/services/znc.nix

@@ -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;
-        };
-      };
-    };
-  };
-}

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;
+    };
+  };
+}

config/hosts/boline/configuration.nix

@@ -2,7 +2,7 @@
 
 {
   imports = [
-    ./hardware-configuration.nix
+    ./hardware.nix
     #./wireguard.nix
   ];
 

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 =

config/hosts/yule/configuration.nix

@@ -2,7 +2,7 @@
 
 {
   imports = [
-    ./hardware-configuration.nix
+    ./hardware.nix
     ../../services/zfs.nix
   ];