From 3909c474a12a6d1529ec8a217ac0171d7273ef95 Mon Sep 17 00:00:00 2001 From: Alison Watson Date: Thu, 25 Jul 2019 01:36:09 -0400 Subject: [PATCH] reorganize things and use some magic for making things better on different setups --- applications/fish | 29 +++++++++++++++++-- build-system/makepkg.conf | 5 ++-- copy-files.fish => copy-files | 1 + files | 1 - network/mastodon-meta/allowlist.txt | 1 + scripts/cmds/build-hosts | 10 +++++++ scripts/cmds/build-hosts.fish | 9 ------ scripts/cmds/{crtolf.fish => crtolf} | 1 + ...album-artist.fish => find-no-album-artist} | 1 + .../cmds/{find-stereo.fish => find-stereo} | 1 + scripts/cmds/{flac2mp3.fish => flac2mp3} | 1 + .../cmds/{generate-grub.sh => generate-grub} | 1 + ...te-vim-plugins.fish => update-vim-plugins} | 1 + scripts/cmds/{vnc.fish => vnc} | 1 + scripts/fish/os.fish | 13 --------- scripts/fish/prompt.fish | 2 +- scripts/rebuild.rkt | 3 +- scripts/{sharenix.fish => sharenix} | 1 + scripts/sharenix-cw | 5 ++++ scripts/sharenix-cw.fish | 4 --- scripts/sharenix-fs | 5 ++++ scripts/sharenix-fs.fish | 4 --- scripts/sharenix-sel | 5 ++++ scripts/sharenix-sel.fish | 4 --- {applications => unused}/zshrc | 0 virtual-machines/Win2000-run.fish | 2 ++ virtual-machines/Win98-run.fish | 2 ++ 27 files changed, 71 insertions(+), 42 deletions(-) rename copy-files.fish => copy-files (97%) create mode 100755 scripts/cmds/build-hosts delete mode 100755 scripts/cmds/build-hosts.fish rename scripts/cmds/{crtolf.fish => crtolf} (92%) rename scripts/cmds/{find-no-album-artist.fish => find-no-album-artist} (95%) rename scripts/cmds/{find-stereo.fish => find-stereo} (95%) rename scripts/cmds/{flac2mp3.fish => flac2mp3} (93%) rename scripts/cmds/{generate-grub.sh => generate-grub} (88%) rename scripts/cmds/{update-vim-plugins.fish => update-vim-plugins} (96%) rename scripts/cmds/{vnc.fish => vnc} (76%) delete mode 100644 scripts/fish/os.fish rename scripts/{sharenix.fish => sharenix} (95%) create mode 100755 scripts/sharenix-cw delete mode 100755 scripts/sharenix-cw.fish create mode 100755 scripts/sharenix-fs delete mode 100755 scripts/sharenix-fs.fish create mode 100755 scripts/sharenix-sel delete mode 100755 scripts/sharenix-sel.fish rename {applications => unused}/zshrc (100%) diff --git a/applications/fish b/applications/fish index bdf5853..6ebb548 100644 --- a/applications/fish +++ b/applications/fish @@ -1,3 +1,6 @@ +# vim: syntax=fish: + +# launch tmux if we're in an interactive terminal emulator if status is-interactive and not status is-login and test -z "$TMUX" @@ -5,12 +8,34 @@ if status is-interactive exec tmux new-session end -for f in (find ~/src/scripts/fish -type f -name '*.fish') - source $f +# bootstrapping information +switch (uname) + case Linux + set -gx CC clang + set -gx CXX clang++ + set -Ux _agw_dir_bin ~/bin + set -Ux _agw_dir_rc ~/src/git-scripts + set -Ux _agw_dir_scripts ~/src/scripts + set -Ux _agw_dir_src ~/src + case Darwin + set -gx CMAKE_PREFIX_PATH /usr/local/opt/qt/ + set -gx DISTCC_HOSTS "192.168.1.2,cpp" + set -gx fish_user_paths "/usr/local/opt/ruby/bin" $fish_user_paths + set -gx LDFLAGS "-L/usr/local/opt/ruby/lib" + set -gx CPPFLAGS "-I/usr/local/opt/ruby/include" + set -Ux _agw_dir_bin ~/Binaries + set -Ux _agw_dir_rc ~/Sources/scripts + set -Ux _agw_dir_scripts ~/Scripts + set -Ux _agw_dir_src ~/Sources end +# execute scripts if test -f ~/.cargo/env source ~/.cargo/env end +for f in (find $_agw_dir_scripts/fish -type f -name '*.fish') + source $f +end + ## EOF diff --git a/build-system/makepkg.conf b/build-system/makepkg.conf index aa016e5..c40cc8b 100644 --- a/build-system/makepkg.conf +++ b/build-system/makepkg.conf @@ -1,3 +1,4 @@ +# vim: syntax=sh: COMPRESSBZ2=(pbzip2 -c -f) COMPRESSGZ=(pigz -c -f -n) COMPRESSXZ=(xz -c -z - --threads=0) @@ -6,7 +7,7 @@ CFLAGS="-mtune=native -march=native -O3 -pipe -fstack-protector-strong -fno-plt CXXFLAGS="${CFLAGS}" MAKEFLAGS="-j12" PACKAGER="Alison Watson " -PKGDEST="$HOME/bin/packages" -SRCDEST="$HOME/bin/sources" +PKGDEST="$_agw_dir_bin/packages" +SRCDEST="$_agw_dir_bin/sources" CC=clang CXX=clang++ diff --git a/copy-files.fish b/copy-files similarity index 97% rename from copy-files.fish rename to copy-files index e497be3..399a56c 100755 --- a/copy-files.fish +++ b/copy-files @@ -1,4 +1,5 @@ #!/usr/bin/env fish +# vim: syntax=fish: # copy regular files mkdir -p \ diff --git a/files b/files index 722954e..0b84990 100644 --- a/files +++ b/files @@ -21,7 +21,6 @@ network/motsognir.conf /etc/motsognir.conf network/mpd.conf ~/.config/mpd/mpd.conf network/nginx.conf /etc/nginx/nginx.conf network/resolv.conf /etc/resolv.conf -scripts ~/src/scripts/* scripts/bookmark-get.ps1 /mnt/d/w2/Output/_dlscr/bookmark_get.ps1 system/61-xwiimote-custom.conf /etc/X11/xorg.conf.d/61-xwiimote-custom.conf system/grub /etc/default/grub diff --git a/network/mastodon-meta/allowlist.txt b/network/mastodon-meta/allowlist.txt index 40295b7..c0674e1 100644 --- a/network/mastodon-meta/allowlist.txt +++ b/network/mastodon-meta/allowlist.txt @@ -71,6 +71,7 @@ meow.social merveilles.town monsterpit.net mst3k.interlinked.me +nitro.horse niu.moe nulled.red occult.camp diff --git a/scripts/cmds/build-hosts b/scripts/cmds/build-hosts new file mode 100755 index 0000000..615bd32 --- /dev/null +++ b/scripts/cmds/build-hosts @@ -0,0 +1,10 @@ +#!/usr/bin/env fish +# vim: syntax=fish: + +cd $_agw_dir_src/hosts +git pull + +sudo sh -c "cat $_agw_dir_rc/applications/hosts > /etc/hosts" +sudo sh -c "cat $_agw_dir_src/hosts/hosts >> /etc/hosts" + +## EOF diff --git a/scripts/cmds/build-hosts.fish b/scripts/cmds/build-hosts.fish deleted file mode 100755 index 14f1b96..0000000 --- a/scripts/cmds/build-hosts.fish +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/env fish - -cd ~/src/hosts -git pull - -sudo sh -c "cat $HOME/src/git-scripts/applications/hosts > /etc/hosts" -sudo sh -c "cat $HOME/src/hosts/hosts >> /etc/hosts" - -## EOF diff --git a/scripts/cmds/crtolf.fish b/scripts/cmds/crtolf similarity index 92% rename from scripts/cmds/crtolf.fish rename to scripts/cmds/crtolf index 523c5cb..faa337d 100755 --- a/scripts/cmds/crtolf.fish +++ b/scripts/cmds/crtolf @@ -1,4 +1,5 @@ #!/usr/bin/env fish +# vim: syntax=fish: for f in (find . -type f) set ftype (file -b --mime-type "$f") diff --git a/scripts/cmds/find-no-album-artist.fish b/scripts/cmds/find-no-album-artist similarity index 95% rename from scripts/cmds/find-no-album-artist.fish rename to scripts/cmds/find-no-album-artist index 827ae0c..6496ce3 100755 --- a/scripts/cmds/find-no-album-artist.fish +++ b/scripts/cmds/find-no-album-artist @@ -1,4 +1,5 @@ #!/usr/bin/env fish +# vim: syntax=fish: set filter 'pan=mono|c0=0.5*FL+-0.5*FR,silenceremove=start_periods=1:detection=peak' diff --git a/scripts/cmds/find-stereo.fish b/scripts/cmds/find-stereo similarity index 95% rename from scripts/cmds/find-stereo.fish rename to scripts/cmds/find-stereo index 1682c95..104e684 100755 --- a/scripts/cmds/find-stereo.fish +++ b/scripts/cmds/find-stereo @@ -1,4 +1,5 @@ #!/usr/bin/env fish +# vim: syntax=fish: set filter 'pan=mono|c0=0.5*FL+-0.5*FR,silenceremove=start_periods=1:detection=peak' diff --git a/scripts/cmds/flac2mp3.fish b/scripts/cmds/flac2mp3 similarity index 93% rename from scripts/cmds/flac2mp3.fish rename to scripts/cmds/flac2mp3 index d3d4bdf..3c2bf25 100755 --- a/scripts/cmds/flac2mp3.fish +++ b/scripts/cmds/flac2mp3 @@ -1,4 +1,5 @@ #!/usr/bin/env fish +# vim: syntax=fish: function fail echo "failed to process $f, exiting" diff --git a/scripts/cmds/generate-grub.sh b/scripts/cmds/generate-grub similarity index 88% rename from scripts/cmds/generate-grub.sh rename to scripts/cmds/generate-grub index 31c31d3..5d5182f 100755 --- a/scripts/cmds/generate-grub.sh +++ b/scripts/cmds/generate-grub @@ -1,4 +1,5 @@ #!/usr/bin/env sh +# vim: syntax=sh: grub-mkconfig -o /boot/grub/grub.cfg grub-install --target=x86_64-efi --efi-directory=/efi --bootloader-id=arch diff --git a/scripts/cmds/update-vim-plugins.fish b/scripts/cmds/update-vim-plugins similarity index 96% rename from scripts/cmds/update-vim-plugins.fish rename to scripts/cmds/update-vim-plugins index 509dcb2..4632bcd 100755 --- a/scripts/cmds/update-vim-plugins.fish +++ b/scripts/cmds/update-vim-plugins @@ -1,4 +1,5 @@ #!/usr/bin/env fish +# vim: syntax=fish: function pull_plugins for plugin in ./* diff --git a/scripts/cmds/vnc.fish b/scripts/cmds/vnc similarity index 76% rename from scripts/cmds/vnc.fish rename to scripts/cmds/vnc index d02a173..cf611bb 100755 --- a/scripts/cmds/vnc.fish +++ b/scripts/cmds/vnc @@ -1,4 +1,5 @@ #!/usr/bin/env fish +# vim: syntax=fish: while true x11vnc -forever -scale 0.25 diff --git a/scripts/fish/os.fish b/scripts/fish/os.fish deleted file mode 100644 index 11eb238..0000000 --- a/scripts/fish/os.fish +++ /dev/null @@ -1,13 +0,0 @@ -switch (uname) - case Linux - set -gx CC clang - set -gx CXX clang++ - case Darwin - set -gx CMAKE_PREFIX_PATH /usr/local/opt/qt/ - set -gx DISTCC_HOSTS "192.168.1.2,cpp" - set -gx fish_user_paths "/usr/local/opt/ruby/bin" $fish_user_paths - set -gx LDFLAGS "-L/usr/local/opt/ruby/lib" - set -gx CPPFLAGS "-I/usr/local/opt/ruby/include" -end - -## EOF diff --git a/scripts/fish/prompt.fish b/scripts/fish/prompt.fish index ad2e794..b51703c 100644 --- a/scripts/fish/prompt.fish +++ b/scripts/fish/prompt.fish @@ -10,7 +10,7 @@ function fish_greeting set_color c50ed2 echo "Word of the moment: "(shuf -n1 /usr/share/dict/words) | - awk -f ~/src/scripts/text/mid.awk col=$COLUMNS + awk -f $_agw_dir_scripts/text/mid.awk col=$COLUMNS set_color normal end diff --git a/scripts/rebuild.rkt b/scripts/rebuild.rkt index ad303f9..814f855 100755 --- a/scripts/rebuild.rkt +++ b/scripts/rebuild.rkt @@ -8,7 +8,6 @@ (require racket/system) (require racket/port) -(define home (find-system-path 'home-dir)) (define cwd current-directory) (define (sys cmd) @@ -35,7 +34,7 @@ (with-output-to-string (λ () (sys (~a "git describe --tags " latest))))) (define (build-pkg pkg opts) - (parameterize ([cwd (build-path home "bin")]) + (parameterize ([cwd (string->path (getenv "_agw_dir_bin"))]) (let ([makepkg-args (~a "-isrLcCf --noconfirm" (str-or-empty opts 'asdeps " --asdeps") (str-or-empty opts 'force " -f") diff --git a/scripts/sharenix.fish b/scripts/sharenix similarity index 95% rename from scripts/sharenix.fish rename to scripts/sharenix index 9fac2e1..8810f6f 100755 --- a/scripts/sharenix.fish +++ b/scripts/sharenix @@ -1,4 +1,5 @@ #!/usr/bin/env fish +# vim: syntax=fish: function notify notify-send -a sharenix -i dialog-information $argv diff --git a/scripts/sharenix-cw b/scripts/sharenix-cw new file mode 100755 index 0000000..0f8caaa --- /dev/null +++ b/scripts/sharenix-cw @@ -0,0 +1,5 @@ +#!/usr/bin/env fish +# vim: syntax=fish: + +source "$_agw_dir_scripts/sharenix" +run_spectacle -a diff --git a/scripts/sharenix-cw.fish b/scripts/sharenix-cw.fish deleted file mode 100755 index 2057110..0000000 --- a/scripts/sharenix-cw.fish +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env fish - -source "$HOME/src/scripts/sharenix.fish" -run_spectacle -a diff --git a/scripts/sharenix-fs b/scripts/sharenix-fs new file mode 100755 index 0000000..f577df4 --- /dev/null +++ b/scripts/sharenix-fs @@ -0,0 +1,5 @@ +#!/usr/bin/env fish +# vim: syntax=fish: + +source "$_agw_dir_scripts/sharenix" +run_spectacle -m diff --git a/scripts/sharenix-fs.fish b/scripts/sharenix-fs.fish deleted file mode 100755 index 0a389aa..0000000 --- a/scripts/sharenix-fs.fish +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env fish - -source "$HOME/src/scripts/sharenix.fish" -run_spectacle -m diff --git a/scripts/sharenix-sel b/scripts/sharenix-sel new file mode 100755 index 0000000..8679168 --- /dev/null +++ b/scripts/sharenix-sel @@ -0,0 +1,5 @@ +#!/usr/bin/env fish +# vim: syntax=fish: + +source "$_agw_dir_scripts/sharenix" +run_spectacle -r diff --git a/scripts/sharenix-sel.fish b/scripts/sharenix-sel.fish deleted file mode 100755 index 0a129c1..0000000 --- a/scripts/sharenix-sel.fish +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env fish - -source "$HOME/src/scripts/sharenix.fish" -run_spectacle -r diff --git a/applications/zshrc b/unused/zshrc similarity index 100% rename from applications/zshrc rename to unused/zshrc diff --git a/virtual-machines/Win2000-run.fish b/virtual-machines/Win2000-run.fish index ea2e3f0..b2af72c 100755 --- a/virtual-machines/Win2000-run.fish +++ b/virtual-machines/Win2000-run.fish @@ -1,5 +1,7 @@ #!/usr/bin/env fish +source ../qemu-setup.fish + run-qemu i386 \ --drive file=image,format=qcow2,media=disk \ --drive file="$m/MS Windows/2000 Pro/5.00.2195.iso",media=cdrom,readonly \ diff --git a/virtual-machines/Win98-run.fish b/virtual-machines/Win98-run.fish index 002f07d..f98146e 100755 --- a/virtual-machines/Win98-run.fish +++ b/virtual-machines/Win98-run.fish @@ -1,5 +1,7 @@ #!/usr/bin/env fish +source ../qemu-setup.fish + run-qemu i386 \ --drive file=image,format=qcow2,media=disk \ --drive file="$m/Boot Disks/98SE.img",format=raw,if=floppy,readonly \