mirror of https://github.com/JPyke3/mbp-manjaro
Merge branch 'thanos-awesome' into 'master'
Awesome profile changes See merge request profiles-and-settings/iso-profiles!142
This commit is contained in:
Thanos Apostolou
commit
c331a55c94
|
|
@ -1,106 +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
|
||||
testdisk
|
||||
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
|
||||
|
|
@ -110,57 +42,108 @@ 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
|
||||
|
||||
###################################
|
||||
## AUR Support
|
||||
## Missing base-devel packages
|
||||
###################################
|
||||
autoconf
|
||||
automake
|
||||
binutils
|
||||
bison
|
||||
fakeroot
|
||||
flex
|
||||
gcc
|
||||
m4
|
||||
make
|
||||
patch
|
||||
pkgconf
|
||||
git
|
||||
yay
|
||||
|
||||
###################################
|
||||
## 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
|
||||
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
|
||||
>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-manjaro-notifier
|
||||
|
|
@ -1,8 +0,0 @@
|
|||
manjaro-live-skel
|
||||
mkinitcpio-nfs-utils
|
||||
nbd
|
||||
squashfs-tools
|
||||
manjaro-live-systemd
|
||||
>manjaro grub-theme-live-manjaro
|
||||
calamares
|
||||
gparted
|
||||
|
|
@ -0,0 +1 @@
|
|||
../../shared/Packages-Live
|
||||
|
|
@ -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-340xx
|
||||
>nonfree_default KERNEL-nvidia-390xx
|
||||
>nonfree_default nvidia-340xx-utils
|
||||
>nonfree_default nvidia-390xx-utils
|
||||
>nonfree_default nvidia-utils
|
||||
>nonfree_multilib lib32-catalyst-utils
|
||||
>nonfree_multilib lib32-nvidia-340xx-utils
|
||||
>nonfree_multilib lib32-nvidia-390xx-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
|
||||
|
|
@ -0,0 +1 @@
|
|||
../../shared/Packages-Mhwd
|
||||
|
|
@ -1,93 +0,0 @@
|
|||
acpi
|
||||
>i686 archlinux32-keyring
|
||||
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
|
||||
#pcmciautils
|
||||
perl
|
||||
procps-ng
|
||||
psmisc
|
||||
reiserfsprogs
|
||||
sed
|
||||
shadow
|
||||
spectre-meltdown-checker
|
||||
s-nail
|
||||
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
|
||||
#zd1211-firmware
|
||||
zsh
|
||||
|
|
@ -0,0 +1 @@
|
|||
../../shared/Packages-Root
|
||||
|
|
@ -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
|
||||
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
# useradd defaults file for ArchLinux
|
||||
# original changes by TomK
|
||||
GROUP=100
|
||||
GROUP=users
|
||||
HOME=/home
|
||||
INACTIVE=-1
|
||||
EXPIRE=
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
@ -1,26 +0,0 @@
|
|||
[H[2J
|
||||
Manjaro Live ISO (\l) - \s-\r \m
|
||||
|
||||
|
||||
\e[0m# Welcome to Manjaro #
|
||||
|
||||
|
||||
\e[34m██████████████████ ████████
|
||||
██████████████████ ████████
|
||||
██████████████████ ████████
|
||||
██████████████████ ████████
|
||||
████████ ████████
|
||||
████████ ████████ ████████
|
||||
████████ ████████ ████████
|
||||
████████ ████████ ████████
|
||||
████████ ████████ ████████
|
||||
████████ ████████ ████████
|
||||
████████ ████████ ████████
|
||||
████████ ████████ ████████
|
||||
████████ ████████ ████████
|
||||
████████ ████████ ████████
|
||||
████████ ████████ ████████\e[0m
|
||||
|
||||
|
||||
|
||||
|
||||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
@ -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
|
||||
|
||||
|
||||
|
|
@ -1 +0,0 @@
|
|||
kernel.printk = 3 3 3 3
|
||||
|
|
@ -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.
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
[General]
|
||||
theme=KvAdaptaBreathDark
|
||||
|
||||
[Applications]
|
||||
KvAdaptaBreath=calamares, Calamares
|
||||
|
|
@ -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;
|
||||
}
|
||||
|
|
@ -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
|
||||
|
|
@ -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)
|
||||
|
|
@ -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"
|
||||
]
|
||||
}
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
# This file is written by LXAppearance. Do not edit.
|
||||
[Icon Theme]
|
||||
Name=Default
|
||||
Comment=Default Cursor Theme
|
||||
Inherits=xcursor-breeze
|
||||
|
|
@ -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;
|
||||
}
|
||||
|
|
@ -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
|
||||
|
|
@ -0,0 +1,2 @@
|
|||
[Icon Theme]
|
||||
Inherits=xcursor-breeze
|
||||
|
|
@ -0,0 +1 @@
|
|||
../../shared/manjaro/live-overlay/
|
||||
|
|
@ -1 +0,0 @@
|
|||
../../../../shared/manjaro/live-overlay/etc/default
|
||||
|
|
@ -1 +0,0 @@
|
|||
../../../../shared/manjaro/live-overlay/etc/fstab
|
||||
|
|
@ -1,31 +0,0 @@
|
|||
[H[2J
|
||||
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
|
||||
|
||||
|
|
@ -1 +0,0 @@
|
|||
../../../../shared/manjaro/live-overlay/etc/pam.d
|
||||
|
|
@ -1 +0,0 @@
|
|||
../../../../shared/manjaro/live-overlay/etc/sudoers.d
|
||||
|
|
@ -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')
|
||||
|
|
|
|||
Loading…
Reference in New Issue