Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion config/neovim-packer/install
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/bash
#!/bin/sh

set -e
set -o nounset
Expand Down
10 changes: 4 additions & 6 deletions dotfiles/bashrc
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,6 @@ test -f ~/.bashrc-defaults && . ~/.bashrc-defaults

. ~/.commonrc

# brew install starship
if which starship >/dev/null 2>/dev/null; then
export STARSHIP_THIS_PID=$$
eval "$(starship init bash 2>/dev/null)"
fi

for fun in ~/.shell-functions/*; do
. $fun
done
Expand Down Expand Up @@ -78,3 +72,7 @@ if which starship >/dev/null 2>/dev/null; then
fi

[ -f ~/.fzf.bash ] && source ~/.fzf.bash

if which direnv >/dev/null 2>/dev/null; then
eval "$(direnv hook bash)"
fi
9 changes: 0 additions & 9 deletions dotfiles/shell-functions/start-direnv

This file was deleted.

4 changes: 4 additions & 0 deletions dotfiles/zshrc
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,10 @@ fi
__commonrc_step ZSHRCINIT
source ~/.commonrc

if which direnv >/dev/null 2>/dev/null; then
eval "$(direnv hook zsh)"
fi

__commonrc_step ZSHRCLOADFUNCS
for fun in ~/.shell-functions/*; do
# Look for a line like "# ok: zsh"
Expand Down
2 changes: 1 addition & 1 deletion script/install-config
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/bash
#!/bin/sh

set -e
set -o nounset
Expand Down
2 changes: 1 addition & 1 deletion script/install-dotfiles
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/bash
#!/bin/sh

set -e
set -o nounset
Expand Down
10 changes: 10 additions & 0 deletions script/install-nix-dev
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
#!/bin/sh
#/ Usage: script/install-nix-dev

set -e
set -o nounset

cd `dirname "$0"`/..
set -x
script/install-dotfiles
script/install-config config/neovim-packer