From a07d2dbcd2aaba0ac331d3fe3003214295ab6936 Mon Sep 17 00:00:00 2001
From: Santiago Lo Coco <santilococo.01@gmail.com>
Date: Sun, 2 Jun 2024 21:18:42 +0200
Subject: [PATCH] Update dotfiles
---
dotfiles/.config/nvim/init.vim | 5 +++--
dotfiles/.config/nvimpager/init.vim | 3 ++-
dotfiles/.config/skhd/skhdrc | 4 ++--
dotfiles/.config/yabai/yabairc | 2 +-
dotfiles/.config/zsh/.zshrc_aliases | 2 +-
dotfiles/.local/bin/clean.sh | 4 ++++
dotfiles/.local/bin/uninstall.sh | 4 +++-
dotfiles/.zprofile | 5 ++++-
8 files changed, 20 insertions(+), 9 deletions(-)
diff --git a/dotfiles/.config/nvim/init.vim b/dotfiles/.config/nvim/init.vim
index dc8bc8b..ede7534 100644
--- a/dotfiles/.config/nvim/init.vim
+++ b/dotfiles/.config/nvim/init.vim
@@ -22,7 +22,8 @@ Plug 'jiangmiao/auto-pairs'
Plug 'xuhdev/vim-latex-live-preview', { 'for': 'tex' }
call plug#end()
-set bg=light
+"set bg=light
+set bg=dark
set go=a
set mouse=a
set nohlsearch
@@ -36,7 +37,7 @@ set clipboard=unnamed
" Though for this we need xsel (https://github.com/neovim/neovim/issues/7945)
-"colorscheme delek
+colorscheme retrobox
" Some basics:
nnoremap c "_c
diff --git a/dotfiles/.config/nvimpager/init.vim b/dotfiles/.config/nvimpager/init.vim
index 58180ba..ba17009 100644
--- a/dotfiles/.config/nvimpager/init.vim
+++ b/dotfiles/.config/nvimpager/init.vim
@@ -1,6 +1,6 @@
let mapleader =","
-set bg=light
+set bg=dark
set go=a
set mouse=a
set nohlsearch
@@ -15,6 +15,7 @@ set clipboard=unnamedplus
" Though for this we need xsel (https://github.com/neovim/neovim/issues/7945)
"colorscheme delek
+colorscheme retrobox
" Some basics:
"nnoremap c "_c
diff --git a/dotfiles/.config/skhd/skhdrc b/dotfiles/.config/skhd/skhdrc
index 529b1f3..3f38571 100755
--- a/dotfiles/.config/skhd/skhdrc
+++ b/dotfiles/.config/skhd/skhdrc
@@ -200,8 +200,8 @@ alt - 8 : skhd --key "alt + ctrl - 8" && sketchybar --trigger windows_on_spaces
alt - 9 : skhd --key "alt + ctrl - 9" && sketchybar --trigger windows_on_spaces
alt - 0 : skhd --key "alt + ctrl - 0" && sketchybar --trigger windows_on_spaces
-alt - right : skhd --key "ctrl - right" && sketchybar --trigger windows_on_spaces
-alt - left : skhd --key "ctrl - left" && sketchybar --trigger windows_on_spaces
+alt + shift - right : skhd --key "ctrl - right" && sketchybar --trigger windows_on_spaces
+alt + shift - left : skhd --key "ctrl - left" && sketchybar --trigger windows_on_spaces
# shift + alt - 0 : /Users/slococo/.local/bin/layout.sh
diff --git a/dotfiles/.config/yabai/yabairc b/dotfiles/.config/yabai/yabairc
index 4e3555d..973f91d 100755
--- a/dotfiles/.config/yabai/yabairc
+++ b/dotfiles/.config/yabai/yabairc
@@ -46,5 +46,5 @@ yabai -m rule --add title='scratchpad' sub-layer=above space=10 grid=4:4:1:1:2:2
/Users/slococo/.local/bin/open.sh &
-/Users/slococo/.local/bin/doNotCharge.sh &
+#/Users/slococo/.local/bin/doNotCharge.sh &
diff --git a/dotfiles/.config/zsh/.zshrc_aliases b/dotfiles/.config/zsh/.zshrc_aliases
index c01548a..7f8c117 100644
--- a/dotfiles/.config/zsh/.zshrc_aliases
+++ b/dotfiles/.config/zsh/.zshrc_aliases
@@ -4,7 +4,7 @@ alias wget=wget --hsts-file="$XDG_DATA_HOME/wget-hsts"
alias gcm='git commit -m'
alias sed='gsed'
alias qrread='zbarimg -q --raw <(pngpaste -)'
-alias sudoedit='sudo nvim'
+alias sudoedit='sudo -e nvim'
gacp() {
git add .
diff --git a/dotfiles/.local/bin/clean.sh b/dotfiles/.local/bin/clean.sh
index 0f1b371..a0e3850 100755
--- a/dotfiles/.local/bin/clean.sh
+++ b/dotfiles/.local/bin/clean.sh
@@ -48,6 +48,7 @@ locations=(
"/usr/local/sbin"
"/usr/local/share"
"/usr/local/var"
+ "/usr/local/libexec"
$(getconf DARWIN_USER_CACHE_DIR | sed "s/\/$//")
$(getconf DARWIN_USER_TEMP_DIR | sed "s/\/$//")
)
@@ -83,4 +84,7 @@ if [ "$answer" = "y" ]; then
posixFiles=$(printf ", POSIX file \"%s\"" "${paths[@]}" | awk '{print substr($0,3)}')
osascript -e "tell application \"Finder\" to delete { $posixFiles }" > /dev/null
printf "%s\n" "Done"
+
+ app_name="$(echo "$app_name" | tr ' ' '-')"
+ brew list "$app_name" && brew uninstall --force --zap "$app_name"
fi
diff --git a/dotfiles/.local/bin/uninstall.sh b/dotfiles/.local/bin/uninstall.sh
index 9d68354..b0b8fd9 100755
--- a/dotfiles/.local/bin/uninstall.sh
+++ b/dotfiles/.local/bin/uninstall.sh
@@ -93,6 +93,7 @@ locations=(
"/usr/local/sbin"
"/usr/local/share"
"/usr/local/var"
+ "/usr/local/libexec"
$(getconf DARWIN_USER_CACHE_DIR | sed "s/\/$//")
$(getconf DARWIN_USER_TEMP_DIR | sed "s/\/$//")
)
@@ -120,5 +121,6 @@ if [ "$answer" = "y" ]; then
osascript -e "tell application \"Finder\" to delete { $posixFiles }" > /dev/null
printf "%s\n" "Done"
- brew list "$app_name" && brew uninstall "$app_name"
+ app_name="$(echo "$app_name" | sed 's/.app//' | tr ' ' '-')"
+ brew list "$app_name" && brew uninstall --force --zap "$app_name"
fi
diff --git a/dotfiles/.zprofile b/dotfiles/.zprofile
index f800444..9831e53 100644
--- a/dotfiles/.zprofile
+++ b/dotfiles/.zprofile
@@ -26,7 +26,7 @@ export DOCKER_CONFIG="$XDG_CONFIG_HOME"/docker
export IPYTHONDIR="${XDG_CONFIG_HOME}/ipython"
export JUPYTER_CONFIG_DIR="$XDG_CONFIG_HOME"/jupyter
#export BUNDLE_USER_CONFIG="$XDG_CONFIG_HOME"/bundle
-export BUNDLE_USER_CACHE="$XDG_CACHE_HOME"/bundle
+#export BUNDLE_USER_CACHE="$XDG_CACHE_HOME"/bundle
#export BUNDLE_USER_PLUGIN="$XDG_DATA_HOME"/bundle
export TLDR_CACHE_DIR="$XDG_CACHE_HOME"/tldr
export TLDR_AUTO_UPDATE_DISABLED=true
@@ -34,6 +34,9 @@ export SHELL_SESSIONS_DISABLE=1
export PAGER='nvimpager -p'
export DIALOGRC="$XDG_CONFIG_HOME"/dialog/dialogrc
export NPM_CONFIG_USERCONFIG="$XDG_CONFIG_HOME"/npm/npmrc
+export DOCKER_HOST="unix:///Volumes/SSD/.colima/docker.sock"
+export ANSIBLE_HOME="$XDG_DATA_HOME"/ansible
+export ANSIBLE_COLLECTIONS_PATH="$ANSIBLE_HOME/collections/ansible_collections:/opt/homebrew/opt/ansible/libexec/lib/python3.12/site-packages/ansible_collections"
export EDITOR=/opt/homebrew/bin/nvim