From 1c0897be8328a6af664a195b9d220bb1fc32bb90 Mon Sep 17 00:00:00 2001 From: Ted Kulp Date: Fri, 13 Oct 2023 14:41:34 -0400 Subject: [PATCH] chore: getting back into sync --- .config/zsh/homebrew.zsh##os.Darwin | 6 ++-- .config/zsh/vim.zsh | 1 + .gitconfig | 2 ++ .local/share/yadm/archive | Bin 6134 -> 6861 bytes .tmux.conf.local | 41 +++++++++++++++++++--------- .zshrc | 21 +++++++++++--- 6 files changed, 51 insertions(+), 20 deletions(-) diff --git a/.config/zsh/homebrew.zsh##os.Darwin b/.config/zsh/homebrew.zsh##os.Darwin index ec69693..cb5b50f 100644 --- a/.config/zsh/homebrew.zsh##os.Darwin +++ b/.config/zsh/homebrew.zsh##os.Darwin @@ -1,5 +1,5 @@ export PATH="/usr/local/sbin:$PATH" -alias hbu="brew outdated | sort | fzf --no-sort --height 50% --header 'Homebrew Upgrade' --reverse -m --border --preview 'sleep 1 && brew info {}' | xargs -I '{}' brew upgrade {}" -alias hbx="brew list | sort | fzf --no-sort --height 50% --header 'Homebrew Uninstall' --reverse -m --border --preview 'sleep 1 && brew info {}' | xargs -I '{}' brew uninstall {}" -alias hbi="brew list | sort | fzf --no-sort --height 50% --header 'Homebrew Installed Packages' --reverse -m --border --preview 'sleep 1 && brew info {}'" +alias hbu="brew outdated 2> /dev/null | sort | fzf --no-sort --height 50% --header 'Homebrew Upgrade' --reverse -m --border --preview 'sleep 1 && brew info {}' | xargs -I '{}' brew upgrade {}" +alias hbx="brew list 2> /dev/null | sort | fzf --no-sort --height 50% --header 'Homebrew Uninstall' --reverse -m --border --preview 'sleep 1 && brew info {}' | xargs -I '{}' brew uninstall {}" +alias hbi="brew list 2> /dev/null | sort | fzf --no-sort --height 50% --header 'Homebrew Installed Packages' --reverse -m --border --preview 'sleep 1 && brew info {}'" diff --git a/.config/zsh/vim.zsh b/.config/zsh/vim.zsh index 809c7e4..051d70a 100644 --- a/.config/zsh/vim.zsh +++ b/.config/zsh/vim.zsh @@ -7,3 +7,4 @@ else fi export EDITOR="nvim" +alias nvim="nvm use v16 && /Users/tedkulp/.asdf/shims/nvim" diff --git a/.gitconfig b/.gitconfig index 2b568b0..36c8d66 100644 --- a/.gitconfig +++ b/.gitconfig @@ -11,3 +11,5 @@ rebase = false [tag] forceSignAnnotated = true +[alias] + mdr = merge --no-commit --no-ff diff --git a/.local/share/yadm/archive b/.local/share/yadm/archive index 002ddf763fb42f138db4be31daa84bf2d9d29fa4..f4fd9d95718d5cafc3b6e51433f9810cf0f7d504 100644 GIT binary patch literal 6861 zcmV;;8ZzaK4Fm}T2w}vAR&M7vkn_^&0V9&mx%T&&^1W@mBY{Yngh6U%FaK~8DybdU zNMB-|C=;r*?rhzL>9hfO*jiFFNt(gIN)s3KYa{UDLqM^k{m_Bgc;XR>i{Dk1I6+T@ zb2Ja7c!@T*EABU{h!O>VA!mb&9rQDxTaJDa4f;eHmyr6g1pjr=?hS*wt`Q>)^9ddm z)P^}}5c>-u^nq<4PZPL8;VMNPXciu<850x!7(v8+IRUNxDguaQ@=x0YQmI&ayHFR1 zk6B)fX=dvthpVFv#AjPTGbfk?QN|A;itmzrYuZR^o~MKzubYlGQGc9juRVG)+DuvTjd8s059-9)rcxLK>I4+O6ub(I?riO!9tYC(4& zd?+B=F@^Fq0l3xpIjFCZ9MCy<%@C4ib4_NOPZ5l=k!nn3|0)VqcVvOjwwm4-wsxX| z2nCMN<@S5-7sNpv*|?_LqhSxvgU)=C?N*C%7EjRv1#!?YzdWxJM0=da)c5f`P}VZ@ zB{}Hk>9&GvVl^?uV=@7y(2#(^MI7L(FM!4f_6UpzqgrT{aPKF8U-yf*{r?B-%D@5a zYD?Hj0nToDAOU^4 zTcnL~|JYV%Gepq!&-2SX<|AM^zNwU6j{*&tylRM$N)s%JA5`!AK_78!5a|=BcfE}R zSt!rYC9SbgnFKQ!#A;bEnFh;w(Nw+*Icq||sF;1%7LSW`a25O9=3`Gyg!8E=H17;M z5i7#1VSv5NQZjmFl)!bQgWN`>-Y9+e&q4jzlXd)@dO`Jaoz^RXF2hD*wYHRyNgOWxA{$N#VOHCQ#@$LvlJ|-?Oc!d&7$REPKH^;>X7I+TO9g_A;|O%t zXp^o+v)5YsQU_8v(vl9TwTQn|Ov0mR|7g zZsQd4G4))CVO|p5ogbiaiZ`qgY>!-QfnFfg=gpnl3q;e|WtIn5y<8XL>NGTw1^i^1Oa@y}AXtNXj6NeOzV^YZJX>AY^$P5~|aZNwx#BMgek; zy6X4G+5~r9jZgpwFwiRB#vbbHX*I5J;&c#+xJ zeFIf@Qx-rjy_pD2BE<6=!QkriDoS)Mpl=A7J^>^r_$x(46TDs{CTC5*0Fl(x-9s?< z?$A4r_FR&aK83Ktox6oL8a~K5DA;nYW$MsRxU_~e3r{s{_cJJ0$V?KRM7*~8Aj{xJ zHmrjK;MX62 zP3&9RaDSv2IdO%(aVA`n+Y*mgk3tTE^OKkws9F#vWP}1<+YWTm)N|97n`NfNA?1K~ zB3VVcGd29e^Fi6oJbaMIgW__fS}v6U7<6_^=4Y??S#K@dGMeS?9se5Dqq2?_308|z zm{QQM#{^5kIX7AcNMy&A%lSU@_L8af>YT~#5)tJJf}C8gMRCD6E7R3uri&V`Wbxg2 zl3uJkBk2*}S>@Je?hhB5e^KGB ?$_JpaaUQ<)6pA_kJ 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 HXt~ql1YSQZ literal 6134 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 I&fy$qV^Z1nKL7v# diff --git a/.tmux.conf.local b/.tmux.conf.local index 2e128e3..b14d620 100644 --- a/.tmux.conf.local +++ b/.tmux.conf.local @@ -409,19 +409,34 @@ set -g @plugin 'laktak/extrakto' # WARNING: hex colors can't contain capital letters # --> Catppuccin -thm_bg="#1e1e28" -thm_fg="#dadae8" -thm_cyan="#c2e7f0" -thm_black="#15121c" -thm_gray="#332e41" -thm_magenta="#c6aae8" -thm_pink="#e5b4e2" -thm_red="#e38c8f" -thm_green="#b1e3ad" -thm_yellow="#ebddaa" -thm_blue="#a4b9ef" -thm_orange="#f9c096" -thm_black4="#575268" +# thm_bg="#1e1e28" +# thm_fg="#dadae8" +# thm_cyan="#c2e7f0" +# thm_black="#15121c" +# thm_gray="#332e41" +# thm_magenta="#c6aae8" +# thm_pink="#e5b4e2" +# thm_red="#e38c8f" +# thm_green="#b1e3ad" +# thm_yellow="#ebddaa" +# thm_blue="#a4b9ef" +# thm_orange="#f9c096" +# thm_black4="#575268" + +# --> Catppuccin (Mocha) +thm_bg="#1e1e2e" +thm_fg="#cdd6f4" +thm_cyan="#89dceb" +thm_black="#181825" +thm_gray="#313244" +thm_magenta="#cba6f7" +thm_pink="#f5c2e7" +thm_red="#f38ba8" +thm_green="#a6e3a1" +thm_yellow="#f9e2af" +thm_blue="#89b4fa" +thm_orange="#fab387" +thm_black4="#585b70" # ----------------------------=== Theme ===-------------------------- diff --git a/.zshrc b/.zshrc index e8d4fbc..1e01307 100644 --- a/.zshrc +++ b/.zshrc @@ -1,5 +1,8 @@ -export PATH="${PATH}:${HOME}/.local/bin" +# zmodload zsh/zprof +export PATH="${PATH}:${HOME}/.local/bin" +export XDG_CONFIG_HOME="${HOME}/.config" +export ENHANCD_FILTER=fzy:fzf:peco # zmodload zsh/zprof ZSH_DISABLE_COMPFIX=true @@ -8,7 +11,8 @@ setopt HIST_IGNORE_SPACE # export PATH=$HOME/bin:/usr/local/bin:$PATH # Path to your oh-my-zsh installation. -export ZSH="$HOME/.oh-my-zsh" +#export ZSH="$HOME/.oh-my-zsh" +export ZSH="${HOME}/.local/share/sheldon/repos/github.com/ohmyzsh/ohmyzsh" # Set name of the theme to load --- if set to "random", it will # load a random theme each time oh-my-zsh is loaded, in which case, @@ -77,9 +81,10 @@ fi # Custom plugins may be added to $ZSH_CUSTOM/plugins/ # Example format: plugins=(rails git textmate ruby lighthouse) # Add wisely, as too many plugins slow down shell startup. -plugins=(vi-mode git fzf aws vscode dash zoxide thefuck zsh-syntax-highlighting jq forgit) +# plugins=(vi-mode git fzf aws vscode dash zoxide thefuck zsh-syntax-highlighting jq forgit) +plugins=(vi-mode git fzf aws dash zoxide zsh-syntax-highlighting jq sd) -source $ZSH/oh-my-zsh.sh +#source $ZSH/oh-my-zsh.sh # User configuration @@ -111,9 +116,17 @@ source $ZSH/oh-my-zsh.sh # uninstall by removing these lines # [ -f ~/.config/tabtab/__tabtab.fish ]; and . ~/.config/tabtab/__tabtab.fish; or true +eval "$(sheldon source)" source <("/usr/local/bin/starship" init zsh --print-full-init) # zprof # Add RVM to PATH for scripting. Make sure this is the last PATH variable change. export PATH="$PATH:$HOME/.rvm/bin" + +# zprof + +# pnpm +export PNPM_HOME="/Users/tedkulp/Library/pnpm" +export PATH="$PNPM_HOME:$PATH" +# pnpm end \ No newline at end of file