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

diff --git a/config/karabiner/karabiner.json b/config/karabiner/karabiner.json
index d792efc18219f0ff14597c252068862b4228bf43..360dd8c955421f9e698b2c86d651e675632c0402 100644 (file)
--- 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 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 5f0ed8112e63a37a267af2420775215e96645893..6d2b00ddb37c9093518a6d193a81d8b0452192d7 100644 (file)
--- 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