Compare commits
No commits in common. 'master' and 'develop' have entirely different histories.
@ -1,39 +0,0 @@
|
||||
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
|
||||
User nathan
|
||||
Port 2020
|
||||
|
||||
Host opnsense
|
||||
Hostname 192.168.0.221
|
||||
User nathan
|
||||
Port 2020
|
||||
|
||||
Host truenas
|
||||
Hostname 192.168.0.222
|
||||
User nathan
|
||||
Port 2020
|
||||
|
||||
Host wireguard
|
||||
Hostname 192.168.0.223
|
||||
User nathan
|
||||
Port 2020
|
||||
|
||||
Host racknerd
|
||||
Hostname racknerd.aney.co.uk
|
||||
User nathan
|
||||
Port 2020
|
||||
|
||||
Host alphavps
|
||||
Hostname alphavps.aney.co.uk
|
||||
User nathan
|
||||
Port 2020
|
||||
@ -1,34 +0,0 @@
|
||||
#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
|
||||
@ -1,120 +0,0 @@
|
||||
# ~/.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
|
||||
|
||||
@ -1,6 +0,0 @@
|
||||
"\C-p":previous-history
|
||||
"\C-n":next-history
|
||||
"\C-a.":beginning-of-line
|
||||
"\C-e.":end-of-line
|
||||
"\C-l":clear-screen
|
||||
|
||||
@ -1,279 +0,0 @@
|
||||
alias start='cmd.exe /c start'
|
||||
alias explorer='start'
|
||||
alias rm='rm -i'
|
||||
alias zoidberg-sync-lock-check='ssh root@zoidberg.tjs.co.uk -p 2020 "ls -altr /home/*/website/private/tmp/*lock*"'
|
||||
alias zoidberg-phantomjs-check='ssh root@zoidberg.tjs.co.uk -p 2020 "ps -ef | grep phantomjs"'
|
||||
alias updatedns='ssh root@midget.tjs.co.uk "/root/scripts/updatedns.php"'
|
||||
alias scratch='cd /mnt/c/scratch'
|
||||
alias vagrant='vagrant.exe'
|
||||
|
||||
# devboxes
|
||||
VAG80='27018d0'
|
||||
VAG74='97c9f86'
|
||||
VAG56='09ec6c2'
|
||||
|
||||
alias vagup80='vagrant.exe up $VAG80'
|
||||
alias vagup74='vagrant.exe up $VAG74'
|
||||
alias vagup56='vagrant.exe up $VAG56'
|
||||
alias vaghalt80='vagrant.exe halt $VAG80'
|
||||
alias vaghalt74='vagrant.exe halt $VAG74'
|
||||
alias vaghalt56='vagrant.exe halt $VAG56'
|
||||
alias vagreload80='vagrant.exe reload $VAG80'
|
||||
alias vagreload74='vagrant.exe reload $VAG74'
|
||||
alias vagreload56='vagrant.exe reload $VAG56'
|
||||
alias vaghaltall='vagrant.exe halt $VAG80 && vagrant.exe halt $VAG74 && vagrant.exe halt $VAG56'
|
||||
|
||||
alias ssh80='ssh vagrant@nathan80.tjs.co.uk'
|
||||
alias ssh74='ssh vagrant@nathan74.tjs.co.uk'
|
||||
alias ssh56='ssh vagrant@nathan56.tjs.co.uk'
|
||||
|
||||
#alias weasel-pageant='eval $(/mnt/c/Users/nathan/command/weasel-pageant-1.1/weasel-pageant -r)'
|
||||
|
||||
function git-push-release()
|
||||
{
|
||||
|
||||
if git show-ref --verify --quiet refs/heads/main; then
|
||||
echo "Push main:"
|
||||
git push origin main
|
||||
elif git show-ref --verify --quiet refs/heads/master; then
|
||||
echo "Push master:"
|
||||
git push origin master
|
||||
fi
|
||||
|
||||
echo ""
|
||||
echo "Push tags:"
|
||||
git push origin --tags
|
||||
|
||||
echo ""
|
||||
echo "Push develop:"
|
||||
git push origin develop
|
||||
}
|
||||
|
||||
|
||||
## server siteexport
|
||||
function siteexport()
|
||||
{
|
||||
usage="Usage: siteexport <servername> [nginx|both]"
|
||||
if [[ $# -eq 0 ]]; then
|
||||
echo "No server specified"
|
||||
echo "$usage"
|
||||
return 1
|
||||
elif [[ $# -eq 1 ]]; then
|
||||
echo "No scope specified"
|
||||
echo "$usage"
|
||||
return 2
|
||||
else
|
||||
if [[ $2 = 'nginx' ]]; then
|
||||
args=' --nginx-only'
|
||||
elif [[ $2 = 'both' ]]; then
|
||||
args=""
|
||||
else
|
||||
echo "Scope must be 'nginx' or 'both'"
|
||||
echo "$usage"
|
||||
return 3
|
||||
fi
|
||||
#weasel-pageant && ssh root@midget.tjs.co.uk "/root/scripts/$1-siteexport.php $args"
|
||||
ssh root@midget.tjs.co.uk "/root/scripts/$1-siteexport.php $args"
|
||||
fi
|
||||
}
|
||||
|
||||
## change to a website project's directory
|
||||
function site()
|
||||
{
|
||||
basedir="/mnt/c/Users/nathan/documents/websites/"
|
||||
if [[ $# -eq 0 ]]; then
|
||||
echo "No site specified"
|
||||
echo "Usage: site <sitename>"
|
||||
echo "cd $basedir"
|
||||
cd $basedir
|
||||
return 0;
|
||||
elif [[ -d "$basedir$1" ]]; then
|
||||
dir="$basedir$1";
|
||||
else
|
||||
for f in $basedir$1*; do
|
||||
if [[ -e $f && -d $f ]]; then
|
||||
dirsfound=()
|
||||
COUNTER=0
|
||||
for g in $basedir$1*; do
|
||||
if [[ -d $g ]]; then
|
||||
tempdir=$g
|
||||
dirsfound+=(${g/$basedir/})
|
||||
let COUNTER=COUNTER+1
|
||||
fi
|
||||
done
|
||||
if [ "$COUNTER" -eq "1" ]; then
|
||||
dir=$tempdir
|
||||
else
|
||||
echo "$COUNTER found, need to be more specific"
|
||||
for h in ${dirsfound[@]}; do
|
||||
echo " - $h"
|
||||
done
|
||||
echo "cd $basedir"
|
||||
cd $basedir
|
||||
dir=""
|
||||
fi
|
||||
else
|
||||
echo "Can't find site '$1'";
|
||||
return 0;
|
||||
fi
|
||||
break
|
||||
done
|
||||
fi
|
||||
|
||||
if [[ $# -ge 2 ]]; then
|
||||
if [[ -d "$dir/$2" ]]; then
|
||||
dir="$dir/$2";
|
||||
else
|
||||
echo "Can't find subfolder '$2'";
|
||||
return 0;
|
||||
fi
|
||||
fi
|
||||
|
||||
if [ $dir ]; then
|
||||
cd $dir
|
||||
#explorer .
|
||||
echo "Changed to $dir"
|
||||
if [[ -d ".git" ]]; then
|
||||
echo "-----------------------------------";
|
||||
#echo "ensuring SSH agent is running...";
|
||||
#weasel-pageant;
|
||||
#echo "...done";
|
||||
#echo "-------------";
|
||||
if [ -f ".nvmrc" ]; then
|
||||
echo "setting node version...";
|
||||
nvm use;
|
||||
echo "...done";
|
||||
fi
|
||||
echo "-------------";
|
||||
echo "git-fetching origin (incl. tags)...";
|
||||
git fetch origin --tags;
|
||||
echo "...done";
|
||||
echo "-------------";
|
||||
echo "Git branches:";
|
||||
git br;
|
||||
echo "-------------";
|
||||
echo "Recent commits:";
|
||||
git recent -n 3
|
||||
echo "-----------";
|
||||
echo "Git status:";
|
||||
if [[ `git status --porcelain` ]]; then
|
||||
# Changes
|
||||
git st;
|
||||
else
|
||||
# No changes
|
||||
echo "Repo is clean."
|
||||
fi
|
||||
echo "-----------------------------------";
|
||||
fi;
|
||||
fi
|
||||
}
|
||||
## change to a component project's directory
|
||||
function comp()
|
||||
{
|
||||
basedir="/mnt/c/Users/nathan/documents/components/"
|
||||
if [[ $# -eq 0 ]]; then
|
||||
echo "No component specified"
|
||||
echo "Usage: comp <componentname>"
|
||||
echo "cd $basedir"
|
||||
cd $basedir
|
||||
return 0;
|
||||
elif [[ -d "$basedir$1" ]]; then
|
||||
dir="$basedir$1";
|
||||
else
|
||||
for f in $basedir$1*; do
|
||||
if [[ -e $f && -d $f ]]; then
|
||||
dirsfound=()
|
||||
COUNTER=0
|
||||
for g in $basedir$1*; do
|
||||
if [[ -d $g ]]; then
|
||||
tempdir=$g
|
||||
dirsfound+=(${g/$basedir/})
|
||||
let COUNTER=COUNTER+1
|
||||
fi
|
||||
done
|
||||
if [ "$COUNTER" -eq "1" ]; then
|
||||
dir=$tempdir
|
||||
else
|
||||
echo "$COUNTER found, need to be more specific"
|
||||
for h in ${dirsfound[@]}; do
|
||||
echo " - $h"
|
||||
done
|
||||
echo "cd $basedir"
|
||||
cd $basedir
|
||||
dir=""
|
||||
fi
|
||||
else
|
||||
echo "Can't find component '$1'";
|
||||
return 0;
|
||||
fi
|
||||
break
|
||||
done
|
||||
fi
|
||||
|
||||
if [[ $# -ge 2 ]]; then
|
||||
if [[ -d "$dir/$2" ]]; then
|
||||
dir="$dir/$2";
|
||||
else
|
||||
echo "Can't find subfolder '$2'";
|
||||
return 0;
|
||||
fi
|
||||
fi
|
||||
|
||||
if [ $dir ]; then
|
||||
cd $dir
|
||||
#explorer .
|
||||
echo "Changed to $dir"
|
||||
if [[ -d ".git" ]]; then
|
||||
echo "-----------------------------------";
|
||||
#echo "ensuring SSH agent is running...";
|
||||
#weasel-pageant;
|
||||
#echo "...done";
|
||||
#echo "-------------";
|
||||
echo "git-fetching origin (incl. tags)...";
|
||||
git fetch origin --tags;
|
||||
echo "...done";
|
||||
echo "-------------";
|
||||
echo "Git branches:";
|
||||
git br;
|
||||
echo "-------------";
|
||||
echo "Recent commits:";
|
||||
git recent -n 3
|
||||
echo "-----------";
|
||||
echo "Git status:";
|
||||
if [[ `git status --porcelain` ]]; then
|
||||
# Changes
|
||||
git st;
|
||||
else
|
||||
# No changes
|
||||
echo "Repo is clean."
|
||||
fi
|
||||
echo "-----------------------------------";
|
||||
fi;
|
||||
fi
|
||||
}
|
||||
|
||||
## GIST: https://gist.github.com/949740
|
||||
## Only ask for my SSH key passpharase once!
|
||||
# Sourced from 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
|
||||
@ -1,54 +0,0 @@
|
||||
call plug#begin("~/.vim/plugged")
|
||||
" Colour Scheme
|
||||
Plug 'morhetz/gruvbox'
|
||||
|
||||
" Tree view
|
||||
Plug 'nvim-tree/nvim-tree.lua'
|
||||
"Plug 'nvim-tree/nvim-web-devicons'
|
||||
|
||||
" Fuzzy finder(s)
|
||||
Plug 'ibhagwan/fzf-lua', {'branch': 'main'}
|
||||
|
||||
" Colour highlighter
|
||||
Plug 'norcalli/nvim-colorizer.lua'
|
||||
|
||||
" Vim tweaks, and additions
|
||||
" Vim Move (C-hjkl)
|
||||
Plug 'matze/vim-move'
|
||||
" Add surround to vim (much like, around, inside, etc)
|
||||
Plug 'tpope/vim-surround'
|
||||
" Add easy commenting
|
||||
Plug 'preservim/nerdcommenter'
|
||||
|
||||
"Git (Show changes in files)
|
||||
Plug 'mhinz/vim-signify'
|
||||
call plug#end()
|
||||
|
||||
" Vim stuff
|
||||
source ~/.vimrc
|
||||
|
||||
" Colour Scheme
|
||||
if (has("termguicolors"))
|
||||
set termguicolors
|
||||
endif
|
||||
syntax enable
|
||||
colorscheme gruvbox
|
||||
|
||||
" Colourizer
|
||||
lua require'colorizer'.setup()
|
||||
" Tree
|
||||
lua require'nvim-tree'.setup {}
|
||||
nnoremap <C-n> :NvimTreeToggle<CR>
|
||||
|
||||
" Signify
|
||||
let g:signify_sign_add = '+'
|
||||
let g:signify_sign_delete = '-'
|
||||
let g:signify_sign_change = '│'
|
||||
"hi DiffDelete guifg=#ff5555 guibg=none
|
||||
|
||||
" Fzf
|
||||
nnoremap <C-p> <cmd>lua require('fzf-lua').files()<CR>
|
||||
|
||||
" Vim Move
|
||||
let g:move_key_modifier = 'C'
|
||||
|
||||
@ -1,25 +0,0 @@
|
||||
Host pi1
|
||||
Hostname 192.168.0.100
|
||||
User nathan
|
||||
Port 2020
|
||||
|
||||
Host local
|
||||
Hostname 127.0.0.1 #10.0.2.15 # NAT
|
||||
User nathan
|
||||
Port 2020
|
||||
|
||||
Host rn2
|
||||
Hostname rn2.aney.co.uk
|
||||
User nathan
|
||||
Port 2020
|
||||
|
||||
Host alphavps
|
||||
Hostname alphavps.aney.co.uk
|
||||
User nathan
|
||||
Port 2020
|
||||
|
||||
Host av1
|
||||
Hostname alphavps.aney.co.uk
|
||||
User nathan
|
||||
Port 2020
|
||||
|
||||
@ -1,21 +0,0 @@
|
||||
#!/bin/bash
|
||||
|
||||
DIRS=$(ls -d */)
|
||||
#stow -d
|
||||
|
||||
# First make hidden files not wildcardable
|
||||
shopt -u dotglob
|
||||
|
||||
# Loop the directories
|
||||
for i in "${DIRS[@]}"
|
||||
do
|
||||
echo $i
|
||||
# Stow adopt, like -d, but it replaces the content in stow dir with
|
||||
# what already exists
|
||||
stow --adopt $i --target ~/
|
||||
done
|
||||
|
||||
# Now to revert the --adopt, and make it act like -d
|
||||
# !Make sure there's nothing new/uncommited in dotfiles dir first
|
||||
git reset --hard
|
||||
|
||||
Loading…
Reference in New Issue