extern/dotfiles
1
0
Fork 0
mirror of https://github.com/Lissy93/dotfiles.git synced 2024-11-28 18:23:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Rebase new changes, and fish conf

Browse Source
This commit is contained in:
Alicia Sykes 2022-11-30 11:41:42 +00:00
parent 8f862597d6
commit 237a3de3af
5 changed files with 68 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
config/general/config.fish
View File

@ -1,9 +0,0 @@
if status is-interactive
# Commands to run in interactive sessions can go here
end
# If starship is installed, initialize it
if type -q starship
starship init fish | source
end

7
config/vim/setup-vim-plug.vim
View File

@ -1,3 +1,10 @@
""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
" Sets up all Vim / Neovim Plugins via Vim Plug "
""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
" Installs and imports Vim Plug, updates and loads listed plugins "
" For more info, see docs at: https://github.com/lissy93/dotfiles "
" Licensed under MIT (C) Alicia Sykes 2022 <https://aliciasykes.com> "
""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
" Set paths for plug.vim and directory for plugins " Set paths for plug.vim and directory for plugins
if has('nvim') if has('nvim')

95
config/zsh/.zshrc
View File

@ -1,66 +1,85 @@
######################################################################
# ~/.config/zsh/.zshrc #
######################################################################
# Instructions to be executed when a new ZSH session is launched #
# Imports all plugins, aliases, helper functions, and configurations #
# #
# After editing, re-source .zshrc for new changes to take effect #
# For docs and more info, see: https://github.com/lissy93/dotfiles #
######################################################################
# Licensed under MIT (C) Alicia Sykes 2022 <https://aliciasykes.com> #
######################################################################
# Directory for all-things ZSH config # Directory for all-things ZSH config
zsh_dir=${${ZDOTDIR}:-$HOME/.config/zsh} zsh_dir=${${ZDOTDIR}:-$HOME/.config/zsh}
utils_dir=~/.config/utils utils_dir="${XDG_CONFIG_HOME}/utils"
# If not running interactively, don't do anything # If not running interactively, don't do anything
[[ $- != *i* ]] && return [[ $- != *i* ]] && return
# Import alias files # Source all ZSH config files (if present)
source ${zsh_dir}/aliases/general.zsh if [[ -d $zsh_dir ]]; then
source ${zsh_dir}/aliases/git.zsh # Import alias files
source ${zsh_dir}/aliases/node-js.zsh source ${zsh_dir}/aliases/general.zsh
source ${zsh_dir}/aliases/flutter.zsh source ${zsh_dir}/aliases/git.zsh
source ${zsh_dir}/aliases/alias-tips.zsh source ${zsh_dir}/aliases/node-js.zsh
source ${zsh_dir}/aliases/flutter.zsh
source ${zsh_dir}/aliases/alias-tips.zsh
# Setup Antigen, and import plugins # Setup Antigen, and import plugins
source ${zsh_dir}/helpers/setup-antigen.zsh source ${zsh_dir}/helpers/setup-antigen.zsh
source ${zsh_dir}/helpers/import-plugins.zsh source ${zsh_dir}/helpers/import-plugins.zsh
source ${zsh_dir}/helpers/misc-stuff.zsh source ${zsh_dir}/helpers/misc-stuff.zsh
# Configure ZSH stuff # Configure ZSH stuff
source ${zsh_dir}/lib/colors.zsh source ${zsh_dir}/lib/colors.zsh
source ${zsh_dir}/lib/cursor.zsh source ${zsh_dir}/lib/cursor.zsh
source ${zsh_dir}/lib/history.zsh source ${zsh_dir}/lib/history.zsh
source ${zsh_dir}/lib/surround.zsh source ${zsh_dir}/lib/surround.zsh
source ${zsh_dir}/lib/completion.zsh source ${zsh_dir}/lib/completion.zsh
source ${zsh_dir}/lib/term-title.zsh source ${zsh_dir}/lib/term-title.zsh
source ${zsh_dir}/lib/navigation.zsh source ${zsh_dir}/lib/navigation.zsh
source ${zsh_dir}/lib/expansions.zsh source ${zsh_dir}/lib/expansions.zsh
source ${zsh_dir}/lib/key-bindings.zsh source ${zsh_dir}/lib/key-bindings.zsh
fi
# Import utility functions # Import utility functions
source ${utils_dir}/transfer.sh if [[ -d $utils_dir ]]; then
source ${utils_dir}/matrix.sh source ${utils_dir}/transfer.sh
source ${utils_dir}/hr.sh source ${utils_dir}/matrix.sh
source ${utils_dir}/web-search.sh source ${utils_dir}/hr.sh
source ${utils_dir}/am-i-online.sh source ${utils_dir}/web-search.sh
source ${utils_dir}/welcome-banner.sh source ${utils_dir}/am-i-online.sh
source ${utils_dir}/color-map.sh source ${utils_dir}/welcome-banner.sh
source ${utils_dir}/color-map.sh
fi
# Import P10k config for command prompt, run `p10k configure` or edit # Import P10k config for command prompt, run `p10k configure` or edit
[[ ! -f ${zsh_dir}/.p10k.zsh ]] || source ${zsh_dir}/.p10k.zsh [[ ! -f ${zsh_dir}/.p10k.zsh ]] || source ${zsh_dir}/.p10k.zsh
# Add Brew to path, if installed and on MacOS # MacOS-specific services
if [ "$(uname -s)" = "Darwin" ] && [[ -d /opt/homebrew/bin ]]; then if [ "$(uname -s)" = "Darwin" ]; then
# Add Brew to path, if it's installed
if [[ -d /opt/homebrew/bin ]]; then
export PATH=/opt/homebrew/bin:$PATH export PATH=/opt/homebrew/bin:$PATH
fi fi
# If using iTerm on MacOS, import the shell integration # If using iTerm, import the shell integration if availible
if [ "$(uname -s)" = "Darwin" ] && [[ -f "${XDG_CONFIG_HOME}/zsh/.iterm2_shell_integration.zsh" ]]; then if [[ -f "${XDG_CONFIG_HOME}/zsh/.iterm2_shell_integration.zsh" ]]; then
source ${XDG_CONFIG_HOME}/iterm/shell-integration.zsh source "${XDG_CONFIG_HOME}/zsh/.iterm2_shell_integration.zsh"
fi fi
# And Android SDK to path, if within Library direcroty # Append the Android SDK locations to path
if [ "$(uname -s)" = "Darwin" ] && [[ -d "${HOME}/Library/Android/" ]]; then if [[ -d "${HOME}/Library/Android/" ]]; then
export PATH="${HOME}/Library/Android/sdk/emulator:${PATH}" export PATH="${HOME}/Library/Android/sdk/emulator:${PATH}"
export ANDROID_HOME="${HOME}/Library/Android/sdk" export ANDROID_HOME="${HOME}/Library/Android/sdk"
export ANDROID_SDK_ROOT="${HOME}/Library/Android/sdk" export ANDROID_SDK_ROOT="${HOME}/Library/Android/sdk"
export ANDROID_AVD_HOME="${ANDROID_SDK_ROOT}/tools/emulator" export ANDROID_AVD_HOME="${ANDROID_SDK_ROOT}/tools/emulator"
export NODE_BINARY="/usr/local/bin/node" export NODE_BINARY="/usr/local/bin/node"
fi
fi fi
# If not running in nested shell, then show welcome message :) # If not running in nested shell, then show nice welcome message :)
if [[ "${SHLVL}" -lt 2 ]] && [[ -z "$SKIP_WELCOME" ]]; then if [[ "${SHLVL}" -lt 2 ]] && [[ -z "$SKIP_WELCOME" ]]; then
welcome welcome
fi fi

