diff --git a/bash/.bashrc b/bash/.bashrc index f9dd112..ae9419b 100644 --- a/bash/.bashrc +++ b/bash/.bashrc @@ -109,6 +109,9 @@ alias rs='bin/rails s -p3001' alias mux='tmuxinator start' +alias ibrew='arch -x86_64 /usr/local/bin/brew' +alias mbrew='arch -arm64e /opt/homebrew/bin/brew' + yta() { streamlink $1 audio_mp4 } @@ -132,7 +135,8 @@ alias fkill='fzf_kill' # Homebrew stuff if [ -x /usr/local/bin/brew ]; then - export PATH=/usr/local/bin:/usr/local/sbin:$PATH + # export PATH=/usr/local/bin:/usr/local/sbin:$PATH + export PATH=/opt/homebrew/bin:/opt/homebrew/opt:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/Library/Apple/usr/bin:$PATH export MANPATH=/usr/local/share/man:$MANPATH fi diff --git a/karabiner/.config/karabiner/karabiner.json b/karabiner/.config/karabiner/karabiner.json index ab34e7d..12585a6 100644 --- a/karabiner/.config/karabiner/karabiner.json +++ b/karabiner/.config/karabiner/karabiner.json @@ -15,6 +15,32 @@ "mouse_motion_to_scroll.speed": 100 }, "rules": [ + { + "description": "Change caps_lock to control if pressed with other keys, to escape if pressed alone.", + "manipulators": [ + { + "from": { + "key_code": "caps_lock", + "modifiers": { + "optional": [ + "any" + ] + } + }, + "to": [ + { + "key_code": "left_control" + } + ], + "to_if_alone": [ + { + "key_code": "escape" + } + ], + "type": "basic" + } + ] + }, { "description": "Tab Modifier Mode [Tab as Trigger Key]", "manipulators": [ @@ -1521,117 +1547,133 @@ "from": { "key_code": "f1" }, - "to": { - "consumer_key_code": "display_brightness_decrement" - } + "to": [ + { + "consumer_key_code": "display_brightness_decrement" + } + ] }, { "from": { "key_code": "f2" }, - "to": { - "consumer_key_code": "display_brightness_increment" - } + "to": [ + { + "consumer_key_code": "display_brightness_increment" + } + ] }, { "from": { "key_code": "f3" }, - "to": { - "key_code": "mission_control" - } + "to": [ + { + "key_code": "mission_control" + } + ] }, { "from": { "key_code": "f4" }, - "to": { - "key_code": "launchpad" - } + "to": [ + { + "key_code": "launchpad" + } + ] }, { "from": { "key_code": "f5" }, - "to": { - "key_code": "illumination_decrement" - } + "to": [ + { + "key_code": "illumination_decrement" + } + ] }, { "from": { "key_code": "f6" }, - "to": { - "key_code": "illumination_increment" - } + "to": [ + { + "key_code": "illumination_increment" + } + ] }, { "from": { "key_code": "f7" }, - "to": { - "consumer_key_code": "rewind" - } + "to": [ + { + "consumer_key_code": "rewind" + } + ] }, { "from": { "key_code": "f8" }, - "to": { - "consumer_key_code": "play_or_pause" - } + "to": [ + { + "consumer_key_code": "play_or_pause" + } + ] }, { "from": { "key_code": "f9" }, - "to": { - "consumer_key_code": "fastforward" - } + "to": [ + { + "consumer_key_code": "fastforward" + } + ] }, { "from": { "key_code": "f10" }, - "to": { - "consumer_key_code": "mute" - } + "to": [ + { + "consumer_key_code": "mute" + } + ] }, { "from": { "key_code": "f11" }, - "to": { - "consumer_key_code": "volume_decrement" - } + "to": [ + { + "consumer_key_code": "volume_decrement" + } + ] }, { "from": { "key_code": "f12" }, - "to": { - "consumer_key_code": "volume_increment" - } + "to": [ + { + "consumer_key_code": "volume_increment" + } + ] } ], "name": "work", "parameters": { "delay_milliseconds_before_open_device": 1000 }, - "selected": true, - "simple_modifications": [ - { - "from": { - "key_code": "caps_lock" - }, - "to": { - "key_code": "f18" - } - } - ], + "selected": false, + "simple_modifications": [], "virtual_hid_keyboard": { "caps_lock_delay_milliseconds": 1000, "country_code": 0, + "indicate_sticky_modifier_keys_state": true, "keyboard_type": "ansi", "mouse_key_xy_scale": 100 } @@ -1678,117 +1720,144 @@ "from": { "key_code": "f1" }, - "to": { - "consumer_key_code": "display_brightness_decrement" - } + "to": [ + { + "consumer_key_code": "display_brightness_decrement" + } + ] }, { "from": { "key_code": "f2" }, - "to": { - "consumer_key_code": "display_brightness_increment" - } + "to": [ + { + "consumer_key_code": "display_brightness_increment" + } + ] }, { "from": { "key_code": "f3" }, - "to": { - "key_code": "mission_control" - } + "to": [ + { + "key_code": "mission_control" + } + ] }, { "from": { "key_code": "f4" }, - "to": { - "key_code": "launchpad" - } + "to": [ + { + "key_code": "launchpad" + } + ] }, { "from": { "key_code": "f5" }, - "to": { - "key_code": "illumination_decrement" - } + "to": [ + { + "key_code": "illumination_decrement" + } + ] }, { "from": { "key_code": "f6" }, - "to": { - "key_code": "illumination_increment" - } + "to": [ + { + "key_code": "illumination_increment" + } + ] }, { "from": { "key_code": "f7" }, - "to": { - "consumer_key_code": "rewind" - } + "to": [ + { + "consumer_key_code": "rewind" + } + ] }, { "from": { "key_code": "f8" }, - "to": { - "consumer_key_code": "play_or_pause" - } + "to": [ + { + "consumer_key_code": "play_or_pause" + } + ] }, { "from": { "key_code": "f9" }, - "to": { - "consumer_key_code": "fastforward" - } + "to": [ + { + "consumer_key_code": "fastforward" + } + ] }, { "from": { "key_code": "f10" }, - "to": { - "consumer_key_code": "mute" - } + "to": [ + { + "consumer_key_code": "mute" + } + ] }, { "from": { "key_code": "f11" }, - "to": { - "consumer_key_code": "volume_decrement" - } + "to": [ + { + "consumer_key_code": "volume_decrement" + } + ] }, { "from": { "key_code": "f12" }, - "to": { - "consumer_key_code": "volume_increment" - } + "to": [ + { + "consumer_key_code": "volume_increment" + } + ] } ], "name": "wow", "parameters": { "delay_milliseconds_before_open_device": 1000 }, - "selected": false, + "selected": true, "simple_modifications": [ { "from": { "key_code": "right_command" }, - "to": { - "pointing_button": "button2" - } + "to": [ + { + "pointing_button": "button2" + } + ] } ], "virtual_hid_keyboard": { "caps_lock_delay_milliseconds": 0, "country_code": 0, + "indicate_sticky_modifier_keys_state": true, "keyboard_type": "ansi", "mouse_key_xy_scale": 100 } diff --git a/macos b/macos index b703bfd..64eb40d 100755 --- a/macos +++ b/macos @@ -17,9 +17,10 @@ while true; do sudo -n true; sleep 60; kill -0 "$$" || exit; done 2>/dev/null & ############################################################################### # Set computer name (as done via System Preferences → Sharing) -#sudo scutil --set ComputerName "0x6D746873" -#sudo scutil --set HostName "0x6D746873" -#sudo scutil --set LocalHostName "0x6D746873" +# sudo scutil --set ComputerName "hostname" +# sudo scutil --set HostName "hostname" +# sudo scutil --set LocalHostName "hostname" + #sudo defaults write /Library/Preferences/SystemConfiguration/com.apple.smb.server NetBIOSName -string "0x6D746873" # Set standby delay to 24 hours (default is 1 hour) @@ -130,7 +131,7 @@ defaults write com.apple.screensaver askForPassword -int 1 defaults write com.apple.screensaver askForPasswordDelay -int 0 # Save screenshots to the desktop -defaults write com.apple.screencapture location -string "${HOME}/Desktop" +defaults write com.apple.screencapture location -string "${HOME}/Screenshot" # Save screenshots in PNG format (other options: BMP, GIF, JPG, PDF, TIFF) defaults write com.apple.screencapture type -string "png" diff --git a/vim/.vimrc b/vim/.vimrc index 20a78e8..d2fd96e 100644 --- a/vim/.vimrc +++ b/vim/.vimrc @@ -27,6 +27,9 @@ syntax on " ======================================================== " -> Plugins " ======================================================== +" +" curl -fLo ~/.vim/autoload/plug.vim --create-dirs https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim +" call plug#begin('~/.vim/plugged')