From 05eb9949bb6277364a1787390147aa22a3d25131 Mon Sep 17 00:00:00 2001 From: Daniel Flanagan Date: Tue, 13 Aug 2019 16:18:27 -0500 Subject: [PATCH] Changes --- shell/bash/aliases | 2 ++ shell/bash/bashrc | 2 +- shell/tmux/tmux.conf | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/shell/bash/aliases b/shell/bash/aliases index e42d23e..43969f4 100644 --- a/shell/bash/aliases +++ b/shell/bash/aliases @@ -52,6 +52,7 @@ alias tdf="tmux attach -t dotfiles || tmux new -s dotfiles -c \"\$DOTFILES_PATH\ alias tmon="tmux attach -t monitoring || tmux new -s monitoring" alias tcom="tmux attach -t comms || tmux new -s comms" alias tn="tmux attach -t notes || tmux new -s notes -c \"\$NOTES_PATH\"" +alias tm="tmux attach -t music || tmux new -s music" # git aliases # TODO: make these git aliases in the gitconfig? @@ -69,6 +70,7 @@ alias gds="git diff --staged" alias gpl="git pull" alias gp="git push" alias gpa="git push --all && git push --tags" +alias gpt="git push && git push --tags" alias gpf="git push --force-with-lease" alias gac="git add -A && git commit" alias gsur="git submodule update --remote" diff --git a/shell/bash/bashrc b/shell/bash/bashrc index e1991f8..6987810 100644 --- a/shell/bash/bashrc +++ b/shell/bash/bashrc @@ -113,7 +113,7 @@ fi # TODO: check if fd command exists export FZF_DEFAULT_COMMAND='fd --type f --hidden --follow --exclude .git' -export ERL_AFLAGS="-kernel shell_history enabled" +export ERL_AFLAGS="-kernel shell_history enabled -kernel shell_history_file_bytes 1024000" _make_paths diff --git a/shell/tmux/tmux.conf b/shell/tmux/tmux.conf index eb1da02..a32876a 100644 --- a/shell/tmux/tmux.conf +++ b/shell/tmux/tmux.conf @@ -35,7 +35,7 @@ bind-key h split-window # show tmux status bar by default with (C-s, H) to toggle it set -g status on -bind-key H set -g status +bind-key H set -s status # simple session switching bind-key j switch-client -p