From 142869f80f5d339f813ec32ebf1fdd9fcc58f578 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 4 Jul 2018 19:13:49 +0200 Subject: Don't force colour in aliases. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/system/shadow.scm (default-skeletons): Substitute ‘--color=auto’ for ‘--color’ (which implies ‘=always’) in aliases. * doc/guix.texi (G-Expressions): Also adjust examples as that makes more sense. --- gnu/system/shadow.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/system/shadow.scm') diff --git a/gnu/system/shadow.scm b/gnu/system/shadow.scm index 28d399f2b1..b4db69f068 100644 --- a/gnu/system/shadow.scm +++ b/gnu/system/shadow.scm @@ -178,9 +178,9 @@ then else PS1='\\u@\\h \\w\\$ ' fi -alias ls='ls -p --color' +alias ls='ls -p --color=auto' alias ll='ls -l' -alias grep='grep --color'\n")) +alias grep='grep --color=auto'\n")) (zlogin (plain-file "zlogin" "\ # Honor system-wide environment variables source /etc/profile\n")) -- cgit v1.2.3 From 10df28d74d1f799969d3ce37348c44efb1067c7f Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 23 Jul 2018 10:36:37 +0200 Subject: system: '.guile' skeleton now recommends 'guile-colorized'. * gnu/system/shadow.scm (default-skeletons)[".guile"]: Recommend 'guile-colorized'. --- gnu/system/shadow.scm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'gnu/system/shadow.scm') diff --git a/gnu/system/shadow.scm b/gnu/system/shadow.scm index b4db69f068..f800c3b546 100644 --- a/gnu/system/shadow.scm +++ b/gnu/system/shadow.scm @@ -210,7 +210,17 @@ include /run/current-system/profile/share/nano/*.nanorc\n")) ((module-ref module 'activate-readline)))) (else (display \"Consider installing the 'guile-readline' package for -convenient interactive line editing and input history.\\n\\n\")))\n")) +convenient interactive line editing and input history.\\n\\n\"))) + + (unless (getenv \"INSIDE_EMACS\") + (cond ((false-if-exception (resolve-interface '(ice-9 colorized))) + => + (lambda (module) + ;; Enable completion and input history at the REPL. + ((module-ref module 'activate-colorized)))) + (else + (display \"Consider installing the 'guile-colorized' package +for a colorful Guile experience.\\n\\n\"))))\n")) (".guile-wm" ,guile-wm) (".gdbinit" ,gdbinit)))) -- cgit v1.2.3