feat: updated magic values

This commit is contained in:
Nick 2024-10-09 23:26:43 -05:00
parent 36b3b2cff4
commit cbb7128218
8 changed files with 60 additions and 62 deletions

View file

@ -1,11 +1,11 @@
let
perms22 = ["fmask=0022" "dmask=0022"];
perms77 = ["fmask=0077" "dmask=0077"];
permsRW = ["rw"];
permsSmb = ["rw" "gid=100" "vers=3.0" "x-systemd.automount" "x-systemd.requires=network-online.target"];
permsFm = ["file_mode=0644" "dir_mode=0755"];
uid0 = ["uid=1000"];
uid1 = ["uid=1001"];
ownerWriteOthersReadMask = ["fmask=0022" "dmask=0022"];
ownerExclusiveReadWriteMask = ["fmask=0077" "dmask=0077"];
readWritePermissions = ["rw"];
sambaPermissions = ["rw" "gid=100" "vers=3.0" "x-systemd.automount" "x-systemd.requires=network-online.target"];
fileModeAndDirMode = ["file_mode=0644" "dir_mode=0755"];
userIdForUser0 = ["uid=1000"];
userIdForUser1 = ["uid=1001"];
in {
device = {
# Desktop
@ -17,17 +17,17 @@ in {
address0 = "192.168.50.196";
};
boot = {
options = perms22;
options = ownerWriteOthersReadMask;
};
storage0 = {
mount = "/mnt/media/games";
device = "/dev/disk/by-label/Games";
options = permsRW;
options = readWritePermissions;
};
storage1 = {
mount = "/mnt/media/storage";
device = "/dev/disk/by-label/Storage";
options = permsRW;
options = readWritePermissions;
};
};
@ -41,7 +41,7 @@ in {
address0 = "192.168.50.142";
};
boot = {
options = perms22;
options = ownerWriteOthersReadMask;
};
};
@ -50,6 +50,7 @@ in {
server = let
serverName = "server";
serverIP = "192.168.50.140";
nasPath = "NAS1";
in {
label = "Server";
name = serverName;
@ -57,21 +58,17 @@ in {
address0 = serverIP;
};
boot = {
options = perms77;
options = ownerExclusiveReadWriteMask;
};
storage0 = let
nasPath = "NAS1";
in {
storage0 = {
mount = "/mnt/media/${nasPath}";
device = "/dev/disk/by-label/${nasPath}";
options = permsRW;
options = readWritePermissions;
};
samba0 = let
share0Name = "media";
in {
mount = "/mnt/media/${serverName}/${share0Name}";
device = "//${serverIP}/${share0Name}";
options = permsSmb ++ permsFm ++ uid0;
samba0 = {
mount = "/mnt/media/${serverName}";
device = "//${serverIP}";
options = sambaPermissions ++ fileModeAndDirMode ++ userIdForUser0;
};
};
@ -99,31 +96,31 @@ in {
folder0 = {
mount = "/mnt/media/${nasName}/${user0}";
device = "//${nasIP}/homes/${user0Name}";
options = permsSmb ++ uid0;
options = sambaPermissions ++ userIdForUser0;
};
# Garnet Home Folder
folder1 = {
mount = "/mnt/media/${nasName}/${user1}";
device = "//${nasIP}/homes/${user1Name}";
options = permsSmb ++ uid1;
options = sambaPermissions ++ userIdForUser1;
};
# Fallaryn Home Folder
folder2 = {
mount = "/mnt/media/${nasName}/${user2}";
device = "//${nasIP}/homes/${user2Name}";
options = permsSmb ++ uid0;
options = sambaPermissions ++ userIdForUser0;
};
# Denise Home Folder
folder3 = {
mount = "/mnt/media/${nasName}/${user3}";
device = "//${nasIP}/homes/${user3Name}";
options = permsSmb ++ uid0;
options = sambaPermissions ++ userIdForUser0;
};
# Minecraft Worlds
folder4 = {
mount = "/home/${user1}/.local/share/PrismLauncher/instances/1.21/.minecraft/saves";
device = "//${nasIP}/homes/${user1Name}/Minecraft";
options = permsSmb ++ uid1;
options = sambaPermissions ++ userIdForUser1;
};
};
@ -136,17 +133,17 @@ in {
address0 = "";
};
boot = {
options = perms22;
options = ownerWriteOthersReadMask;
};
storage0 = {
mount = "/run/media/games";
device = "/dev/disk/by-label/Games";
options = permsRW;
options = readWritePermissions;
};
storage1 = {
mount = "/run/media/entertainment";
device = "/dev/disk/by-label/Entertainment";
options = permsRW;
options = readWritePermissions;
};
};