From: Rafael Costa Rega Date: Sat, 4 Jul 2020 23:45:59 +0000 (-0300) Subject: Update to 2020.06.15 X-Git-Url: http://git.osdn.net/view?p=rebornos%2Fcnchi-gnome-osdn.git;a=commitdiff_plain;h=486f74f21c234ac7b0a717f1e39e6d28740d5d08;hp=d19443f7d81b6075453e1e79df427fe37cf60da4 Update to 2020.06.15 --- diff --git a/CHANGELOG b/CHANGELOG index 3e91409..8f7bcf4 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -124,6 +124,260 @@ Added file "auto_partition.py" in Cnchi folder with changes to original one, and modified build.sh to make this change when compiling. Here we changed the references from AntergosRoot to RebornOSRoot, etc. To return to the previous condition, remove the modification in build.sh. +To leave it as it was, it will be necessary to eliminate the overwriting +of this file in the build. + + +========================================================================= + +2020.06.04 + +Changed sddm, sddm-theme-gracilis-git, and sddm-config-editor-git +for lightdm and lightdm-webkit2-greeter in desktop access. + + +========================================================================= + +2020.06.08 + + +Changed sddm to lightdm on access to the following desktops: + +Cinnamon +Pantheon +Windows +XFCE +MATE +Openbox +Enlightenment +Budgie +i3 + + +The following greeter is used: + +lightdm-webkit2-greeter + + +The following theme is used for this greeter (compiled and uploaded to the +RebornOS repository): + +lightdm-webkit2-theme-material2 + + +There are the following lines in the packages.xml file to load these files on +the above mentioned desktops: + + +lightdm +lightdm-webkit2-greeter +lightdm-webkit2-theme-material2 + + +The webkit2-greeter configuration file is copied in the cnchi installation +(cnchi subdirectory, (sent to the final cnchi directory in /usr/share/cnchi +from the build) to replace it in postainstall: + +lightdm-webkit2-greeter.conf + + +========================================================================= + +2020.06.14 + +lightdm files used: + +lightdm +lightdm-gtk-greeter +rebornos-lightdm-gtk-greeter-images +lightdm-gtk-greeter-settings + + + +sddm files used before moving to lightdm: + +sddm-theme-gracilis-git +sddm-config-editor-git + + +lightdm.conf content: + +{{{ +# +# 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 +# dbus-service = True if LightDM provides a D-Bus service to control it +# +[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=$XDG_DATA_DIRS/lightdm/greeters:$XDG_DATA_DIRS/xgreeters +#backup-logs=true +#dbus-service=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:seat-thin-client*] matches all seats that have names that start with "seat-thin-client". +# +# type = Seat type (local, 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-config = Config file to pass to X server +# xserver-layout = Layout 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) +# 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=/etc/lightdm/Xsession +# 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=local +#pam-service=lightdm +#pam-autologin-service=lightdm-autologin +#pam-greeter-service=lightdm-greeter +#xserver-command=X +#xmir-command=Xmir +#xserver-config= +#xserver-layout= +#xserver-allow-tcp=false +#xserver-share=true +#xserver-hostname= +#xserver-display-number= +#xdmcp-manager= +#xdmcp-port=177 +#xdmcp-key= +greeter-session=lightdm-gtk-greeter +#greeter-hide-users=false +#greeter-allow-guest=true +#greeter-show-manual-login=false +#greeter-show-remote-login=true +user-session=mate +#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) +# hostname = Hostname to report to XDMCP clients (defaults to system hostname if unset) +# +# 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= +#hostname= + +# +# 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 +}}} + + +lightdm-gtk-greeter.conf content: + +{{{ +[greeter] +theme-name = Flat-Plat-Blue +icon-theme-name = Flat-Remix-Green +background = /usr/share/pixmaps/rebornos.jpg +default-user-image = /usr/share/pixmaps/avatar.png +}}} diff --git a/Cnchi/antergos-for-everyone-black1.png b/Cnchi/antergos-for-everyone-black1.png new file mode 100644 index 0000000..c041cc7 Binary files /dev/null and b/Cnchi/antergos-for-everyone-black1.png differ diff --git a/Cnchi/antergos-for-everyone-white1.png b/Cnchi/antergos-for-everyone-white1.png new file mode 100644 index 0000000..a725932 Binary files /dev/null and b/Cnchi/antergos-for-everyone-white1.png differ diff --git a/Cnchi/antergos-logo-mini.png b/Cnchi/antergos-logo-mini.png new file mode 100644 index 0000000..7df8278 Binary files /dev/null and b/Cnchi/antergos-logo-mini.png differ diff --git a/Cnchi/antergos-logo-mini2-OLD.png b/Cnchi/antergos-logo-mini2-OLD.png new file mode 100644 index 0000000..f1bc8f6 Binary files /dev/null and b/Cnchi/antergos-logo-mini2-OLD.png differ diff --git a/Cnchi/antergos-logo.png b/Cnchi/antergos-logo.png new file mode 100644 index 0000000..b3881c4 Binary files /dev/null and b/Cnchi/antergos-logo.png differ diff --git a/Cnchi/avatar.png b/Cnchi/avatar.png new file mode 100644 index 0000000..181725b Binary files /dev/null and b/Cnchi/avatar.png differ diff --git a/Cnchi/backup_lightdm-webkit2-greeter.conf b/Cnchi/backup_lightdm-webkit2-greeter.conf new file mode 100644 index 0000000..a1af3e7 --- /dev/null +++ b/Cnchi/backup_lightdm-webkit2-greeter.conf @@ -0,0 +1,35 @@ +# +# [greeter] +# debug_mode = Greeter theme debug mode. +# detect_theme_errors = Provide an option to load a fallback theme when theme errors are detected. +# screensaver_timeout = Blank the screen after this many seconds of inactivity. +# secure_mode = Don't allow themes to make remote http requests. +# time_format = A moment.js format string so the greeter can generate localized time for display. +# time_language = Language to use when displaying the time or "auto" to use the system's language. +# webkit_theme = Webkit theme to use. +# +# NOTE: See moment.js documentation for format string options: http://momentjs.com/docs/#/displaying/format/ +# + +[greeter] +debug_mode = false +detect_theme_errors = true +screensaver_timeout = 300 +secure_mode = true +time_format = LT +time_language = auto +webkit_theme = lightdm-webkit-theme-aether + +# +# [branding] +# background_images = Path to directory that contains background images for use by themes. +# logo = Path to logo image for use by greeter themes. +# user_image = Default user image/avatar. This is used by themes for users that have no .face image. +# +# NOTE: Paths must be accessible to the lightdm system user account (so they cannot be anywhere in /home) +# + +[branding] +background_images = /usr/share/backgrounds/ +logo = /usr/share/lightdm-webkit/themes/lightdm-webkit-theme-aether/src/img/arch-logo.png +user_image = /usr/share/lightdm-webkit/themes/lightdm-webkit-theme-aether/src/img/arch-logo.png diff --git a/Cnchi/desktop_info.py b/Cnchi/desktop_info.py index e74b5e0..8a84314 100644 --- a/Cnchi/desktop_info.py +++ b/Cnchi/desktop_info.py @@ -175,8 +175,9 @@ DESCRIPTIONS = { "and others, but also a whole suite of libraries to help " "you create beautiful user interfaces with much less work"), - 'i3': _("i3 is a tiling window manager primarily targeted at advanced " - "users and developers."), + 'i3': _("Is a tiling window manager, completely written from scratch. " + "i3 is primarily targeted at advanced users and developers. " + "Target platforms are GNU/Linux and BSD operating systems."), 'lxqt': _("LXQt is the next-generation of LXDE, the Lightweight Desktop " "Environment. It is lightweight, modular, blazing-fast, and " diff --git a/Cnchi/info.py b/Cnchi/info.py index fa53251..6a249b6 100755 --- a/Cnchi/info.py +++ b/Cnchi/info.py @@ -29,7 +29,7 @@ """ Set some Cnchi global constants """ -CNCHI_VERSION = "RebornOS Installer Gnome based 2020.05.25" +CNCHI_VERSION = "RebornOS Installer Gnome based 2020.06.15" CNCHI_WEBSITE = "https://rebornos.org" CNCHI_RELEASE_STAGE = "production" diff --git a/Cnchi/lightdm-gtk-greeter.conf b/Cnchi/lightdm-gtk-greeter.conf new file mode 100644 index 0000000..0b8967b --- /dev/null +++ b/Cnchi/lightdm-gtk-greeter.conf @@ -0,0 +1,6 @@ +[greeter] +theme-name = Flat-Plat-Blue +icon-theme-name = Flat-Remix-Green +background = /usr/share/pixmaps/rebornos.jpg +default-user-image = /usr/share/pixmaps/avatar.png + diff --git a/Cnchi/lightdm-webkit2-greeter.conf b/Cnchi/lightdm-webkit2-greeter.conf index a1af3e7..5019d7c 100644 --- a/Cnchi/lightdm-webkit2-greeter.conf +++ b/Cnchi/lightdm-webkit2-greeter.conf @@ -13,12 +13,12 @@ [greeter] debug_mode = false -detect_theme_errors = true +detect_theme_errors = false screensaver_timeout = 300 secure_mode = true time_format = LT time_language = auto -webkit_theme = lightdm-webkit-theme-aether +webkit_theme = material2 # # [branding] @@ -30,6 +30,6 @@ webkit_theme = lightdm-webkit-theme-aether # [branding] -background_images = /usr/share/backgrounds/ -logo = /usr/share/lightdm-webkit/themes/lightdm-webkit-theme-aether/src/img/arch-logo.png -user_image = /usr/share/lightdm-webkit/themes/lightdm-webkit-theme-aether/src/img/arch-logo.png +background_images = /usr/share/backgrounds +logo = /usr/share/pixmaps/archlinux-logo.svg +user_image = /usr/share/pixmaps/archlinux-user.svg diff --git a/Cnchi/lightdm.conf b/Cnchi/lightdm.conf new file mode 100644 index 0000000..734efd9 --- /dev/null +++ b/Cnchi/lightdm.conf @@ -0,0 +1,163 @@ +# +# 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 +# dbus-service = True if LightDM provides a D-Bus service to control it +# +[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=$XDG_DATA_DIRS/lightdm/greeters:$XDG_DATA_DIRS/xgreeters +#backup-logs=true +#dbus-service=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:seat-thin-client*] matches all seats that have names that start with "seat-thin-client". +# +# type = Seat type (local, 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-config = Config file to pass to X server +# xserver-layout = Layout 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) +# 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=/etc/lightdm/Xsession +# 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=local +#pam-service=lightdm +#pam-autologin-service=lightdm-autologin +#pam-greeter-service=lightdm-greeter +#xserver-command=X +#xmir-command=Xmir +#xserver-config= +#xserver-layout= +#xserver-allow-tcp=false +#xserver-share=true +#xserver-hostname= +#xserver-display-number= +#xdmcp-manager= +#xdmcp-port=177 +#xdmcp-key= +greeter-session=lightdm-gtk-greeter +#greeter-hide-users=false +#greeter-allow-guest=true +#greeter-show-manual-login=false +#greeter-show-remote-login=true +user-session=mate +#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) +# hostname = Hostname to report to XDMCP clients (defaults to system hostname if unset) +# +# 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= +#hostname= + +# +# 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/Cnchi/packages.xml b/Cnchi/packages.xml index 8d46cf8..bfa1f59 100755 --- a/Cnchi/packages.xml +++ b/Cnchi/packages.xml @@ -39,7 +39,7 @@ rebornos-cosmic-gnome network-manager-applet - gnome + @@ -47,7 +47,6 @@ rebornos-cosmic-gnome network-manager-applet - gnome apricity-theme @@ -56,9 +55,10 @@ network-manager-applet rebornos-cosmic-cinnamon - cinnamon - - + lightdm + lightdm-gtk-greeter + rebornos-lightdm-gtk-greeter-images + lightdm-gtk-greeter-settings @@ -66,7 +66,10 @@ network-manager-applet rebornos-cosmic-pantheon - pantheon + lightdm + lightdm-gtk-greeter + rebornos-lightdm-gtk-greeter-images + lightdm-gtk-greeter-settings @@ -75,8 +78,10 @@ network-manager-applet rebornos-cosmic-cinnamon cinnamon - - + lightdm + lightdm-gtk-greeter + rebornos-lightdm-gtk-greeter-images + lightdm-gtk-greeter-settings windows-theme @@ -84,18 +89,20 @@ rebornos-cosmic-xfce - xfce4-goodies - xfce4 - sddm-theme-gracilis-git - sddm-config-editor-git + lightdm + lightdm-gtk-greeter + rebornos-lightdm-gtk-greeter-images + lightdm-gtk-greeter-settings rebornos-cosmic-mate - mate - mate-extra + lightdm + lightdm-gtk-greeter + rebornos-lightdm-gtk-greeter-images + lightdm-gtk-greeter-settings @@ -104,15 +111,16 @@ network-manager-applet rebornos-cosmic-openbox lxde-gtk3 + lightdm + lightdm-gtk-greeter + rebornos-lightdm-gtk-greeter-images + lightdm-gtk-greeter-settings rebornos-cosmic-kde - plasma - kdebase - kdeutils @@ -121,7 +129,6 @@ rebornos-cosmic-lxqt - lxqt @@ -130,18 +137,30 @@ rebornos-cosmic-enlightenment enlightenment + lightdm + lightdm-gtk-greeter + rebornos-lightdm-gtk-greeter-images + lightdm-gtk-greeter-settings rebornos-cosmic-budgie + lightdm + lightdm-gtk-greeter + rebornos-lightdm-gtk-greeter-images + lightdm-gtk-greeter-settings rebornos-cosmic-i3 + lightdm + lightdm-gtk-greeter + rebornos-lightdm-gtk-greeter-images + lightdm-gtk-greeter-settings @@ -153,8 +172,6 @@ lightdm - deepin - deepin-extra diff --git a/Cnchi/postinstall.sh b/Cnchi/postinstall.sh index 7dea709..4f1a4b4 100755 --- a/Cnchi/postinstall.sh +++ b/Cnchi/postinstall.sh @@ -377,6 +377,9 @@ postinstall() { chroot ${CN_DESTDIR} systemctl enable ufw cp /usr/share/cnchi/101_gnome.gschema.override ${CN_DESTDIR}/usr/share/glib-2.0/schemas/ chroot ${CN_DESTDIR} /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas + # Delete a remnant of lightdm + # If at any time you want to use lightdm as access, you should comment on this line: + rm ${CN_DESTDIR}/etc/lightdm fi # if [[ apricity = "${CN_DESKTOP}" ]]; then @@ -405,12 +408,16 @@ postinstall() { cp /usr/share/cnchi/updating.sh ${CN_DESTDIR}/usr/bin/ chroot ${CN_DESTDIR} systemctl enable earlyoom chroot ${CN_DESTDIR} systemctl enable ufw + chroot ${CN_DESTDIR} pacman -S rebornos-kde-customization --noconfirm + # Delete a remnant of lightdm + # If at any time you want to use lightdm as access, you should comment on this line: + rm ${CN_DESTDIR}/etc/lightdm fi if [[ budgie = "${CN_DESKTOP}" ]]; then - chroot ${CN_DESTDIR} systemctl -fq enable lightdm - sed -i 's/^webkit_theme\s*=\s*\(.*\)/webkit_theme = lightdm-webkit-theme-aether #\1/g' ${CN_DESTDIR}/etc/lightdm/lightdm-webkit2-greeter.conf - sed -i 's/^\(#?greeter\)-session\s*=\s*\(.*\)/greeter-session = lightdm-webkit2-greeter #\1/ #\2g' ${CN_DESTDIR}/etc/lightdm/lightdm.conf + chroot ${CN_DESTDIR} systemctl -fq enable lightdm.service + # sed -i 's/^webkit_theme\s*=\s*\(.*\)/webkit_theme = lightdm-webkit-theme-aether #\1/g' ${CN_DESTDIR}/etc/lightdm/lightdm-webkit2-greeter.conf + # sed -i 's/^\(#?greeter\)-session\s*=\s*\(.*\)/greeter-session = lightdm-webkit2-greeter #\1/ #\2g' ${CN_DESTDIR}/etc/lightdm/lightdm.conf cp /usr/share/cnchi/flatpak.sh ${CN_DESTDIR}/usr/bin/ cp /usr/share/cnchi/pkcon.sh ${CN_DESTDIR}/usr/bin/ cp /usr/share/cnchi/pkcon2.sh ${CN_DESTDIR}/usr/bin/ @@ -422,10 +429,19 @@ postinstall() { echo "# ---> End added by Cnchi RebornOS Installer Gnome based for Budgie Desktop <--- #" >> ${CN_DESTDIR}/etc/environment chroot ${CN_DESTDIR} systemctl enable earlyoom chroot ${CN_DESTDIR} systemctl enable ufw + # Copy config files to use lightdm-gtk-greeter + rm ${CN_DESTDIR}/etc/lightdm/lightdm.conf + cp /usr/share/cnchi/lightdm.conf ${CN_DESTDIR}/etc/lightdm/ + echo "[greeter]" >> ${CN_DESTDIR}/etc/lightdm/lightdm-gtk-greeter.conf + echo "theme-name = Flat-Plat-Blue" >> ${CN_DESTDIR}/etc/lightdm/lightdm-gtk-greeter.conf + echo "icon-theme-name = Flat-Remix-Green" >> ${CN_DESTDIR}/etc/lightdm/lightdm-gtk-greeter.conf + echo "background = /usr/share/pixmaps/rebornos.jpg" >> ${CN_DESTDIR}/etc/lightdm/lightdm-gtk-greeter.conf + echo "default-user-image = /usr/share/pixmaps/avatar.png" >> ${CN_DESTDIR}/etc/lightdm/lightdm-gtk-greeter.conf fi if [[ i3 = "${CN_DESKTOP}" ]]; then - chroot ${CN_DESTDIR} systemctl -fq enable sddm + # chroot ${CN_DESTDIR} systemctl -fq enable sddm + chroot ${CN_DESTDIR} systemctl -fq enable lightdm.service cp /usr/share/cnchi/sddm.conf ${CN_DESTDIR}/etc/ cp /usr/share/cnchi/flatpak.sh ${CN_DESTDIR}/usr/bin/ cp /usr/share/cnchi/pkcon.sh ${CN_DESTDIR}/usr/bin/ @@ -438,10 +454,19 @@ postinstall() { echo "# ---> End added by Cnchi RebornOS Installer Gnome based for i3 Desktop <--- #" >> ${CN_DESTDIR}/etc/environment chroot ${CN_DESTDIR} systemctl enable earlyoom chroot ${CN_DESTDIR} systemctl enable ufw + # Copy config files to use lightdm-gtk-greeter + rm ${CN_DESTDIR}/etc/lightdm/lightdm.conf + cp /usr/share/cnchi/lightdm.conf ${CN_DESTDIR}/etc/lightdm/ + echo "[greeter]" >> ${CN_DESTDIR}/etc/lightdm/lightdm-gtk-greeter.conf + echo "theme-name = Flat-Plat-Blue" >> ${CN_DESTDIR}/etc/lightdm/lightdm-gtk-greeter.conf + echo "icon-theme-name = Flat-Remix-Green" >> ${CN_DESTDIR}/etc/lightdm/lightdm-gtk-greeter.conf + echo "background = /usr/share/pixmaps/rebornos.jpg" >> ${CN_DESTDIR}/etc/lightdm/lightdm-gtk-greeter.conf + echo "default-user-image = /usr/share/pixmaps/avatar.png" >> ${CN_DESTDIR}/etc/lightdm/lightdm-gtk-greeter.conf fi # if [ -f "${CN_DESTDIR}/usr/bin/enlightenment" ]; then - # chroot ${CN_DESTDIR} systemctl -fq enable sddm + # # chroot ${CN_DESTDIR} systemctl -fq enable sddm + # chroot ${CN_DESTDIR} systemctl -fq enable lightdm.service # cp /usr/share/cnchi/sddm.conf ${CN_DESTDIR}/etc/ # cp /usr/share/cnchi/flatpak.sh ${CN_DESTDIR}/usr/bin/ # cp /usr/share/cnchi/pkcon.sh ${CN_DESTDIR}/usr/bin/ @@ -454,10 +479,19 @@ postinstall() { # echo "# ---> End added by Cnchi RebornOS Installer Gnome based for Enlightenment Desktop <--- #" >> ${CN_DESTDIR}/etc/environment # chroot ${CN_DESTDIR} systemctl enable earlyoom # chroot ${CN_DESTDIR} systemctl enable ufw + # Copy config files to use lightdm-gtk-greeter + # rm ${CN_DESTDIR}/etc/lightdm/lightdm.conf + # cp /usr/share/cnchi/lightdm.conf ${CN_DESTDIR}/etc/lightdm/ + # echo "[greeter]" >> ${CN_DESTDIR}/etc/lightdm/lightdm-gtk-greeter.conf + # echo "theme-name = Flat-Plat-Blue" >> ${CN_DESTDIR}/etc/lightdm/lightdm-gtk-greeter.conf + # echo "icon-theme-name = Flat-Remix-Green" >> ${CN_DESTDIR}/etc/lightdm/lightdm-gtk-greeter.conf + # echo "background = /usr/share/pixmaps/rebornos.jpg" >> ${CN_DESTDIR}/etc/lightdm/lightdm-gtk-greeter.conf + # echo "default-user-image = /usr/share/pixmaps/avatar.png" >> ${CN_DESTDIR}/etc/lightdm/lightdm-gtk-greeter.conf # fi if [[ lxqt = "${CN_DESKTOP}" ]]; then - chroot ${CN_DESTDIR} systemctl -fq enable sddm + chroot ${CN_DESTDIR} systemctl -fq enable sddm.service + # chroot ${CN_DESTDIR} systemctl -fq enable lightdm.service cp /usr/share/cnchi/sddm.conf ${CN_DESTDIR}/etc/ cp /usr/share/cnchi/flatpak.sh ${CN_DESTDIR}/usr/bin/ cp /usr/share/cnchi/pkcon.sh ${CN_DESTDIR}/usr/bin/ @@ -467,11 +501,12 @@ postinstall() { cp /usr/share/cnchi/updating.sh ${CN_DESTDIR}/usr/bin/ chroot ${CN_DESTDIR} systemctl enable earlyoom chroot ${CN_DESTDIR} systemctl enable ufw + # Delete a remnant of lightdm + # If at any time you want to use lightdm as access, you should comment on this line: + rm ${CN_DESTDIR}/etc/lightdm fi if [ -f "${CN_DESTDIR}/usr/bin/lxsession" ]; then - rm ${CN_DESTDIR}/etc/lightdm/lightdm-webkit2-greeter.conf - cp /usr/share/cnchi/lightdm-webkit2-greeter.conf ${CN_DESTDIR}/etc/lightdm/ chmod go=rx ${CN_DESTDIR}/var/lib/lightdm-data chroot ${CN_DESTDIR} systemctl -fq enable lxdm cp /usr/share/cnchi/flatpak.sh ${CN_DESTDIR}/usr/bin/ @@ -487,10 +522,17 @@ postinstall() { chroot ${CN_DESTDIR} obmenu-generator -p -i chroot ${CN_DESTDIR} systemctl enable earlyoom chroot ${CN_DESTDIR} systemctl enable ufw + # Copy config files to use lightdm-gtk-greeter + # rm ${CN_DESTDIR}/etc/lightdm/lightdm.conf + # cp /usr/share/cnchi/lightdm.conf ${CN_DESTDIR}/etc/lightdm/ + # rm ${CN_DESTDIR}/etc/lightdm/lightdm-gtk-greeter.conf + # cp /usr/share/cnchi/lightdm-gtk-greeter.conf ${CN_DESTDIR}/etc/lightdm/ + chroot ${CN_DESTDIR} mmaker -tGTerm -f OpenBox fi if [[ mate = "${CN_DESKTOP}" ]]; then - chroot ${CN_DESTDIR} systemctl -fq enable sddm + # chroot ${CN_DESTDIR} systemctl -fq enable sddm + chroot ${CN_DESTDIR} systemctl -fq enable lightdm.service cp /usr/share/cnchi/sddm.conf ${CN_DESTDIR}/etc/ cp /usr/share/cnchi/flatpak.sh ${CN_DESTDIR}/usr/bin/ cp /usr/share/cnchi/pkcon.sh ${CN_DESTDIR}/usr/bin/ @@ -498,18 +540,26 @@ postinstall() { cp /usr/share/cnchi/flatpak.desktop ${CN_DESTDIR}/usr/share/applications/ cp /usr/share/cnchi/update.desktop ${CN_DESTDIR}/etc/xdg/autostart/ cp /usr/share/cnchi/updating.sh ${CN_DESTDIR}/usr/bin/ + # MATE panel bug fixed: chroot ${CN_DESTDIR} mate-panel --reset --layout default - # chroot ${CN_DESTDIR} mate-panel --reset --layout cinnamon - # chroot ${CN_DESTDIR} sudo mate-panel --reset --layout cinnamon echo "# ---> Added by Cnchi RebornOS Installer Gnome based for MATE Desktop <--- #" >> ${CN_DESTDIR}/etc/environment echo "QT_QPA_PLATFORMTHEME=qt5ct" >> ${CN_DESTDIR}/etc/environment echo "# ---> End added by Cnchi RebornOS Installer Gnome based for MATE Desktop <--- #" >> ${CN_DESTDIR}/etc/environment chroot ${CN_DESTDIR} systemctl enable earlyoom chroot ${CN_DESTDIR} systemctl enable ufw + # Copy config files to use lightdm-gtk-greeter + rm ${CN_DESTDIR}/etc/lightdm/lightdm.conf + cp /usr/share/cnchi/lightdm.conf ${CN_DESTDIR}/etc/lightdm/ + echo "[greeter]" >> ${CN_DESTDIR}/etc/lightdm/lightdm-gtk-greeter.conf + echo "theme-name = Flat-Plat-Blue" >> ${CN_DESTDIR}/etc/lightdm/lightdm-gtk-greeter.conf + echo "icon-theme-name = Flat-Remix-Green" >> ${CN_DESTDIR}/etc/lightdm/lightdm-gtk-greeter.conf + echo "background = /usr/share/pixmaps/rebornos.jpg" >> ${CN_DESTDIR}/etc/lightdm/lightdm-gtk-greeter.conf + echo "default-user-image = /usr/share/pixmaps/avatar.png" >> ${CN_DESTDIR}/etc/lightdm/lightdm-gtk-greeter.conf fi if [[ xfce = "${CN_DESKTOP}" ]]; then - chroot ${CN_DESTDIR} systemctl -fq enable sddm + # chroot ${CN_DESTDIR} systemctl -fq enable sddm + chroot ${CN_DESTDIR} systemctl -fq enable lightdm.service cp /usr/share/cnchi/sddm.conf ${CN_DESTDIR}/etc/ cp /usr/share/cnchi/flatpak.sh ${CN_DESTDIR}/usr/bin/ cp /usr/share/cnchi/pkcon.sh ${CN_DESTDIR}/usr/bin/ @@ -522,10 +572,19 @@ if [[ xfce = "${CN_DESKTOP}" ]]; then echo "# ---> End added by Cnchi RebornOS Installer Gnome based for XFCE Desktop <--- #" >> ${CN_DESTDIR}/etc/environment chroot ${CN_DESTDIR} systemctl enable earlyoom chroot ${CN_DESTDIR} systemctl enable ufw + # Copy config files to use lightdm-gtk-greeter + rm ${CN_DESTDIR}/etc/lightdm/lightdm.conf + cp /usr/share/cnchi/lightdm.conf ${CN_DESTDIR}/etc/lightdm/ + echo "[greeter]" >> ${CN_DESTDIR}/etc/lightdm/lightdm-gtk-greeter.conf + echo "theme-name = Flat-Plat-Blue" >> ${CN_DESTDIR}/etc/lightdm/lightdm-gtk-greeter.conf + echo "icon-theme-name = Flat-Remix-Green" >> ${CN_DESTDIR}/etc/lightdm/lightdm-gtk-greeter.conf + echo "background = /usr/share/pixmaps/rebornos.jpg" >> ${CN_DESTDIR}/etc/lightdm/lightdm-gtk-greeter.conf + echo "default-user-image = /usr/share/pixmaps/avatar.png" >> ${CN_DESTDIR}/etc/lightdm/lightdm-gtk-greeter.conf fi if [[ cinnamon = "${CN_DESKTOP}" ]]; then - chroot ${CN_DESTDIR} systemctl -fq enable sddm + # chroot ${CN_DESTDIR} systemctl -fq enable sddm + chroot ${CN_DESTDIR} systemctl -fq enable lightdm.service cp /usr/share/cnchi/sddm.conf ${CN_DESTDIR}/etc/ cp /usr/share/cnchi/flatpak.sh ${CN_DESTDIR}/usr/bin/ cp /usr/share/cnchi/pkcon.sh ${CN_DESTDIR}/usr/bin/ @@ -540,10 +599,19 @@ if [[ cinnamon = "${CN_DESKTOP}" ]]; then chroot ${CN_DESTDIR} systemctl enable ufw cp /usr/share/cnchi/95_cinnamon.gschema.override ${CN_DESTDIR}/usr/share/glib-2.0/schemas/ chroot ${CN_DESTDIR} /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas + # Copy config files to use lightdm-gtk-greeter + rm ${CN_DESTDIR}/etc/lightdm/lightdm.conf + cp /usr/share/cnchi/lightdm.conf ${CN_DESTDIR}/etc/lightdm/ + echo "[greeter]" >> ${CN_DESTDIR}/etc/lightdm/lightdm-gtk-greeter.conf + echo "theme-name = Flat-Plat-Blue" >> ${CN_DESTDIR}/etc/lightdm/lightdm-gtk-greeter.conf + echo "icon-theme-name = Flat-Remix-Green" >> ${CN_DESTDIR}/etc/lightdm/lightdm-gtk-greeter.conf + echo "background = /usr/share/pixmaps/rebornos.jpg" >> ${CN_DESTDIR}/etc/lightdm/lightdm-gtk-greeter.conf + echo "default-user-image = /usr/share/pixmaps/avatar.png" >> ${CN_DESTDIR}/etc/lightdm/lightdm-gtk-greeter.conf fi if [[ pantheon = "${CN_DESKTOP}" ]]; then - chroot ${CN_DESTDIR} systemctl -fq enable sddm + # chroot ${CN_DESTDIR} systemctl -fq enable sddm + chroot ${CN_DESTDIR} systemctl -fq enable lightdm.service cp /usr/share/cnchi/sddm.conf ${CN_DESTDIR}/etc/ cp /usr/share/cnchi/flatpak.sh ${CN_DESTDIR}/usr/bin/ cp /usr/share/cnchi/pkcon.sh ${CN_DESTDIR}/usr/bin/ @@ -556,10 +624,19 @@ if [[ pantheon = "${CN_DESKTOP}" ]]; then echo "# ---> End added by Cnchi RebornOS Installer Gnome based for Pantheon Desktop <--- #" >> ${CN_DESTDIR}/etc/environment chroot ${CN_DESTDIR} systemctl enable earlyoom chroot ${CN_DESTDIR} systemctl enable ufw + # Copy config files to use lightdm-gtk-greeter + rm ${CN_DESTDIR}/etc/lightdm/lightdm.conf + cp /usr/share/cnchi/lightdm.conf ${CN_DESTDIR}/etc/lightdm/ + echo "[greeter]" >> ${CN_DESTDIR}/etc/lightdm/lightdm-gtk-greeter.conf + echo "theme-name = Flat-Plat-Blue" >> ${CN_DESTDIR}/etc/lightdm/lightdm-gtk-greeter.conf + echo "icon-theme-name = Flat-Remix-Green" >> ${CN_DESTDIR}/etc/lightdm/lightdm-gtk-greeter.conf + echo "background = /usr/share/pixmaps/rebornos.jpg" >> ${CN_DESTDIR}/etc/lightdm/lightdm-gtk-greeter.conf + echo "default-user-image = /usr/share/pixmaps/avatar.png" >> ${CN_DESTDIR}/etc/lightdm/lightdm-gtk-greeter.conf fi #if [[ windows = "${CN_DESKTOP}" ]]; then -# chroot ${CN_DESTDIR} systemctl -fq enable sddm +# # chroot ${CN_DESTDIR} systemctl -fq enable sddm +# chroot ${CN_DESTDIR} systemctl -fq enable lightdm.service # cp /usr/share/cnchi/sddm.conf ${CN_DESTDIR}/etc/ # cp /usr/share/cnchi/flatpak.sh ${CN_DESTDIR}/usr/bin/ # cp /usr/share/cnchi/pkcon.sh ${CN_DESTDIR}/usr/bin/ @@ -572,6 +649,14 @@ fi # echo "# ---> End added by Cnchi RebornOS Installer Gnome based for Windows Desktop <--- #" >> ${CN_DESTDIR}/etc/environment # chroot ${CN_DESTDIR} systemctl enable earlyoom # chroot ${CN_DESTDIR} systemctl enable ufw + # Copy config files to use lightdm-gtk-greeter + #rm ${CN_DESTDIR}/etc/lightdm/lightdm.conf + # cp /usr/share/cnchi/lightdm.conf ${CN_DESTDIR}/etc/lightdm/ + # echo "[greeter]" >> ${CN_DESTDIR}/etc/lightdm/lightdm-gtk-greeter.conf + # echo "theme-name = Flat-Plat-Blue" >> ${CN_DESTDIR}/etc/lightdm/lightdm-gtk-greeter.conf + # echo "icon-theme-name = Flat-Remix-Green" >> ${CN_DESTDIR}/etc/lightdm/lightdm-gtk-greeter.conf + # echo "background = /usr/share/pixmaps/rebornos.jpg" >> ${CN_DESTDIR}/etc/lightdm/lightdm-gtk-greeter.conf + # echo "default-user-image = /usr/share/pixmaps/avatar.png" >> ${CN_DESTDIR}/etc/lightdm/lightdm-gtk-greeter.conf #fi # Copy pacman.conf file over diff --git a/build.sh b/build.sh index f8f0d4c..165973f 100755 --- a/build.sh +++ b/build.sh @@ -301,8 +301,19 @@ cp ${script_path}/Cnchi/welcome.py ${work_dir}/${arch}/airootfs/usr/share/cnchi/ #cp ${script_path}/Cnchi/metalink.py ${work_dir}/${arch}/airootfs/usr/share/cnchi/src/download/ #rm ${work_dir}/${arch}/airootfs/usr/share/cnchi/src/installation/pac.py #cp ${script_path}/Cnchi/pac.py ${work_dir}/${arch}/airootfs/usr/share/cnchi/src/installation/ +# Changing logo images rm ${work_dir}/${arch}/airootfs/usr/share/cnchi/data/images/antergos/antergos-logo-mini2.png cp ${script_path}/Cnchi/antergos-logo-mini2.png ${work_dir}/${arch}/airootfs/usr/share/cnchi/data/images/antergos/ +rm ${work_dir}/${arch}/airootfs/usr/share/cnchi/data/images/antergos/antergos-for-everyone-black1.png +cp ${script_path}/Cnchi/antergos-for-everyone-black1.png ${work_dir}/${arch}/airootfs/usr/share/cnchi/data/images/antergos/ +rm ${work_dir}/${arch}/airootfs/usr/share/cnchi/data/images/antergos/antergos-for-everyone-white1.png +cp ${script_path}/Cnchi/antergos-for-everyone-white1.png ${work_dir}/${arch}/airootfs/usr/share/cnchi/data/images/antergos/ +rm ${work_dir}/${arch}/airootfs/usr/share/cnchi/data/images/antergos/antergos-logo.png +cp ${script_path}/Cnchi/antergos-logo.png ${work_dir}/${arch}/airootfs/usr/share/cnchi/data/images/antergos/ +rm ${work_dir}/${arch}/airootfs/usr/share/cnchi/data/images/antergos/antergos-logo-mini.png +cp ${script_path}/Cnchi/antergos-logo-mini.png ${work_dir}/${arch}/airootfs/usr/share/cnchi/data/images/antergos/ +rm ${work_dir}/${arch}/airootfs/usr/share/cnchi/data/images/antergos/antergos-logo-mini2-OLD.png +cp ${script_path}/Cnchi/antergos-logo-mini2-OLD.png ${work_dir}/${arch}/airootfs/usr/share/cnchi/data/images/antergos/ cp ${script_path}/Cnchi/20-intel.conf ${work_dir}/${arch}/airootfs/usr/share/cnchi/ cp ${script_path}/Cnchi/lightdm-webkit2-greeter.conf ${work_dir}/${arch}/airootfs/usr/share/cnchi/ rm ${work_dir}/${arch}/airootfs/usr/share/cnchi/data/images/slides/1.png @@ -446,6 +457,9 @@ cp ${script_path}/Cnchi/main_window.py ${work_dir}/${arch}/airootfs/usr/share/cn # ===>>> Add new png files used by modify main_window.py <<<=== # cp ${script_path}/Cnchi/rebornos-logo-mini2.png ${work_dir}/${arch}/airootfs/usr/share/cnchi/data/images/antergos/ cp ${script_path}/Cnchi/rebornos-icon.png ${work_dir}/${arch}/airootfs/usr/share/cnchi/data/images/antergos/ +# ===>>> Files to configure lightdm with RebornOS and lightdm-gtk-greeter <<<=== # +cp ${script_path}/Cnchi/lightdm.conf ${work_dir}/${arch}/airootfs/usr/share/cnchi/ +cp ${script_path}/Cnchi/lightdm-gtk-greeter.conf ${work_dir}/${arch}/airootfs/usr/share/cnchi/ echo "DONE" echo echo "Replacing Antergos mentions with RebornOS" diff --git a/cnchi-screenshot-0009.png b/cnchi-screenshot-0009.png new file mode 100644 index 0000000..b6448fd Binary files /dev/null and b/cnchi-screenshot-0009.png differ diff --git a/packages.both b/packages.both index 22c1a41..ccf37f7 100755 --- a/packages.both +++ b/packages.both @@ -76,6 +76,8 @@ yaru-gnome-shell-theme yaru-gtk-theme yaru-icon-theme yaru-sound-theme +# For accessibility in conjunction with ORCA it is added: +espeak-ng # ===>>> VirtualBox <<<=== # @@ -118,9 +120,9 @@ bubblewrap # ===>>> Firefox web browser <<<=== # firefox -firefox-adblock-plus -firefox-extension-privacybadger -firefox-extension-https-everywhere +# firefox-adblock-plus +# firefox-extension-privacybadger +# firefox-extension-https-everywhere colord dconf-editor