derped
/
nixos
1
0
Fork 0
Code Releases Activity

Adapt to unstable option name changes.

This commit is contained in:
Kevin Baensch 2019-12-26 01:00:46 +01:00
parent 85600ad746
commit 8511968173
Signed by: derped
GPG Key ID: C0F1D326C7626543
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/locale.nix
View File

@ -1,8 +1,8 @@
{ config, pkgs, ... }: { config, pkgs, ... }:
{ {
console.keyMap = "de";
i18n = { i18n = {
consoleKeyMap = "de";
defaultLocale = "en_US.UTF-8"; defaultLocale = "en_US.UTF-8";
inputMethod = { inputMethod = {

2
machines/Lilim/options.nix
View File

@ -60,7 +60,7 @@ with lib;
allowedUDPPortRanges = [ { from = 1714; to = 1764; } ]; allowedUDPPortRanges = [ { from = 1714; to = 1764; } ];
allowedTCPPortRanges = [ { from = 1714; to = 1764; } ]; allowedTCPPortRanges = [ { from = 1714; to = 1764; } ];
}; };
desktop.wms = [ "i3" ]; desktop.wms = [ "none+i3" "i3" ];
}; };
config.system.copySysConf = { config.system.copySysConf = {

2
services/desktop.nix
View File

@ -40,9 +40,9 @@ in mkIf (elem "desktop" cfg.services) {
enable = !(elem "sway" cfg.desktop.wms); enable = !(elem "sway" cfg.desktop.wms);
layout = "de"; layout = "de";
videoDrivers = [ "intel" ]; videoDrivers = [ "intel" ];
displayManager.defaultSession = ifelse (cfg.desktop.wms != []) (elemAt cfg.desktop.wms 0) null;
windowManager = mkIf (cfg.desktop.wms != []) { windowManager = mkIf (cfg.desktop.wms != []) {
i3 = mkIf (elem "i3" cfg.desktop.wms) (import ./desktop/i3.nix { inherit pkgs; }); i3 = mkIf (elem "i3" cfg.desktop.wms) (import ./desktop/i3.nix { inherit pkgs; });
default = elemAt cfg.desktop.wms 0;
}; };
libinput = { libinput = {
enable = true; enable = true;