axeman/pub-solar-os
1
0
Fork 0
forked from pub-solar/os
Code Issues Pull requests Packages Projects Releases Wiki Activity

dumpyourvms: fix Error switching console mode to 1 unsupported

Browse source
This commit is contained in:
teutat3s 2022-11-26 04:23:53 +01:00
parent 6c83d67887
commit f791ceccd0
Signed by untrusted user: teutat3s
GPG key ID: 4FA1D3FA524F22C1
1 changed files with 22 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
hosts/dumpyourvms/dumpyourvms.nix
View file

@ -1,10 +1,14 @@
{ config, pkgs, lib, self, ... }: {
with lib; config,
let pkgs,
lib,
self,
...
}:
with lib; let
psCfg = config.pub-solar; psCfg = config.pub-solar;
xdg = config.home-manager.users."${psCfg.user.name}".xdg; xdg = config.home-manager.users."${psCfg.user.name}".xdg;
in in {
{
imports = [ imports = [
./hardware-configuration.nix ./hardware-configuration.nix
]; ];
@ -28,11 +32,14 @@ in
# fix backlight for keyboard and brightness, adjust function key binding, # fix backlight for keyboard and brightness, adjust function key binding,
# intel_pstate for cpu schedutil, resume offset for swapfile, disable amdgpu driver # 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.loader.efi.canTouchEfiVariables = true;
#boot.resumeDevice = "/dev/mapper/cryptroot"; #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 = '' systemd.sleep.extraConfig = ''
HibernateMode=shutdown HibernateMode=shutdown
@ -58,7 +65,7 @@ in
services.mozillavpn.enable = true; services.mozillavpn.enable = true;
networking = import ./networking.nix; networking = import ./networking.nix;
security.pki.certificateFiles = [ ./consul-agent-ca.pem ]; security.pki.certificateFiles = [./consul-agent-ca.pem];
services.unbound = import ./unbound.nix; services.unbound = import ./unbound.nix;
@ -75,7 +82,7 @@ in
console = { console = {
earlySetup = true; earlySetup = true;
font = lib.mkForce "ter-i32b"; font = lib.mkForce "ter-i32b";
packages = [ pkgs.terminus_font ]; packages = [pkgs.terminus_font];
}; };
# Thunderbolt tools # Thunderbolt tools
@ -112,13 +119,13 @@ in
# Disable XHC1 wakeup signal to avoid resume getting triggered some time # Disable XHC1 wakeup signal to avoid resume getting triggered some time
# after suspend. Reboot required for this to take effect. # after suspend. Reboot required for this to take effect.
lib.optionalString lib.optionalString
(lib.versionAtLeast config.boot.kernelPackages.kernel.version "3.13") (lib.versionAtLeast config.boot.kernelPackages.kernel.version "3.13")
''SUBSYSTEM=="pci", KERNEL=="0000:00:14.0", ATTR{power/wakeup}="disabled"''; ''SUBSYSTEM=="pci", KERNEL=="0000:00:14.0", ATTR{power/wakeup}="disabled"'';
services.printing.enable = true; 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 # Custom device sway configs
xdg.configFile = mkIf psCfg.sway.enable { xdg.configFile = mkIf psCfg.sway.enable {
"sway/config.d/10-applications.conf".source = ./.config/sway/config.d/applications.conf; "sway/config.d/10-applications.conf".source = ./.config/sway/config.d/applications.conf;
@ -130,14 +137,13 @@ in
}; };
users.users.teutat3s = { users.users.teutat3s = {
extraGroups = [ "unbound" ]; extraGroups = ["unbound"];
}; };
# WLAN frequency compliance (e.g. check for radar with DFS) # WLAN frequency compliance (e.g. check for radar with DFS)
# #
# Radeon driver seems to work better than amdgpu with Radeon R9 M370X # 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 = '' boot.extraModprobeConfig = ''
options cfg80211 ieee80211_regdom="DE" options cfg80211 ieee80211_regdom="DE"
''; '';