commit 2bcb652d97a67c89113860bf05c49f5ed3cefceb
parent ea987b22bfac6b19b46825d5aeaa6f9f3870b781
Author: Matthew Carlson <matt@mcarlson.xyz>
Date: Fri, 16 Jul 2021 17:03:41 -0400
switched from ash to mksh; bit more clean up
Diffstat:
14 files changed, 94 insertions(+), 76 deletions(-)
diff --git a/.config/ash/ashrc b/.config/ash/ashrc
@@ -1,9 +0,0 @@
-#!/bin/sh
-#
-# ashrc
-
-# aliasrc
-[ -f "${XDG_CONFIG_HOME:-${HOME}/.config}/sh/aliasrc" ] && . "${XDG_CONFIG_HOME:-${HOME}/.config}/sh/aliasrc"
-
-# functionrc
-[ -f "${XDG_CONFIG_HOME:-${HOME}/.config}/sh/functionrc" ] && . "${XDG_CONFIG_HOME:-${HOME}/.config}/sh/functionrc"
diff --git a/.config/mksh/mkshrc b/.config/mksh/mkshrc
@@ -0,0 +1,11 @@
+#!/bin/sh
+#
+# mkshrc
+
+export PS1=$'\033[1;34m${PWD} $ \033[0;37m'
+
+# aliasrc
+[ -f "${XDG_CONFIG_HOME:-${HOME}/.config}/sh/aliasrc" ] && . "${XDG_CONFIG_HOME:-${HOME}/.config}/sh/aliasrc"
+
+# functionrc
+[ -f "${XDG_CONFIG_HOME:-${HOME}/.config}/sh/functionrc" ] && . "${XDG_CONFIG_HOME:-${HOME}/.config}/sh/functionrc"
diff --git a/.config/sh/functionrc b/.config/sh/functionrc
@@ -2,4 +2,5 @@
#
# functionrc
+rands() { </dev/urandom tr -dc 'A-Za-z0-9!"#$%&'\''()*+,-./:;<=>?@[\]^_`{|}~' | head -c $1 ; echo ; }
shfm() { cd "$(command shfm "${@}")" ; }
diff --git a/.config/sh/profile b/.config/sh/profile
@@ -37,8 +37,9 @@ export XDG_STATE_HOME="${HOME}/.local/state/"
export XINITRC="${XDG_CONFIG_HOME:-${HOME}/.config}/x/xinitrc"
export VIMINIT="source ${XDG_CONFIG_HOME:-${HOME}/.config}/vim/vimrc"
export GNUPGHOME="${XDG_DATA_HOME:-${HOME}/.local/share}/gnupg/"
-export ENV="${XDG_CONFIG_HOME:-${HOME}/.config}/ash/ashrc"
+export ENV="${XDG_CONFIG_HOME:-${HOME}/.config}/mksh/mkshrc"
export HISTFILE=''
+export XAUTHORITY="${XDG_RUNTIME_DIR}/xauth"
# folders
export DEV_DIR="${HOME}/dev/"
@@ -50,6 +51,7 @@ export PICTURES_DIR="${HOME}/pix/"
export VIDEOS_DIR="${HOME}/vids/"
# gpg
+export GPG_TTY="$(tty)"
export GNUPG="9CC4E75365C16465FFE752C94DDBF97211D4EA31"
# colorful man pages
@@ -62,15 +64,18 @@ export LESS_TERMCAP_ue=$'\e[0m'
export LESS_TERMCAP_us=$'\e[04;38;5;146m'
# shfm opener
-export SHFM_OPENER="${HOME}/.local/bin/shfm.sh"
+export SHFM_OPENER="${HOME}/.local/bin/open.sh"
# pash
export PASH_KEYID="${GNUPG}"
-export PASH_LENGTH=16
+export PASH_LENGTH=32
export PASH_PATTERN=_A-Z-a-z-0-9
export PASH_DIR="${XDG_DATA_HOME:-${HOME}/.local/share}/pash/"
export PASH_CLIP='xclip -sel c'
export PASH_TIMEOUT=60
+# clean up
+export LESSHISTFILE=-
+
# startx
[ -z "${DISPLAY}" ] && [ "$(tty)" = /dev/tty1 ] && ssh-agent startx "${XINITRC}" &> /dev/null
diff --git a/.config/x/xinitrc b/.config/x/xinitrc
@@ -4,4 +4,4 @@
. "${XDG_CONFIG_HOME:-${HOME}/.config}/x/xprofile"
-${HOME}/.local/bin/dwm.sh
+"${WM}" >/dev/null 2>&1
diff --git a/.config/x/xresources b/.config/x/xresources
@@ -88,6 +88,16 @@ herbe.pos_y : 42
herbe.corner : 3
herbe.duration : 5
+! slock
+slock.init : col0
+slock.input : col4
+slock.failed : col1
+slock.caps : col9
+slock.failonclear : 1
+slock.message : Type password to unlock
+slock.text_color : col7
+slock.font_name : monospace:size=18
+
! st
st.font : monospace:size=18
st.font2 : monospace:size=18
diff --git a/.local/bin/dwm.sh b/.local/bin/dwm.sh
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-while true; do dwm >/dev/null 2>&1; done
diff --git a/.local/bin/open.sh b/.local/bin/open.sh
@@ -0,0 +1,58 @@
+#!/bin/sh -e
+#
+# open
+
+case "${1}" in
+ # audio
+ *.flac \
+ | *.m4a \
+ | *.mp3 \
+ | *.ogg \
+ | *.opus \
+ | *.wav)
+ "${MEDIA_PLAYER}" --no-video "${1}"
+ ;;
+
+ # document
+ *.djvu \
+ | *.epub \
+ | *.pdf)
+ "${READER}" "${1}"
+ ;;
+
+ # gif
+ *.gif)
+ "${MEDIA_PLAYER}" --loop "${1}"
+ ;;
+
+ # image
+ *.jpeg \
+ | *.jpg \
+ | *.png \
+ | *.tga \
+ | *.webp)
+ "${IMG_VIEWER}" "${1}"
+ ;;
+
+ # video
+ *.avi \
+ | *.mkv \
+ | *.mp4 \
+ | *.webm)
+ "${MEDIA_PLAYER}" "${1}"
+ ;;
+
+ # web/vector
+ *.htm \
+ | *.html \
+ | *.php \
+ | *.svg \
+ | *.xhtml)
+ "${BROWSER}" "${1}"
+ ;;
+
+ # everything else
+ *)
+ "${EDITOR:-vi}" "${1}"
+ ;;
+esac
diff --git a/.local/bin/shfm.sh b/.local/bin/shfm.sh
@@ -1,58 +0,0 @@
-#!/bin/sh -e
-#
-# shfm
-
-case "${1}" in
- # audio
- *.flac \
- | *.m4a \
- | *.mp3 \
- | *.ogg \
- | *.opus \
- | *.wav)
- "${MEDIA_PLAYER}" --no-video "${1}"
- ;;
-
- # document
- *.djvu \
- | *.epub \
- | *.pdf)
- "${READER}" "${1}"
- ;;
-
- # gif
- *.gif)
- "${MEDIA_PLAYER}" --loop "${1}"
- ;;
-
- # image
- *.jpeg \
- | *.jpg \
- | *.png \
- | *.tga \
- | *.webp)
- "${IMG_VIEWER}" "${1}"
- ;;
-
- # video
- *.avi \
- | *.mkv \
- | *.mp4 \
- | *.webm)
- "${MEDIA_PLAYER}" "${1}"
- ;;
-
- # web/vector
- *.htm \
- | *.html \
- | *.php \
- | *.svg \
- | *.xhtml)
- "${BROWSER}" "${1}"
- ;;
-
- # everything else
- *)
- "${EDITOR:-vi}" "${1}"
- ;;
-esac
diff --git a/.local/bin/wm.sh b/.local/bin/wm.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+#
+# wm
+
+while true; do "${WM}" >/dev/null 2>&1; done
diff --git a/.local/share/fonts/gnu-freefont/free-mono.otf b/.local/share/fonts/gnu-freefont/free-mono.otf
Binary files differ.
diff --git a/.local/share/fonts/gnu-freefont/free-sans.otf b/.local/share/fonts/gnu-freefont/free-sans.otf
Binary files differ.
diff --git a/.local/share/fonts/gnu-freefont/free-serif.otf b/.local/share/fonts/gnu-freefont/free-serif.otf
Binary files differ.
diff --git a/.xprofile b/.xprofile
@@ -1 +0,0 @@
-.config/x/xprofile
-\ No newline at end of file
