Compare commits
No commits in common. "3a2ae744d5cd8ae246cb6152d6681c2dc1f4e748" and "eee970e38d4cf96130d17f808acb265a6dff9fff" have entirely different histories.
3a2ae744d5
...
eee970e38d
8 changed files with 462 additions and 34 deletions
|
@ -127,8 +127,6 @@ alias wezterm='flatpak run org.wezfurlong.wezterm'
|
|||
|
||||
export EDITOR=vim
|
||||
|
||||
alias wezterm='flatpak run org.wezfurlong.wezterm'
|
||||
|
||||
eval "$(starship init zsh)"
|
||||
|
||||
test -e "$HOME/.shellfishrc" && source "$HOME/.shellfishrc"
|
||||
|
|
|
@ -1,7 +0,0 @@
|
|||
#!/usr/bin/env bash
|
||||
# Use fuzzel to find a password from password-store and copy it to clipboard.
|
||||
# inpired by: https://gist.github.com/igemnace/2b8609d280752e8a1b173204c14f6892
|
||||
|
||||
pass_name=$(cd $HOME/.password-store && rg --files | sort | sed 's/\.gpg$//' | fuzzel -d)
|
||||
|
||||
[[ $pass_name != "" ]] && pass show $pass_name | wl-copy
|
|
@ -129,14 +129,18 @@ return {
|
|||
border_right_width = '0.5cell',
|
||||
},
|
||||
window_background_opacity = 0.97,
|
||||
window_decorations = "TITLE | RESIZE",
|
||||
{{ if eq .chezmoi.os "darwin" -}}
|
||||
window_decorations = "TITLE | RESIZE",
|
||||
{{ else if eq .chezmoi.os "linux" -}}
|
||||
window_decorations = "NONE",
|
||||
{{ end -}}
|
||||
tab_bar_at_bottom = false,
|
||||
hide_tab_bar_if_only_one_tab = true,
|
||||
use_fancy_tab_bar = false,
|
||||
scrollback_lines = 999999,
|
||||
enable_scroll_bar = false,
|
||||
adjust_window_size_when_changing_font_size=false,
|
||||
font = wezterm.font_with_fallback({"JetBrains Mono", "Twemoji"}),
|
||||
font = wezterm.font_with_fallback({"Hack Nerd Font", "Hack", "JetBrains Mono", "Twemoji"}),
|
||||
font_size = 15,
|
||||
force_reverse_video_cursor = false,
|
||||
colors = {
|
||||
|
|
|
@ -18,7 +18,7 @@ yabai -m space 8 --label games
|
|||
# window rules
|
||||
yabai -m rule --add app="^WezTerm$" space=code
|
||||
yabai -m rule --add app="^(Safari|Firefox)$" space=web
|
||||
yabai -m rule --add app="^(Mail|Canary Mail|Thunderbird)$" space=mail
|
||||
yabai -m rule --add app="^Mail$" space=mail
|
||||
yabai -m rule --add app="^Element$" space=chat
|
||||
yabai -m rule --add app="^Discord$" space=social grid=1:1:0:0:1:1 manage=off
|
||||
yabai -m rule --add app="^(Notes|Joplin)$" space=notes
|
||||
|
|
449
dot_shellfishrc
Normal file
449
dot_shellfishrc
Normal file
|
@ -0,0 +1,449 @@
|
|||
# include this from .bashrc, .zshrc or
|
||||
# another shell startup file with:
|
||||
# source $HOME/.shellfishrc
|
||||
#
|
||||
# Running from Secure ShellFish
|
||||
# this gives access to:
|
||||
# openUrl to open pages or deeps links
|
||||
# pbcopy to copy text to iOS clipboard
|
||||
# pbpaste to paste from iOS clipboard
|
||||
# quicklook to preview files
|
||||
# runShortcut to run Shortcuts
|
||||
# setbarcolor to change toolbar color
|
||||
# sharesheet to invoke iOS share sheet
|
||||
# snip to add new snippets
|
||||
# textastic to edit files with Textastic
|
||||
#
|
||||
# In any terminal use:
|
||||
# thumbnail to write exif thumbnails
|
||||
# notify to post notifications
|
||||
# widget to change lock/home screen
|
||||
# widgets & apple watch complications
|
||||
#
|
||||
#
|
||||
# this part does nothing outside ShellFish
|
||||
if [[ "$LC_TERMINAL" = "ShellFish" ]]; then
|
||||
ios_printURIComponent() {
|
||||
awk 'BEGIN {while (y++ < 125) z[sprintf("%c", y)] = y
|
||||
while (y = substr(ARGV[1], ++j, 1))
|
||||
q = y ~ /[a-zA-Z0-9]/ ? q y : q sprintf("%%%02X", z[y])
|
||||
printf("%s", q)}' "$1"
|
||||
}
|
||||
|
||||
ios_printBase64Component() {
|
||||
echo -n "$1" | base64
|
||||
}
|
||||
|
||||
which printf > /dev/null
|
||||
ios_hasPrintf=$?
|
||||
ios_printf() {
|
||||
if [ $ios_hasPrintf ]; then
|
||||
printf "$1"
|
||||
else
|
||||
awk "BEGIN {printf \"$1\"}"
|
||||
fi
|
||||
}
|
||||
|
||||
ios_sequence() {
|
||||
if [[ -n "$TMUX" ]]; then
|
||||
OUTPUT=$(
|
||||
ios_printf '\033Ptmux;\033\033]'
|
||||
echo -n "$1" | tr -d '[:space:]'
|
||||
ios_printf '\a\033\\' )
|
||||
else
|
||||
OUTPUT=$(
|
||||
ios_printf '\033]'
|
||||
echo -n "$1" | tr -d '[:space:]'
|
||||
ios_printf '\a' )
|
||||
fi
|
||||
if [ -t 1 ] ; then
|
||||
echo -n $OUTPUT
|
||||
elif [[ -n "$SSH_TTY" ]]; then
|
||||
echo -n $OUTPUT > $SSH_TTY
|
||||
else
|
||||
echo >&2 'Standard output is not tty and there is no $SSH_TTY'
|
||||
fi
|
||||
}
|
||||
|
||||
ios_sequence_spaced() {
|
||||
if [[ -n "$TMUX" ]]; then
|
||||
OUTPUT=$(
|
||||
ios_printf '\033Ptmux;\033\033]'
|
||||
echo -n "$1"
|
||||
ios_printf '\a\033\\' )
|
||||
else
|
||||
OUTPUT=$(
|
||||
ios_printf '\033]'
|
||||
echo -n "$1"
|
||||
ios_printf '\a' )
|
||||
fi
|
||||
if [ -t 1 ] ; then
|
||||
echo -n $OUTPUT
|
||||
elif [[ -n "$SSH_TTY" ]]; then
|
||||
echo -n $OUTPUT > $SSH_TTY
|
||||
else
|
||||
echo >&2 'Standard output is not tty and there is no $SSH_TTY'
|
||||
fi
|
||||
}
|
||||
|
||||
# prepare fifo for communicating result back to shell
|
||||
ios_prepareResult() {
|
||||
FIFO=$(mktemp)
|
||||
rm -f $FIFO
|
||||
mkfifo $FIFO
|
||||
echo $FIFO
|
||||
}
|
||||
|
||||
# wait for terminal to complete action
|
||||
ios_handleResult() {
|
||||
FIFO=$1
|
||||
if [ -n "$FIFO" ]; then
|
||||
read <$FIFO -s
|
||||
rm -f $FIFO
|
||||
|
||||
if [[ $REPLY = error* ]]; then
|
||||
echo "${REPLY#error=}" | base64 >&2 -d
|
||||
return 1
|
||||
fi
|
||||
|
||||
if [[ $REPLY = result* ]]; then
|
||||
echo "${REPLY#result=}" | base64 -d
|
||||
fi
|
||||
fi
|
||||
}
|
||||
|
||||
sharesheet() {
|
||||
if [[ $# -eq 0 ]]; then
|
||||
if tty -s; then
|
||||
cat <<EOF
|
||||
Usage: sharesheet [FILE]...
|
||||
|
||||
Present share sheet for files and directories. Alternatively you can pipe in text and call it without arguments.
|
||||
|
||||
If arguments exist inside the Finder or Files app changes made are written back to the server.
|
||||
EOF
|
||||
return 0
|
||||
fi
|
||||
fi
|
||||
|
||||
FIFO=$(ios_prepareResult)
|
||||
OUTPUT=$(
|
||||
awk 'BEGIN {printf "6;sharesheet://?ver=2&respond="}'
|
||||
ios_printBase64Component "$FIFO"
|
||||
awk 'BEGIN {printf "&pwd="}'
|
||||
ios_printBase64Component "$PWD"
|
||||
awk 'BEGIN {printf "&home="}'
|
||||
ios_printBase64Component "$HOME"
|
||||
for var in "$@"
|
||||
do
|
||||
awk 'BEGIN {printf "&path="}'
|
||||
ios_printBase64Component "$var"
|
||||
done
|
||||
if [[ $# -eq 0 ]]; then
|
||||
text=$(cat -)
|
||||
awk 'BEGIN {printf "&text="}'
|
||||
ios_printBase64Component "$text"
|
||||
fi
|
||||
)
|
||||
ios_sequence "$OUTPUT"
|
||||
ios_handleResult "$FIFO"
|
||||
}
|
||||
|
||||
quicklook() {
|
||||
if [[ $# -eq 0 ]]; then
|
||||
if tty -s; then
|
||||
cat <<EOF
|
||||
Usage: quicklook [FILE]...
|
||||
|
||||
Show QuickLook preview for files and directories. Alternatively you can pipe in text and call it without arguments.
|
||||
EOF
|
||||
return 0
|
||||
fi
|
||||
fi
|
||||
|
||||
FIFO=$(ios_prepareResult)
|
||||
OUTPUT=$(
|
||||
awk 'BEGIN {printf "6;quicklook://?ver=2&respond="}'
|
||||
ios_printBase64Component "$FIFO"
|
||||
awk 'BEGIN {printf "&pwd="}'
|
||||
ios_printBase64Component "$PWD"
|
||||
awk 'BEGIN {printf "&home="}'
|
||||
ios_printBase64Component "$HOME"
|
||||
for var in "$@"
|
||||
do
|
||||
awk 'BEGIN {printf "&path="}'
|
||||
ios_printBase64Component "$var"
|
||||
done
|
||||
if [[ $# -eq 0 ]]; then
|
||||
text=$(cat -)
|
||||
awk 'BEGIN {printf "&text="}'
|
||||
ios_printBase64Component "$text"
|
||||
fi
|
||||
)
|
||||
ios_sequence "$OUTPUT"
|
||||
ios_handleResult "$FIFO"
|
||||
}
|
||||
|
||||
textastic() {
|
||||
if [[ $# -eq 0 ]]; then
|
||||
cat <<EOF
|
||||
Usage: textastic <text-file>
|
||||
|
||||
Open in Textastic 9.5 or later.
|
||||
File must be in directory represented in the Files app to allow writing back edits.
|
||||
EOF
|
||||
else
|
||||
if [ ! -e "$1" ]; then
|
||||
touch "$1"
|
||||
fi
|
||||
OUTPUT=$(
|
||||
awk 'BEGIN {printf "6;textastic://?ver=2&pwd="}'
|
||||
ios_printBase64Component "$PWD"
|
||||
awk 'BEGIN {printf "&home="}'
|
||||
ios_printBase64Component "$HOME"
|
||||
awk 'BEGIN {printf "&path="}'
|
||||
ios_printBase64Component "$1"
|
||||
)
|
||||
ios_sequence "$OUTPUT"
|
||||
fi
|
||||
}
|
||||
|
||||
setbarcolor() {
|
||||
if [[ $# -eq 0 ]]; then
|
||||
cat <<EOF
|
||||
Usage: setbarcolor <css-style color>
|
||||
|
||||
Set color of terminal toolbar color with values such as
|
||||
red, #f00, #ff0000, rgb(255,0,0), color(p3 1.0 0.0 0.0)
|
||||
EOF
|
||||
else
|
||||
OUTPUT=$(
|
||||
awk 'BEGIN {printf "6;settoolbar://?ver=2&color="}'
|
||||
ios_printBase64Component "$1"
|
||||
)
|
||||
ios_sequence "$OUTPUT"
|
||||
fi
|
||||
}
|
||||
|
||||
openUrl() {
|
||||
if [[ $# -eq 0 ]]; then
|
||||
cat <<EOF
|
||||
Usage: openUrl <url>
|
||||
|
||||
Open URL on iOS.
|
||||
EOF
|
||||
else
|
||||
FIFO=$(ios_prepareResult)
|
||||
OUTPUT=$(
|
||||
awk 'BEGIN {printf "6;open://?ver=2&respond="}'
|
||||
ios_printBase64Component "$FIFO"
|
||||
awk 'BEGIN {printf "&url="}'
|
||||
ios_printBase64Component "$1"
|
||||
)
|
||||
ios_sequence "$OUTPUT"
|
||||
ios_handleResult "$FIFO"
|
||||
fi
|
||||
}
|
||||
|
||||
runShortcut() {
|
||||
local baseUrl="shortcuts://run-shortcut"
|
||||
if [[ $1 == "--x-callback" ]]; then
|
||||
local baseUrl="shortcuts://x-callback-url/run-shortcut"
|
||||
shift
|
||||
fi
|
||||
|
||||
if [[ $# -eq 0 ]]; then
|
||||
cat <<EOF
|
||||
Usage: runShortcut [--x-callback] <shortcut-name> [input-for-shortcut]
|
||||
|
||||
Run in Shortcuts app bringing back results if --x-callback is included.
|
||||
EOF
|
||||
else
|
||||
local name=$(ios_printURIComponent "$1")
|
||||
shift
|
||||
if [[ $* == "-" ]]; then
|
||||
local text=$(cat -)
|
||||
local input=$(ios_printURIComponent "$text")
|
||||
else
|
||||
local input=$(ios_printURIComponent "$*")
|
||||
fi
|
||||
openUrl "$baseUrl?name=$name&input=$input"
|
||||
fi
|
||||
}
|
||||
|
||||
# copy standard input or arguments to iOS clipboard
|
||||
pbcopy() {
|
||||
OUTPUT=$(
|
||||
awk 'BEGIN {printf "52;c;"} '
|
||||
if [ $# -eq 0 ]; then
|
||||
base64 | tr -d '\n'
|
||||
else
|
||||
echo -n "$@" | base64 | tr -d '\n'
|
||||
fi
|
||||
)
|
||||
ios_sequence "$OUTPUT"
|
||||
}
|
||||
|
||||
# paste from iOS device clipboard to standard output
|
||||
pbpaste() {
|
||||
FIFO=$(ios_prepareResult)
|
||||
OUTPUT=$(
|
||||
awk 'BEGIN {printf "6;pbpaste://?ver=2&respond="}'
|
||||
ios_printBase64Component "$FIFO"
|
||||
)
|
||||
ios_sequence "$OUTPUT"
|
||||
ios_handleResult "$FIFO"
|
||||
}
|
||||
|
||||
# create new snippets
|
||||
snip() {
|
||||
if [[ $# -eq 0 ]]; then
|
||||
cat <<EOF
|
||||
Usage: snip <text for snippet>
|
||||
|
||||
EOF
|
||||
else
|
||||
OUTPUT=$(
|
||||
awk 'BEGIN {printf "6;addsnippet://?ver=2&text="}'
|
||||
ios_printBase64Component "$*"
|
||||
)
|
||||
ios_sequence "$OUTPUT"
|
||||
fi
|
||||
}
|
||||
|
||||
# Secure ShellFish supports 24-bit colors
|
||||
export COLORTERM=truecolor
|
||||
|
||||
# We need to pass through escape sequences through tmux
|
||||
if [[ -n "$TMUX" ]]; then
|
||||
# ignore error from old versions of tmux without this command
|
||||
tmux 2> /dev/null set -g allow-passthrough on || true
|
||||
fi
|
||||
|
||||
if [[ -z "$INSIDE_EMACS" && $- = *i* ]]; then
|
||||
# tmux mouse mode enables scrolling with
|
||||
# swipe and mouse wheel
|
||||
if [[ -n "$TMUX" ]]; then
|
||||
tmux set -g mouse on
|
||||
fi
|
||||
|
||||
# send the current directory using OSC 7 when showing prompt to
|
||||
# make filename detection work better for interactive shell
|
||||
update_terminal_cwd() {
|
||||
ios_sequence $(
|
||||
awk "BEGIN {printf \"7;%s\", \"file://$HOSTNAME\"}"
|
||||
ios_printURIComponent "$PWD"
|
||||
)
|
||||
}
|
||||
if [ -n "$ZSH_VERSION" ]; then
|
||||
precmd() { update_terminal_cwd; }
|
||||
elif [[ $PROMPT_COMMAND != *"update_terminal_cwd"* ]]; then
|
||||
PROMPT_COMMAND="update_terminal_cwd${PROMPT_COMMAND:+; $PROMPT_COMMAND}"
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
||||
# this part works in any context
|
||||
|
||||
thumbnail() {
|
||||
if [[ $# -eq 0 ]]; then
|
||||
cat <<EOF
|
||||
Usage: thumbnail <image-file> [image-file-2] ...
|
||||
|
||||
Add Exif thumnails to image files using ImageMagick convert and exiftool.
|
||||
|
||||
EOF
|
||||
else
|
||||
# make sure ImageMagick and exiftool are available
|
||||
convert -version 1>/dev/null 2>/dev/null || { echo "ImageMagick convert needs to be installed"; return 1; }
|
||||
exiftool -v 1>/dev/null 2>/dev/null || { echo "exiftool needs to be installed"; return 1; }
|
||||
|
||||
THUMBNAIL=/tmp/thumbnail.jpg
|
||||
for arg in "$@"
|
||||
do
|
||||
echo "$arg"
|
||||
convert "$arg" -thumbnail 160x120^ "$THUMBNAIL"
|
||||
exiftool -q -overwrite_original "-thumbnailimage<=$THUMBNAIL" "$arg"
|
||||
rm -f "$THUMBNAIL"
|
||||
done
|
||||
fi
|
||||
}
|
||||
|
||||
|
||||
# Updates Terminal Data widget in Secure ShellFish
|
||||
#
|
||||
# This command sends encrypted data through push notifications such
|
||||
# that it doesn't need to run from a Secure ShellFish terminal.
|
||||
widget() {
|
||||
if [[ $# -eq 0 ]]; then
|
||||
cat <<EOF
|
||||
Usage: widget [target] <data> ...
|
||||
|
||||
Update widget on device from which this function was installed with a number of content parameters that can be string, progress, icon, target, color, url or shortcut.
|
||||
|
||||
Each argument type is derived from input, where the first argument is assumed to be a target if it matches a target configured on the widget.
|
||||
|
||||
Progress has the form: 50% or 110/220
|
||||
|
||||
Icon must match valid SF Symbol name such as globe or terminal.fill
|
||||
|
||||
Colors must be hex colours such as #000 #ff00ff where the color is used for later content and 'foreground' switches back to default colour
|
||||
|
||||
Target is used to send different content to different widgets after configuring the widgets with different target identifiers which requires the pro unlock. The target parameter is never assumed unless --target is used and is effective until next --target parameter allowing updates of several widgets with a single command
|
||||
|
||||
URL is used when tapping the widget and is assumed for arguments starting with https:// and other schemes are supported by using --url
|
||||
|
||||
Shortcut works like URL running the Shortcut with the given name and is never assumed without --shortcut
|
||||
|
||||
String is the fallback type if nothing else matches, but content type can be forced for next parameter with --progress, --icon, --color, --text or --target with something like:
|
||||
widget --text "50/100"
|
||||
|
||||
You can update several widgets at once by using --target to send all parameters until the next --target to a particular widget. Updating several widgets at once allows more total updates per day.
|
||||
|
||||
EOF
|
||||
return 0
|
||||
fi
|
||||
|
||||
local key=ab5d8c58fd13a6a2536504580a527d682fe9f5560aa57298b4a4135ef5ed6987
|
||||
local user=jBkLbEYRBy33rdItwbMJq0WHYwYoMy2Zf1gBCfVj
|
||||
local iv=ab5bbeb426015da7eedcee8bee3dffb7
|
||||
|
||||
local plain=$(
|
||||
echo Secure ShellFish Widget 2.0
|
||||
for var in "$@"
|
||||
do
|
||||
echo -ne "$var" | base64
|
||||
done)
|
||||
local base64=$(echo "$plain" | openssl enc -aes-256-cbc -base64 -K $key -iv $iv)
|
||||
curl -sS -X POST -H "Content-Type: text/plain" --data "$base64" "https://secureshellfish.app/push/?user=$user"
|
||||
}
|
||||
|
||||
|
||||
# Shows notification on your device with Secure ShellFish installed
|
||||
# optionally opening URL or running Shortcut when notification is
|
||||
# opened.
|
||||
#
|
||||
# This command sends encrypted data through push notifications such
|
||||
# that it doesn't need to run from a Secure ShellFish terminal.
|
||||
notify() {
|
||||
if [[ $# -eq 0 ]]; then
|
||||
cat <<EOF
|
||||
Usage: notify [--shortcut NameOfShortcut] [--url https://url.to.open/] [title] <body> ...
|
||||
|
||||
EOF
|
||||
return 0
|
||||
fi
|
||||
|
||||
local key=ab5d8c58fd13a6a2536504580a527d682fe9f5560aa57298b4a4135ef5ed6987
|
||||
local user=jBkLbEYRBy33rdItwbMJq0WHYwYoMy2Zf1gBCfVj
|
||||
local iv=ab5bbeb426015da7eedcee8bee3dffb7
|
||||
|
||||
local plain=$(
|
||||
echo Secure ShellFish Notify 2.0
|
||||
for var in "$@"
|
||||
do
|
||||
echo -ne "$var" | base64
|
||||
done)
|
||||
local base64=$(echo "$plain" | openssl enc -aes-256-cbc -base64 -K $key -iv $iv)
|
||||
curl -sS -X POST -H "Content-Type: text/plain" --data "$base64" "https://secureshellfish.app/push/?user=$user&mutable"
|
||||
}
|
|
@ -219,10 +219,10 @@ tmux_conf_theme_left_separator_main=""
|
|||
tmux_conf_theme_left_separator_sub="|"
|
||||
tmux_conf_theme_right_separator_main=""
|
||||
tmux_conf_theme_right_separator_sub="|"
|
||||
tmux_conf_theme_left_separator_main='\uE0B0' # /!\ you don't need to install Powerline
|
||||
tmux_conf_theme_left_separator_sub='\uE0B1' # you only need fonts patched with
|
||||
tmux_conf_theme_right_separator_main='\uE0B2' # Powerline symbols or the standalone
|
||||
tmux_conf_theme_right_separator_sub='\uE0B3' # PowerlineSymbols.otf font, see README.md
|
||||
#tmux_conf_theme_left_separator_main='\uE0B0' # /!\ you don't need to install Powerline
|
||||
#tmux_conf_theme_left_separator_sub='\uE0B1' # you only need fonts patched with
|
||||
#tmux_conf_theme_right_separator_main='\uE0B2' # Powerline symbols or the standalone
|
||||
#tmux_conf_theme_right_separator_sub='\uE0B3' # PowerlineSymbols.otf font, see README.md
|
||||
|
||||
# status left/right content:
|
||||
# - separate main sections with "|"
|
||||
|
@ -353,10 +353,10 @@ tmux_conf_copy_to_os_clipboard=false
|
|||
# this is the place to override or undo settings
|
||||
|
||||
# increase history size
|
||||
set -g history-limit 10000
|
||||
#set -g history-limit 10000
|
||||
|
||||
# start with mouse mode enabled
|
||||
set -g mouse on
|
||||
#set -g mouse on
|
||||
|
||||
# force Vi mode
|
||||
# really you should export VISUAL or EDITOR environment variable, see manual
|
||||
|
|
|
@ -1,11 +0,0 @@
|
|||
[clipman.desktop][Global Shortcuts]
|
||||
_launch=Alt+Y
|
||||
|
||||
[fuzzel-plasma-pass.sh.desktop][Global Shortcuts]
|
||||
_launch=Alt+Shift+Y
|
||||
|
||||
[fuzzel.desktop][Global Shortcuts]
|
||||
_launch=Alt+D
|
||||
|
||||
[org.wezfurlong.wezterm.desktop][Global Shortcuts]
|
||||
_launch=Alt+Return
|
|
@ -1,5 +0,0 @@
|
|||
#!/bin/bash
|
||||
|
||||
set -x
|
||||
|
||||
wl-paste -t text --watch clipman store &
|
Loading…
Reference in a new issue