-
Notifications
You must be signed in to change notification settings - Fork 40
Xfce and KDE setups #64
base: master
Are you sure you want to change the base?
Changes from 10 commits
9184355
98a739a
f0861b8
5733aa9
fe70853
810bec3
474d8b3
f6daadc
e1321f7
a068816
a438a85
bf1f20a
603d36c
43b198b
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,121 @@ | ||
# Installation | ||
crda | ||
dialog | ||
dmraid | ||
efibootmgr | ||
gparted | ||
gptfdisk | ||
grub | ||
haveged | ||
hwdetect | ||
hwinfo | ||
ntp | ||
os-prober | ||
parted | ||
efitools | ||
arch-install-scripts | ||
fakeroot | ||
|
||
|
||
# Cnchi Graphical Installer | ||
|
||
cnchi | ||
python-lxml | ||
python-mako | ||
python-mock | ||
python-requests | ||
python-bugsnag | ||
|
||
# Network | ||
|
||
b43-fwcutter | ||
broadcom-wl | ||
b43-firmware | ||
dnsutils | ||
intel-ucode | ||
ipw2100-fw | ||
ipw2200-fw | ||
linux-firmware | ||
modemmanager | ||
netctl | ||
net-tools | ||
plasma-nm | ||
networkmanager-openvpn | ||
networkmanager-pptp | ||
rp-pppoe | ||
usb_modeswitch | ||
whois | ||
wireless_tools | ||
wpa_actiond | ||
zd1211-firmware | ||
|
||
# Filesystems | ||
|
||
linux-headers | ||
btrfs-progs | ||
dosfstools | ||
f2fs-tools | ||
mtools | ||
ntfs-3g | ||
squashfs-tools | ||
xfsprogs | ||
zfs | ||
|
||
# Xorg & Graphics Drivers | ||
|
||
mesa | ||
mesa-vdpau | ||
virtualbox-guest-modules-arch | ||
virtualbox-guest-utils | ||
xf86-input-synaptics | ||
xf86-video-ati | ||
xf86-video-fbdev | ||
xf86-video-intel | ||
xf86-video-nouveau | ||
xf86-video-openchrome | ||
xf86-video-vesa | ||
xf86-video-vmware | ||
xorg-server | ||
xorg-server-utils | ||
|
||
|
||
# System Tools | ||
|
||
alsa-utils | ||
expect | ||
git | ||
gksu | ||
pamac | ||
pkgfile | ||
powerpill | ||
reflector | ||
sudo | ||
unzip | ||
unrar | ||
wget | ||
xdg-user-dirs-gtk | ||
plymouth | ||
|
||
# Fonts | ||
|
||
divehi-fonts | ||
ttf-aboriginal-sans | ||
ttf-arphic-uming | ||
ttf-baekmuk | ||
ttf-bitstream-vera | ||
ttf-dejavu | ||
ttf-freefont | ||
ttf-opensans | ||
|
||
|
||
# Desktop | ||
|
||
chromium | ||
chromium-pepper-flash | ||
antergos-kde-setup | ||
|
||
# LightDM | ||
|
||
lightdm-webkit2-greeter | ||
light-locker | ||
light-locker-settings |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -62,73 +62,50 @@ if [[ -z "$DBUS_SESSION_BUS_ADDRESS" ]]; then | |
eval `dbus-launch --sh-syntax` | ||
fi | ||
|
||
# Change keyboard layaout | ||
_current_val="$(gsettings get org.gnome.desktop.input-sources sources)" | ||
echo "${_current_val}" > /tmp/.input-sources | ||
if [[ *'[]'* = "${_current_val}" ]]; then | ||
gsettings set org.gnome.desktop.input-sources sources "[('xkb','us')]" | ||
fi | ||
|
||
# Enabled extensions | ||
_extensions="['[email protected]', '[email protected]', '[email protected]', '[email protected]', '[email protected]@gmail.com']" | ||
gsettings set org.gnome.shell enabled-extensions "${_extensions}" | ||
|
||
# Extension - Panel-OSD Settings | ||
gsettings set org.gnome.shell.extensions.panel-osd x-pos 96.0 | ||
gsettings set org.gnome.shell.extensions.panel-osd y-pos 96.0 | ||
gsettings set org.gnome.shell.extensions.panel-osd force-expand true | ||
|
||
# Extension - dash-to-dock Settings | ||
gsettings set org.gnome.shell.extensions.dash-to-dock apply-custom-theme false | ||
gsettings set org.gnome.shell.extensions.dash-to-dock opaque-background true | ||
gsettings set org.gnome.shell.extensions.dash-to-dock background-opacity 0.5 | ||
gsettings set org.gnome.shell.extensions.dash-to-dock custom-theme-running-dots false | ||
gsettings set org.gnome.shell.extensions.dash-to-dock custom-theme-shrink false | ||
|
||
# Randomly choose a default wallpaper from antergos-wallpapers | ||
DIR="/usr/share/antergos/wallpapers" | ||
PIC=$(ls ${DIR}/* | shuf -n1) | ||
|
||
gsettings set org.gnome.desktop.background picture-uri file://${PIC} | ||
|
||
# Set favorite apps | ||
gsettings set org.gnome.shell favorite-apps "['Cnchi.desktop', 'nautilus.desktop', 'chromium.desktop', 'pidgin.desktop', 'gnome-music.desktop']" | ||
|
||
# Disable screensaver | ||
gsettings set org.gnome.desktop.screensaver lock-enabled false | ||
gsettings set org.gnome.desktop.lockdown disable-lock-screen true | ||
gsettings set org.gnome.desktop.session idle-delay 0 | ||
|
||
|
||
# Set theme | ||
gsettings set org.gnome.desktop.interface gtk-theme 'Numix-Frost-Light' | ||
gsettings set org.gnome.desktop.wm.preferences theme 'Numix-Frost-Light' | ||
gsettings set org.gnome.shell.extensions.user-theme name 'Numix-Frost' | ||
|
||
# Set icon theme | ||
gsettings set org.gnome.desktop.interface icon-theme 'Numix-Square' | ||
|
||
# Not show desktop icons | ||
gsettings set org.gnome.desktop.background show-desktop-icons false | ||
|
||
# Minimize and close buttons | ||
gsettings set org.gnome.desktop.wm.preferences button-layout 'appmenu:minimize,maximize,close' | ||
|
||
# Don't Disable terminal bell (accessibility concerns) | ||
gsettings set org.gnome.desktop.wm.preferences audible-bell true | ||
|
||
# Configure touchpad | ||
gsettings set org.gnome.desktop.peripherals.touchpad tap-to-click true | ||
gsettings set org.gnome.desktop.peripherals.touchpad natural-scroll true | ||
gsettings set org.gnome.desktop.peripherals.touchpad scroll-method 'two-finger-scrolling' | ||
|
||
# Set fonts | ||
gsettings set org.gnome.desktop.interface font-name 'Open Sans 12' | ||
gsettings set org.gnome.desktop.wm.preferences titlebar-font 'Open Sans 13' | ||
gsettings set org.gnome.settings-daemon.plugins.xsettings antialiasing 'rgba' | ||
|
||
# Turn on automatic date/time | ||
gsettings set org.gnome.desktop.datetime automatic-timezone true; | ||
# Set KDE in .dmrc | ||
echo "[Desktop]" > ${CN_DESTDIR}/home/${CN_USER_NAME}/.dmrc | ||
echo "Session=kde-plasma" >> ${CN_DESTDIR}/home/${CN_USER_NAME}/.dmrc | ||
chroot ${CN_DESTDIR} chown ${CN_USER_NAME}:users /home/${CN_USER_NAME}/.dmrc | ||
|
||
# Force QtCurve to use our theme | ||
rm -R ${CN_DESTDIR}/usr/share/kstyle/themes/qtcurve.themerc | ||
|
||
# Setup user defaults | ||
chroot ${CN_DESTDIR} /usr/share/antergos-kde-setup/install.sh ${CN_USER_NAME} | ||
|
||
# Setup root defaults | ||
cp -R ${CN_DESTDIR}/etc/skel/.config ${CN_DESTDIR}/root | ||
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" | ||
|
||
# When applications transition to Qt5 they will look for config files in the standardized (XDG) locations. Create | ||
# symlinks during the transitional period until all apps are updated to use the new config file paths. | ||
link_config() { | ||
|
||
if [[ ${1} != "apps:" ]] && [[ ${1} != "" ]]; then | ||
app=${1:6} | ||
app_old="/home/${CN_USER_NAME}/.kde4/share/apps/${app}" | ||
app_new="/home/${CN_USER_NAME}/.local/share/${app}" | ||
chroot ${CN_DESTDIR} "ln -s ${app_old}${app_new}" ${CN_USER_NAME} | ||
fi | ||
if [[ ${2} != "conf:" ]] && [[ ${2} != "" ]]; then | ||
conf=${2:6} | ||
conf_old="/home/${CN_USER_NAME}/.kde4/share/config/${conf}" | ||
conf_new="/home/${CN_USER_NAME}/.config/${conf}" | ||
chroot ${CN_DESTDIR} "ln -s ${conf_old}${conf_new}" ${CN_USER_NAME} | ||
fi | ||
|
||
} | ||
|
||
#for i in konsole; do | ||
# link_config apps:${i}; | ||
#done | ||
#for i in kdeglobals; do | ||
# link_config apps: conf:kdeglobals; | ||
#done | ||
|
||
## Set default directories | ||
chroot ${CN_DESTDIR} su -c xdg-user-dirs-update ${CN_USER_NAME} | ||
|
||
} | ||
|
||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -99,7 +99,7 @@ greeter-session=lightdm-webkit2-greeter | |
#greeter-allow-guest=true | ||
#greeter-show-manual-login=false | ||
#greeter-show-remote-login=true | ||
user-session=gnome | ||
user-session=kde | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. @wyn10 I think the session is called There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. @lots0logs Ah it's plasma.desktop - well what the Sddm page says, I'll fix it all up when I get home. |
||
#allow-user-switching=true | ||
#allow-guest=true | ||
#guest-session= | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1,2 @@ | ||
[Desktop] | ||
Session=gnome | ||
Session=kde | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. |
This file was deleted.
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
[User] | ||
Language=en_US.UTF-8 | ||
XSession=kde | ||
Icon= | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. |
||
SystemAccount=false |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,78 @@ | ||
# -*- coding: utf-8 -*- | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. @wyn10 This should be a relative symlink to the file that is in the main iso config directory. So after changing directories to There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. @lots0logs I was getting a few errors from symlinks when I was running the build script, I'm going to assume I did something, and ended up just replacing them all to get the issue out of my hair. I'll go through em all and replace them back. |
||
# | ||
# CNCHI_UPDATER.pot | ||
# | ||
# Copyright © 2013-2015 Antergos | ||
# | ||
# This file is part of Cnchi. | ||
# | ||
# Cnchi is free software; you can redistribute it and/or modify | ||
# it under the terms of the GNU General Public License as published by | ||
# the Free Software Foundation; either version 2 of the License, or | ||
# (at your option) any later version. | ||
# | ||
# Cnchi is distributed in the hope that it will be useful, | ||
# but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
# GNU General Public License for more details. | ||
# | ||
# You should have received a copy of the GNU General Public License | ||
# along with Cnchi; if not, write to the Free Software | ||
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, | ||
# MA 02110-1301, USA. | ||
# | ||
msgid "" | ||
msgstr "" | ||
"Project-Id-Version: \n" | ||
"Report-Msgid-Bugs-To: \n" | ||
"POT-Creation-Date: 2015-05-05 18:37-0500\n" | ||
"PO-Revision-Date: 2015-05-05 18:38-0600\n" | ||
"Language: bin\n" | ||
"MIME-Version: 1.0\n" | ||
"Content-Type: text/plain; charset=UTF-8\n" | ||
"Content-Transfer-Encoding: 8bit\n" | ||
"Last-Translator: \n" | ||
"Language-Team: \n" | ||
"X-Generator: Poedit 1.7.5\n" | ||
|
||
#: pacman-boot:38 | ||
msgid "INSTALLER NOTICE:" | ||
msgstr "" | ||
|
||
#: pacman-boot:39 | ||
msgid "" | ||
"You must be connected to the internet to install Antergos. Click the network " | ||
"icon in the top bar to configure your connection." | ||
msgstr "" | ||
|
||
#: pacman-boot:40 | ||
msgid "Installing Updates" | ||
msgstr "" | ||
|
||
#: pacman-boot:41 | ||
msgid "Installing available updates." | ||
msgstr "" | ||
|
||
#: pacman-boot:42 | ||
msgid "Update Complete" | ||
msgstr "" | ||
|
||
#: pacman-boot:43 | ||
msgid "Updates were installed sucessfully. Starting Cnchi..." | ||
msgstr "" | ||
|
||
#: pacman-boot:44 | ||
msgid "Cnchi Automatic Updates" | ||
msgstr "" | ||
|
||
#: pacman-boot:45 | ||
msgid "Checking for available updates for the Antergos Installer." | ||
msgstr "" | ||
|
||
#: pacman-boot:46 | ||
msgid "Check was sucessful." | ||
msgstr "" | ||
|
||
#: pacman-boot:47 | ||
msgid "You have the latest version. You can proceed with your installation!" | ||
msgstr "" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@wyn10 I think that for KDE it isn't necessary to apply configuration here. The reason we do it here for GNOME is because using gsettings/dconf during the ISO build is unreliable at best (usually doesnt work at all). KDE is configured with config files in users'
/home
so we can apply those settings by placing necessary files in/etc/skel
on the ISO.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@wyn10 Also, I think that the config will actually be installed via the antergos-kde package meaning we might not have to worry about including it in the iso build itself. If you could check on that and let me know please. Thanks!