From f791ceccd0b0e069f6050454810648ff70fd4526 Mon Sep 17 00:00:00 2001 From: teutat3s Date: Sat, 26 Nov 2022 04:23:53 +0100 Subject: [PATCH] dumpyourvms: fix Error switching console mode to 1 unsupported --- hosts/dumpyourvms/dumpyourvms.nix | 38 ++++++++++++++++++------------- 1 file changed, 22 insertions(+), 16 deletions(-) diff --git a/hosts/dumpyourvms/dumpyourvms.nix b/hosts/dumpyourvms/dumpyourvms.nix index 2e608582..6aabb237 100644 --- a/hosts/dumpyourvms/dumpyourvms.nix +++ b/hosts/dumpyourvms/dumpyourvms.nix @@ -1,10 +1,14 @@ -{ config, pkgs, lib, self, ... }: -with lib; -let +{ + config, + pkgs, + lib, + self, + ... +}: +with lib; let psCfg = config.pub-solar; xdg = config.home-manager.users."${psCfg.user.name}".xdg; -in -{ +in { imports = [ ./hardware-configuration.nix ]; @@ -28,11 +32,14 @@ in # fix backlight for keyboard and brightness, adjust function key binding, # intel_pstate for cpu schedutil, resume offset for swapfile, disable amdgpu driver - boot.kernelParams = [ "acpi_backlight=video" "hid_apple.fnmode=2" "intel_pstate=passive" ]; + boot.kernelParams = ["acpi_backlight=video" "hid_apple.fnmode=2" "intel_pstate=passive"]; boot.loader.efi.canTouchEfiVariables = true; #boot.resumeDevice = "/dev/mapper/cryptroot"; - boot.binfmt.emulatedSystems = [ "aarch64-linux" ]; + # fix for Error switching console mode to 1: unsupported on startup + boot.loader.systemd-boot.consoleMode = mkForce "0"; + + boot.binfmt.emulatedSystems = ["aarch64-linux"]; systemd.sleep.extraConfig = '' HibernateMode=shutdown @@ -58,7 +65,7 @@ in services.mozillavpn.enable = true; networking = import ./networking.nix; - security.pki.certificateFiles = [ ./consul-agent-ca.pem ]; + security.pki.certificateFiles = [./consul-agent-ca.pem]; services.unbound = import ./unbound.nix; @@ -75,7 +82,7 @@ in console = { earlySetup = true; font = lib.mkForce "ter-i32b"; - packages = [ pkgs.terminus_font ]; + packages = [pkgs.terminus_font]; }; # Thunderbolt tools @@ -112,13 +119,13 @@ in # Disable XHC1 wakeup signal to avoid resume getting triggered some time # after suspend. Reboot required for this to take effect. lib.optionalString - (lib.versionAtLeast config.boot.kernelPackages.kernel.version "3.13") - ''SUBSYSTEM=="pci", KERNEL=="0000:00:14.0", ATTR{power/wakeup}="disabled"''; + (lib.versionAtLeast config.boot.kernelPackages.kernel.version "3.13") + ''SUBSYSTEM=="pci", KERNEL=="0000:00:14.0", ATTR{power/wakeup}="disabled"''; services.printing.enable = true; - services.printing.drivers = [ pkgs.brlaser ]; + services.printing.drivers = [pkgs.brlaser]; - home-manager = pkgs.lib.setAttrByPath [ "users" psCfg.user.name ] { + home-manager = pkgs.lib.setAttrByPath ["users" psCfg.user.name] { # Custom device sway configs xdg.configFile = mkIf psCfg.sway.enable { "sway/config.d/10-applications.conf".source = ./.config/sway/config.d/applications.conf; @@ -130,14 +137,13 @@ in }; users.users.teutat3s = { - extraGroups = [ "unbound" ]; + extraGroups = ["unbound"]; }; - # WLAN frequency compliance (e.g. check for radar with DFS) # # Radeon driver seems to work better than amdgpu with Radeon R9 M370X - hardware.firmware = with pkgs; [ wireless-regdb ]; + hardware.firmware = with pkgs; [wireless-regdb]; boot.extraModprobeConfig = '' options cfg80211 ieee80211_regdom="DE" '';