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/install b/install
index 90704af2882f09762be02b136c9d680f5542497c..64a3131d228717643af396c3a400412f2c2e44c2 100755 (executable)
--- 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 1194ba7d42e1d3a1ffa3666bcb12da1477f1b588..60a52014ffcf0f223318dfee7ae15110604b8e5c 100755 (executable)
--- 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 7521c5cddcc207770544f36f816efc0013baad3d..28e916aed8d73d4281a30c64a0a7ebc531af56ee 100644 (file)
--- 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 3166acf4435b378057f71538324ec12932ea0a59..6d2b00ddb37c9093518a6d193a81d8b0452192d7 100644 (file)
--- 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