andrejus/dotfiles
1
1
Fork 0
Code Issues Activity

fix: bump fish deps, clean up profile, drop fishlogin

Browse Source
This commit is contained in:
Andrejus
2021-03-28 18:32:01 +01:00
parent 850dc1102d
commit 092d0cd097
7 changed files with 25 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
files/.bash_profile
View File

@@ -8,4 +8,3 @@
# References: # References:
# https://unix.stackexchange.com/questions/192521/loading-profile-from-bash-profile-or-not-using-bash-profile-at-all # https://unix.stackexchange.com/questions/192521/loading-profile-from-bash-profile-or-not-using-bash-profile-at-all
# https://www.stefaanlippens.net/my_bashrc_aliases_profile_and_other_stuff/ # https://www.stefaanlippens.net/my_bashrc_aliases_profile_and_other_stuff/
if [ -e /home/andrejus/.nix-profile/etc/profile.d/nix.sh ]; then . /home/andrejus/.nix-profile/etc/profile.d/nix.sh; fi # added by Nix installer

1
files/.bashrc
View File

@@ -1,4 +1,3 @@
[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm
[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" # This loads nvm bash_completion [ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" # This loads nvm bash_completion
[ -f ~/.fzf.bash ] && source ~/.fzf.bash [ -f ~/.fzf.bash ] && source ~/.fzf.bash

7
files/.config/fish/config.fish
View File

@@ -1,9 +1,10 @@
# Only execute in interactive shell
if status --is-interactive if status --is-interactive
# Cross-shell setup # Cross-shell setup
if begin; test -e ~/.bash_profile; and type -q bax; end if begin; test -e $HOME/.profile; and type -q replay; end
bax "source ~/.bash_profile" replay "source $HOME/.profile"
end end
# Fish specific # Fish specific
set fish_greeting set fish_greeting
if type -q base16-seti if type -q base16-seti

10
files/.config/fish/fishfile
View File

@@ -1,8 +1,6 @@
fishpkg/fish-prompt-mono
tomyun/base16-fish
gazorby/fish-abbreviation-tips
oh-my-fish/plugin-license
matchai/fish-mock
jorgebucaran/fish-bax
jethrokuan/z jethrokuan/z
jorgebucaran/replay.fish
jorgebucaran/hydro
joseluisq/gitnow joseluisq/gitnow
tomyun/base16-fish
PatrickF1/fzf.fish

2
files/.config/fish/functions/nvm.fish
View File

@@ -1,3 +1,3 @@
function nvm function nvm
bax source $NVM_DIR/nvm.sh ';' nvm $argv replay source $NVM_DIR/nvm.sh ';' nvm $argv
end end

32
files/.profile
View File

@@ -1,10 +1,10 @@
# U _____ u _ _ __ __ # U _____ u _ _ __ __
# \| ___"|/| \ |"| \ \ /"/u # \| ___"|/| \ |"| \ \ /"/u
# | _|" <| \| |> \ \ / // # | _|" <| \| |> \ \ / //
# | |___ U| |\ |u /\ V /_,-. # | |___ U| |\ |u /\ V /_,-.
# |_____| |_| \_| U \_/-(_/ # |_____| |_| \_| U \_/-(_/
# << >> || \\,-.// # << >> || \\,-.//
# (__) (__)(_") (_/(__) # (__) (__)(_") (_/(__)
# #
# set PATH so it includes user's private bin # set PATH so it includes user's private bin
export PATH="$HOME/bin:$PATH" export PATH="$HOME/bin:$PATH"
@@ -65,16 +65,16 @@ export FZF_DEFAULT_COMMAND='fdfind --type f --hidden --follow --exclude .git'
export FZF_CTRL_T_COMMAND="$FZF_DEFAULT_COMMAND" export FZF_CTRL_T_COMMAND="$FZF_DEFAULT_COMMAND"
export FZF_COMPLETION_TRIGGER='**' export FZF_COMPLETION_TRIGGER='**'
# do not use fishlogin for subshells # nix
export SHELL=/bin/sh if [ -e ~/.nix-profile/etc/profile.d/nix.sh ]; then . ~/.nix-profile/etc/profile.d/nix.sh; fi
# _ _ _ ____ # _ _ _ ____
# U /"\ u |"| ___ U /"\ u / __"| u # U /"\ u |"| ___ U /"\ u / __"| u
# \/ _ \/ U | | u |_"_| \/ _ \/ <\___ \/ # \/ _ \/ U | | u |_"_| \/ _ \/ <\___ \/
# / ___ \ \| |/__ | | / ___ \ u___) | # / ___ \ \| |/__ | | / ___ \ u___) |
# /_/ \_\ |_____| U/| |\u /_/ \_\ |____/>> # /_/ \_\ |_____| U/| |\u /_/ \_\ |____/>>
# \\ >> // \\.-,_|___|_,-.\\ >> )( (__) # \\ >> // \\.-,_|___|_,-.\\ >> )( (__)
# (__) (__)(_")("_)\_)-' '-(_/(__) (__)(__) # (__) (__)(_")("_)\_)-' '-(_/(__) (__)(__)
# #
alias vim='nvim' alias vim='nvim'
alias vi='vim' alias vi='vim'

13
install/02-fish.sh
View File

@@ -20,16 +20,3 @@ echo "fisher is installed, updating..."
`fish -c "fisher"`; `fish -c "fisher"`;
fish -c "fisher --version" fish -c "fisher --version"
if not_installed "fishlogin"; then
echo "setting up fishlogin..."
mkdir -p ~/bin
target="$HOME/bin/fishlogin"
tee -a $target << END
#!/bin/bash
exec -l fish "\$@"
END
sudo chmod +x $target
echo $target | sudo tee -a /etc/shells
sudo usermod -s $target $USER
fi