From 2ccdb553a0d8e3d8edaea50c51d3186423175c5b Mon Sep 17 00:00:00 2001 From: Nick Chambers Date: Sun, 12 May 2024 20:52:59 -0500 Subject: [PATCH] Start cleaning up dotfiles --- .bashrc | 16 ++++++++++------ dotlib/{generic-post => post}/calendar.sh | 0 dotlib/{generic-post => post}/cattle.sh | 0 dotlib/{generic-post => post}/ruby.sh | 0 dotlib/{generic-post => post}/tab.sh | 0 dotlib/{generic-post => post}/util.sh | 0 dotlib/{generic-pre => pre}/path.sh | 0 dotlib/{generic-pre => pre}/prompt.sh | 0 8 files changed, 10 insertions(+), 6 deletions(-) rename dotlib/{generic-post => post}/calendar.sh (100%) rename dotlib/{generic-post => post}/cattle.sh (100%) rename dotlib/{generic-post => post}/ruby.sh (100%) rename dotlib/{generic-post => post}/tab.sh (100%) rename dotlib/{generic-post => post}/util.sh (100%) rename dotlib/{generic-pre => pre}/path.sh (100%) rename dotlib/{generic-pre => pre}/prompt.sh (100%) diff --git a/.bashrc b/.bashrc index 26dac22..622511e 100644 --- a/.bashrc +++ b/.bashrc @@ -1,9 +1,13 @@ +### +# Disable rc file in non-interactive mode. +### + if [[ $- != *i* ]]; then return fi ### -# Default Environment +# Apply default environment. ### __dotlib_set_PATH() { @@ -43,7 +47,7 @@ __dotlib_set_SHOPTS ulimit -c unlimited ### -# Library loader +# Load the dot library. ### __dotlib_load_libraries() { @@ -58,9 +62,9 @@ __dotlib_load_libraries() { esac dots=( - ~/bin/dotlib/generic-pre/*.sh - ~/bin/dotlib/"$os"/*.sh - ~/bin/dotlib/generic-post/*.sh + ~/.config/dotlib/pre/*.sh + ~/.config/dotlib/"$os"/*.sh + ~/.config/dotlib/post/*.sh ) for dot in "${dots[@]}"; do @@ -71,7 +75,7 @@ __dotlib_load_libraries() { __dotlib_load_libraries ### -# Reset exit status +# Reset the exit status. ### true diff --git a/dotlib/generic-post/calendar.sh b/dotlib/post/calendar.sh similarity index 100% rename from dotlib/generic-post/calendar.sh rename to dotlib/post/calendar.sh diff --git a/dotlib/generic-post/cattle.sh b/dotlib/post/cattle.sh similarity index 100% rename from dotlib/generic-post/cattle.sh rename to dotlib/post/cattle.sh diff --git a/dotlib/generic-post/ruby.sh b/dotlib/post/ruby.sh similarity index 100% rename from dotlib/generic-post/ruby.sh rename to dotlib/post/ruby.sh diff --git a/dotlib/generic-post/tab.sh b/dotlib/post/tab.sh similarity index 100% rename from dotlib/generic-post/tab.sh rename to dotlib/post/tab.sh diff --git a/dotlib/generic-post/util.sh b/dotlib/post/util.sh similarity index 100% rename from dotlib/generic-post/util.sh rename to dotlib/post/util.sh diff --git a/dotlib/generic-pre/path.sh b/dotlib/pre/path.sh similarity index 100% rename from dotlib/generic-pre/path.sh rename to dotlib/pre/path.sh diff --git a/dotlib/generic-pre/prompt.sh b/dotlib/pre/prompt.sh similarity index 100% rename from dotlib/generic-pre/prompt.sh rename to dotlib/pre/prompt.sh