Merge remote-tracking branch 'upstream/master'

This commit is contained in:
fhdk 2018-05-23 15:23:38 +02:00
commit 0ebefb8014
7 changed files with 24 additions and 21 deletions

View File

@ -9,6 +9,7 @@ binutils
bison bison
>extra blueberry >extra blueberry
cinnamon-sounds cinnamon-sounds
cinnamon-translations
>extra cinnamon-wallpapers >extra cinnamon-wallpapers
>extra dconf-editor >extra dconf-editor
>extra deluge >extra deluge
@ -24,7 +25,6 @@ flex
>extra gcolor2 >extra gcolor2
>extra gimp >extra gimp
>extra git >extra git
gksu
>extra gnome-disk-utility >extra gnome-disk-utility
gnome-keyring gnome-keyring
>extra gnome-screenshot >extra gnome-screenshot
@ -119,6 +119,7 @@ screenfetch
>extra system-config-printer >extra system-config-printer
>extra terminus-font >extra terminus-font
>extra thunderbird >extra thunderbird
>extra timeshift
tree tree
ttf-bitstream-vera ttf-bitstream-vera
>extra ttf-dejavu >extra ttf-dejavu
@ -151,3 +152,4 @@ xdg-user-dirs
xorg-server xorg-server
xorg-xhost xorg-xhost
xorg-xkill xorg-xkill
zensu

View File

@ -39,7 +39,6 @@ gcc
gedit gedit
>extra gimp >extra gimp
>extra git >extra git
gksu
>extra gparted >extra gparted
>extra gst-libav >extra gst-libav
>extra gst-plugins-bad >extra gst-plugins-bad
@ -129,3 +128,4 @@ xorg-xinit
xdg-user-dirs xdg-user-dirs
xorg-xhost xorg-xhost
xorg-server xorg-server
zensu

View File

@ -30,7 +30,6 @@ gcc
gconf gconf
>extra gimp >extra gimp
>extra git >extra git
gksu
gnome-keyring gnome-keyring
>extra gparted >extra gparted
groff groff
@ -158,3 +157,4 @@ xterm
yaourt yaourt
xdg-user-dirs xdg-user-dirs
xorg-server xorg-server
zensu

View File

@ -61,7 +61,7 @@ bindsym $mod+Ctrl+a exec terminal -e 'setup'
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
bindsym $mod+Shift+F3 exec gksu pcmanfm bindsym $mod+Shift+F3 exec zensu pcmanfm
bindsym $mod+F5 exec terminal -e 'mocp' bindsym $mod+F5 exec terminal -e 'mocp'
bindsym $mod+t exec --no-startup-id pkill compton bindsym $mod+t exec --no-startup-id pkill compton
bindsym $mod+Ctrl+t exec --no-startup-id compton -b bindsym $mod+Ctrl+t exec --no-startup-id compton -b
@ -215,7 +215,6 @@ for_window [title="sudo"] floating enable border normal
for_window [class="Simple-scan"] floating enable border normal for_window [class="Simple-scan"] floating enable border normal
for_window [class="(?i)System-config-printer.py"] floating enable border normal for_window [class="(?i)System-config-printer.py"] floating enable border normal
for_window [class="Skype"] floating enable border normal for_window [class="Skype"] floating enable border normal
for_window [class="Thus"] floating enable border normal
for_window [class="Timeset-gui"] floating enable border normal for_window [class="Timeset-gui"] floating enable border normal
for_window [class="(?i)virtualbox"] floating enable border normal for_window [class="(?i)virtualbox"] floating enable border normal
for_window [class="Xfburn"] floating enable for_window [class="Xfburn"] floating enable

View File

@ -132,16 +132,18 @@ irqbalance
# Settings # Settings
manjaro-settings-manager manjaro-settings-manager
#manjaro-settings-manager-kcm manjaro-settings-manager-kcm
manjaro-settings-manager-notifier manjaro-settings-manager-notifier
#systemsettings systemsettings
#kde-gtk-config kde-gtk-config
#kgamma5 kgamma5
#kinfocenter kinfocenter
lxrandr-gtk3 kscreen
#kscreen
#kwayland-integration #kwayland-integration
#user-manager user-manager
systemd-kcm
kcm-wacomtablet
kcron
# WebDad desktop # WebDad desktop
jade-desktop-mode jade-desktop-mode

View File

@ -74,7 +74,7 @@ manjaro-wallpapers-18.0
illyria-wallpaper illyria-wallpaper
manjaro-browser-settings manjaro-browser-settings
manjaro-settings-manager-notifier manjaro-settings-manager-notifier
manjaro-gnome-assets manjaro-gnome-assets-dev
manjaro-hotfixes manjaro-hotfixes
manjaro-pulse manjaro-pulse
manjaro-hello manjaro-hello
@ -103,11 +103,11 @@ pulseaudio-ctl
pulseaudio-zeroconf pulseaudio-zeroconf
>extra simple-scan >extra simple-scan
sushi sushi
>systemd alsa-utils alsa-utils
>systemd avahi avahi
>systemd networkmanager networkmanager
>systemd ntp ntp
>systemd openssh openssh
terminus-font terminus-font
totem totem
tracker tracker
@ -117,7 +117,7 @@ ttf-droid
ttf-inconsolata ttf-inconsolata
ttf-indic-otf ttf-indic-otf
ttf-liberation ttf-liberation
>systemd usb_modeswitch usb_modeswitch
# arc-maia-icon-theme # arc-maia-icon-theme
# firefox-arc-maia-settings #disable theming since upstream no adjust the theme # firefox-arc-maia-settings #disable theming since upstream no adjust the theme
vino vino

View File

@ -6,7 +6,7 @@
# multilib="true" # multilib="true"
# use extra packages as defined in pkglist to activate a full profile # use extra packages as defined in pkglist to activate a full profile
extra="true" # extra="true"
################ install ################ ################ install ################