Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

dell/xps/13-9360: conflicting font fix #180

Merged
merged 1 commit into from Jul 28, 2020
Merged

Conversation

afreakk
Copy link
Contributor

@afreakk afreakk commented Jul 26, 2020

Removed setting console.font for >= 20.03
because the auto generated hardware-configuration.nix now sets:

  # High-DPI console
  console.font = lib.mkDefault "${pkgs.terminus_font}/share/consolefonts/ter-u28n.psf.gz";

Which cause the following error when also importing <nixos-hardware/dell/xps/13-9360>:

The option `console.font' has conflicting definitions, in 
`/etc/nixos/hardware-configuration.nix' and 
`/nix/var/nix/profiles/per-user/root/channels/nixos-hardware/dell/xps/13-9360'.

Closes #177

# 4K screen, use bigger console font
# i18n.consoleFont deprecated and obsolete in >=20.03
# hardware-configuration.nix generates console.font
i18n.consoleFont = lib.mkIf (lib.versionOlder (lib.versions.majorMinor lib.version) "20.03") (lib.mkDefault "latarcyrheb-sun32");
Copy link
Member

@Mic92 Mic92 Jul 26, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In unstable this should instead enable our new hidpi module instead. This should not cause a conflict because nixos-generate-config does the same.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Whats the new hidpi module?
Where is that? (im pretty new to nixos)

Copy link
Member

@Mic92 Mic92 Jul 28, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

NixOS/nixpkgs#88669

...also it might be not required at all anymore because nixos-generate-config already adds it automatically

@Mic92 Mic92 merged commit ad72510 into NixOS:master Jul 28, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

conflicting definitions: console.font in dell/xps/13-9360
2 participants