AtaraxiaDev/nixos-config
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix mount, iperf

Browse Source
This commit is contained in:
Dmitriy Holkin 2019-09-29 14:59:51 +04:00
parent 44831a9724
commit cb01f5c303
4 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
modules/applications/packages.nix
View File

@ -33,6 +33,7 @@ with deviceSpecific; {
lm_sensors lm_sensors
libnotify libnotify
tree tree
iperf
(youtube-to-mpv.override { isLaptop = isLaptop; }) (youtube-to-mpv.override { isLaptop = isLaptop; })
# Other # Other
(vivaldi.override { proprietaryCodecs = true; }) (vivaldi.override { proprietaryCodecs = true; })

55
modules/filesystems.nix
View File

@ -43,18 +43,32 @@ with deviceSpecific; {
"gid=${toString config.users.groups.smbgrp.gid}" "gid=${toString config.users.groups.smbgrp.gid}"
]; ];
}; };
"/shared/data" = lib.mkIf (isHost) { "/media/data" = if isHost then {
# Samba host
fsType = "ntfs"; fsType = "ntfs";
device = "/dev/disk/by-partuuid/f9f853f5-498a-4981-8082-02feeae85377"; device = "/dev/disk/by-partuuid/f9f853f5-498a-4981-8082-02feeae85377";
options = [ options = [
"ro" # "ro"
# "noatime" # "noatime"
"nofail" "nofail"
"uid=${toString config.users.users.alukard.uid}" "uid=${toString config.users.users.alukard.uid}"
"gid=${toString config.users.groups.smbgrp.gid}" "gid=${toString config.users.groups.smbgrp.gid}"
]; ];
} else {
# Linux samba
fsType = "cifs";
device = "//192.168.0.100/data";
options = [
"ro"
"user=${secrets.linux-samba.user}"
"password=${secrets.linux-samba.password}"
# "nofail"
"uid=${toString config.users.users.alukard.uid}"
"gid=${toString config.users.groups.users.gid}"
];
}; };
"/shared/files" = lib.mkIf (isHost) { "/media/files" = if isHost then {
# Samba host
fsType = "ntfs"; fsType = "ntfs";
device = "/dev/disk/by-partuuid/8a1d933c-302b-4e62-b9af-a45ecd05777f"; device = "/dev/disk/by-partuuid/8a1d933c-302b-4e62-b9af-a45ecd05777f";
options = [ options = [
@ -64,6 +78,17 @@ with deviceSpecific; {
"uid=${toString config.users.users.alukard.uid}" "uid=${toString config.users.users.alukard.uid}"
"gid=${toString config.users.groups.smbgrp.gid}" "gid=${toString config.users.groups.smbgrp.gid}"
]; ];
} else {
# Linux samba
fsType = "cifs";
device = "//192.168.0.100/files";
options = [
"user=${secrets.linux-samba.user}"
"password=${secrets.linux-samba.password}"
# "nofail"
"uid=${toString config.users.users.alukard.uid}"
"gid=${toString config.users.groups.users.gid}"
];
}; };
# Samba Windows # Samba Windows
"/media/windows/files" = lib.mkIf (!isHost) { "/media/windows/files" = lib.mkIf (!isHost) {
@ -89,30 +114,6 @@ with deviceSpecific; {
"gid=${toString config.users.groups.users.gid}" "gid=${toString config.users.groups.users.gid}"
]; ];
}; };
# Samba Linux
"/media/linux/files" = lib.mkIf (!isHost) {
fsType = "cifs";
device = "//192.168.0.100/files";
options = [
"user=${secrets.linux-samba.user}"
"password=${secrets.linux-samba.password}"
# "nofail"
"uid=${toString config.users.users.alukard.uid}"
"gid=${toString config.users.groups.users.gid}"
];
};
"/media/linux/data" = lib.mkIf (!isHost) {
fsType = "cifs";
device = "//192.168.0.100/data";
options = [
"ro"
"user=${secrets.linux-samba.user}"
"password=${secrets.linux-samba.password}"
# "nofail"
"uid=${toString config.users.users.alukard.uid}"
"gid=${toString config.users.groups.users.gid}"
];
};
}; };
swapDevices = [ swapDevices = [
{ {

8
modules/samba.nix
View File

@ -33,21 +33,19 @@ with deviceSpecific; {
smb ports = 445 smb ports = 445
[data] [data]
path = /shared/data path = /media/data
browsable = yes browsable = yes
read only = yes read only = no
force create mode = 0660 force create mode = 0660
force directory mode = 2770 force directory mode = 2770
valid users = @smbgrp valid users = @smbgrp
[files] [files]
path = /shared/files path = /media/files
browsable = yes browsable = yes
read only = no read only = no
# guest only = yes
force create mode = 0660 force create mode = 0660
force directory mode = 2770 force directory mode = 2770
# force user = smbuser
valid users = @smbgrp valid users = @smbgrp
''; '';
}; };

4
modules/services.nix
View File

@ -14,7 +14,7 @@
[local] [local]
enabled = true enabled = true
library = sqlite library = sqlite
media_dir = /shared/files/Music media_dir = /media/files/Music
scan_timeout = 1000 scan_timeout = 1000
scan_flush_threshold = 100 scan_flush_threshold = 100
scan_follow_symlinks = false scan_follow_symlinks = false
@ -32,7 +32,7 @@
home-manager.users.alukard.home.file.".ncmpcpp/config".text = '' home-manager.users.alukard.home.file.".ncmpcpp/config".text = ''
mpd_host = 127.0.0.1 mpd_host = 127.0.0.1
mpd_port = 6600 mpd_port = 6600
mpd_music_dir = "/shared/files/Music" mpd_music_dir = "/media/files/Music"
''; '';
# services.mopidy = { # services.mopidy = {