Browse Source

various modifications

balena
Micah Halter 8 months ago
parent
commit
02c322b60f
Signed by: mehalter GPG Key ID: 4224A6EA9A8CAAA8
10 changed files with 62 additions and 33 deletions
  1. +1
    -1
      scripts/.config/configs
  2. +2
    -2
      scripts/.config/folders
  3. +1
    -1
      scripts/.local/bin/pins
  4. +1
    -1
      scripts/.local/bin/tasks
  5. +0
    -3
      scripts/.local/bin/tmuxiplex
  6. +46
    -22
      scripts/.local/bin/ufetch
  7. +1
    -1
      termite/.config/termite/config
  8. +1
    -1
      tmux/.config/tmux/tmux.conf
  9. +1
    -1
      zsh/.config/zsh/aliases
  10. +8
    -0
      zsh/.zshenv

+ 1
- 1
scripts/.config/configs View File

@ -1,6 +1,6 @@
cfa $XDG_CONFIG_HOME/zsh/aliases
cfcf $XDG_CONFIG_HOME/configs
cfcv $HOME/Documents/mehalter.com/content.md
cfcv $XDG_DOCUMENTS_DIR/Documents/mehalter.com/content.md
cfe $HOME/.zshenv
cff $XDG_CONFIG_HOME/folders
cfi $XDG_CONFIG_HOME/i3/config


+ 2
- 2
scripts/.config/folders View File

@ -1,6 +1,6 @@
b -
cf ~/.config
cv ~/Documents/mehalter.com
cv ~/Documents/git/mehalter.com
d ~/Documents
D ~/Downloads
e /etc
@ -15,7 +15,7 @@ s ~/Documents/School-Work
S ~/.local/bin
u /usr
v ~/Videos
ws ~/Documents/mehalter.com
ws ~/Documents/git/mehalter.com
wp ~/Pictures/wallpapers
xd ~/.local/share
xc ~/.cache


+ 1
- 1
scripts/.local/bin/pins View File

@ -1,5 +1,5 @@
# simple pin system
pinfile=$XDG_CONFIG_HOME/pins
pinfile=${XDG_CONFIG_HOME:-$HOME/.config}/pins
alias pl='if [ -f $pinfile ]; then
while read -r pin; do
key=`awk -F "\t" '"'"'{print $1}'"'"' <<< $pin`


+ 1
- 1
scripts/.local/bin/tasks View File

@ -1,5 +1,5 @@
# simple task system
taskfile=$XDG_DATA_HOME/tasks
taskfile=${XDG_DATA_HOME:-$HOME/.local/share}/tasks
alias t='if [ -f $taskfile ]; then
count=1
while read -r task; do


+ 0
- 3
scripts/.local/bin/tmuxiplex View File

@ -34,9 +34,6 @@ if [ "$s_name" = "scratchpad" ]; then
w3_name="music"
$tmux new-window -d -t "=${s_name}" -n "${w3_name}"
$tmux split-window -d -t "=${s_name}:=${w3_name}"
$tmux resize-pane -t "=${s_name}:=${w3_name}" -D 6
$tmux send-keys -t "=${s_name}:=${w3_name}.2" "cava" Enter
$tmux send-keys -t "=${s_name}:=${w3_name}.1" "cmus" Enter
fi


+ 46
- 22
scripts/.local/bin/ufetch View File

