mirror of
https://github.com/ivuorinen/dotfiles.git
synced 2026-02-03 01:48:19 +00:00
Compare commits
4 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 622c8f991a | |||
| 88894a33a5 | |||
| acbfd34e7d | |||
| bac03a0b7b |
10
base/bashrc
10
base/bashrc
@@ -3,9 +3,6 @@
|
|||||||
|
|
||||||
# Defaults
|
# Defaults
|
||||||
export DOTFILES="$HOME/.dotfiles"
|
export DOTFILES="$HOME/.dotfiles"
|
||||||
export PATH="$HOME/.local/bin:$HOME/.dotfiles/local/bin:$HOME/.local/go/bin:$PATH"
|
|
||||||
# shellcheck source=scripts/shared.sh
|
|
||||||
# source "$DOTFILES/scripts/shared.sh"
|
|
||||||
|
|
||||||
# Explicitly set XDG folders
|
# Explicitly set XDG folders
|
||||||
# https://specifications.freedesktop.org/basedir-spec/basedir-spec-latest.html
|
# https://specifications.freedesktop.org/basedir-spec/basedir-spec-latest.html
|
||||||
@@ -18,7 +15,14 @@ export XDG_BIN_HOME="$HOME/.local/bin"
|
|||||||
export XDG_CACHE_HOME="$HOME/.cache"
|
export XDG_CACHE_HOME="$HOME/.cache"
|
||||||
export XDG_RUNTIME_DIR="$HOME/.local/run"
|
export XDG_RUNTIME_DIR="$HOME/.local/run"
|
||||||
|
|
||||||
|
# Paths
|
||||||
|
export PATH="$XDG_BIN_HOME:$DOTFILES/local/bin:$HOME/.local/go/bin:$XDG_DATA_HOME/cargo/bin:$PATH"
|
||||||
|
|
||||||
|
# shellcheck source=scripts/shared.sh
|
||||||
|
# source "$DOTFILES/scripts/shared.sh"
|
||||||
|
|
||||||
source "$DOTFILES/config/exports"
|
source "$DOTFILES/config/exports"
|
||||||
|
source "$DOTFILES/config/alias"
|
||||||
|
|
||||||
# shellcheck source=../config/fzf/fzf.bash
|
# shellcheck source=../config/fzf/fzf.bash
|
||||||
[ -f "${DOTFILES}/config/fzf/fzf.bash" ] &&
|
[ -f "${DOTFILES}/config/fzf/fzf.bash" ] &&
|
||||||
|
|||||||
15
base/zshrc
15
base/zshrc
@@ -1,7 +1,20 @@
|
|||||||
# this is my zsh config. there are many like it, but this one is mine.
|
# this is my zsh config. there are many like it, but this one is mine.
|
||||||
# shellcheck shell=bash
|
# shellcheck shell=bash
|
||||||
|
|
||||||
export PATH="$HOME/.local/bin:$HOME/.dotfiles/local/bin:$HOME/.local/go/bin:$PATH"
|
export DOTFILES="$HOME/.dotfiles"
|
||||||
|
|
||||||
|
# Explicitly set XDG folders
|
||||||
|
# https://specifications.freedesktop.org/basedir-spec/basedir-spec-latest.html
|
||||||
|
export XDG_CONFIG_HOME="$HOME/.config"
|
||||||
|
export XDG_DATA_HOME="$HOME/.local/share"
|
||||||
|
export XDG_STATE_HOME="$HOME/.local/state"
|
||||||
|
|
||||||
|
# custom variables
|
||||||
|
export XDG_BIN_HOME="$HOME/.local/bin"
|
||||||
|
export XDG_CACHE_HOME="$HOME/.cache"
|
||||||
|
export XDG_RUNTIME_DIR="$HOME/.local/run"
|
||||||
|
|
||||||
|
export PATH="$XDG_BIN_HOME:$DOTFILES/local/bin:$HOME/.local/go/bin:$XDG_DATA_HOME/cargo/bin:$PATH"
|
||||||
|
|
||||||
source "$DOTFILES/config/exports"
|
source "$DOTFILES/config/exports"
|
||||||
source "$DOTFILES/config/alias"
|
source "$DOTFILES/config/alias"
|
||||||
|
|||||||
@@ -144,7 +144,7 @@ if [[ -f "$HOME/.aliases.local" ]]; then
|
|||||||
source "$HOME/.aliases.local"
|
source "$HOME/.aliases.local"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
alias wget=wget --hsts-file="$XDG_DATA_HOME/wget-hsts"
|
alias wget="wget --hsts-file=$XDG_DATA_HOME/wget-hsts"
|
||||||
alias svn="svn --config-dir $XDG_CONFIG_HOME/subversion"
|
alias svn="svn --config-dir $XDG_CONFIG_HOME/subversion"
|
||||||
|
|
||||||
# Alacritty preexec hook to update dynamic title
|
# Alacritty preexec hook to update dynamic title
|
||||||
|
|||||||
@@ -2,6 +2,11 @@
|
|||||||
# shellcheck shell=bash
|
# shellcheck shell=bash
|
||||||
# vim: filetype=zsh
|
# vim: filetype=zsh
|
||||||
|
|
||||||
|
# if cargo directory exists, add it to path
|
||||||
|
if [[ -d "$HOME/.local/share/cargo/bin" ]]; then
|
||||||
|
export PATH="$HOME/.local/share/cargo/bin:$PATH"
|
||||||
|
fi
|
||||||
|
|
||||||
# Cache commands using bkt if installed
|
# Cache commands using bkt if installed
|
||||||
if command -v bkt >&/dev/null; then
|
if command -v bkt >&/dev/null; then
|
||||||
bkt()
|
bkt()
|
||||||
@@ -55,4 +60,3 @@ function have_brew
|
|||||||
source "$DOTFILES/config/exports-shell"
|
source "$DOTFILES/config/exports-shell"
|
||||||
source "$DOTFILES/config/exports-apps"
|
source "$DOTFILES/config/exports-apps"
|
||||||
|
|
||||||
x-have nvim && export EDITOR="nvim"
|
|
||||||
|
|||||||
@@ -42,6 +42,7 @@ function section_install
|
|||||||
"macos:Setup nice macOS defaults"
|
"macos:Setup nice macOS defaults"
|
||||||
"neofetch:Install neofetch"
|
"neofetch:Install neofetch"
|
||||||
"nvm:Install Node Version Manager (nvm)"
|
"nvm:Install Node Version Manager (nvm)"
|
||||||
|
"nvm-latest:Install latest lts node using nvm"
|
||||||
"npm:Install NPM Packages"
|
"npm:Install NPM Packages"
|
||||||
"ntfy:Install ntfy"
|
"ntfy:Install ntfy"
|
||||||
"ohmybash:Install oh-my-bash"
|
"ohmybash:Install oh-my-bash"
|
||||||
@@ -150,11 +151,19 @@ function section_install
|
|||||||
;;
|
;;
|
||||||
nvm)
|
nvm)
|
||||||
msg "Installing nvm..."
|
msg "Installing nvm..."
|
||||||
curl -o- "https://raw.githubusercontent.com/nvm-sh/nvm/$VERSION_NVM/install.sh" | bash \
|
curl -o- "https://raw.githubusercontent.com/nvm-sh/nvm/$VERSION_NVM/install.sh" | bash
|
||||||
&& nvm install --lts --latest-npm --default
|
$0 install nvm-latest
|
||||||
git checkout "$DOTFILES/base/zshrc"
|
|
||||||
msg_yay "nvm installed!"
|
msg_yay "nvm installed!"
|
||||||
;;
|
;;
|
||||||
|
nvm-latest)
|
||||||
|
msg "Installing latest lts node..."
|
||||||
|
if [ -n "$NVM_DIR" ]; then
|
||||||
|
[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
|
||||||
|
fi
|
||||||
|
nvm install --lts --latest-npm --default
|
||||||
|
git checkout "$DOTFILES/base/*"
|
||||||
|
msg_yay "latest lts node installed!"
|
||||||
|
;;
|
||||||
npm)
|
npm)
|
||||||
msg "NPM Packages install started..."
|
msg "NPM Packages install started..."
|
||||||
bash "$DOTFILES/scripts/install-npm-packages.sh" \
|
bash "$DOTFILES/scripts/install-npm-packages.sh" \
|
||||||
|
|||||||
Reference in New Issue
Block a user