mirror of
https://github.com/Matir/skel.git
synced 2026-05-25 21:19:09 -07:00
Compare commits
7 Commits
158d9f6e4e
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
9770514d6a | ||
|
|
e1724c77f3 | ||
|
|
ecbc25e5ac | ||
|
|
ea33840ef6 | ||
|
|
1048775da3 | ||
|
|
c9af80bc5d | ||
|
|
d8b4991419 |
5
Brewfile
5
Brewfile
@@ -21,9 +21,11 @@ brew "dfu-util"
|
|||||||
brew "difftastic"
|
brew "difftastic"
|
||||||
brew "direnv"
|
brew "direnv"
|
||||||
brew "duck"
|
brew "duck"
|
||||||
|
brew "dust"
|
||||||
brew "earthly"
|
brew "earthly"
|
||||||
brew "esptool"
|
brew "esptool"
|
||||||
brew "fish"
|
brew "fish"
|
||||||
|
brew "fq"
|
||||||
brew "gh"
|
brew "gh"
|
||||||
brew "ghidra", link: false
|
brew "ghidra", link: false
|
||||||
brew "git"
|
brew "git"
|
||||||
@@ -58,6 +60,7 @@ brew "pkgconf"
|
|||||||
brew "protobuf"
|
brew "protobuf"
|
||||||
brew "pwgen"
|
brew "pwgen"
|
||||||
brew "pwntools"
|
brew "pwntools"
|
||||||
|
brew "python@3.13"
|
||||||
brew "qemu"
|
brew "qemu"
|
||||||
brew "restic"
|
brew "restic"
|
||||||
brew "ripgrep"
|
brew "ripgrep"
|
||||||
@@ -115,6 +118,7 @@ end
|
|||||||
if !is_corp?
|
if !is_corp?
|
||||||
brew "bazelisk"
|
brew "bazelisk"
|
||||||
brew "openssh"
|
brew "openssh"
|
||||||
|
brew "virt-manager"
|
||||||
|
|
||||||
cask "claude-code"
|
cask "claude-code"
|
||||||
cask "cryptomator"
|
cask "cryptomator"
|
||||||
@@ -123,4 +127,5 @@ if !is_corp?
|
|||||||
cask "google-cloud-sdk"
|
cask "google-cloud-sdk"
|
||||||
cask "keybase"
|
cask "keybase"
|
||||||
cask "orbstack"
|
cask "orbstack"
|
||||||
|
cask "jordanbaird-ice"
|
||||||
end
|
end
|
||||||
|
|||||||
63
bin/quartz
Executable file
63
bin/quartz
Executable file
@@ -0,0 +1,63 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
set -euo pipefail
|
||||||
|
|
||||||
|
# QUARTZ_DIR search logic
|
||||||
|
if [ -z "${QUARTZ_DIR:-}" ]; then
|
||||||
|
if [ -f "quartz.config.ts" ]; then
|
||||||
|
QUARTZ_DIR="$PWD"
|
||||||
|
elif [ -d "$HOME/Personal/notes-quartz" ]; then
|
||||||
|
QUARTZ_DIR="$HOME/Personal/notes-quartz"
|
||||||
|
elif [ -d "$HOME/Projects/notes-quartz" ]; then
|
||||||
|
QUARTZ_DIR="$HOME/Projects/notes-quartz"
|
||||||
|
else
|
||||||
|
echo "Error: QUARTZ_DIR could not be found." >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ ! -d "$QUARTZ_DIR" ]; then
|
||||||
|
echo "Error: QUARTZ_DIR '$QUARTZ_DIR' is not a directory." >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
# NOTES_DIR search logic
|
||||||
|
PARSE_NOTES_DIR=""
|
||||||
|
# Use a copy of args to find -d/--directory
|
||||||
|
ARGS=("$@")
|
||||||
|
for ((i=0; i<${#ARGS[@]}; i++)); do
|
||||||
|
if [[ "${ARGS[i]}" == "-d" || "${ARGS[i]}" == "--directory" ]]; then
|
||||||
|
if [[ $((i+1)) -lt ${#ARGS[@]} ]]; then
|
||||||
|
PARSE_NOTES_DIR="${ARGS[i+1]}"
|
||||||
|
fi
|
||||||
|
break
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
|
||||||
|
if [ -n "$PARSE_NOTES_DIR" ]; then
|
||||||
|
NOTES_DIR="$PARSE_NOTES_DIR"
|
||||||
|
elif [ -z "${NOTES_DIR:-}" ]; then
|
||||||
|
if [ -d "$HOME/Notes" ]; then
|
||||||
|
NOTES_DIR="$HOME/Notes"
|
||||||
|
elif [ -d "$HOME/Personal/notes" ]; then
|
||||||
|
NOTES_DIR="$HOME/Personal/notes"
|
||||||
|
elif [ -d "$HOME/Projects/notes" ]; then
|
||||||
|
NOTES_DIR="$HOME/Projects/notes"
|
||||||
|
else
|
||||||
|
echo "Error: NOTES_DIR could not be found." >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ ! -d "$NOTES_DIR" ]; then
|
||||||
|
echo "Error: NOTES_DIR '$NOTES_DIR' is not a directory." >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
cd "$QUARTZ_DIR"
|
||||||
|
|
||||||
|
# Run npx quartz
|
||||||
|
# Following the prompt's structure but using NOTES_DIR for the flag
|
||||||
|
# npx quartz ${argv[1]} --directory ${NOTES_DIR} "$@"
|
||||||
|
# We use ${1:-} for argv[1] to handle cases with no arguments.
|
||||||
|
npx quartz "${1:-}" --directory "$NOTES_DIR" "$@"
|
||||||
@@ -9,9 +9,8 @@ uv_venv_auto = true
|
|||||||
|
|
||||||
[tools]
|
[tools]
|
||||||
age = "latest"
|
age = "latest"
|
||||||
age-plugin-yubikey = "latest"
|
|
||||||
usage = "latest"
|
usage = "latest"
|
||||||
uv = "latest"
|
uv = "0.11.8"
|
||||||
|
|
||||||
[hooks]
|
[hooks]
|
||||||
postinstall = "mise sync python --uv"
|
postinstall = "mise sync python --uv"
|
||||||
|
|||||||
@@ -15,6 +15,7 @@ export DEBEMAIL="david@systemoverlord.com"
|
|||||||
export DEBFULLNAME="David Tomaschik"
|
export DEBFULLNAME="David Tomaschik"
|
||||||
export LESS="-MR"
|
export LESS="-MR"
|
||||||
export QUOTING_STYLE="literal" # Coreutils quotes
|
export QUOTING_STYLE="literal" # Coreutils quotes
|
||||||
|
export HOMEBREW_NO_ENV_HINTS=1
|
||||||
|
|
||||||
# Fix gnome-terminal
|
# Fix gnome-terminal
|
||||||
if [ "$TERM" = "xterm" ] && [ "$COLORTERM" = "gnome-terminal" ] ; then
|
if [ "$TERM" = "xterm" ] && [ "$COLORTERM" = "gnome-terminal" ] ; then
|
||||||
|
|||||||
@@ -185,6 +185,9 @@ have_command() {
|
|||||||
if test -d ${HOME}/.local/bin ; then
|
if test -d ${HOME}/.local/bin ; then
|
||||||
export PATH="${HOME}/.local/bin:${PATH}"
|
export PATH="${HOME}/.local/bin:${PATH}"
|
||||||
fi
|
fi
|
||||||
|
if test -d ${HOME}/.npm-packages/bin ; then
|
||||||
|
export PATH="${HOME}/.npm-packages/bin:${PATH}"
|
||||||
|
fi
|
||||||
|
|
||||||
# Source extras and aliases if interactive
|
# Source extras and aliases if interactive
|
||||||
if [[ $- == *i* ]] ; then
|
if [[ $- == *i* ]] ; then
|
||||||
|
|||||||
@@ -3,6 +3,17 @@
|
|||||||
# Skelify -- move a file to my .skel and setup symlinks
|
# Skelify -- move a file to my .skel and setup symlinks
|
||||||
|
|
||||||
function skelify {
|
function skelify {
|
||||||
|
local -A opts
|
||||||
|
zparseopts -D -A opts -overlay:
|
||||||
|
|
||||||
|
local overlay_name="${opts[--overlay]}"
|
||||||
|
local base_skel_dir="${HOME}/.skel/dotfiles"
|
||||||
|
local extra_args=()
|
||||||
|
if [[ -n "${overlay_name}" ]]; then
|
||||||
|
base_skel_dir="${HOME}/.skel/dotfile_overlays/${overlay_name}"
|
||||||
|
extra_args=(--overlay "${overlay_name}")
|
||||||
|
fi
|
||||||
|
|
||||||
local target
|
local target
|
||||||
local whichdir
|
local whichdir
|
||||||
local relhome
|
local relhome
|
||||||
@@ -10,16 +21,19 @@ function skelify {
|
|||||||
local fulltarget
|
local fulltarget
|
||||||
for target in $~@; do
|
for target in $~@; do
|
||||||
if test -d ${target} ; then
|
if test -d ${target} ; then
|
||||||
skelify ${target}/* || return 1
|
skelify "${extra_args[@]}" ${target}/* || return 1
|
||||||
elif test -f ${target} ; then
|
elif test -f ${target} ; then
|
||||||
if ! whichdir=$(cd $(dirname $target) && pwd); then
|
if ! whichdir=$(cd $(dirname $target) && pwd); then
|
||||||
echo Could not find directory for $target >/dev/stderr
|
echo Could not find directory for $target >/dev/stderr
|
||||||
return 1
|
return 1
|
||||||
fi
|
fi
|
||||||
fname=$(basename ${target})
|
fname=$(basename ${target})
|
||||||
relhome=${whichdir#${HOME}/}
|
|
||||||
fulltarget="${whichdir}/${fname}"
|
fulltarget="${whichdir}/${fname}"
|
||||||
if [[ ${relhome} == ${whichdir} ]] ; then
|
if [[ ${whichdir} == ${HOME} ]] ; then
|
||||||
|
relhome=""
|
||||||
|
elif [[ ${whichdir} == ${HOME}/* ]] ; then
|
||||||
|
relhome=${whichdir#${HOME}/}
|
||||||
|
else
|
||||||
echo ${whichdir} is not in home >/dev/stderr
|
echo ${whichdir} is not in home >/dev/stderr
|
||||||
return 1
|
return 1
|
||||||
fi
|
fi
|
||||||
@@ -32,7 +46,7 @@ function skelify {
|
|||||||
return 1
|
return 1
|
||||||
fi
|
fi
|
||||||
echo ${target}
|
echo ${target}
|
||||||
local skeldir="${HOME}/.skel/dotfiles/${relhome}"
|
local skeldir="${base_skel_dir}/${relhome}"
|
||||||
mkdir -p "${skeldir}"
|
mkdir -p "${skeldir}"
|
||||||
mv ${target} "${skeldir}/${fname}"
|
mv ${target} "${skeldir}/${fname}"
|
||||||
ln -s "${skeldir}/${fname}" "${fulltarget}"
|
ln -s "${skeldir}/${fname}" "${fulltarget}"
|
||||||
|
|||||||
Reference in New Issue
Block a user