From 4f6182db0a77355445f0f430b0794b769c9fc974 Mon Sep 17 00:00:00 2001 From: PowerUser64 Date: Fri, 31 May 2024 01:07:26 -0700 Subject: [PATCH 1/9] copy-path: remove trailing newline --- .config/shell/bin/copy-path | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.config/shell/bin/copy-path b/.config/shell/bin/copy-path index 92bfd43..b7976ff 100755 --- a/.config/shell/bin/copy-path +++ b/.config/shell/bin/copy-path @@ -5,4 +5,4 @@ CLIPBOARD_MANAGER="${CLIPBOARD_MANAGER:-xsel -b}" for f; do realpath "$f" -done | $CLIPBOARD_MANAGER +done | sed -z '$ s/\n$//' | $CLIPBOARD_MANAGER From 8b84afc58bd9f83bc2a5867a8fee8780212f42a4 Mon Sep 17 00:00:00 2001 From: PowerUser64 Date: Thu, 6 Jun 2024 03:43:45 -0700 Subject: [PATCH 2/9] upd: add home-manager --- .config/shell/bin/upd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.config/shell/bin/upd b/.config/shell/bin/upd index 205eeaa..325cf06 100755 --- a/.config/shell/bin/upd +++ b/.config/shell/bin/upd @@ -27,7 +27,7 @@ g() { git -C "$REPO" "$@"; } REPO_ABBR='echo ${REPO/"$HOME"/"~"}' # `git pull` everything mentioned in the REPOS_TO_UPDATE variable -IFS=: read -ra REPOS_TO_UPDATE_ARR <<< "${REPOS_TO_UPDATE:-}:${DOCS_DIR:-}:$HOME/bin:${NIXOS_DIR:-}:$HOME/code/faust-ideas" +IFS=: read -ra REPOS_TO_UPDATE_ARR <<< "${REPOS_TO_UPDATE:-}:${DOCS_DIR:-}:$HOME/bin:${NIXOS_DIR:-}:$HOME/code/faust-ideas:$HOME/.config/home-manager" for REPO in "${REPOS_TO_UPDATE_ARR[@]}"; do if [ -n "$REPO" ]; then if g rev-parse > /dev/null 2>&1; then From d7ed5dfbcf40672046332dcc7df63c75f1b61ce3 Mon Sep 17 00:00:00 2001 From: PowerUser64 Date: Wed, 19 Jun 2024 00:52:49 -0700 Subject: [PATCH 3/9] zsh: set noextendglob to fix problems with '#' in nix --- .zshrc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.zshrc b/.zshrc index e783bce..cf3018c 100644 --- a/.zshrc +++ b/.zshrc @@ -111,8 +111,8 @@ alias nix='noglob nix' ## 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 From ec8cc0d624a942ae208aeed7f6284208b2a0b186 Mon Sep 17 00:00:00 2001 From: PowerUser64 Date: Wed, 19 Jun 2024 00:58:33 -0700 Subject: [PATCH 4/9] git: add psnew alias, st now means stash --- .gitconfig | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 From 097f5cb5d8d7b800b7786ec16249ae82a3bd0de6 Mon Sep 17 00:00:00 2001 From: PowerUser64 Date: Sat, 10 Aug 2024 02:06:46 -0700 Subject: [PATCH 5/9] upd: remove home-manager config I don't know if I'll use HM like this --- .config/shell/bin/upd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.config/shell/bin/upd b/.config/shell/bin/upd index b9242da..c53b91c 100755 --- a/.config/shell/bin/upd +++ b/.config/shell/bin/upd @@ -27,7 +27,7 @@ g() { git -C "$REPO" "$@"; } REPO_ABBR='echo ${REPO/"$HOME"/"~"}' # `git pull` everything mentioned in the REPOS_TO_UPDATE variable -IFS=: read -ra REPOS_TO_UPDATE_ARR <<< "${REPOS_TO_UPDATE:-}:${DOCS_DIR:-}:$HOME/bin:${NIXOS_DIR:-}:$HOME/code/faust-ideas:$HOME/.config/home-manager:$HOME/code/nixvim-config" +IFS=: read -ra REPOS_TO_UPDATE_ARR <<< "${REPOS_TO_UPDATE:-}:${DOCS_DIR:-}:$HOME/bin:${NIXOS_DIR:-}:$HOME/code/faust-ideas:$HOME/code/nixvim-config" for REPO in "${REPOS_TO_UPDATE_ARR[@]}"; do if [ -n "$REPO" ]; then if g rev-parse > /dev/null 2>&1; then From 4a684aa31bf54276b9942d64588e0af8ef2b1904 Mon Sep 17 00:00:00 2001 From: PowerUser64 Date: Mon, 19 Aug 2024 03:05:51 -0700 Subject: [PATCH 6/9] p10k: enable time for colorful-angluar theme --- .config/shell/p10k/colorful-angular.p10k.zsh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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. From 2dd394612349391dfa599d9665e12393a5389ded Mon Sep 17 00:00:00 2001 From: PowerUser64 Date: Sat, 31 Aug 2024 13:49:18 -0700 Subject: [PATCH 7/9] shell: improve LS aliases, remove smartplug things --- .config/shell/aliases | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) 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 From 9faeadfccb53bbd25878e0fe17ab5866655e4e96 Mon Sep 17 00:00:00 2001 From: PowerUser64 Date: Sat, 7 Sep 2024 02:08:54 -0700 Subject: [PATCH 8/9] dotfiles-install: change install url --- .local/bin/dotfiles-install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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" From ac74b03c858373b457795498339dafbad91eb6e1 Mon Sep 17 00:00:00 2001 From: PowerUser64 Date: Sat, 7 Sep 2024 02:16:58 -0700 Subject: [PATCH 9/9] remove p10k "current" symlink --- .config/shell/p10k/current | 1 - 1 file changed, 1 deletion(-) delete mode 120000 .config/shell/p10k/current diff --git a/.config/shell/p10k/current b/.config/shell/p10k/current deleted file mode 120000 index 22a37a4..0000000 --- a/.config/shell/p10k/current +++ /dev/null @@ -1 +0,0 @@ -/home/blake/.config/shell/p10k/colorful-angular.p10k.zsh \ No newline at end of file