mirror of
https://gitlab.com/upRootNutrition/dotfiles.git
synced 2025-12-14 02:20:53 -06:00
fix: syncthing cucked
This commit is contained in:
parent
1eacc3aa09
commit
2cd05e31fc
15 changed files with 64 additions and 23 deletions
|
|
@ -5,7 +5,7 @@
|
|||
...
|
||||
}:
|
||||
let
|
||||
inherit (import ../../helpers.nix) labHelpers;
|
||||
inherit (import ../../../helpers.nix) labHelpers;
|
||||
inherit (labHelpers) guestPath;
|
||||
inherit (import ../config { inherit config flake pkgs; }) fireflyVM;
|
||||
inherit (flake.config.people) user0;
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
...
|
||||
}:
|
||||
let
|
||||
inherit (import ../../helpers.nix) labHelpers;
|
||||
inherit (import ../../../helpers.nix) labHelpers;
|
||||
inherit (labHelpers) mntPath;
|
||||
inherit (import ../config { inherit flake pkgs; }) forgejoVM;
|
||||
inherit (flake.config.people) user0;
|
||||
|
|
|
|||
|
|
@ -1,9 +0,0 @@
|
|||
{
|
||||
labHelpers = {
|
||||
mntPath = "/mnt/storage";
|
||||
guestPath = user: "/mnt/storage/users/${user}/guests";
|
||||
docsPath = user: "/mnt/storage/users/${user}/home/docs";
|
||||
mediaPath = user: "/mnt/storage/users/${user}/home/media";
|
||||
miscPath = user: "/mnt/storage/users/${user}/home/misc";
|
||||
};
|
||||
}
|
||||
|
|
@ -4,7 +4,7 @@
|
|||
...
|
||||
}:
|
||||
let
|
||||
inherit (import ../../helpers.nix) labHelpers;
|
||||
inherit (import ../../../helpers.nix) labHelpers;
|
||||
inherit (labHelpers) mntPath;
|
||||
inherit (import ../config { inherit flake config; }) jellyfinVM;
|
||||
inherit (flake.config.people) user0;
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
...
|
||||
}:
|
||||
let
|
||||
inherit (import ../../helpers.nix) labHelpers;
|
||||
inherit (import ../../../helpers.nix) labHelpers;
|
||||
inherit (labHelpers) mntPath;
|
||||
inherit
|
||||
(import ../config {
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
...
|
||||
}:
|
||||
let
|
||||
inherit (import ../../helpers.nix) labHelpers;
|
||||
inherit (import ../../../helpers.nix) labHelpers;
|
||||
inherit (labHelpers) mntPath;
|
||||
inherit (import ../config { inherit flake pkgs; }) minecraftVM;
|
||||
inherit (flake.config.services) instances;
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
...
|
||||
}:
|
||||
let
|
||||
inherit (import ../../helpers.nix) labHelpers;
|
||||
inherit (import ../../../helpers.nix) labHelpers;
|
||||
inherit (labHelpers) mntPath;
|
||||
inherit (import ../config { inherit flake pkgs; }) opencloudVM;
|
||||
inherit (flake.config.people) user0;
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
...
|
||||
}:
|
||||
let
|
||||
inherit (import ../../helpers.nix) labHelpers;
|
||||
inherit (import ../../../helpers.nix) labHelpers;
|
||||
inherit (labHelpers) guestPath;
|
||||
inherit (import ../config { inherit flake pkgs; }) opencloudVM;
|
||||
inherit (flake.config.people) user0;
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
...
|
||||
}:
|
||||
let
|
||||
inherit (import ../../helpers.nix) labHelpers;
|
||||
inherit (import ../../../helpers.nix) labHelpers;
|
||||
inherit (labHelpers) guestPath mediaPath;
|
||||
inherit (import ../config { inherit flake lib; }) photoprismVM;
|
||||
inherit (flake.config.services.instances) photoprism;
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
...
|
||||
}:
|
||||
let
|
||||
inherit (import ../../helpers.nix) labHelpers;
|
||||
inherit (import ../../../helpers.nix) labHelpers;
|
||||
inherit (labHelpers) mntPath;
|
||||
inherit (import ../config { inherit config flake pkgs; }) qbittorrentVM;
|
||||
inherit (flake.config.people) user0;
|
||||
|
|
|
|||
|
|
@ -20,7 +20,6 @@ in
|
|||
devices,
|
||||
tmpIn,
|
||||
mounts,
|
||||
tmpOut,
|
||||
}:
|
||||
{
|
||||
microvm.vms = {
|
||||
|
|
@ -149,8 +148,7 @@ in
|
|||
systemd.tmpfiles.rules = [
|
||||
"d ${mnt} 0751 microvm wheel - -"
|
||||
"d ${mnt}/${serviceCfg.name} 0751 microvm wheel - -"
|
||||
]
|
||||
++ tmpOut;
|
||||
];
|
||||
sops.secrets = {
|
||||
"${serviceCfg.name}/${user}-pass" = {
|
||||
owner = "root";
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
...
|
||||
}:
|
||||
let
|
||||
inherit (import ../../helpers.nix) labHelpers;
|
||||
inherit (import ../../../helpers.nix) labHelpers;
|
||||
inherit (labHelpers)
|
||||
guestPath
|
||||
mediaPath
|
||||
|
|
@ -81,13 +81,6 @@ let
|
|||
"d /var/lib/${serviceCfg.name}/misc 0755 ${serviceCfg.name} ${serviceCfg.name} -"
|
||||
];
|
||||
|
||||
tmpRulesOut = user: [
|
||||
"d ${guestPath user} 0751 microvm wheel - -"
|
||||
"d ${docsPath user} 0751 microvm wheel - -"
|
||||
"d ${mediaPath user} 0751 microvm wheel - -"
|
||||
"d ${miscPath user} 0751 microvm wheel - -"
|
||||
];
|
||||
|
||||
syncthingNick =
|
||||
let
|
||||
phoneID = "OALKHLZ-OODUWVX-PAC2LI7-UMZMSZO-FELLRCD-RS4DHJS-PVA5YQK-WTFXXQI";
|
||||
|
|
@ -102,8 +95,7 @@ let
|
|||
folders = foldersHelper user0;
|
||||
devices = devicesHelper user0 phoneID "Phone" "192.168.50.8";
|
||||
mounts = mountsHelper user0;
|
||||
tmpIn = tmpRulesIn;
|
||||
tmpOut = tmpRulesOut user0;
|
||||
tmp = tmpRulesIn;
|
||||
};
|
||||
in
|
||||
syncthingNick
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
...
|
||||
}:
|
||||
let
|
||||
inherit (import ../../helpers.nix) labHelpers;
|
||||
inherit (import ../../../helpers.nix) labHelpers;
|
||||
inherit (labHelpers) guestPath;
|
||||
inherit (import ../config { inherit flake; }) vaultwardenVM;
|
||||
inherit (flake.config.people) user0;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue