diff options
| -rwxr-xr-x | bin/extra/ytplay | 2 | ||||
| -rwxr-xr-x | bin/menuscripts/mpower | 2 | ||||
| -rwxr-xr-x | config/X/x11/xinitrc | 1 | ||||
| -rw-r--r-- | config/essentials/shell/aliases.sh | 4 | ||||
| -rw-r--r-- | config/essentials/shell/functions.sh | 13 | ||||
| -rw-r--r-- | config/home/.bashrc | 2 | ||||
| -rw-r--r-- | config/home/.zshenv | 8 | ||||
| -rw-r--r-- | config/theme/gtk-2.0/gtkfilechooser.ini | 6 |
8 files changed, 21 insertions, 17 deletions
diff --git a/bin/extra/ytplay b/bin/extra/ytplay index 005cc2d..d87a6f9 100755 --- a/bin/extra/ytplay +++ b/bin/extra/ytplay @@ -1,4 +1,4 @@ #!/bin/sh url="$(ytlink)" herbe "playing: $url" & -yt-dlp -S "res:1080" -o - "$url" | mpv - +yt-dlp --no-playlist -S "res:1080" -o - "$url" | mpv - diff --git a/bin/menuscripts/mpower b/bin/menuscripts/mpower index 8c1a886..cccba94 100755 --- a/bin/menuscripts/mpower +++ b/bin/menuscripts/mpower @@ -3,11 +3,11 @@ choice="$( cat <<EOF | commander -c -w 1 -y 5 poweroff suspend -hibernate reboot firmware EOF )" +# hibernate [ "$choice" = "firmware" ] && systemctl reboot --firmware-setup [ "$choice" ] && systemctl "$choice" diff --git a/config/X/x11/xinitrc b/config/X/x11/xinitrc index 441c72b..59f4a7f 100755 --- a/config/X/x11/xinitrc +++ b/config/X/x11/xinitrc @@ -39,4 +39,5 @@ slstatus & upds & eval "$(keychain --dir "$XDG_CONFIG_HOME/keychain" --eval --quiet --agents gpg,ssh)" unclutter --timeout 3 --jitter 50 -b +herbimisu & exec startdwm diff --git a/config/essentials/shell/aliases.sh b/config/essentials/shell/aliases.sh index 51bc0e6..63a6f12 100644 --- a/config/essentials/shell/aliases.sh +++ b/config/essentials/shell/aliases.sh @@ -99,7 +99,7 @@ alias doprm='dopac -Rns' alias mpkg='makepkg -si' which pikaur >/dev/null 2>&1 && alias yay='MAKEFLAGS="-j $(nproc)" pikaur' -alias yup='yay -Syu' +alias yup='yay -Syua' alias ysi='yay -Si' alias yss='yay -Ss' alias yqs='yay -Qs' @@ -276,7 +276,7 @@ alias czo='cd ~/zot/' alias cdpw='cd ${PASSWORD_STORE_DIR:-~/.password-store}' alias cdng='cd /etc/nginx' alias cdnv='cd ~/.config/nvim' -alias cdvi='cd ~/.config/vis' +alias cdvis='cd ~/.config/vis' alias cdrs='cd /srv/' alias cdv='cd ~/vids' alias god='cd "$(find . -mindepth 1 -maxdepth 1 -type d | fzf)"' diff --git a/config/essentials/shell/functions.sh b/config/essentials/shell/functions.sh index 464126b..fd2226d 100644 --- a/config/essentials/shell/functions.sh +++ b/config/essentials/shell/functions.sh @@ -168,18 +168,19 @@ function git_develop_branch() { } # gpg backup +# $1: key gpg_backup() { - # $1: option - # $2: output file (without .asc) - gpg_command() { gpg "$1" --armor > "$2".asc; } - gpg_command --export-secret-keys "private" - gpg_command --export "public" - gpg_command --export-ownertrust "trust" + key="$(gpg --list-keys --with-colons | awk -F: '/^uid/ {print $10}' |sort|uniq | fzf)" + [ "$key" ] || exit 1 + gpg --armor --export-secret-keys "$key" > private.asc + gpg --armor --export "$key" > public.asc + gpg --armor --export-ownertrust > trust.asc tar -czvf gpg_backup.tar.gz public.asc private.asc trust.asc shred -uz public.asc private.asc trust.asc } +# $1: backup tar gpg_import() { tar xf $1 diff --git a/config/home/.bashrc b/config/home/.bashrc index 149270c..c8c3a52 100644 --- a/config/home/.bashrc +++ b/config/home/.bashrc @@ -7,7 +7,7 @@ PATH=$HOME/bin:$PATH # bold="\[\033[1m\]" # reset="\[\033[0m\]" # PS1="${color1}${bold} ${color3}\\u${reset}${color3}${color4}@${color2}${bold}\\h${reset}${color3} \\w${reset} " -PS1='$ ' +PS1=' \w $ ' HISTFILE= . $HOME/.config/shell/aliases.sh . $HOME/.config/shell/functions.sh diff --git a/config/home/.zshenv b/config/home/.zshenv index 189d10b..3f6f4dc 100644 --- a/config/home/.zshenv +++ b/config/home/.zshenv @@ -1,8 +1,8 @@ #!/bin/zsh -export EDITOR="nvim" -export VISUAL="nvim" +export EDITOR="vis" +export VISUAL="vis" -export BROWSER="osurf" +export BROWSER="zen-browser" export VIEWER="zathura" export PLAYER="mpv" @@ -99,3 +99,5 @@ export PATH="$PATH:$PLAN9/bin" export SSH_ASKPASS=askpass export SSH_ASKPASS_REQUIRE=prefer + +export MAKEFLAGS="-j$(nproc)" diff --git a/config/theme/gtk-2.0/gtkfilechooser.ini b/config/theme/gtk-2.0/gtkfilechooser.ini index bfbffb9..d742688 100644 --- a/config/theme/gtk-2.0/gtkfilechooser.ini +++ b/config/theme/gtk-2.0/gtkfilechooser.ini @@ -2,10 +2,10 @@ LocationMode=path-bar ShowHidden=false ShowSizeColumn=true -GeometryX=567 -GeometryY=160 +GeometryX=158 +GeometryY=201 GeometryWidth=836 -GeometryHeight=626 +GeometryHeight=697 SortColumn=name SortOrder=ascending StartupMode=recent |