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

hosts: nas: move Mars to Jupiter

Browse Source
This commit is contained in:
Kabbone 2023-09-03 19:39:29 +02:00
parent 389d5d8daa
commit cc62417941
Signed by: Kabbone
SSH Key Fingerprint: SHA256:A5zPB5I6u5V78V51c362BBdCwhDhfDUVbt7NfKdjWBY
5 changed files with 23 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hosts/desktop/hardware-configuration.nix
View File

@ -100,7 +100,7 @@
};
fileSystems."/mnt/Mars" =
{ device = "nas:/Mars";
{ device = "jupiter:/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,nfsvers=4.2" ];
};

2
hosts/jupiter/default.nix
View File

@ -23,7 +23,7 @@
imports = # For now, if applying to other system, swap files
[(import ./hardware-configuration.nix)] ++ # Current system hardware config @ /etc/nixos/hardware-configuration.nix
(import ../../modules/desktop/virtualisation) ++ # Docker
# (import ../../modules/services/nas) ++ # Server Services
(import ../../modules/services/nas) ++ # Server Services
(import ../../modules/hardware); # Hardware devices
boot = { # Boot options

37
hosts/jupiter/hardware-configuration.nix
View File

@ -66,7 +66,7 @@
subvolume = {
"@" = {};
"@home" = {};
# "@nas/home" = {};
"@nas/Home" = {};
};
};
};
@ -132,12 +132,12 @@
options = [ "compress=zstd,space_cache=v2,ssd,noatime,subvolid=5,discard=async" ];
};
# fileSystems."/mnt/snapshots/Mars" =
# { device = "/dev/disk/by-label/NIXROOT";
# fsType = "btrfs";
# options = [ "compress=zstd,space_cache=v2,ssd,noatime,subvolid=5,discard=async" ];
# };
#
fileSystems."/mnt/snapshots/Mars" =
{ device = "/dev/disk/by-label/NIXROOT";
fsType = "btrfs";
options = [ "compress=zstd,space_cache=v2,ssd,noatime,subvolid=5,discard=async" ];
};
# fileSystems."/mnt/snapshots/Pluto" =
# { device = "/dev/disk/by-label/NAS-RAID";
# fsType = "btrfs";
@ -150,11 +150,11 @@
# options = [ "compress=zstd,space_cache=v2,noatime,subvol=@" ];
# };
#
# fileSystems."/mnt/Mars" =
# { device = "/dev/disk/by-label/NIXROOT";
# fsType = "btrfs";
# options = [ "compress=zstd,space_cache=v2,ssd,noatime,subvol=@nas,discard=async" ];
# };
fileSystems."/mnt/Mars" =
{ device = "/dev/disk/by-label/NIXROOT";
fsType = "btrfs";
options = [ "compress=zstd,space_cache=v2,ssd,noatime,subvol=@nas,discard=async" ];
};
fileSystems."/boot" =
{ device = "/dev/disk/by-label/NIXBOOT";
@ -165,11 +165,11 @@
# { device = "/mnt/Pluto";
# options = [ "bind" ];
# };
#
# fileSystems."/export/Mars" =
# { device = "/mnt/Mars";
# options = [ "bind" ];
# };
fileSystems."/export/Mars" =
{ device = "/mnt/Mars";
options = [ "bind" ];
};
swapDevices = [ ];
@ -239,7 +239,8 @@
powerManagement = {
cpuFreqGovernor = lib.mkDefault "powersave";
powertop.enable = true;
# powerUpCommands = ''
scsiLinkPolicy = "med_power_with_dipm";
# powerUpCommands = ''
# ${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
# '';

2
hosts/laptop/hardware-configuration.nix
View File

@ -117,7 +117,7 @@
};
fileSystems."/mnt/Mars" =
{ device = "nas:/Mars";
{ device = "jupiter:/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,nfsvers=4.2" ];
};

2
hosts/steamdeck/hardware-configuration.nix
View File

@ -113,7 +113,7 @@
};
fileSystems."/mnt/Mars" =
{ device = "nas:/Mars";
{ device = "jupiter:/Mars";
fsType = "nfs";
options = [ "nofail,noauto,users,x-systemd.automount,x-systemd.device-timeout=10,soft,timeo=14,x-systemd.idle-timeout=1min,sec=sys,exec,nfsvers=4.2" ];
};