diff options
| author | Ruben Beltran del Rio <ruben@unlimited.pizza> | 2022-04-15 09:14:22 +0000 |
|---|---|---|
| committer | Ruben Beltran del Rio <ruben@unlimited.pizza> | 2022-04-15 09:14:22 +0000 |
| commit | 14a899db10b88c5e4800e34dc208a0ce3b624dcd (patch) | |
| tree | ea0b2f3d7e475a3ec2027e84b44d319965f6b94c | |
| parent | 071e5a5319b45799c866af9113f6d47b10d81e4e (diff) | |
| parent | 086f96e45c174eaf53a2cbae7d60554a66e44c74 (diff) | |
Merge branch 'main' of gitlab.com:rbdr/dotfiles
| -rw-r--r-- | config/karabiner/karabiner.json | 43 | ||||
| -rw-r--r-- | provisioning/brew_essential | 2 | ||||
| -rw-r--r-- | runcoms/zshrc | 10 |
3 files changed, 8 insertions, 47 deletions
diff --git a/config/karabiner/karabiner.json b/config/karabiner/karabiner.json index d792efc..360dd8c 100644 --- a/config/karabiner/karabiner.json +++ b/config/karabiner/karabiner.json @@ -93,48 +93,7 @@ }, "ignore": false, "manipulate_caps_lock_led": false, - "simple_modifications": [ - { - "from": { - "key_code": "application" - }, - "to": [ - { - "key_code": "right_option" - } - ] - }, - { - "from": { - "key_code": "left_command" - }, - "to": [ - { - "key_code": "left_option" - } - ] - }, - { - "from": { - "key_code": "left_option" - }, - "to": [ - { - "key_code": "left_command" - } - ] - }, - { - "from": { - "key_code": "right_option" - }, - "to": [ - { - "key_code": "right_command" - } - ] - } - ] + "simple_modifications": [] } ], "fn_function_keys": [ 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 5f0ed81..6d2b00d 100644 --- a/runcoms/zshrc +++ b/runcoms/zshrc @@ -43,13 +43,15 @@ export VISUAL="nvim" # Python related variables export VIRTUAL_ENV_DISABLE_PROMPT=1 export WORKON_HOME=$HOME/.virtualenvs -export PROJECT_HOME=$HOME/Projects +export PROJECT_HOME=$HOME/Documents/projects export VIRTUALENVWRAPPER_PYTHON="/usr/local/bin/python3" # GPG 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 @@ -81,10 +83,10 @@ if [[ -s "/opt/homebrew/bin/brew" ]]; then fi # Z -if ! command -v brew &> /dev/null; then - . /usr/local/etc/profile.d/z.sh -else +if [[ -s "/opt/homebrew/bin/brew" ]]; then . /opt/homebrew/etc/profile.d/z.sh +else + . /usr/local/etc/profile.d/z.sh fi # ASDF |