diff --git a/.config/shell/aliases b/.config/shell/aliases index 73a6877..57398ff 100644 --- a/.config/shell/aliases +++ b/.config/shell/aliases @@ -153,19 +153,12 @@ alias rce='reset && clear && exec zsh' # find pretty much any file, quickly alias fds='fd --no-ignore --hidden --exclude /run --exclude /mnt' -# smart plug things -export SMART_PLUG_IP='192.168.1.250' -alias \ - light='tplink_smartplug.py -t $SMART_PLUG_IP -c' \ - lion='light on' \ - loff='light off' \ - # Common ls aliases alias \ l='ls' \ - la='ls -Ah' \ + la='ls -ah' \ ll='ls -lh' \ - lla='ls -lAh' \ + lla='ls -lah' \ # <<< # vim:fdm=marker:fmr=>>>,<<<:fdl=1:et:ft=bash:sw=3:ts=3 diff --git a/.config/shell/bin/copy-path b/.config/shell/bin/copy-path index b33d783..2810167 100755 --- a/.config/shell/bin/copy-path +++ b/.config/shell/bin/copy-path @@ -9,4 +9,4 @@ fi for f; do realpath "$f" -done | $CLIPBOARD_MANAGER +done | sed -z '$ s/\n$//' | $CLIPBOARD_MANAGER diff --git a/.config/shell/bin/how b/.config/shell/bin/how new file mode 100755 index 0000000..b9a2d8a --- /dev/null +++ b/.config/shell/bin/how @@ -0,0 +1,3 @@ +#!/bin/sh +test $# -gt 0 && where="$1" && shift +IFS='+' eval 'curl "https://cht.sh/${where:-}/$*"' diff --git a/.config/shell/bin/vvc b/.config/shell/bin/vvc new file mode 100755 index 0000000..5581dfc --- /dev/null +++ b/.config/shell/bin/vvc @@ -0,0 +1,4 @@ +#!/bin/sh + +cd "$(dirname "$(realpath "$1")")" +eval "$EDITOR" "$@" diff --git a/.config/shell/local/env b/.config/shell/local/env new file mode 100644 index 0000000..8129a59 --- /dev/null +++ b/.config/shell/local/env @@ -0,0 +1,4 @@ +export REPOS_TO_UPDATE="/home/blake/Documents/pwp" +export PATH="$HOME/.local/share/bottles/runners/wine-ge-proton8-14/bin:$PATH" + +# vim:ft=bash diff --git a/.config/shell/p10k/colorful-angular.p10k.zsh b/.config/shell/p10k/colorful-angular.p10k.zsh index ffbccaf..410f3f2 100644 --- a/.config/shell/p10k/colorful-angular.p10k.zsh +++ b/.config/shell/p10k/colorful-angular.p10k.zsh @@ -95,7 +95,7 @@ todo # todo items (https://github.com/todotxt/todo.txt-cli) timewarrior # timewarrior tracking status (https://timewarrior.net/) taskwarrior # taskwarrior task count (https://taskwarrior.org/) - # time # current time + time # current time # ip # ip address and bandwidth usage for a specified network interface # public_ip # public IP address # proxy # system-wide http/https/ftp proxy @@ -1612,7 +1612,7 @@ typeset -g POWERLEVEL9K_TIME_FOREGROUND=0 typeset -g POWERLEVEL9K_TIME_BACKGROUND=7 # Format for the current time: 09:51:02. See `man 3 strftime`. - typeset -g POWERLEVEL9K_TIME_FORMAT='%D{%H:%M:%S}' + typeset -g POWERLEVEL9K_TIME_FORMAT='%D{%l:%M %p}' # If set to true, time will update when you hit enter. This way prompts for the past # commands will contain the start times of their commands as opposed to the default # behavior where they contain the end times of their preceding commands. diff --git a/.gitconfig b/.gitconfig index bedd732..c586fd7 100644 --- a/.gitconfig +++ b/.gitconfig @@ -33,10 +33,11 @@ pl = pull ps = push psf = push -f + psnew = "! git push --set-upstream origin \"$(git branch --show-current)\"" rem = remote rest = restore s = status - st = status + st = stash sub = submodule subup = sub update --init --recursive sw = switch diff --git a/.local/bin/dotfiles-install.sh b/.local/bin/dotfiles-install.sh index 0ec62d7..a0f9f7a 100755 --- a/.local/bin/dotfiles-install.sh +++ b/.local/bin/dotfiles-install.sh @@ -5,7 +5,7 @@ set -eu DOTFILES_REPO_DIR="$HOME/git/dotfiles" -DOTFILES_REPO_URL="https://git.blakenorth.net/dotfiles" +DOTFILES_REPO_URL="https://git.blake.ly/PowerUser/dotfiles" DOTFILES_BACKUP_DIR="$HOME/.dotfiles-backup_$(date +'%Y-%m-%d_%H:%m:%S')" printf "\n Installing dotfiles from %s\n\n" "$DOTFILES_REPO_URL" diff --git a/.zshrc b/.zshrc index 6d42f7f..ada18a8 100644 --- a/.zshrc +++ b/.zshrc @@ -109,8 +109,8 @@ Set the SKIP_P10K_THEME environment variable to 'true' or make a configuration t ## ZSH Options >>> { - # setopt correct # Auto correct mistakes - setopt extendedglob # Extended globbing. Allows using regular expressions with * + # setopt correct # Auto correct mistakes + setopt noextendedglob # Extended globbing. Allows using regular expressions with * [ -z "$TERMUX_VERSION" ] && setopt nocaseglob # Case insensitive globbing (and fix for termux) setopt rcexpandparam # Array expension with parameters