From 4cdf9547329e69e5207e848f6e754e2cb13d3bc8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kier=C3=A1n=20Meinhardt?= Date: Sun, 19 Sep 2021 09:41:51 +0200 Subject: [PATCH] feat: wilde -> kabsa --- .versions/retiolum.json | 8 ++++---- configs/cloud.nix | 8 ++++---- configs/mail/fetcher.nix | 2 +- configs/ssh.nix | 4 ++-- configs/tuna.nix | 4 ++-- deploy.nix | 8 ++++---- lib/default.nix | 2 +- lib/local-network.nix | 2 +- systems/{wilde => kabsa}/configuration.nix | 4 ++-- systems/{wilde => kabsa}/hardware-configuration.nix | 0 10 files changed, 21 insertions(+), 21 deletions(-) rename systems/{wilde => kabsa}/configuration.nix (92%) rename systems/{wilde => kabsa}/hardware-configuration.nix (100%) diff --git a/.versions/retiolum.json b/.versions/retiolum.json index 6b88841..f953aa3 100644 --- a/.versions/retiolum.json +++ b/.versions/retiolum.json @@ -1,9 +1,9 @@ { "url": "https://github.com/krebs/retiolum", - "rev": "a643fe16365118d53ee2aa2d6205d0f0dae3719f", - "date": "2021-09-06T21:02:13+02:00", - "path": "/nix/store/r7fn6j86hn9089ls0rgbsp51qsyzmpib-retiolum", - "sha256": "1hbdli97ad0ajcm9gj1jnn7y6g0058i3hpdj8hyv2vkxsnshqdw4", + "rev": "5384cff550036aa3581f8c6f851392329f28ffe8", + "date": "2021-09-19T09:32:14+02:00", + "path": "/nix/store/izzhb6p76h96zmlz5xdxa1xrpixhbk4s-retiolum", + "sha256": "07318jnkb8zycyi43fydrmrsrbq9ajhb2nnaahj1bxg77pb4wj7a", "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/configs/cloud.nix b/configs/cloud.nix index b3411dc..e521ab7 100644 --- a/configs/cloud.nix +++ b/configs/cloud.nix @@ -40,11 +40,11 @@ folders = let cloud-dir = "${config.users.users.me.home}/cloud"; in { - "${cloud-dir}/syncthing/common".devices = [ "wilde" "manakish" ]; - "${cloud-dir}/syncthing/library".devices = [ "wilde" "manakish" "heym" ]; - "${cloud-dir}/syncthing/mundoiu".devices = [ "wilde" "manakish" "heym" ]; + "${cloud-dir}/syncthing/common".devices = [ "kabsa" "manakish" ]; + "${cloud-dir}/syncthing/library".devices = [ "kabsa" "manakish" "heym" ]; + "${cloud-dir}/syncthing/mundoiu".devices = [ "kabsa" "manakish" "heym" ]; "${cloud-dir}/syncthing/music" = { - devices = [ "wilde" "manakish" "heym" "zaatar" ]; + devices = [ "kabsa" "manakish" "heym" "zaatar" ]; id = "music"; }; }; diff --git a/configs/mail/fetcher.nix b/configs/mail/fetcher.nix index 81a6146..68b0e04 100644 --- a/configs/mail/fetcher.nix +++ b/configs/mail/fetcher.nix @@ -47,7 +47,7 @@ in systemd.services.mail-sync = let - hosts = [ "manakish.r" "wilde.r" ]; + hosts = [ "manakish.r" "kabsa.r" ]; in { enable = true; wants = [ "network-online.target" config.krebs.secret.files.email-ssh.service ]; diff --git a/configs/ssh.nix b/configs/ssh.nix index cc979e8..245d0dd 100644 --- a/configs/ssh.nix +++ b/configs/ssh.nix @@ -35,8 +35,8 @@ in { user = "root"; port = sshPort; }; - wilde = { - hostname = "wilde.r"; + kabsa = { + hostname = "kabsa.r"; user = "kfm"; port = sshPort; }; diff --git a/configs/tuna.nix b/configs/tuna.nix index 3a02b63..5ce91b6 100644 --- a/configs/tuna.nix +++ b/configs/tuna.nix @@ -23,10 +23,10 @@ in cert = toString ; key = toString ; devices = { - inherit ((import ).syncthing.devices) wilde manakish heym; + inherit ((import ).syncthing.devices) kabsa manakish heym; }; folders.${config.services.mpd.musicDirectory} = { - devices = [ "heym" "wilde" "manakish" ]; + devices = [ "heym" "kabsa" "manakish" ]; id = "music"; type = "receiveonly"; }; diff --git a/deploy.nix b/deploy.nix index b1969b5..3f7968a 100644 --- a/deploy.nix +++ b/deploy.nix @@ -43,10 +43,10 @@ in { name = "zaatar"; address = "zaatar.r"; }); - wilde = writeDeploy "deploy-wilde" (regularSystem { - path = systems/wilde; - name = "wilde"; - address = "wilde.r"; + kabsa = writeDeploy "deploy-kabsa" (regularSystem { + path = systems/kabsa; + name = "kabsa"; + address = "kabsa.r"; }); toum = writeDeploy "deploy-toum" (regularSystem { path = systems/toum; diff --git a/lib/default.nix b/lib/default.nix index 1015b21..1f54d37 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -43,7 +43,7 @@ rec { }; syncthing.devices = { - wilde.id = "R6DEBD7-G5RYDKN-VFA3HPO-WX4DNVI-373F7OQ-AW5MZTT-3L4BDVW-Y6ROEAF"; + kabsa.id = "R6DEBD7-G5RYDKN-VFA3HPO-WX4DNVI-373F7OQ-AW5MZTT-3L4BDVW-Y6ROEAF"; heym.id = "HLQSG3D-WSKLA6S-MEYQ3EU-GDBGABE-PY53RQ6-SWQAP2I-Z5MVBVX-MYPJXAM"; manakish.id = "AJVBWR2-VFFAGZF-7ZF5JAX-T63GMOG-NZ446WK-MC5E6WK-6X6Q2HE-QQA2JQ3"; toum.id = "CBJQXFF-FMFGWFU-2J6FMPR-SRDTSGX-7NHOYOH-CQCABKF-KQJMRJC-SDE24Q4"; diff --git a/lib/local-network.nix b/lib/local-network.nix index 98219b3..f1ee07a 100644 --- a/lib/local-network.nix +++ b/lib/local-network.nix @@ -1,7 +1,7 @@ { toum = "192.168.178.24"; zaatar = "192.168.178.21"; - wilde = "192.168.178.32"; + kabsa = "192.168.178.32"; android = "192.168.178.35"; manakish = "192.168.178.29"; diff --git a/systems/wilde/configuration.nix b/systems/kabsa/configuration.nix similarity index 92% rename from systems/wilde/configuration.nix rename to systems/kabsa/configuration.nix index 4dc91d9..44dfdf0 100644 --- a/systems/wilde/configuration.nix +++ b/systems/kabsa/configuration.nix @@ -35,13 +35,13 @@ in boot.loader.efi.canTouchEfiVariables = true; - networking.hostName = "wilde"; + networking.hostName = "kabsa"; networking.wireless.interfaces = [ "wlp3s0" ]; networking.retiolum = { ipv4 = "10.243.2.4"; - ipv6 = "42:0:3c46:907c:1fb8:b74f:c59b:1ee3"; + ipv6 = "42:0:3c46:861f:a118:8e9a:82c9:3d"; }; system.stateVersion = "19.03"; diff --git a/systems/wilde/hardware-configuration.nix b/systems/kabsa/hardware-configuration.nix similarity index 100% rename from systems/wilde/hardware-configuration.nix rename to systems/kabsa/hardware-configuration.nix