From 2e683b9427c62777b4523971bbef3319811748f7 Mon Sep 17 00:00:00 2001 From: Nathan Steel Date: Fri, 16 Feb 2024 14:23:39 +0000 Subject: [PATCH] Changes --- bash/.bash_aliases | 32 +++++++++++- bash/.bashrc | 120 ++++++++++++++++++++++++++++++++++++++++++++- ssh/.ssh/config | 34 ++++--------- 3 files changed, 160 insertions(+), 26 deletions(-) diff --git a/bash/.bash_aliases b/bash/.bash_aliases index 5d096d2..c44c475 100644 --- a/bash/.bash_aliases +++ b/bash/.bash_aliases @@ -1,4 +1,34 @@ -alias vim='nvim' +#alias vim='nvim' alias ta='tmux attach || tmux new' alias top='htop' +alias ll="ls -lhtr" +alias df="df -h" + +alias ipe="curl ifconfig.co" + +## Only ask for my SSH key passpharase once! +## https://gist.github.com/949740 +## http://mah.everybody.org/docs/ssh +SSH_ENV="${HOME}/.ssh/environment" + +# Function to start the SSH-Agent +function start_agent { + echo "Initialising new SSH agent..." + /usr/bin/ssh-agent | sed 's/^echo/#echo/' > "${SSH_ENV}" + echo succeeded + chmod 600 "${SSH_ENV}" + . "${SSH_ENV}" > /dev/null + /usr/bin/ssh-add; +} + +# Source SSH settings, if applicable +if [ -f "${SSH_ENV}" ]; then + . "${SSH_ENV}" > /dev/null + #ps ${SSH_AGENT_PID} doesn't work under cywgin + ps -ef | grep ${SSH_AGENT_PID} | grep ssh-agent$ > /dev/null || { + start_agent; + } +else + start_agent; +fi diff --git a/bash/.bashrc b/bash/.bashrc index 071e8c0..16ac8d5 100644 --- a/bash/.bashrc +++ b/bash/.bashrc @@ -1,2 +1,120 @@ -# Vi mode +# ~/.bashrc: executed by bash(1) for non-login shells. +# see /usr/share/doc/bash/examples/startup-files (in the package bash-doc) +# for examples + +# If not running interactively, don't do anything +case $- in + *i*) ;; + *) return;; +esac + +# don't put duplicate lines or lines starting with space in the history. +# See bash(1) for more options +HISTCONTROL=ignoreboth + +# append to the history file, don't overwrite it +shopt -s histappend + +# for setting history length see HISTSIZE and HISTFILESIZE in bash(1) +HISTSIZE=1000 +HISTFILESIZE=2000 + +# check the window size after each command and, if necessary, +# update the values of LINES and COLUMNS. +shopt -s checkwinsize + +# If set, the pattern "**" used in a pathname expansion context will +# match all files and zero or more directories and subdirectories. +#shopt -s globstar + +# make less more friendly for non-text input files, see lesspipe(1) +[ -x /usr/bin/lesspipe ] && eval "$(SHELL=/bin/sh lesspipe)" + +# set variable identifying the chroot you work in (used in the prompt below) +if [ -z "${debian_chroot:-}" ] && [ -r /etc/debian_chroot ]; then + debian_chroot=$(cat /etc/debian_chroot) +fi + +# set a fancy prompt (non-color, unless we know we "want" color) +case "$TERM" in + xterm-color|*-256color) color_prompt=yes;; +esac + +# uncomment for a colored prompt, if the terminal has the capability; turned +# off by default to not distract the user: the focus in a terminal window +# should be on the output of commands, not on the prompt +#force_color_prompt=yes + +if [ -n "$force_color_prompt" ]; then + if [ -x /usr/bin/tput ] && tput setaf 1 >&/dev/null; then + # We have color support; assume it's compliant with Ecma-48 + # (ISO/IEC-6429). (Lack of such support is extremely rare, and such + # a case would tend to support setf rather than setaf.) + color_prompt=yes + else + color_prompt= + fi +fi + +if [ "$color_prompt" = yes ]; then + PS1='${debian_chroot:+($debian_chroot)}\[\033[01;32m\]\u@\h\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\]\$ ' +else + PS1='${debian_chroot:+($debian_chroot)}\u@\h:\w\$ ' +fi +unset color_prompt force_color_prompt + +# If this is an xterm set the title to user@host:dir +case "$TERM" in +xterm*|rxvt*) + PS1="\[\e]0;${debian_chroot:+($debian_chroot)}\u@\h: \w\a\]$PS1" + ;; +*) + ;; +esac + +# enable color support of ls and also add handy aliases +if [ -x /usr/bin/dircolors ]; then + test -r ~/.dircolors && eval "$(dircolors -b ~/.dircolors)" || eval "$(dircolors -b)" + alias ls='ls --color=auto' + #alias dir='dir --color=auto' + #alias vdir='vdir --color=auto' + + alias grep='grep --color=auto' + alias fgrep='fgrep --color=auto' + alias egrep='egrep --color=auto' +fi + +# colored GCC warnings and errors +#export GCC_COLORS='error=01;31:warning=01;35:note=01;36:caret=01;32:locus=01:quote=01' + +# some more ls aliases +alias ll='ls -alF' +alias la='ls -A' +alias l='ls -CF' + +# Add an "alert" alias for long running commands. Use like so: +# sleep 10; alert +alias alert='notify-send --urgency=low -i "$([ $? = 0 ] && echo terminal || echo error)" "$(history|tail -n1|sed -e '\''s/^\s*[0-9]\+\s*//;s/[;&|]\s*alert$//'\'')"' + +# Alias definitions. +# You may want to put all your additions into a separate file like +# ~/.bash_aliases, instead of adding them here directly. +# See /usr/share/doc/bash-doc/examples in the bash-doc package. + +if [ -f ~/.bash_aliases ]; then + . ~/.bash_aliases +fi + +# enable programmable completion features (you don't need to enable +# this, if it's already enabled in /etc/bash.bashrc and /etc/profile +# sources /etc/bash.bashrc). +if ! shopt -oq posix; then + if [ -f /usr/share/bash-completion/bash_completion ]; then + . /usr/share/bash-completion/bash_completion + elif [ -f /etc/bash_completion ]; then + . /etc/bash_completion + fi +fi + set -o vi + diff --git a/ssh/.ssh/config b/ssh/.ssh/config index 4d652a1..5c26dbf 100644 --- a/ssh/.ssh/config +++ b/ssh/.ssh/config @@ -1,39 +1,25 @@ -Host truenas - Hostname 192.168.0.100 - User nathan - Port 2020 - -Host red - Hostname 192.168.0.200 - User nathan - Port 2020 - -Host lilman - Hostname 192.168.0.220 +Host racknerd + Hostname racknerd.aney.co.uk User nathan Port 2020 -Host opnsense - Hostname 192.168.0.221 +Host rn1 + Hostname rn1.aney.co.uk User nathan Port 2020 -Host truenas - Hostname 192.168.0.222 +Host rn2 + Hostname rn2.aney.co.uk User nathan Port 2020 -Host wireguard - Hostname 192.168.0.223 +Host alphavps + Hostname alphavps.aney.co.uk User nathan Port 2020 -Host racknerd - Hostname racknerd.aney.co.uk +Host av + Hostname av.aney.co.uk User nathan Port 2020 -Host alphavps - Hostname alphavps.aney.co.uk - User nathan - Port 2020