From 3fce470ff818e0d0e966b65f1d9b478c4ce9b742 Mon Sep 17 00:00:00 2001 From: Lucien Cartier-Tilet Date: Sun, 15 Mar 2020 19:21:43 +0100 Subject: [PATCH] Changed fish theme --- .config/yadm/bootstrap | 66 +++++++++++++++++++++++++++---------- org/config/fish.org | 40 ---------------------- org/config/installation.org | 26 +++++++-------- 3 files changed, 60 insertions(+), 72 deletions(-) diff --git a/.config/yadm/bootstrap b/.config/yadm/bootstrap index 30ba8c8..265f2f2 100755 --- a/.config/yadm/bootstrap +++ b/.config/yadm/bootstrap @@ -108,22 +108,53 @@ for pkg in $PACKAGES end printf "\n# Tangling org files ##########################################################\n\n" -printf "\n\n==== Tangling bin.org\n\n" -emacs -q --batch --eval "(require 'ob-tangle)" --eval "(setq org-confirm-babel-evaluate nil)" --eval "(org-babel-do-load-languages 'org-babel-load-languages '((python . t)))" --eval "(org-babel-tangle-file \"~/org/config/bin.org\")" -printf "\n\n==== Tangling fish.org\n\n" -emacs -q --batch --eval "(require 'ob-tangle)" --eval "(setq org-confirm-babel-evaluate nil)" --eval "(org-babel-do-load-languages 'org-babel-load-languages '((python . t)))" --eval "(org-babel-tangle-file \"~/org/config/fish.org\")" -printf "\n\n==== Tangling i3.org\n\n" -emacs -q --batch --eval "(require 'ob-tangle)" --eval "(setq org-confirm-babel-evaluate nil)" --eval "(org-babel-do-load-languages 'org-babel-load-languages '((python . t)))" --eval "(org-babel-tangle-file \"~/org/config/i3.org\")" -printf "\n\n==== Tangling index.org\n\n" -emacs -q --batch --eval "(require 'ob-tangle)" --eval "(setq org-confirm-babel-evaluate nil)" --eval "(org-babel-do-load-languages 'org-babel-load-languages '((python . t)))" --eval "(org-babel-tangle-file \"~/org/config/index.org\")" -printf "\n\n==== Tangling nano.org\n\n" -emacs -q --batch --eval "(require 'ob-tangle)" --eval "(setq org-confirm-babel-evaluate nil)" --eval "(org-babel-do-load-languages 'org-babel-load-languages '((python . t)))" --eval "(org-babel-tangle-file \"~/org/config/nano.org\")" -printf "\n\n==== Tangling polybar.org\n\n" -emacs -q --batch --eval "(require 'ob-tangle)" --eval "(setq org-confirm-babel-evaluate nil)" --eval "(org-babel-do-load-languages 'org-babel-load-languages '((python . t)))" --eval "(org-babel-tangle-file \"~/org/config/polybar.org\")" -printf "\n\n==== Tangling spacemacs.org\n\n" -emacs -q --batch --eval "(require 'ob-tangle)" --eval "(setq org-confirm-babel-evaluate nil)" --eval "(org-babel-do-load-languages 'org-babel-load-languages '((python . t)))" --eval "(org-babel-tangle-file \"~/org/config/spacemacs.org\")" -printf "\n\n==== Tangling tmux.org\n\n" -emacs -q --batch --eval "(require 'ob-tangle)" --eval "(setq org-confirm-babel-evaluate nil)" --eval "(org-babel-do-load-languages 'org-babel-load-languages '((python . t)))" --eval "(org-babel-tangle-file \"~/org/config/tmux.org\")" +printf '\n\n==== Tangling bin.org\n\n' && \ +emacs -q --batch --eval '(require \'ob-tangle)' \ +--eval '(setq org-confirm-babel-evaluate nil)' \ +--eval '(org-babel-do-load-languages \'org-babel-load-languages \'((python . t)))' \ +--eval '(org-babel-tangle-file "~/org/config/bin.org")' + +printf '\n\n==== Tangling fish.org\n\n' && \ +emacs -q --batch --eval '(require \'ob-tangle)' \ +--eval '(setq org-confirm-babel-evaluate nil)' \ +--eval '(org-babel-do-load-languages \'org-babel-load-languages \'((python . t)))' \ +--eval '(org-babel-tangle-file "~/org/config/fish.org")' + +printf '\n\n==== Tangling i3.org\n\n' && \ +emacs -q --batch --eval '(require \'ob-tangle)' \ +--eval '(setq org-confirm-babel-evaluate nil)' \ +--eval '(org-babel-do-load-languages \'org-babel-load-languages \'((python . t)))' \ +--eval '(org-babel-tangle-file "~/org/config/i3.org")' + +printf '\n\n==== Tangling index.org\n\n' && \ +emacs -q --batch --eval '(require \'ob-tangle)' \ +--eval '(setq org-confirm-babel-evaluate nil)' \ +--eval '(org-babel-do-load-languages \'org-babel-load-languages \'((python . t)))' \ +--eval '(org-babel-tangle-file "~/org/config/index.org")' + +printf '\n\n==== Tangling nano.org\n\n' && \ +emacs -q --batch --eval '(require \'ob-tangle)' \ +--eval '(setq org-confirm-babel-evaluate nil)' \ +--eval '(org-babel-do-load-languages \'org-babel-load-languages \'((python . t)))' \ +--eval '(org-babel-tangle-file "~/org/config/nano.org")' + +printf '\n\n==== Tangling polybar.org\n\n' && \ +emacs -q --batch --eval '(require \'ob-tangle)' \ +--eval '(setq org-confirm-babel-evaluate nil)' \ +--eval '(org-babel-do-load-languages \'org-babel-load-languages \'((python . t)))' \ +--eval '(org-babel-tangle-file "~/org/config/polybar.org")' + +printf '\n\n==== Tangling spacemacs.org\n\n' && \ +emacs -q --batch --eval '(require \'ob-tangle)' \ +--eval '(setq org-confirm-babel-evaluate nil)' \ +--eval '(org-babel-do-load-languages \'org-babel-load-languages \'((python . t)))' \ +--eval '(org-babel-tangle-file "~/org/config/spacemacs.org")' + +printf '\n\n==== Tangling tmux.org\n\n' && \ +emacs -q --batch --eval '(require \'ob-tangle)' \ +--eval '(setq org-confirm-babel-evaluate nil)' \ +--eval '(org-babel-do-load-languages \'org-babel-load-languages \'((python . t)))' \ +--eval '(org-babel-tangle-file "~/org/config/tmux.org")' find ~/.local/bin -type f -exec chmod +x {} + @@ -262,12 +293,11 @@ printf "\n# Installing fisher ################################################## curl https://git.io/fisher --create-dirs -sLo ~/.config/fish/functions/fisher.fish printf "\n# Installing Fisher Extensions ################################################\n\n" -fisher add oh-my-fish/theme-bobthefish +fisher add fishpkg/fish-prompt-metro fisher add jorgebucaran/fish-bax fisher add franciscolourenco/done fisher add jethrokuan/fzf fisher add jethrokuan/z fisher add jorgebucaran/fish-getopts fisher add laughedelic/pisces -fisher add tuvistavie/fish-ssh-agent fisher add acomagu/fish-async-prompt diff --git a/org/config/fish.org b/org/config/fish.org index 57d5964..acf86e7 100644 --- a/org/config/fish.org +++ b/org/config/fish.org @@ -18,7 +18,6 @@ - [[#tramp-remote-access][Tramp remote access]] - [[#regular-fish-shell-appearance][Regular fish shell appearance]] - [[#global-variables][Global variables]] -- [[#theme-customization][Theme customization]] - [[#abbreviations][Abbreviations]] - [[#system-monitoring][System monitoring]] - [[#system-management-packages-and-services][System management (packages and services)]] @@ -168,45 +167,6 @@ set -gx PKG_CONFIG_PATH /usr/local/lib/pkgconfig/ $PKG_CONFIG_PATH #+END_SRC -* Theme customization - :PROPERTIES: - :CUSTOM_ID: h-e9dccb31-8350-459d-b688-b5b7cbeab272 - :END: - The theme I use is =bobthefish=. Although its default configuration is quite - alright, it allows some customization. The first thing I want to enable is the - support for =nerd-fonts=: - #+BEGIN_SRC fish - set -g theme_nerd_fonts_support yes - #+END_SRC - - Next, I want the name of the current process to be shown in the terminal - title. - #+BEGIN_SRC fish - set -g theme_title_display_process yes - #+END_SRC - - I also wish to display the current host in the prompt, but only when I am - connected through an SSH session. - #+BEGIN_SRC fish - set -g theme_display_hostname ssh - #+END_SRC - - I also want the sudo username to be displayed, as a warning that I am indeed - running a session as root. - #+BEGIN_SRC fish - set -g theme_display_sudo_user yes - #+END_SRC - - The exit status can be sometimes really useful, hence why I want it activated. - #+BEGIN_SRC fish - set -g theme_show_exit_status yes - #+END_SRC - - I also want to have proper git worktree support. - #+BEGIN_SRC fish - set -g theme_git_worktree_support yes - #+END_SRC - * Abbreviations :PROPERTIES: :CUSTOM_ID: h-740bd904-3e32-4c09-b0a4-bde16ae2e116 diff --git a/org/config/installation.org b/org/config/installation.org index d5954da..0686215 100644 --- a/org/config/installation.org +++ b/org/config/installation.org @@ -837,17 +837,16 @@ I generally use the following extensions in my Fish shell. #+NAME: fish-extensions #+CAPTION: Fish extensions managed by Fisher - | Package name | Description | - |-----------------------------+------------------------------------------------------------------| - | oh-my-fish/theme-bobthefish | Robust, git-aware, powerline prompt | - | jorgebucaran/fish-bax | Run bash scripts, replaying environment changes in fish | - | franciscolourenco/done | Automatically receive notifications when a long process finishes | - | jethrokuan/fzf | Improved key bindings for [[https://github.com/junegunn/fzf][junegunn/fzf]] | - | jethrokuan/z | Pure-fish [[https://github.com/rupa/z][rupa/z]]-like directory jumping | - | jorgebucaran/fish-getopts | CLI options parser; alternative to the [[https://fishshell.com/docs/current/commands.html#argparse][argparse]] fish builtin | - | laughedelic/pisces | Autoclose parentheses, braces, quotes and other paired symbols | - | tuvistavie/fish-ssh-agent | Utility functions to start your ssh agent | - | acomagu/fish-async-prompt | Make your prompt asynchronous to increase it reactivity | + | Package name | Description | + |---------------------------+------------------------------------------------------------------| + | fishpkg/fish-prompt-metro | Fast, git-aware, space-conscious, Powerline prompt | + | jorgebucaran/fish-bax | Run bash scripts, replaying environment changes in fish | + | franciscolourenco/done | Automatically receive notifications when a long process finishes | + | jethrokuan/fzf | Improved key bindings for [[https://github.com/junegunn/fzf][junegunn/fzf]] | + | jethrokuan/z | Pure-fish [[https://github.com/rupa/z][rupa/z]]-like directory jumping | + | jorgebucaran/fish-getopts | CLI options parser; alternative to the [[https://fishshell.com/docs/current/commands.html#argparse][argparse]] fish builtin | + | laughedelic/pisces | Autoclose parentheses, braces, quotes and other paired symbols | + | acomagu/fish-async-prompt | Make your prompt asynchronous to increase it reactivity | #+NAME: fish-ext-py #+BEGIN_SRC emacs-lisp :exports none :tangle no :var extensions=fish-extensions[,0] :cache yes @@ -856,15 +855,14 @@ "\n") #+END_SRC - #+RESULTS[e82c7269c09b1d43a1a335a13c422b22b59079b1]: fish-ext-py - : fisher add oh-my-fish/theme-bobthefish + #+RESULTS[e8afa907b582d6c8c9cb206a5a6be9a3f0f5f657]: fish-ext-py + : fisher add fishpkg/fish-prompt-metro : fisher add jorgebucaran/fish-bax : fisher add franciscolourenco/done : fisher add jethrokuan/fzf : fisher add jethrokuan/z : fisher add jorgebucaran/fish-getopts : fisher add laughedelic/pisces - : fisher add tuvistavie/fish-ssh-agent : fisher add acomagu/fish-async-prompt #+BEGIN_SRC fish :noweb yes