mirror of https://github.com/JPyke3/mbp-manjaro
Merge remote-tracking branch 'upstream/master'
This commit is contained in:
commit
e599886879
|
@ -135,7 +135,7 @@ yelp
|
|||
>extra unace
|
||||
>extra lrzip
|
||||
>extra gtk3-print-backends
|
||||
>extra libreoffice-fresh
|
||||
#>extra libreoffice-fresh
|
||||
>extra thunderbird
|
||||
>extra lollypop
|
||||
>extra empathy
|
||||
|
|
|
@ -4,6 +4,7 @@ alsa-plugins
|
|||
alsa-utils
|
||||
>extra apparmor
|
||||
arandr
|
||||
>extra bauh
|
||||
>basic i3-default-artwork
|
||||
>extra artwork-i3
|
||||
autoconf
|
||||
|
@ -26,7 +27,6 @@ fakeroot
|
|||
>extra ffmpegthumbnailer
|
||||
>extra flac
|
||||
flex
|
||||
>extra fpakman
|
||||
>extra gcc
|
||||
>extra >multilib gcc-libs-multilib
|
||||
>extra >multilib gcc-multilib
|
||||
|
@ -34,7 +34,6 @@ gcolor2
|
|||
gconf
|
||||
>extra gimp
|
||||
>extra git
|
||||
gksu-polkit
|
||||
gnome-keyring
|
||||
>extra gparted
|
||||
groff
|
||||
|
@ -141,6 +140,7 @@ vim
|
|||
>extra vlc
|
||||
volumeicon
|
||||
w3m
|
||||
>extra wallpapers-juhraya
|
||||
wmutils
|
||||
>extra xarchiver
|
||||
xautolock
|
||||
|
@ -166,3 +166,4 @@ xterm
|
|||
xdg-user-dirs
|
||||
xorg-server
|
||||
>extra yay
|
||||
zensu
|
||||
|
|
|
@ -61,7 +61,7 @@ bindsym $mod+Ctrl+a exec terminal -e 'setup'
|
|||
bindsym $mod+F2 exec palemoon
|
||||
bindsym $mod+F3 exec pcmanfm
|
||||
# bindsym $mod+F3 exec ranger
|
||||
bindsym $mod+Shift+F3 exec gksu pcmanfm
|
||||
bindsym $mod+Shift+F3 exec pcmanfm_pkexec
|
||||
bindsym $mod+F5 exec terminal -e 'mocp'
|
||||
bindsym $mod+t exec --no-startup-id pkill compton
|
||||
bindsym $mod+Ctrl+t exec --no-startup-id compton -b
|
||||
|
|
|
@ -31,7 +31,7 @@ nonfree_mhwd="true"
|
|||
|
||||
# unset defaults to given values
|
||||
# names must match systemd service names
|
||||
enable_systemd=('avahi-daemon' 'bluetooth' 'cronie' 'ModemManager' 'NetworkManager' 'org.cups.cupsd' 'tlp' 'tlp-sleep' 'ufw' 'apparmor' 'snapd.apparmor' 'snapd')
|
||||
enable_systemd=('avahi-daemon' 'bluetooth' 'cronie' 'ModemManager' 'NetworkManager' 'org.cups.cupsd' 'tlp' 'tlp-sleep' 'haveged' 'ufw' 'apparmor' 'snapd.apparmor' 'snapd')
|
||||
disable_systemd=('pacman-init')
|
||||
|
||||
# add strict snaps: strict_snaps="core core18 gnome-3-28-1804 gtk-common-themes snap-store"
|
||||
|
|
|
@ -17,6 +17,7 @@ wallpapers-2018
|
|||
mate-icon-theme
|
||||
papirus-maia-icon-theme
|
||||
matcha-gtk-theme
|
||||
kvantum-theme-matcha
|
||||
xcursor-breeze
|
||||
mate
|
||||
marco
|
||||
|
@ -43,6 +44,7 @@ pacui
|
|||
mhwd-tui
|
||||
xterm
|
||||
gparted
|
||||
squashfs-tools
|
||||
grilo-plugins
|
||||
gst-libav
|
||||
gst-plugins-bad
|
||||
|
@ -118,7 +120,7 @@ caja-open-terminal
|
|||
>extra mate-themes
|
||||
>extra mate-tweak
|
||||
>extra mate-screensaver
|
||||
>extra libreoffice-fresh
|
||||
#>extra libreoffice-fresh
|
||||
>extra thunderbird
|
||||
>extra lollypop
|
||||
>extra vlc
|
||||
|
|
|
@ -75,6 +75,7 @@ manjaro-alsa
|
|||
manjaro-artwork
|
||||
>extra wallpapers-2018
|
||||
>extra manjaro-wallpapers-18.0
|
||||
>extra wallpapers-juhraya
|
||||
illyria-wallpaper
|
||||
manjaro-browser-settings
|
||||
manjaro-settings-manager-notifier
|
||||
|
@ -112,6 +113,7 @@ pulseaudio-bluetooth
|
|||
pulseaudio-ctl
|
||||
pulseaudio-zeroconf
|
||||
>extra simple-scan
|
||||
>basic squashfs-tools
|
||||
sushi
|
||||
alsa-utils
|
||||
avahi
|
||||
|
@ -171,7 +173,7 @@ yelp
|
|||
>extra jre8-openjdk
|
||||
>extra jre8-openjdk-headless
|
||||
>extra libdvdcss
|
||||
>extra steam-manjaro
|
||||
>x86_64 >extra steam-manjaro
|
||||
>extra manjaro-printer
|
||||
>extra ffmpegthumbnailer
|
||||
>extra timeshift
|
||||
|
|
|
@ -88,7 +88,7 @@ terminus-font
|
|||
>extra ttf-droid
|
||||
|
||||
## Games
|
||||
>extra steam-manjaro
|
||||
>x86_64 >extra steam-manjaro
|
||||
|
||||
## Package management
|
||||
#appimagelauncher
|
||||
|
@ -173,6 +173,7 @@ plasma5-themes-breath # Default
|
|||
sddm-breath-theme # Default
|
||||
grub-theme-manjaro
|
||||
illyria-wallpaper
|
||||
>extra wallpapers-juhraya
|
||||
>extra wallpapers-2018
|
||||
>extra manjaro-wallpapers-18.0
|
||||
|
||||
|
@ -325,6 +326,7 @@ xdg-su
|
|||
|
||||
## Misc
|
||||
manjaro-hotfixes
|
||||
>basic squashfs-tools
|
||||
|
||||
## Flatpak support
|
||||
>extra flatpak
|
||||
|
|
|
@ -79,7 +79,7 @@ ttf-bitstream-vera # xfce4-terminal default Monospace
|
|||
>extra ttf-droid
|
||||
|
||||
## Games
|
||||
>extra steam-manjaro
|
||||
>x86_64 >extra steam-manjaro
|
||||
|
||||
## Package management
|
||||
>extra apparmor
|
||||
|
@ -184,6 +184,7 @@ pavucontrol
|
|||
## Themes
|
||||
>extra manjaro-wallpapers-18.0
|
||||
>extra wallpapers-2018
|
||||
>extra wallpapers-juhraya
|
||||
gnome-icon-theme
|
||||
gnome-themes-standard
|
||||
grub-theme-manjaro
|
||||
|
@ -275,6 +276,7 @@ xdg-su
|
|||
## Misc
|
||||
gtkhash-thunar
|
||||
manjaro-hotfixes
|
||||
>basic squashfs-tools
|
||||
|
||||
## Handshake tools
|
||||
#faucet-tool
|
||||
|
|
|
@ -61,7 +61,7 @@ bindsym $mod+Ctrl+a exec terminal -e 'setup'
|
|||
bindsym $mod+F2 exec palemoon
|
||||
bindsym $mod+F3 exec pcmanfm
|
||||
# bindsym $mod+F3 exec ranger
|
||||
bindsym $mod+Shift+F3 exec gksu pcmanfm
|
||||
bindsym $mod+Shift+F3 exec pcmanfm_pkexec
|
||||
bindsym $mod+F5 exec terminal -e 'mocp'
|
||||
bindsym $mod+t exec --no-startup-id pkill compton
|
||||
bindsym $mod+Ctrl+t exec --no-startup-id compton -b
|
||||
|
|
|
@ -142,7 +142,6 @@ blueman
|
|||
bluez-utils
|
||||
ffmpegthumbnailer # tumbler - for video thumbnails
|
||||
freetype2 # tumbler - for font thumbnails
|
||||
gksu-polkit
|
||||
gnome-keyring # fix wlan segfault
|
||||
libgsf # tumbler - for ODF thumbnails
|
||||
libopenraw # tumbler - for RAW thumbnails
|
||||
|
@ -184,6 +183,7 @@ xfce4-whiskermenu-plugin-gtk3
|
|||
xfce4-xkb-plugin
|
||||
xfce4-pulseaudio-plugin
|
||||
pavucontrol
|
||||
zensu
|
||||
|
||||
## Themes
|
||||
>extra manjaro-wallpapers-18.0
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
calamares-git
|
||||
calamares
|
||||
>manjaro grub-theme-live-manjaro
|
||||
gsmartcontrol
|
||||
manjaro-architect
|
||||
|
@ -6,5 +6,4 @@ manjaro-live-skel
|
|||
manjaro-live-systemd
|
||||
mkinitcpio-nfs-utils
|
||||
nbd
|
||||
squashfs-tools
|
||||
clonezilla
|
||||
|
|
|
@ -24,12 +24,12 @@ mesa-vdpau
|
|||
>multilib lib32-primus
|
||||
#>nonfree_default catalyst-utils
|
||||
#>nonfree_default KERNEL-catalyst
|
||||
>nonfree_default KERNEL-nvidia-418xx
|
||||
>nonfree_default KERNEL-nvidia-340xx
|
||||
>nonfree_default KERNEL-nvidia-390xx
|
||||
>nonfree_x86_64 KERNEL-nvidia-418xx
|
||||
>nonfree_default nvidia-340xx-utils
|
||||
>nonfree_default nvidia-390xx-utils
|
||||
>nonfree_default nvidia-418xx-utils
|
||||
>nonfree_x86_64 nvidia-418xx-utils
|
||||
#>nonfree_multilib lib32-catalyst-utils
|
||||
>nonfree_multilib lib32-nvidia-418xx-utils
|
||||
>nonfree_multilib lib32-nvidia-340xx-utils
|
||||
|
|
Loading…
Reference in New Issue