bunch oh updates

This commit is contained in:
Daylin Morgan 2023-02-20 10:10:52 -06:00
parent aeac63b7e8
commit 441b1a6c0f
6 changed files with 32 additions and 89 deletions

24
home/dot_zshenv Normal file
View file

@ -0,0 +1,24 @@
#!/usr/bin/env zsh
#
# .zshenv - Zsh environment file, loaded always.
#
# NOTE: .zshenv has to live at ~/.zshenv, not in $ZDOTDIR! You can get around this by
# symlinking .zshenv from your $ZDOTDIR: `ln -sf $ZDOTDIR/.zshenv ~/.zshenv`
#
#
# ZDOTDIR
#
export XDG_CONFIG_HOME=${XDG_CONFIG_HOME:-${HOME}/.config}
export ZDOTDIR=${ZDOTDIR:-${XDG_CONFIG_HOME}/zsh}
#
# .zprofile
#
# We use .zprofile for everything else (load for non-login, non-interactive shells).
if [[ ( "$SHLVL" -eq 1 && ! -o LOGIN ) && -s "${ZDOTDIR:-$HOME}/.zprofile" ]]; then
source "${ZDOTDIR:-$HOME}/.zprofile"
fi

View file

@ -14,7 +14,7 @@ alias rr="rm -rf"
# more ways to ls # more ways to ls
alias ls="ls --group-directories-first --color=always" alias ls="ls --group-directories-first --color=always"
alias l='ls -lh' alias l='ls -lh'
alias la='ls -lAh' alias la='ls -a'
alias ldot='ls -ld .*' alias ldot='ls -ld .*'
alias lr='ls -R' alias lr='ls -R'
alias lsl="ls -lhFA --color=always | less" alias lsl="ls -lhFA --color=always | less"
@ -35,3 +35,4 @@ alias urlencode='python3 -c "import sys, urllib.parse as ul; \
alias zshrc='${EDITOR:-vim} "${ZDOTDIR:-$HOME}"/.zshrc' alias zshrc='${EDITOR:-vim} "${ZDOTDIR:-$HOME}"/.zshrc'
# alias zbench='for i in {1..10}; do /usr/bin/time zsh -lic exit; done' # alias zbench='for i in {1..10}; do /usr/bin/time zsh -lic exit; done'
alias zdot='cd ${ZDOTDIR:-~}' alias zdot='cd ${ZDOTDIR:-~}'

View file

