From 9c89a95896f856271c808c6117c71b855cd172f5 Mon Sep 17 00:00:00 2001
From: kat witch <kat@kittywit.ch>
Date: Tue, 4 Jan 2022 04:47:19 +0000
Subject: [PATCH] daiyousei: migration part 1.5

---
 config/hosts/daiyousei.nix            |  3 +++
 config/hosts/kyouko.nix               |  5 ++---
 config/tf                             |  2 +-
 config/users/kat/base/weechat.nix     |  6 +++---
 config/users/kat/personal/weechat.nix |  6 +++---
 config/users/kat/services/weechat.nix |  6 +++---
 flake.lock                            | 12 ++++++------
 7 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/config/hosts/daiyousei.nix b/config/hosts/daiyousei.nix
index 67144e09..84fe0ef7 100644
--- a/config/hosts/daiyousei.nix
+++ b/config/hosts/daiyousei.nix
@@ -3,6 +3,7 @@
     profiles.hardware.aarch64
     profiles.hardware.oracle.ubuntu
     profiles.network
+    users.kat.services.weechat
     services.nginx
     services.gitea
     services.murmur
@@ -20,6 +21,8 @@
     services.website
     services.dnscrypt-proxy
     services.vaultwarden
+    services.weechat
+    services.znc
   ];
 
   kw.oci = {
diff --git a/config/hosts/kyouko.nix b/config/hosts/kyouko.nix
index eb5277c8..b11ff8ca 100644
--- a/config/hosts/kyouko.nix
+++ b/config/hosts/kyouko.nix
@@ -9,14 +9,13 @@ with lib;
     profiles.hardware.hcloud-imperative
     profiles.network
     users.kat.server
-    users.kat.services.weechat
+#    users.kat.services.weechat
     services.logrotate
     services.nginx
     services.postgres
     services.restic
     services.taskserver
-    services.weechat
-    services.znc
+#    services.znc
   ];
 
   kw.monitoring = {
diff --git a/config/tf b/config/tf
index 59407637..e5b12b64 160000
--- a/config/tf
+++ b/config/tf
@@ -1 +1 @@
-Subproject commit 5940763767ab723f39806dd61d21fb82975c4bb8
+Subproject commit e5b12b6415a963ea0c86fc972ebe46c094c87504
diff --git a/config/users/kat/base/weechat.nix b/config/users/kat/base/weechat.nix
index 7a4463f2..cde6a3ad 100644
--- a/config/users/kat/base/weechat.nix
+++ b/config/users/kat/base/weechat.nix
@@ -6,9 +6,9 @@ with lib;
   programs.weechat = {
     init = lib.mkMerge [
       (lib.mkBefore ''
-        /server add espernet kyouko.kittywit.ch/5001 -ssl -autoconnect
-        /server add softnet kyouko.kittywit.ch/5001 -ssl -autoconnect
-        /server add liberachat kyouko.kittywit.ch/5001 -ssl -autoconnect
+        /server add espernet znc.kittywit.ch/5001 -ssl -autoconnect
+        /server add softnet znc.kittywit.ch/5001 -ssl -autoconnect
+        /server add liberachat znc.kittywit.ch/5001 -ssl -autoconnect
         /matrix server add kittywitch kittywit.ch
         /key bind meta-g /go
         /key bind meta-v /input jump_last_buffer_displayed
diff --git a/config/users/kat/personal/weechat.nix b/config/users/kat/personal/weechat.nix
index f608c834..84cc8547 100644
--- a/config/users/kat/personal/weechat.nix
+++ b/config/users/kat/personal/weechat.nix
@@ -37,21 +37,21 @@
       irc = {
         server = {
           softnet = {
-            addresses = "kyouko.kittywit.ch/5001";
+            addresses = "znc.kittywit.ch/5001";
             password = "kat@${nixos.networking.hostName}/softnet:\${sec.data.znc}";
             ssl = true;
             ssl_verify = false;
             autoconnect = true;
           };
           liberachat = {
-            addresses = "kyouko.kittywit.ch/5001";
+            addresses = "znc.kittywit.ch/5001";
             password = "kat@${nixos.networking.hostName}/liberachat:\${sec.data.znc}";
             ssl = true;
             ssl_verify = false;
             autoconnect = true;
           };
           espernet = {
-            addresses = "kyouko.kittywit.ch/5001";
+            addresses = "znc.kittywit.ch/5001";
             password = "kat@${nixos.networking.hostName}/espernet:\${sec.data.znc}";
             ssl = true;
             ssl_verify = false;
diff --git a/config/users/kat/services/weechat.nix b/config/users/kat/services/weechat.nix
index c863d346..c7bb819f 100644
--- a/config/users/kat/services/weechat.nix
+++ b/config/users/kat/services/weechat.nix
@@ -54,21 +54,21 @@
       irc = {
         server = {
           softnet = {
-            addresses = "kyouko.kittywit.ch/5001";
+            addresses = "znc.kittywit.ch/5001";
             password = "kat@${nixos.networking.hostName}/softnet:\${sec.data.znc}";
             ssl = true;
             ssl_verify = false;
             autoconnect = true;
           };
           liberachat = {
-            addresses = "kyouko.kittywit.ch/5001";
+            addresses = "znc.kittywit.ch/5001";
             password = "kat@${nixos.networking.hostName}/liberachat:\${sec.data.znc}";
             ssl = true;
             ssl_verify = false;
             autoconnect = true;
           };
           espernet = {
-            addresses = "kyouko.kittywit.ch/5001";
+            addresses = "znc.kittywit.ch/5001";
             password = "kat@${nixos.networking.hostName}/espernet:\${sec.data.znc}";
             ssl = true;
             ssl_verify = false;
diff --git a/flake.lock b/flake.lock
index 15d1bbd2..7355b8b5 100644
--- a/flake.lock
+++ b/flake.lock
@@ -20,11 +20,11 @@
     "arcexprs": {
       "flake": false,
       "locked": {
-        "lastModified": 1638641209,
-        "narHash": "sha256-TWwp84CpYNyfp2ECzt/mzyIicev6mfn9IzZ4if/xW+0=",
+        "lastModified": 1641269180,
+        "narHash": "sha256-yxKrSjZIsagr6DoiTSfHk9FTMNmMWd6/eCdIbANQUY8=",
         "owner": "arcnmx",
         "repo": "nixexprs",
-        "rev": "0262eed347d7d481b62754ecac14bb8cd40a54cd",
+        "rev": "ae4a52292edbcc49e39e9d40f70f2b27948ef4a6",
         "type": "github"
       },
       "original": {
@@ -391,11 +391,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1638806821,
-        "narHash": "sha256-v2qd2Bsmzft53s43eCbN+4ocrLksRdFLyF/MAGuWuDA=",
+        "lastModified": 1641230035,
+        "narHash": "sha256-hFyqihERaTbLxCOlugy/rpp22VLtLh8SPRnA2uu3F/8=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "bc5d68306b40b8522ffb69ba6cff91898c2fbbff",
+        "rev": "78cd22c1b8604de423546cd49bfe264b786eca13",
         "type": "github"
       },
       "original": {