diff --git a/hosts/harrison/hardware-configuration.nix b/hosts/harrison/hardware-configuration.nix index 1d534e69..56e9652e 100644 --- a/hosts/harrison/hardware-configuration.nix +++ b/hosts/harrison/hardware-configuration.nix @@ -17,8 +17,21 @@ boot.initrd.luks.devices."cryptoroot" = { device = "/dev/disk/by-uuid/e3a0394d-8bb5-4049-bf65-90d7202163cd"; keyFile = "/dev/disk/by-id/usb-SanDisk_Cruzer_Blade_04011806021722115743-0:0-part1"; + fallbackToPassword = true; + bypassWorkqueues = true; }; + boot.loader.grub.mirroredBoots = [ + { + devices = [ "/dev/disk/by-uuid/4B4A-B1B4" ]; + path = "/boot1"; + } + { + devices = [ "/dev/disk/by-uuid/4B2C-385A" ]; + path = "/boot2"; + } + ]; + fileSystems = { "/" = { @@ -26,17 +39,17 @@ fsType = "ext4"; }; - "/boot" = - { - device = "/dev/disk/by-uuid/4B4A-B1B4"; - fsType = "vfat"; - }; - - "/boot2" = - { - device = "/dev/disk/by-uuid/4B2C-385A"; - fsType = "vfat"; - }; + # "/boot" = + # { + # device = "/dev/disk/by-uuid/4B4A-B1B4"; + # fsType = "vfat"; + # }; + # + # "/boot2" = + # { + # device = "/dev/disk/by-uuid/4B2C-385A"; + # fsType = "vfat"; + # }; "/home/hensoko/data" = { @@ -49,6 +62,4 @@ [{ device = "/dev/disk/by-uuid/51348108-5c29-4251-a087-5a7de2eb97b5"; }]; hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; - # high-resolution display - hardware.video.hidpi.enable = lib.mkDefault true; } diff --git a/hosts/norman/hardware-configuration.nix b/hosts/norman/hardware-configuration.nix index 6827a797..158f6cb9 100644 --- a/hosts/norman/hardware-configuration.nix +++ b/hosts/norman/hardware-configuration.nix @@ -11,8 +11,14 @@ boot.kernelModules = [ "kvm-intel" ]; boot.extraModulePackages = [ ]; + boot.loader.grub.trustedBoot = { + enable = true; + systemHasTPM = "YES_TPM_is_activated"; + }; + boot.initrd.luks.devices."cryptroot" = { device = "/dev/disk/by-uuid/cdc29f0f-5b18-4ee7-8d38-1f4bac80b1e6"; + bypassWorkqueues = true; }; fileSystems."/" = @@ -31,4 +37,10 @@ [{ device = "/dev/disk/by-uuid/54162798-9017-4b59-afd7-ab9578da4bb9"; }]; hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; + + hardware.trackpoint = { + enable = true; + device = "TPPS/2 ALPS TrackPoint"; + emulateWheel = true; + }; } diff --git a/hosts/ringo/hardware-configuration.nix b/hosts/ringo/hardware-configuration.nix index c828e07d..408dcf02 100644 --- a/hosts/ringo/hardware-configuration.nix +++ b/hosts/ringo/hardware-configuration.nix @@ -14,6 +14,8 @@ boot.initrd.luks.devices."cryptroot" = { device = "/dev/disk/by-uuid/bd1ebf98-adc1-4868-842f-3d2c6ee04e13"; keyFile = "/dev/disk/by-partuuid/9ff6ebf7-01"; + fallbackToPassword = true; + bypassWorkqueues = true; }; fileSystems."/" =