@ -1,35 +1,5 @@
#
# .zsh_plugins.txt - antidote plugins file
#
### Overview
#
# The `.zsh_plugins.txt` file is used by antidote to configure Zsh bundles. Bundles are
# just a fancy way of referring to Zsh utilities, frameworks, prompts, or plugins.
# `.zsh_plugins.txt` is used by antidote to generate a static `.zsh_plugins.zsh` file,
# which can then be sourced in your `.zshrc`. You can use this file as a starting point
# for your own config. Strip out instructional comments (ie: lines beginning with a '#')
# and any plugins you don't need, then add what you like and make it yours!
#
# NOTE: Order matters in this file! Some bundles need to be last, and others are
# prerequisites. Read the documentation for the plugins you use to ensure proper
# configuration.
#
###
### Utilities
#
# Utilities aren't traditional Zsh plugins - they aren't sourced Zsh scripts. Instead
# they provide commands that can be executed from your terminal session. One good
# example is zsh-bench, which is a utility that benchmarks your Zsh config. Utility
# bundles can often be made available simply with the `kind:path` annotation.
#
###
romkatv/zsh-bench kind:path romkatv/zsh-bench kind:path
### Framework: Oh-My-Zsh
ohmyzsh/ohmyzsh path:lib/clipboard.zsh ohmyzsh/ohmyzsh path:lib/clipboard.zsh
ohmyzsh/ohmyzsh path:plugins/copybuffer ohmyzsh/ohmyzsh path:plugins/copybuffer
ohmyzsh/ohmyzsh path:plugins/copyfile ohmyzsh/ohmyzsh path:plugins/copyfile
@ -38,67 +8,16 @@ ohmyzsh/ohmyzsh path:plugins/extract
ohmyzsh/ohmyzsh path:plugins/magic-enter ohmyzsh/ohmyzsh path:plugins/magic-enter
ohmyzsh/ohmyzsh path:plugins/fancy-ctrl-z ohmyzsh/ohmyzsh path:plugins/fancy-ctrl-z
### Framework: zsh-utils
#
# zsh-utils is a micro-framework that is also well suited to pair with antidote. It
# provides much of the same core functionality from other bigger frameworks without the
# bloat or performance hit. Using zsh-utils, you may find you don't need much else.
# If you want a really thin framework, this is great.
#
###
belak/zsh-utils path:history belak/zsh-utils path:history
belak/zsh-utils path:utility belak/zsh-utils path:utility
#belak/zsh-utils path:editor
#belak/zsh-utils path:prompt
#belak/zsh-utils path:completion
### Deferred Plugins
#
# Antidote allows you to defer loading plugins. This is similar to concepts like "turbo
# mode" in other plugin managers. Antidote handles deferring plugins by leveraging
# romkatv/zsh-defer, which "defers execution of a zsh command until zsh has nothing else
# to do and is waiting for user input". In general, you should not defer plugins unless
# you know for sure they properly support deferred loading, and there are no adverse
# side-effects (see: https://github.com/romkatv/zsh-defer#Caveats). However, for
# certain plugins, this can greatly increase your zsh startup speed.
#
###
# Syntax highlighting
#zsh-users/zsh-syntax-highlighting kind:defer
zdharma-continuum/fast-syntax-highlighting kind:defer zdharma-continuum/fast-syntax-highlighting kind:defer
Aloxaf/fzf-tab kind:defer Aloxaf/fzf-tab kind:defer
### Completions
#
# You may want to add some additional completions to Zsh. Completions look in your fpath
# for completion functions, which are functions named with a leading underscore
# (eg: _git). You need to add all supplemental completions to your fpath prior to
# running `compinit` to use completions functionality properly. You will want to find
# a completion plugin that runs `compinit` for you, or you can run it yourself in
# your .zshrc after antidote loads like this:
#
# autoload -Uz compinit && compinit
#
###
# zsh-users/zsh-completions is a popular plugin for adding supplemental completions.
# We combine the `path:` and `kind:fpath` annotations here:
zsh-users/zsh-completions path:src kind:fpath zsh-users/zsh-completions path:src kind:fpath
# doesn't play well with fzf-tab
# belak/zsh-utils path:completion
# Compinit plugins should be near the end of .zsh_plugins.txt so that $fpath has been
# fully populated. Use zsh-utils for its completion plugin.
belak/zsh-utils path:completion
### Final Plugins
#
# Remember plugin order matters! Put plugins that need run last at the bottom of your
# .zsh_plugins.txt file.
#
###
# Add fzf completions scripts
junegunn/fzf path:shell/completion.zsh junegunn/fzf path:shell/completion.zsh
junegunn/fzf path:shell/key-bindings.zsh junegunn/fzf path:shell/key-bindings.zsh
@ -107,7 +26,6 @@ mattmc3/zshrc.d
~/.config/zsh/plugins/zexists ~/.config/zsh/plugins/zexists
# These popular core plugins should be loaded at the end # These popular core plugins should be loaded at the end
zsh-users/zsh-autosuggestions kind:defer # zsh-users/zsh-autosuggestions kind:defer
zsh-users/zsh-history-substring-search
# vim: ft=zsh sw=2 ts=2 et # vim: ft=zsh sw=2 ts=2 et

View file

@ -1,3 +1,4 @@
#!/usr/bin/env zsh
# #
# .zshrc - Zsh file loaded on interactive shell sessions. # .zshrc - Zsh file loaded on interactive shell sessions.
# #
@ -60,4 +61,3 @@ fi
# Source your static plugins file. # Source your static plugins file.
source $zsh_plugins source $zsh_plugins
# vim: ft=zsh sw=2 ts=2 et

View file

@ -1,6 +1,5 @@
##? envsubst - fall-back wrapper in the event the envsubst command does not exist. ##? envsubst - fall-back wrapper in the event the envsubst command does not exist.
# function envsubst {
if (( ! $+commands[envsubst] )); then if (( ! $+commands[envsubst] )); then
function envsubst { function envsubst {
command envsubst "$@" command envsubst "$@"
@ -10,6 +9,5 @@ else
python -c 'import os,sys;[sys.stdout.write(os.path.expandvars(l)) for l in sys.stdin]' python -c 'import os,sys;[sys.stdout.write(os.path.expandvars(l)) for l in sys.stdin]'
} }
fi fi
# }
# vim: ft=zsh sw=2 ts=2 et # vim: ft=zsh sw=2 ts=2 et

View file

@ -1 +1,3 @@
alias lg=lazygit alias lg=lazygit
alias dots-git='lazygit -p ~/.dotfiles'