artemist/nixos-config
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Switch to NFS

Browse source
This commit is contained in:
Artemis Tosini 2021-01-16 04:14:30 +00:00
parent 97546218f6
commit 850e0c3c27
Signed by: artemist
GPG key ID: ADFFE553DCBB831E
2 changed files with 24 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
system/starlight/boot-config.nix
View file

@ -1,7 +1,7 @@
{ config, pkgs, ... }: { config, pkgs, ... }:
let let
cifs_opts = [ "x-systemd.automount" "noauto" "x-systemd.idle-timeout=60" "x-systemd.device-timeout=5s" "x-systemd.mount-timeout=5s" "uid=${builtins.toString config.users.users.artemis.uid}" "gid=100" ]; net_opts = [ "x-systemd.automount" "noauto" "x-systemd.idle-timeout=60" "x-systemd.device-timeout=5s" "x-systemd.mount-timeout=5s" ];
luna_opts = cifs_opts ++ [ "credentials=/var/private/luna_creds" ]; luna_opts = net_opts ++ [ "uid=${builtins.toString config.users.users.artemis.uid}" "gid=100" "credentials=/var/private/luna_creds" ];
in in
{ {
imports = [ ../../externals/systemd-boot-secure ]; imports = [ ../../externals/systemd-boot-secure ];
@ -30,6 +30,7 @@ in
allowDiscards = true; allowDiscards = true;
}; };
glimmer = { glimmer = {
device = "/dev/disk/by-uuid/43220fc3-2f33-4915-9365-59eb27b21719";
preLVM = true; preLVM = true;
allowDiscards = true; allowDiscards = true;
}; };
@ -37,6 +38,8 @@ in
}; };
}; };
fileSystems."/media/luna/media".options = luna_opts; fileSystems."/media/luna/media".options = net_opts;
fileSystems."/media/luna/photos".options = net_opts;
fileSystems."/media/luna/games".options = net_opts;
fileSystems."/media/luna/private".options = luna_opts; fileSystems."/media/luna/private".options = luna_opts;
} }

26
system/starlight/hardware-configuration.nix
View file

@ -47,8 +47,6 @@
fsType = "btrfs"; fsType = "btrfs";
}; };
boot.initrd.luks.devices."glimmer".device = "/dev/disk/by-uuid/43220fc3-2f33-4915-9365-59eb27b21719";
fileSystems."/var/lib/lxd/shmounts" = fileSystems."/var/lib/lxd/shmounts" =
{ {
device = "tmpfs"; device = "tmpfs";
@ -75,18 +73,30 @@
options = [ "bind" ]; options = [ "bind" ];
}; };
fileSystems."/media/luna/media" =
{
device = "//10.69.0.69/media";
fsType = "cifs";
};
fileSystems."/media/luna/private" = fileSystems."/media/luna/private" =
{ {
device = "//10.69.0.69/private"; device = "//10.69.0.69/private";
fsType = "cifs"; fsType = "cifs";
}; };
fileSystems."/media/luna/photos" =
{
device = "10.69.0.69:/media/tank/photos";
fsType = "nfs4";
};
fileSystems."/media/luna/games" =
{
device = "10.69.0.69:/media/tank/games";
fsType = "nfs4";
};
fileSystems."/media/luna/media" =
{
device = "10.69.0.69:/media/tank/media";
fsType = "nfs4";
};
swapDevices = swapDevices =
[{ device = "/dev/disk/by-uuid/b134fecf-719f-45af-b317-001e413f06c4"; }]; [{ device = "/dev/disk/by-uuid/b134fecf-719f-45af-b317-001e413f06c4"; }];