diff --git a/.zsh/.p10k.zsh b/.config/zsh/.p10k.zsh similarity index 100% rename from .zsh/.p10k.zsh rename to .config/zsh/.p10k.zsh diff --git a/.zsh/.zsh_plugins.txt b/.config/zsh/.zsh_plugins.txt similarity index 100% rename from .zsh/.zsh_plugins.txt rename to .config/zsh/.zsh_plugins.txt diff --git a/.config/zsh/.zsh_plugins.zsh b/.config/zsh/.zsh_plugins.zsh new file mode 100644 index 0000000..e764ef6 --- /dev/null +++ b/.config/zsh/.zsh_plugins.zsh @@ -0,0 +1,9 @@ +fpath+=( $HOME/.cache/antidote/https-COLON--SLASH--SLASH-github.com-SLASH-zsh-users-SLASH-zsh-autosuggestions ) +source $HOME/.cache/antidote/https-COLON--SLASH--SLASH-github.com-SLASH-zsh-users-SLASH-zsh-autosuggestions/zsh-autosuggestions.plugin.zsh +fpath+=( $HOME/.cache/antidote/https-COLON--SLASH--SLASH-github.com-SLASH-zsh-users-SLASH-zsh-syntax-highlighting ) +source $HOME/.cache/antidote/https-COLON--SLASH--SLASH-github.com-SLASH-zsh-users-SLASH-zsh-syntax-highlighting/zsh-syntax-highlighting.plugin.zsh +fpath+=( $HOME/.cache/antidote/https-COLON--SLASH--SLASH-github.com-SLASH-zsh-users-SLASH-zsh-completions ) +source $HOME/.cache/antidote/https-COLON--SLASH--SLASH-github.com-SLASH-zsh-users-SLASH-zsh-completions/zsh-completions.plugin.zsh +fpath+=( $HOME/.cache/antidote/https-COLON--SLASH--SLASH-github.com-SLASH-romkatv-SLASH-powerlevel10k ) +source $HOME/.cache/antidote/https-COLON--SLASH--SLASH-github.com-SLASH-romkatv-SLASH-powerlevel10k/powerlevel10k.zsh-theme +source $HOME/.cache/antidote/https-COLON--SLASH--SLASH-github.com-SLASH-romkatv-SLASH-powerlevel10k/powerlevel9k.zsh-theme diff --git a/.zsh/.zshrc b/.config/zsh/.zshrc similarity index 97% rename from .zsh/.zshrc rename to .config/zsh/.zshrc index c6f75d3..3932234 100644 --- a/.zsh/.zshrc +++ b/.config/zsh/.zshrc @@ -65,4 +65,4 @@ alias -g -- --help='--help 2>&1 | bat --language=help --style=plain' eval "$(direnv hook zsh)" # To customize prompt, run `p10k configure` or edit ~/.zsh/.p10k.zsh. -[[ ! -f ~/.zsh/.p10k.zsh ]] || source ~/.zsh/.p10k.zsh +[[ ! -f "$ZDOTDIR/.p10k.zsh" ]] || source $ZDOTDIR/.p10k.zsh diff --git a/.config/zsh/antidote b/.config/zsh/antidote new file mode 160000 index 0000000..4858ab3 --- /dev/null +++ b/.config/zsh/antidote @@ -0,0 +1 @@ +Subproject commit 4858ab37c1cef407bf4bc3b398b28fb71c5ee954 diff --git a/.zsh/bd.zsh b/.config/zsh/bd.zsh similarity index 100% rename from .zsh/bd.zsh rename to .config/zsh/bd.zsh diff --git a/.zsh/completion.zsh b/.config/zsh/completion.zsh similarity index 100% rename from .zsh/completion.zsh rename to .config/zsh/completion.zsh diff --git a/.zsh/completions/_tldr b/.config/zsh/completions/_tldr similarity index 100% rename from .zsh/completions/_tldr rename to .config/zsh/completions/_tldr diff --git a/.gitignore b/.gitignore index 7749d0d..61eab3b 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,18 @@ /.config/google-chrome /.config/inkscape /.config/configstore +/.config/borgmqtt +/.config/dconf +/.config/fish +/.config/gtk-2.0 +/.config/pulse +/.config/ros.org +/.config/ruff +/.config/uv +/.config/wslu +/.config/Qt* +.bash* + + +# don't include self +/.config/dotfiles diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..b9c95b9 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule ".config/zsh/antidote"] + path = .config/zsh/antidote + url = https://github.com/mattmc3/antidote.git diff --git a/.zshenv b/.zshenv index 6bd4d1a..72e7b8e 100644 --- a/.zshenv +++ b/.zshenv @@ -1,5 +1,9 @@ +export XDG_CONFIG_HOME="$HOME/.config" +export XDG_CACHE_HOME="$HOME/.cache" + +export ZDOTDIR="$XDG_CONFIG_HOME/zsh" + # editor -export ZDOTDIR="$HOME/.zsh" export EDITOR="nvim" export VISUAL="nvim" @@ -15,6 +19,8 @@ export VISUAL="nvim" export VCPKG_ROOT=~/.vcpkg export PATH=$VCPKG_ROOT:$PATH + +# cmake export CMAKE_COLOR_DIAGNOSTICS=ON export CMAKE_GENERATOR="Ninja"