From 963dd724d2a58cbd643b8a69f1a5f56d3e8514bc Mon Sep 17 00:00:00 2001 From: Stefan Ellmauthaler Date: Sun, 31 Jul 2022 14:39:16 +0200 Subject: [PATCH] Add configuration on metis --- machines/metis/default.nix | 32 +++++++++++++++++---- machines/metis/hardware-configuration.nix | 34 ++++++++++++----------- 2 files changed, 45 insertions(+), 21 deletions(-) diff --git a/machines/metis/default.nix b/machines/metis/default.nix index 37b47ab..5a9e995 100644 --- a/machines/metis/default.nix +++ b/machines/metis/default.nix @@ -1,4 +1,4 @@ -{ config, pkgs, inputs, nixos-hardware, ...}: +{ config, pkgs, inputs, nixos-hardware, ... }: { imports = [ ../../common/users.nix @@ -18,7 +18,7 @@ graphical = { enable = false; # set dpi if used in mobile applications -# dpi = 180; + # dpi = 180; }; # enable deamon to generate nix-index-db @@ -40,9 +40,9 @@ }; # enable wireguard - wireguard.enable = false; - - + wireguard.enable = false; + + # user setup users = { enable = true; @@ -56,5 +56,27 @@ }; }; }; + fileSystems."/".options = [ "noatime" ]; + boot.loader.systemd-boot.enable = true; + boot.loader.efi.canTouchEfiVariables = true; + + networking = { + interfaces.ens3 = { + ipv4.addresses = [{ + address = "89.58.45.113"; + prefixLength = 22; + }]; + ipv6.addresses = [{ + address = "fe80::94e0:6eff:fecd:d6cb"; + prefixLength = 64; + }]; + }; + defaultGateway = "89.58.44.1"; + defaultGateway6 = { + address = "fe80::1"; + interface = "ens3"; + }; + + }; system.stateVersion = "22.05"; } diff --git a/machines/metis/hardware-configuration.nix b/machines/metis/hardware-configuration.nix index 43d6e91..bfd3a32 100644 --- a/machines/metis/hardware-configuration.nix +++ b/machines/metis/hardware-configuration.nix @@ -5,34 +5,36 @@ { imports = - [ (modulesPath + "/installer/scan/not-detected.nix") + [ + (modulesPath + "/profiles/qemu-guest.nix") ]; - boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" "sdhci_pci" ]; + boot.initrd.availableKernelModules = [ "ata_piix" "uhci_hcd" "virtio_pci" "virtio_scsi" "sd_mod" "sr_mod" ]; boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ "kvm-intel" ]; + boot.kernelModules = [ ]; boot.extraModulePackages = [ ]; fileSystems."/" = - { device = "/dev/disk/by-uuid/da267a3c-34e3-4218-933f-10738ee61eb6"; - fsType = "ext4"; - }; - - fileSystems."/home" = - { device = "/dev/disk/by-uuid/9ebd7aff-629b-449b-83d8-6381a04eb708"; - fsType = "ext4"; + { + device = "/dev/disk/by-label/nixos-root"; + fsType = "xfs"; }; fileSystems."/boot" = - { device = "/dev/disk/by-uuid/DE6D-C383"; + { + device = "/dev/disk/by-label/BOOT"; fsType = "vfat"; }; swapDevices = - [ { device = "/dev/disk/by-uuid/0069f1fa-dd8e-4c0a-8f01-a576af29909e"; } - ]; + [{ device = "/dev/disk/by-label/swap"; }]; - powerManagement.cpuFreqGovernor = lib.mkDefault "powersave"; - # high-resolution display - hardware.video.hidpi.enable = lib.mkDefault true; + # 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.ens3.useDHCP = lib.mkDefault true; + + hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; }