@ -12,43 +12,67 @@ kernel="$(uname -sr)"
uptime="$(uptime -p | sed 's/up //')"
packages="$(pacman -Q | wc -l)"
shell="$(basename "${SHELL}")"
DE=$DESKTOP_SESSION
birthday="$(head -n 1 /var/log/pacman.log | grep -oP '\d{4}(-\d{2}){2}')"
birthday="$(date -d "$birthday" +'%b %d, %Y' )"
## UI DETECTION
if [ -n "${DE}" ]; then
ui="${DE}"
uitype='DE'
elif [ -n "${WM}" ]; then
ui="${WM}"
uitype='WM'
elif [ -n "${XDG_CURRENT_DESKTOP}" ]; then
ui="${XDG_CURRENT_DESKTOP}"
uitype='DE'
elif [ -n "${DESKTOP_SESSION}" ]; then
ui="${DESKTOP_SESSION}"
uitype='DE'
elif [ -f "${XINITRC:-${HOME}/.xinitrc}" ]; then
ui="$(tail -n 1 "${XINITRC:-${HOME}/.xinitrc}" | cut -d ' ' -f 2)"
uitype='WM'
elif [ -f "${HOME}/.xsession" ]; then
ui="$(tail -n 1 "${HOME}/.xsession" | cut -d ' ' -f 2)"
uitype='WM'
else
ui='unknown'
uitype='UI'
fi
## DEFINE COLORS
# probably don't change these
bc="$(tput bold)" # bold
c0="$(tput setaf 0)" # black
c1="$(tput setaf 1)" # red
c2="$(tput setaf 2)" # green
c3="$(tput setaf 3)" # yellow
c4="$(tput setaf 4)" # blue
c5="$(tput setaf 5)" # magenta
c6="$(tput setaf 6)" # cyan
c7="$(tput setaf 7)" # white
rc="$(tput sgr0)" # reset
bc="$(tput bold)" # bold
c0="$(tput setaf 0)" # black
c1="$(tput setaf 1)" # red
c2="$(tput setaf 2)" # green
c3="$(tput setaf 3)" # yellow
c4="$(tput setaf 4)" # blue
c5="$(tput setaf 5)" # magenta
c6="$(tput setaf 6)" # cyan
c7="$(tput setaf 7)" # white
rc="$(tput sgr0)" # reset
# you can change these
lc="${rc}${bc}${c6}" # labels
nc="${rc}${bc}${c6}" # user and hostname
ic="${rc}${bc}${c7}" # info
fc="${rc}${bc}${c6}" # first color
sc="${rc}${c6}" # second color
lc="${rc}${bc}${c6}" # labels
nc="${rc}${bc}${c6}" # user and hostname
ic="${rc}${bc}${c7}" # info
fc="${rc}${bc}${c6}" # first color
sc="${rc}${c6}" # second color
## OUTPUT
cat <<EOF
${fc} ${nc}${USER}${ic}@${nc}${hostname}${rc}
${fc} /\ ${lc}OS: ${ic}${os}${rc}
${fc} /^^\ ${lc}KERNEL: ${ic}${kernel}${rc}
${fc} /\ \ ${lc}UPTIME: ${ic}${uptime}${rc}
${fc} / ${sc}__ \ ${lc}BIRTHDAY: ${ic}${birthday}${rc}
${sc} / ( ) \ ${lc}PACKAGES: ${ic}${packages}${rc}
${fc} /\\ ${lc}OS: ${ic}${os}${rc}
${fc} / \\ ${lc}KERNEL: ${ic}${kernel}${rc}
${fc} /\\ \\ ${lc}UPTIME: ${ic}${uptime}${rc}
${fc} / ${sc}__ \\ ${lc}BIRTHDAY: ${ic}${birthday}${rc}
${sc} / ( ) \\ ${lc}PACKAGES: ${ic}${packages}${rc}
${sc} / __| |__\\\\ ${lc}SHELL: ${ic}${shell}${rc}
${sc} /// \\\\\ ${lc}DE: ${ic}${DE}${rc}
${sc} /.\` \`.\\ ${lc}${uitype}: ${ic}${ui}${rc}
EOF

+ 1
- 1
termite/.config/termite/config View File

@ -1,4 +1,4 @@
[options]
allow_bold = false
allow_bold = true
font = mono 9
scrollback_lines = 50000

+ 1
- 1
tmux/.config/tmux/tmux.conf View File

@ -85,7 +85,7 @@ bind -T copy-mode-vi y send-keys -X copy-pipe-and-cancel "xclip -i -f -selection
set -g message-style bg="colour0",fg="colour6"
set -g message-command-style bg="colour0",fg="colour6"
set -g pane-active-border-style fg="colour1"
set -g pane-border-style fg="colour0"
set -g pane-border-style fg="colour8"
set -g status "on"
set -g status-style "none"
set -g status-bg "colour0"


+ 1
- 1
zsh/.config/zsh/aliases View File

@ -122,7 +122,7 @@ jlactivate() {
jlenv() {
venv_dir="$1"
[ -z "$1" ] && venv_dir="env"
julia -e "using VirtualEnv; venv(\"$venv_dir\")"
julia -e "using VirtualEnv; venv(\"$venv_dir\"; $2)"
}
# git aliases


+ 8
- 0
zsh/.zshenv View File

@ -14,6 +14,14 @@ export ALTBROWSER="firefox"
export XDG_CONFIG_HOME="$HOME/.config"
export XDG_CACHE_HOME="$HOME/.cache"
export XDG_DATA_HOME="$HOME/.local/share"
export XDG_DESKTOP_DIR="$HOME/Desktop"
export XDG_DOCUMENTS_DIR="$HOME/Documents"
export XDG_DOWNLOAD_DIR="$HOME/Downloads"
export XDG_MUSIC_DIR="$HOME/Music"
export XDG_PICTURES_DIR="$HOME/Pictures"
export XDG_PUBLICSHARE_DIR="$HOME/Public"
export XDG_TEMPLATES_DIR="$HOME/Templates"
export XDG_VIDEOS_DIR="$HOME/Videos"
# set up XDG base directories
export ANDROID_SDK_HOME="$XDG_CONFIG_HOME/android"


Loading…
Cancel
Save