Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: mobile-nixos/mobile-nixos
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: a29fbde4a11f
Choose a base ref
...
head repository: mobile-nixos/mobile-nixos
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 9d95561e5b3b
Choose a head ref
  • 3 commits
  • 2 files changed
  • 1 contributor

Commits on Apr 30, 2021

  1. examples/demo: Prefer modesetting first

    @samueldr
    samueldr committed Apr 30, 2021

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    GPG key ID: B5690EEEBB952194
    Verified
    Learn about vigilant mode
    Copy the full SHA
    09fc549 View commit details

  2. examples/demo: Fix wallpaper in modesetting 

    This is because the wallpaper is set per-display, without falling back
to a general more configurable path before their built-in fallback.
    @samueldr
    samueldr committed Apr 30, 2021
    Copy the full SHA
    e3d8e4a View commit details

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

    examples/demo: Prefer modesetting first
    @samueldr
    samueldr authored Apr 30, 2021
    Copy the full SHA
    9d95561 View commit details
Showing with 41 additions and 11 deletions.
  1. +6 −11 examples/demo/configuration.nix
  2. +35 −0 examples/demo/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml
17 changes: 6 additions & 11 deletions examples/demo/configuration.nix
View file
Original file line number Diff line number Diff line change
@@ -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 changes: 35 additions & 0 deletions examples/demo/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml
View file
Original file line number Diff line number Diff line change
@@ -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">