diff options
Diffstat (limited to 'guix')
| -rw-r--r-- | guix/bashrc | 26 | ||||
| -rw-r--r-- | guix/system.scm | 14 |
2 files changed, 32 insertions, 8 deletions
diff --git a/guix/bashrc b/guix/bashrc new file mode 100644 index 0000000..44af031 --- /dev/null +++ b/guix/bashrc @@ -0,0 +1,26 @@ +# Bash initialization for interactive non-login shells and +# for remote shells (info "(bash) Bash Startup Files"). + +# Export 'SHELL' to child processes. Programs such as 'screen' +# honor it and otherwise use /bin/sh. +export SHELL + +if [ -n "$SSH_CLIENT" -a -z "`type -P cat`" ] +then + # We are being invoked from a non-interactive SSH session + # (as in "ssh host command") but 'cat' cannot be found + # in $PATH. Source /etc/profile so we get $PATH and other + # essential variables. + source /etc/profile +fi + +# Adjust the prompt depending on whether we're in 'guix environment'. +if [ -n "$GUIX_ENVIRONMENT" ] +then + PS1='\u@\h \w [env]\$ ' +else + PS1='\u@\h \w\$ ' +fi + +# exec fish +exec fish diff --git a/guix/system.scm b/guix/system.scm index 26a0270..2c6eaaf 100644 --- a/guix/system.scm +++ b/guix/system.scm @@ -57,19 +57,17 @@ (group "users") (supplementary-groups '("wheel" "netdev" "audio" "video")) - (home-directory "/home/fischerling") - (shell #~(string-append #$fish "/bin/fish"))) + (home-directory "/home/fischerling")) %base-user-accounts)) (packages (cons* - i3-wm i3status dmenu conky ;; Desktop + i3-wm i3status dmenu ;; Desktop - gcc python-wrapper git make ;; Devel - fish - file + gcc python-wrapper git ;; Devel + fish fish-guix vis - htop - gnupg + htop file + gnupg pinentry openssh alsa-utils nss-certs ;for HTTPS access |