From: Rafael Costa Rega Date: Tue, 5 Jan 2021 13:16:11 +0000 (-0300) Subject: 2021.01.04 Update X-Git-Url: http://git.osdn.net/view?p=rebornos%2Fcnchi-gnome-mac-osdn.git;a=commitdiff_plain;h=2538b2ea2e20234b37ec11e7b5e449b5ecc6a972 2021.01.04 Update --- 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/adwaita-day.jpg b/Cnchi/adwaita-day.jpg index 3068e13..ad8d08d 100644 Binary files a/Cnchi/adwaita-day.jpg and b/Cnchi/adwaita-day.jpg differ 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 c89c9cc..d4b9f77 100755 --- a/Cnchi/info.py +++ b/Cnchi/info.py @@ -3,7 +3,7 @@ # # info.py # -# Copyright © 2013-2019 RebornOS +# Copyright © 2013-2020 RebornOS # # This file is part of Cnchi. # @@ -29,7 +29,7 @@ """ Set some Cnchi global constants """ -CNCHI_VERSION = "RebornOS Mac Installer Gnome based 2020.05.25" +CNCHI_VERSION = "RebornOS Mac Installer Gnome based 2021.01.04" 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/mirrorlist b/Cnchi/mirrorlist new file mode 100644 index 0000000..dd6b9dc --- /dev/null +++ b/Cnchi/mirrorlist @@ -0,0 +1,696 @@ +## +## Arch Linux repository mirrorlist +## Generated on 2020-12-28 +## + +## Worldwide +Server = http://mirrors.evowise.com/archlinux/$repo/os/$arch +Server = http://mirror.rackspace.com/archlinux/$repo/os/$arch +Server = https://mirror.rackspace.com/archlinux/$repo/os/$arch + +## Australia +Server = https://mirror.aarnet.edu.au/pub/archlinux/$repo/os/$arch +Server = http://archlinux.mirror.digitalpacific.com.au/$repo/os/$arch +Server = https://archlinux.mirror.digitalpacific.com.au/$repo/os/$arch +Server = http://ftp.iinet.net.au/pub/archlinux/$repo/os/$arch +Server = http://mirror.internode.on.net/pub/archlinux/$repo/os/$arch +Server = http://mirror.launtel.net.au/repo/arch/$repo/os/$arch +Server = https://mirror.launtel.net.au/repo/arch/$repo/os/$arch +Server = http://arch.lucassymons.net/$repo/os/$arch +Server = https://arch.lucassymons.net/$repo/os/$arch +Server = http://syd.mirror.rackspace.com/archlinux/$repo/os/$arch +Server = https://syd.mirror.rackspace.com/archlinux/$repo/os/$arch +Server = http://ftp.swin.edu.au/archlinux/$repo/os/$arch + +## Austria +Server = http://mirror.digitalnova.at/archlinux/$repo/os/$arch +Server = http://mirror.easyname.at/archlinux/$repo/os/$arch +Server = http://mirror.reisenbauer.ee/archlinux/$repo/os/$arch +Server = https://mirror.reisenbauer.ee/archlinux/$repo/os/$arch + +## Bangladesh +Server = http://mirror.xeonbd.com/archlinux/$repo/os/$arch + +## Belarus +Server = http://ftp.byfly.by/pub/archlinux/$repo/os/$arch +Server = http://mirror.datacenter.by/pub/archlinux/$repo/os/$arch + +## Belgium +Server = http://archlinux.cu.be/$repo/os/$arch +Server = http://archlinux.mirror.kangaroot.net/$repo/os/$arch +Server = http://mirror.tiguinet.net/arch/$repo/os/$arch + +## Bosnia and Herzegovina +Server = http://archlinux.mirror.ba/$repo/os/$arch + +## Brazil +Server = http://br.mirror.archlinux-br.org/$repo/os/$arch +Server = http://archlinux.c3sl.ufpr.br/$repo/os/$arch +Server = http://www.caco.ic.unicamp.br/archlinux/$repo/os/$arch +Server = https://www.caco.ic.unicamp.br/archlinux/$repo/os/$arch +Server = http://linorg.usp.br/archlinux/$repo/os/$arch +Server = http://archlinux.pop-es.rnp.br/$repo/os/$arch +Server = http://mirror.ufam.edu.br/archlinux/$repo/os/$arch +Server = http://mirror.ufscar.br/archlinux/$repo/os/$arch + +## Bulgaria +Server = http://mirror.host.ag/archlinux/$repo/os/$arch +Server = http://mirrors.netix.net/archlinux/$repo/os/$arch +Server = http://mirrors.uni-plovdiv.net/archlinux/$repo/os/$arch +Server = https://mirrors.uni-plovdiv.net/archlinux/$repo/os/$arch + +## Canada +Server = http://mirror.cedille.club/archlinux/$repo/os/$arch +Server = http://archlinux.mirror.colo-serv.net/$repo/os/$arch +Server = http://mirror.csclub.uwaterloo.ca/archlinux/$repo/os/$arch +Server = https://mirror.csclub.uwaterloo.ca/archlinux/$repo/os/$arch +Server = http://mirror2.evolution-host.com/archlinux/$repo/os/$arch +Server = https://mirror2.evolution-host.com/archlinux/$repo/os/$arch +Server = http://mirror.its.dal.ca/archlinux/$repo/os/$arch +Server = http://muug.ca/mirror/archlinux/$repo/os/$arch +Server = https://muug.ca/mirror/archlinux/$repo/os/$arch +Server = http://archlinux.mirror.rafal.ca/$repo/os/$arch +Server = http://mirror.scd31.com/arch/$repo/os/$arch +Server = https://mirror.scd31.com/arch/$repo/os/$arch +Server = http://mirror.sergal.org/archlinux/$repo/os/$arch +Server = https://mirror.sergal.org/archlinux/$repo/os/$arch + +## Chile +Server = http://mirror.anquan.cl/archlinux/$repo/os/$arch +Server = http://mirror.archlinux.cl/$repo/os/$arch +Server = http://mirror1.cl.netactuate.com/archlinux/$repo/os/$arch +Server = https://mirror1.cl.netactuate.com/archlinux/$repo/os/$arch +Server = http://mirror.ufro.cl/archlinux/$repo/os/$arch +Server = https://mirror.ufro.cl/archlinux/$repo/os/$arch + +## China +Server = http://mirrors.163.com/archlinux/$repo/os/$arch +Server = http://mirrors.bfsu.edu.cn/archlinux/$repo/os/$arch +Server = https://mirrors.bfsu.edu.cn/archlinux/$repo/os/$arch +Server = http://mirrors.cqu.edu.cn/archlinux/$repo/os/$arch +Server = https://mirrors.cqu.edu.cn/archlinux/$repo/os/$arch +Server = http://mirrors.dgut.edu.cn/archlinux/$repo/os/$arch +Server = https://mirrors.dgut.edu.cn/archlinux/$repo/os/$arch +Server = http://mirrors.hit.edu.cn/archlinux/$repo/os/$arch +Server = https://mirrors.hit.edu.cn/archlinux/$repo/os/$arch +Server = http://mirror.lzu.edu.cn/archlinux/$repo/os/$arch +Server = http://mirrors.neusoft.edu.cn/archlinux/$repo/os/$arch +Server = https://mirrors.neusoft.edu.cn/archlinux/$repo/os/$arch +Server = http://mirrors.nju.edu.cn/archlinux/$repo/os/$arch +Server = https://mirrors.nju.edu.cn/archlinux/$repo/os/$arch +Server = http://mirror.redrock.team/archlinux/$repo/os/$arch +Server = https://mirror.redrock.team/archlinux/$repo/os/$arch +Server = https://mirrors.sjtug.sjtu.edu.cn/archlinux/$repo/os/$arch +Server = http://mirrors.tuna.tsinghua.edu.cn/archlinux/$repo/os/$arch +Server = https://mirrors.tuna.tsinghua.edu.cn/archlinux/$repo/os/$arch +Server = http://mirrors.ustc.edu.cn/archlinux/$repo/os/$arch +Server = https://mirrors.ustc.edu.cn/archlinux/$repo/os/$arch +Server = https://mirrors.xjtu.edu.cn/archlinux/$repo/os/$arch +Server = http://mirrors.zju.edu.cn/archlinux/$repo/os/$arch + +## Colombia +Server = http://mirrors.udenar.edu.co/archlinux/$repo/os/$arch + +## Croatia +Server = http://archlinux.iskon.hr/$repo/os/$arch + +## Czechia +Server = http://mirror.dkm.cz/archlinux/$repo/os/$arch +Server = https://mirror.dkm.cz/archlinux/$repo/os/$arch +Server = http://ftp.fi.muni.cz/pub/linux/arch/$repo/os/$arch +Server = http://ftp.linux.cz/pub/linux/arch/$repo/os/$arch +Server = http://gluttony.sin.cvut.cz/arch/$repo/os/$arch +Server = https://gluttony.sin.cvut.cz/arch/$repo/os/$arch +Server = http://mirrors.nic.cz/archlinux/$repo/os/$arch +Server = http://ftp.sh.cvut.cz/arch/$repo/os/$arch +Server = https://ftp.sh.cvut.cz/arch/$repo/os/$arch +Server = http://mirror.vpsfree.cz/archlinux/$repo/os/$arch + +## Denmark +Server = http://mirrors.dotsrc.org/archlinux/$repo/os/$arch +Server = https://mirrors.dotsrc.org/archlinux/$repo/os/$arch +Server = http://mirror.one.com/archlinux/$repo/os/$arch +Server = https://mirror.one.com/archlinux/$repo/os/$arch + +## Ecuador +Server = http://mirror.cedia.org.ec/archlinux/$repo/os/$arch +Server = http://mirror.espoch.edu.ec/archlinux/$repo/os/$arch +Server = http://mirror.uta.edu.ec/archlinux/$repo/os/$arch + +## Finland +Server = http://arch.mirror.far.fi/$repo/os/$arch +Server = http://mirror.hosthink.net/archlinux/$repo/os/$arch +Server = http://mirror.pseudoform.org/$repo/os/$arch +Server = https://mirror.pseudoform.org/$repo/os/$arch +Server = https://mirror.srv.fail/archlinux/$repo/os/$arch +Server = http://mirror.wuki.li/archlinux/$repo/os/$arch +Server = https://mirror.wuki.li/archlinux/$repo/os/$arch + +## France +Server = http://archlinux.de-labrusse.fr/$repo/os/$arch +Server = http://mirror.archlinux.ikoula.com/archlinux/$repo/os/$arch +Server = https://archlinux.vi-di.fr/$repo/os/$arch +Server = http://archlinux.mirrors.benatherton.com/$repo/os/$arch +Server = http://mirror.cyberbits.eu/archlinux/$repo/os/$arch +Server = https://mirror.cyberbits.eu/archlinux/$repo/os/$arch +Server = https://mirrors.eric.ovh/arch/$repo/os/$arch +Server = http://mirror.ibcp.fr/pub/archlinux/$repo/os/$arch +Server = http://mirror.lastmikoi.net/archlinux/$repo/os/$arch +Server = https://arch-mirror.cloud.louifox.house/$repo/os/$arch +Server = http://archlinux.mailtunnel.eu/$repo/os/$arch +Server = https://archlinux.mailtunnel.eu/$repo/os/$arch +Server = http://mir.archlinux.fr/$repo/os/$arch +Server = http://mirrors.celianvdb.fr/archlinux/$repo/os/$arch +Server = https://mirrors.celianvdb.fr/archlinux/$repo/os/$arch +Server = http://arch.nimukaito.net/$repo/os/$arch +Server = https://arch.nimukaito.net/$repo/os/$arch +Server = http://mirror.oldsql.cc/archlinux/$repo/os/$arch +Server = https://mirror.oldsql.cc/archlinux/$repo/os/$arch +Server = http://archlinux.mirrors.ovh.net/archlinux/$repo/os/$arch +Server = http://archlinux.polymorf.fr/$repo/os/$arch +Server = http://archlinux.rezopole.net/$repo/os/$arch +Server = https://mirrors.slaanesh.org/archlinux/$repo/os/$arch +Server = http://mirrors.standaloneinstaller.com/archlinux/$repo/os/$arch +Server = https://mirror.sysa.tech/archlinux/$repo/os/$arch +Server = https://mirror.thekinrar.fr/archlinux/$repo/os/$arch +Server = http://ftp.u-strasbg.fr/linux/distributions/archlinux/$repo/os/$arch +Server = https://mirror.wormhole.eu/archlinux/$repo/os/$arch +Server = http://mirroir.wptheme.fr/archlinux/$repo/os/$arch +Server = https://mirroir.wptheme.fr/archlinux/$repo/os/$arch +Server = http://arch.yourlabs.org/$repo/os/$arch +Server = https://arch.yourlabs.org/$repo/os/$arch + +## Georgia +Server = http://archlinux.grena.ge/$repo/os/$arch +Server = https://archlinux.grena.ge/$repo/os/$arch + +## Germany +Server = http://mirror.23media.com/archlinux/$repo/os/$arch +Server = https://mirror.23media.com/archlinux/$repo/os/$arch +Server = http://ftp.agdsn.de/pub/mirrors/archlinux/$repo/os/$arch +Server = https://ftp.agdsn.de/pub/mirrors/archlinux/$repo/os/$arch +Server = https://appuals.com/archlinux/$repo/os/$arch +Server = http://artfiles.org/archlinux.org/$repo/os/$arch +Server = https://mirror.autisten.club/archlinux/$repo/os/$arch +Server = https://mirror.bethselamin.de/$repo/os/$arch +Server = http://mirror.chaoticum.net/arch/$repo/os/$arch +Server = https://mirror.chaoticum.net/arch/$repo/os/$arch +Server = http://mirror.checkdomain.de/archlinux/$repo/os/$arch +Server = https://mirror.checkdomain.de/archlinux/$repo/os/$arch +Server = http://mirror.clientvps.com/archlinux/$repo/os/$arch +Server = https://mirror.clientvps.com/archlinux/$repo/os/$arch +Server = https://mirror.dogado.de/archlinux/$repo/os/$arch +Server = http://mirror.f4st.host/archlinux/$repo/os/$arch +Server = https://mirror.f4st.host/archlinux/$repo/os/$arch +Server = http://ftp.fau.de/archlinux/$repo/os/$arch +Server = https://ftp.fau.de/archlinux/$repo/os/$arch +Server = https://dist-mirror.fem.tu-ilmenau.de/archlinux/$repo/os/$arch +Server = http://mirror.fsrv.services/archlinux/$repo/os/$arch +Server = https://mirror.fsrv.services/archlinux/$repo/os/$arch +Server = https://mirror.gnomus.de/$repo/os/$arch +Server = http://www.gutscheindrache.com/mirror/archlinux/$repo/os/$arch +Server = http://ftp.gwdg.de/pub/linux/archlinux/$repo/os/$arch +Server = http://archlinux.honkgong.info/$repo/os/$arch +Server = http://ftp.hosteurope.de/mirror/ftp.archlinux.org/$repo/os/$arch +Server = http://ftp-stud.hs-esslingen.de/pub/Mirrors/archlinux/$repo/os/$arch +Server = http://archlinux.mirror.iphh.net/$repo/os/$arch +Server = http://arch.jensgutermuth.de/$repo/os/$arch +Server = https://arch.jensgutermuth.de/$repo/os/$arch +Server = http://mirror.kumi.systems/archlinux/$repo/os/$arch +Server = https://mirror.kumi.systems/archlinux/$repo/os/$arch +Server = http://mirror.fra10.de.leaseweb.net/archlinux/$repo/os/$arch +Server = https://mirror.fra10.de.leaseweb.net/archlinux/$repo/os/$arch +Server = http://mirror.metalgamer.eu/archlinux/$repo/os/$arch +Server = https://mirror.metalgamer.eu/archlinux/$repo/os/$arch +Server = http://mirror.mikrogravitation.org/archlinux/$repo/os/$arch +Server = https://mirror.mikrogravitation.org/archlinux/$repo/os/$arch +Server = https://mirror.pkgbuild.com/$repo/os/$arch +Server = http://mirrors.n-ix.net/archlinux/$repo/os/$arch +Server = https://mirrors.n-ix.net/archlinux/$repo/os/$arch +Server = http://mirror.netcologne.de/archlinux/$repo/os/$arch +Server = https://mirror.netcologne.de/archlinux/$repo/os/$arch +Server = http://mirrors.niyawe.de/archlinux/$repo/os/$arch +Server = https://mirrors.niyawe.de/archlinux/$repo/os/$arch +Server = http://mirror.orbit-os.com/archlinux/$repo/os/$arch +Server = https://mirror.orbit-os.com/archlinux/$repo/os/$arch +Server = http://packages.oth-regensburg.de/archlinux/$repo/os/$arch +Server = https://packages.oth-regensburg.de/archlinux/$repo/os/$arch +Server = http://phinau.de/arch/$repo/os/$arch +Server = https://phinau.de/arch/$repo/os/$arch +Server = https://www.ratenzahlung.de/mirror/archlinux/$repo/os/$arch +Server = http://ftp.halifax.rwth-aachen.de/archlinux/$repo/os/$arch +Server = https://ftp.halifax.rwth-aachen.de/archlinux/$repo/os/$arch +Server = http://linux.rz.rub.de/archlinux/$repo/os/$arch +Server = http://mirror.satis-faction.de/archlinux/$repo/os/$arch +Server = https://mirror.satis-faction.de/archlinux/$repo/os/$arch +Server = http://mirror.selfnet.de/archlinux/$repo/os/$arch +Server = https://mirror.selfnet.de/archlinux/$repo/os/$arch +Server = http://ftp.spline.inf.fu-berlin.de/mirrors/archlinux/$repo/os/$arch +Server = https://ftp.spline.inf.fu-berlin.de/mirrors/archlinux/$repo/os/$arch +Server = http://archlinux.thaller.ws/$repo/os/$arch +Server = https://archlinux.thaller.ws/$repo/os/$arch +Server = http://ftp.tu-chemnitz.de/pub/linux/archlinux/$repo/os/$arch +Server = http://mirror.ubrco.de/archlinux/$repo/os/$arch +Server = https://mirror.ubrco.de/archlinux/$repo/os/$arch +Server = http://mirror.undisclose.de/archlinux/$repo/os/$arch +Server = https://mirror.undisclose.de/archlinux/$repo/os/$arch +Server = http://ftp.uni-bayreuth.de/linux/archlinux/$repo/os/$arch +Server = http://ftp.uni-hannover.de/archlinux/$repo/os/$arch +Server = http://ftp.uni-kl.de/pub/linux/archlinux/$repo/os/$arch +Server = http://mirror.united-gameserver.de/archlinux/$repo/os/$arch +Server = https://arch.unixpeople.org/$repo/os/$arch +Server = http://ftp.wrz.de/pub/archlinux/$repo/os/$arch +Server = https://ftp.wrz.de/pub/archlinux/$repo/os/$arch +Server = http://mirror.wtnet.de/arch/$repo/os/$arch +Server = https://mirror.wtnet.de/arch/$repo/os/$arch + +## Greece +Server = http://ftp.cc.uoc.gr/mirrors/linux/archlinux/$repo/os/$arch +Server = http://mirrors.myaegean.gr/linux/archlinux/$repo/os/$arch +Server = http://ftp.ntua.gr/pub/linux/archlinux/$repo/os/$arch +Server = http://ftp.otenet.gr/linux/archlinux/$repo/os/$arch + +## Hong Kong +Server = http://mirror-hk.koddos.net/archlinux/$repo/os/$arch +Server = https://mirror-hk.koddos.net/archlinux/$repo/os/$arch +Server = http://hkg.mirror.rackspace.com/archlinux/$repo/os/$arch +Server = https://hkg.mirror.rackspace.com/archlinux/$repo/os/$arch +Server = https://arch-mirror.wtako.net/$repo/os/$arch +Server = http://mirror.xtom.com.hk/archlinux/$repo/os/$arch +Server = https://mirror.xtom.com.hk/archlinux/$repo/os/$arch + +## Hungary +Server = http://ftp.energia.mta.hu/pub/mirrors/ftp.archlinux.org/$repo/os/$arch +Server = http://archmirror.hbit.sztaki.hu/archlinux/$repo/os/$arch +Server = http://nova.quantum-mirror.hu/mirrors/pub/archlinux/$repo/os/$arch +Server = http://quantum-mirror.hu/mirrors/pub/archlinux/$repo/os/$arch +Server = http://super.quantum-mirror.hu/mirrors/pub/archlinux/$repo/os/$arch +Server = https://nova.quantum-mirror.hu/mirrors/pub/archlinux/$repo/os/$arch +Server = https://quantum-mirror.hu/mirrors/pub/archlinux/$repo/os/$arch +Server = https://super.quantum-mirror.hu/mirrors/pub/archlinux/$repo/os/$arch + +## Iceland +Server = http://mirror.system.is/arch/$repo/os/$arch +Server = https://mirror.system.is/arch/$repo/os/$arch + +## India +Server = http://mirror.cse.iitk.ac.in/archlinux/$repo/os/$arch +Server = http://mirrors.piconets.webwerks.in/archlinux-mirror/$repo/os/$arch +Server = https://mirrors.piconets.webwerks.in/archlinux-mirror/$repo/os/$arch + +## Indonesia +Server = http://mirror.gi.co.id/archlinux/$repo/os/$arch +Server = https://mirror.gi.co.id/archlinux/$repo/os/$arch +Server = http://mirror.labkom.id/archlinux/$repo/os/$arch +Server = http://mirror.papua.go.id/archlinux/$repo/os/$arch +Server = https://mirror.papua.go.id/archlinux/$repo/os/$arch +Server = http://mirror.poliwangi.ac.id/archlinux/$repo/os/$arch +Server = http://suro.ubaya.ac.id/archlinux/$repo/os/$arch +Server = http://mirror.telkomuniversity.ac.id/archlinux/$repo/os/$arch +Server = https://mirror.telkomuniversity.ac.id/archlinux/$repo/os/$arch + +## Iran +Server = http://repo.iut.ac.ir/repo/archlinux/$repo/os/$arch +Server = http://mirror.nak-mci.ir/arch/$repo/os/$arch +Server = http://mirror.rasanegar.com/archlinux/$repo/os/$arch +Server = https://mirror.rasanegar.com/archlinux/$repo/os/$arch + +## Ireland +Server = http://ftp.heanet.ie/mirrors/ftp.archlinux.org/$repo/os/$arch +Server = https://ftp.heanet.ie/mirrors/ftp.archlinux.org/$repo/os/$arch + +## Israel +Server = http://mirror.isoc.org.il/pub/archlinux/$repo/os/$arch +Server = https://mirror.isoc.org.il/pub/archlinux/$repo/os/$arch +Server = https://archlinux.mivzakim.net/$repo/os/$arch + +## Italy +Server = https://archmirror.it/$repo/os/$arch +Server = https://archlinux.beccacervello.it/archlinux/$repo/os/$arch +Server = http://archlinux.mirror.garr.it/archlinux/$repo/os/$arch +Server = http://mirrors.prometeus.net/archlinux/$repo/os/$arch + +## Japan +Server = http://mirrors.cat.net/archlinux/$repo/os/$arch +Server = https://mirrors.cat.net/archlinux/$repo/os/$arch +Server = http://ftp.tsukuba.wide.ad.jp/Linux/archlinux/$repo/os/$arch +Server = http://ftp.jaist.ac.jp/pub/Linux/ArchLinux/$repo/os/$arch +Server = https://ftp.jaist.ac.jp/pub/Linux/ArchLinux/$repo/os/$arch + +## Kazakhstan +Server = http://mirror.hoster.kz/archlinux/$repo/os/$arch +Server = https://mirror.hoster.kz/archlinux/$repo/os/$arch +Server = http://mirror.ps.kz/archlinux/$repo/os/$arch +Server = https://mirror.ps.kz/archlinux/$repo/os/$arch + +## Kenya +Server = http://archlinux.mirror.liquidtelecom.com/$repo/os/$arch +Server = https://archlinux.mirror.liquidtelecom.com/$repo/os/$arch + +## Latvia +Server = http://archlinux.koyanet.lv/archlinux/$repo/os/$arch +Server = https://archlinux.koyanet.lv/archlinux/$repo/os/$arch + +## Lithuania +Server = http://mirrors.atviras.lt/archlinux/$repo/os/$arch +Server = https://mirrors.atviras.lt/archlinux/$repo/os/$arch +Server = http://mirrors.ims.nksc.lt/archlinux/$repo/os/$arch +Server = https://mirrors.ims.nksc.lt/archlinux/$repo/os/$arch + +## Luxembourg +Server = http://archlinux.mirror.root.lu/$repo/os/$arch + +## Moldova +Server = http://mirror.ihost.md/archlinux/$repo/os/$arch +Server = https://mirror.ihost.md/archlinux/$repo/os/$arch + +## Netherlands +Server = https://mirrors.daan.vodka/archlinux/$repo/os/$arch +Server = http://mirror.i3d.net/pub/archlinux/$repo/os/$arch +Server = https://mirror.i3d.net/pub/archlinux/$repo/os/$arch +Server = https://arch.jeweet.net/$repo/os/$arch +Server = http://mirror.koddos.net/archlinux/$repo/os/$arch +Server = https://mirror.koddos.net/archlinux/$repo/os/$arch +Server = http://arch.mirrors.lavatech.top/$repo/os/$arch +Server = https://arch.mirrors.lavatech.top/$repo/os/$arch +Server = http://mirror.ams1.nl.leaseweb.net/archlinux/$repo/os/$arch +Server = https://mirror.ams1.nl.leaseweb.net/archlinux/$repo/os/$arch +Server = http://archlinux.mirror.liteserver.nl/$repo/os/$arch +Server = https://archlinux.mirror.liteserver.nl/$repo/os/$arch +Server = http://mirror.lyrahosting.com/archlinux/$repo/os/$arch +Server = https://mirror.lyrahosting.com/archlinux/$repo/os/$arch +Server = http://mirror.mijn.host/archlinux/$repo/os/$arch +Server = https://mirror.mijn.host/archlinux/$repo/os/$arch +Server = http://mirror.neostrada.nl/archlinux/$repo/os/$arch +Server = https://mirror.neostrada.nl/archlinux/$repo/os/$arch +Server = http://ftp.nluug.nl/os/Linux/distr/archlinux/$repo/os/$arch +Server = http://archlinux.mirror.pcextreme.nl/$repo/os/$arch +Server = https://archlinux.mirror.pcextreme.nl/$repo/os/$arch +Server = http://mirror.serverion.com/archlinux/$repo/os/$arch +Server = https://mirror.serverion.com/archlinux/$repo/os/$arch +Server = http://ftp.snt.utwente.nl/pub/os/linux/archlinux/$repo/os/$arch +Server = http://mirror.tarellia.net/distr/archlinux/$repo/os/$arch +Server = https://mirror.tarellia.net/distr/archlinux/$repo/os/$arch +Server = http://archlinux.mirror.wearetriple.com/$repo/os/$arch +Server = https://archlinux.mirror.wearetriple.com/$repo/os/$arch +Server = http://mirror-archlinux.webruimtehosting.nl/$repo/os/$arch +Server = https://mirror-archlinux.webruimtehosting.nl/$repo/os/$arch +Server = http://mirrors.xtom.nl/archlinux/$repo/os/$arch +Server = https://mirrors.xtom.nl/archlinux/$repo/os/$arch + +## New Caledonia +Server = http://mirror.lagoon.nc/pub/archlinux/$repo/os/$arch +Server = http://archlinux.nautile.nc/archlinux/$repo/os/$arch +Server = https://archlinux.nautile.nc/archlinux/$repo/os/$arch + +## New Zealand +Server = http://mirror.fsmg.org.nz/archlinux/$repo/os/$arch +Server = https://mirror.fsmg.org.nz/archlinux/$repo/os/$arch +Server = http://mirror.smith.geek.nz/archlinux/$repo/os/$arch +Server = https://mirror.smith.geek.nz/archlinux/$repo/os/$arch + +## North Macedonia +Server = http://arch.softver.org.mk/archlinux/$repo/os/$arch +Server = http://mirror.onevip.mk/archlinux/$repo/os/$arch +Server = http://mirror.t-home.mk/archlinux/$repo/os/$arch +Server = https://mirror.t-home.mk/archlinux/$repo/os/$arch + +## Norway +Server = http://mirror.archlinux.no/$repo/os/$arch +Server = https://mirror.archlinux.no/$repo/os/$arch +Server = http://archlinux.uib.no/$repo/os/$arch +Server = http://mirror.neuf.no/archlinux/$repo/os/$arch +Server = https://mirror.neuf.no/archlinux/$repo/os/$arch +Server = http://mirror.terrahost.no/linux/archlinux/$repo/os/$arch + +## Pakistan +Server = http://repo.inara.pk/archlinux/$repo/os/$arch +Server = https://repo.inara.pk/archlinux/$repo/os/$arch + +## Paraguay +Server = http://archlinux.mirror.py/archlinux/$repo/os/$arch + +## Philippines +Server = http://mirror.rise.ph/archlinux/$repo/os/$arch + +## Poland +Server = http://ftp.icm.edu.pl/pub/Linux/dist/archlinux/$repo/os/$arch +Server = https://ftp.icm.edu.pl/pub/Linux/dist/archlinux/$repo/os/$arch +Server = http://arch.midov.pl/arch/$repo/os/$arch +Server = https://arch.midov.pl/arch/$repo/os/$arch +Server = http://arch.nixlab.pl/$repo/os/$arch +Server = https://arch.nixlab.pl/$repo/os/$arch +Server = http://mirror.onet.pl/pub/mirrors/archlinux/$repo/os/$arch +Server = http://piotrkosoft.net/pub/mirrors/ftp.archlinux.org/$repo/os/$arch +Server = http://mirror.sfinae.tech/pub/mirrors/archlinux/$repo/os/$arch +Server = https://mirror.sfinae.tech/pub/mirrors/archlinux/$repo/os/$arch +Server = http://ftp.vectranet.pl/archlinux/$repo/os/$arch + +## Portugal +Server = http://glua.ua.pt/pub/archlinux/$repo/os/$arch +Server = https://glua.ua.pt/pub/archlinux/$repo/os/$arch +Server = http://ftp.rnl.tecnico.ulisboa.pt/pub/archlinux/$repo/os/$arch +Server = https://ftp.rnl.tecnico.ulisboa.pt/pub/archlinux/$repo/os/$arch + +## Romania +Server = http://mirrors.chroot.ro/archlinux/$repo/os/$arch +Server = https://mirrors.chroot.ro/archlinux/$repo/os/$arch +Server = http://mirror.efect.ro/archlinux/$repo/os/$arch +Server = https://mirror.efect.ro/archlinux/$repo/os/$arch +Server = http://mirrors.go.ro/archlinux/$repo/os/$arch +Server = https://mirrors.go.ro/archlinux/$repo/os/$arch +Server = http://mirrors.hostico.ro/archlinux/$repo/os/$arch +Server = https://mirrors.hostico.ro/archlinux/$repo/os/$arch +Server = http://archlinux.mirrors.linux.ro/$repo/os/$arch +Server = http://mirrors.m247.ro/archlinux/$repo/os/$arch +Server = http://mirrors.nav.ro/archlinux/$repo/os/$arch +Server = http://mirrors.nxthost.com/archlinux/$repo/os/$arch +Server = https://mirrors.nxthost.com/archlinux/$repo/os/$arch +Server = http://mirrors.pidginhost.com/arch/$repo/os/$arch +Server = https://mirrors.pidginhost.com/arch/$repo/os/$arch + +## Russia +Server = http://mirrors.powernet.com.ru/archlinux/$repo/os/$arch +Server = http://mirror.rol.ru/archlinux/$repo/os/$arch +Server = https://mirror.rol.ru/archlinux/$repo/os/$arch +Server = http://mirror.truenetwork.ru/archlinux/$repo/os/$arch +Server = https://mirror.truenetwork.ru/archlinux/$repo/os/$arch +Server = http://mirror.yandex.ru/archlinux/$repo/os/$arch +Server = https://mirror.yandex.ru/archlinux/$repo/os/$arch +Server = http://archlinux.zepto.cloud/$repo/os/$arch + +## Serbia +Server = http://arch.petarmaric.com/$repo/os/$arch +Server = http://mirror.pmf.kg.ac.rs/archlinux/$repo/os/$arch + +## Singapore +Server = http://mirror.0x.sg/archlinux/$repo/os/$arch +Server = https://mirror.0x.sg/archlinux/$repo/os/$arch +Server = http://mirror.aktkn.sg/archlinux/$repo/os/$arch +Server = https://mirror.aktkn.sg/archlinux/$repo/os/$arch +Server = https://download.nus.edu.sg/mirror/archlinux/$repo/os/$arch +Server = http://mirror.guillaumea.fr/archlinux/$repo/os/$arch +Server = https://mirror.guillaumea.fr/archlinux/$repo/os/$arch +Server = http://mirror.nus.edu.sg/archlinux/$repo/os/$arch + +## Slovakia +Server = http://mirror.lnx.sk/pub/linux/archlinux/$repo/os/$arch +Server = https://mirror.lnx.sk/pub/linux/archlinux/$repo/os/$arch +Server = http://tux.rainside.sk/archlinux/$repo/os/$arch + +## Slovenia +Server = http://archimonde.ts.si/archlinux/$repo/os/$arch +Server = https://archimonde.ts.si/archlinux/$repo/os/$arch + +## South Africa +Server = http://archlinux.za.mirror.allworldit.com/archlinux/$repo/os/$arch +Server = https://archlinux.za.mirror.allworldit.com/archlinux/$repo/os/$arch +Server = http://za.mirror.archlinux-br.org/$repo/os/$arch +Server = http://mirror.is.co.za/mirror/archlinux.org/$repo/os/$arch +Server = http://arch.opnmirror.co.za/$repo/os/$arch +Server = https://arch.opnmirror.co.za/$repo/os/$arch +Server = http://mirrors.urbanwave.co.za/archlinux/$repo/os/$arch +Server = https://mirrors.urbanwave.co.za/archlinux/$repo/os/$arch + +## South Korea +Server = http://mirror.anigil.com/archlinux/$repo/os/$arch +Server = https://mirror.anigil.com/archlinux/$repo/os/$arch +Server = http://ftp.harukasan.org/archlinux/$repo/os/$arch +Server = https://ftp.harukasan.org/archlinux/$repo/os/$arch +Server = http://ftp.lanet.kr/pub/archlinux/$repo/os/$arch +Server = https://ftp.lanet.kr/pub/archlinux/$repo/os/$arch +Server = http://mirror.premi.st/archlinux/$repo/os/$arch +Server = https://mirror.premi.st/archlinux/$repo/os/$arch + +## Spain +Server = https://mirror.cloroformo.org/archlinux/$repo/os/$arch +Server = http://mirror.librelabucm.org/archlinux/$repo/os/$arch +Server = https://mirror.librelabucm.org/archlinux/$repo/os/$arch +Server = https://osl.ugr.es/archlinux/$repo/os/$arch +Server = http://ftp.rediris.es/mirror/archlinux/$repo/os/$arch +Server = http://sharing.thelinuxsect.com/archlinux/$repo/os/$arch + +## Sweden +Server = http://ftp.acc.umu.se/mirror/archlinux/$repo/os/$arch +Server = https://ftp.acc.umu.se/mirror/archlinux/$repo/os/$arch +Server = http://archlinux.dynamict.se/$repo/os/$arch +Server = https://archlinux.dynamict.se/$repo/os/$arch +Server = http://ftpmirror.infania.net/mirror/archlinux/$repo/os/$arch +Server = http://ftp.lysator.liu.se/pub/archlinux/$repo/os/$arch +Server = https://ftp.lysator.liu.se/pub/archlinux/$repo/os/$arch +Server = http://ftp.myrveln.se/pub/linux/archlinux/$repo/os/$arch +Server = https://ftp.myrveln.se/pub/linux/archlinux/$repo/os/$arch +Server = https://mirror.osbeck.com/archlinux/$repo/os/$arch + +## Switzerland +Server = http://pkg.adfinis.com/archlinux/$repo/os/$arch +Server = https://pkg.adfinis.com/archlinux/$repo/os/$arch +Server = http://mirror.init7.net/archlinux/$repo/os/$arch +Server = https://mirror.init7.net/archlinux/$repo/os/$arch +Server = http://mirror.puzzle.ch/archlinux/$repo/os/$arch +Server = https://mirror.puzzle.ch/archlinux/$repo/os/$arch +Server = https://theswissbay.ch/archlinux/$repo/os/$arch +Server = https://mirror.ungleich.ch/mirror/packages/archlinux/$repo/os/$arch + +## Taiwan +Server = http://archlinux.ccns.ncku.edu.tw/archlinux/$repo/os/$arch +Server = http://archlinux.cs.nctu.edu.tw/$repo/os/$arch +Server = http://shadow.ind.ntou.edu.tw/archlinux/$repo/os/$arch +Server = https://shadow.ind.ntou.edu.tw/archlinux/$repo/os/$arch +Server = http://ftp.tku.edu.tw/Linux/ArchLinux/$repo/os/$arch +Server = http://ftp.yzu.edu.tw/Linux/archlinux/$repo/os/$arch +Server = https://ftp.yzu.edu.tw/Linux/archlinux/$repo/os/$arch + +## Thailand +Server = http://mirror.kku.ac.th/archlinux/$repo/os/$arch +Server = https://mirror.kku.ac.th/archlinux/$repo/os/$arch +Server = http://mirror2.totbb.net/archlinux/$repo/os/$arch + +## Turkey +Server = http://ftp.linux.org.tr/archlinux/$repo/os/$arch +Server = http://mirror.veriteknik.net.tr/archlinux/$repo/os/$arch + +## Ukraine +Server = http://mirror.mirohost.net/archlinux/$repo/os/$arch +Server = https://mirror.mirohost.net/archlinux/$repo/os/$arch +Server = http://mirrors.nix.org.ua/linux/archlinux/$repo/os/$arch +Server = https://mirrors.nix.org.ua/linux/archlinux/$repo/os/$arch + +## United Kingdom +Server = http://archlinux.uk.mirror.allworldit.com/archlinux/$repo/os/$arch +Server = https://archlinux.uk.mirror.allworldit.com/archlinux/$repo/os/$arch +Server = http://mirror.bytemark.co.uk/archlinux/$repo/os/$arch +Server = https://mirror.bytemark.co.uk/archlinux/$repo/os/$arch +Server = http://mirrors.gethosted.online/archlinux/$repo/os/$arch +Server = https://mirrors.gethosted.online/archlinux/$repo/os/$arch +Server = http://mirrors.manchester.m247.com/arch-linux/$repo/os/$arch +Server = http://mirrors.melbourne.co.uk/archlinux/$repo/os/$arch +Server = https://mirrors.melbourne.co.uk/archlinux/$repo/os/$arch +Server = http://www.mirrorservice.org/sites/ftp.archlinux.org/$repo/os/$arch +Server = https://www.mirrorservice.org/sites/ftp.archlinux.org/$repo/os/$arch +Server = http://mirror.netweaver.uk/archlinux/$repo/os/$arch +Server = https://mirror.netweaver.uk/archlinux/$repo/os/$arch +Server = http://lon.mirror.rackspace.com/archlinux/$repo/os/$arch +Server = https://lon.mirror.rackspace.com/archlinux/$repo/os/$arch +Server = http://arch.serverspace.co.uk/arch/$repo/os/$arch +Server = http://archlinux.mirrors.uk2.net/$repo/os/$arch +Server = http://mirrors.ukfast.co.uk/sites/archlinux.org/$repo/os/$arch +Server = https://mirrors.ukfast.co.uk/sites/archlinux.org/$repo/os/$arch + +## United States +Server = http://mirrors.acm.wpi.edu/archlinux/$repo/os/$arch +Server = http://mirrors.advancedhosters.com/archlinux/$repo/os/$arch +Server = http://mirrors.aggregate.org/archlinux/$repo/os/$arch +Server = http://ca.us.mirror.archlinux-br.org/$repo/os/$arch +Server = http://il.us.mirror.archlinux-br.org/$repo/os/$arch +Server = http://archlinux.surlyjake.com/archlinux/$repo/os/$arch +Server = https://archlinux.surlyjake.com/archlinux/$repo/os/$arch +Server = http://mirror.arizona.edu/archlinux/$repo/os/$arch +Server = https://mirror.arizona.edu/archlinux/$repo/os/$arch +Server = http://arlm.tyzoid.com/$repo/os/$arch +Server = https://arlm.tyzoid.com/$repo/os/$arch +Server = https://mirror.ava.dev/archlinux/$repo/os/$arch +Server = http://mirrors.cat.pdx.edu/archlinux/$repo/os/$arch +Server = http://mirror.cc.columbia.edu/pub/linux/archlinux/$repo/os/$arch +Server = http://arch.mirror.constant.com/$repo/os/$arch +Server = https://arch.mirror.constant.com/$repo/os/$arch +Server = http://mirror.cs.pitt.edu/archlinux/$repo/os/$arch +Server = http://mirror.cs.vt.edu/pub/ArchLinux/$repo/os/$arch +Server = http://distro.ibiblio.org/archlinux/$repo/os/$arch +Server = http://mirror.es.its.nyu.edu/archlinux/$repo/os/$arch +Server = http://mirror.ette.biz/archlinux/$repo/os/$arch +Server = https://mirror.ette.biz/archlinux/$repo/os/$arch +Server = http://mirrors.gigenet.com/archlinux/$repo/os/$arch +Server = http://www.gtlib.gatech.edu/pub/archlinux/$repo/os/$arch +Server = http://mirror.dc02.hackingand.coffee/arch/$repo/os/$arch +Server = https://mirror.dc02.hackingand.coffee/arch/$repo/os/$arch +Server = https://mirror.hodgepodge.dev/archlinux/$repo/os/$arch +Server = http://arch.hu.fo/archlinux/$repo/os/$arch +Server = https://arch.hu.fo/archlinux/$repo/os/$arch +Server = http://repo.ialab.dsu.edu/archlinux/$repo/os/$arch +Server = https://repo.ialab.dsu.edu/archlinux/$repo/os/$arch +Server = http://mirrors.kernel.org/archlinux/$repo/os/$arch +Server = https://mirrors.kernel.org/archlinux/$repo/os/$arch +Server = http://mirror.dal10.us.leaseweb.net/archlinux/$repo/os/$arch +Server = http://mirror.mia11.us.leaseweb.net/archlinux/$repo/os/$arch +Server = http://mirror.sfo12.us.leaseweb.net/archlinux/$repo/os/$arch +Server = http://mirror.wdc1.us.leaseweb.net/archlinux/$repo/os/$arch +Server = https://mirror.dal10.us.leaseweb.net/archlinux/$repo/os/$arch +Server = https://mirror.mia11.us.leaseweb.net/archlinux/$repo/os/$arch +Server = https://mirror.sfo12.us.leaseweb.net/archlinux/$repo/os/$arch +Server = https://mirror.wdc1.us.leaseweb.net/archlinux/$repo/os/$arch +Server = http://mirrors.liquidweb.com/archlinux/$repo/os/$arch +Server = http://mirror.lty.me/archlinux/$repo/os/$arch +Server = https://mirror.lty.me/archlinux/$repo/os/$arch +Server = http://mirrors.lug.mtu.edu/archlinux/$repo/os/$arch +Server = https://mirrors.lug.mtu.edu/archlinux/$repo/os/$arch +Server = http://mirror.math.princeton.edu/pub/archlinux/$repo/os/$arch +Server = http://mirror.metrocast.net/archlinux/$repo/os/$arch +Server = http://mirror.kaminski.io/archlinux/$repo/os/$arch +Server = https://mirror.kaminski.io/archlinux/$repo/os/$arch +Server = http://iad.mirrors.misaka.one/archlinux/$repo/os/$arch +Server = https://iad.mirrors.misaka.one/archlinux/$repo/os/$arch +Server = http://repo.miserver.it.umich.edu/archlinux/$repo/os/$arch +Server = http://mirrors.mit.edu/archlinux/$repo/os/$arch +Server = https://mirrors.mit.edu/archlinux/$repo/os/$arch +Server = http://mirrors.ocf.berkeley.edu/archlinux/$repo/os/$arch +Server = https://mirrors.ocf.berkeley.edu/archlinux/$repo/os/$arch +Server = http://archmirror1.octyl.net/$repo/os/$arch +Server = https://archmirror1.octyl.net/$repo/os/$arch +Server = http://ftp.osuosl.org/pub/archlinux/$repo/os/$arch +Server = http://arch.mirrors.pair.com/$repo/os/$arch +Server = http://dfw.mirror.rackspace.com/archlinux/$repo/os/$arch +Server = http://iad.mirror.rackspace.com/archlinux/$repo/os/$arch +Server = http://ord.mirror.rackspace.com/archlinux/$repo/os/$arch +Server = https://dfw.mirror.rackspace.com/archlinux/$repo/os/$arch +Server = https://iad.mirror.rackspace.com/archlinux/$repo/os/$arch +Server = https://ord.mirror.rackspace.com/archlinux/$repo/os/$arch +Server = http://plug-mirror.rcac.purdue.edu/archlinux/$repo/os/$arch +Server = https://plug-mirror.rcac.purdue.edu/archlinux/$repo/os/$arch +Server = http://mirrors.rit.edu/archlinux/$repo/os/$arch +Server = https://mirrors.rit.edu/archlinux/$repo/os/$arch +Server = https://arch.rrig.gs/$repo/os/$arch +Server = http://mirrors.rutgers.edu/archlinux/$repo/os/$arch +Server = https://mirrors.rutgers.edu/archlinux/$repo/os/$arch +Server = http://mirror.siena.edu/archlinux/$repo/os/$arch +Server = http://mirrors.sonic.net/archlinux/$repo/os/$arch +Server = https://mirrors.sonic.net/archlinux/$repo/os/$arch +Server = http://arch.mirror.square-r00t.net/$repo/os/$arch +Server = https://arch.mirror.square-r00t.net/$repo/os/$arch +Server = http://mirror.stephen304.com/archlinux/$repo/os/$arch +Server = https://mirror.stephen304.com/archlinux/$repo/os/$arch +Server = http://ftp.sudhip.com/archlinux/$repo/os/$arch +Server = https://ftp.sudhip.com/archlinux/$repo/os/$arch +Server = http://mirror.pit.teraswitch.com/archlinux/$repo/os/$arch +Server = https://mirror.pit.teraswitch.com/archlinux/$repo/os/$arch +Server = http://mirror.umd.edu/archlinux/$repo/os/$arch +Server = http://mirror.vtti.vt.edu/archlinux/$repo/os/$arch +Server = http://mirrors.xmission.com/archlinux/$repo/os/$arch +Server = http://mirrors.xtom.com/archlinux/$repo/os/$arch +Server = https://mirrors.xtom.com/archlinux/$repo/os/$arch +Server = https://zxcvfdsa.com/arch/$repo/os/$arch + +## Vietnam +Server = http://f.archlinuxvn.org/archlinux/$repo/os/$arch +Server = http://mirror.bizflycloud.vn/archlinux/$repo/os/$arch + diff --git a/Cnchi/os-release b/Cnchi/os-release new file mode 100644 index 0000000..fd8c06d --- /dev/null +++ b/Cnchi/os-release @@ -0,0 +1,12 @@ +NAME="RebornOS" +VERSION="RebornOS Rolling" +ID=RebornOS +ID_LIKE=arch +PRETTY_NAME="RebornOS" +BUILD_ID=rolling +ANSI_COLOR="38;2;23;147;209" +HOME_URL="https://rebornos.org/" +DOCUMENTATION_URL="https://osdn.net/projects/rebornos/wiki/TitleIndex/" +SUPPORT_URL="https://rebornos.freeforums.net/" +BUG_REPORT_URL="https://gitlab.com/reborn-os-team" +LOGO=rebornos diff --git a/Cnchi/packages.xml b/Cnchi/packages.xml index deeb793..4972d10 100755 --- a/Cnchi/packages.xml +++ b/Cnchi/packages.xml @@ -39,7 +39,11 @@ rebornos-cosmic-gnome network-manager-applet - gnome + lightdm + lightdm-gtk-greeter + rebornos-lightdm-gtk-greeter-images + lightdm-gtk-greeter-settings + @@ -47,7 +51,6 @@ rebornos-cosmic-gnome network-manager-applet - gnome apricity-theme @@ -56,9 +59,10 @@ network-manager-applet rebornos-cosmic-cinnamon - cinnamon - - + lightdm + lightdm-gtk-greeter + rebornos-lightdm-gtk-greeter-images + lightdm-gtk-greeter-settings @@ -66,7 +70,10 @@ network-manager-applet rebornos-cosmic-pantheon - pantheon + lightdm + lightdm-gtk-greeter + rebornos-lightdm-gtk-greeter-images + lightdm-gtk-greeter-settings @@ -75,8 +82,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 +93,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 +115,20 @@ 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 + lightdm + lightdm-gtk-greeter + rebornos-lightdm-gtk-greeter-images + lightdm-gtk-greeter-settings @@ -121,7 +137,10 @@ rebornos-cosmic-lxqt - lxqt + lightdm + lightdm-gtk-greeter + rebornos-lightdm-gtk-greeter-images + lightdm-gtk-greeter-settings @@ -130,18 +149,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 +184,6 @@ lightdm - deepin - deepin-extra @@ -418,7 +447,7 @@ bleachbit timeshift - xapps + xapp stacer @@ -436,7 +465,7 @@ redshift - redshiftgui + redshiftgui-bin skypeforlinux-stable-bin @@ -506,6 +535,7 @@ linux-lts + linux-lts-headers freeoffice @@ -574,13 +604,13 @@ wps-office wps-office-mime wps-office-fonts - wps-office-mui-es-es - wps-office-extension-spanish-dictionary - wps-office-mui-pt-br - wps-office-extension-portuguese-brazilian-dictionary - wps-office-mui-ru-ru - wps-office-extension-russian-dictionary - wps-office-extension-english-uk-dictionary + + + + + + + tlp @@ -643,11 +673,12 @@ - grub-zfs - spl - spl-utils - zfs - zfs-utils + + + + + + @@ -670,7 +701,7 @@ efibootmgr - refind-efi + refind diff --git a/Cnchi/postinstall.sh b/Cnchi/postinstall.sh index c04d9b7..6425f38 100755 --- a/Cnchi/postinstall.sh +++ b/Cnchi/postinstall.sh @@ -168,7 +168,7 @@ kde_settings() { set_dmrc kde-plasma # Force QtCurve to use our theme - rm -R ${CN_DESTDIR}/usr/share/kstyle/themes/qtcurve.themerc + # rm -R ${CN_DESTDIR}/usr/share/kstyle/themes/qtcurve.themerc # Setup user defaults #if [ -f "${CN_DESTDIR}/usr/share/antergos-kde-setup/install.sh" ]; then @@ -177,11 +177,11 @@ kde_settings() { # chroot ${CN_DESTDIR} /usr/bin/antergos-desktop plasma ${CN_USER_NAME} #fi - cp ${CN_DESTDIR}/etc/skel/.gtkrc-2.0-kde4 ${CN_DESTDIR}/root - chroot ${CN_DESTDIR} "ln -s /root/.gtkrc-2.0-kde4 /root/.gtkrc-2.0" + # cp ${CN_DESTDIR}/etc/skel/.gtkrc-2.0-kde4 ${CN_DESTDIR}/root + # chroot ${CN_DESTDIR} "ln -s /root/.gtkrc-2.0-kde4 /root/.gtkrc-2.0" # Set default directories - chroot ${CN_DESTDIR} su -c xdg-user-dirs-update ${CN_USER_NAME} + # chroot ${CN_DESTDIR} su -c xdg-user-dirs-update ${CN_USER_NAME} } mate_settings() { @@ -307,9 +307,12 @@ postinstall() { fi # Set RebornOS name in filesystem files - cp /etc/arch-release "${CN_DESTDIR}/etc/" - cp /etc/os-release "${CN_DESTDIR}/etc/" + cp /etc/arch-release ${CN_DESTDIR}/etc/ + # cp /etc/os-release "${CN_DESTDIR}/etc/" sed -i 's|Arch|RebornOS|g' "${CN_DESTDIR}/etc/issue" + # os-release updated for RebornOS + rm ${CN_DESTDIR}/usr/lib/os-release + cp /usr/share/cnchi/os-release ${CN_DESTDIR}/usr/lib/ # Set common desktop settigns common_settings @@ -333,10 +336,14 @@ postinstall() { echo "# ---> End added by Cnchi RebornOS Mac Installer Gnome based <--- #" >> "${file}" done - # Uncomplicated Firewall Workaround (Rafael from RebornOS) - cp /usr/share/cnchi/gufw.svg ${CN_DESTDIR}/usr/share/icons/default/gufw.svg - cp /usr/share/cnchi/gufw.png ${CN_DESTDIR}/usr/share/icons/hicolor/48x48/apps/gufw.png - cp /usr/share/cnchi/gufw.desktop ${CN_DESTDIR}/usr/share/applications/gufw.desktop + # Uncomplicated Firewall Workaround (Rafael from RebornOS) Already solved by latest package update + # cp /usr/share/cnchi/gufw.svg ${CN_DESTDIR}/usr/share/icons/default/gufw.svg + # cp /usr/share/cnchi/gufw.png ${CN_DESTDIR}/usr/share/icons/hicolor/48x48/apps/gufw.png + # cp /usr/share/cnchi/gufw.desktop ${CN_DESTDIR}/usr/share/applications/gufw.desktop + + # Start cups.service + chroot ${CN_DESTDIR} systemctl enable cups.service + # reborn-mirrorlist permission change chroot ${CN_DESTDIR} chmod 644 /etc/pacman.d/reborn-mirrorlist @@ -370,13 +377,23 @@ 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/ - echo "# ---> Added by Cnchi RebornOS Mac Installer Gnome based for Gnome Desktop <--- #" >> ${CN_DESTDIR}/etc/environment + echo "# ---> Added by Cnchi RebornOS Mac Installer Gnome based for GNOME Desktop <--- #" >> ${CN_DESTDIR}/etc/environment echo "QT_QPA_PLATFORMTHEME=qt5ct" >> ${CN_DESTDIR}/etc/environment - echo "# ---> End added by Cnchi RebornOS Mac Installer Gnome based for Gnome Desktop <--- #" >> ${CN_DESTDIR}/etc/environment + echo "# ---> End added by Cnchi RebornOS Mac Installer Gnome based for GNOME Desktop <--- #" >> ${CN_DESTDIR}/etc/environment chroot ${CN_DESTDIR} systemctl enable earlyoom 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 + 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 [[ apricity = "${CN_DESKTOP}" ]]; then @@ -405,12 +422,24 @@ postinstall() { cp /usr/share/cnchi/updating.sh ${CN_DESTDIR}/usr/bin/ chroot ${CN_DESTDIR} systemctl enable earlyoom chroot ${CN_DESTDIR} systemctl enable ufw + #==>> KDE customization removed as it does not install properly >>==# + # 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 + 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 [[ 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 +451,19 @@ postinstall() { echo "# ---> End added by Cnchi RebornOS Mac 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 +476,19 @@ postinstall() { echo "# ---> End added by Cnchi RebornOS Mac 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 +501,19 @@ postinstall() { # echo "# ---> End added by Cnchi RebornOS Mac 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 +523,19 @@ 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 + 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/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 +551,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 +569,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 Mac 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 Mac 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 +601,19 @@ if [[ xfce = "${CN_DESKTOP}" ]]; then echo "# ---> End added by Cnchi RebornOS Mac 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 +628,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 +653,19 @@ if [[ pantheon = "${CN_DESKTOP}" ]]; then echo "# ---> End added by Cnchi RebornOS Mac 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 +678,14 @@ fi # echo "# ---> End added by Cnchi RebornOS Mac 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/Cnchi/reborn-mirrorlist b/Cnchi/reborn-mirrorlist index c97346e..7e3290b 100644 --- a/Cnchi/reborn-mirrorlist +++ b/Cnchi/reborn-mirrorlist @@ -2,6 +2,48 @@ # RebornOS Mirrorlist generated by Cnchi RebornOS Mac Installer Gnome based # ############################################################################# +# OSDN RebornOS Repository 1 +Server = https://mirrors.dotsrc.org/osdn/storage/g/r/re/rebornos/repo/RebornOS/ + +# OSDN RebornOS Repository 2 +Server = https://mirrors.tuna.tsinghua.edu.cn/osdn/storage/g/r/re/rebornos/repo/RebornOS/ + +# OSDN RebornOS Repository 3 +Server = https://mirrors.xtom.com.hk/osdn//storage/g/r/re/rebornos/repo/RebornOS/ + +# OSDN RebornOS Repository 4 +Server = https://mirrors.bfsu.edu.cn/osdn/storage/g/r/re/rebornos/repo/RebornOS/ + +# OSDN RebornOS Repository 5 +Server = https://mirror.liquidtelecom.com/osdn/storage/g/r/re/rebornos/repo/RebornOS/ + +# OSDN RebornOS Repository 6 +Server = https://ftp.jaist.ac.jp/pub/sourceforge.jp/storage/g/r/re/rebornos/repo/RebornOS/ + +# OSDN RebornOS Repository 7 +Server = http://ftp.halifax.rwth-aachen.de/osdn/storage/g/r/re/rebornos/repo/RebornOS/ + +# OSDN RebornOS Repository 8 +Server = http://mirroronet.pl/pub/mirrors/sourceforge.jp/storage/g/r/re/rebornos/repo/RebornOS/ + +# OSDN RebornOS Repository 9 +Server = https://ftp.acc.umu.se/mirror/osdn.net/storage/g/r/re/rebornos/repo/RebornOS/ + +# OSDN RebornOS Repository 10 +Server = http://osdn.mirror.constant.com/storage/g/r/re/rebornos/repo/RebornOS/ + +# OSDN RebornOS Repository 11 +Server = http://mirror.math.princeton.edu/pub/osdn/storage/g/r/re/rebornos/repo/RebornOS/ + +# OSDN RebornOS Repository 12 +Server = https://plug-mirror.rcac.purdue.edu/osdn/storage/g/r/re/rebornos/repo/RebornOS/ + +# OSDN RebornOS Repository 13 +Server = https://mirrors.gigenet.com/OSDN/storage/g/r/re/rebornos/repo/RebornOS/ + +# OSDN RebornOS Repository 14 +Server = https://openbsd.c3sl.ufpr.br/osdn/storage/g/r/re/rebornos/repo/RebornOS/ + # US Server Server = https://repo.rebornos.org/RebornOS/ diff --git a/Cnchi/reborn-mirrorlist2 b/Cnchi/reborn-mirrorlist2 index c97346e..7e3290b 100644 --- a/Cnchi/reborn-mirrorlist2 +++ b/Cnchi/reborn-mirrorlist2 @@ -2,6 +2,48 @@ # RebornOS Mirrorlist generated by Cnchi RebornOS Mac Installer Gnome based # ############################################################################# +# OSDN RebornOS Repository 1 +Server = https://mirrors.dotsrc.org/osdn/storage/g/r/re/rebornos/repo/RebornOS/ + +# OSDN RebornOS Repository 2 +Server = https://mirrors.tuna.tsinghua.edu.cn/osdn/storage/g/r/re/rebornos/repo/RebornOS/ + +# OSDN RebornOS Repository 3 +Server = https://mirrors.xtom.com.hk/osdn//storage/g/r/re/rebornos/repo/RebornOS/ + +# OSDN RebornOS Repository 4 +Server = https://mirrors.bfsu.edu.cn/osdn/storage/g/r/re/rebornos/repo/RebornOS/ + +# OSDN RebornOS Repository 5 +Server = https://mirror.liquidtelecom.com/osdn/storage/g/r/re/rebornos/repo/RebornOS/ + +# OSDN RebornOS Repository 6 +Server = https://ftp.jaist.ac.jp/pub/sourceforge.jp/storage/g/r/re/rebornos/repo/RebornOS/ + +# OSDN RebornOS Repository 7 +Server = http://ftp.halifax.rwth-aachen.de/osdn/storage/g/r/re/rebornos/repo/RebornOS/ + +# OSDN RebornOS Repository 8 +Server = http://mirroronet.pl/pub/mirrors/sourceforge.jp/storage/g/r/re/rebornos/repo/RebornOS/ + +# OSDN RebornOS Repository 9 +Server = https://ftp.acc.umu.se/mirror/osdn.net/storage/g/r/re/rebornos/repo/RebornOS/ + +# OSDN RebornOS Repository 10 +Server = http://osdn.mirror.constant.com/storage/g/r/re/rebornos/repo/RebornOS/ + +# OSDN RebornOS Repository 11 +Server = http://mirror.math.princeton.edu/pub/osdn/storage/g/r/re/rebornos/repo/RebornOS/ + +# OSDN RebornOS Repository 12 +Server = https://plug-mirror.rcac.purdue.edu/osdn/storage/g/r/re/rebornos/repo/RebornOS/ + +# OSDN RebornOS Repository 13 +Server = https://mirrors.gigenet.com/OSDN/storage/g/r/re/rebornos/repo/RebornOS/ + +# OSDN RebornOS Repository 14 +Server = https://openbsd.c3sl.ufpr.br/osdn/storage/g/r/re/rebornos/repo/RebornOS/ + # US Server Server = https://repo.rebornos.org/RebornOS/ diff --git a/Cnchi/rebornos.png b/Cnchi/rebornos.png new file mode 100644 index 0000000..181725b Binary files /dev/null and b/Cnchi/rebornos.png differ diff --git a/Cnchi/rebornos.svg b/Cnchi/rebornos.svg new file mode 100644 index 0000000..1b2a528 --- /dev/null +++ b/Cnchi/rebornos.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/RebornOS-Mac_screenshot-0008.png b/RebornOS-Mac_screenshot-0008.png new file mode 100644 index 0000000..7286da4 Binary files /dev/null and b/RebornOS-Mac_screenshot-0008.png differ diff --git a/airootfs/etc/reborn-mirrorlist b/airootfs/etc/reborn-mirrorlist index c97346e..7e3290b 100644 --- a/airootfs/etc/reborn-mirrorlist +++ b/airootfs/etc/reborn-mirrorlist @@ -2,6 +2,48 @@ # RebornOS Mirrorlist generated by Cnchi RebornOS Mac Installer Gnome based # ############################################################################# +# OSDN RebornOS Repository 1 +Server = https://mirrors.dotsrc.org/osdn/storage/g/r/re/rebornos/repo/RebornOS/ + +# OSDN RebornOS Repository 2 +Server = https://mirrors.tuna.tsinghua.edu.cn/osdn/storage/g/r/re/rebornos/repo/RebornOS/ + +# OSDN RebornOS Repository 3 +Server = https://mirrors.xtom.com.hk/osdn//storage/g/r/re/rebornos/repo/RebornOS/ + +# OSDN RebornOS Repository 4 +Server = https://mirrors.bfsu.edu.cn/osdn/storage/g/r/re/rebornos/repo/RebornOS/ + +# OSDN RebornOS Repository 5 +Server = https://mirror.liquidtelecom.com/osdn/storage/g/r/re/rebornos/repo/RebornOS/ + +# OSDN RebornOS Repository 6 +Server = https://ftp.jaist.ac.jp/pub/sourceforge.jp/storage/g/r/re/rebornos/repo/RebornOS/ + +# OSDN RebornOS Repository 7 +Server = http://ftp.halifax.rwth-aachen.de/osdn/storage/g/r/re/rebornos/repo/RebornOS/ + +# OSDN RebornOS Repository 8 +Server = http://mirroronet.pl/pub/mirrors/sourceforge.jp/storage/g/r/re/rebornos/repo/RebornOS/ + +# OSDN RebornOS Repository 9 +Server = https://ftp.acc.umu.se/mirror/osdn.net/storage/g/r/re/rebornos/repo/RebornOS/ + +# OSDN RebornOS Repository 10 +Server = http://osdn.mirror.constant.com/storage/g/r/re/rebornos/repo/RebornOS/ + +# OSDN RebornOS Repository 11 +Server = http://mirror.math.princeton.edu/pub/osdn/storage/g/r/re/rebornos/repo/RebornOS/ + +# OSDN RebornOS Repository 12 +Server = https://plug-mirror.rcac.purdue.edu/osdn/storage/g/r/re/rebornos/repo/RebornOS/ + +# OSDN RebornOS Repository 13 +Server = https://mirrors.gigenet.com/OSDN/storage/g/r/re/rebornos/repo/RebornOS/ + +# OSDN RebornOS Repository 14 +Server = https://openbsd.c3sl.ufpr.br/osdn/storage/g/r/re/rebornos/repo/RebornOS/ + # US Server Server = https://repo.rebornos.org/RebornOS/ diff --git a/airootfs/usr/share/pixmaps/cnchi.png b/airootfs/usr/share/pixmaps/cnchi.png index d7990c4..181725b 100644 Binary files a/airootfs/usr/share/pixmaps/cnchi.png and b/airootfs/usr/share/pixmaps/cnchi.png differ diff --git a/build.sh b/build.sh index 32b0b06..6461062 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,17 @@ 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/ +# To be used by os-release in its LOGO = braces line +cp ${script_path}/Cnchi/rebornos.png ${work_dir}/${arch}/airootfs/usr/share/cnchi/ +cp ${script_path}/Cnchi/rebornos.svg ${work_dir}/${arch}/airootfs/usr/share/cnchi/ +cp ${script_path}/Cnchi/os-release ${work_dir}/${arch}/airootfs/usr/share/cnchi/ +# Delete old mirrorlist (Arch) and add new one +rm ${work_dir}/${arch}/airootfs/etc/pacman.d/mirrorlist +cp ${script_path}/Cnchi/mirrorlist ${work_dir}/${arch}/airootfs/etc/pacman.d/ +chmod 644 ${work_dir}/${arch}/airootfs/etc/pacman.d/mirrorlist echo "DONE" echo echo "Replacing Antergos mentions with RebornOS" diff --git a/config b/config index 5f1811a..0069d82 100644 --- a/config +++ b/config @@ -4,7 +4,7 @@ CNCHI_GIT_BRANCH="0.16.21" # Not used: CNCHI_GIT_URL="https://github.com/Antergos/Cnchi/archive/${CNCHI_GIT_BRANCH}.zip" # Used: -CNCHI_REBORNOS_URL="https://repo.rebornos.org/RebornOS/sources/cnchi/0.16.21.zip" +CNCHI_REBORNOS_URL="https://osdn.net/projects/rebornos/storage/repo/RebornOS/sources/cnchi/0.16.21.zip" # iso-hotfix-utility diff --git a/gsettings/101_reborn_budgie.gschema.override b/gsettings/101_reborn_budgie.gschema.override index 4cc7c8d..19e49a9 100755 --- a/gsettings/101_reborn_budgie.gschema.override +++ b/gsettings/101_reborn_budgie.gschema.override @@ -6,7 +6,7 @@ gtk-theme='Yaru' icon-theme='Papirus' [org.gnome.shell.extensions.user-theme] -name='Yaru' +name='Yaru-dark' [org.gnome.desktop.peripherals.touchpad] natural-scroll=true @@ -40,8 +40,8 @@ allow-updates = false show-ratings = true [org.gnome.shell] -enabled-extensions=['dash-to-panel@jderose9.github.com', 'drive-menu@gnome-shell-extensions.gcampax.github.com', 'appindicatorsupport@rgcjonas.gmail.com', 'screenshot-window-sizer@gnome-shell-extensions.gcampax.github.com', 'user-theme@gnome-shell-extensions.gcampax.github.com'] -favorite-apps=['org.gnome.Nautilus.desktop', 'org.gnome.gedit.desktop', 'firefox.desktop', 'org.gnome.Software.desktop', 'gparted.desktop', 'antergos-install.desktop', 'org.gnome.Terminal.desktop', 'pamac.desktop'] +enabled-extensions=['dash-to-panel@jderose9.github.com', 'drive-menu@gnome-shell-extensions.gcampax.github.com', 'appindicatorsupport@rgcjonas.gmail.com', 'screenshot-window-sizer@gnome-shell-extensions.gcampax.github.com', 'user-theme@gnome-shell-extensions.gcampax.github.com'] +favorite-apps=['firefox.desktop', 'org.gnome.Nautilus.desktop', 'org.gnome.gedit.desktop', 'gparted.desktop', 'antergos-install.desktop', 'org.gnome.Terminal.desktop'] always-show-log-out=true [org.gnome.settings-daemon.plugins.xsettings] diff --git a/packages.both b/packages.both index e2da259..ad67811 100755 --- a/packages.both +++ b/packages.both @@ -33,14 +33,18 @@ partclone partimage ppp pptpclient -refind-efi +# refind-efi not available (change to refind): +# refind-efi +refind rp-pppoe sdparm sg3_utils smartmontools tcpdump testdisk -vim-minimal +# vim-minimal not available (change to vim): +# vim-minimal +vim vpnc wvdial xl2tpd @@ -50,10 +54,7 @@ yay base base-devel -# ===>>> Comsic packages <<<=== # -# common-cosmic-reborn -# full-macbook-base-cosmic-reborn -# graphic-cosmic-reborn +# ===>>> Cosmic packages <<<=== # rebornos-cosmic-common rebornos-cosmic-full-macbook-base rebornos-cosmic-graphic @@ -61,7 +62,6 @@ rebornos-cosmic-graphic # ===>>> GNOME install start here <<<=== # gnome -# gnome-cosmic-reborn rebornos-cosmic-gnome gdm network-manager-applet @@ -76,6 +76,9 @@ yaru-gnome-shell-theme yaru-gtk-theme yaru-icon-theme yaru-sound-theme +# For accessibility in conjunction with ORCA it is added: +espeak-ng +rebornos-logo # ===>>> VirtualBox <<<=== # @@ -83,7 +86,8 @@ yaru-sound-theme # virtualbox-guest-modules-arch --> It is no longer in the repository. Now present in the kernel. # virtualbox-guest-utils xf86-input-libinput -#xf86-input-mouse +# xf86-input-mouse has been removed from the repositories: +# xf86-input-mouse xf86-video-amdgpu xf86-video-ati xf86-video-intel @@ -118,9 +122,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 @@ -155,6 +159,8 @@ noto-fonts-cjk # ===>>> Linux-y things <<<=== # btrfs-progs +linux-macbook +linux-macbook-headers linux-api-headers mtools squashfs-tools @@ -180,7 +186,9 @@ git # ===>>> Network packages <<<=== # b43-firmware broadcom-wl-dkms -dnsutils +# dnsutils change to bind: +# dnsutils +bind netctl nss-mdns @@ -194,6 +202,7 @@ nvidia-settings # ===>>> Necessary for Cnchi. Enter Cnchi bloat! <<<=== # encfs +# In RebornOS repo (pam_encfs): pam_encfs libinput clutter