summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorToby Vincent <tobyv13@gmail.com>2022-01-23 18:59:47 -0600
committerToby Vincent <tobyv13@gmail.com>2022-01-23 18:59:47 -0600
commitf63e69651175b71eea1328b7a4a4fefad854864d (patch)
treec653e416d53cc1fd90131d4a8dc6fd4de6746f52
parent17a9898b45a798c5f37b7079329dea3207d89991 (diff)
fix: fixed source order in bashrc
-rw-r--r--bash/env.sh1
-rw-r--r--bashrc4
-rw-r--r--install.conf.yaml1
3 files changed, 2 insertions, 4 deletions
diff --git a/bash/env.sh b/bash/env.sh
index 14d4208..c35bf77 100644
--- a/bash/env.sh
+++ b/bash/env.sh
@@ -1,7 +1,6 @@
#!/usr/bin/env bash
export GPG_TTY=$(tty)
-export BROWSER=wslview
export STARSHIP_LOG="error"
export MANPAGER="sh -c 'col -bx | bat -l man -p'"
export FZF_PREVIEW_COMMAND="bat --style=numbers,changes --wrap never --color always {} || cat {} || tree -C {}"
diff --git a/bashrc b/bashrc
index 4924725..6894c5d 100644
--- a/bashrc
+++ b/bashrc
@@ -2,10 +2,10 @@
comp_dir=${XDG_DATA_HOME:-$HOME/.local/share}/bash-completion/completions
-if [ -d "$comp_dir" ]; then for f in "$comp_dir"/*; do source $f; done; fi
if [ -d "~/.bash" ]; then for f in ~/.bash/*; do source $f; done; fi
+if [ -d "$comp_dir" ]; then for f in "$comp_dir"/*; do source $f; done; fi
-eval "$(starship init bash)"
+command -v starship >/dev/null 2>&1 && eval "$(starship init bash)"
function set_win_title() {
echo -ne "\033]0;$USER@$HOSTNAME: ${PWD/$HOME/'~'}\007"
diff --git a/install.conf.yaml b/install.conf.yaml
index ec45d1c..c1d6b98 100644
--- a/install.conf.yaml
+++ b/install.conf.yaml
@@ -142,7 +142,6 @@
- link:
# shell
- ~/.bash_profile: bash/env.sh
~/.bashrc:
~/.bash:
glob: true