mirror of
https://github.com/kmein/niveum
synced 2026-03-16 10:11:08 +01:00
feat: wilde -> kabsa
This commit is contained in:
@@ -1,9 +1,9 @@
|
|||||||
{
|
{
|
||||||
"url": "https://github.com/krebs/retiolum",
|
"url": "https://github.com/krebs/retiolum",
|
||||||
"rev": "a643fe16365118d53ee2aa2d6205d0f0dae3719f",
|
"rev": "5384cff550036aa3581f8c6f851392329f28ffe8",
|
||||||
"date": "2021-09-06T21:02:13+02:00",
|
"date": "2021-09-19T09:32:14+02:00",
|
||||||
"path": "/nix/store/r7fn6j86hn9089ls0rgbsp51qsyzmpib-retiolum",
|
"path": "/nix/store/izzhb6p76h96zmlz5xdxa1xrpixhbk4s-retiolum",
|
||||||
"sha256": "1hbdli97ad0ajcm9gj1jnn7y6g0058i3hpdj8hyv2vkxsnshqdw4",
|
"sha256": "07318jnkb8zycyi43fydrmrsrbq9ajhb2nnaahj1bxg77pb4wj7a",
|
||||||
"fetchSubmodules": false,
|
"fetchSubmodules": false,
|
||||||
"deepClone": false,
|
"deepClone": false,
|
||||||
"leaveDotGit": false
|
"leaveDotGit": false
|
||||||
|
|||||||
@@ -40,11 +40,11 @@
|
|||||||
folders =
|
folders =
|
||||||
let cloud-dir = "${config.users.users.me.home}/cloud";
|
let cloud-dir = "${config.users.users.me.home}/cloud";
|
||||||
in {
|
in {
|
||||||
"${cloud-dir}/syncthing/common".devices = [ "wilde" "manakish" ];
|
"${cloud-dir}/syncthing/common".devices = [ "kabsa" "manakish" ];
|
||||||
"${cloud-dir}/syncthing/library".devices = [ "wilde" "manakish" "heym" ];
|
"${cloud-dir}/syncthing/library".devices = [ "kabsa" "manakish" "heym" ];
|
||||||
"${cloud-dir}/syncthing/mundoiu".devices = [ "wilde" "manakish" "heym" ];
|
"${cloud-dir}/syncthing/mundoiu".devices = [ "kabsa" "manakish" "heym" ];
|
||||||
"${cloud-dir}/syncthing/music" = {
|
"${cloud-dir}/syncthing/music" = {
|
||||||
devices = [ "wilde" "manakish" "heym" "zaatar" ];
|
devices = [ "kabsa" "manakish" "heym" "zaatar" ];
|
||||||
id = "music";
|
id = "music";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -47,7 +47,7 @@ in
|
|||||||
|
|
||||||
systemd.services.mail-sync =
|
systemd.services.mail-sync =
|
||||||
let
|
let
|
||||||
hosts = [ "manakish.r" "wilde.r" ];
|
hosts = [ "manakish.r" "kabsa.r" ];
|
||||||
in {
|
in {
|
||||||
enable = true;
|
enable = true;
|
||||||
wants = [ "network-online.target" config.krebs.secret.files.email-ssh.service ];
|
wants = [ "network-online.target" config.krebs.secret.files.email-ssh.service ];
|
||||||
|
|||||||
@@ -35,8 +35,8 @@ in {
|
|||||||
user = "root";
|
user = "root";
|
||||||
port = sshPort;
|
port = sshPort;
|
||||||
};
|
};
|
||||||
wilde = {
|
kabsa = {
|
||||||
hostname = "wilde.r";
|
hostname = "kabsa.r";
|
||||||
user = "kfm";
|
user = "kfm";
|
||||||
port = sshPort;
|
port = sshPort;
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -23,10 +23,10 @@ in
|
|||||||
cert = toString <system-secrets/syncthing/cert.pem>;
|
cert = toString <system-secrets/syncthing/cert.pem>;
|
||||||
key = toString <system-secrets/syncthing/key.pem>;
|
key = toString <system-secrets/syncthing/key.pem>;
|
||||||
devices = {
|
devices = {
|
||||||
inherit ((import <niveum/lib>).syncthing.devices) wilde manakish heym;
|
inherit ((import <niveum/lib>).syncthing.devices) kabsa manakish heym;
|
||||||
};
|
};
|
||||||
folders.${config.services.mpd.musicDirectory} = {
|
folders.${config.services.mpd.musicDirectory} = {
|
||||||
devices = [ "heym" "wilde" "manakish" ];
|
devices = [ "heym" "kabsa" "manakish" ];
|
||||||
id = "music";
|
id = "music";
|
||||||
type = "receiveonly";
|
type = "receiveonly";
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -43,10 +43,10 @@ in {
|
|||||||
name = "zaatar";
|
name = "zaatar";
|
||||||
address = "zaatar.r";
|
address = "zaatar.r";
|
||||||
});
|
});
|
||||||
wilde = writeDeploy "deploy-wilde" (regularSystem {
|
kabsa = writeDeploy "deploy-kabsa" (regularSystem {
|
||||||
path = systems/wilde;
|
path = systems/kabsa;
|
||||||
name = "wilde";
|
name = "kabsa";
|
||||||
address = "wilde.r";
|
address = "kabsa.r";
|
||||||
});
|
});
|
||||||
toum = writeDeploy "deploy-toum" (regularSystem {
|
toum = writeDeploy "deploy-toum" (regularSystem {
|
||||||
path = systems/toum;
|
path = systems/toum;
|
||||||
|
|||||||
@@ -43,7 +43,7 @@ rec {
|
|||||||
};
|
};
|
||||||
|
|
||||||
syncthing.devices = {
|
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";
|
heym.id = "HLQSG3D-WSKLA6S-MEYQ3EU-GDBGABE-PY53RQ6-SWQAP2I-Z5MVBVX-MYPJXAM";
|
||||||
manakish.id = "AJVBWR2-VFFAGZF-7ZF5JAX-T63GMOG-NZ446WK-MC5E6WK-6X6Q2HE-QQA2JQ3";
|
manakish.id = "AJVBWR2-VFFAGZF-7ZF5JAX-T63GMOG-NZ446WK-MC5E6WK-6X6Q2HE-QQA2JQ3";
|
||||||
toum.id = "CBJQXFF-FMFGWFU-2J6FMPR-SRDTSGX-7NHOYOH-CQCABKF-KQJMRJC-SDE24Q4";
|
toum.id = "CBJQXFF-FMFGWFU-2J6FMPR-SRDTSGX-7NHOYOH-CQCABKF-KQJMRJC-SDE24Q4";
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
toum = "192.168.178.24";
|
toum = "192.168.178.24";
|
||||||
zaatar = "192.168.178.21";
|
zaatar = "192.168.178.21";
|
||||||
wilde = "192.168.178.32";
|
kabsa = "192.168.178.32";
|
||||||
android = "192.168.178.35";
|
android = "192.168.178.35";
|
||||||
manakish = "192.168.178.29";
|
manakish = "192.168.178.29";
|
||||||
|
|
||||||
|
|||||||
@@ -35,13 +35,13 @@ in
|
|||||||
|
|
||||||
boot.loader.efi.canTouchEfiVariables = true;
|
boot.loader.efi.canTouchEfiVariables = true;
|
||||||
|
|
||||||
networking.hostName = "wilde";
|
networking.hostName = "kabsa";
|
||||||
|
|
||||||
networking.wireless.interfaces = [ "wlp3s0" ];
|
networking.wireless.interfaces = [ "wlp3s0" ];
|
||||||
|
|
||||||
networking.retiolum = {
|
networking.retiolum = {
|
||||||
ipv4 = "10.243.2.4";
|
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";
|
system.stateVersion = "19.03";
|
||||||
Reference in New Issue
Block a user