chore(config): updated paths, cleaned old files

This commit is contained in:
2023-08-15 12:11:24 +03:00
parent a103fbddbe
commit 2f043d8b37
7 changed files with 97 additions and 111 deletions

1
.gitignore vendored
View File

@@ -8,6 +8,7 @@ config/fzf
config/cheat/cheatsheets/pure-bash-bible/*
config/cheat/cheatsheets/tldr/*
config/git/credentials
config/npm/npmrc
config/zsh/.zcompdump
ssh/local.d/*
!ssh/local.d/.gitkeep

View File

@@ -1,6 +0,0 @@
{
"version": 1,
"cli": {
"analytics": false
}
}

View File

@@ -1,13 +1,6 @@
# this is my zsh config. there are many like it, but this one is mine.
# shellcheck shell=bash
# Enable Powerlevel10k instant prompt. Should stay close to the top of ~/.zshrc.
# Initialization code that may require console input (password prompts, [y/n]
# confirmations, etc.) must go above this block; everything else may go below.
if [[ -r "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh" ]]; then
source "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh"
fi
# Defaults
export DOTFILES="$HOME/.dotfiles"
# shellcheck source=shared.sh
@@ -38,14 +31,13 @@ x-dc "$ZSH_CUSTOM_COMPLETION_PATH"
# Add completion scripts to zsh path
FPATH="$ZSH_CUSTOM_COMPLETION_PATH:$FPATH"
autoload -Uz compinit
compinit -d "$XDG_CACHE_HOME"/zsh/zcompdump-"$ZSH_VERSION"
if type brew &>/dev/null
then
FPATH="$(brew --prefix)/share/zsh/site-functions:${FPATH}"
compinit -d "$XDG_CACHE_HOME"/zsh/zcompdump-"$ZSH_VERSION"
fi
compinit -d "$XDG_CACHE_HOME"/zsh/zcompdump-"$ZSH_VERSION"
# Import ssh keys in keychain
ssh-add -A 2>/dev/null;
@@ -67,8 +59,6 @@ have antigen && {
[ -f "${DOTFILES}/config/fzf/fzf.zsh" ] \
&& source "${DOTFILES}/config/fzf/fzf.zsh"
export LESSHISTFILE="$XDG_CACHE_HOME"/less_history
# To customize prompt, run `p10k configure` or edit ~/.p10k.zsh.
export P10K_LOCATION="$XDG_CONFIG_HOME/zsh/p10k.zsh"
[[ ! -f $P10K_LOCATION ]] || source $P10K_LOCATION

View File

@@ -17,16 +17,11 @@ export XDG_BIN_HOME="$HOME/.local/bin"
export XDG_CACHE_HOME="$HOME/.cache"
export XDG_RUNTIME_DIR="$HOME/.local/run"
eval "$(brew shellenv)"
export HOMEBREW_PREFIX="$XDG_STATE_HOME/homebrew"
export HOMEBREW_BIN="$HOMEBREW_PREFIX/bin"
export HOMEBREW_PKG="$HOMEBREW_PREFIX/opt"
export HOMEBREW_SBIN="$HOMEBREW_PREFIX/sbin"
path_append "/opt/homebrew/bin"
have brew && eval "$(brew shellenv)"
path_append "/usr/local/bin"
path_prepend "$XDG_BIN_HOME"
path_append "$XDG_BIN_HOME"
# brew, https://brew.sh
have brew && {

View File

@@ -77,6 +77,8 @@ export NVM_DIR="$XDG_CONFIG_HOME/nvm"
[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm
[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" # This loads nvm bash_completion
export NPM_CONFIG_USERCONFIG="$XDG_CONFIG_HOME"/npm/npmrc
# Add npm packages to path
have node && {
NVM_NODE_BIN_DIR="$(dirname "$(which node)")"
@@ -115,7 +117,7 @@ have gem && path_append "$(gem environment gemdir)/bin"
have rbenv && eval "$(rbenv init - zsh)"
# Rust / cargo
export CARGO_HOME="$XDG_STATE_HOME/cargo"
export CARGO_HOME="$XDG_DATA_HOME/cargo"
path_append "$CARGO_HOME/bin"
# screen

View File

@@ -62,6 +62,8 @@ brew "asdf"
brew "aspell"
# Official Amazon AWS command-line interface
brew "awscli"
# Bourne-Again SHell, a UNIX command interpreter
brew "bash"
# Clone of cat(1) with syntax highlighting and Git integration
brew "bat"
# Yet another cross-platform graphical process/system monitor
@@ -102,12 +104,6 @@ brew "dotenv-linter"
brew "editorconfig-checker"
# Useful examples at the command-line
brew "eg-examples"
# C/C++ and Java libraries for Unicode and globalization
brew "icu4c"
# OpenType text shaping engine
brew "harfbuzz"
# Development kit for the Java programming language
brew "openjdk"
# Run arbitrary commands when files change
brew "entr"
# Perl lib for reading and writing EXIF metadata
@@ -156,6 +152,10 @@ brew "gpgme"
brew "gpg-tui"
# Image manipulation
brew "netpbm"
# C/C++ and Java libraries for Unicode and globalization
brew "icu4c"
# OpenType text shaping engine
brew "harfbuzz"
# Framework for layout and rendering of i18n text
brew "pango"
# Library to render SVG files using Cairo
@@ -210,6 +210,8 @@ brew "nvm"
brew "openjdk@11"
# Generate clients, server & docs from an OpenAPI spec (v2, v3)
brew "openapi-generator"
# Development kit for the Java programming language
brew "openjdk"
# Swiss-army knife of markup format conversion
brew "pandoc"
# Highly capable, feature-rich programming language

View File

@@ -377,208 +377,208 @@
<key>Alpha Component</key>
<real>1</real>
<key>Blue Component</key>
<real>0.35294117647058826</real>
<real>0.11764705926179886</real>
<key>Color Space</key>
<string>sRGB</string>
<key>Green Component</key>
<real>0.27843137254901962</real>
<real>0.098039217293262482</real>
<key>Red Component</key>
<real>0.27058823529411763</real>
<real>0.078431375324726105</real>
</dict>
<key>Ansi 1 Color</key>
<dict>
<key>Alpha Component</key>
<real>1</real>
<key>Blue Component</key>
<real>0.6588235294117647</real>
<real>0.16300037503242493</real>
<key>Color Space</key>
<string>sRGB</string>
<key>Green Component</key>
<real>0.54509803921568623</real>
<real>0.23660069704055786</real>
<key>Red Component</key>
<real>0.95294117647058818</real>
<real>0.7074432373046875</real>
</dict>
<key>Ansi 10 Color</key>
<dict>
<key>Alpha Component</key>
<real>1</real>
<key>Blue Component</key>
<real>0.63137254901960782</real>
<real>0.56541937589645386</real>
<key>Color Space</key>
<string>sRGB</string>
<key>Green Component</key>
<real>0.8901960784313725</real>
<real>0.9042816162109375</real>
<key>Red Component</key>
<real>0.65098039215686276</real>
<real>0.3450070321559906</real>
</dict>
<key>Ansi 11 Color</key>
<dict>
<key>Alpha Component</key>
<real>1</real>
<key>Blue Component</key>
<real>0.68627450980392157</real>
<real>0.0</real>
<key>Color Space</key>
<string>sRGB</string>
<key>Green Component</key>
<real>0.88627450980392153</real>
<real>0.8833775520324707</real>
<key>Red Component</key>
<real>0.97647058823529409</real>
<real>0.9259033203125</real>
</dict>
<key>Ansi 12 Color</key>
<dict>
<key>Alpha Component</key>
<real>1</real>
<key>Blue Component</key>
<real>0.98039215686274506</real>
<real>0.9485321044921875</real>
<key>Color Space</key>
<string>sRGB</string>
<key>Green Component</key>
<real>0.70588235294117652</real>
<real>0.67044717073440552</real>
<key>Red Component</key>
<real>0.53725490196078429</real>
<real>0.65349078178405762</real>
</dict>
<key>Ansi 13 Color</key>
<dict>
<key>Alpha Component</key>
<real>1</real>
<key>Blue Component</key>
<real>0.90588235294117647</real>
<real>0.8821563720703125</real>
<key>Color Space</key>
<string>sRGB</string>
<key>Green Component</key>
<real>0.76078431372549016</real>
<real>0.4927266538143158</real>
<key>Red Component</key>
<real>0.96078431372549022</real>
<real>0.8821563720703125</real>
</dict>
<key>Ansi 14 Color</key>
<dict>
<key>Alpha Component</key>
<real>1</real>
<key>Blue Component</key>
<real>0.83529411764705885</real>
<real>1</real>
<key>Color Space</key>
<string>sRGB</string>
<key>Green Component</key>
<real>0.88627450980392153</real>
<real>0.99263292551040649</real>
<key>Red Component</key>
<real>0.58039215686274515</real>
<real>0.37597531080245972</real>
</dict>
<key>Ansi 15 Color</key>
<dict>
<key>Alpha Component</key>
<real>1</real>
<key>Blue Component</key>
<real>0.78431372549019607</real>
<real>1</real>
<key>Color Space</key>
<string>sRGB</string>
<key>Green Component</key>
<real>0.67843137254901964</real>
<real>1</real>
<key>Red Component</key>
<real>0.65098039215686276</real>
<real>0.99999600648880005</real>
</dict>
<key>Ansi 2 Color</key>
<dict>
<key>Alpha Component</key>
<real>1</real>
<key>Blue Component</key>
<real>0.63137254901960782</real>
<real>0.0</real>
<key>Color Space</key>
<string>sRGB</string>
<key>Green Component</key>
<real>0.8901960784313725</real>
<real>0.7607843279838562</real>
<key>Red Component</key>
<real>0.65098039215686276</real>
<real>0.0</real>
</dict>
<key>Ansi 3 Color</key>
<dict>
<key>Alpha Component</key>
<real>1</real>
<key>Blue Component</key>
<real>0.68627450980392157</real>
<real>0.0</real>
<key>Color Space</key>
<string>sRGB</string>
<key>Green Component</key>
<real>0.88627450980392153</real>
<real>0.76959484815597534</real>
<key>Red Component</key>
<real>0.97647058823529409</real>
<real>0.78058648109436035</real>
</dict>
<key>Ansi 4 Color</key>
<dict>
<key>Alpha Component</key>
<real>1</real>
<key>Blue Component</key>
<real>0.98039215686274506</real>
<real>0.78216177225112915</real>
<key>Color Space</key>
<string>sRGB</string>
<key>Green Component</key>
<real>0.70588235294117652</real>
<real>0.26474356651306152</real>
<key>Red Component</key>
<real>0.53725490196078429</real>
<real>0.15404300391674042</real>
</dict>
<key>Ansi 5 Color</key>
<dict>
<key>Alpha Component</key>
<real>1</real>
<key>Blue Component</key>
<real>0.90588235294117647</real>
<real>0.74494361877441406</real>
<key>Color Space</key>
<string>sRGB</string>
<key>Green Component</key>
<real>0.76078431372549016</real>
<real>0.24931684136390686</real>
<key>Red Component</key>
<real>0.96078431372549022</real>
<real>0.752197265625</real>
</dict>
<key>Ansi 6 Color</key>
<dict>
<key>Alpha Component</key>
<real>1</real>
<key>Blue Component</key>
<real>0.83529411764705885</real>
<real>0.78166204690933228</real>
<key>Color Space</key>
<string>sRGB</string>
<key>Green Component</key>
<real>0.88627450980392153</real>
<real>0.77425903081893921</real>
<key>Red Component</key>
<real>0.58039215686274515</real>
<real>0.0</real>
</dict>
<key>Ansi 7 Color</key>
<dict>
<key>Alpha Component</key>
<real>1</real>
<key>Blue Component</key>
<real>0.87058823529411766</real>
<real>0.78104829788208008</real>
<key>Color Space</key>
<string>sRGB</string>
<key>Green Component</key>
<real>0.76078431372549016</real>
<real>0.78105825185775757</real>
<key>Red Component</key>
<real>0.72941176470588232</real>
<real>0.7810397744178772</real>
</dict>
<key>Ansi 8 Color</key>
<dict>
<key>Alpha Component</key>
<real>1</real>
<key>Blue Component</key>
<real>0.4392156862745098</real>
<real>0.4078223705291748</real>
<key>Color Space</key>
<string>sRGB</string>
<key>Green Component</key>
<real>0.35686274509803922</real>
<real>0.40782788395881653</real>
<key>Red Component</key>
<real>0.34509803921568627</real>
<real>0.40781760215759277</real>
</dict>
<key>Ansi 9 Color</key>
<dict>
<key>Alpha Component</key>
<real>1</real>
<key>Blue Component</key>
<real>0.6588235294117647</real>
<real>0.45833224058151245</real>
<key>Color Space</key>
<string>sRGB</string>
<key>Green Component</key>
<real>0.54509803921568623</real>
<real>0.47524076700210571</real>
<key>Red Component</key>
<real>0.95294117647058818</real>
<real>0.8659515380859375</real>
</dict>
<key>BM Growl</key>
<true/>
@@ -587,13 +587,13 @@
<key>Alpha Component</key>
<real>1</real>
<key>Blue Component</key>
<real>0.1803921568627451</real>
<real>0.12103271484375</real>
<key>Color Space</key>
<string>sRGB</string>
<key>Green Component</key>
<real>0.11764705882352941</real>
<real>0.099111050367355347</real>
<key>Red Component</key>
<real>0.11764705882352941</real>
<real>0.0806884765625</real>
</dict>
<key>Background Image Location</key>
<string></string>
@@ -602,11 +602,11 @@
<key>Alpha Component</key>
<real>0.5</real>
<key>Blue Component</key>
<real>0.0</real>
<real>1</real>
<key>Color Space</key>
<string>sRGB</string>
<key>Green Component</key>
<real>0.14910030364990234</real>
<real>1</real>
<key>Red Component</key>
<real>1</real>
</dict>
@@ -621,13 +621,13 @@
<key>Alpha Component</key>
<real>1</real>
<key>Blue Component</key>
<real>0.95686274509803926</real>
<real>1</real>
<key>Color Space</key>
<string>sRGB</string>
<key>Green Component</key>
<real>0.83921568627450982</real>
<real>1</real>
<key>Red Component</key>
<real>0.80392156862745101</real>
<real>0.99999600648880005</real>
</dict>
<key>Character Encoding</key>
<integer>4</integer>
@@ -642,40 +642,42 @@
<key>Alpha Component</key>
<real>1</real>
<key>Blue Component</key>
<real>0.86274509803921573</real>
<real>0.99998724460601807</real>
<key>Color Space</key>
<string>sRGB</string>
<key>Green Component</key>
<real>0.8784313725490196</real>
<real>1</real>
<key>Red Component</key>
<real>0.96078431372549022</real>
<real>0.99997633695602417</real>
</dict>
<key>Cursor Guide Color</key>
<dict>
<key>Alpha Component</key>
<real>0.070000000000000007</real>
<real>0.25</real>
<key>Blue Component</key>
<real>0.95686274509803926</real>
<real>1</real>
<key>Color Space</key>
<string>sRGB</string>
<key>Green Component</key>
<real>0.83921568627450982</real>
<real>0.9268307089805603</real>
<key>Red Component</key>
<real>0.80392156862745101</real>
<real>0.70213186740875244</real>
</dict>
<key>Cursor Text Color</key>
<dict>
<key>Alpha Component</key>
<real>1</real>
<key>Blue Component</key>
<real>0.95686274509803926</real>
<real>0.0</real>
<key>Color Space</key>
<string>sRGB</string>
<key>Green Component</key>
<real>0.83921568627450982</real>
<real>0.0</real>
<key>Red Component</key>
<real>0.80392156862745101</real>
<real>0.0</real>
</dict>
<key>Cursor Type</key>
<integer>1</integer>
<key>Custom Command</key>
<string>No</string>
<key>Custom Directory</key>
@@ -695,13 +697,13 @@
<key>Alpha Component</key>
<real>1</real>
<key>Blue Component</key>
<real>0.95686274509803926</real>
<real>0.86198854446411133</real>
<key>Color Space</key>
<string>sRGB</string>
<key>Green Component</key>
<real>0.83921568627450982</real>
<real>0.86199951171875</real>
<key>Red Component</key>
<real>0.80392156862745101</real>
<real>0.86197912693023682</real>
</dict>
<key>Guid</key>
<string>B563F48B-314D-48CC-908E-ACA971D430BE</string>
@@ -1004,13 +1006,13 @@
<key>Alpha Component</key>
<real>1</real>
<key>Blue Component</key>
<real>0.92156862745098034</real>
<real>0.9337158203125</real>
<key>Color Space</key>
<string>sRGB</string>
<key>Green Component</key>
<real>0.86274509803921573</real>
<real>0.55789834260940552</real>
<key>Red Component</key>
<real>0.53725490196078429</real>
<real>0.19802422821521759</real>
</dict>
<key>Mouse Reporting</key>
<true/>
@@ -1035,7 +1037,7 @@
<key>Right Option Key Sends</key>
<integer>0</integer>
<key>Rows</key>
<integer>25</integer>
<integer>40</integer>
<key>Screen</key>
<integer>-1</integer>
<key>Scrollback Lines</key>
@@ -1045,26 +1047,26 @@
<key>Alpha Component</key>
<real>1</real>
<key>Blue Component</key>
<real>0.95686274509803926</real>
<real>0.0</real>
<key>Color Space</key>
<string>sRGB</string>
<key>Green Component</key>
<real>0.83921568627450982</real>
<real>0.0</real>
<key>Red Component</key>
<real>0.80392156862745101</real>
<real>0.0</real>
</dict>
<key>Selection Color</key>
<dict>
<key>Alpha Component</key>
<real>1</real>
<key>Blue Component</key>
<real>0.4392156862745098</real>
<real>1</real>
<key>Color Space</key>
<string>sRGB</string>
<key>Green Component</key>
<real>0.35686274509803922</real>
<real>0.84313726425170898</real>
<key>Red Component</key>
<real>0.34509803921568627</real>
<real>0.70196080207824707</real>
</dict>
<key>Send Code When Idle</key>
<false/>