ivuorinen/dotfiles
1
0
Fork 0
mirror of https://github.com/ivuorinen/dotfiles.git synced 2026-02-10 19:51:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(shell): update paths, add missing deps

Browse Source
This commit is contained in:
Ismo Vuorinen
2023-09-29 20:46:46 +03:00
parent 4b45c89a90
commit 39ecd0495c
5 changed files with 29 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
base/bashrc
View File

@@ -3,12 +3,11 @@
# Defaults # Defaults
export DOTFILES="$HOME/.dotfiles" export DOTFILES="$HOME/.dotfiles"
export DOTFILES_SHARED_LOADED=""
# shellcheck source=scripts/shared.sh # shellcheck source=scripts/shared.sh
source "$DOTFILES/scripts/shared.sh" source "$DOTFILES/scripts/shared.sh"
path_prepend "$DOTFILES/local/bin" path_prepend "$DOTFILES/local/bin"
x-load-configs $DOTFILES/local/bin/x-load-configs
# Import ssh keys in keychain # Import ssh keys in keychain
ssh-add -A 2>/dev/null ssh-add -A 2>/dev/null

9
base/zshrc
View File

@@ -9,7 +9,7 @@ path_prepend "$DOTFILES/local/bin"
export COMPLETION_WAITING_DOTS=true export COMPLETION_WAITING_DOTS=true
x-load-configs $DOTFILES/local/bin/x-load-configs
export ZSH_CUSTOM_COMPLETION_PATH="$XDG_CONFIG_HOME/zsh/completion" export ZSH_CUSTOM_COMPLETION_PATH="$XDG_CONFIG_HOME/zsh/completion"
x-dc "$ZSH_CUSTOM_COMPLETION_PATH" x-dc "$ZSH_CUSTOM_COMPLETION_PATH"
@@ -51,13 +51,6 @@ antigen bundle jreese/zsh-titles
antigen bundle unixorn/autoupdate-antigen.zshplugin antigen bundle unixorn/autoupdate-antigen.zshplugin
antigen bundle zsh-users/zsh-completions antigen bundle zsh-users/zsh-completions
# prettier history search
antigen bundle zsh-history-substring-search
bindkey "${terminfo[kcuu1]}" history-substring-search-up
bindkey "${terminfo[kcud1]}" history-substring-search-down
bindkey -M vicmd 'k' history-substring-search-up
bindkey -M vicmd 'j' history-substring-search-down
# these should be available if there's need # these should be available if there's need
have brew && antigen bundle brew have brew && antigen bundle brew
have php && antigen bundle php have php && antigen bundle php

38
local/bin/x-load-configs
View File

@@ -5,19 +5,27 @@
: "${DOTFILES:=$HOME/.dotfiles}" : "${DOTFILES:=$HOME/.dotfiles}"
source "$DOTFILES/scripts/shared.sh" source "$DOTFILES/scripts/shared.sh"
CONFIG_PATH="$DOTFILES/config"
# Load the shell dotfiles, and then some: # Load the shell dotfiles, and then some:
for FILENAME in $DOTFILES/config/{exports,alias,functions}; do function load()
HOST="$(hostname -s)" {
# global (exports|alias|functions) FILENAME for all hosts for FILE in $CONFIG_PATH/{exports,alias,functions}; do
# shellcheck source=../config/exports FILENAME="$FILE"
[ -r "$FILENAME" ] && source "$FILENAME" HOST="$(hostname -s)"
# global secret FILENAME, git ignored # global (exports|alias|functions) FILENAME for all hosts
# shellcheck source=../config/exports-secret # shellcheck source=../config/exports
[ -r "$FILENAME-secret" ] && source "$FILENAME-secret" [ -r "$FILENAME" ] && source "$FILENAME"
# host specific (exports|alias|functions) FILENAME # global secret FILENAME, git ignored
# shellcheck source=../config/exports # shellcheck source=../config/exports-secret
[ -r "$FILENAME-$HOST" ] && source "$FILENAME-$HOST" [ -r "$FILENAME-secret" ] && source "$FILENAME-secret"
# host specific (exports|alias|functions) FILENAME, git ignored # host specific (exports|alias|functions) FILENAME
# shellcheck source=../config/exports # shellcheck source=../config/exports
[ -r "$FILENAME-$HOST-secret" ] && source "$FILENAME-$HOST-secret" [ -r "$FILENAME-$HOST" ] && source "$FILENAME-$HOST"
done # host specific (exports|alias|functions) FILENAME, git ignored
# shellcheck source=../config/exports
[ -r "$FILENAME-$HOST-secret" ] && source "$FILENAME-$HOST-secret"
done
}
load

2
scripts/install-cargo-packages.sh
View File

@@ -14,6 +14,8 @@ msg "Starting to install rust/cargo packages"
source "$CARGO_HOME/env" source "$CARGO_HOME/env"
packages=( packages=(
# starship.rs
"starship"
# An incremental parsing system for programming tools # An incremental parsing system for programming tools
"tree-sitter-cli" "tree-sitter-cli"
# a subprocess caching utility # a subprocess caching utility

2
scripts/install-go-packages.sh
View File

@@ -27,6 +27,8 @@ packages=(
github.com/charmbracelet/glow@latest github.com/charmbracelet/glow@latest
# Static checker for GitHub Actions workflow files # Static checker for GitHub Actions workflow files
github.com/rhysd/actionlint/cmd/actionlint@latest github.com/rhysd/actionlint/cmd/actionlint@latest
# simple terminal UI for git commands
github.com/jesseduffield/lazygit@latest
) )
for pkg in "${packages[@]}"; do for pkg in "${packages[@]}"; do