NixOS/mobile-nixos
1
1
Fork 0
mirror of https://github.com/NixOS/mobile-nixos.git synced 2024-12-16 11:43:21 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #341 from samueldr-wip/fix/demo-prefer-modesetting

Browse Source 
examples/demo: Prefer modesetting first
This commit is contained in:
Samuel Dionne-Riel 2021-04-30 15:05:36 -04:00 committed by GitHub
commit 9d95561e5b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 41 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
examples/demo/configuration.nix
View File

@ -36,7 +36,12 @@ in
enable = true;
libinput.enable = true;
videoDrivers = lib.mkDefault [ "fbdev" ];
videoDrivers = lib.mkDefault [
# Try modesetting first
"modesetting"
# Fallback on fbdev (for many android vendor kernels)
"fbdev"
];
# Automatically login as nixos.
displayManager.lightdm = {
@ -246,16 +251,6 @@ in
};
}
# FIXME : depthcharge is the wrong assumption.
# A better abstraction over the X11 stack is required within mobile-nixos.
# The qemu VM requires the fbdev one to work as expcted.
# The android devices may have hwcomposer stuff coming.
(lib.mkIf (system_type == "depthcharge") {
services.xserver = {
videoDrivers = [ "modesetting" ];
};
})
{
# Force userdata for the target partition. It is assumed it will not
# fit in the `system` partition.

35
examples/demo/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml
View File

@ -10,6 +10,41 @@
<property name="last-image" type="string" value="@wallpaper@"/>
</property>
</property>
<property name="monitorVirtual-1" type="empty">
<property name="workspace0" type="empty">
<property name="color-style" type="int" value="0"/>
<property name="image-style" type="int" value="5"/>
<property name="last-image" type="string" value="@wallpaper@"/>
</property>
</property>
<property name="monitorDSI-1" type="empty">
<property name="workspace0" type="empty">
<property name="color-style" type="int" value="0"/>
<property name="image-style" type="int" value="5"/>
<property name="last-image" type="string" value="@wallpaper@"/>
</property>
</property>
<property name="monitorHDMI-1" type="empty">
<property name="workspace0" type="empty">
<property name="color-style" type="int" value="0"/>
<property name="image-style" type="int" value="5"/>
<property name="last-image" type="string" value="@wallpaper@"/>
</property>
</property>
<property name="monitorDP-1" type="empty">
<property name="workspace0" type="empty">
<property name="color-style" type="int" value="0"/>
<property name="image-style" type="int" value="5"/>
<property name="last-image" type="string" value="@wallpaper@"/>
</property>
</property>
<property name="monitoreDP-1" type="empty">
<property name="workspace0" type="empty">
<property name="color-style" type="int" value="0"/>
<property name="image-style" type="int" value="5"/>
<property name="last-image" type="string" value="@wallpaper@"/>
</property>
</property>
</property>
</property>
<property name="desktop-menu" type="empty">