diff --git a/.config/fish/config.fish b/.config/fish/config.fish index 4082100..b2c66d7 100644 --- a/.config/fish/config.fish +++ b/.config/fish/config.fish @@ -1,6 +1,11 @@ # [[file:../../Console.org::*Fish][Fish:1]] -if [ "$TERM" != "dumb" ]; and type -q starship +if [ "$TERM" != "dumb" ]; and type -q starship; starship init fish | source +else + function fish_prompt -d "Write out the prompt" + printf '%s@%s %s%s%s > ' $USER $hostname \ + (set_color $fish_color_cwd) (basename (pwd)) (set_color normal) + end end # Fish:1 ends here diff --git a/.profile b/.profile index e5806d1..06dfc33 100644 --- a/.profile +++ b/.profile @@ -63,6 +63,10 @@ export GUIX_PACKAGE_PATH=~/guix-packages export GUIX_LOCPATH=$HOME/.guix-extra-profiles/console/console/lib/locale # Guix settings:4 ends here +# [[file:Console.org::*Guix settings][Guix settings:5]] +export GIO_EXTRA_MODULES="" +# Guix settings:5 ends here + # [[file:Console.org::*Other package managers][Other package managers:1]] if [ -d "$HOME/.cask" ]; then export PATH="/home/pavel/.cask/bin:$PATH" diff --git a/Console.org b/Console.org index 46211ce..2bb15d6 100644 --- a/Console.org +++ b/Console.org @@ -119,6 +119,11 @@ Locale settings #+begin_src sh export GUIX_LOCPATH=$HOME/.guix-extra-profiles/console/console/lib/locale #+end_src + +Somehow LibreOffice doesn't work without the following: +#+begin_src sh +export GIO_EXTRA_MODULES="" +#+end_src ** Other package managers Using other package managers with Guix requires some extra work. @@ -478,8 +483,13 @@ init_yc () { Launch starship #+begin_src fish -if [ "$TERM" != "dumb" ]; and type -q starship +if [ "$TERM" != "dumb" ]; and type -q starship; starship init fish | source +else + function fish_prompt -d "Write out the prompt" + printf '%s@%s %s%s%s > ' $USER $hostname \ + (set_color $fish_color_cwd) (basename (pwd)) (set_color normal) + end end #+end_src