upRootNutrition/dotfiles
1
0
Fork 0
mirror of https://gitlab.com/upRootNutrition/dotfiles.git synced 2025-06-17 02:25:12 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

refactor: samba and synology mounts redone

Browse source
This commit is contained in:
Nick 2024-11-03 19:02:58 -06:00
parent e934b63d5a
commit 6e62fd96fe
3 changed files with 22 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
config/device.nix
View file

@ -101,7 +101,7 @@ in {
options = sambaPermissions ++ userIdForUser1; options = sambaPermissions ++ userIdForUser1;
}; };
# Minecraft Worlds # Minecraft Worlds
folder4 = { folder2 = {
mount = "/home/${user1}/.local/share/PrismLauncher/instances/1.21/.minecraft/saves"; mount = "/home/${user1}/.local/share/PrismLauncher/instances/1.21/.minecraft/saves";
device = "//${nasIP}/homes/${user1Name}/Minecraft"; device = "//${nasIP}/homes/${user1Name}/Minecraft";
options = sambaPermissions ++ userIdForUser1; options = sambaPermissions ++ userIdForUser1;

10
systems/desktop/filesystem.nix
View file

@ -6,6 +6,7 @@
inherit (flake.config.people) user0 user1; inherit (flake.config.people) user0 user1;
inherit (flake.config.system.device) desktop server nas; inherit (flake.config.system.device) desktop server nas;
inherit (flake.config.service.instance) samba; inherit (flake.config.service.instance) samba;
synologySecrets = config.sops.secrets."network/synology".path; synologySecrets = config.sops.secrets."network/synology".path;
serverSecrets = config.sops.secrets."network/server".path; serverSecrets = config.sops.secrets."network/server".path;
in { in {
@ -14,7 +15,6 @@ in {
"folder0" "folder0"
"folder1" "folder1"
"folder2" "folder2"
"folder3"
]; ];
storageDrives = [ storageDrives = [
@ -31,7 +31,9 @@ in {
value = { value = {
device = nas.${synologyDrive}.device; device = nas.${synologyDrive}.device;
fsType = "cifs"; fsType = "cifs";
options = nas.${synologyDrive}.options ++ ["credentials=${synologySecrets}"]; options =
nas.${synologyDrive}.options
++ ["credentials=${synologySecrets}"];
}; };
}; };
@ -49,7 +51,9 @@ in {
value = { value = {
device = "${server.${sambaDrive}.device}/${samba.paths.path1}"; device = "${server.${sambaDrive}.device}/${samba.paths.path1}";
fsType = "cifs"; fsType = "cifs";
options = server.${sambaDrive}.options ++ ["credentials=${serverSecrets}"]; options =
server.${sambaDrive}.options
++ ["credentials=${serverSecrets}"];
}; };
}; };
in in

23
systems/laptop/filesystem.nix
View file

@ -5,6 +5,7 @@
}: let }: let
inherit (flake.config.people) user0 user1; inherit (flake.config.people) user0 user1;
inherit (flake.config.system.device) laptop nas server; inherit (flake.config.system.device) laptop nas server;
inherit (flake.config.service.instance) samba;
synologySecrets = config.sops.secrets."network/synology".path; synologySecrets = config.sops.secrets."network/synology".path;
serverSecrets = config.sops.secrets."network/server".path; serverSecrets = config.sops.secrets."network/server".path;
@ -13,28 +14,32 @@ in {
synologyDrives = [ synologyDrives = [
"folder0" "folder0"
"folder1" "folder1"
"folder4" "folder2"
]; ];
sambaDrives = [ sambaDrives = [
"samba0" "samba0"
]; ];
synologyMounts = folder: { synologyMounts = synologyDrive: {
name = "${nas.${folder}.mount}"; name = "${nas.${synologyDrive}.mount}";
value = { value = {
device = nas.${folder}.device; device = nas.${synologyDrive}.device;
fsType = "cifs"; fsType = "cifs";
options = nas.${folder}.options ++ ["credentials=${synologySecrets}"]; options =
nas.${synologyDrive}.options
++ ["credentials=${synologySecrets}"];
}; };
}; };
sambaMounts = samba: { sambaMounts = sambaDrive: {
name = "${server.${samba}.mount}"; name = "${server.${sambaDrive}.mount}/${samba.paths.path1}";
value = { value = {
device = server.${samba}.device; device = "${server.${sambaDrive}.device}/${samba.paths.path1}";
fsType = "cifs"; fsType = "cifs";
options = server.${samba}.options ++ ["credentials=${serverSecrets}"]; options =
server.${sambaDrive}.options
++ ["credentials=${serverSecrets}"];
}; };
}; };
in in