From 2985ff4688abe48238b6b9ad76533b2f89ed04fd Mon Sep 17 00:00:00 2001 From: josiah Date: Sun, 14 Mar 2021 21:46:24 -0500 Subject: [PATCH] fix pathing issues with .bashrc, .profile, by having them ref 3rd f. --- .bashrc | 21 +-------------------- .paths | 20 ++++++++++++++++++++ .profile | 26 ++++++++++++++++++++++++++ 3 files changed, 47 insertions(+), 20 deletions(-) create mode 100644 .paths create mode 100644 .profile diff --git a/.bashrc b/.bashrc index 4ac8fa7..a5c2d05 100644 --- a/.bashrc +++ b/.bashrc @@ -7,26 +7,7 @@ shopt -s checkwinsize # fix line wrap issues set completion-ignore-case on # ignore case when tab-completing -# find paths inside agares -export AGARES=${AGARES:-"$HOME/.agares"} - -# guix stuff -export GUIX_LOCPATH=$HOME/.guix-profile/lib/locale -export GUIX_PROFILE="$HOME/.guix-profile" -source "$GUIX_PROFILE/etc/profile" - -# fuck with nix stuff -export XDG_DATA_DIRS="/home/josiah/.nix-profile/share:$XDG_DATA_DIRS" -if [ -e /home/josiah/.nix-profile/etc/profile.d/nix.sh ]; then - . /home/josiah/.nix-profile/etc/profile.d/nix.sh -fi -# update paths with installed executables: -export PATH=/usr/local/bin:$PATH -export PATH=/usr/local/share/python:$PATH -export PATH=/Users/jowj/Library/Python/3.6/bin:$PATH -export PATH=/home/josiah/.local/bin:$PATH -export PATH=/home/josiah/.gem/ruby/2.6.0/bin:$PATH -export PATH=/home/josiah/.config/guix/current/bin/:$PATH +source ~/.paths export EDITOR=emacsclient # blatantly steal micah's ls aliases because they make SO MUCH SENSE omg. diff --git a/.paths b/.paths new file mode 100644 index 0000000..d6cd7b9 --- /dev/null +++ b/.paths @@ -0,0 +1,20 @@ +# find paths inside agares +export AGARES=${AGARES:-"$HOME/.agares"} + +# guix stuff +export GUIX_LOCPATH=$HOME/.guix-profile/lib/locale +export GUIX_PROFILE="$HOME/.guix-profile" +source "$GUIX_PROFILE/etc/profile" + +# fuck with nix stuff +export XDG_DATA_DIRS="/home/josiah/.nix-profile/share:$XDG_DATA_DIRS" +if [ -e /home/josiah/.nix-profile/etc/profile.d/nix.sh ]; then + . /home/josiah/.nix-profile/etc/profile.d/nix.sh +fi +# update paths with installed executables: +export PATH=/usr/local/bin:$PATH +export PATH=/usr/local/share/python:$PATH +export PATH=/Users/jowj/Library/Python/3.6/bin:$PATH +export PATH=/home/josiah/.local/bin:$PATH +export PATH=/home/josiah/.gem/ruby/2.6.0/bin:$PATH +export PATH=/home/josiah/.config/guix/current/bin/:$PATH diff --git a/.profile b/.profile new file mode 100644 index 0000000..a124e41 --- /dev/null +++ b/.profile @@ -0,0 +1,26 @@ +# ~/.profile: executed by the command interpreter for login shells. +# This file is not read by bash(1), if ~/.bash_profile or ~/.bash_login +# exists. +# see /usr/share/doc/bash/examples/startup-files for examples. +# the files are located in the bash-doc package. + +# the default umask is set in /etc/profile; for setting the umask +# for ssh logins, install and configure the libpam-umask package. +#umask 022 + +source ~/.paths + +if [ -d "$HOME/bin" ] ; then + PATH="$HOME/bin:$PATH" +fi + +# set PATH so it includes user's private bin if it exists +if [ -d "$HOME/.local/bin" ] ; then + PATH="$HOME/.local/bin:$PATH" +fi + +export LANG=en_US.UTF-8 +export LANGUAGE=en_US.UTF-8 +export LC_COLLATE=C +export LC_CTYPE=en_US.UTF-8 +