Merge with JIX

This commit is contained in:
Jonas Ryssel 2021-01-16 23:49:53 +01:00
parent d26e59f9d3
commit bf69b42263

View File

@ -1,49 +1,70 @@
export EDITOR=nvim
if [ $USER = 'knyffen' ]; then
alias rm="trash"
fi
alias sudo="sudo "
alias rm="trash"
alias vim="nvim"
alias vi="nvim"
alias ghc="ghc -dynamic"
alias ggn="ggn -p"
alias find_root="sudo find / 2>&1"
alias py="python"
alias ssh-add="ssh-add /home/knyffen/.ssh/knyf-inator /home/knyffen/.ssh/Knyf-inatorV2"
alias ssh-add="ssh-add /home/knyffen/.ssh/knyf-inator /home/knyffen/.ssh/Knyf-inatorV2 /home/knyffen/.ssh/git_knyffen_dk"
alias zathura-t="tabbed -c zathura -e"
alias parsecd="LIBVA_DRIVER_NAME=iHD parsecd"
alias stack="/usr/bin/stack"
alias gst="git status"
alias ggn="git grep -Pn"
alias java_hidpi="java -Dsun.java2d.uiScale=2"
alias wol_desktop="ssh knyf wol BC:5F:F4:74:74:57"
alias dd_progress='sudo kill -USR1 $(pgrep ^dd)'
alias co2="ssh knyf mhz14a -r -d /dev/ttyS0"
alias h2o="ssh knyf 'cd configfiles/BME280; ./get_temperature_humidity_and_idead_humidity.sh'"
# git
alias gst="git status"
alias gbr="git branch --sort=-committerdate"
function ggn { git grep -Pn --color=always "$@" :/; }
function ggt { git grep -Pn --color=always "$@" t/lib ; }
function ggp { ggn --color=always "$@" $(git rev-list --all); }
function ggl { ggn --color=always "$@" | less -R; }
function gdl { git diff --color=always "$@" | less -R; }
function ggtl { ggt --color=always "$@" | less -R; }
function ggpl { ggp --color=always "$@" | less -R; }
# git grep colors
git config --global color.grep.filename "Green"
git config --global color.grep.linenumber "Yellow"
git config --global color.grep.match "bold #ff4d00"
alias TODO="ggn 'TODO: jry:'"
title() {
# set input argument as window titlE
# set input argument as window title
echo -ne "\033]30;$1\007"
}
expressvpn() {
local subcommand
local subcommand
if (( "$#" == 0 )); then command expressvpn; return; fi
if (( "$#" == 0 )); then command expressvpn; return; fi
subcommand=$1; shift
case $subcommand in
connect)
if ! (command expressvpn "status" | grep -i "$@"); then
command expressvpn "disconnect";
fi
command "sudo /usr/bin/cp -f /etc/resolv.conf /etc/resolv.conf.backup"
command expressvpn "$subcommand" "$@"
;;
disconnect)
command expressvpn "$subcommand" "$@"
command "sudo /usr/bin/cp -f /etc/resolv.conf.backup /etc/resolv.conf"
;;
*)
command expressvpn "$subcommand" "$@"
;;
esac
subcommand=$1; shift
case $subcommand in
connect)
if ! (command expressvpn "status" | grep -i "$@"); then
command expressvpn "disconnect";
fi
command "sudo /usr/bin/cp -f /etc/resolv.conf /etc/resolv.conf.backup"
command expressvpn "$subcommand" "$@"
;;
disconnect)
command expressvpn "$subcommand" "$@"
command "sudo /usr/bin/cp -f /etc/resolv.conf.backup /etc/resolv.conf"
;;
*)
command expressvpn "$subcommand" "$@"
;;
esac
}
spin() {
@ -88,3 +109,48 @@ spin() {
command spin "$subcommand $@"
esac;
}
if [ $USER = 'jry' ]; then
alias fzy="~/.fzy/fzy"
alias perlperl="/home/perl/bin/perl"
alias perlprove="/home/perl/bin/prove"
function prove { jix-shell TEST_METHOD=$TEST_METHOD BAIL_ON_FAIL=$BAIL_ON_FAIL prove "$@"; }
function perl { jix-shell TEST_METHOD=$TEST_METHOD BAIL_ON_FAIL=$BAIL_ON_FAIL perl "$@"; }
function profiling {
local JIX_USERID=233476; # userid of JRY
local USER=jobdk;
local ROOT=$1;
shift;
local FORM=$@;
local COMMAND='use Test::More; use Test::JIX::Mojo;
use JIX::Env;
DB::disable_profile; # backup solution for setting NYTPROF=start=no env variable
JIX::Env->USER("'$USER'"); # backup solution for setting USER=jobdk env variable
my $t = Test::JIX::Mojo->new("JIX::Mojo");
my $c = JIX::CompanyUser->retrieve( { id => '$JIX_USERID' } );
$t->ua->inactivity_timeout(600);
$t->auto_html5_ok(0);
$t->login_companyuser($c);
$t->jix_get_ok([ "'$ROOT'", format=>"xml", form => { '$FORM' } ]);
for (0..9) {
$t->login_companyuser($c);
DB::enable_profile;
$t->jix_get_ok([ "'$ROOT'", format=>"xml", form => { '$FORM' } ]);
DB::disable_profile;
};
done_testing();';
echo "Command:";
echo "perl -d:NYTProf -E '$COMMAND'";
USER=jobdk NYTPROF=start=no perl -d:NYTProf -E "$COMMAND";
nytprofhtml;
}
# Automatically keep a pointer to my latest SSH agent
MY_SSH_SOCK="/tmp/ssh-agent-$USER"
if test $SSH_AUTH_SOCK && [ $SSH_AUTH_SOCK != $MY_SSH_SOCK ]; then
ln -sf $SSH_AUTH_SOCK $MY_SSH_SOCK
export SSH_AUTH_SOCK=$MY_SSH_SOCK
fi
fi