diff options
Diffstat (limited to '')
| -rw-r--r-- | .bash_profile | 7 | ||||
| -rw-r--r-- | .bashrc | 12 | ||||
| -rw-r--r-- | .profile | 46 |
3 files changed, 39 insertions, 26 deletions
diff --git a/.bash_profile b/.bash_profile deleted file mode 100644 index d65bb56..0000000 --- a/.bash_profile +++ /dev/null @@ -1,7 +0,0 @@ -include () { - [[ -f "$1" && -r "$1" ]] && source "$1" -} - -include ~/.profile -include ~/.nix-profile/etc/profile.d/nix.sh -[[ $TERM = "eterm-color" || $TERM = "screen" ]] || include ~/.bashrc @@ -1,8 +1,6 @@ # If not running interactively, don't do anything else [[ $- != *i* ]] && return -[[ $TERM = "eterm-color" || $TERM = "screen" ]] && source ~/.bash_profile - # from https://unix.stackexchange.com/a/55935 a_prompt() { cwd=$(sed -e "s:$HOME:~:" -e "s:\(\.\?[^/]\)[^/]*/:\1/:g" <<<$PWD) @@ -12,7 +10,7 @@ PS1="\u@\h \$(a_prompt)> " # i-beam cursor # echo -e "\033[5 q" # blinking -echo -e "\033[6 q" # non-blinking +# echo -e "\033[6 q" # non-blinking # various bash tweaks shopt -s histappend @@ -28,13 +26,9 @@ stty stop "" alias ls='ls --color=auto' alias l='ls -lh' # long format and human-readable sizes alias ll='l -A' # long format, all files -alias g='git' -include /usr/share/bash-completion/completions/git && __git_complete g _git alias mpv="mpv --ytdl-format mp4" alias mv="mv -iv" alias cp="cp -iv" -alias scl=systemctl -alias jcl=journalctl alias mbsync='mbsync -c "$XDG_CONFIG_HOME"/isync/mbsyncrc' alias getmail='getmail --getmaildir "$XDG_CONFIG_HOME"/getmail --rcfile getmailrc' alias mb="mbsync csclub; mbsync uwaterloo; mbsync shemshak" @@ -51,8 +45,8 @@ aur() { } # fzf -include /usr/share/fzf/key-bindings.bash -include /usr/share/fzf/completion.bash +#include /usr/share/fzf/key-bindings.bash +#include /usr/share/fzf/completion.bash if ! pgrep -u "$USER" ssh-agent > /dev/null; then ssh-agent > ~/.ssh-agent-thing @@ -1,25 +1,51 @@ -export INPUTRC="$XDG_CONFIG_HOME"/readline/inputrc -export SCREENRC="$XDG_CONFIG_HOME"/screen/screenrc +# ~/.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 export EDITOR="emacsclient -nw" export VISUAL="emcl" -export PATH="$HOME/.local/bin:$HOME/.cabal/bin:$HOME/.cargo/bin:$HOME/.elan/bin${PATH:+:}$PATH" -export GOPATH="$HOME/src/go" +PATH="$HOME/bin:$HOME/.local/bin:$PATH" +PATH="$HOME/.cabal/bin:$HOME/.cargo/bin:$HOME/.elan/bin:$PATH" +export PATH export XDG_CONFIG_HOME="$HOME/.config" export XDG_DATA_HOME="$HOME/.local/share" -export XDG_DATA_DIRS="/usr/local/share:/usr/share" +export XDG_DATA_DIRS="/usr/share/mate:/usr/local/share/:/usr/share/" + +export INPUTRC="$XDG_CONFIG_HOME"/readline/inputrc +export SCREENRC="$XDG_CONFIG_HOME"/screen/screenrc export MAILDIR="$HOME/mail" export CVS_RSH="ssh" +export GOPATH="$HOME/src/go" + +# if running bash +if [ -n "$BASH_VERSION" ]; then + # include .bashrc if it exists + if [ -f "$HOME/.bashrc" ]; then + . "$HOME/.bashrc" + fi +fi + +# if guix is installed if [ -x "$(command -v guix)" ]; then + export PATH="$HOME/.config/guix/current/bin:$PATH" export GUIX_LOCPATH="$HOME/.guix-profile/lib/locale" - export PATH="$HOME/.config/guix/current/bin${PATH:+:}$PATH" - export SSL_CERT_DIR="$HOME/.guix-profile/etc/ssl/certs" - export SSL_CERT_FILE="$HOME/.guix-profile/etc/ssl/certs/ca-certificates.crt" - export GIT_SSL_CAINFO="$SSL_CERT_FILE" + + GUIX_PROFILE="$HOME/.guix-profile" + . "$GUIX_PROFILE/etc/profile" fi -export NIXPKGS="$HOME/src/git/nixpkgs" +setxkbmap \ + -layout us_ab,ir \ + -option ctrl:nocaps \ + -option altwin:swap_alt_win \ + -option grp:shifts_toggle |