diff --git a/hosts/fwbook.hardware-configuration.nix b/hosts/fwbook.hardware-configuration.nix index 740893c..eddda11 100644 --- a/hosts/fwbook.hardware-configuration.nix +++ b/hosts/fwbook.hardware-configuration.nix @@ -1,28 +1,33 @@ -# Generated by ‘nixos-generate-config’ -{ config, lib, pkgs, modulesPath, ... }: +# Do not modify this file! It was generated by ‘nixos-generate-config’ +# and may be overwritten by future invocations. Please make changes +# to /etc/nixos/configuration.nix instead. +{ config, lib, modulesPath, ... }: { - imports = - [ - (modulesPath + "/installer/scan/not-detected.nix") - ]; + imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; - boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "thunderbolt" "uas" "usb_storage" "sd_mod" ]; + boot.initrd.availableKernelModules = + [ "nvme" "xhci_pci" "thunderbolt" "uas" "sd_mod" ]; boot.initrd.kernelModules = [ ]; boot.kernelModules = [ "kvm-amd" ]; boot.extraModulePackages = [ ]; - fileSystems."/" = - { - device = "/dev/disk/by-uuid/3fbf3ccf-655a-4040-b898-b97a1d555912"; - fsType = "ext4"; - }; + fileSystems."/" = { + device = "/dev/disk/by-uuid/3fbf3ccf-655a-4040-b898-b97a1d555912"; + fsType = "ext4"; + }; - fileSystems."/boot" = - { - device = "/dev/disk/by-uuid/3342-B2BE"; - fsType = "vfat"; - }; + fileSystems."/boot" = { + device = "/dev/disk/by-uuid/3342-B2BE"; + fsType = "vfat"; + options = [ "fmask=0022" "dmask=0022" ]; + }; + + fileSystems."/mnt/Data" = { + device = "/dev/disk/by-uuid/239db4ac-762d-4d76-8297-ccd37bcdfd8b"; + fsType = "ext4"; + options = [ "users" "nofail" ]; + }; swapDevices = [{ device = "/dev/disk/by-uuid/5175a4b0-0067-47c6-b7da-35acb247f134"; }]; @@ -32,9 +37,13 @@ # 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; + hardware.cpu.amd.updateMicrocode = + lib.mkDefault config.hardware.enableRedistributableFirmware; } diff --git a/hosts/fwbook.nix b/hosts/fwbook.nix index dea0260..88bfcd5 100644 --- a/hosts/fwbook.nix +++ b/hosts/fwbook.nix @@ -15,11 +15,11 @@ in }) { inherit (pkgs) system; }).fwupd; services.fprintd.enable = true; - fileSystems."${dataDir}" = { - device = "/dev/sda1"; - fsType = "ext4"; - options = [ "users" "nofail" ]; - }; + # fileSystems."${dataDir}" = { + # device = "/dev/sda1"; + # fsType = "ext4"; + # options = [ "users" "nofail" ]; + # }; hardware.bluetooth.settings.General = { ControllerMode = "bredr"; }; # Bootloader. boot.loader.systemd-boot.enable = true;