diff --git a/fish/install.fish b/fish/install.fish index 73fcb91..c3ffcbf 100755 --- a/fish/install.fish +++ b/fish/install.fish @@ -15,3 +15,4 @@ brew_install "FiraCode Nerd Font" font-fira-code-nerd-font "" homebrew/cask-font brew_install "Starship Prompt" starship brew_install "The Fuck" thefuck npm_install "tldr pages" tldr +brew_install exa exa diff --git a/javascript/install.fish b/javascript/install.fish index 3903233..e7b7e62 100755 --- a/javascript/install.fish +++ b/javascript/install.fish @@ -2,6 +2,7 @@ source "$DOT/script/utils.fish" source "$DOT/node/node_utils.fish" +source "$DOT/homebrew/brew_utils.fish" # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/os/macos.fish b/os/darwin.fish similarity index 100% rename from os/macos.fish rename to os/darwin.fish diff --git a/os/macos/finder.pref.fish b/os/macos/finder.pref.fish index 55da381..dfd79e2 100755 --- a/os/macos/finder.pref.fish +++ b/os/macos/finder.pref.fish @@ -12,7 +12,7 @@ execute "defaults write com.apple.finder _FXShowPosixPathInTitle -bool true" \ execute "defaults write com.apple.finder WarnOnEmptyTrash -bool false" \ "Disable the warning before emptying the trash" -execite "defaults write com.apple.finder FXDefaultSearchScope -string 'SCcf'" \ +execute "defaults write com.apple.finder FXDefaultSearchScope -string 'SCcf'" \ "Search the current directory by default" execute "defaults write com.apple.finder FXEnableExtensionChangeWarning -bool false" \ @@ -30,7 +30,7 @@ execute "defaults write -g AppleShowAllExtensions -bool true" \ execute "defaults write com.apple.finder AppleShowAllFiles -bool true" \ "Show hidden files" -execite "defaults write com.apple.finder _FXSortFoldersFirst -bool true" \ +execute "defaults write com.apple.finder _FXSortFoldersFirst -bool true" \ "Keep folders on top when sorting by name" execute "defaults write com.apple.finder FXRemoveOldTrashItems -bool true" \ diff --git a/os/macos/networking.pref.fish b/os/macos/networking.pref.fish old mode 100644 new mode 100755 diff --git a/script/dot.fish b/script/dot.fish index 12f1c4a..fc8afd0 100755 --- a/script/dot.fish +++ b/script/dot.fish @@ -14,7 +14,7 @@ function set_os_prefs print_title "OS Preferences" set -f os $(uname | string lower) - set -f file "{$DOT}/os/{$os}.fish" + set -f file "$DOT/os/$os.fish" if [ -e "$file" -a -x "$file" ] "$file" diff --git a/script/utils.fish b/script/utils.fish index f7b4257..9df1752 100755 --- a/script/utils.fish +++ b/script/utils.fish @@ -127,7 +127,7 @@ function execute -a cmds msg set_trap EXIT kill_all_subproccesses eval "$cmds" &>/dev/null 2>$tmp_file & - set cmds_pid $last_pid + set cmds_pid $fish_pid show_spinner $cmds_pid $cmds $msg