From 7e4858c1abaab113f6634033c3bf055441e171a3 Mon Sep 17 00:00:00 2001 From: Ari Sosnovsky Date: Tue, 9 Jul 2024 11:35:31 -0400 Subject: [PATCH] Added mounts + clean up --- hosts/fwbook.hardware-configuration.nix | 17 ++++++++++++----- hosts/fwbook.nix | 5 ----- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/hosts/fwbook.hardware-configuration.nix b/hosts/fwbook.hardware-configuration.nix index e732e4c..076f76a 100644 --- a/hosts/fwbook.hardware-configuration.nix +++ b/hosts/fwbook.hardware-configuration.nix @@ -29,20 +29,27 @@ options = [ "users" "nofail" ]; }; + fileSystems."/mnt/EightTerra/DownloadedTorrents" = { + device = "tnas1.lab.internal:/mnt/EightTerra/DownloadedTorrents"; + fsType = "nfs"; + options = [ "x-systemd.automount" "noauto" ]; + }; + + fileSystems."/mnt/EightTerra/k3s-cluster" = { + device = "tnas1.lab.internal:/mnt/EightTerra/k3s-cluster"; + fsType = "nfs"; + options = [ "x-systemd.automount" "noauto" ]; + }; + swapDevices = [{ device = "/dev/disk/by-uuid/5175a4b0-0067-47c6-b7da-35acb247f134"; }]; - # Enables DHCP on each ethernet and wireless interface. In case of scripted networking - # (the default) this is the recommended approach. When using systemd-networkd it's - # still possible to use this option, but it's recommended to use it in conjunction - # with explicit per-interface declarations with `networking.interfaces..useDHCP`. networking.useDHCP = lib.mkDefault true; # networking.interfaces.br-74ce7d3722b8.useDHCP = lib.mkDefault true; networking.interfaces.docker0.useDHCP = lib.mkDefault true; # networking.interfaces.tailscale0.useDHCP = lib.mkDefault true; # networking.interfaces.vethdb1ba40.useDHCP = lib.mkDefault true; # networking.interfaces.wlp1s0.useDHCP = lib.mkDefault true; - nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; diff --git a/hosts/fwbook.nix b/hosts/fwbook.nix index b870d39..92a9d58 100644 --- a/hosts/fwbook.nix +++ b/hosts/fwbook.nix @@ -15,11 +15,6 @@ in }) { inherit (pkgs) system; }).fwupd; services.fprintd.enable = true; - # fileSystems."${dataDir}" = { - # device = "/dev/sda1"; - # fsType = "ext4"; - # options = [ "users" "nofail" ]; - # }; hardware.bluetooth.settings.General = { ControllerMode = "bredr"; }; # Bootloader. boot.loader.systemd-boot.enable = true;