tristan/nix
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

Fix smb cifs mount permissions & update flake deps

Browse source
This commit is contained in:
Tristan D. 2023-12-04 12:20:48 +01:00
parent 57e91462ab
commit 0a36bfc203
Signed by: tristan
SSH key fingerprint: SHA256:U7y6eMb7CQDaTHv9XoX6/BaQnPqyxxKc+Xnfcefi6rY
2 changed files with 33 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
flake.lock generated
View file

@ -69,11 +69,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1701334333, "lastModified": 1701680013,
"narHash": "sha256-rsJ11xznoc2JSmM57bstxyas8xq8ZaEqNhQuQWyoQ/A=", "narHash": "sha256-H8uAiSr//UhEdTTRDJwP6LCTq7d1sXF1IKpe8GDW3PA=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "913e44a13636fd111139ee683a6741ccb4c28672", "rev": "1ff5471880b6e48f63ec5fa668486ab1268c2b22",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -318,11 +318,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1701432845, "lastModified": 1701626906,
"narHash": "sha256-06sd2rQ+DPMSueh+hW4MiXbpMSdhQHJOi/sw0vuwqvs=", "narHash": "sha256-ugr1QyzzwNk505ICE4VMQzonHQ9QS5W33xF2FXzFQ00=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "77da99a144cd341408308e0a37622f5edcc6c5ba", "rev": "0c6d8c783336a59f4c59d4a6daed6ab269c4b361",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -334,11 +334,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1701389149, "lastModified": 1701539137,
"narHash": "sha256-rU1suTIEd5DGCaAXKW6yHoCfR1mnYjOXQFOaH7M23js=", "narHash": "sha256-nVO/5QYpf1GwjvtpXhyxx5M3U/WN0MwBro4Lsk+9mL0=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "5de0b32be6e85dc1a9404c75131316e4ffbc634c", "rev": "933d7dc155096e7575d207be6fb7792bc9f34f6d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -350,11 +350,11 @@
}, },
"nur": { "nur": {
"locked": { "locked": {
"lastModified": 1701623572, "lastModified": 1701679481,
"narHash": "sha256-NBxGAGL+NqUON+2g9SjPJzcBIgov0gCM8WT8mZM83Xg=", "narHash": "sha256-mwcnWs3hi6t2yf1xDAvQyN4p94B2AIK5tkXqgPm8/vk=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "805f936f3ce5589d53c2a2c5eeab4019a233e10d", "rev": "946611806d877569dbcee22f39a92a59a137c7b1",
"type": "github" "type": "github"
}, },
"original": { "original": {

43
systems/nixos-pulse/default.nix
View file

@ -97,28 +97,27 @@
}; };
}; };
fileSystems."/mnt/ServerF" = { fileSystems =
# device = "//srv-nas-01.local/Server_F"; let
device = "//192.168.0.1/Server_F"; automount_opts = "x-systemd.automount,noauto,x-systemd.idle-timeout=60,x-systemd.device-timeout=5s,x-systemd.mount-timeout=5s";
fsType = "cifs"; perm_opts = "uid=1000,gid=100";
options = cifs_opts = "vers=2.0,credentials=/home/tristand/.smb-secrets";
let mount_opts = "${automount_opts},${perm_opts},${cifs_opts}";
# this line prevents hanging on network split in
automount_opts = "x-systemd.automount,noauto,x-systemd.idle-timeout=60,x-systemd.device-timeout=5s,x-systemd.mount-timeout=5s"; {
in "/mnt/ServerF" = {
[ "${automount_opts},vers=2.0,credentials=/home/tristand/.smb-secrets" ]; # device = "//srv-nas-01.local/Server_F";
}; device = "//192.168.0.1/Server_F";
fileSystems."/mnt/Scans" = { fsType = "cifs";
# device = "//srv-nas-01.local/Server_F"; options = [ mount_opts ];
device = "//192.168.0.1/Scans"; };
fsType = "cifs"; "/mnt/Scans" = {
options = # device = "//srv-nas-01.local/Server_F";
let device = "//192.168.0.1/Scans";
# this line prevents hanging on network split fsType = "cifs";
automount_opts = "x-systemd.automount,noauto,x-systemd.idle-timeout=60,x-systemd.device-timeout=5s,x-systemd.mount-timeout=5s"; options = [ mount_opts ];
in };
[ "${automount_opts},vers=2.0,credentials=/home/tristand/.smb-secrets" ]; };
};
systemd = { systemd = {
services = { services = {