3
scripts/macos-setup/macos-preferences.sh
View File

@ -379,6 +379,9 @@ log_section "Dock and Launchpad"
log_msg "Set dock position to left-hand side" log_msg "Set dock position to left-hand side"
defaults write com.apple.dock orientation left defaults write com.apple.dock orientation left
log_msg "Remove default apps from the dock"
defaults write com.apple.dock persistent-apps -array
log_msg "Add highlight effect to dock stacks" log_msg "Add highlight effect to dock stacks"
defaults write com.apple.dock mouse-over-hilite-stack -bool true defaults write com.apple.dock mouse-over-hilite-stack -bool true

2
symlinks.yaml
View File

@ -18,8 +18,8 @@
${XDG_CONFIG_HOME}/vim: config/vim ${XDG_CONFIG_HOME}/vim: config/vim
${XDG_CONFIG_HOME}/nvim: config/vim ${XDG_CONFIG_HOME}/nvim: config/vim
${XDG_CONFIG_HOME}/tmux: config/tmux ${XDG_CONFIG_HOME}/tmux: config/tmux
${XDG_CONFIG_HOME}/fish: config/fish
${XDG_CONFIG_HOME}/fish/config.fish: config/config.fish
${XDG_DATA_HOME}/tmux/tpm: lib/tpm ${XDG_DATA_HOME}/tmux/tpm: lib/tpm
${XDG_DATA_HOME}/tmux/plugins/tpm: lib/tpm ${XDG_DATA_HOME}/tmux/plugins/tpm: lib/tpm