Merge branch 'main' of gitlab.com:rbdr/dotfiles

diff --git a/config/kitty/kitty.conf b/config/kitty/kitty.conf
index 7b023894e9cb4b84e5129b76decca1befae86b7c..4cf056d1c5b72c44fa17351d7c569f177ccc4dc6 100644 (file)
--- 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 aa1fbaa8c8ba7d80288e122b2e1d958bcb7c0b49..e516cbf660a9c28771e591e34c1f9f6975f4b2b6 100644 (file)
--- 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 272938ed72c358efa52471343b11f5d4ab6bb8fb..3166acf4435b378057f71538324ec12932ea0a59 100644 (file)
--- 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

diff --git a/vimrc b/vimrc
index 4a38153b152c2938898ceee224157c339bdec316..d16ba35ae5a53c5287aaf41101efa5a3794105da 100755 (executable)
--- a/vimrc
+++ b/vimrc
@@ -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 (file)
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 6ae0fcc59345ea358db780b27c65fd2f37bbcbec..0f69a9e4f80c63e1df58f5e07b7f18e8e239e3d4 100644 (file)
--- 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'