From fd8024499c41a05aec8a9564f73db2ac05a65c43 Mon Sep 17 00:00:00 2001 From: Brian Zalewski Date: Tue, 22 Nov 2022 17:55:29 +0000 Subject: [PATCH] Update dotfiles/.local/share/chezmoi/.chezmoiexternal.toml, dotfiles/.local/share/chezmoi/private_dot_config/shell/motd, dotfiles/.local/share/chezmoi/private_dot_config/shell/profile --- dotfiles/.local/share/chezmoi/.chezmoiexternal.toml | 8 ++++---- .../.local/share/chezmoi/private_dot_config/shell/motd | 4 ++-- .../.local/share/chezmoi/private_dot_config/shell/profile | 6 ------ 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/dotfiles/.local/share/chezmoi/.chezmoiexternal.toml b/dotfiles/.local/share/chezmoi/.chezmoiexternal.toml index cf5710d3..41533ad9 100644 --- a/dotfiles/.local/share/chezmoi/.chezmoiexternal.toml +++ b/dotfiles/.local/share/chezmoi/.chezmoiexternal.toml @@ -23,19 +23,19 @@ [".config/tmux/tmux.conf.local"] type = "file" url = "https://raw.githubusercontent.com/gpakosz/.tmux/master/.tmux.conf.local" -[".local/antigen.zsh"] +[".local/scripts/antigen.zsh"] type = "file" url = "https://raw.githubusercontent.com/zsh-users/antigen/develop/bin/antigen.zsh" refreshPeriod = "{{ $refreshPeriod }}" -[".local/docker-functions.bash"] +[".local/scripts/docker-functions.bash"] type = "file" url = "https://raw.githubusercontent.com/jessfraz/dotfiles/master/.dockerfunc" refreshPeriod = "{{ $refreshPeriod }}" -[".local/fzf-git.bash"] +[".local/scripts/fzf-git.bash"] type = "file" url = "https://raw.githubusercontent.com/junegunn/fzf-git.sh/main/fzf-git.sh" refreshPeriod = "{{ $refreshPeriod }}" -[".local/fzf-tmux.bash"] +[".local/scripts/fzf-tmux.bash"] type = "file" url = "https://raw.githubusercontent.com/junegunn/fzf/master/bin/fzf-tmux" refreshPeriod = "{{ $refreshPeriod }}" diff --git a/dotfiles/.local/share/chezmoi/private_dot_config/shell/motd b/dotfiles/.local/share/chezmoi/private_dot_config/shell/motd index 1cacda10..5f45edcc 100644 --- a/dotfiles/.local/share/chezmoi/private_dot_config/shell/motd +++ b/dotfiles/.local/share/chezmoi/private_dot_config/shell/motd @@ -1,9 +1,9 @@ ### MOTD # Add file named .hushlogin in the user's home directory to disable the MOTD if [ "$BASH_SUPPORT" = 'true' ] && [ ! -f ~/.hushlogin ] && [ "$SHLVL" -eq 1 ]; then - if [ -f "$HOME/.local/motd.sh" ] && { [ -n "$SSH_CONNECTION" ] && [[ $- == *i* ]]; } || command -v qubes-vmexec > /dev/null || command -v qubes-dom0-update > /dev/null || { [ -d /Applications ] && [ -d /System ]; }; then + if [ -f "$HOME/.local/scripts/motd.bash" ] && { [ -n "$SSH_CONNECTION" ] && [[ $- == *i* ]]; } || command -v qubes-vmexec > /dev/null || command -v qubes-dom0-update > /dev/null || { [ -d /Applications ] && [ -d /System ]; }; then if { [ -z "$MOTD" ] || [ "$MOTD" -ne 0 ]; } && [[ "$(hostname)" != *'-minimal' ]]; then - . "$HOME/.local/motd.sh" + . "$HOME/.local/scripts/motd.bash" # TODO - -- services if [ -n "$SSH_CONNECTION" ]; then # SSH diff --git a/dotfiles/.local/share/chezmoi/private_dot_config/shell/profile b/dotfiles/.local/share/chezmoi/private_dot_config/shell/profile index 8dcdf92b..6f81c769 100644 --- a/dotfiles/.local/share/chezmoi/private_dot_config/shell/profile +++ b/dotfiles/.local/share/chezmoi/private_dot_config/shell/profile @@ -108,12 +108,6 @@ if [ "$BASH_SUPPORT" = 'true' ]; then . "$XDG_CONFIG_HOME/shell/lscolors.sh" fi - ### Directory Colors (https://github.com/trapd00r/LS_COLORS) - command -v gdircolors >/dev/null 2>&1 || alias gdircolors="dircolors" - if type gdircolors &> /dev/null && [ -f "$XDG_CONFIG_HOME/dircolors" ]; then - eval "$(gdircolors -b "$XDG_CONFIG_HOME/dircolors")" - fi - ### MOTD if [ -f "$XDG_CONFIG_HOME/shell/motd" ]; then . "$XDG_CONFIG_HOME/shell/motd"