ivuorinen/dotfiles
1
0
Fork 0
mirror of https://github.com/ivuorinen/dotfiles.git synced 2026-02-05 17:49:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: cleanup and fixes

Browse Source
This commit is contained in:
Ismo Vuorinen
2024-07-23 05:09:30 +03:00
parent e8fe5c570b
commit 28aae89f70
6 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
base/zshenv
View File

@@ -4,5 +4,3 @@
export DOTFILES="$HOME/.dotfiles" export DOTFILES="$HOME/.dotfiles"
export PATH="$HOME/.local/bin:$DOTFILES/local/bin:$PATH" export PATH="$HOME/.local/bin:$DOTFILES/local/bin:$PATH"
export SHARED_SCRIPTS_SOURCED=0 export SHARED_SCRIPTS_SOURCED=0
source "$DOTFILES/config/shared.sh"

6
base/zshrc
View File

@@ -4,6 +4,10 @@
# export VERBOSE=1 # export VERBOSE=1
# export DEBUG=1 # export DEBUG=1
export DOTFILES="$HOME/.dotfiles"
source "$DOTFILES/config/shared.sh"
x-path-prepend "/usr/local/bin" x-path-prepend "/usr/local/bin"
x-path-prepend "/opt/homebrew/bin" x-path-prepend "/opt/homebrew/bin"
x-path-prepend "$HOME/.local/share/cargo/bin" x-path-prepend "$HOME/.local/share/cargo/bin"
@@ -11,8 +15,6 @@ x-path-prepend "$HOME/.local/share/bob/nvim-bin"
x-path-prepend "$HOME/.local/bin" x-path-prepend "$HOME/.local/bin"
x-path-prepend "$DOTFILES/local/bin" x-path-prepend "$DOTFILES/local/bin"
x-load-configs
eval "$(oh-my-posh init zsh --config "$DOTFILES/config/omp/own.toml")" eval "$(oh-my-posh init zsh --config "$DOTFILES/config/omp/own.toml")"
# Load asdf # Load asdf

10
config/exports
View File

@@ -4,11 +4,11 @@
# Set XDG directories if not already set # Set XDG directories if not already set
# https://specifications.freedesktop.org/basedir-spec/basedir-spec-latest.html # https://specifications.freedesktop.org/basedir-spec/basedir-spec-latest.html
[ -z "$XDG_CONFIG_HOME" ] && export $XDG_CONFIG_HOME="$HOME/.config" [ -z "$XDG_CONFIG_HOME" ] && export XDG_CONFIG_HOME="$HOME/.config"
[ -z "$XDG_DATA_HOME" ] && export $XDG_DATA_HOME="$HOME/.local/share" [ -z "$XDG_DATA_HOME" ] && export XDG_DATA_HOME="$HOME/.local/share"
[ -z "$XDG_CACHE_HOME" ] && export $XDG_CACHE_HOME="$HOME/.cache" [ -z "$XDG_CACHE_HOME" ] && export XDG_CACHE_HOME="$HOME/.cache"
[ -z "$XDG_STATE_HOME" ] && export $XDG_STATE_HOME="$HOME/.local/state" [ -z "$XDG_STATE_HOME" ] && export XDG_STATE_HOME="$HOME/.local/state"
[ -z "$XDG_BIN_HOME" ] && export $XDG_BIN_HOME="$HOME/.local/bin" [ -z "$XDG_BIN_HOME" ] && export XDG_BIN_HOME="$HOME/.local/bin"
# if DOTFILES is not set, set it to the default location # if DOTFILES is not set, set it to the default location
[ -z "$DOTFILES" ] && export DOTFILES="$HOME/.dotfiles" [ -z "$DOTFILES" ] && export DOTFILES="$HOME/.dotfiles"

6
config/shared.sh
View File

@@ -19,10 +19,10 @@ DEBUG="${DEBUG:-0}"
# Explicitly set XDG folders, if not already set # Explicitly set XDG folders, if not already set
# https://specifications.freedesktop.org/basedir-spec/basedir-spec-latest.html # https://specifications.freedesktop.org/basedir-spec/basedir-spec-latest.html
[ -z "$XDG_CONFIG_HOME" ] && export XDG_CONFIG_HOME="$HOME/.config" [ -z "$XDG_CONFIG_HOME" ] && export XDG_CONFIG_HOME="$HOME/.config"
[ -z "$XDG_DATA_HOME" ] && export $XDG_DATA_HOME="$HOME/.local/share" [ -z "$XDG_DATA_HOME" ] && export XDG_DATA_HOME="$HOME/.local/share"
[ -z "$XDG_STATE_HOME" ] && export $XDG_STATE_HOME="$HOME/.local/state"
[ -z "$XDG_BIN_HOME" ] && export XDG_BIN_HOME="$HOME/.local/bin"
[ -z "$XDG_CACHE_HOME" ] && export XDG_CACHE_HOME="$HOME/.cache" [ -z "$XDG_CACHE_HOME" ] && export XDG_CACHE_HOME="$HOME/.cache"
[ -z "$XDG_STATE_HOME" ] && export XDG_STATE_HOME="$HOME/.local/state"
[ -z "$XDG_BIN_HOME" ] && export XDG_BIN_HOME="$HOME/.local/bin"
# Paths # Paths
x-path-prepend "/usr/local/bin" x-path-prepend "/usr/local/bin"

1
local/bin/x-have
View File

@@ -42,7 +42,6 @@ main()
fi fi
check_command "$1" check_command "$1"
return 0
} }
main "$@" main "$@"

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

@@ -93,6 +93,5 @@ config_msg "VERBOSE=1" "Verbose mode enabled"
config_msg "HOST" "$CONFIG_HOST" config_msg "HOST" "$CONFIG_HOST"
load_config_files "$(config_file_path "exports")" load_config_files "$(config_file_path "exports")"
load_config_files "$(config_file_path "functions")"
load_config_files "$(config_file_path "alias")" load_config_files "$(config_file_path "alias")"
exit 0 exit 0