diff --git a/bash/.bash_profile b/bash/.bash_profile deleted file mode 100644 index 08bc354..0000000 --- a/bash/.bash_profile +++ /dev/null @@ -1,13 +0,0 @@ -# .bash_profile - -# Get the aliases and functions -if [ -f ~/.bashrc ]; then - . ~/.bashrc -fi - -# User specific environment and startup programs - -export EDITOR=nvim - - -if [ -e /home/grue/.nix-profile/etc/profile.d/nix.sh ]; then . /home/grue/.nix-profile/etc/profile.d/nix.sh; fi # added by Nix installer diff --git a/bash/.bashrc b/bash/.bashrc deleted file mode 100644 index ad4581e..0000000 --- a/bash/.bashrc +++ /dev/null @@ -1,27 +0,0 @@ -# .bashrc - -# Source global definitions -if [ -f /etc/bashrc ]; then - . /etc/bashrc -fi - -# User specific environment -if ! [[ "$PATH" =~ "$HOME/.local/bin:$HOME/bin:" ]] -then - PATH="$HOME/.local/bin:$HOME/bin:$PATH" -fi -export PATH - -# Uncomment the following line if you don't like systemctl's auto-paging feature: -# export SYSTEMD_PAGER= - -# User specific aliases and functions -if [ -d ~/.bashrc.d ]; then - for rc in ~/.bashrc.d/*; do - if [ -f "$rc" ]; then - . "$rc" - fi - done -fi - -unset rc diff --git a/bash/.bashrc.d/alias.sh b/bash/.bashrc.d/alias.sh index fe5ffd1..6c02454 100644 --- a/bash/.bashrc.d/alias.sh +++ b/bash/.bashrc.d/alias.sh @@ -1,6 +1,29 @@ +# ls +alias l="ls -l" +alias la="ls -la" +alias ll="ls -lah" +alias lt="ls --tree" + +# tmux +if [ -x "$(command -v tmux)" ]; then + function tn { + if [ $# -eq 0 ]; then + tmux new-session -s $(basename $(pwd)) + else + tmux new-session -s $1 + fi + } + alias tl="tmux list-sessions" + alias ta="tmux attach -t" +fi + # LaTeX -alias luamk="latexmk -pdf -interaction=nonstopmode -pdflatex=lualatex" -alias lmk="latexmk -pdf -interaction=nonstopmode" +if [ -x "$(command -v latexmk)" ]; then + if [ -x "$(command -v lualatex)" ]; then + alias luamk="latexmk -pdf -interaction=nonstopmode -pdflatex=lualatex" + fi + alias lmk="latexmk -pdf -interaction=nonstopmode" +fi # editor if [ -x "$(command -v nvim)" ]; then diff --git a/bash/.bashrc.d/vars.sh b/bash/.bashrc.d/vars.sh index 1cbf5d9..4c1cdb6 100644 --- a/bash/.bashrc.d/vars.sh +++ b/bash/.bashrc.d/vars.sh @@ -1 +1,4 @@ export JULIA_NUM_THREADS=auto +export EDITOR=nvim +# export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket) +export GPG_TTY=$(tty) diff --git a/git/.config/git/config b/git/.config/git/config index 697689a..2c9990e 100644 --- a/git/.config/git/config +++ b/git/.config/git/config @@ -7,7 +7,7 @@ [merege] conflictstyle = diff3 [commit] - gpgsign = true + gpgsign = false [credential] helper = cache --timeout 28800 [alias]