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

5 files changed, 15 insertions, 49 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/install b/install
index 90704af..64a3131 100755
--- a/install
+++ b/install
@@ -60,6 +60,8 @@ ln -fns ../.dotfiles/config/nvim ~/.config/nvim
 # config
 ln -fns ../.dotfiles/config/karabiner ~/.config/karabiner
 
+touch ~/.tool-versions
+
 # Italics setup
 echo "Setting up terminfo"
 tic xterm-256color-italic.terminfo
diff --git a/provision b/provision
index 1194ba7..60a5201 100755
--- a/provision
+++ b/provision
@@ -1,4 +1,4 @@
-#!/usr/bin/env sh
+#!/usr/bin/env bash
 
 if [[ -z "$1" ]]; then
   echo "Run with parameters: essential, nice, cask_essential, or cask_nice"
diff --git a/provisioning/apt_essential b/provisioning/apt_essential
index 7521c5c..28e916a 100644
--- a/provisioning/apt_essential
+++ b/provisioning/apt_essential
@@ -1,6 +1,8 @@
+-y
 bat
 curl
 fd-find
+exa
 fzf
 gpg
 htop
@@ -8,7 +10,6 @@ ripgrep
 rsync
 tmux
 tree
-vim
 neovim
 wget
 zsh
diff --git a/runcoms/zshrc b/runcoms/zshrc
index 3166acf..6d2b00d 100644
--- a/runcoms/zshrc
+++ b/runcoms/zshrc
@@ -43,7 +43,7 @@ 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
@@ -57,7 +57,11 @@ export FZF_DEFAULT_OPTS='--preview ''bat --style=numbers --color=always {} | hea
 if [[ -s "/opt/homebrew/bin/brew" ]]; then
   export FZF_VIM_PATH=/opt/homebrew/opt/fzf
 else
-  export FZF_VIM_PATH=/usr/local/opt/fzf
+  if [[ -s "/opt/homebrew/bin/brew" ]]; then
+    export FZF_VIM_PATH=/usr/local/opt/fzf
+  else
+    export FZF_VIM_PATH=/usr/share/doc/fzf/examples
+  fi
 fi
 
 ################################################################################
@@ -79,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