diff --git a/copy_files.sh b/copy-files.sh similarity index 100% rename from copy_files.sh rename to copy-files.sh diff --git a/scripts/find_stereo.sh b/scripts/find-stereo.fish similarity index 95% rename from scripts/find_stereo.sh rename to scripts/find-stereo.fish index 5285982..b28f350 100755 --- a/scripts/find_stereo.sh +++ b/scripts/find-stereo.fish @@ -1,4 +1,4 @@ -#!/usr/bin/fish +#!/usr/bin/env fish set filter 'pan=mono|c0=0.5*FL+-0.5*FR,silenceremove=start_periods=1:detection=peak' diff --git a/scripts/flac2mp3.sh b/scripts/flac2mp3.fish similarity index 92% rename from scripts/flac2mp3.sh rename to scripts/flac2mp3.fish index 12c7d2e..55a263a 100755 --- a/scripts/flac2mp3.sh +++ b/scripts/flac2mp3.fish @@ -1,4 +1,4 @@ -#!/usr/bin/fish +#!/usr/bin/env fish function fail echo "failed to process $f, exiting" diff --git a/scripts/megadl.fish b/scripts/megadl.fish new file mode 100755 index 0000000..27e54ea --- /dev/null +++ b/scripts/megadl.fish @@ -0,0 +1,3 @@ +#!/usr/bin/env fish + +megadl (cat ~/dl) diff --git a/scripts/megadl.sh b/scripts/megadl.sh deleted file mode 100755 index b08e43b..0000000 --- a/scripts/megadl.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/fish - -megadl (cat ~/dl) diff --git a/scripts/path.sh b/scripts/path similarity index 100% rename from scripts/path.sh rename to scripts/path diff --git a/scripts/rebuild.sh.old b/scripts/rebuild.sh.old deleted file mode 100755 index ee95a62..0000000 --- a/scripts/rebuild.sh.old +++ /dev/null @@ -1,126 +0,0 @@ -#!/usr/bin/env bash - -cd "${0%/*}" -. ./rebuild_pkgs.sh -pkg_ver() { - sed '/^pkgver\=/!d;s/pkgver\=\(.*\)/\1/' PKGBUILD -} -exit_on_err() { - local res=$? - echo "error in rebuild, aborting" - exit "$res" -} -higan_make() { - make -j12 -C $@ uninstall - make -j12 -C $@ clean || exit_on_err - make -j12 -C $@ all || exit_on_err - make -j12 -C $@ install || exit_on_err -} -build_package() { - cd ~/bin || exit_on_err - - local pkg=$1 - shift - - local special_handling="None" - local makepkg_args="-isrLcCf --noconfirm" - local pull_url="https://aur.archlinux.org/$pkg.git" - local branch - - while (( $# )) - do - case $1 in - --handle) - special_handling=$2 - shift 2 - ;; - --url) - pull_url=$2 - shift 2 - ;; - --branch) - branch=-b "$2" - shift 2 - ;; - --asdeps|--skipinteg|-f) - makepkg_args+=" $1" - shift - ;; - *) - echo "error in rebuild configuration ($1), aborting" - exit 1 - ;; - esac - done - - if [[ ! -d ~/bin/$pkg ]] - then - git clone $branch "$pull_url" || exit_on_err - fi - - cd "$pkg" || exit_on_err - git pull || exit_on_err - - local new_tag - - case $special_handling in - None) - ;; - Higan) - new_tag=$(git describe --tags "$(git rev-list --tags --max-count=1)") - git fetch --tags - git checkout "$new_tag" - higan_make higan target=higan - higan_make icarus - make -j12 -C shaders install || exit_on_err - return - ;; - *) - echo "incorrect handler ($special_handling), aborting" - exit 1 - ;; - esac - - makepkg $makepkg_args || exit_on_err -} -resume_from() { - local resume - - for pkg in ${all_pkgs[*]} - do - [[ $pkg = "$1" ]] && resume=1 - [[ $resume ]] && echo "$pkg" - done -} -main() { - local pkg - local pkgs - - while (( $# )) - do - case $1 in - --resume-from) - pkgs+=" $(resume_from "$2")" - shift 2 - ;; - *) - pkgs+=" $1" - shift - ;; - esac - done - - if [[ ! $pkgs ]] - then - pkgs=${all_pkgs[*]} - fi - - for pkg in $pkgs - do - build_package "$pkg" ${options[$pkg]} - done -} - -main $@ - -## EOF diff --git a/scripts/rebuild_pkgs.sh.old b/scripts/rebuild_pkgs.sh.old deleted file mode 100644 index a165142..0000000 --- a/scripts/rebuild_pkgs.sh.old +++ /dev/null @@ -1,68 +0,0 @@ -#!/usr/bin/env bash - -m64pncp=mupen64plus-noncore-plugins-git -greyserv_git="https://git.greyserv.net/marrub" -all_pkgs=( - # deps - cef-standard - cereal - libsodium-git - vim-runtime-git - - # packages - "$m64pncp" - chocolate-doom - desmume-git - dolphin-emu-git - eternity-engine-git - fceux-git - gdcc-git - godot - gopherus - gvim-git - gzdoom-legacy - higan - maxcso - mednaffe - megatools - mgba-git - minecraft-launcher - minecraft-server-fabric - motsognir - mupen64plus-git - mupen64plus-gui-git - nicotine-plus-git - obs-linuxbrowser-bin - obs-studio-git - pcsx2-git - plasma5-applets-mpdnowplaying - powershell-bin - ppsspp-git - prboom-plus - ripcord - rpcs3-git - sharenix-git - slade - squirrel-sql - teamviewer - ttf-twemoji-color - xf86-input-xwiimote-git - xwiimote-git - zdoom -) -declare -A options=( - [cef-standard]="--asdeps" - [cereal]="--asdeps" - [libsodium-git]="--asdeps" - [vim-runtime-git]="--asdeps" - - [$m64pncp]="-f --url $greyserv_git/$m64pncp.git" - [gdcc-git]="--url $greyserv_git/gdcc-git.git" - [higan]="--handle Higan --url https://gitlab.com/higan/higan.git/" - [motsognir]="--url $greyserv_git/motsognir.git" - [ppsspp-git]="--url $greyserv_git/ppsspp-git.git" - [teamviewer]="--url $greyserv_git/teamviewer.git --branch nmfix" - [minecraft-server-fabric]="--url $greyserv_git/minecraft-server-fabric.git" -) - -## EOF diff --git a/scripts/sharenix.cw.sh b/scripts/sharenix-cw.fish similarity index 74% rename from scripts/sharenix.cw.sh rename to scripts/sharenix-cw.fish index 6487a77..a616d39 100755 --- a/scripts/sharenix.cw.sh +++ b/scripts/sharenix-cw.fish @@ -1,4 +1,4 @@ -#!/usr/bin/fish +#!/usr/bin/env fish source "$HOME/src/scripts/sharenix.sh" run_spectacle -a diff --git a/scripts/sharenix.fs.sh b/scripts/sharenix-fs.fish similarity index 74% rename from scripts/sharenix.fs.sh rename to scripts/sharenix-fs.fish index 13cdc1e..4f905e9 100755 --- a/scripts/sharenix.fs.sh +++ b/scripts/sharenix-fs.fish @@ -1,4 +1,4 @@ -#!/usr/bin/fish +#!/usr/bin/env fish source "$HOME/src/scripts/sharenix.sh" run_spectacle -f diff --git a/scripts/sharenix.sel.sh b/scripts/sharenix-sel.fish similarity index 74% rename from scripts/sharenix.sel.sh rename to scripts/sharenix-sel.fish index 0ae83d6..32254e8 100755 --- a/scripts/sharenix.sel.sh +++ b/scripts/sharenix-sel.fish @@ -1,4 +1,4 @@ -#!/usr/bin/fish +#!/usr/bin/env fish source "$HOME/src/scripts/sharenix.sh" run_spectacle -r diff --git a/scripts/sharenix.sh b/scripts/sharenix.fish similarity index 90% rename from scripts/sharenix.sh rename to scripts/sharenix.fish index fb6d7c1..1bdeb6d 100755 --- a/scripts/sharenix.sh +++ b/scripts/sharenix.fish @@ -1,4 +1,4 @@ -#!/usr/bin/fish +#!/usr/bin/env fish function run_spectacle set f "$HOME/Pictures/"(date "+%y%m%d-%H%M%S")".png" diff --git a/scripts/update_vim_plugins.sh b/scripts/update-vim-plugins.fish similarity index 97% rename from scripts/update_vim_plugins.sh rename to scripts/update-vim-plugins.fish index fd13fde..132af1b 100755 --- a/scripts/update_vim_plugins.sh +++ b/scripts/update-vim-plugins.fish @@ -1,4 +1,4 @@ -#!/usr/bin/fish +#!/usr/bin/env fish function pull_plugins for plugin in ./* diff --git a/scripts/vnc.sh b/scripts/vnc.fish similarity index 70% rename from scripts/vnc.sh rename to scripts/vnc.fish index 4c2907a..dc75c44 100755 --- a/scripts/vnc.sh +++ b/scripts/vnc.fish @@ -1,4 +1,4 @@ -#!/usr/bin/fish +#!/usr/bin/env fish while true x11vnc -forever -scale 0.25 diff --git a/terminal/fish b/terminal/fish index d41a423..bdbaf83 100644 --- a/terminal/fish +++ b/terminal/fish @@ -18,6 +18,6 @@ function fish_greeting awk -f ~/src/scripts/mid.awk col=$COLUMNS end -alias rebuild $HOME/src/scripts/rebuild.sh +alias rebuild $HOME/src/scripts/rebuild.rkt ## EOF diff --git a/terminal/zshrc.old b/terminal/zshrc.old deleted file mode 100644 index 2bf8516..0000000 --- a/terminal/zshrc.old +++ /dev/null @@ -1,29 +0,0 @@ -[[ -o interactive && ! -o login && -z $TMUX ]] && - exec tmux new-session - -HISTFILE=~/.zsh/hist -HISTSIZE=100000 -SAVEHIST=10000 - -setopt appendhistory extendedglob nomatch prompt_subst correct -unsetopt autocd beep - -bindkey -e -bindkey "${terminfo[khome]}" beginning-of-line -bindkey "${terminfo[kend]}" end-of-line - -zstyle :compinstall filename '/home/marrub/.zshrc' -zstyle ':completion:*' format '[Completing %d]' -zstyle ':completion:*' matcher-list '' 'm:{a-zA-Z}={A-Za-z}' 'r:|[._-]=* r:|=*' 'l:|=* r:|=*' -autoload -Uz compinit -compinit - -alias rebuild=$HOME/src/scripts/rebuild.sh -alias ls='ls --color=auto' - -PROMPT='%#' -RPROMPT='%2~' - -[[ -n $TMUX ]] && - echo "Word of the moment: $(shuf -n1 /usr/share/dict/words)" | - awk -f ~/src/scripts/mid.awk col=$COLUMNS