X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=.bashrc;h=814c9af63136b822811da9ba20c1af02beaa1ff4;hb=8de1e14e35d0ad62620a59f6e2ca4ba19ddcda3c;hp=12b60b8b29b6e0cefbb153de6c1bc1b16285d376;hpb=9a0f77b0495e6f2643d5646c54b4c99cf3118c67;p=distro-setup diff --git a/.bashrc b/.bashrc index 12b60b8..814c9af 100644 --- a/.bashrc +++ b/.bashrc @@ -1,6 +1,26 @@ #!/bin/bash -# Copyright (C) 2019 Ian Kelling -# SPDX-License-Identifier: AGPL-3.0-or-later +# I, Ian Kelling, follow the GNU license recommendations at +# https://www.gnu.org/licenses/license-recommendations.en.html. They +# recommend that small programs, < 300 lines, be licensed under the +# Apache License 2.0. This file contains or is part of one or more small +# programs. If a small program grows beyond 300 lines, I plan to switch +# its license to GPL. + +# Copyright 2024 Ian Kelling + +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at + +# http://www.apache.org/licenses/LICENSE-2.0 + +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +# shellcheck disable=SC2317 # to debug #set -x @@ -35,6 +55,11 @@ HISTIGNORE='pass *:otp *:oathtool *:histrm *' umask 022 +if [[ $EUID == 1000 && $TERM == linux && ! $DISPLAY && $(tty) = /dev/tty1 && -x /usr/bin/startx ]] && \ + tmp=$(systemctl status |& head) && \ + grep -qi '^ *state: running' <<<"$tmp" && grep -qi '^ *failed: 0' <<<"$tmp" && grep -qi '^ *jobs: 0' <<<"$tmp"; then + startx +fi #### if (in # noninteractive ssh shells or tty). tty because often i use it when @@ -109,7 +134,7 @@ return 0 # Automatically added by the Guix install script. if [ -n "$GUIX_ENVIRONMENT" ]; then - if [[ $PS1 =~ (.*)"\\$" ]]; then - PS1="${BASH_REMATCH[1]} [env]\\\$ " - fi + if [[ $PS1 =~ (.*)"\\$" ]]; then + PS1="${BASH_REMATCH[1]} [env]\\\$ " + fi fi