1
0
Fork 0

small fixes

This commit is contained in:
Luca Bilke 2023-05-31 09:41:28 +02:00
parent cf93ac0a7e
commit 6531d6dd32
5 changed files with 14 additions and 12 deletions

View File

@ -1,12 +1,14 @@
[init]
defaultBranch = main
defaultBranch = main
[push]
recurseSubmodules = check
[pull]
rebase = false
rebase = false
[submodule]
recurse = true
[credential]
helper = store
helper = store
[core]
excludesfile = ~/.config/git/excludes
[include]
path = ~/.config/git/host-setup

2
.config/git/excludes Normal file
View File

@ -0,0 +1,2 @@
*~
.*.swp

View File

@ -59,7 +59,7 @@ export XDG_CONFIG_HOME="$HOME/.config"
export XDG_DATA_HOME="$HOME/.local/share"
export XDG_CACHE_HOME="$HOME/.cache"
export XINITRC="$XDG_CONFIG_HOME/X11/xinitrc"
export DOTFILES="$HOME/.dotfiles"
export DOTFILES_DIR="$HOME/.dotfiles"
export ZSH_COMPDUMP="$XDG_CACHE_HOME/zcompdump"
export NOTMUCH_CONFIG="$XDG_CONFIG_HOME/notmuch-config"

View File

@ -5,12 +5,10 @@ GREEN='\033[32m'
BLUE='\033[34m'
RED='\033[31m'
NC='\033[0m'
dotfiles="${1:-$DOTFILES}"
dotfiles="${dotfiles:-$HOME/.dotfiles}"
printf "%b" "$BOLD${BLUE}Changing directory to $dotfiles$NC\n"
if ! cd "$dotfiles"; then
printf "%b" "${RED}Could not CD into $dotfiles$NC\n"
printf "%b" "$BOLD${BLUE}Changing directory to $DOTFILES_DIR$NC\n"
if ! cd "$DOTFILES_DIR"; then
printf "%b" "${RED}Could not CD into $DOTFILES_DIR$NC\n"
exit
fi
printf "\n"
@ -43,12 +41,12 @@ else
fi
printf "%b" "$BOLD${BLUE}Generating firefox profiles...$NC\n\n"
"$dotfiles/.mozilla/firefox/generate.sh"
"$DOTFILES_DIR/.mozilla/firefox/generate.sh"
printf "\n"
printf "${BOLD}Recompile/Install src files? ${GREEN}Y/N?$NC\n"
read ans
[ "$ans" = "y" ] && for f in "$dotfiles"/.local/src/*; do
[ "$ans" = "y" ] && for f in "$DOTFILES_DIR"/.local/src/*; do
if ! cd "$f"; then
printf "%b" "${RED}Could not CD into $f$NC\n"
exit

View File

@ -43,7 +43,7 @@ command -v apt 1>/dev/null 2>&1 && sudo apt upgrade
command -v xbps-install 1>/dev/null 2>&1 && sudo xbps-install -Syu && pkill -RTMIN+8 "${STATUSBAR:-dwmblocks}"
printf "%b" "$BOLD${BLUE}Updating arkenfox...$NC\n"
"$DOTFILES/.local/share/firefox/updater.sh" -s
"$DOTFILES_DIR/.local/share/firefox/updater.sh" -s
printf "%b" "$BOLD${BLUE}Upgrade complete.\nPress <Enter> to exit window.\n"
read -r _