diff options
| author | Ruben Beltran del Rio <ruben@unlimited.pizza> | 2022-04-15 11:09:03 +0200 |
|---|---|---|
| committer | Ruben Beltran del Rio <ruben@unlimited.pizza> | 2022-04-15 11:09:03 +0200 |
| commit | 62cd2be5faf5d6523656b4245d1790c99fb5af9f (patch) | |
| tree | da4921f573168545c7821dcd4f955c07472d1d13 | |
| parent | c67dd2dbe9732ad91b8ec844eee3b7daa5c98ad4 (diff) | |
| parent | 27561e82e7e8c73ef73d9d25e66b677b71106108 (diff) | |
Merge branch 'main' of gitlab.com:rbdr/dotfiles
| -rw-r--r-- | config/kitty/kitty.conf | 2 | ||||
| -rw-r--r-- | provisioning/brew_essential | 2 | ||||
| -rw-r--r-- | runcoms/zshrc | 5 | ||||
| -rwxr-xr-x | vimrc | 1 | ||||
| -rw-r--r-- | zsh/functions/prettify-json.zsh | 3 | ||||
| -rw-r--r-- | zsh/modules/aliases.zsh | 2 |
6 files changed, 10 insertions, 5 deletions
diff --git a/config/kitty/kitty.conf b/config/kitty/kitty.conf index 7b02389..4cf056d 100644 --- a/config/kitty/kitty.conf +++ b/config/kitty/kitty.conf @@ -1,6 +1,6 @@ # Font font_family Hasklig -font_size 16.0 +font_size 14.0 # Cursor cursor #eeeeee diff --git a/provisioning/brew_essential b/provisioning/brew_essential index aa1fbaa..e516cbf 100644 --- a/provisioning/brew_essential +++ b/provisioning/brew_essential @@ -1,6 +1,7 @@ asdf bat curl +exa fd fortune fzf @@ -10,7 +11,6 @@ ripgrep tmux tree v -vim neovim watch wget diff --git a/runcoms/zshrc b/runcoms/zshrc index 272938e..3166acf 100644 --- a/runcoms/zshrc +++ b/runcoms/zshrc @@ -6,6 +6,7 @@ source "${ZDOTDIR:-$HOME}/.dotfiles/zsh/functions/dotenv.zsh" source "${ZDOTDIR:-$HOME}/.dotfiles/zsh/functions/graphviz.zsh" source "${ZDOTDIR:-$HOME}/.dotfiles/zsh/functions/short-uptime.zsh" source "${ZDOTDIR:-$HOME}/.dotfiles/zsh/functions/figlet-sample.zsh" +source "${ZDOTDIR:-$HOME}/.dotfiles/zsh/functions/prettify-json.zsh" ################################################################################ # Load Modules @@ -49,6 +50,8 @@ export VIRTUALENVWRAPPER_PYTHON="/usr/local/bin/python3" export GPG_TTY=$(tty) # FZF Config +[ -f ~/.fzf.zsh ] && source ~/.fzf.zsh + export FZF_DEFAULT_COMMAND='/usr/bin/env rg --color never --files --hidden -g \!.git' export FZF_DEFAULT_OPTS='--preview ''bat --style=numbers --color=always {} | head -500''' if [[ -s "/opt/homebrew/bin/brew" ]]; then @@ -71,8 +74,6 @@ if [[ -s "${ZDOTDIR:-$HOME}/.zshrc.local" ]]; then source "${ZDOTDIR:-$HOME}/.zshrc.local" fi -eval $(/usr/libexec/path_helper -s) - if [[ -s "/opt/homebrew/bin/brew" ]]; then export PATH=/opt/homebrew/bin:/opt/homebrew/sbin:$PATH fi @@ -219,6 +219,7 @@ Plug 'jparise/vim-graphql' Plug 'tpope/vim-endwise' Plug 'rstacruz/vim-closer' Plug 'michaeljsmith/vim-indent-object' +Plug 'editorconfig/editorconfig-vim' " Distraction free editing Plug 'junegunn/goyo.vim' diff --git a/zsh/functions/prettify-json.zsh b/zsh/functions/prettify-json.zsh new file mode 100644 index 0000000..f2d30ff --- /dev/null +++ b/zsh/functions/prettify-json.zsh @@ -0,0 +1,3 @@ +prettify-json () { + pbpaste | jq | pbcopy +} diff --git a/zsh/modules/aliases.zsh b/zsh/modules/aliases.zsh index 6ae0fcc..0f69a9e 100644 --- a/zsh/modules/aliases.zsh +++ b/zsh/modules/aliases.zsh @@ -31,7 +31,7 @@ alias gp='git push' alias grm="/usr/local/bin/gm" # JS friendly tree -alias arbol="tree -I 'node_modules|bower_components|doc'" +alias arbol="tree -I 'node_modules|bower_components|doc|__pycache__|\.pyc'" # Load Script Version Managers because they slow alias enable-nvm='source $(brew --prefix nvm)/nvm.sh' |