changes

5 files changed, 38 insertions, 15 deletions

diff --git a/mac/.config/aerospace/aerospace.toml b/mac/.config/aerospace/aerospace.toml
index 0737240..febfc9e 100644
--- a/mac/.config/aerospace/aerospace.toml
+++ b/mac/.config/aerospace/aerospace.toml
@@ -106,13 +106,16 @@ on-focus-changed = ['move-mouse window-lazy-center']
     # You can uncomment this line to open up terminal with alt + enter shortcut
     # See: https://nikitabobko.github.io/AeroSpace/commands#exec-and-forget
     # alt-enter = 'exec-and-forget open -n /System/Applications/Utilities/Terminal.app'
-    alt-enter = 'exec-and-forget open -n /Applications/Kitty.app'
-    alt-c = 'exec-and-forget kitty --title "calcurse" -e calcurse'
+    alt-enter = 'exec-and-forget open -na Kitty'
+    alt-shift-enter = 'exec-and-forget open -na Cursor'
+    alt-ctrl-enter = 'exec-and-forget open -na "Visual Studio Code"'
+    alt-c = 'exec-and-forget kitty --title -o close_on_child_death=yes -o confirm_os_window_close=0 "calcurse" -e calcurse'
     alt-d = 'exec-and-forget open -na Dbeaver'
-    alt-e = 'exec-and-forget kitty --title "neomutt" -e env EDITOR="nvim -u ~/.config/nvim/init.lua" neomutt'
+    alt-e = 'exec-and-forget kitty --title -o close_on_child_death=yes -o confirm_os_window_close=0 "neomutt" -e env EDITOR="nvim -u ~/.config/nvim/init.lua" neomutt'
     alt-shift-e = 'exec-and-forget open -na "Microsoft Outlook"'
-    alt-r = 'exec-and-forget kitty --title "htop" -e htop'
-    alt-s = 'exec-and-forget kitty --title "newsboat" -e newsboat'
+    alt-o = 'exec-and-forget open -na Docker'
+    alt-r = 'exec-and-forget kitty --title -o close_on_child_death=yes -o confirm_os_window_close=0 "htop" -e htop'
+    alt-s = 'exec-and-forget kitty --title -o close_on_child_death=yes -o confirm_os_window_close=0 "newsboat" -e newsboat'
     alt-t = 'exec-and-forget open -na "Microsoft Teams"'
     alt-w = 'exec-and-forget open -na Firefox'
 
@@ -146,6 +149,7 @@ on-focus-changed = ['move-mouse window-lazy-center']
     alt-7 = 'workspace 7'
     alt-8 = 'workspace 8'
     alt-9 = 'workspace 9'
+    alt-0 = 'workspace 10'
 
     # See: https://nikitabobko.github.io/AeroSpace/commands#move-node-to-workspace
     alt-shift-1 = 'move-node-to-workspace 1'
@@ -157,6 +161,7 @@ on-focus-changed = ['move-mouse window-lazy-center']
     alt-shift-7 = 'move-node-to-workspace 7'
     alt-shift-8 = 'move-node-to-workspace 8'
     alt-shift-9 = 'move-node-to-workspace 9'
+    alt-shift-0 = 'move-node-to-workspace 10'
 
     # See: https://nikitabobko.github.io/AeroSpace/commands#move-node-to-workspace
     alt-ctrl-1 = ['move-node-to-workspace 1', 'workspace 1']
@@ -168,6 +173,7 @@ on-focus-changed = ['move-mouse window-lazy-center']
     alt-ctrl-7 = ['move-node-to-workspace 7', 'workspace 7']
     alt-ctrl-8 = ['move-node-to-workspace 8', 'workspace 8']
     alt-ctrl-9 = ['move-node-to-workspace 9', 'workspace 9']
+    alt-ctrl-0 = ['move-node-to-workspace 10', 'workspace 10']
 
     # See: https://nikitabobko.github.io/AeroSpace/commands#workspace-back-and-forth
     alt-tab = 'workspace-back-and-forth'
@@ -242,6 +248,10 @@ if.app-id = 'com.clickup.desktop-app'
 run = ['move-node-to-workspace 5']
 
 [[on-window-detected]]
+if.app-id = 'com.electron.dockerdesktop'
+run = ['move-node-to-workspace 6']
+
+[[on-window-detected]]
 if.app-name-regex-substring = 'vimwiki'
 run = ['move-node-to-workspace 6']
 
@@ -262,17 +272,21 @@ if.app-id = 'com.apple.iCal'
 run = ['move-node-to-workspace 8']
 
 [[on-window-detected]]
-if.app-id = 'com.kakao.KakaoTalkMac'
+if.app-id = 'com.microsoft.Outlook'
 run = ['move-node-to-workspace 9']
 
 [[on-window-detected]]
-if.app-id = 'com.tdesktop.Telegram'
+if.app-id = 'com.microsoft.teams2'
 run = ['move-node-to-workspace 9']
 
 [[on-window-detected]]
