yanlin/nix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rearrange borg modules

Browse source
This commit is contained in:
Yan Lin 2025-11-03 13:58:29 +01:00
parent a100931286
commit b806a1865c
4 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
hosts/nixos/hs/system.nix
View file

@ -7,7 +7,7 @@
../../../modules/wireguard.nix ../../../modules/wireguard.nix
../../../modules/podman.nix ../../../modules/podman.nix
../../../modules/traefik.nix ../../../modules/traefik.nix
../../../modules/borg-client.nix ../../../modules/borg/client.nix
../../../modules/login-display.nix ../../../modules/login-display.nix
]; ];

2
hosts/nixos/vps/system.nix
View file

@ -7,7 +7,7 @@
../../../modules/wireguard.nix ../../../modules/wireguard.nix
../../../modules/podman.nix ../../../modules/podman.nix
../../../modules/traefik.nix ../../../modules/traefik.nix
../../../modules/borg-client.nix ../../../modules/borg/client.nix
../../../modules/login-display.nix ../../../modules/login-display.nix
]; ];

5
modules/borg-client.nix → modules/borg/client.nix
View file

@ -3,11 +3,12 @@
with lib; with lib;
let let
cfg = config.services.borgbackup-custom; cfg = config.services.borg-client-custom;
in in
{ {
options.services.borgbackup-custom = { # options.services.borgbackup-custom = {
options.services.borg-client-custom = {
enable = mkEnableOption "Borg backup service"; enable = mkEnableOption "Borg backup service";
repositoryUrl = mkOption { repositoryUrl = mkOption {

9
modules/borg-server.nix → modules/borg/server.nix
View file

@ -3,11 +3,12 @@
with lib; with lib;
let let
cfg = config.services.borgbackup-server; cfg = config.services.borg-server-custom;
in in
{ {
options.services.borgbackup-server = { # options.services.borgbackup-server = {
options.services.borg-server-custom = {
enable = mkEnableOption "Borg backup server"; enable = mkEnableOption "Borg backup server";
dataDir = mkOption { dataDir = mkOption {
@ -119,7 +120,7 @@ in
echo "To add user '$USERNAME', add the following to your NixOS configuration:" echo "To add user '$USERNAME', add the following to your NixOS configuration:"
echo "" echo ""
echo "services.borgbackup-server.users.$USERNAME = {" echo "services.borg-server-custom.users.$USERNAME = {"
echo " publicKeys = [ \"$SSH_KEY\" ];" echo " publicKeys = [ \"$SSH_KEY\" ];"
echo "};" echo "};"
echo "" echo ""
@ -169,4 +170,4 @@ in
}; };
}; };
} }