Compare commits

..

6 Commits

3 changed files with 42 additions and 8 deletions

View File

@@ -1,4 +1,4 @@
# SPDX-FileCopyrightText: 2019-2022, 2025 Kris Lamoureux <kris@lamoureux.io> # SPDX-FileCopyrightText: 2019-2022, 2025-2026 Kris Lamoureux <kris@lamoureux.io>
# SPDX-License-Identifier: 0BSD # SPDX-License-Identifier: 0BSD
# shellcheck shell=bash # shellcheck shell=bash
@@ -11,8 +11,13 @@ alias 'otheralias'='vim ~/.other_aliases && . ~/.bash_aliases'
alias 'viewalias'='view ~/.bash_aliases' alias 'viewalias'='view ~/.bash_aliases'
alias 'refreshalias'='source ~/.bash_aliases' alias 'refreshalias'='source ~/.bash_aliases'
# File management
alias put='mv --update=none-fail --verbose'
alias copy='cp --update=none-fail --verbose'
alias mv='mv -i'
# SSH management # SSH management
alias 'fssh'='ssh-add && ssh -A' alias 'fssh'='ssh-add && ssh -A -S none'
alias 'editssh'='vim ~/.ssh/config' alias 'editssh'='vim ~/.ssh/config'
# Edit hosts file # Edit hosts file
@@ -77,15 +82,15 @@ alias 'signhist'='git rebase --exec "git commit -S --amend --no-edit -n"'
alias 'signhistnew'='git rebase --exec "git commit -S --amend --date '\''`date -R`'\'' --no-edit -n"' alias 'signhistnew'='git rebase --exec "git commit -S --amend --date '\''`date -R`'\'' --no-edit -n"'
function gd() { function gd() {
git diff HEAD~$1 git diff "HEAD~$1"
} }
function rebase() { function rebase() {
git rebase -i HEAD~$1 git rebase -i "HEAD~$1"
} }
function delcommit() { function delcommit() {
git reset --hard HEAD~$1 git reset --hard "HEAD~$1"
} }
# Docker shortcuts # Docker shortcuts
@@ -103,9 +108,11 @@ alias 'socks'='screen -dm ssh -D 1337 -q -C -N'
# sshuttle proxy # sshuttle proxy
#e.g. alias 'proxyhome'='proxy user hostdomain:22 192.168.1.0/24' #e.g. alias 'proxyhome'='proxy user hostdomain:22 192.168.1.0/24'
function proxy() { function proxy() {
screen -dm sshuttle -v -r $1@$2 -x $2 ${@:2}; screen -r; screen -dm sshuttle -v -r "$1@$2" -x "$2" "${@:2}"
screen -r
} }
if [ -f ~/.other_aliases ]; then if [ -f ~/.other_aliases ]; then
# shellcheck disable=SC1090
source ~/.other_aliases source ~/.other_aliases
fi fi

25
tmux/.tmux.conf Normal file
View File

@@ -0,0 +1,25 @@
# prefix+r to reload
bind r source-file ~/.tmux.conf \; display "Config reloaded!"
# long history, 2k default
set-option -g history-limit 100000
# vi-style key bindings in copy mode, etc
set-window-option -g mode-keys vi
# Trying out mouse mode for now, use shift to bypass to local emulator
bind-key m set-option -g mouse \; display "Mouse: #{?mouse,ON,OFF}"
set -g mouse on
set -g terminal-overrides 'xterm*:smcup@:rmcup@'
# F12 to toggle whether tmux commands affect local or nested (remote) session
bind -T root F12 \
set prefix None \;\
set key-table off \;\
refresh-client -S
bind -T off F12 \
set -u prefix \;\
set -u key-table \;\
refresh-client -S

View File

@@ -18,3 +18,5 @@ if &term =~ '256color'
set t_ut= set t_ut=
endif endif
" Use tabs in shell
autocmd FileType sh setlocal tabstop=4 shiftwidth=4 noexpandtab