X-Git-Url: https://iankelling.org/git/?p=distro-setup;a=blobdiff_plain;f=.bashrc;h=da70b0726f1ae5221626d84a31562693ce9d3f63;hp=d8cbd978008030d1ca4fbbc6be9e982ff332da7e;hb=HEAD;hpb=768363d8771edb9d9ed82425fa772d77b90139c0

diff --git a/.bashrc b/.bashrc
index d8cbd97..81853d0 100644
--- a/.bashrc
+++ b/.bashrc
@@ -1,6 +1,25 @@
 #!/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.
+
 
 # to debug
 #set -x
@@ -31,6 +50,9 @@ HISTCONTROL=ignoredups
 # but meh. dunno why, but just " *" does glob expansion, so use [ ] to avoid it.
 HISTIGNORE='pass *:otp *:oathtool *:histrm *'
 
+# note: duplicated in /a/bin/ds/filesystem/etc/profile.d/environment.sh
+umask 022
+
 
 
 #### if (in
@@ -103,3 +125,10 @@ return 0
 ## BEGIN_KITTY_SHELL_INTEGRATION
 # if test -n "$KITTY_INSTALLATION_DIR" -a -e "$KITTY_INSTALLATION_DIR/shell-integration/bash/kitty.bash"; then source "$KITTY_INSTALLATION_DIR/shell-integration/bash/kitty.bash"; fi
 ## END_KITTY_SHELL_INTEGRATION
+
+# Automatically added by the Guix install script.
+if [ -n "$GUIX_ENVIRONMENT" ]; then
+    if [[ $PS1 =~ (.*)"\\$" ]]; then
+        PS1="${BASH_REMATCH[1]} [env]\\\$ "
+    fi
+fi