citadel

commit 04ef85c4cbc9aea5fb72e94915ac2f2a40178395
parent 4b3786cffed758ce899ea191fb5cdb64be99e032
Author: William Casarin <jb55@jb55.com>
Date:   Tue, 29 Dec 2020 10:32:53 -0800

more bash fixes

Diffstat:
M
dotfiles/.bash_aliases
 | 
6
+++++-
M
dotfiles/.bashrc
 | 
9
++++++++-
M
nix-config/environment/desktop/default.nix
 | 
2
+-

3 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/dotfiles/.bash_aliases b/dotfiles/.bash_aliases
@@ -58,9 +58,13 @@ md () {
     mandown README*
 }
 
+function run_fuzzer() {
+	eval "$(fuzz-run-command "$@")"
+}
+
 alias e="edit -n"
 alias g=git
-alias f=fuzz-run-command
+alias f=run_fuzzer
 alias vim=nvim
 alias feh="feh --conversion-timeout 2"
 alias info="info --vi-keys"
diff --git a/dotfiles/.bashrc b/dotfiles/.bashrc
@@ -6,8 +6,13 @@ set -o vi
 # If not running interactively, don't do anything
 [ -z "$PS1" ] && return
 
+
+if [ "$USER" = "jb55" ]; then
+	export PS1='$(printf "%3.*s" $? $?) $ '
+else
+	export PS1="\u@\h$ "
+fi
  
-export PS1="\u@\h:\w\$ "
 
 # don't put duplicate lines in the history. See bash(1) for more options
 export HISTCONTROL=ignoredups
@@ -29,6 +34,8 @@ bind
 [ -f ~/bin/z.sh ] && source ~/bin/z.sh
 [ -f "$UNDISTRACT" ] && source "$UNDISTRACT"
 
+eval "$(direnv hook bash)"
+
 # needed for the C-h binding
 bind '"\C-x\C-a": vi-movement-mode'
 bind '"\C-x\C-e": shell-expand-line'
diff --git a/nix-config/environment/desktop/default.nix b/nix-config/environment/desktop/default.nix
@@ -55,7 +55,7 @@ let gtk2rc = pkgs.writeText "gtk2rc" ''
       sxiv
       texlive.combined.scheme-full
       userConfig
-      vlc
+      mpv
       w3m
       wine
       steam