Merge pull request 'Changes from work' (#2) from lytedev-divvy/dotfiles:master into master
Reviewed-on: #2
This commit is contained in:
commit
691f192d55
|
@ -2,6 +2,7 @@ os/linux
|
||||||
os/linux/arch
|
os/linux/arch
|
||||||
os/linux/nix
|
os/linux/nix
|
||||||
os/linux/debian
|
os/linux/debian
|
||||||
|
os/macos
|
||||||
host/desktop
|
host/desktop
|
||||||
host/desktop/wallwart
|
host/desktop/wallwart
|
||||||
host/desktop/rising
|
host/desktop/rising
|
||||||
|
|
|
@ -12,7 +12,7 @@ end
|
||||||
|
|
||||||
if has_command brew && test -f (brew --prefix asdf)/lib/asdf.fish
|
if has_command brew && test -f (brew --prefix asdf)/lib/asdf.fish
|
||||||
set -Ux ASDF_DIR (brew --prefix asdf)
|
set -Ux ASDF_DIR (brew --prefix asdf)
|
||||||
source (brew --prefix asdf)/lib/asdf.fish
|
source (brew --prefix asdf)/libexec/asdf.fish
|
||||||
else if test -f $HOME/.asdf/asdf.fish
|
else if test -f $HOME/.asdf/asdf.fish
|
||||||
source $HOME/.asdf/asdf.fish
|
source $HOME/.asdf/asdf.fish
|
||||||
else if test -f /opt/asdf-vm/asdf.fish
|
else if test -f /opt/asdf-vm/asdf.fish
|
||||||
|
|
|
@ -71,4 +71,4 @@ if test -n "$NIX_PATH"
|
||||||
set NIX_PATH :
|
set NIX_PATH :
|
||||||
end
|
end
|
||||||
test -d $HOME/.nix-defexpr/channels && \
|
test -d $HOME/.nix-defexpr/channels && \
|
||||||
set --export --universal NIX_PATH $HOME/.nix-defexpr/channels:$NIX_PATH
|
set --export --universal NIX_PATH $HOME/.nix-defexpr/channels:$NIX_PATH
|
||||||
|
|
|
@ -12,9 +12,8 @@ end
|
||||||
function preprocess_pwd
|
function preprocess_pwd
|
||||||
test (pwd) = / && echo "/" && return 1
|
test (pwd) = / && echo "/" && return 1
|
||||||
test (pwd) = $NICE_HOME && echo "~" && return 0
|
test (pwd) = $NICE_HOME && echo "~" && return 0
|
||||||
# TODO: fix for macOS
|
pwd | cut -c2- | \
|
||||||
echo (pwd) | cut -c2- | \
|
awk '{n=split($0,p,"/");for(i=1;i<=n;i++){if(i==n){printf "/%s",p[i]}else{printf "/%.'$MAX_PATH_PIECE_CHARS[1]'s",p[i]}}}'
|
||||||
awk '{split($0,p,"/");for(k in p){if(k==length(p)){printf "/%s",p[k]}else{printf "/%.'$MAX_PATH_PIECE_CHARS[1]'s",p[k]}}}'
|
|
||||||
end
|
end
|
||||||
|
|
||||||
function fish_prompt
|
function fish_prompt
|
||||||
|
|
|
@ -81,3 +81,8 @@
|
||||||
[include]
|
[include]
|
||||||
path = ~/.config/lytedev-env/host-layer-personal/gitconfig
|
path = ~/.config/lytedev-env/host-layer-personal/gitconfig
|
||||||
path = ~/.config/lytedev-env/divvy/gitconfig
|
path = ~/.config/lytedev-env/divvy/gitconfig
|
||||||
|
|
||||||
|
# [push]
|
||||||
|
# pushOption = merge_request.create
|
||||||
|
# pushOption = merge_request.remove_source_branch
|
||||||
|
# pushOption = merge_request.assign="daniel.flanagan"
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
/home/daniel/.home/.config/lytedev-dotfiles/common/colors/vim
|
/Users/danielflanagan/.config/lytedev-dotfiles/common/colors/vim
|
4
os/macos/config.d.fish
Normal file
4
os/macos/config.d.fish
Normal file
|
@ -0,0 +1,4 @@
|
||||||
|
#!/usr/bin/env fish
|
||||||
|
|
||||||
|
fish_add_path /opt/homebrew/sbin
|
||||||
|
fish_add_path /opt/homebrew/bin
|
Reference in a new issue