Merge remote-tracking branch 'upstream/master'

This commit is contained in:
fhdk 2018-04-01 14:01:35 +02:00
commit 489cf21d69
12 changed files with 51 additions and 31 deletions

View file

@ -5,9 +5,6 @@
# use multilib packages; x86_64 only # use multilib packages; x86_64 only
# multilib="true" # multilib="true"
# use extra packages as defined in pkglist to activate a full profile
extra="true"
################ install ################ ################ install ################
# default displaymanager: none # default displaymanager: none

View file

@ -5,9 +5,6 @@
# use multilib packages; x86_64 only # use multilib packages; x86_64 only
# multilib="true" # multilib="true"
# use extra packages as defined in pkglist to activate a full profile
extra="true"
################ install ################ ################ install ################
# default displaymanager: none # default displaymanager: none

View file

@ -56,7 +56,7 @@ bindsym $mod+Ctrl+m exec terminal -e 'alsamixer'
# Start Applications # Start Applications
bindsym $mod+Ctrl+b exec terminal -e 'bmenu' bindsym $mod+Ctrl+b exec terminal -e 'bmenu'
bindsym $mod+i exec sudo -E calamares bindsym $mod+i exec calamares_polkit
bindsym $mod+F2 exec palemoon bindsym $mod+F2 exec palemoon
bindsym $mod+F3 exec pcmanfm bindsym $mod+F3 exec pcmanfm
# bindsym $mod+F3 exec ranger # bindsym $mod+F3 exec ranger

View file

@ -5,9 +5,6 @@
# use multilib packages; x86_64 only # use multilib packages; x86_64 only
# multilib="true" # multilib="true"
# use extra packages as defined in pkglist to activate a full profile
extra="true"
################ install ################ ################ install ################
# default displaymanager: none # default displaymanager: none

View file

@ -45,7 +45,7 @@ networkmanager-vpnc
## terminal ## terminal
termite termite
>extra lxterminal-gtk3 >extra lxterminal
## filemanager ## filemanager
thunar-gtk3 thunar-gtk3

View file

@ -133,6 +133,7 @@ xf86-input-void
xorg-server xorg-server
xorg-twm xorg-twm
xorg-xinit xorg-xinit
>extra xf86-input-wacom #support for tablet and pen display ( wacom ecc. )
yelp yelp
ms-office-online ms-office-online

View file

@ -0,0 +1 @@
../../../../shared/manjaro/live-overlay/usr/share

View file

@ -0,0 +1 @@
../../../shared/manjaro/live-overlay/usr

View file

@ -112,23 +112,25 @@ lightdm-gtk-greeter
lightdm-gtk-greeter-settings lightdm-gtk-greeter-settings
accountsservice # Enhanced user accounts handling accountsservice # Enhanced user accounts handling
## GTK3
gtk3-classic
>multilib lib32-gtk3-classic
## XFCE Group ## XFCE Group
exo exo-gtk3
garcon garcon-gtk3
gtk-xfce-engine thunar-gtk3
thunar
thunar-volman thunar-volman
tumbler tumbler
xfce4-appfinder xfce4-appfinder-gtk3
xfce4-panel xfce4-panel-gtk3
xfce4-power-manager xfce4-power-manager-gtk3
xfce4-session xfce4-session-gtk3
xfce4-settings xfce4-settings-gtk3
xfce4-terminal xfce4-terminal
xfconf xfconf-gtk3
xfdesktop xfdesktop-gtk3
xfwm4 xfwm4-gtk3
xfwm4-themes
## XFCE Extras ## XFCE Extras
blueman blueman
@ -145,6 +147,7 @@ menulibre
orage orage
poppler-glib # tumbler - for PDF thumbnails poppler-glib # tumbler - for PDF thumbnails
thunar-archive-plugin thunar-archive-plugin
file-roller
thunar-media-tags-plugin thunar-media-tags-plugin
# >extra xfce4-artwork # >extra xfce4-artwork
xfce4-battery-plugin xfce4-battery-plugin
@ -161,7 +164,7 @@ xfce4-clipman-plugin
>extra xfce4-mpc-plugin >extra xfce4-mpc-plugin
>extra xfce4-netload-plugin >extra xfce4-netload-plugin
>extra xfce4-notes-plugin >extra xfce4-notes-plugin
xfce4-notifyd xfce4-notifyd-gtk3
xfce4-screenshooter xfce4-screenshooter
>extra xfce4-sensors-plugin >extra xfce4-sensors-plugin
>extra xfce4-smartbookmark-plugin >extra xfce4-smartbookmark-plugin
@ -172,7 +175,7 @@ xfce4-taskmanager
>extra xfce4-verve-plugin >extra xfce4-verve-plugin
>extra xfce4-wavelan-plugin >extra xfce4-wavelan-plugin
>extra xfce4-weather-plugin >extra xfce4-weather-plugin
xfce4-whiskermenu-plugin xfce4-whiskermenu-plugin-gtk3
xfce4-xkb-plugin xfce4-xkb-plugin
xfce4-pulseaudio-plugin xfce4-pulseaudio-plugin
pavucontrol pavucontrol
@ -231,8 +234,8 @@ unrar # RAR archive support
manjaro-documentation-en manjaro-documentation-en
## Settings packages ## Settings packages
>extra manjaro-xfce-settings >extra manjaro-xfce-gtk3-settings
>basic manjaro-xfce-minimal-settings >basic manjaro-xfce-gtk3-minimal-settings
manjaro-browser-settings manjaro-browser-settings
## Xorg Input Drivers ## Xorg Input Drivers

View file

@ -2,9 +2,9 @@
background = /usr/share/backgrounds/breath.png background = /usr/share/backgrounds/breath.png
font-name = Cantarell 10 font-name = Cantarell 10
xft-antialias = true xft-antialias = true
icon-theme-name = Vertex-Maia icon-theme-name = Vibrancy-Full-Dark-Teal
screensaver-timeout = 60 screensaver-timeout = 60
theme-name = Vertex-Maia theme-name = Adapta-Eta-Maia
cursor-theme-name = xcursor-breeze cursor-theme-name = xcursor-breeze
show-clock = false show-clock = false
default-user-image = #avatar-default default-user-image = #avatar-default

View file

@ -1,7 +1,7 @@
KERNEL-bbswitch KERNEL-bbswitch
KERNEL-broadcom-wl KERNEL-broadcom-wl
KERNEL-r8168 KERNEL-r8168
KERNEL-rt3562sta #KERNEL-rt3562sta
KERNEL-virtualbox-guest-modules KERNEL-virtualbox-guest-modules
libva-intel-driver libva-intel-driver
libva-mesa-driver libva-mesa-driver

View file

@ -0,0 +1,23 @@
---
componentName: manjaro
strings:
productName: Manjaro Linux
shortProductName: Manjaro
version: 18.0-alpha-1
shortVersion: 18.0a1
versionedName: Manjaro Linux 18.0-alpha-1 "Illyria"
shortVersionedName: Manjaro 18.0a1
bootloaderEntryName: Manjaro
images:
productLogo: "logo.png"
productIcon: "logo.png"
productWelcome: "languages.png"
slideshow: "show.qml"
style:
sidebarBackground: "#454948"
sidebarText: "#efefef"
sidebarTextSelect: "#9E4F5D"