+if.app-id = 'com.kakao.KakaoTalkMac'
+run = ['move-node-to-workspace 10']
+
+[[on-window-detected]]
 if.app-id = 'com.hnc.Discord'
-run = ['move-node-to-workspace 9']
+run = ['move-node-to-workspace 10']
 
 [[on-window-detected]]
-if.app-id = 'com.microsoft.teams2'
-run = ['move-node-to-workspace 9']
+if.app-id = 'com.tdesktop.Telegram'
+run = ['move-node-to-workspace 10']
diff --git a/mac/.config/kitty/kitty.conf b/mac/.config/kitty/kitty.conf
index 719e760..d77c33b 100644
--- a/mac/.config/kitty/kitty.conf
+++ b/mac/.config/kitty/kitty.conf
@@ -6,7 +6,7 @@
 #: individual font faces and even specify special fonts for particular
 #: characters.
 
-font_family      FiraCode Nerd Font
+font_family      FiraCode Nerd Font Mono
 # bold_font        auto
 # italic_font      auto
 # bold_italic_font auto
diff --git a/mac/.config/lf/icons b/mac/.config/lf/icons
index 9792436..0464ef4 100644
--- a/mac/.config/lf/icons
+++ b/mac/.config/lf/icons
@@ -23,9 +23,9 @@ Vagrantfile                 
 *.ejs                       
 *.css                       
 *.less                      
-*.md                        
+*.md                        
 *.mdx                       
-*.markdown                  
+*.markdown                  
 *.rmd                       
 *.json                      
 *.webmanifest               
diff --git a/mac/.config/shell/profile b/mac/.config/shell/profile
index 5549050..963e64d 100644
--- a/mac/.config/shell/profile
+++ b/mac/.config/shell/profile
@@ -3,9 +3,10 @@
 ###################################################
 # Add all directories in each subdirectory to $PATH
 export PATH="$PATH:/opt/homebrew/bin"
-export PATH="$PATH:$(find -L /opt/homebrew/opt -name bin -type d -print 2>/dev/null | sort -u | paste -s -d ':' -)"
+export PATH="$PATH:$(find -L ~/.local/share/asdf/installs -name bin -type d -print 2>/dev/null | sort -u | paste -s -d ':' -)"
 export PATH="$PATH:$(find ~/.local/bin -path '*/.git*' -prune -o \( -type f -o -type l \) -perm -u=x -exec dirname {} \; | sort -u | paste -sd ':' -)"
 export PATH="$PATH:$(find ~/.local/share/.password-store -type d -name '.extensions' | paste -sd ':' -)"
+command -v asdf >/dev/null 2>&1 && export PATH="$PATH:$(find -L /opt/homebrew/opt -name bin -type d -print 2>/dev/null | sort -u | paste -s -d ':' -)"
 
 unsetopt PROMPT_SP 2>/dev/null
 
@@ -54,6 +55,10 @@ export ANDROID_SDK_HOME="$XDG_CONFIG_HOME/android"
 ### --- ANSIBLE --- ###
 export ANSIBLE_CONFIG="$XDG_CONFIG_HOME/ansible/ansible.cfg"
 
+### --- ASDF --- ###
+export ASDF_CONFIG_FILE="$XDG_CONFIG_HOME/asdf/asdfrc"
+export ASDF_DATA_DIR="$XDG_DATA_HOME/asdf"
+
 ### --- BAT --- ###
 export BAT_CONFIG_PATH="$XDG_CONFIG_HOME/bat/config"
 
@@ -63,6 +68,10 @@ export CARGO_HOME="$XDG_DATA_HOME/cargo"
 ### --- DICS --- ###
 export DICS="/usr/share/stardict/dic/"
 
+### --- DOCKER --- ###
+export DOCKER_CONFIG="$XDG_CONFIG_HOME"/docker
+export MACHINE_STORAGE_PATH="$XDG_DATA_HOME"/docker-machine
+
 ### --- ELECTRUM --- ###
 export ELECTRUMDIR="$XDG_DATA_HOME/electrum"
 
diff --git a/mac/.config/zsh/scripts.zsh b/mac/.config/zsh/scripts.zsh
index 42c60fc..7ebe2ed 100644
--- a/mac/.config/zsh/scripts.zsh
+++ b/mac/.config/zsh/scripts.zsh
@@ -466,7 +466,7 @@ function fzf_kill_process() {
 # open lf and cd to the file path
 function lfcd () {
     tmp="$(mktemp -uq)"
-    trap 'rm -f $tmp >/dev/null 2>&1 && trap - HUP INT QUIT TERM PWR EXIT' HUP INT QUIT TERM PWR EXIT
+    trap 'rm -f $tmp >/dev/null 2>&1 && trap - HUP INT QUIT TERM EXIT' HUP INT QUIT TERM EXIT
     lf -last-dir-path="$tmp" "$@"
     if [ -f "$tmp" ]; then
         dir="$(cat "$tmp")"