From 72e42077caf9b9f961d7bc4030f623e0f3b0501a Mon Sep 17 00:00:00 2001 From: Evgeniy Alekseev Date: Thu, 26 Dec 2019 11:42:09 +0300 Subject: [PATCH] zsh cleanup --- zsh-plugins | 5 ---- zsh-plugins-server | 2 -- zsh/hash_common.zsh | 4 --- zsh/hash_desktop.zsh | 3 --- zsh/sudo_aliases_common.zsh | 13 ---------- zsh/sudo_aliases_pc.zsh | 8 +----- zsh/vimpager.zsh | 14 ----------- zsh/xrandr_e530.zsh | 48 ----------------------------------- zsh/xrandr_t440.zsh | 50 ------------------------------------- zshrc | 2 -- 10 files changed, 1 insertion(+), 148 deletions(-) delete mode 100644 zsh/hash_common.zsh delete mode 100644 zsh/hash_desktop.zsh delete mode 100644 zsh/vimpager.zsh delete mode 100644 zsh/xrandr_e530.zsh delete mode 100644 zsh/xrandr_t440.zsh diff --git a/zsh-plugins b/zsh-plugins index bfd0da3..db3e1a0 100644 --- a/zsh-plugins +++ b/zsh-plugins @@ -1,9 +1,5 @@ archive_functions.zsh -custom_rm.zsh -custom_su.zsh filetypes_aliases.zsh -hash_common.zsh -hash_desktop.zsh highlighting.zsh pacman_common.zsh pacman_test.zsh @@ -15,7 +11,6 @@ ssh-agent.zsh sudo_aliases_common.zsh sudo_aliases_pc.zsh urltools.zsh -vimpager.zsh websearch.zsh xrandr_e530.zsh xrandr_t440.zsh diff --git a/zsh-plugins-server b/zsh-plugins-server index c95a687..2829611 100644 --- a/zsh-plugins-server +++ b/zsh-plugins-server @@ -1,9 +1,7 @@ archive_functions.zsh -custom_rm.zsh highlighting.zsh prompt_server.zsh sprunge.zsh sudo_aliases_common.zsh urltools.zsh -vimpager.zsh websearch.zsh diff --git a/zsh/hash_common.zsh b/zsh/hash_common.zsh deleted file mode 100644 index 461ed8e..0000000 --- a/zsh/hash_common.zsh +++ /dev/null @@ -1,4 +0,0 @@ -# common hashs -hash -d iso="/mnt/iso" -hash -d u1="/mnt/usbdev1" -hash -d u2="/mnt/usbdev2" diff --git a/zsh/hash_desktop.zsh b/zsh/hash_desktop.zsh deleted file mode 100644 index 2f2131e..0000000 --- a/zsh/hash_desktop.zsh +++ /dev/null @@ -1,3 +0,0 @@ -# hash -hash -d global="/mnt/global" -hash -d windows="/mnt/windows" diff --git a/zsh/sudo_aliases_common.zsh b/zsh/sudo_aliases_common.zsh index 402e491..5516ddc 100644 --- a/zsh/sudo_aliases_common.zsh +++ b/zsh/sudo_aliases_common.zsh @@ -3,26 +3,13 @@ if [[ ${EUID} == 0 ]]; then alias fat32mnt='mount -t vfat -o codepage=866,iocharset=utf8,umask=000' alias synctime='{ ntpd -qg; hwclock -w; date; }' else - alias dhcpcd='sudo dhcpcd' - alias extra-i686-build='sudo extra-i686-build' - alias extra-x86_64-build='sudo extra-x86_64-build' alias fat32mnt='sudo mount -t vfat -o codepage=866,iocharset=utf8,umask=000' alias modprobe='sudo modprobe' alias mount='sudo mount' - alias multilib-build='sudo multilib-build' - alias multilib-staging-build='sudo multilib-staging-build' - alias multilib-testing-build='sudo multilib-testing-build' - alias netctl='sudo netctl' alias pacdiff='sudo pacdiff' alias rmmod='sudo rmmod' alias scat='sudo cat' alias sgrep='sudo grep' - alias staging-i686-build='sudo staging-i686-build' - alias staging-x86_64-build='sudo staging-x86_64-build' alias svim='sudo vim' - alias synctime='{ sudo ntpd -qg; sudo hwclock -w; date; }' - alias systemctl='sudo systemctl' - alias testing-i686-build='sudo testing-i686-build' - alias testing-x86_64-build='sudo testing-x86_64-build' alias umount='sudo umount' fi diff --git a/zsh/sudo_aliases_pc.zsh b/zsh/sudo_aliases_pc.zsh index f9b5254..894986d 100644 --- a/zsh/sudo_aliases_pc.zsh +++ b/zsh/sudo_aliases_pc.zsh @@ -1,12 +1,6 @@ # sudo alias if [[ ${EUID} == 0 ]]; then - alias mts_3g='eject /dev/sr1 && sleep 5 && wvdial mts3g && disown' - alias sddm='systemctl start sddm && exit' + # do nothing yet else - alias cpu='sudo cpu' - alias backlight='sudo backlight' - alias exante='sudo netctl start exante && sudo systemctl start exante-vpn && sddm' - alias mts_3g='sudo eject /dev/sr1 && sleep 5 && sudo wvdial mts3g && disown' - alias sddm='sudo systemctl start sddm && exit' alias wifi-menu='sudo wifi-menu' fi diff --git a/zsh/vimpager.zsh b/zsh/vimpager.zsh deleted file mode 100644 index fc2d398..0000000 --- a/zsh/vimpager.zsh +++ /dev/null @@ -1,14 +0,0 @@ -# use vimcat instead of cat -# till vimpager doesn't use pipe disable it -#alias cat='vimcat' - -# use vimpager instead of less -# find vimpager -if which vimpager &> /dev/null; then - export PAGER="vimpager" -else - export PAGER="$HOME/.zsh/bin/vimpager" -fi -alias less="$PAGER" -alias zless="$PAGER" - diff --git a/zsh/xrandr_e530.zsh b/zsh/xrandr_e530.zsh deleted file mode 100644 index 0e0bc3c..0000000 --- a/zsh/xrandr_e530.zsh +++ /dev/null @@ -1,48 +0,0 @@ -# xrandr functions for ThinkPad E530 -# functions to contorl xrandr -# EXAMPLE: projctl 1024x768 -projctl() { - local MONITORS="$(xrandr | grep connected | cut -d ' ' -f 1 | tr '\n' ' ')" - echo "Available monitors are: ${MONITORS}" - local FIRSTMON="LVDS1" - local SECONDMON="VGA1" - local RESOLUTION="1366x768" - until [ -z $1 ]; do - case "$1" in - "-h" | "--help" ) echo "Usage: projctl [ off/resol ] [ -o MON | --output MON ]" && return 0 ;; - "-o" | "--output" ) [ -z "$2" ] || SECONDMON="$2" && shift ;; - * ) RESOLUTION="$1" ;; - esac - shift - done - if [[ "${RESOLUTION}" == "off" ]]; then - echo "Disable ${SECONDMON}" - xrandr --output ${FIRSTMON} --mode ${RESOLUTION} --output ${SECONDMON} --off - else - echo "Using resolution: ${RESOLUTION}" - xrandr --output ${FIRSTMON} --mode ${RESOLUTION} --output ${SECONDMON} --mode ${RESOLUTION} - fi -} - -twinmon() { - local MONITORS="$(xrandr | grep connected | cut -d ' ' -f 1 | tr '\n' ' ')" - echo "Available monitors are: ${MONITORS}" - local FIRSTMON="LVDS1" - local SECONDMON="VGA1" - local MODE="on" - until [ -z $1 ]; do - case "$1" in - "-h" | "--help" ) echo "Usage: twinmon [ off ] [ -o MON | --output MON ]" && return 0 ;; - "-o" | "--output" ) [ -z "$2" ] || SECONDMON="$2" && shift ;; - "off" ) MODE="off" ;; - esac - shift - done - if [[ "${MODE}" == "off" ]]; then - echo "Disable ${SECONDMON}" - xrandr --output ${FIRSTMON} --auto --primary --output ${SECONDMON} --off - else - echo "Enable ${SECONDMON}" - xrandr --output ${FIRSTMON} --auto --primary --output ${SECONDMON} --auto --left-of ${FIRSTMON} - fi -} diff --git a/zsh/xrandr_t440.zsh b/zsh/xrandr_t440.zsh deleted file mode 100644 index fe601b4..0000000 --- a/zsh/xrandr_t440.zsh +++ /dev/null @@ -1,50 +0,0 @@ -# xrandr functions for ThinkPad T440 -# functions to contorl xrandr -# EXAMPLE: projctl 1024x768 -projctl() { - local MONITORS="$(xrandr | grep connected | cut -d ' ' -f 1 | tr '\n' ' ')" - echo "Available monitors are: ${MONITORS}" - local FIRSTMON="eDP1" - local SECONDMON="DP2" - local RESOLUTION="1600x900" - until [ -z $1 ]; do - case "$1" in - "-h" | "--help" ) echo "Usage: projctl [ off/resol ] [ -o MON | --output MON ]" && return 0 ;; - "-o" | "--output" ) [ -z "$2" ] || SECONDMON="$2" && shift ;; - * ) RESOLUTION="$1" ;; - esac - shift - done - if [[ "${RESOLUTION}" == "off" ]]; then - echo "Disable ${SECONDMON}" - xrandr --output ${FIRSTMON} --mode ${RESOLUTION} --output ${SECONDMON} --off - else - echo "Using resolution: ${RESOLUTION}" - xrandr --output ${FIRSTMON} --mode ${RESOLUTION} --output ${SECONDMON} --mode ${RESOLUTION} - fi - xinput set-prop "ELAN Touchscreen" 140 $(get-coord-matrix.py) -} - -twinmon() { - local MONITORS="$(xrandr | grep connected | cut -d ' ' -f 1 | tr '\n' ' ')" - echo "Available monitors are: ${MONITORS}" - local FIRSTMON="eDP1" - local SECONDMON="DP2" - local MODE="on" - until [ -z $1 ]; do - case "$1" in - "-h" | "--help" ) echo "Usage: twinmon [ off ] [ -o MON | --output MON ]" && return 0 ;; - "-o" | "--output" ) [ -z "$2" ] || SECONDMON="$2" && shift ;; - "off" ) MODE="off" ;; - esac - shift - done - if [[ "${MODE}" == "off" ]]; then - echo "Disable ${SECONDMON}" - xrandr --output ${FIRSTMON} --auto --primary --output ${SECONDMON} --off - else - echo "Enable ${SECONDMON}" - xrandr --output ${FIRSTMON} --auto --primary --output ${SECONDMON} --auto --left-of ${FIRSTMON} - fi - xinput set-prop "ELAN Touchscreen" 140 $(get-coord-matrix.py) -} diff --git a/zshrc b/zshrc index b0b8911..ddb5cbe 100644 --- a/zshrc +++ b/zshrc @@ -103,8 +103,6 @@ export EDITOR="vim" export GCC_COLOR="auto" # path for _DIR in $(find "${HOME}/.local/bin" -type d 2> /dev/null); do export PATH="${_DIR}:${PATH}"; done -# fix urxvt -[[ ${TERM} =~ "rxvt-unicode-*" ]] && export TERM="xterm" # load valid ssh config /bin/rm -f "${HOME}/.ssh/config" find "${HOME}/.ssh/conf.d" -type f -name '*.conf' -exec cat {} > "${HOME}/.ssh/config" \; 2> /dev/null