diff --git a/home/fish/config.fish b/home/fish/config.fish index e261201..598bea3 100644 --- a/home/fish/config.fish +++ b/home/fish/config.fish @@ -26,6 +26,13 @@ function y builtin cd -- "$cwd" end end +function g + if git rev-parse --git-dir >/dev/null 2>&1 + gitui + else + echo "Not inside a Git repository." + end +end function editor set pos (cat ~/dotfiles/.pos) y $pos diff --git a/home/fish/default.nix b/home/fish/default.nix index beeeec9..7d7f16a 100644 --- a/home/fish/default.nix +++ b/home/fish/default.nix @@ -14,8 +14,6 @@ vi = "${pkgs.neovim}/bin/nvim"; vim = "${pkgs.neovim}/bin/nvim"; - - g = "${pkgs.gitui}/bin/gitui"; }; shellInit = builtins.readFile ./config.fish; diff --git a/home/fish/interactive.fish b/home/fish/interactive.fish index f5b1fd3..fb6b35f 100644 --- a/home/fish/interactive.fish +++ b/home/fish/interactive.fish @@ -21,6 +21,8 @@ function fish_prompt set -l user $USER set -l host (hostname) + printf '\e[24m' + if test -n "$IN_NIX_SHELL" if test "$IN_NIX_SHELL" = "shell" set -a markers "nix shell" diff --git a/home/tardis.nix b/home/tardis.nix index 7879794..a686677 100644 --- a/home/tardis.nix +++ b/home/tardis.nix @@ -21,7 +21,7 @@ in home.file.".xinitrc".text = '' if [ -f ~/.xsession ]; then - exec dbus-run-session ~/.xsession + exec ~/.xsession fi '';