diff options
| author | Profpatsch <mail@profpatsch.de> | 2019-12-22 20:49:43 +0100 |
|---|---|---|
| committer | Profpatsch <mail@profpatsch.de> | 2019-12-22 20:51:00 +0100 |
| commit | f0e65e6254ea72f92422392f4493681ff6c5c760 (patch) | |
| tree | 004a2881c3761f8e7344b27fa5e28d923d27189d /machines/devhell | |
| parent | 075c4e093d5bcef94f2b5e1df44a8e364edfbbc2 (diff) | |
machines: `consoleFont` and `consoleKeyMap` moved to `console`
Fixes the evaluation warning. cc @aszlig @devhell @sternenseemann
Diffstat (limited to 'machines/devhell')
| -rw-r--r-- | machines/devhell/eir.nix | 7 | ||||
| -rw-r--r-- | machines/devhell/gunnr.nix | 9 | ||||
| -rw-r--r-- | machines/devhell/hildr.nix | 7 | ||||
| -rw-r--r-- | machines/devhell/sigrun.nix | 7 |
4 files changed, 21 insertions, 9 deletions
diff --git a/machines/devhell/eir.nix b/machines/devhell/eir.nix index a76be6e5..9ffd5bb4 100644 --- a/machines/devhell/eir.nix +++ b/machines/devhell/eir.nix @@ -74,11 +74,14 @@ }; i18n = { - consoleFont = "Lat2-Terminus16"; - consoleKeyMap = "uk"; defaultLocale = "en_GB.UTF-8"; }; + console = { + font = "Lat2-Terminus16"; + keyMap = "uk"; + }; + #### Machine-specific service configuration #### vuizvui.user.devhell.profiles.services.enable = true; diff --git a/machines/devhell/gunnr.nix b/machines/devhell/gunnr.nix index 70a009c4..b3323629 100644 --- a/machines/devhell/gunnr.nix +++ b/machines/devhell/gunnr.nix @@ -78,9 +78,12 @@ }; i18n = { - consoleFont = "Lat2-Terminus16"; - consoleKeyMap = "dvorak"; - defaultLocale = "en_GB.UTF-8"; + defaultLocale = "en_US.UTF-8"; + }; + + console = { + font = "Lat2-Terminus16"; + keyMap = "dvorak"; }; #### Machine-specific service configuration #### diff --git a/machines/devhell/hildr.nix b/machines/devhell/hildr.nix index 19c89029..47959d5e 100644 --- a/machines/devhell/hildr.nix +++ b/machines/devhell/hildr.nix @@ -82,11 +82,14 @@ }; i18n = { - consoleFont = "lat9w-16"; - consoleKeyMap = "uk"; defaultLocale = "en_GB.UTF-8"; }; + console = { + font = "lat9w-16"; + keyMap = "uk"; + }; + #### Machine-specific service configuration #### vuizvui.user.devhell.profiles.services.enable = true; diff --git a/machines/devhell/sigrun.nix b/machines/devhell/sigrun.nix index 4fba2ffe..9db7c063 100644 --- a/machines/devhell/sigrun.nix +++ b/machines/devhell/sigrun.nix @@ -71,11 +71,14 @@ nix.maxJobs = 8; i18n = { - consoleFont = "Lat2-Terminus16"; - consoleKeyMap = "dvorak"; defaultLocale = "en_US.UTF-8"; }; + console = { + font = "Lat2-Terminus16"; + keyMap = "dvorak"; + }; + powerManagement.powerUpCommands = '' ${pkgs.hdparm}/sbin/hdparm -B 255 \ /dev/disk/by-id/ata-ST31500541AS_6XW0NK21 |