sam
/
nixos
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FEATURE: add bind mounts for homeshare 

- mount homeshare directories to media from homeshareDataLocation in configVars
This commit is contained in:
Sam 2025-01-19 10:30:46 +00:00
parent 6e236ff544
commit 82b89bd6d0
15 changed files with 81 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
home/common/optional/desktop/common/default.nix
View File

@ -26,7 +26,6 @@
pkgs.hunspellDicts.en_US
pkgs.set_wm_class
pkgs.xorg.xkill
pkgs.krita
pkgs.R
pkgs.gimp
pkgs.gajim

8
hosts/citadel/default.nix
View File

@ -48,9 +48,11 @@ in {
../common/optional/pipewire.nix
../common/optional/openssh.nix
../common/optional/dwm.nix
../common/optional/nfs-mounts/media.nix
../common/optional/nfs-mounts/homeshare.nix
../common/optional/nfs-mounts/photos.nix
# ../common/optional/fileserver/media.nix
# ../common/optional/fileserver/homeshare.nix
# ../common/optional/fileserver/photos.nix
../common/optional/printing.nix
../common/optional/backlight.nix
../common/optional/xmodmap-arrow-remaps.nix

13
hosts/common/optional/fileserver/bind-mounts/media.nix Normal file
View File

@ -0,0 +1,13 @@
{configVars, ...}: let
homeshareDataLocation = configVars.locations.homeshareDataLocation;
in
{
fileSystems."/media/media" = {
device = "${homeshareDataLocation}/media";
fsType = "none";
options = [ "bind" ];
};
}

13
hosts/common/optional/fileserver/bind-mounts/personal.nix Normal file
View File

@ -0,0 +1,13 @@
{configVars, ...}: let
homeshareDataLocation = configVars.locations.homeshareDataLocation;
in
{
fileSystems."/media/personal" = {
device = "${homeshareDataLocation}/personal";
fsType = "none";
options = [ "bind" ];
};
}

13
hosts/common/optional/fileserver/bind-mounts/photos.nix Normal file
View File

@ -0,0 +1,13 @@
{configVars, ...}: let
homeshareDataLocation = configVars.locations.homeshareDataLocation;
in
{
fileSystems."/media/photos" = {
device = "${homeshareDataLocation}/photos";
fsType = "none";
options = [ "bind" ];
};
}

0
hosts/common/optional/nfs-mounts/homeshare.nix → hosts/common/optional/fileserver/nfs-client/homeshare.nix
View File

0
hosts/common/optional/nfs-mounts/media.nix → hosts/common/optional/fileserver/nfs-client/media.nix
View File

0
hosts/common/optional/nfs-mounts/photos.nix → hosts/common/optional/fileserver/nfs-client/photos.nix
View File

9
hosts/common/optional/fileserver/nfs-server/homeshare.nix Normal file
View File

@ -0,0 +1,9 @@
{
fileSystems."/media/homeshare" = {
device = "10.0.10.30:/mnt/homeshare";
fsType = "nfs";
options = [ "noatime" "_netdev" ];
};
}

9
hosts/common/optional/fileserver/nfs-server/media.nix Normal file
View File

@ -0,0 +1,9 @@
{configVars, ...}: let
mediaDataMountPoint = configVars.locations.mediaDataMountPoint;
in {
fileSystems.${mediaDataMountPoint} = {
device = "10.0.10.30:/mnt/media";
fsType = "nfs";
options = ["noatime" "_netdev"];
};
}

9
hosts/common/optional/fileserver/nfs-server/photos.nix Normal file
View File

@ -0,0 +1,9 @@
{configVars, ...}: let
photosDataMountPoint = configVars.locations.photosDataMountPoint;
in {
fileSystems.${photosDataMountPoint} = {
device = "10.0.10.30:/mnt/photos";
fsType = "nfs";
options = ["noatime" "_netdev" "ro"];
};
}

3
hosts/common/optional/nixos-containers/pihole.nix
View File

@ -78,7 +78,7 @@ in {
useHostResolvConf = lib.mkForce false;
};
services.resolved.enable = true;
services.resolved.enable = false;
imports = [
arion.nixosModules.arion
@ -89,6 +89,7 @@ in {
pkgs.vim
pkgs.git
pkgs.arion
pkgs.lsof
];
virtualisation = {

10
hosts/semita/default.nix
View File

@ -54,10 +54,10 @@ in {
../common/optional/gaming.nix
../common/optional/restic-backup.nix
# nfs mounts
../common/optional/nfs-mounts/media.nix
../common/optional/nfs-mounts/homeshare.nix
../common/optional/nfs-mounts/photos.nix
# bind mounts
../common/optional/fileserver/bind-mounts/media.nix
../common/optional/fileserver/bind-mounts/personal.nix
../common/optional/fileserver/bind-mounts/photos.nix
# nixos-containers
../common/optional/nixos-containers/nix-bitcoin.nix
@ -66,7 +66,7 @@ in {
../common/optional/nixos-containers/semitamaps-worker.nix
../common/optional/nixos-containers/backup-server.nix
../common/optional/nixos-containers/docker.nix
# ../common/optional/nixos-containers/pihole.nix
../common/optional/nixos-containers/pihole.nix
../common/optional/nixos-containers/metrics-server.nix
# # Build nix derivations on remote machine

2
hosts/sparky/default.nix
View File

@ -44,7 +44,7 @@ in {
# Import optional options
../common/optional/openssh.nix
../common/optional/persistence.nix
../common/optional/nfs-mounts/media.nix
# ../common/optional/fileserver/media.nix
../common/optional/gaming.nix
../common/optional/printing.nix
outputs.nixosModules.nixosAutoUpgrade

2
vars/default.nix
View File

@ -7,6 +7,8 @@
locations = {
mediaDataMountPoint = "/media/media";
photosDataMountPoint = "/media/photos";
personalDataMountPoint = "/media/personal";
homeshareDataLocation = "/mnt/main-ssd/homeshare";
metricsServerContainerData = "/mnt/main-ssd/metrics-server";
dockerContainerData = "/mnt/main-ssd/docker";