marrub
/
scripts
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fish: put per-computer configs in actual per-computer configs

master
an 2019-10-26 00:02:26 -04:00
parent 0ad336ffda
commit 6ead87706d
6 changed files with 32 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
applications/fish
View File

@ -12,39 +12,14 @@ end
# - _agw_dir_src = non-volatile source code storage
switch (uname)
case Linux
set -gx CC clang
set -gx CXX clang++
set -gx GOPATH ~/go
set -gx RIPGREP_CONFIG_PATH ~/.config/ripgreprc
set -Ux _agw_dir_bin ~/bin
set -Ux _agw_dir_rc ~/rc
set -Ux _agw_dir_src ~/src
case Darwin
set -gx CMAKE_PREFIX_PATH /usr/local/opt/qt/
set -gx CPPFLAGS "-I/usr/local/opt/ruby/include"
set -gx DISTCC_HOSTS "192.168.1.2,cpp"
set -gx LDFLAGS "-L/usr/local/opt/ruby/lib"
set -gx fish_user_paths "/usr/local/opt/ruby/bin" $fish_user_paths
set -Ux _agw_dir_bin ~/Binaries
set -Ux _agw_dir_rc ~/Sources/scripts
set -Ux _agw_dir_src ~/Sources
case NetBSD
# Yes, these are *actually* needed.
set -gx CC cc
set -gx CXX c++
set -gx PATH $HOME/bin \
/usr/pkg/gcc8/bin \
/sbin \
/usr/sbin \
/bin \
/usr/bin \
/usr/pkg/sbin \
/usr/pkg/bin \
/usr/X11R7/bin \
/usr/games \
/usr/local/bin \
/usr/local/sbin
set -gx PKG_PATH "http://cdn.NetBSD.org/pub/pkgsrc/packages/NetBSD/"(uname -p)"/"(uname -r|cut -f '1 2' -d.|cut -f 1 -d_)"/All"
set -Ux _agw_dir_bin ~/bin
set -Ux _agw_dir_rc ~/rc
set -Ux _agw_dir_src ~/src
@ -52,6 +27,7 @@ switch (uname)
echo (set_color red)"This platform is not configured!"
end
# per-computer configs go here
set -Ux _agw_dir_local $_agw_dir_rc/computers/(hostname)
# execute scripts
@ -59,7 +35,11 @@ if test -f ~/.cargo/env
source ~/.cargo/env
end
for f in (find $_agw_dir_rc/fish -type f)
for f in (test -d $_agw_dir_local/fish &&
find $_agw_dir_local/fish -type f |
env LC_ALL=C sort) \
(find $_agw_dir_rc/fish -type f |
env LC_ALL=C sort)
source $f
end

5
computers/Alisons-Mac-mini.local/fish/env Normal file
View File

@ -0,0 +1,5 @@
set -gx CMAKE_PREFIX_PATH /usr/local/opt/qt/
set -gx CPPFLAGS "-I/usr/local/opt/ruby/include"
set -gx DISTCC_HOSTS "192.168.1.2,cpp"
set -gx LDFLAGS "-L/usr/local/opt/ruby/lib"
set -gx fish_user_paths "/usr/local/opt/ruby/bin" $fish_user_paths

1
computers/cain/fish/env Symbolic link
View File

@ -0,0 +1 @@
../../rain/fish/env

1
computers/cain/vconf Symbolic link
View File

@ -0,0 +1 @@
../rain/vconf

15
computers/netbsd/fish/env Normal file
View File

@ -0,0 +1,15 @@
set -gx CC cc
set -gx CXX c++
set -gx PATH "$_agw_dir_bin" \
/usr/pkg/gcc8/bin \
/sbin \
/usr/sbin \
/bin \
/usr/bin \
/usr/pkg/sbin \
/usr/pkg/bin \
/usr/X11R7/bin \
/usr/games \
/usr/local/bin \
/usr/local/sbin
set -gx PKG_PATH "http://cdn.NetBSD.org/pub/pkgsrc/packages/NetBSD/"(uname -p)"/"(uname -r|cut -f '1 2' -d.|cut -f 1 -d_)"/All"

4
computers/rain/fish/env Normal file
View File

@ -0,0 +1,4 @@
set -gx CC clang
set -gx CXX clang++
set -gx GOPATH ~/go
set -gx RIPGREP_CONFIG_PATH ~/.config/ripgreprc