From 192f2a7e0689aa0b16fb991b1b6ff45d97b68f4d Mon Sep 17 00:00:00 2001 From: Kabbone Date: Fri, 13 Jan 2023 15:35:07 +0100 Subject: [PATCH] hosts: change to new nas --- hosts/desktop/hardware-configuration.nix | 12 ------------ hosts/laptop/hardware-configuration.nix | 18 ++++++++++++------ hosts/nas/hardware-configuration.nix | 17 ++--------------- 3 files changed, 14 insertions(+), 33 deletions(-) diff --git a/hosts/desktop/hardware-configuration.nix b/hosts/desktop/hardware-configuration.nix index 0315b92..2c4a37f 100644 --- a/hosts/desktop/hardware-configuration.nix +++ b/hosts/desktop/hardware-configuration.nix @@ -59,18 +59,6 @@ fsType = "vfat"; }; - fileSystems."/mnt/Herkules" = - { device = "truenas:/mnt/Herkules"; - fsType = "nfs"; - options = [ "noauto,users,x-systemd.automount,x-systemd.device-timeout=10,soft,timeo=14,x-systemd.idle-timeout=1min,sec=sys,exec" ]; - }; - - fileSystems."/mnt/Nova" = - { device = "truenas:/mnt/Nova"; - fsType = "nfs"; - options = [ "noauto,users,x-systemd.automount,x-systemd.device-timeout=10,soft,timeo=14,x-systemd.idle-timeout=1min,sec=sys,exec" ]; - }; - fileSystems."/mnt/Pluto" = { device = "nas:/Pluto"; fsType = "nfs"; diff --git a/hosts/laptop/hardware-configuration.nix b/hosts/laptop/hardware-configuration.nix index 89ee11f..2c08ff1 100644 --- a/hosts/laptop/hardware-configuration.nix +++ b/hosts/laptop/hardware-configuration.nix @@ -74,18 +74,24 @@ fsType = "vfat"; }; - fileSystems."/mnt/Herkules" = - { device = "truenas:/mnt/Herkules"; + fileSystems."/mnt/Pluto" = + { device = "nas:/Pluto"; fsType = "nfs"; - options = [ "noauto,users,x-systemd.automount,x-systemd.device-timeout=10,soft,timeo=14,x-systemd.idle-timeout=1min,sec=sys,exec" ]; + options = [ "noauto,users,x-systemd.automount,x-systemd.device-timeout=10,soft,timeo=14,x-systemd.idle-timeout=1min,sec=sys,exec,nfsvers=4.2" ]; }; - fileSystems."/mnt/Nova" = - { device = "truenas:/mnt/Nova"; + fileSystems."/mnt/Mars" = + { device = "nas:/Mars"; fsType = "nfs"; - options = [ "noauto,users,x-systemd.automount,x-systemd.device-timeout=10,soft,timeo=14,x-systemd.idle-timeout=1min,sec=sys,exec" ]; + options = [ "noauto,users,x-systemd.automount,x-systemd.device-timeout=10,soft,timeo=14,x-systemd.idle-timeout=1min,sec=sys,exec,nfsvers=4.2" ]; }; +# fileSystems."/mnt/Pluto" = +# { device = "nas:/Pluto/nix"; +# fsType = "nfs"; +# options = [ "noauto,users,x-systemd.automount,x-systemd.device-timeout=10,soft,timeo=14,x-systemd.idle-timeout=1min,sec=sys,exec,nfsvers=4.2,local_lock=all" ]; +# }; + swapDevices = [ ]; diff --git a/hosts/nas/hardware-configuration.nix b/hosts/nas/hardware-configuration.nix index 099c59f..738ab44 100644 --- a/hosts/nas/hardware-configuration.nix +++ b/hosts/nas/hardware-configuration.nix @@ -96,19 +96,6 @@ }; - fileSystems."/mnt/Herkules" = - { device = "truenas:/mnt/Herkules"; - fsType = "nfs"; - options = [ "noauto,users,x-systemd.automount,x-systemd.device-timeout=10,soft,timeo=14,x-systemd.idle-timeout=1min,sec=sys,exec" ]; - }; - - fileSystems."/mnt/Nova" = - { device = "truenas:/mnt/Nova"; - fsType = "nfs"; - options = [ "noauto,users,x-systemd.automount,x-systemd.device-timeout=10,soft,timeo=14,x-systemd.idle-timeout=1min,sec=sys,exec" ]; - }; - - swapDevices = [ ]; networking = { @@ -144,8 +131,8 @@ cpuFreqGovernor = lib.mkDefault "powersave"; powertop.enable = true; powerUpCommands = '' - ${pkgs.hdparm}/sbin/hdparm -B 127 -S 120 /dev/disk/by-uuid/57e6446d-faca-4b67-9063-e8d9afb80088 - ${pkgs.hdparm}/sbin/hdparm -B 127 -S 120 /dev/disk/by-uuid/b9edc489-ac37-4b28-981d-442722df7ae2 + ${pkgs.hdparm}/sbin/hdparm -S 150 /dev/disk/by-uuid/57e6446d-faca-4b67-9063-e8d9afb80088 + ${pkgs.hdparm}/sbin/hdparm -S 150 /dev/disk/by-uuid/b9edc489-ac37-4b28-981d-442722df7ae2 ''; };