daylin/dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

shfmt formatting

Browse source
This commit is contained in:
Daylin Morgan 2022-01-18 12:29:42 -06:00
parent 38e4f299f5
commit 3361f81885
6 changed files with 57 additions and 62 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
system/alias.sh
View file

@ -55,4 +55,3 @@ if is-exectuable zellij; then
alias za="zellij a" alias za="zellij a"
fi fi
########################################## ##########################################

3
system/conda.sh
View file

@ -2,7 +2,7 @@
# >>> conda initialize >>> # >>> conda initialize >>>
# !! Contents within this block are managed by 'conda init' !! # !! Contents within this block are managed by 'conda init' !!
__conda_setup="$('$HOME/mambaforge/bin/conda' 'shell.zsh' 'hook' 2> /dev/null)" __conda_setup="$('$HOME/mambaforge/bin/conda' 'shell.zsh' 'hook' 2>/dev/null)"
if [ $? -eq 0 ]; then if [ $? -eq 0 ]; then
eval "$__conda_setup" eval "$__conda_setup"
else else
@ -20,4 +20,3 @@ fi
# <<< conda initialize <<< # <<< conda initialize <<<
[ -d "$HOME/mambaforge/envs/dev" ] && conda activate dev [ -d "$HOME/mambaforge/envs/dev" ] && conda activate dev

3
system/custom.sh
View file

@ -1,9 +1,8 @@
# env variables # env variables
if ! [ $(cat /etc/hostname)=="thinkpad" ];then if ! [ $(cat /etc/hostname)=="thinkpad" ]; then
export BROWSER=/mnt/c/Users/daylin/AppData/Local/Vivaldi/Application/vivaldi.exe export BROWSER=/mnt/c/Users/daylin/AppData/Local/Vivaldi/Application/vivaldi.exe
else else
export BROWSER=vivaldi-stable export BROWSER=vivaldi-stable
fi fi
# aliases # aliases
alias files=explorer.exe alias files=explorer.exe

7
system/env.sh
View file

@ -4,8 +4,8 @@ export XDG_DATA_HOME="${XDG_DATA_HOME:-$HOME/.local/share}"
export PATH=$PATH:~/bin export PATH=$PATH:~/bin
export HISTSIZE=32768; export HISTSIZE=32768
export HISTFILESIZE="${HISTSIZE}"; export HISTFILESIZE="${HISTSIZE}"
export SAVEHIST=4096 export SAVEHIST=4096
export HISTCONTROL=ignoredups:erasedups export HISTCONTROL=ignoredups:erasedups
@ -30,10 +30,9 @@ fi
# setopt CORRECT # setopt CORRECT
# setopt CORRECT_ALL # setopt CORRECT_ALL
# Setup fzf # Setup fzf
# --------- # ---------
if [[ ! "$PATH" == *$HOME/.fzf/bin* ]]; then if [[ $PATH != *$HOME/.fzf/bin* ]]; then
export PATH="${PATH:+${PATH}:}$HOME/.fzf/bin" export PATH="${PATH:+${PATH}:}$HOME/.fzf/bin"
fi fi

39
system/function.sh
View file

@ -1,10 +1,10 @@
function cl() { function cl() {
DIR="$*"; DIR="$*"
# if no DIR given, go home # if no DIR given, go home
if [ $# -lt 1 ]; then if [ $# -lt 1 ]; then
DIR=$HOME; DIR=$HOME
fi; fi
builtin cd "${DIR}" && \ builtin cd "${DIR}" &&
# use your preferred ls command # use your preferred ls command
ls -F --color=auto ls -F --color=auto
} }
@ -14,7 +14,7 @@ prepend-path() {
} }
#delete and reclone remote repo #delete and reclone remote repo
reclone () { reclone() {
basename=${PWD##*/} basename=${PWD##*/}
remoteurl=$(git remote get-url --push origin) remoteurl=$(git remote get-url --push origin)
cd .. cd ..
@ -27,7 +27,7 @@ reclone () {
# snakemake use all cores by default # snakemake use all cores by default
sm() { sm() {
if [[ "$*" == *"-j"* || "$*" == *"--jobs"* || "$*" == *"--cores"* ]]; then if [[ $* == *"-j"* || $* == *"--jobs"* || $* == *"--cores"* ]]; then
snakemake $@ snakemake $@
else else
snakemake -j all $@ snakemake -j all $@
@ -35,24 +35,24 @@ sm() {
} }
function gi() { function gi() {
curl -sL "https://www.toptal.com/developers/gitignore/api/$@" ; curl -sL "https://www.toptal.com/developers/gitignore/api/$@"
}
# make pdfs or svgs from vegalite json's
mkvegapdf () {
vl2vg $1 | vg2pdf > $2
} }
mkvegasvg () { # make pdfs or svgs from vegalite json's
vl2vg $1 | vg2svg > $2 mkvegapdf() {
vl2vg $1 | vg2pdf >$2
}
mkvegasvg() {
vl2vg $1 | vg2svg >$2
} }
# quick and dirty pdf generation from simple md # quick and dirty pdf generation from simple md
md2pdf () { md2pdf() {
root=$1 root=$1
# get extension and root path: https://stackoverflow.com/a/40928328 # get extension and root path: https://stackoverflow.com/a/40928328
fname="${root#.}";fname="${root%"$fname"}${fname%.*}" fname="${root#.}"
fname="${root%"$fname"}${fname%.*}"
ext="${root#"$fname"}" ext="${root#"$fname"}"
echo "converting $root to pdf" echo "converting $root to pdf"
@ -66,7 +66,7 @@ md2pdf () {
} }
py2nb2html () { py2nb2html() {
if [ $# -eq 0 ]; then if [ $# -eq 0 ]; then
echo "No arguments provided" echo "No arguments provided"
return 1 return 1
@ -77,8 +77,7 @@ py2nb2html () {
jupytext --to notebook -o - $pyfile | jupyter nbconvert --execute --to html --stdin $@ jupytext --to notebook -o - $pyfile | jupyter nbconvert --execute --to html --stdin $@
} }
web () { web() {
filepath=$(wslpath -w $1) filepath=$(wslpath -w $1)
$BROWSER $filepath $BROWSER $filepath
} }

4
system/path.sh
View file

@ -26,8 +26,8 @@ PATH="$HOME/go/bin:$PATH"
# PATH="$(perl -e 'print join(":", grep { not $seen{$_}++ } split(/:/, $ENV{PATH}))')" # PATH="$(perl -e 'print join(":", grep { not $seen{$_}++ } split(/:/, $ENV{PATH}))')"
# printf %s "$PATH" | awk -v RS=: -v ORS=: '!arr[$0]++' # printf %s "$PATH" | awk -v RS=: -v ORS=: '!arr[$0]++'
PATH=$(printf %s "$PATH" \ PATH=$(printf %s "$PATH" |
| awk -vRS=: -vORS= '!a[$0]++ {if (NR>1) printf(":"); printf("%s", $0) }' ) awk -vRS=: -vORS= '!a[$0]++ {if (NR>1) printf(":"); printf("%s", $0) }')
# Wrap up # Wrap up
export PATH export PATH