21.05 -> 21.11 robi
This commit is contained in:
Ingolf Wagner
parent
708616b7b2
commit
e8492a17bb
8 changed files with 344 additions and 363 deletions
|
|
@ -38,11 +38,11 @@
|
|||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1635070614,
|
||||
"narHash": "sha256-eRup9WsvSIhsRrSlNugPcQ7gfGOsbk3d4izufwVlz1Q=",
|
||||
"lastModified": 1641229786,
|
||||
"narHash": "sha256-WPPcLNbVu6ryj772GooUpF285LOvRHdOo/UNJgPnFYI=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "3b1789322fcbcb5cf51228d732752714f1bf77da",
|
||||
"rev": "88579effa7e88c25087faf6de6388d0cd1738dc0",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
|
|||
|
|
@ -98,7 +98,9 @@ in
|
|||
users.users.nextcloud = {
|
||||
isSystemUser = true;
|
||||
uid = nextcloudUid;
|
||||
group = "nextcloud";
|
||||
};
|
||||
users.groups.nextcloud = { };
|
||||
|
||||
|
||||
# Container Setup
|
||||
|
|
@ -135,23 +137,23 @@ in
|
|||
isReadOnly = false;
|
||||
};
|
||||
samples = {
|
||||
mountPoint = toString config.services.syncthing.declarative.folders.samples.path;
|
||||
hostPath = toString config.services.syncthing.declarative.folders.samples.path;
|
||||
mountPoint = toString config.services.syncthing.folders.samples.path;
|
||||
hostPath = toString config.services.syncthing.folders.samples.path;
|
||||
isReadOnly = true;
|
||||
};
|
||||
movies = {
|
||||
mountPoint = toString config.services.syncthing.declarative.folders.movies.path;
|
||||
hostPath = toString config.services.syncthing.declarative.folders.movies.path;
|
||||
mountPoint = toString config.services.syncthing.folders.movies.path;
|
||||
hostPath = toString config.services.syncthing.folders.movies.path;
|
||||
isReadOnly = true;
|
||||
};
|
||||
music = {
|
||||
mountPoint = toString config.services.syncthing.declarative.folders.music-library.path;
|
||||
hostPath = toString config.services.syncthing.declarative.folders.music-library.path;
|
||||
mountPoint = toString config.services.syncthing.folders.music-library.path;
|
||||
hostPath = toString config.services.syncthing.folders.music-library.path;
|
||||
isReadOnly = true;
|
||||
};
|
||||
series = {
|
||||
mountPoint = toString config.services.syncthing.declarative.folders.series.path;
|
||||
hostPath = toString config.services.syncthing.declarative.folders.series.path;
|
||||
mountPoint = toString config.services.syncthing.folders.series.path;
|
||||
hostPath = toString config.services.syncthing.folders.series.path;
|
||||
isReadOnly = true;
|
||||
};
|
||||
};
|
||||
|
|
@ -214,6 +216,7 @@ in
|
|||
innodb_large_prefix = true;
|
||||
innodb_file_format = "barracuda";
|
||||
innodb_file_per_table = 1;
|
||||
innodb_read_only_compressed = 0;
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -13,95 +13,93 @@
|
|||
openDefaultPorts = false;
|
||||
dataDir = "/media/syncthing";
|
||||
configDir = "/media/syncthing";
|
||||
declarative = {
|
||||
overrideDevices = true;
|
||||
overrideFolders = true;
|
||||
cert = toString config.sops.secrets.syncthing_cert.path;
|
||||
key = toString config.sops.secrets.syncthing_key.path;
|
||||
overrideDevices = true;
|
||||
overrideFolders = true;
|
||||
cert = toString config.sops.secrets.syncthing_cert.path;
|
||||
key = toString config.sops.secrets.syncthing_key.path;
|
||||
|
||||
folders = {
|
||||
folders = {
|
||||
|
||||
# on encrypted hard drive
|
||||
# -----------------------
|
||||
#private = {
|
||||
# enable = true;
|
||||
# path = "/home/syncthing/private";
|
||||
#};
|
||||
#desktop = {
|
||||
# enable = true;
|
||||
# path = "/home/syncthing/desktop";
|
||||
#};
|
||||
#finance = {
|
||||
# enable = true;
|
||||
# path = "/home/syncthing/finance";
|
||||
#};
|
||||
#fotos = {
|
||||
# enable = true;
|
||||
# path = "/home/syncthing/fotos";
|
||||
#};
|
||||
#lost-fotos = {
|
||||
# enable = true;
|
||||
# path = "/home/syncthing/lost-fotos.ct";
|
||||
#};
|
||||
#zettlr = {
|
||||
# enable = true;
|
||||
# path = "/home/syncthing/zettlr";
|
||||
#};
|
||||
|
||||
# on media hard drive (not encrypted)
|
||||
# -----------------------------------
|
||||
#borg-mirror = {
|
||||
# enable = true;
|
||||
# path = "/media/syncthing/borg";
|
||||
# rescanInterval = 36 * 3600;
|
||||
# type = "sendonly";
|
||||
#};
|
||||
#video-material = {
|
||||
# enable = true;
|
||||
# path = "/home/syncthing/video-material";
|
||||
#};
|
||||
#music-library-free = {
|
||||
# enable = true;
|
||||
# path = "/media/syncthing/music-library-free";
|
||||
# rescanInterval = 8 * 3600;
|
||||
#};
|
||||
books = {
|
||||
enable = true;
|
||||
path = "/media/syncthing/books";
|
||||
};
|
||||
samples = {
|
||||
enable = true;
|
||||
path = "/media/syncthing/samples";
|
||||
};
|
||||
movies = {
|
||||
enable = true;
|
||||
path = "/media/syncthing/movies";
|
||||
};
|
||||
series = {
|
||||
enable = true;
|
||||
path = "/media/syncthing/series";
|
||||
};
|
||||
music-library = {
|
||||
enable = true;
|
||||
path = "/media/syncthing/music";
|
||||
};
|
||||
# todo : no need to place it on encrypted drive
|
||||
#music-projects = {
|
||||
# enable = true;
|
||||
# path = "/home/syncthing/music-projects";
|
||||
#};
|
||||
#smartphone-folder = {
|
||||
# enable = true;
|
||||
# path = "/media/syncthing/smartphone-folder";
|
||||
# rescanInterval = 8 * 3600;
|
||||
#};
|
||||
#processing = {
|
||||
# enable = true;
|
||||
# path = "/media/syncthing/sketchbook";
|
||||
# rescanInterval = 8 * 3600;
|
||||
#};
|
||||
# on encrypted hard drive
|
||||
# -----------------------
|
||||
#private = {
|
||||
# enable = true;
|
||||
# path = "/home/syncthing/private";
|
||||
#};
|
||||
#desktop = {
|
||||
# enable = true;
|
||||
# path = "/home/syncthing/desktop";
|
||||
#};
|
||||
#finance = {
|
||||
# enable = true;
|
||||
# path = "/home/syncthing/finance";
|
||||
#};
|
||||
#fotos = {
|
||||
# enable = true;
|
||||
# path = "/home/syncthing/fotos";
|
||||
#};
|
||||
#lost-fotos = {
|
||||
# enable = true;
|
||||
# path = "/home/syncthing/lost-fotos.ct";
|
||||
#};
|
||||
#zettlr = {
|
||||
# enable = true;
|
||||
# path = "/home/syncthing/zettlr";
|
||||
#};
|
||||
|
||||
# on media hard drive (not encrypted)
|
||||
# -----------------------------------
|
||||
#borg-mirror = {
|
||||
# enable = true;
|
||||
# path = "/media/syncthing/borg";
|
||||
# rescanInterval = 36 * 3600;
|
||||
# type = "sendonly";
|
||||
#};
|
||||
#video-material = {
|
||||
# enable = true;
|
||||
# path = "/home/syncthing/video-material";
|
||||
#};
|
||||
#music-library-free = {
|
||||
# enable = true;
|
||||
# path = "/media/syncthing/music-library-free";
|
||||
# rescanInterval = 8 * 3600;
|
||||
#};
|
||||
books = {
|
||||
enable = true;
|
||||
path = "/media/syncthing/books";
|
||||
};
|
||||
samples = {
|
||||
enable = true;
|
||||
path = "/media/syncthing/samples";
|
||||
};
|
||||
movies = {
|
||||
enable = true;
|
||||
path = "/media/syncthing/movies";
|
||||
};
|
||||
series = {
|
||||
enable = true;
|
||||
path = "/media/syncthing/series";
|
||||
};
|
||||
music-library = {
|
||||
enable = true;
|
||||
path = "/media/syncthing/music";
|
||||
};
|
||||
# todo : no need to place it on encrypted drive
|
||||
#music-projects = {
|
||||
# enable = true;
|
||||
# path = "/home/syncthing/music-projects";
|
||||
#};
|
||||
#smartphone-folder = {
|
||||
# enable = true;
|
||||
# path = "/media/syncthing/smartphone-folder";
|
||||
# rescanInterval = 8 * 3600;
|
||||
#};
|
||||
#processing = {
|
||||
# enable = true;
|
||||
# path = "/media/syncthing/sketchbook";
|
||||
# rescanInterval = 8 * 3600;
|
||||
#};
|
||||
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -115,7 +115,7 @@ in
|
|||
incomplete-dir = "/media/torrent/incomplete";
|
||||
incomplete-dir-enabled = true;
|
||||
message-level = 1;
|
||||
umask = "002";
|
||||
umask = 2;
|
||||
rpc-whitelist-enabled = false;
|
||||
rpc-host-whitelist-enabled = false;
|
||||
rpc-port = uiPort;
|
||||
|
|
|
|||
|
|
@ -210,11 +210,11 @@
|
|||
"rust-analyzer-src": "rust-analyzer-src"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1631067971,
|
||||
"narHash": "sha256-z+qlJaCaw/OAoFGdzm0nDKkjRdCwstHzduF74nMn3bY=",
|
||||
"lastModified": 1637475807,
|
||||
"narHash": "sha256-E3nzOvlzZXwyo8Stp5upKsTCDcqUTYAFj4EC060A31c=",
|
||||
"owner": "nix-community",
|
||||
"repo": "fenix",
|
||||
"rev": "0771140f0a6a6622c509fb2d6d2c87f0bfda703d",
|
||||
"rev": "960e7fef45692a4fffc6df6d6b613b0399bbdfd5",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -255,11 +255,11 @@
|
|||
},
|
||||
"flake-utils_3": {
|
||||
"locked": {
|
||||
"lastModified": 1629481132,
|
||||
"narHash": "sha256-JHgasjPR0/J1J3DRm4KxM4zTyAj4IOJY8vIl75v/kPI=",
|
||||
"lastModified": 1637014545,
|
||||
"narHash": "sha256-26IZAc5yzlD9FlDT54io1oqG/bBoyka+FJk5guaX4x4=",
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"rev": "997f7efcb746a9c140ce1f13c72263189225f482",
|
||||
"rev": "bba5dcc8e0b20ab664967ad83d24d64cb64ec4f4",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -311,16 +311,16 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1637019201,
|
||||
"narHash": "sha256-lq4gz51fx4m5FXfx1SCB444aEBeaYtLMVm3P18Wi9ls=",
|
||||
"lastModified": 1639871969,
|
||||
"narHash": "sha256-6feWUnMygRzA9tzkrfAzpA5/NBYg75bkFxnqb1DtD7E=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "bcf03fa16a1f06b8a0abb27bf49afa8d6fffe8f1",
|
||||
"rev": "697cc8c68ed6a606296efbbe9614c32537078756",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-community",
|
||||
"ref": "release-21.05",
|
||||
"ref": "release-21.11",
|
||||
"repo": "home-manager",
|
||||
"type": "github"
|
||||
}
|
||||
|
|
@ -345,27 +345,6 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"naersk": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"nixpkgs-fmt",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1631004250,
|
||||
"narHash": "sha256-LGh0CjAZwh13AVkTi9w9lITEC7x6bwSQyFViOZ6HyNo=",
|
||||
"owner": "nmattia",
|
||||
"repo": "naersk",
|
||||
"rev": "08afb3d1dbfe016108b72e05b02ba0f6ecb3c8e1",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nmattia",
|
||||
"repo": "naersk",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nix-straight": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
|
|
@ -402,17 +381,16 @@
|
|||
"inputs": {
|
||||
"fenix": "fenix",
|
||||
"flake-utils": "flake-utils_3",
|
||||
"naersk": "naersk",
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1637014534,
|
||||
"narHash": "sha256-bWwWZi6KIJuHgR/VvrYqUF8iTb7b8Jewgf4pSB45hJs=",
|
||||
"lastModified": 1639739626,
|
||||
"narHash": "sha256-HQHHONvnRQNbXaiWRzkFdV1uTmO2AUZ5JpErjCvEhVs=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nixpkgs-fmt",
|
||||
"rev": "0f8e19fc8806747da1fd898d64dc989da10bcdba",
|
||||
"rev": "7a67b35f6afcf92aab23681522ea5fda2fd47231",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -423,11 +401,11 @@
|
|||
},
|
||||
"nixpkgs-unstable": {
|
||||
"locked": {
|
||||
"lastModified": 1636976544,
|
||||
"narHash": "sha256-9ZmdyoRz4Qu8bP5BKR1T10YbzcB9nvCeQjOEw2cRKR0=",
|
||||
"lastModified": 1641528457,
|
||||
"narHash": "sha256-FyU9E63n1W7Ql4pMnhW2/rO9OftWZ37pLppn/c1aisY=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "931ab058daa7e4cd539533963f95e2bb0dbd41e6",
|
||||
"rev": "ff377a78794d412a35245e05428c8f95fef3951f",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -439,16 +417,16 @@
|
|||
},
|
||||
"nixpkgs_2": {
|
||||
"locked": {
|
||||
"lastModified": 1636944046,
|
||||
"narHash": "sha256-74KLDsiWSBsYXKj/ql9EGbw1TbIJRE7clFkhl30HV/c=",
|
||||
"lastModified": 1641593416,
|
||||
"narHash": "sha256-Vn/vqQtYnVuZlbGGO0gSzLjmtFwb6OPvakwyoG1D/MY=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "46251a79f752ae1d46ef733e8e9760b6d3429da4",
|
||||
"rev": "36480448d470bf41bb21267cf9062a1542c4a95f",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nixos",
|
||||
"ref": "nixos-21.05",
|
||||
"ref": "nixos-21.11",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
|
|
@ -469,11 +447,11 @@
|
|||
},
|
||||
"nixpkgs_4": {
|
||||
"locked": {
|
||||
"lastModified": 1636228094,
|
||||
"narHash": "sha256-CpOcIwHAn3yS0PeVmUICFrJ+gde2PiZp3XsnDP3LE9w=",
|
||||
"lastModified": 1638097282,
|
||||
"narHash": "sha256-EXCzj9b8X/lqDPJapxZThIOKL5ASbpsJZ+8L1LnY1ig=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "2606cb0fc24e65f489b7d9fdcbf219756e45db35",
|
||||
"rev": "78cb77b29d37a9663e05b61abb4fa09465da4b70",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -647,11 +625,11 @@
|
|||
"rust-analyzer-src": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1630943734,
|
||||
"narHash": "sha256-jqgAKhvrVDEkv8HB56hVIgvMDuuQ7X4D2zE9ATV+baI=",
|
||||
"lastModified": 1637439871,
|
||||
"narHash": "sha256-2awQ/obzl7zqYgLwbQL0zT58gN8Xq7n+81GcMiS595I=",
|
||||
"owner": "rust-analyzer",
|
||||
"repo": "rust-analyzer",
|
||||
"rev": "3dae94bf2b3e496adb049da589c7efef272a39b8",
|
||||
"rev": "4566414789310acb2617543f4b50beab4bb48e06",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -666,11 +644,11 @@
|
|||
"nixpkgs": "nixpkgs_4"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1637050424,
|
||||
"narHash": "sha256-8IaY0/Y5g3jJiQzPN0PflKFcFEE1C29DZZ0dF1NIJ6s=",
|
||||
"lastModified": 1641374494,
|
||||
"narHash": "sha256-a56G6Um43+0+n+yNYhRCh/mSvDdRVzQHSKcFaDEB9/8=",
|
||||
"owner": "Mic92",
|
||||
"repo": "sops-nix",
|
||||
"rev": "3c53d012ac77d4bd8428f9c847709e287c897ad9",
|
||||
"rev": "7edb4b080023ef12f39262a3aa7aab31015a7a0e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
description = "system flake.nix";
|
||||
inputs = {
|
||||
sops-nix.url = "github:Mic92/sops-nix";
|
||||
nixpkgs.url = "github:nixos/nixpkgs/nixos-21.05";
|
||||
nixpkgs.url = "github:nixos/nixpkgs/nixos-21.11";
|
||||
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
|
||||
polygon-art = {
|
||||
url = "git+ssh://gitlab@gitlab.ingolf-wagner.de/palo/polygon-art";
|
||||
|
|
@ -14,7 +14,7 @@
|
|||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
home-manager = {
|
||||
url = "github:nix-community/home-manager/release-21.05";
|
||||
url = "github:nix-community/home-manager/release-21.11";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
home-manager-utils = {
|
||||
|
|
|
|||
|
|
@ -3,230 +3,228 @@ with lib; {
|
|||
|
||||
services.syncthing = {
|
||||
guiAddress = lib.mkDefault "${config.networking.hostName}.private:8384";
|
||||
declarative = {
|
||||
overrideDevices = lib.mkDefault true;
|
||||
devices =
|
||||
let
|
||||
device = name: id: {
|
||||
"${name}" = {
|
||||
name = name;
|
||||
id = id;
|
||||
addresses =
|
||||
[ "tcp://${name}.private:22000" ];
|
||||
};
|
||||
};
|
||||
in
|
||||
{
|
||||
"robi" = {
|
||||
name = "robi";
|
||||
id = "B6P22RF-5BC2LTZ-6GHVWRZ-5D3OLXC-D66E45Y-JEB3WYT-ZQ442WZ-5FFAMQ7";
|
||||
addresses = [ "tcp://144.76.13.147:22000" ];
|
||||
};
|
||||
}
|
||||
// (device "workhorse"
|
||||
"AFSAKB6-JLH4QAS-DSRMPI3-6PVCIHF-IIAVLPC-STPNO3Y-YRDU5NW-QD445QI")
|
||||
// (device "pepe"
|
||||
"SZLXFW3-VTAC7UB-V2Z7CHE-3VZAYPL-6D72AK6-OCDMPZP-G4FPY5P-FL6ZVAG")
|
||||
// (device "workout"
|
||||
"DZOOAKG-GI2SVOS-QEVMFL7-TRHVTPQ-ADIJEVH-RH5WV3J-6M7MJHC-C53EOAC")
|
||||
// (device "sterni"
|
||||
"ZFNNKPD-ZSOAYJQ-VROXXDB-5MD3UTJ-GDCNTSQ-G5POVV3-UZG5HFT-CCAU3AD")
|
||||
// {
|
||||
"porani" = {
|
||||
name = "porani";
|
||||
id = "6YOIA4E-X52ZD5Z-FPNWPRS-77QIMMU-VDIXVZB-6BPQN7A-FFJDU4W-EXEGFAI";
|
||||
overrideDevices = lib.mkDefault true;
|
||||
devices =
|
||||
let
|
||||
device = name: id: {
|
||||
"${name}" = {
|
||||
name = name;
|
||||
id = id;
|
||||
addresses =
|
||||
[ "tcp://porani.secret:22000" "tcp://porani.secret:21027" ];
|
||||
};
|
||||
} // {
|
||||
smartphone = {
|
||||
name = "smartphone";
|
||||
id =
|
||||
"PRCA4KO-PEMLUSO-ERUSKAP-GUDSW2I-AYTEB54-E5JJOXJ-23X2UYP-RLSMKQM";
|
||||
addresses = [ "dynamic" ];
|
||||
};
|
||||
} // {
|
||||
bumba = {
|
||||
name = "windows-bumba";
|
||||
id =
|
||||
"JS7PWTO-VKFGBUP-GNFLSWP-MGFJ2KH-HLO2LKW-V3RPCR6-PCB5SQC-42FCKQZ";
|
||||
addresses = [ "dynamic" ];
|
||||
};
|
||||
} // {
|
||||
mors = {
|
||||
name = "lassulus-mors";
|
||||
id =
|
||||
"ZPRS57K-YK32ROQ-7A6MRAV-VOYXQ3I-CQCXISZ-C5PCV2A-GSFLG3I-K7UGGAH";
|
||||
addresses = [ "tcp://mors.r:22000" ];
|
||||
[ "tcp://${name}.private:22000" ];
|
||||
};
|
||||
};
|
||||
|
||||
folders = {
|
||||
|
||||
# needs to be on encrypted drives
|
||||
# -------------------------------
|
||||
private = {
|
||||
enable = lib.mkDefault false;
|
||||
watch = false;
|
||||
devices = [ "workout" "workhorse" "pepe" "sterni" ];
|
||||
versioning = {
|
||||
type = "simple";
|
||||
params.keep = "10";
|
||||
};
|
||||
in
|
||||
{
|
||||
"robi" = {
|
||||
name = "robi";
|
||||
id = "B6P22RF-5BC2LTZ-6GHVWRZ-5D3OLXC-D66E45Y-JEB3WYT-ZQ442WZ-5FFAMQ7";
|
||||
addresses = [ "tcp://144.76.13.147:22000" ];
|
||||
};
|
||||
desktop = {
|
||||
enable = lib.mkDefault false;
|
||||
watch = false;
|
||||
devices = [ "workout" "workhorse" "pepe" "sterni" ];
|
||||
}
|
||||
// (device "workhorse"
|
||||
"AFSAKB6-JLH4QAS-DSRMPI3-6PVCIHF-IIAVLPC-STPNO3Y-YRDU5NW-QD445QI")
|
||||
// (device "pepe"
|
||||
"SZLXFW3-VTAC7UB-V2Z7CHE-3VZAYPL-6D72AK6-OCDMPZP-G4FPY5P-FL6ZVAG")
|
||||
// (device "workout"
|
||||
"DZOOAKG-GI2SVOS-QEVMFL7-TRHVTPQ-ADIJEVH-RH5WV3J-6M7MJHC-C53EOAC")
|
||||
// (device "sterni"
|
||||
"ZFNNKPD-ZSOAYJQ-VROXXDB-5MD3UTJ-GDCNTSQ-G5POVV3-UZG5HFT-CCAU3AD")
|
||||
// {
|
||||
"porani" = {
|
||||
name = "porani";
|
||||
id = "6YOIA4E-X52ZD5Z-FPNWPRS-77QIMMU-VDIXVZB-6BPQN7A-FFJDU4W-EXEGFAI";
|
||||
addresses =
|
||||
[ "tcp://porani.secret:22000" "tcp://porani.secret:21027" ];
|
||||
};
|
||||
finance = {
|
||||
enable = lib.mkDefault false;
|
||||
watch = false;
|
||||
devices = [ "workout" "workhorse" "pepe" "sterni" ];
|
||||
versioning = {
|
||||
type = "simple";
|
||||
params.keep = "10";
|
||||
};
|
||||
} // {
|
||||
smartphone = {
|
||||
name = "smartphone";
|
||||
id =
|
||||
"PRCA4KO-PEMLUSO-ERUSKAP-GUDSW2I-AYTEB54-E5JJOXJ-23X2UYP-RLSMKQM";
|
||||
addresses = [ "dynamic" ];
|
||||
};
|
||||
fotos = {
|
||||
enable = lib.mkDefault false;
|
||||
watch = false;
|
||||
devices = [ "workout" "workhorse" "pepe" "sterni" ];
|
||||
versioning = {
|
||||
type = "simple";
|
||||
params.keep = "10";
|
||||
};
|
||||
} // {
|
||||
bumba = {
|
||||
name = "windows-bumba";
|
||||
id =
|
||||
"JS7PWTO-VKFGBUP-GNFLSWP-MGFJ2KH-HLO2LKW-V3RPCR6-PCB5SQC-42FCKQZ";
|
||||
addresses = [ "dynamic" ];
|
||||
};
|
||||
zettlr = {
|
||||
enable = lib.mkDefault false;
|
||||
watch = true;
|
||||
devices = [ "workout" "workhorse" "pepe" "sterni" ];
|
||||
versioning = {
|
||||
type = "simple";
|
||||
params.keep = "10";
|
||||
};
|
||||
};
|
||||
programs = {
|
||||
enable = lib.mkDefault false;
|
||||
watch = true;
|
||||
devices = [ "workout" "sterni" ];
|
||||
versioning = {
|
||||
type = "simple";
|
||||
params.keep = "1";
|
||||
};
|
||||
};
|
||||
|
||||
# no need to be stored on encrypted drives
|
||||
# ----------------------------------------
|
||||
borg-mirror = {
|
||||
enable = lib.mkDefault false;
|
||||
watch = false;
|
||||
devices = [ "workhorse" "pepe" ];
|
||||
};
|
||||
books = {
|
||||
enable = lib.mkDefault false;
|
||||
id = "wwbvs-5lfbh";
|
||||
watch = false;
|
||||
devices = [ "workhorse" "pepe" "sterni" "robi" ];
|
||||
versioning = {
|
||||
type = "simple";
|
||||
params.keep = "10";
|
||||
};
|
||||
};
|
||||
lost-fotos = {
|
||||
enable = lib.mkDefault false;
|
||||
watch = false;
|
||||
devices = [ "workhorse" "workout" "pepe" ];
|
||||
versioning = {
|
||||
type = "simple";
|
||||
params.keep = "10";
|
||||
};
|
||||
};
|
||||
movies = {
|
||||
enable = lib.mkDefault false;
|
||||
id = "vatmy-c2qf4";
|
||||
watch = false;
|
||||
devices = [ "workhorse" "pepe" "porani" "robi" ];
|
||||
versioning = {
|
||||
type = "simple";
|
||||
params.keep = "3";
|
||||
};
|
||||
};
|
||||
music-library = {
|
||||
enable = lib.mkDefault false;
|
||||
id = "gytmq-r2zrx";
|
||||
watch = false;
|
||||
devices = [ "workhorse" "pepe" "sterni" "robi" ];
|
||||
versioning = {
|
||||
type = "simple";
|
||||
params.keep = "10";
|
||||
};
|
||||
};
|
||||
music-library-free = {
|
||||
enable = lib.mkDefault false;
|
||||
id = "mu9mn-zgvsw";
|
||||
watch = false;
|
||||
devices = [ "workout" "workhorse" "pepe" "mors" ];
|
||||
};
|
||||
processing = {
|
||||
enable = lib.mkDefault false;
|
||||
watch = false;
|
||||
devices = [ "workout" "workhorse" "pepe" "sterni" ];
|
||||
versioning = {
|
||||
type = "simple";
|
||||
params.keep = "10";
|
||||
};
|
||||
};
|
||||
music-projects = {
|
||||
enable = lib.mkDefault false;
|
||||
id = "acfhu-r4t4f";
|
||||
watch = false;
|
||||
devices = [ "workout" "workhorse" "pepe" "sterni" ];
|
||||
versioning = {
|
||||
type = "simple";
|
||||
params.keep = "10";
|
||||
};
|
||||
};
|
||||
smartphone-folder = {
|
||||
enable = lib.mkDefault false;
|
||||
watch = false;
|
||||
devices = [ "workout" "workhorse" "sterni" "smartphone" "pepe" ];
|
||||
};
|
||||
samples = {
|
||||
enable = lib.mkDefault false;
|
||||
id = "pcgkj-tjucd";
|
||||
watch = false;
|
||||
devices = [ "workhorse" "sterni" "pepe" "robi" ];
|
||||
};
|
||||
series = {
|
||||
enable = lib.mkDefault false;
|
||||
id = "all-series";
|
||||
watch = false;
|
||||
devices = [ "workhorse" "porani" "pepe" "robi" ];
|
||||
versioning = {
|
||||
type = "simple";
|
||||
params.keep = "10";
|
||||
};
|
||||
};
|
||||
video-material = {
|
||||
enable = lib.mkDefault false;
|
||||
id = "wgkun-fec5h";
|
||||
watch = false;
|
||||
devices = [ "workout" "workhorse" "pepe" ];
|
||||
versioning = {
|
||||
type = "simple";
|
||||
params.keep = "10";
|
||||
};
|
||||
};
|
||||
windows-sync = {
|
||||
enable = lib.mkDefault false;
|
||||
id = "hcity-p5ikc";
|
||||
watch = false;
|
||||
devices = [ "bumba" "workout" ];
|
||||
} // {
|
||||
mors = {
|
||||
name = "lassulus-mors";
|
||||
id =
|
||||
"ZPRS57K-YK32ROQ-7A6MRAV-VOYXQ3I-CQCXISZ-C5PCV2A-GSFLG3I-K7UGGAH";
|
||||
addresses = [ "tcp://mors.r:22000" ];
|
||||
};
|
||||
};
|
||||
|
||||
folders = {
|
||||
|
||||
# needs to be on encrypted drives
|
||||
# -------------------------------
|
||||
private = {
|
||||
enable = lib.mkDefault false;
|
||||
watch = false;
|
||||
devices = [ "workout" "workhorse" "pepe" "sterni" ];
|
||||
versioning = {
|
||||
type = "simple";
|
||||
params.keep = "10";
|
||||
};
|
||||
};
|
||||
desktop = {
|
||||
enable = lib.mkDefault false;
|
||||
watch = false;
|
||||
devices = [ "workout" "workhorse" "pepe" "sterni" ];
|
||||
};
|
||||
finance = {
|
||||
enable = lib.mkDefault false;
|
||||
watch = false;
|
||||
devices = [ "workout" "workhorse" "pepe" "sterni" ];
|
||||
versioning = {
|
||||
type = "simple";
|
||||
params.keep = "10";
|
||||
};
|
||||
};
|
||||
fotos = {
|
||||
enable = lib.mkDefault false;
|
||||
watch = false;
|
||||
devices = [ "workout" "workhorse" "pepe" "sterni" ];
|
||||
versioning = {
|
||||
type = "simple";
|
||||
params.keep = "10";
|
||||
};
|
||||
};
|
||||
zettlr = {
|
||||
enable = lib.mkDefault false;
|
||||
watch = true;
|
||||
devices = [ "workout" "workhorse" "pepe" "sterni" ];
|
||||
versioning = {
|
||||
type = "simple";
|
||||
params.keep = "10";
|
||||
};
|
||||
};
|
||||
programs = {
|
||||
enable = lib.mkDefault false;
|
||||
watch = true;
|
||||
devices = [ "workout" "sterni" ];
|
||||
versioning = {
|
||||
type = "simple";
|
||||
params.keep = "1";
|
||||
};
|
||||
};
|
||||
|
||||
# no need to be stored on encrypted drives
|
||||
# ----------------------------------------
|
||||
borg-mirror = {
|
||||
enable = lib.mkDefault false;
|
||||
watch = false;
|
||||
devices = [ "workhorse" "pepe" ];
|
||||
};
|
||||
books = {
|
||||
enable = lib.mkDefault false;
|
||||
id = "wwbvs-5lfbh";
|
||||
watch = false;
|
||||
devices = [ "workhorse" "pepe" "sterni" "robi" ];
|
||||
versioning = {
|
||||
type = "simple";
|
||||
params.keep = "10";
|
||||
};
|
||||
};
|
||||
lost-fotos = {
|
||||
enable = lib.mkDefault false;
|
||||
watch = false;
|
||||
devices = [ "workhorse" "workout" "pepe" ];
|
||||
versioning = {
|
||||
type = "simple";
|
||||
params.keep = "10";
|
||||
};
|
||||
};
|
||||
movies = {
|
||||
enable = lib.mkDefault false;
|
||||
id = "vatmy-c2qf4";
|
||||
watch = false;
|
||||
devices = [ "workhorse" "pepe" "porani" "robi" ];
|
||||
versioning = {
|
||||
type = "simple";
|
||||
params.keep = "3";
|
||||
};
|
||||
};
|
||||
music-library = {
|
||||
enable = lib.mkDefault false;
|
||||
id = "gytmq-r2zrx";
|
||||
watch = false;
|
||||
devices = [ "workhorse" "pepe" "sterni" "robi" ];
|
||||
versioning = {
|
||||
type = "simple";
|
||||
params.keep = "10";
|
||||
};
|
||||
};
|
||||
music-library-free = {
|
||||
enable = lib.mkDefault false;
|
||||
id = "mu9mn-zgvsw";
|
||||
watch = false;
|
||||
devices = [ "workout" "workhorse" "pepe" "mors" ];
|
||||
};
|
||||
processing = {
|
||||
enable = lib.mkDefault false;
|
||||
watch = false;
|
||||
devices = [ "workout" "workhorse" "pepe" "sterni" ];
|
||||
versioning = {
|
||||
type = "simple";
|
||||
params.keep = "10";
|
||||
};
|
||||
};
|
||||
music-projects = {
|
||||
enable = lib.mkDefault false;
|
||||
id = "acfhu-r4t4f";
|
||||
watch = false;
|
||||
devices = [ "workout" "workhorse" "pepe" "sterni" ];
|
||||
versioning = {
|
||||
type = "simple";
|
||||
params.keep = "10";
|
||||
};
|
||||
};
|
||||
smartphone-folder = {
|
||||
enable = lib.mkDefault false;
|
||||
watch = false;
|
||||
devices = [ "workout" "workhorse" "sterni" "smartphone" "pepe" ];
|
||||
};
|
||||
samples = {
|
||||
enable = lib.mkDefault false;
|
||||
id = "pcgkj-tjucd";
|
||||
watch = false;
|
||||
devices = [ "workhorse" "sterni" "pepe" "robi" ];
|
||||
};
|
||||
series = {
|
||||
enable = lib.mkDefault false;
|
||||
id = "all-series";
|
||||
watch = false;
|
||||
devices = [ "workhorse" "porani" "pepe" "robi" ];
|
||||
versioning = {
|
||||
type = "simple";
|
||||
params.keep = "10";
|
||||
};
|
||||
};
|
||||
video-material = {
|
||||
enable = lib.mkDefault false;
|
||||
id = "wgkun-fec5h";
|
||||
watch = false;
|
||||
devices = [ "workout" "workhorse" "pepe" ];
|
||||
versioning = {
|
||||
type = "simple";
|
||||
params.keep = "10";
|
||||
};
|
||||
};
|
||||
windows-sync = {
|
||||
enable = lib.mkDefault false;
|
||||
id = "hcity-p5ikc";
|
||||
watch = false;
|
||||
devices = [ "bumba" "workout" ];
|
||||
};
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -14,6 +14,10 @@ in
|
|||
|
||||
networking.firewall.trustedInterfaces = [ "tinc.private" ];
|
||||
|
||||
users.users."tinc.private".group = "tinc.private";
|
||||
users.groups."tinc.private" = { };
|
||||
|
||||
|
||||
# nix-shell -p tinc_pre --run "tinc --config . generate-keys 4096"
|
||||
module.cluster.services.tinc = {
|
||||
"retiolum" = {
|
||||
|
|
|
|||
Loading…
Reference in a new issue