From 8573d2834f629cdb1499bb4f4b59c131023bd81e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philip=20M=C3=BCller?= Date: Sat, 18 Aug 2018 09:38:42 +0200 Subject: [PATCH 1/3] [17.1.12] update all main profiles --- manjaro/gnome/Packages-Desktop | 1 + manjaro/kde/Packages-Desktop | 1 + manjaro/xfce/Packages-Desktop | 1 + shared/Packages-Desktop | 2 +- shared/Packages-Mhwd | 3 --- 5 files changed, 4 insertions(+), 4 deletions(-) diff --git a/manjaro/gnome/Packages-Desktop b/manjaro/gnome/Packages-Desktop index b78d7c68..8cc9a392 100644 --- a/manjaro/gnome/Packages-Desktop +++ b/manjaro/gnome/Packages-Desktop @@ -1,5 +1,6 @@ adwaita-icon-theme alsa-firmware +appimagelauncher baobab dconf-editor dmidecode diff --git a/manjaro/kde/Packages-Desktop b/manjaro/kde/Packages-Desktop index 4e1681a9..64b4d0dd 100644 --- a/manjaro/kde/Packages-Desktop +++ b/manjaro/kde/Packages-Desktop @@ -238,6 +238,7 @@ poppler-data # encoding data to display PDF documents containing CJK characters >extra python-pysmbc # SMB browser support ## Applications +appimagelauncher >extra cantata dmidecode # for inxi -m output htop diff --git a/manjaro/xfce/Packages-Desktop b/manjaro/xfce/Packages-Desktop index 6cd43de9..119526ea 100644 --- a/manjaro/xfce/Packages-Desktop +++ b/manjaro/xfce/Packages-Desktop @@ -187,6 +187,7 @@ xcursor-simpleandsoft xcursor-vanilla-dmz-aa ## Applications +appimagelauncher >extra catfish dmidecode # optional dependency inxi engrampa diff --git a/shared/Packages-Desktop b/shared/Packages-Desktop index 73cdb61b..e307aa8d 100644 --- a/shared/Packages-Desktop +++ b/shared/Packages-Desktop @@ -33,7 +33,7 @@ xf86-input-elographics xf86-input-evdev xf86-input-keyboard xf86-input-libinput -xf86-input-mouse +#xf86-input-mouse xf86-input-void xorg-server-utils xorg-twm diff --git a/shared/Packages-Mhwd b/shared/Packages-Mhwd index ccee0d08..90b053e4 100644 --- a/shared/Packages-Mhwd +++ b/shared/Packages-Mhwd @@ -17,16 +17,13 @@ mesa-vdpau >nonfree_default catalyst-utils >nonfree_default KERNEL-catalyst >nonfree_default KERNEL-nvidia ->nonfree_default KERNEL-nvidia-304xx >nonfree_default KERNEL-nvidia-340xx >nonfree_default KERNEL-nvidia-390xx ->nonfree_default nvidia-304xx-utils >nonfree_default nvidia-340xx-utils >nonfree_default nvidia-390xx-utils >nonfree_default nvidia-utils >nonfree_multilib lib32-catalyst-utils >nonfree_multilib lib32-nvidia-utils ->nonfree_multilib lib32-nvidia-304xx-utils >nonfree_multilib lib32-nvidia-340xx-utils >nonfree_multilib lib32-nvidia-390xx-utils opencl-mesa From 314bdc3331776fd5f4dc6cd6f4de9d648ea58d98 Mon Sep 17 00:00:00 2001 From: ThanosApostolou Date: Wed, 22 Aug 2018 15:01:32 +0300 Subject: [PATCH 2/3] add awesome changes from master --- community/awesome/Packages-Desktop | 268 ++++++++---------- community/awesome/Packages-Live | 12 +- community/awesome/Packages-Mhwd | 51 +--- community/awesome/Packages-Root | 91 +----- .../etc/X11/xorg.conf.d/30-touchpad.conf | 10 - .../desktop-overlay/etc/default/useradd | 2 +- .../awesome/desktop-overlay/etc/environment | 7 - community/awesome/desktop-overlay/etc/issue | 26 -- .../etc/lightdm/slick-greeter.conf | 2 +- community/awesome/desktop-overlay/etc/profile | 31 -- .../awesome/desktop-overlay/etc/skel/.zshrc | 223 --------------- .../etc/sysctl.d/20-quiet-printk.conf | 1 - .../desktop-overlay/root/.bin/scripts.txt | 1 - .../root/.config/Kvantum/kvantum.kvconfig | 5 - .../root/.config/gtk-3.0/gtk.css | 10 - .../root/.config/gtk-3.0/settings.ini | 18 -- .../root/.config/qt5ct/qt5ct.conf | 25 -- .../usr/lib/chromium/master_preferences | 36 --- .../usr/share/default/index.theme | 5 - .../desktop-overlay/usr/share/gtk-3.0/gtk.css | 10 - .../usr/share/gtk-3.0/settings.ini | 18 -- .../usr/share/icons/default/index.theme | 2 + community/awesome/live-overlay | 1 + community/awesome/live-overlay/etc/default | 1 - community/awesome/live-overlay/etc/fstab | 1 - community/awesome/live-overlay/etc/issue | 31 -- community/awesome/live-overlay/etc/pam.d | 1 - community/awesome/live-overlay/etc/sudoers.d | 1 - community/awesome/profile.conf | 55 ++-- 29 files changed, 167 insertions(+), 778 deletions(-) mode change 100644 => 120000 community/awesome/Packages-Live mode change 100644 => 120000 community/awesome/Packages-Mhwd mode change 100644 => 120000 community/awesome/Packages-Root delete mode 100644 community/awesome/desktop-overlay/etc/X11/xorg.conf.d/30-touchpad.conf delete mode 100644 community/awesome/desktop-overlay/etc/environment delete mode 100644 community/awesome/desktop-overlay/etc/issue delete mode 100644 community/awesome/desktop-overlay/etc/profile delete mode 100644 community/awesome/desktop-overlay/etc/skel/.zshrc delete mode 100644 community/awesome/desktop-overlay/etc/sysctl.d/20-quiet-printk.conf delete mode 100644 community/awesome/desktop-overlay/root/.bin/scripts.txt delete mode 100644 community/awesome/desktop-overlay/root/.config/Kvantum/kvantum.kvconfig delete mode 100755 community/awesome/desktop-overlay/root/.config/gtk-3.0/gtk.css delete mode 100644 community/awesome/desktop-overlay/root/.config/gtk-3.0/settings.ini delete mode 100644 community/awesome/desktop-overlay/root/.config/qt5ct/qt5ct.conf delete mode 100644 community/awesome/desktop-overlay/usr/lib/chromium/master_preferences delete mode 100644 community/awesome/desktop-overlay/usr/share/default/index.theme delete mode 100755 community/awesome/desktop-overlay/usr/share/gtk-3.0/gtk.css delete mode 100644 community/awesome/desktop-overlay/usr/share/gtk-3.0/settings.ini create mode 100644 community/awesome/desktop-overlay/usr/share/icons/default/index.theme create mode 120000 community/awesome/live-overlay delete mode 120000 community/awesome/live-overlay/etc/default delete mode 120000 community/awesome/live-overlay/etc/fstab delete mode 100644 community/awesome/live-overlay/etc/issue delete mode 120000 community/awesome/live-overlay/etc/pam.d delete mode 120000 community/awesome/live-overlay/etc/sudoers.d mode change 100755 => 100644 community/awesome/profile.conf diff --git a/community/awesome/Packages-Desktop b/community/awesome/Packages-Desktop index 85d684dd..ac642cb6 100644 --- a/community/awesome/Packages-Desktop +++ b/community/awesome/Packages-Desktop @@ -1,105 +1,38 @@ -adwaita-maia-gtk3 -alsa-firmware -alsa-plugins -alsa-utils -atool -bc -bmenu -brandr -breeze-maia-icon-themes -chromium -links -clonezilla -compton -dash -dbus-x11 -dconf -delayed-hibernation -desktop-file-utils -dfc -downgrade -dunstify -feh -file-roller -mousepad -micro-manjaro -gnome-disk-utility -gtk3-classic -gtk-theme-breath -grub-theme-manjaro-dev -gufw -gvfs -hibernator -htop -light-locker -lightdm-slick-greeter -inxi -libdnet ->basic lxappearance-gtk3 -mate-polkit -maia-console -manjaro-architect -manjaro-browser-settings-native -manjaro-awesome-settings -manjaro-pulse -manjaro-zsh-config -mhwd-tui -moc ->basic mpv -ncdu -nerd-fonts-terminus +################################### +## Network +################################### +avahi +network-manager-applet networkmanager -networkmanager-dmenu networkmanager-openconnect networkmanager-openvpn networkmanager-pptp networkmanager-vpnc +nss-mdns +modemmanager +usb_modeswitch openresolv -yay -pacui -pavucontrol -perl-file-mimeinfo -poppler -ps_mem -pulseaudio-ctl -ranger -rofi -rofi-scripts -rootmenu -thunar-gtk3 -thunar-archive-plugin-gtk3 -thunar-media-tags-plugin -thunar-shares-plugin-manjaro -thunar-volman-gtk3 -tumbler -ffmpegthumbnailer -speedtest-cli -sterminal -terminus-font -thermald -tree -w3m -xcape -xcursor-breeze -xdg-su -xdg-user-dirs -xdg-utils -xf86-input-elographics -xf86-input-evdev -xf86-input-keyboard -xf86-input-libinput -xf86-input-mouse -xf86-input-void -xlogin -light -xorg-server -xorg-xinit -xorg-xprop -xorg-xsetroot -zathura-pdf-poppler -gksu -zsh-completions +################################### +## Libraries for Sound/Audio/Video +################################### +alsa-firmware +alsa-utils +ffmpeg +gst-libav +gst-plugins-bad +gst-plugins-base +gst-plugins-good +gst-plugins-ugly +libdvdcss +manjaro-pulse +pulseaudio-ctl +pulseaudio-zeroconf + +################################### +## Connect Packages +################################### +android-udev gvfs gvfs-afc gvfs-gphoto2 @@ -109,57 +42,104 @@ gvfs-smb mtpfs udiskie udisks2 -lightdm-settings -accountsservice -pamac -xcursor-breeze -adwaita-maia-gtk3 -breeze-maia-icon-themes -gtk-theme-breath -kvantum-manjaro -qt5ct -manjaro-backgrounds -network-manager-applet -manjaro-wallpapers-17.0 -lemonpanel -xfce4-notifyd -libnotify -pa-applet -xfce4-power-manager-gtk3 + +################################### +## Xorg +################################### +xf86-input-elographics +xf86-input-evdev +xf86-input-keyboard +xf86-input-libinput +xf86-input-mouse +xf86-input-void +xorg-server +xorg-xinit +xorg-xprop + +################################### +## Misc +################################### +gtk3-classic +lightdm +lightdm-slick-greeter +libappindicator-gtk3 +accountsservice # Enhanced user accounts +python-dbus +compton gnome-keyring -rxvt-unicode -rxvt-unicode-terminfo -highlight +grub-theme-manjaro-dev +light-locker +mate-polkit +gksu-polkit +perl-file-mimeinfo +pavucontrol +pa-applet +rofi +xcape +xdg-su +xdg-user-dirs +xdg-utils +xfce4-settings-gtk3 +xfce4-power-manager-gtk3 +manjaro-zsh-config +manjaro-browser-settings-native +manjaro-settings-manager +manjaro-wallpapers-17.0 +manjaro-awesome-settings +qt5ct +kvantum-manjaro ->extra compton-conf ->extra xfce4-settings-gtk3 ->extra vlc-nightly ->extra manjaro-settings-manager ->extra libreoffice-fresh ->extra gparted +################################### +## Apps and Optional dependencies +################################### +appimagelauncher +downgrade +inxi +i3-scrot +htop +xfce4-terminal +gufw +gnome-disk-utility +chromium +catfish +pamac +thunar-gtk3 +thunar-archive-plugin-gtk3 +thunar-volman-gtk3 +tumbler +libgsf +ffmpegthumbnailer +file-roller +mousepad +zathura-pdf-poppler +zathura-djvu +ristretto +mpv + +################################### +############## EXTRA ############## + +################################### +## AUR Support +## Missing base-devel packages +################################### +>extra base-devel +>extra git +>extra yay + +################################### +## Extra Misc and Apps +################################### +>extra compton-conf >extra gimp +>extra guvcview +>extra libreoffice-fresh +>extra lightdm-settings +>extra simple-scan >extra thunderbird ->extra cups ->extra cups-pdf ->extra cups-pk-helper ->extra ghostscript ->extra gsfonts ->extra gtk3-print-backends ->extra hplip ->extra splix ->extra gtk3-print-backends ->extra avahi ->extra manjaro-settings-samba +>extra transmission-gtk +>extra thunar-shares-plugin-gtk3 >extra blueman ->extra cups ->extra cups-pdf ->extra cups-pk-helper ->extra ghostscript ->extra gsfonts ->extra hplip ->extra splix ->extra gtk3-print-backends ->extra avahi ->extra manjaro-settings-samba ->extra blueman - +>extra pulseaudio-bluetooth +>extra manjaro-printer +>extra manjaro-settings-manager-notifier \ No newline at end of file diff --git a/community/awesome/Packages-Live b/community/awesome/Packages-Live deleted file mode 100644 index f3c57482..00000000 --- a/community/awesome/Packages-Live +++ /dev/null @@ -1,11 +0,0 @@ -manjaro-live-skel -mkinitcpio-nfs-utils -nbd ->sonar sonar-calamares-branding -squashfs-tools -manjaro-live-systemd ->sonar thus ->manjaro grub-theme-live-manjaro ->sonar grub-theme-live-sonar -calamares -gparted \ No newline at end of file diff --git a/community/awesome/Packages-Live b/community/awesome/Packages-Live new file mode 120000 index 00000000..5e66e00b --- /dev/null +++ b/community/awesome/Packages-Live @@ -0,0 +1 @@ +../../shared/Packages-Live \ No newline at end of file diff --git a/community/awesome/Packages-Mhwd b/community/awesome/Packages-Mhwd deleted file mode 100644 index 0d860119..00000000 --- a/community/awesome/Packages-Mhwd +++ /dev/null @@ -1,50 +0,0 @@ -#KERNEL-bbswitch -#KERNEL-broadcom-wl -#KERNEL-r8168 -#KERNEL-rt3562sta -KERNEL-virtualbox-guest-modules -libva-intel-driver -libva-mesa-driver -#libva-vdpau-driver -#>multilib lib32-libva-vdpau-driver -libxaw -libxpm -libxvmc -mesa-vdpau -#>multilib lib32-mesa-vdpau -#>multilib lib32-libxvmc -#>multilib lib32-primus -#>nonfree_default catalyst-utils -#>nonfree_default KERNEL-catalyst -#>nonfree_default KERNEL-nvidia -#>nonfree_default KERNEL-nvidia-304xx -#>nonfree_default KERNEL-nvidia-340xx -#>nonfree_default nvidia-304xx-utils -#>nonfree_default nvidia-340xx-utils -#>nonfree_default nvidia-utils -#>nonfree_multilib lib32-catalyst-utils -#>nonfree_multilib lib32-nvidia-304xx-utils -#>nonfree_multilib lib32-nvidia-340xx-utils -#>nonfree_multilib lib32-nvidia-utils -opencl-mesa -open-vm-tools -pangox-compat -#primus -#bumblebee -virtualbox-guest-utils -#vulkan-radeon -#>multilib lib32-vulkan-radeon -vulkan-intel -#>multilib lib32-vulkan-intel -xf86-input-vmmouse -#xf86-video-amdgpu -#xf86-video-ati -xf86-video-dummy -xf86-video-fbdev -xf86-video-intel -#xf86-video-nouveau -#xf86-video-openchrome -xf86-video-sisusb -xf86-video-vesa -xf86-video-vmware -#xf86-video-voodoo diff --git a/community/awesome/Packages-Mhwd b/community/awesome/Packages-Mhwd new file mode 120000 index 00000000..9df3d5e3 --- /dev/null +++ b/community/awesome/Packages-Mhwd @@ -0,0 +1 @@ +../../shared/Packages-Mhwd \ No newline at end of file diff --git a/community/awesome/Packages-Root b/community/awesome/Packages-Root deleted file mode 100644 index 8149d1d2..00000000 --- a/community/awesome/Packages-Root +++ /dev/null @@ -1,90 +0,0 @@ -acpi -b43-fwcutter -bash -btrfs-progs -bzip2 -coreutils -crda -dbus-x11 -dhclient -diffutils -dmraid -dnsmasq -dosfstools -e2fsprogs -ecryptfs-utils ->x86_64 efibootmgr -exfat-utils -f2fs-tools -file -filesystem -findutils -gawk -gcc-libs ->multilib gcc-libs-multilib -gettext -glibc -grep -grub -gzip -inetutils -intel-ucode -iproute2 -iptables -iputils -ipw2100-fw -ipw2200-fw -jfsutils -KERNEL -less -licenses -linux-firmware -logrotate -lsb-release -man-db -manjaro-firmware ->manjaro manjaro-release -manjaro-system -man-pages -memtest86+ -mhwd -mhwd-db -mkinitcpio-openswap -nano -ntfs-3g -os-prober -pacman -pciutils -perl -procps-ng -psmisc -reiserfsprogs -sed -shadow -s-nail ->sonar sonar-release -sudo -sysfsutils -acpid -cpupower -cronie -cryptsetup -device-mapper -dhcpcd -haveged -lvm2 -mdadm -nfs-utils -rsync -systemd-sysvcompat -tlp -wpa_supplicant -tar -texinfo -usbutils -util-linux -vi -wget -which -xfsprogs -zsh diff --git a/community/awesome/Packages-Root b/community/awesome/Packages-Root new file mode 120000 index 00000000..60cc7bde --- /dev/null +++ b/community/awesome/Packages-Root @@ -0,0 +1 @@ +../../shared/Packages-Root \ No newline at end of file diff --git a/community/awesome/desktop-overlay/etc/X11/xorg.conf.d/30-touchpad.conf b/community/awesome/desktop-overlay/etc/X11/xorg.conf.d/30-touchpad.conf deleted file mode 100644 index a66f48b6..00000000 --- a/community/awesome/desktop-overlay/etc/X11/xorg.conf.d/30-touchpad.conf +++ /dev/null @@ -1,10 +0,0 @@ - -Section "InputClass" - Identifier "libinput touchpad catchall" - MatchIsTouchpad "on" - MatchDevicePath "/dev/input/event*" - Driver "libinput" - Option "AccelSpeed" "0.3" - Option "Tapping" "on" -EndSection - diff --git a/community/awesome/desktop-overlay/etc/default/useradd b/community/awesome/desktop-overlay/etc/default/useradd index e8c35b37..30a3c3fb 100644 --- a/community/awesome/desktop-overlay/etc/default/useradd +++ b/community/awesome/desktop-overlay/etc/default/useradd @@ -1,6 +1,6 @@ # useradd defaults file for ArchLinux # original changes by TomK -GROUP=100 +GROUP=users HOME=/home INACTIVE=-1 EXPIRE= diff --git a/community/awesome/desktop-overlay/etc/environment b/community/awesome/desktop-overlay/etc/environment deleted file mode 100644 index e3d77182..00000000 --- a/community/awesome/desktop-overlay/etc/environment +++ /dev/null @@ -1,7 +0,0 @@ -# -# This file is parsed by pam_env module -# -# Syntax: simple "KEY=VAL" pairs on separate lines -# -GTK_CSD=1 -QT_QPA_PLATFORMTHEME=qt5ct \ No newline at end of file diff --git a/community/awesome/desktop-overlay/etc/issue b/community/awesome/desktop-overlay/etc/issue deleted file mode 100644 index f5f1406b..00000000 --- a/community/awesome/desktop-overlay/etc/issue +++ /dev/null @@ -1,26 +0,0 @@ - -Manjaro Live ISO (\l) - \s-\r \m - - - \e[0m# Welcome to Manjaro # - - - \e[34m██████████████████ ████████ - ██████████████████ ████████ - ██████████████████ ████████ - ██████████████████ ████████ - ████████ ████████ - ████████ ████████ ████████ - ████████ ████████ ████████ - ████████ ████████ ████████ - ████████ ████████ ████████ - ████████ ████████ ████████ - ████████ ████████ ████████ - ████████ ████████ ████████ - ████████ ████████ ████████ - ████████ ████████ ████████ - ████████ ████████ ████████\e[0m - - - - diff --git a/community/awesome/desktop-overlay/etc/lightdm/slick-greeter.conf b/community/awesome/desktop-overlay/etc/lightdm/slick-greeter.conf index 59655bf8..841b64be 100644 --- a/community/awesome/desktop-overlay/etc/lightdm/slick-greeter.conf +++ b/community/awesome/desktop-overlay/etc/lightdm/slick-greeter.conf @@ -1,5 +1,5 @@ [Greeter] background=/usr/share/backgrounds/manjarowall17_07.jpg -theme-name=Arc-Maia-Darker +theme-name=Adapta-Nokto-Maia icon-theme-name=Arc-Maia draw-grid=false diff --git a/community/awesome/desktop-overlay/etc/profile b/community/awesome/desktop-overlay/etc/profile deleted file mode 100644 index 9ac74c83..00000000 --- a/community/awesome/desktop-overlay/etc/profile +++ /dev/null @@ -1,31 +0,0 @@ -# /etc/profile - -#Set our umask -umask 022 - -# Set our default path -PATH="/usr/local/sbin:/usr/local/bin:/usr/bin:$HOME/.config/bspwm:$HOME/.config/bspwm/panel:$HOME/.bin" -export PATH -export XDG_CONFIG_HOME="$HOME/.config" -export BSPWM_SOCKET="/tmp/bspwm-socket" -export XDG_CONFIG_DIRS=/usr/etc/xdg:/etc/xdg - -# Load profiles from /etc/profile.d -if test -d /etc/profile.d/; then - for profile in /etc/profile.d/*.sh; do - test -r "$profile" && . "$profile" - done - unset profile -fi - -# Source global bash config -if test "$PS1" && test "$BASH" && test -r /etc/bash.bashrc; then - . /etc/bash.bashrc -fi - -# Termcap is outdated, old, and crusty, kill it. -unset TERMCAP - -# Man is much better than us at figuring this out -unset MANPATH -BROWSER=/usr/bin/xdg-open diff --git a/community/awesome/desktop-overlay/etc/skel/.zshrc b/community/awesome/desktop-overlay/etc/skel/.zshrc deleted file mode 100644 index 4132447d..00000000 --- a/community/awesome/desktop-overlay/etc/skel/.zshrc +++ /dev/null @@ -1,223 +0,0 @@ -## Options section -setopt correct # Auto correct mistakes -setopt extendedglob # Extended globbing. Allows using regular expressions with * -setopt nocaseglob # Case insensitive globbing -setopt rcexpandparam # Array expension with parameters -setopt nocheckjobs # Don't warn about running processes when exiting -setopt numericglobsort # Sort filenames numerically when it makes sense -setopt nobeep # No beep -setopt appendhistory # Immediately append history instead of overwriting -setopt histignorealldups # If a new command is a duplicate, remove the older one -setopt autocd # if only directory path is entered, cd there. - -zstyle ':completion:*' matcher-list 'm:{a-zA-Z}={A-Za-z}' # Case insensitive tab completion -zstyle ':completion:*' list-colors "${(s.:.)LS_COLORS}" # Colored completion (different colors for dirs/files/etc) -zstyle ':completion:*' rehash true # automatically find new executables in path -# Speed up completions -zstyle ':completion:*' accept-exact '*(N)' -zstyle ':completion:*' use-cache on -zstyle ':completion:*' cache-path ~/.zsh/cache -HISTFILE=~/.zhistory -HISTSIZE=1000 -SAVEHIST=500 -WORDCHARS=${WORDCHARS//\/[&.;]} # Don't consider certain characters part of the word - - -## Keybindings section -bindkey -e -bindkey '^[[7~' beginning-of-line # Home key -bindkey '^[[H' beginning-of-line # Home key -if [[ "${terminfo[khome]}" != "" ]]; then - bindkey "${terminfo[khome]}" beginning-of-line # [Home] - Go to beginning of line -fi -bindkey '^[[8~' end-of-line # End key -bindkey '^[[F' end-of-line # End key -if [[ "${terminfo[kend]}" != "" ]]; then - bindkey "${terminfo[kend]}" end-of-line # [End] - Go to end of line -fi -bindkey '^[[2~' overwrite-mode # Insert key -bindkey '^[[3~' delete-char # Delete key -bindkey '^[[C' forward-char # Right key -bindkey '^[[D' backward-char # Left key -bindkey '^[[5~' history-beginning-search-backward # Page up key -bindkey '^[[6~' history-beginning-search-forward # Page down key - -# Navigate words with ctrl+arrow keys -bindkey '^[Oc' forward-word # -bindkey '^[Od' backward-word # -bindkey '^[[1;5D' backward-word # -bindkey '^[[1;5C' forward-word # -bindkey '^H' backward-kill-word # delete previous word with ctrl+backspace -bindkey '^[[Z' undo # Shift+tab undo last action - -## Alias section -alias cp="cp -i" # Confirm before overwriting something -alias df='df -h' # Human-readable sizes -alias free='free -m' # Show sizes in MB -alias gitu='git add . && git commit && git push' - -# Theming section -autoload -U compinit colors zcalc -compinit -d -colors - -# enable substitution for prompt -setopt prompt_subst - -# Prompt (on left side) similar to default bash prompt, or redhat zsh prompt with colors - #PROMPT="%(!.%{$fg[red]%}[%n@%m %1~]%{$reset_color%}# .%{$fg[green]%}[%n@%m %1~]%{$reset_color%}$ " -# Maia prompt -PROMPT="%B%{$fg[cyan]%}%(4~|%-1~/.../%2~|%~)%u%b >%{$fg[cyan]%}>%B%(?.%{$fg[cyan]%}.%{$fg[red]%})>%{$reset_color%}%b " # Print some system information when the shell is first started -# Print a greeting message when shell is started -echo $USER@$HOST $(uname -srm) $(lsb_release -rcs) -## Prompt on right side: -# - shows status of git when in git repository (code adapted from https://techanic.net/2012/12/30/my_git_prompt_for_zsh.html) -# - shows exit status of previous command (if previous command finished with an error) -# - is invisible, if neither is the case - -# Modify the colors and symbols in these variables as desired. -GIT_PROMPT_SYMBOL="%{$fg[blue]%}±" # plus/minus - clean repo -GIT_PROMPT_PREFIX="%{$fg[green]%}[%{$reset_color%}" -GIT_PROMPT_SUFFIX="%{$fg[green]%}]%{$reset_color%}" -GIT_PROMPT_AHEAD="%{$fg[red]%}ANUM%{$reset_color%}" # A"NUM" - ahead by "NUM" commits -GIT_PROMPT_BEHIND="%{$fg[cyan]%}BNUM%{$reset_color%}" # B"NUM" - behind by "NUM" commits -GIT_PROMPT_MERGING="%{$fg_bold[magenta]%}⚡︎%{$reset_color%}" # lightning bolt - merge conflict -GIT_PROMPT_UNTRACKED="%{$fg_bold[red]%}●%{$reset_color%}" # red circle - untracked files -GIT_PROMPT_MODIFIED="%{$fg_bold[yellow]%}●%{$reset_color%}" # yellow circle - tracked files modified -GIT_PROMPT_STAGED="%{$fg_bold[green]%}●%{$reset_color%}" # green circle - staged changes present = ready for "git push" - -parse_git_branch() { - # Show Git branch/tag, or name-rev if on detached head - ( git symbolic-ref -q HEAD || git name-rev --name-only --no-undefined --always HEAD ) 2> /dev/null -} - -parse_git_state() { - # Show different symbols as appropriate for various Git repository states - # Compose this value via multiple conditional appends. - local GIT_STATE="" - local NUM_AHEAD="$(git log --oneline @{u}.. 2> /dev/null | wc -l | tr -d ' ')" - if [ "$NUM_AHEAD" -gt 0 ]; then - GIT_STATE=$GIT_STATE${GIT_PROMPT_AHEAD//NUM/$NUM_AHEAD} - fi - local NUM_BEHIND="$(git log --oneline ..@{u} 2> /dev/null | wc -l | tr -d ' ')" - if [ "$NUM_BEHIND" -gt 0 ]; then - GIT_STATE=$GIT_STATE${GIT_PROMPT_BEHIND//NUM/$NUM_BEHIND} - fi - local GIT_DIR="$(git rev-parse --git-dir 2> /dev/null)" - if [ -n $GIT_DIR ] && test -r $GIT_DIR/MERGE_HEAD; then - GIT_STATE=$GIT_STATE$GIT_PROMPT_MERGING - fi - if [[ -n $(git ls-files --other --exclude-standard 2> /dev/null) ]]; then - GIT_STATE=$GIT_STATE$GIT_PROMPT_UNTRACKED - fi - if ! git diff --quiet 2> /dev/null; then - GIT_STATE=$GIT_STATE$GIT_PROMPT_MODIFIED - fi - if ! git diff --cached --quiet 2> /dev/null; then - GIT_STATE=$GIT_STATE$GIT_PROMPT_STAGED - fi - if [[ -n $GIT_STATE ]]; then - echo "$GIT_PROMPT_PREFIX$GIT_STATE$GIT_PROMPT_SUFFIX" - fi -} - -git_prompt_string() { - local git_where="$(parse_git_branch)" - - # If inside a Git repository, print its branch and state - [ -n "$git_where" ] && echo "$GIT_PROMPT_SYMBOL$(parse_git_state)$GIT_PROMPT_PREFIX%{$fg[yellow]%}${git_where#(refs/heads/|tags/)}$GIT_PROMPT_SUFFIX" - - # If not inside the Git repo, print exit codes of last command (only if it failed) - [ ! -n "$git_where" ] && echo "%{$fg[red]%} %(?..[%?])" -} - -# Right prompt with exit status of previous command if not successful - #RPROMPT="%{$fg[red]%} %(?..[%?])" -# Right prompt with exit status of previous command marked with ✓ or ✗ - #RPROMPT="%(?.%{$fg[green]%}✓ %{$reset_color%}.%{$fg[red]%}✗ %{$reset_color%})" - - -# Color man pages -export LESS_TERMCAP_mb=$'\E[01;32m' -export LESS_TERMCAP_md=$'\E[01;32m' -export LESS_TERMCAP_me=$'\E[0m' -export LESS_TERMCAP_se=$'\E[0m' -export LESS_TERMCAP_so=$'\E[01;47;34m' -export LESS_TERMCAP_ue=$'\E[0m' -export LESS_TERMCAP_us=$'\E[01;36m' -export LESS=-r - - -## Plugins section: Enable fish style features -# Use syntax highlighting -source /usr/share/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh -# Use history substring search -source /usr/share/zsh/plugins/zsh-history-substring-search/zsh-history-substring-search.zsh -# bind UP and DOWN arrow keys to history substring search -zmodload zsh/terminfo -bindkey "$terminfo[kcuu1]" history-substring-search-up -bindkey "$terminfo[kcud1]" history-substring-search-down -bindkey '^[[A' history-substring-search-up -bindkey '^[[B' history-substring-search-down - -case $(basename "$(cat "/proc/$PPID/comm")") in - login) - RPROMPT="%{$fg[red]%} %(?..[%?])" - alias x='startx ~/.xinitrc' # Type name of desired desktop after x, xinitrc is configured for it - ;; - urxvt) - RPROMPT='$(git_prompt_string)' - # Use autosuggestion - source /usr/share/zsh/plugins/zsh-autosuggestions/zsh-autosuggestions.zsh - ZSH_AUTOSUGGEST_BUFFER_MAX_SIZE=20 - ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE='fg=8' - ;; - konsole|qterminal) - RPROMPT='$(git_prompt_string)' - ;; - 'tmux: server') - if $(ps -p$PPID| grep -q -e konsole -e qterminal); then - RPROMPT='$(git_prompt_string)' - else - RPROMPT='$(git_prompt_string)' - ## Base16 Shell color themes. - #possible themes: 3024, apathy, ashes, atelierdune, atelierforest, atelierhearth, - #atelierseaside, bespin, brewer, chalk, codeschool, colors, default, eighties, - #embers, flat, google, grayscale, greenscreen, harmonic16, isotope, londontube, - #marrakesh, mocha, monokai, ocean, paraiso, pop (dark only), railscasts, shapesifter, - #solarized, summerfruit, tomorrow, twilight - theme="eighties" - #Possible variants: dark and light - shade="dark" - BASE16_SHELL="/usr/share/zsh/scripts/base16-shell/base16-$theme.$shade.sh" - [[ -s $BASE16_SHELL ]] && source $BASE16_SHELL - # Use autosuggestion - source /usr/share/zsh/plugins/zsh-autosuggestions/zsh-autosuggestions.zsh - ZSH_AUTOSUGGEST_BUFFER_MAX_SIZE=20 - ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE='fg=8' - fi - ;; - *) - if $(ps -p$PPID| grep -q -e konsole -e qterminal); then - RPROMPT='$(git_prompt_string)' - else - RPROMPT='$(git_prompt_string)' - # Use autosuggestion - source /usr/share/zsh/plugins/zsh-autosuggestions/zsh-autosuggestions.zsh - ZSH_AUTOSUGGEST_BUFFER_MAX_SIZE=20 - ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE='fg=8' - fi - ;; -esac - - -#if [[ -z "$TMUX" ]] ;then -# ID="$( tmux ls | grep -vm1 attached | cut -d: -f1 )" # get the id of a deattached session -# if [[ -z "$ID" ]] ;then # if not available create a new one -# tmux new-session -# else -# tmux attach-session -t "$ID" # if available attach to it -# fi -#fi - - \ No newline at end of file diff --git a/community/awesome/desktop-overlay/etc/sysctl.d/20-quiet-printk.conf b/community/awesome/desktop-overlay/etc/sysctl.d/20-quiet-printk.conf deleted file mode 100644 index 47146d2a..00000000 --- a/community/awesome/desktop-overlay/etc/sysctl.d/20-quiet-printk.conf +++ /dev/null @@ -1 +0,0 @@ -kernel.printk = 3 3 3 3 diff --git a/community/awesome/desktop-overlay/root/.bin/scripts.txt b/community/awesome/desktop-overlay/root/.bin/scripts.txt deleted file mode 100644 index 6d392eb8..00000000 --- a/community/awesome/desktop-overlay/root/.bin/scripts.txt +++ /dev/null @@ -1 +0,0 @@ -You can put your scripts in this directory and they become available to use in dmenu and command line without specifying the full path. \ No newline at end of file diff --git a/community/awesome/desktop-overlay/root/.config/Kvantum/kvantum.kvconfig b/community/awesome/desktop-overlay/root/.config/Kvantum/kvantum.kvconfig deleted file mode 100644 index 6567ddfb..00000000 --- a/community/awesome/desktop-overlay/root/.config/Kvantum/kvantum.kvconfig +++ /dev/null @@ -1,5 +0,0 @@ -[General] -theme=KvAdaptaBreathDark - -[Applications] -KvAdaptaBreath=calamares, Calamares diff --git a/community/awesome/desktop-overlay/root/.config/gtk-3.0/gtk.css b/community/awesome/desktop-overlay/root/.config/gtk-3.0/gtk.css deleted file mode 100755 index 33c658d7..00000000 --- a/community/awesome/desktop-overlay/root/.config/gtk-3.0/gtk.css +++ /dev/null @@ -1,10 +0,0 @@ -.window-frame, .window-frame:backdrop { - box-shadow: 0 0 0 black; - border-style: none; - margin: 0; - border-radius: 0; -} - -.titlebar { - border-radius: 0; -} \ No newline at end of file diff --git a/community/awesome/desktop-overlay/root/.config/gtk-3.0/settings.ini b/community/awesome/desktop-overlay/root/.config/gtk-3.0/settings.ini deleted file mode 100644 index 6cf83bcd..00000000 --- a/community/awesome/desktop-overlay/root/.config/gtk-3.0/settings.ini +++ /dev/null @@ -1,18 +0,0 @@ -[Settings] -gtk-theme-name=Arc-Maia-Darker -gtk-icon-theme-name=Arc-Maia -gtk-font-name=xos4 Terminus 13 -gtk-cursor-theme-name=xcursor-breeze -gtk-cursor-theme-size=0 -gtk-toolbar-style=GTK_TOOLBAR_ICONS -gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR -gtk-button-images=1 -gtk-menu-images=1 -gtk-enable-event-sounds=1 -gtk-enable-input-feedback-sounds=1 -gtk-xft-antialias=0 -gtk-xft-hinting=0 -gtk-xft-hintstyle=hintmedium -gtk-application-prefer-dark-theme=1 -gtk-decoration-layout=:menu,appmenu,close -gtk-xft-rgba=rgb diff --git a/community/awesome/desktop-overlay/root/.config/qt5ct/qt5ct.conf b/community/awesome/desktop-overlay/root/.config/qt5ct/qt5ct.conf deleted file mode 100644 index 36643d3d..00000000 --- a/community/awesome/desktop-overlay/root/.config/qt5ct/qt5ct.conf +++ /dev/null @@ -1,25 +0,0 @@ -[Appearance] -color_scheme_path= -custom_palette=false -icon_theme=Breeze-Maia-Dark -style=kvantum - -[Fonts] -fixed=@Variant(\0\0\0@\0\0\0\x1a\0x\0o\0s\0\x34\0 \0T\0\x65\0r\0m\0i\0n\0u\0s@(\0\0\0\0\0\0\xff\xff\xff\xff\x5\x1\0K\x10) -general=@Variant(\0\0\0@\0\0\0\x12\0N\0o\0t\0o\0 \0S\0\x61\0n\0s@$\0\0\0\0\0\0\xff\xff\xff\xff\x5\x1\0\x32\x10) - -[Interface] -activate_item_on_single_click=1 -buttonbox_layout=3 -cursor_flash_time=1000 -dialog_buttons_have_icons=1 -double_click_interval=400 -gui_effects=General, AnimateMenu, AnimateTooltip -menus_have_icons=true -stylesheets=@Invalid() -toolbutton_style=4 -underline_shortcut=1 -wheel_scroll_lines=3 - -[SettingsWindow] -geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x2\0\0\0\0\0\0\0\0\0\x19\0\0\x3\xde\0\0\x4\x37\0\0\0\x2\0\0\0\x1b\0\0\x3\xdc\0\0\x4\x35\0\0\0\0\0\0\0\0\a\x80) diff --git a/community/awesome/desktop-overlay/usr/lib/chromium/master_preferences b/community/awesome/desktop-overlay/usr/lib/chromium/master_preferences deleted file mode 100644 index d4220cca..00000000 --- a/community/awesome/desktop-overlay/usr/lib/chromium/master_preferences +++ /dev/null @@ -1,36 +0,0 @@ -{ - "homepage" : "https://manjaro.org", - "homepage_is_newtabpage" : true, - "browser" : { - "show_home_button" : true, - "custom_chrome_frame": true - }, - "session" : { - "restore_on_startup" : 4, - "startup_urls" : [ - "https://manjaro.org" - ] - }, - "distribution": { - "import_bookmarks": false, - "import_bookmarks_from_file": "/usr/lib/chromium/bookmarks.html", - "skip_first_run_ui": true - }, - "extensions": { - "theme": { - "id": "", - "use_system": true - } - }, - "bookmark_bar" : { - "show_on_all_tabs" : false - }, - "sync_promo" : { - "show_on_first_run_allowed": false - }, - "first_run_tabs" : [ - "https://manjaro.org", - "welcome_page", - "new_tab_page" - ] -} diff --git a/community/awesome/desktop-overlay/usr/share/default/index.theme b/community/awesome/desktop-overlay/usr/share/default/index.theme deleted file mode 100644 index ab7b3068..00000000 --- a/community/awesome/desktop-overlay/usr/share/default/index.theme +++ /dev/null @@ -1,5 +0,0 @@ -# This file is written by LXAppearance. Do not edit. -[Icon Theme] -Name=Default -Comment=Default Cursor Theme -Inherits=xcursor-breeze diff --git a/community/awesome/desktop-overlay/usr/share/gtk-3.0/gtk.css b/community/awesome/desktop-overlay/usr/share/gtk-3.0/gtk.css deleted file mode 100755 index 33c658d7..00000000 --- a/community/awesome/desktop-overlay/usr/share/gtk-3.0/gtk.css +++ /dev/null @@ -1,10 +0,0 @@ -.window-frame, .window-frame:backdrop { - box-shadow: 0 0 0 black; - border-style: none; - margin: 0; - border-radius: 0; -} - -.titlebar { - border-radius: 0; -} \ No newline at end of file diff --git a/community/awesome/desktop-overlay/usr/share/gtk-3.0/settings.ini b/community/awesome/desktop-overlay/usr/share/gtk-3.0/settings.ini deleted file mode 100644 index 6cf83bcd..00000000 --- a/community/awesome/desktop-overlay/usr/share/gtk-3.0/settings.ini +++ /dev/null @@ -1,18 +0,0 @@ -[Settings] -gtk-theme-name=Arc-Maia-Darker -gtk-icon-theme-name=Arc-Maia -gtk-font-name=xos4 Terminus 13 -gtk-cursor-theme-name=xcursor-breeze -gtk-cursor-theme-size=0 -gtk-toolbar-style=GTK_TOOLBAR_ICONS -gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR -gtk-button-images=1 -gtk-menu-images=1 -gtk-enable-event-sounds=1 -gtk-enable-input-feedback-sounds=1 -gtk-xft-antialias=0 -gtk-xft-hinting=0 -gtk-xft-hintstyle=hintmedium -gtk-application-prefer-dark-theme=1 -gtk-decoration-layout=:menu,appmenu,close -gtk-xft-rgba=rgb diff --git a/community/awesome/desktop-overlay/usr/share/icons/default/index.theme b/community/awesome/desktop-overlay/usr/share/icons/default/index.theme new file mode 100644 index 00000000..1270d0d6 --- /dev/null +++ b/community/awesome/desktop-overlay/usr/share/icons/default/index.theme @@ -0,0 +1,2 @@ +[Icon Theme] +Inherits=xcursor-breeze diff --git a/community/awesome/live-overlay b/community/awesome/live-overlay new file mode 120000 index 00000000..2a57c8b5 --- /dev/null +++ b/community/awesome/live-overlay @@ -0,0 +1 @@ +../../shared/manjaro/live-overlay/ \ No newline at end of file diff --git a/community/awesome/live-overlay/etc/default b/community/awesome/live-overlay/etc/default deleted file mode 120000 index 812b9ffe..00000000 --- a/community/awesome/live-overlay/etc/default +++ /dev/null @@ -1 +0,0 @@ -../../../../shared/manjaro/live-overlay/etc/default \ No newline at end of file diff --git a/community/awesome/live-overlay/etc/fstab b/community/awesome/live-overlay/etc/fstab deleted file mode 120000 index 8750acae..00000000 --- a/community/awesome/live-overlay/etc/fstab +++ /dev/null @@ -1 +0,0 @@ -../../../../shared/manjaro/live-overlay/etc/fstab \ No newline at end of file diff --git a/community/awesome/live-overlay/etc/issue b/community/awesome/live-overlay/etc/issue deleted file mode 100644 index 2966ff5c..00000000 --- a/community/awesome/live-overlay/etc/issue +++ /dev/null @@ -1,31 +0,0 @@ - -Manjaro Live ISO (\l) - \s-\r \m - - - \e[0m# Welcome to Manjaro # - - - \e[34m██████████████████ ████████ - ██████████████████ ████████ - ██████████████████ ████████ - ██████████████████ ████████ - ████████ ████████ - ████████ ████████ ████████ - ████████ ████████ ████████ - ████████ ████████ ████████ - ████████ ████████ ████████ - ████████ ████████ ████████ - ████████ ████████ ████████ - ████████ ████████ ████████ - ████████ ████████ ████████ - ████████ ████████ ████████ - ████████ ████████ ████████\e[0m - - - login: - - \e[34muser\e[0m \e[1m\e[36mmanjaro\e[0m - \e[34mpassword\e[0m \e[1m\e[36mmanjaro\e[0m - - To launch the installer run: \e[1m\e[36msudo setup\e[0m - diff --git a/community/awesome/live-overlay/etc/pam.d b/community/awesome/live-overlay/etc/pam.d deleted file mode 120000 index 68de5965..00000000 --- a/community/awesome/live-overlay/etc/pam.d +++ /dev/null @@ -1 +0,0 @@ -../../../../shared/manjaro/live-overlay/etc/pam.d \ No newline at end of file diff --git a/community/awesome/live-overlay/etc/sudoers.d b/community/awesome/live-overlay/etc/sudoers.d deleted file mode 120000 index c784c2a2..00000000 --- a/community/awesome/live-overlay/etc/sudoers.d +++ /dev/null @@ -1 +0,0 @@ -../../../../shared/manjaro/live-overlay/etc/sudoers.d \ No newline at end of file diff --git a/community/awesome/profile.conf b/community/awesome/profile.conf old mode 100755 new mode 100644 index 4bb27e37..18f87b4e --- a/community/awesome/profile.conf +++ b/community/awesome/profile.conf @@ -2,40 +2,53 @@ ###### use this file in the profile ###### ########################################## -displaymanager="lightdm" - -nonfree_mhwd="false" - -multilib="false" +# use multilib packages; x86_64 only +# multilib="true" # use extra packages as defined in pkglist to activate a full profile extra="false" ################ install ################ +# default displaymanager: none +# supported; lightdm, sddm, gdm, lxdm, mdm +displaymanager="lightdm" + +# Set to false to disable autologin in the livecd +# autologin="true" + +# nonfree xorg drivers +# nonfree_mhwd="true" + +# possible values: grub;systemd-boot +# efi_boot_loader="grub" + # configure calamares for netinstall -netinstall="false" +# netinstall="false" -# configure calamares to use chrootcfg instead of unpackfs -chrootcfg="false" +# configure calamares to use chrootcfg instead of unpackfs; default: unpackfs +# chrootcfg="false" -# use geoip for localization -# geoip='true' +# use geoip +# geoip="true" # unset defaults to given values # names must match systemd service names -enable_systemd=('cronie' 'ModemManager' 'NetworkManager' 'tlp' 'tlp-sleep' 'systemd-fsck@' 'systemd-fsck-root' 'avahi-daemon' 'add-autologin-group' 'haveged') +# enable_systemd=('bluetooth' 'cronie' 'ModemManager' 'NetworkManager' 'org.cups.cupsd' 'tlp' 'tlp-sleep') disable_systemd=('pacman-init') # unset defaults to given values, # names must match openrc service names -# enable_openrc=('acpid' 'bluetooth' 'elogind' 'cronie' 'cupsd' 'dbus' 'syslog-ng' 'NetworkManager' 'tlp' 'tlp-sleep' 'xdm') +# enable_openrc=('acpid' 'bluetooth' 'elogind' 'cronie' 'cupsd' 'dbus' 'syslog-ng' 'NetworkManager') # disable_openrc=() -# the same workgroup name if samba is used -# smb_workgroup="" +# unset defaults to given values +# addgroups="lp,network,power,wheel" -################# livecd ################# +# the same workgroup name if samba is used +# smb_workgroup="Manjaro" + +################# live-session ################# # unset defaults to given value hostname="manjaro-awesome" @@ -46,19 +59,21 @@ hostname="manjaro-awesome" # unset defaults to given value # password="manjaro" -# the login shell +# the login shell for live image # defaults to bash login_shell=/bin/zsh -# unset defaults to given values -# addgroups="lp,network,power,wheel" +# default system shell is bash +# use /etc/defaults/useradd by supplying a space " " +# use the full path e.g. "/bin/zsh" +user_shell=/bin/zsh # unset defaults to given values # names must match systemd service names # services in enable_systemd array don't need to be listed here -# enable_systemd_live=('manjaro-live' 'mhwd-live' 'pacman-init' 'pacman-boot') +# enable_systemd_live=('manjaro-live' 'mhwd-live' 'pacman-init' 'mirrors-live') # unset defaults to given values, # names must match openrc service names # services in enable_openrc array don't need to be listed here -# enable_openrc_live=('manjaro-live' 'mhwd-live' 'pacman-init' 'pacman-boot') +# enable_openrc_live=('manjaro-live' 'mhwd-live' 'pacman-init' 'mirrors-live') From 6cdd4fd1d07a5f4e040114c5c8a676b7e45200b4 Mon Sep 17 00:00:00 2001 From: ThanosApostolou Date: Wed, 22 Aug 2018 15:12:19 +0300 Subject: [PATCH 3/3] use grub-theme-manjaro instead of grub-theme-manjaro-dev --- community/awesome/Packages-Desktop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/community/awesome/Packages-Desktop b/community/awesome/Packages-Desktop index ac642cb6..3a930d20 100644 --- a/community/awesome/Packages-Desktop +++ b/community/awesome/Packages-Desktop @@ -67,7 +67,7 @@ accountsservice # Enhanced user accounts python-dbus compton gnome-keyring -grub-theme-manjaro-dev +grub-theme-manjaro light-locker mate-polkit gksu-polkit