michael/dotfiles
1
0
Fork 0
mirror of https://github.com/m-housh/dotfiles.git synced 2026-02-17 15:42:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: michael:afdedc5acf6cef7d0fb3074dbd2e767b84c8be45
Branches Tags
michael:main michael:arch michael:lazynvim michael:ansible michael:lazy-nvim michael:master michael:develop
..
compare: michael:37965723246a2a26e7ce2d675cb19fd011f8887c
Branches Tags
michael:main michael:arch michael:lazynvim michael:ansible michael:lazy-nvim michael:master michael:develop

2 Commits
afdedc5acf ... 3796572324

Author SHA1 Message Date
Michael Housh
3796572324 fix: Remains of merge conflict. 2025-03-27 17:08:30 -04:00
Michael Housh
3382c4b165 feat: Adds gpg-agent ssh_auth_sock export to zshrc 2025-03-27 17:01:34 -04:00
2 changed files with 5 additions and 3 deletions
Expand all files Collapse all files

3
sketchybar/plugins/clock.sh
View File

@@ -4,5 +4,4 @@
# the item invoking this script: # the item invoking this script:
# https://felixkratz.github.io/SketchyBar/config/events#events-and-scripting # https://felixkratz.github.io/SketchyBar/config/events#events-and-scripting
sketchybar --set "$NAME" label="$(date '+%d/%m %H:%M')" sketchybar --set "$NAME" label="$(date '+%m/%d %H:%M')"

5
zsh/config/.zshrc
View File

@@ -216,7 +216,6 @@ source <(kubectl completion zsh)
# I tried sourcing them in the the `.zshenv` files, but did not work. # I tried sourcing them in the the `.zshenv` files, but did not work.
_source_if "$ZDOTDIR/.zshrc-local" _source_if "$ZDOTDIR/.zshrc-local"
_source_if "$LOCAL_ENV" _source_if "$LOCAL_ENV"
<<<<<<< HEAD
# pnpm # pnpm
export PNPM_HOME="/Users/michael/.local/share/pnpm" export PNPM_HOME="/Users/michael/.local/share/pnpm"
@@ -230,4 +229,8 @@ esac
fpath=(/Users/michael/.docker/completions $fpath) fpath=(/Users/michael/.docker/completions $fpath)
autoload -Uz compinit autoload -Uz compinit
compinit compinit
# End of Docker CLI completions # End of Docker CLI completions
gpgconf --launch gpg-agent
export SSH_AUTH_SOCK=~/.gnupg/S.gpg-agent.ssh