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

Apply desktop Customisations to all users #4015

Merged
merged 21 commits into from
Feb 3, 2021
Merged

Apply desktop Customisations to all users #4015

merged 21 commits into from
Feb 3, 2021

Conversation

C0D3-M4513R
Copy link
Contributor

@C0D3-M4513R C0D3-M4513R commented Dec 28, 2020

Status: Testing

  • LXDE
  • MATE
  • LXQt
  • Xfce
  • GNUstep

Also please link the issues below.
Reference: fixes #4014 fixes #3994

@C0D3-M4513R C0D3-M4513R marked this pull request as ready for review December 28, 2020 01:52
A couple instances in dietpi-software contained github links to MichaIng/Dietpi, instead of the config specified
@C0D3-M4513R C0D3-M4513R changed the title Patch 1 Apply desktop Customisations to all users Dec 28, 2020
@MichaIng
Copy link
Owner

Ah, as said, I aim to remove the dietpi user, while keeping only the group as pure system group to share cross-software access. We'd need to find a way to either override user defaults system-wide or otherwise copy/link those files and configs when a certain user is chosen for desktop auto-login via dietpi-autostart.

@C0D3-M4513R
Copy link
Contributor Author

C0D3-M4513R commented Dec 28, 2020

how about creating a folder with all the default user configs, that get copied, once a autostart-user is selected?
eg. /usr/share/dietpi/defaultuserconfig/ which gets copied to $USER_HOME/.config/?
EDIT: I'll implement this later, since you suggested it in the issue already.

@MichaIng
Copy link
Owner

For the configuration files there is probably a local user-wide override directory already, so that nothing needs to be copied. Not sure about the desktop entries. What needs to be considered is that most DietPi scripts require root permissions, so executing them from desktop as non-root fails. That would require own entries with a sudo prefix, or we could skip them to require a root desktop or shell session.

@C0D3-M4513R C0D3-M4513R marked this pull request as draft January 1, 2021 12:44
@C0D3-M4513R C0D3-M4513R marked this pull request as ready for review January 1, 2021 13:43
@MichaIng MichaIng added this to the v6.35 milestone Jan 11, 2021
@C0D3-M4513R C0D3-M4513R deleted the patch-1 branch January 20, 2021 23:51
@C0D3-M4513R C0D3-M4513R restored the patch-1 branch January 22, 2021 12:16
@C0D3-M4513R C0D3-M4513R reopened this Jan 22, 2021
@C0D3-M4513R
Copy link
Contributor Author

Acidentially deleted the branch. I should really start naming my pr branches!

dietpi/dietpi-autostart Outdated Show resolved Hide resolved
dietpi/dietpi-software Show resolved Hide resolved
+ DietPi-AutoStart | Do not add PCManFM desktop icon anymore. It is present as panel icon already
+ DietPi-Software | Desktop shortcuts are now created as follows: On first desktop install, a system-wide desktop autostart entry is created that links/copies user-level configs and desktop entries into the users home dir, once it logs in the first time. The autostart entry then disables itseld. This way only users which are actually used for desktop sessions get related configs and entries, and only a single time. Desktop shortcuts for later installed software titles are added only to users, which did already log into a desktop, hence have the autostart entry disabled. For now users, those are added by the autostart entry as well.
+ DietPi-Software | Further implement G_EXEC error handler where applicable and minor coding
+ DietPi-Software | DietPi-Desktop_setup: Pre-create Desktop dir in users home before attempting to link shortcuts
+ DietPi-Software | Satisfy shellcheck
+ DietPi-Software | Fix shellcheck rule ID
@C0D3-M4513R
Copy link
Contributor Author

You should probably mark the requested changes as complete/approved.

@MichaIng
Copy link
Owner

MichaIng commented Feb 3, 2021

"change requested" cannot be undone without approving the PR. But for that I'll now run some tests first 😉.

+ DietPi-Software | DietPi-Desktop_setup: Add htop to default desktop shortcuts
+ DietPi-Software | DietPi-Desktop_setup: Fix root user detection
+ DietPi-Software | DietPi-Desktop_setup: Pre-create autostart directory before writing to it
+ DietPi-Software | LXDE: Fix lxpanel default config directory and apply pcmanfm desktop item config manually within DietPi-Desktop_setup: The default desktop-items-0.conf for users cannot be overwritten by placing a file in any system directory, the content seems to be hardcoded and needs to be altered after it has been created. Since only the wallpaper and fonts shadow colour are relevant changes we apply, this is not a big issue.
+ DietPi-Software | LXDE: Fix applying fonts shadow colour on first login
+ DietPi-Software | LXQt: Fix system-wide config path
+ DietPi-Software | Create_Desktop_Shortcut: Fix condition
+ DietPi-Software | DietPi-Desktop_setup: Replace /root in bookmarks with actual users home
+ DietPi-Software | DietPi-Desktop_setup: Use desktop entry version 1.0, since MATE does not accept newest version 1.5
+ DietPi-Software | MATE: Enable audio (playback and settings panel) by installing the mate-media package
+ DietPi-Software | MATE: Skip xcompmgr install with MATE, since MATE has one integrated which blocks xcompmgr start
+ DietPi-Software | MATE: Do not add a Caja desktop icon, since by default a user home icon is present already
MichaIng
MichaIng previously approved these changes Feb 3, 2021
+ DietPi-Software | Desktops: Simplify xcompmgr install, which is only used/compatible with LXDE and LXQt. All other desktops have one integrated so that either the integrated one or xcompmgr fails. To be failsafe on Xfce, actively remove the autostart entry as it breaks the internal one, leading to ugly results.
+ DietPi-Software | X server: Do not install xterm by default. Each desktop has an own terminal emulator which looks and works much better. Especially when starting terminal applications from desktop entries, xterm overrides the desktops emulator, but has limited colour and fonts set, which does not look good. If there is a non-desktop X application that can make use of a terminal emulator without shipping one, we can re-add it to the related X client install.
+ DietPi-Software | GNUstep: Add xterm as dependency as the GPUstep "Terminal" cannot launch scripts. Remove "x-window-system-core" => "xorg" and "libc-dbg" => "libc6-dbg" dependencies which are not required to launch any of the pre-installed desktop applications.
@MichaIng MichaIng merged commit 664fe3f into MichaIng:dev Feb 3, 2021
MichaIng added a commit that referenced this pull request Feb 3, 2021
+ DietPi-Software | Steam: Do no add Steam desktop shortcut for root user anymore, which is not done on first login: #4015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

LXDE Desktop modifications for all pre-installed users DietPi-Software | LXDE installing from wrong GITOWNER
2 participants