From 24e61766e98f2ecc1a6eedcfc199b40a03dc3b95 Mon Sep 17 00:00:00 2001 From: Vitor Lopes Date: Tue, 15 May 2018 16:51:47 +0100 Subject: [PATCH 1/3] update --- community/webdad/Packages-Desktop | 6 +- .../etc/lightdm/lightdm-webkit2-greeter.conf | 2 +- .../desktop-overlay/etc/skel/.lightdm.conf | 163 ------------------ ....conf => disabled-auto-login-lightdm.conf} | 0 .../live-overlay/usr/bin/webdad-installer | 48 +----- community/webdad/profile.conf | 4 +- 6 files changed, 9 insertions(+), 214 deletions(-) delete mode 100644 community/webdad/desktop-overlay/etc/skel/.lightdm.conf rename community/webdad/live-overlay/etc/lightdm/{lightdm.conf => disabled-auto-login-lightdm.conf} (100%) diff --git a/community/webdad/Packages-Desktop b/community/webdad/Packages-Desktop index 78af26e..93eff53 100644 --- a/community/webdad/Packages-Desktop +++ b/community/webdad/Packages-Desktop @@ -110,6 +110,9 @@ lightdm lightdm-webkit2-greeter-manjaro accountsservice # Enhanced user accounts handling +# Themes +hicolor-icon-theme + # bluetooth bluez-cups bluez-firmware @@ -141,6 +144,7 @@ manjaro-settings-manager #manjaro-settings-manager-kcm manjaro-settings-manager-notifier #systemsettings +#kde-gtk-config network-manager-applet pavucontrol gnome-keyring # fix wlan segfault @@ -194,7 +198,7 @@ xf86-input-keyboard xf86-input-libinput xf86-input-mouse xf86-input-void -#xf86-input-wacom +xf86-input-wacom xf86-input-synaptics ## Xorg Server and Graphics diff --git a/community/webdad/desktop-overlay/etc/lightdm/lightdm-webkit2-greeter.conf b/community/webdad/desktop-overlay/etc/lightdm/lightdm-webkit2-greeter.conf index 8c19930..ecb0a3a 100644 --- a/community/webdad/desktop-overlay/etc/lightdm/lightdm-webkit2-greeter.conf +++ b/community/webdad/desktop-overlay/etc/lightdm/lightdm-webkit2-greeter.conf @@ -18,7 +18,7 @@ screensaver_timeout = 300 secure_mode = true time_format = LT time_language = auto -webkit_theme = manjaro +webkit_theme = webdad # # [branding] diff --git a/community/webdad/desktop-overlay/etc/skel/.lightdm.conf b/community/webdad/desktop-overlay/etc/skel/.lightdm.conf deleted file mode 100644 index c453ae9..0000000 --- a/community/webdad/desktop-overlay/etc/skel/.lightdm.conf +++ /dev/null @@ -1,163 +0,0 @@ -# -# General configuration -# -# start-default-seat = True to always start one seat if none are defined in the configuration -# greeter-user = User to run greeter as -# minimum-display-number = Minimum display number to use for X servers -# minimum-vt = First VT to run displays on -# lock-memory = True to prevent memory from being paged to disk -# user-authority-in-system-dir = True if session authority should be in the system location -# guest-account-script = Script to be run to setup guest account -# logind-check-graphical = True to on start seats that are marked as graphical by logind -# log-directory = Directory to log information to -# run-directory = Directory to put running state in -# cache-directory = Directory to cache to -# sessions-directory = Directory to find sessions -# remote-sessions-directory = Directory to find remote sessions -# greeters-directory = Directory to find greeters -# backup-logs = True to move add a .old suffix to old log files when opening new ones -# -[LightDM] -#start-default-seat=true -#greeter-user=lightdm -#minimum-display-number=0 -#minimum-vt=7 # Setting this to a value < 7 implies security issues, see FS#46799 -#lock-memory=true -#user-authority-in-system-dir=false -#guest-account-script=guest-account -#logind-check-graphical=false -#log-directory=/var/log/lightdm -run-directory=/run/lightdm -#cache-directory=/var/cache/lightdm -#sessions-directory=/usr/share/lightdm/sessions:/usr/share/xsessions:/usr/share/wayland-sessions -#remote-sessions-directory=/usr/share/lightdm/remote-sessions -#greeters-directory=/usr/share/lightdm/greeters:/usr/share/xgreeters -#backup-logs=true - -# -# Seat configuration -# -# Seat configuration is matched against the seat name glob in the section, for example: -# [Seat:*] matches all seats and is applied first. -# [Seat:seat0] matches the seat named "seat0". -# [Seat:thin-client*] matches all seats that have names that start with "thin-client". -# -# type = Seat type (xlocal, xremote) -# pam-service = PAM service to use for login -# pam-autologin-service = PAM service to use for autologin -# pam-greeter-service = PAM service to use for greeters -# xserver-command = X server command to run (can also contain arguments e.g. X -special-option) -# xmir-command = Xmir server command to run (can also contain arguments e.g. Xmir -special-option) -# xserver-layout = Layout to pass to X server -# xserver-config = Config file to pass to X server -# xserver-allow-tcp = True if TCP/IP connections are allowed to this X server -# xserver-share = True if the X server is shared for both greeter and session -# xserver-hostname = Hostname of X server (only for type=xremote) -# xserver-display-number = Display number of X server (only for type=xremote) -# xdmcp-manager = XDMCP manager to connect to (implies xserver-allow-tcp=true) -# xdmcp-port = XDMCP UDP/IP port to communicate on -# xdmcp-key = Authentication key to use for XDM-AUTHENTICATION-1 (stored in keys.conf) -# unity-compositor-command = Unity compositor command to run (can also contain arguments e.g. unity-system-compositor -special-option) -# unity-compositor-timeout = Number of seconds to wait for compositor to start -# greeter-session = Session to load for greeter -# greeter-hide-users = True to hide the user list -# greeter-allow-guest = True if the greeter should show a guest login option -# greeter-show-manual-login = True if the greeter should offer a manual login option -# greeter-show-remote-login = True if the greeter should offer a remote login option -# user-session = Session to load for users -# allow-user-switching = True if allowed to switch users -# allow-guest = True if guest login is allowed -# guest-session = Session to load for guests (overrides user-session) -# session-wrapper = Wrapper script to run session with -# greeter-wrapper = Wrapper script to run greeter with -# guest-wrapper = Wrapper script to run guest sessions with -# display-setup-script = Script to run when starting a greeter session (runs as root) -# display-stopped-script = Script to run after stopping the display server (runs as root) -# greeter-setup-script = Script to run when starting a greeter (runs as root) -# session-setup-script = Script to run when starting a user session (runs as root) -# session-cleanup-script = Script to run when quitting a user session (runs as root) -# autologin-guest = True to log in as guest by default -# autologin-user = User to log in with by default (overrides autologin-guest) -# autologin-user-timeout = Number of seconds to wait before loading default user -# autologin-session = Session to load for automatic login (overrides user-session) -# autologin-in-background = True if autologin session should not be immediately activated -# exit-on-failure = True if the daemon should exit if this seat fails -# -[Seat:*] -#type=xlocal -#pam-service=lightdm -#pam-autologin-service=lightdm-autologin -#pam-greeter-service=lightdm-greeter -#xserver-command=X -#xmir-command=Xmir -#xserver-layout= -#xserver-config= -#xserver-allow-tcp=false -#xserver-share=true -#xserver-hostname= -#xserver-display-number= -#xdmcp-manager= -#xdmcp-port=177 -#xdmcp-key= -#unity-compositor-command=unity-system-compositor -#unity-compositor-timeout=60 -greeter-session=lightdm-slick-greeter -#greeter-hide-users=false -#greeter-allow-guest=true -#greeter-show-manual-login=false -#greeter-show-remote-login=true -user-session=jade -#allow-user-switching=true -#allow-guest=true -#guest-session= -session-wrapper=/etc/lightdm/Xsession -#greeter-wrapper= -#guest-wrapper= -#display-setup-script= -#display-stopped-script= -#greeter-setup-script= -#session-setup-script= -#session-cleanup-script= -#autologin-guest=false -#autologin-user= -#autologin-user-timeout=0 -#autologin-in-background=false -#autologin-session= -#exit-on-failure=false - -# -# XDMCP Server configuration -# -# enabled = True if XDMCP connections should be allowed -# port = UDP/IP port to listen for connections on -# listen-address = Host/address to listen for XDMCP connections (use all addresses if not present) -# key = Authentication key to use for XDM-AUTHENTICATION-1 or blank to not use authentication (stored in keys.conf) -# -# The authentication key is a 56 bit DES key specified in hex as 0xnnnnnnnnnnnnnn. Alternatively -# it can be a word and the first 7 characters are used as the key. -# -[XDMCPServer] -#enabled=false -#port=177 -#listen-address= -#key= - -# -# VNC Server configuration -# -# enabled = True if VNC connections should be allowed -# command = Command to run Xvnc server with -# port = TCP/IP port to listen for connections on -# listen-address = Host/address to listen for VNC connections (use all addresses if not present) -# width = Width of display to use -# height = Height of display to use -# depth = Color depth of display to use -# -[VNCServer] -#enabled=false -#command=Xvnc -#port=5900 -#listen-address= -#width=1024 -#height=768 -#depth=8 diff --git a/community/webdad/live-overlay/etc/lightdm/lightdm.conf b/community/webdad/live-overlay/etc/lightdm/disabled-auto-login-lightdm.conf similarity index 100% rename from community/webdad/live-overlay/etc/lightdm/lightdm.conf rename to community/webdad/live-overlay/etc/lightdm/disabled-auto-login-lightdm.conf diff --git a/community/webdad/live-overlay/usr/bin/webdad-installer b/community/webdad/live-overlay/usr/bin/webdad-installer index 7ce8289..ff226d8 100755 --- a/community/webdad/live-overlay/usr/bin/webdad-installer +++ b/community/webdad/live-overlay/usr/bin/webdad-installer @@ -1,49 +1,3 @@ #!/bin/bash - -notify-send -i /usr/share/icons/hicolor/scalable/apps/calamares.svg "Loading Installer and disabling running software during installation." & - -if pgrep -x "steam" > /dev/null; -then pkill steam; -fi & - -if pgrep -x "kodi" > /dev/null; -then pkill kodi; -fi & - -if pgrep -x "$JADE_BROWSER" > /dev/null; -then pkill $JADE_BROWSER; -fi & - -if pgrep -x "$JADE_TERMINAL" > /dev/null; -then pkill $JADE_TERMINAL; -fi & - -if pgrep -x "pa-applet" > /dev/null; -then pkill pa-applet; -fi & - -if pgrep -x "kdeconnect-indicator" > /dev/null; -then pkill kdeconnect-indicator; -fi & - -if pgrep -x "jade-dashboard" > /dev/null; -then pkill jade-dashboard; -fi & - -if pgrep -x "cairo-dock" > /dev/null; -then pkill cairo-dock; -fi & - -if pgrep -x "msm_notifier" > /dev/null; -then pkill msm_notifier; -fi & - -if pgrep -x "blueman-applet" > /dev/null; -then pkill cairo-dock; -fi & - -if pgrep -x "pamac-tray" > /dev/null; -then pkill pamac-tray; -fi & - +notify-send -i /usr/share/icons/hicolor/scalable/apps/calamares.svg "Loading Installer" & calamares_polkit %f diff --git a/community/webdad/profile.conf b/community/webdad/profile.conf index 8ed29ed..8de6e8a 100644 --- a/community/webdad/profile.conf +++ b/community/webdad/profile.conf @@ -22,7 +22,7 @@ extra="true" # efi_boot_loader="grub" # configure calamares for netinstall -# netinstall="false" +# netinstall="true" # configure calamares to use chrootcfg instead of unpackfs # chrootcfg="false" @@ -46,7 +46,7 @@ disable_systemd=('pacman-init') ################# livecd ################# # unset defaults to given value -# hostname="manjaro" +# hostname="manjaro-webdad" # unset defaults to given value # username="manjaro" From 3c8c269bc988364caa3816be083371b125275a5f Mon Sep 17 00:00:00 2001 From: Bernhard Landauer Date: Tue, 15 May 2018 19:53:57 +0200 Subject: [PATCH 2/3] [Deepin] include firefox also for mini --- community/deepin/Packages-Desktop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/community/deepin/Packages-Desktop b/community/deepin/Packages-Desktop index d202a63..55201a7 100644 --- a/community/deepin/Packages-Desktop +++ b/community/deepin/Packages-Desktop @@ -9,7 +9,7 @@ binutils bison >extra brasero fakeroot ->extra firefox +firefox flex >extra dconf-editor deepin-calendar From 6061df9d59ce4be042b2dee442fad87ed642ebbc Mon Sep 17 00:00:00 2001 From: Bernhard Landauer Date: Tue, 15 May 2018 19:54:10 +0200 Subject: [PATCH 3/3] [xfce] upd greeter.conf --- .../xfce/desktop-overlay/etc/lightdm/lightdm-gtk-greeter.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manjaro/xfce/desktop-overlay/etc/lightdm/lightdm-gtk-greeter.conf b/manjaro/xfce/desktop-overlay/etc/lightdm/lightdm-gtk-greeter.conf index ef74161..cd0161f 100644 --- a/manjaro/xfce/desktop-overlay/etc/lightdm/lightdm-gtk-greeter.conf +++ b/manjaro/xfce/desktop-overlay/etc/lightdm/lightdm-gtk-greeter.conf @@ -1,6 +1,6 @@ [greeter] background = /usr/share/backgrounds/illyria-default-lockscreen.jpg -font-name = Cantarell 10 +font-name = Cantarell Bold 12 xft-antialias = true icon-theme-name = Adapta-Papirus-Maia screensaver-timeout = 60 @@ -12,4 +12,4 @@ xft-hintstyle = hintfull position = 50%,center 50%,center clock-format = panel-position = bottom -indicators = ~host;~spacer;~clock;~spacer;~language;~session;~a11y;~power +indicators = ~host;~spacer;~clock;~spacer;~language;~session;~a11y;~power