From 88b2cf0e21794207d68386ae5c2504abad6b0a67 Mon Sep 17 00:00:00 2001
From: Florian Fischer <muhq@muhq.space>
Date: Tue, 23 May 2017 12:39:46 +0200
Subject: update guixsd setup

guixsd specific environment variables are set with bash.
After setting up the environment fish is executed.
---
 config/fish/config.fish | 13 ++-----------
 guix/bashrc             | 26 ++++++++++++++++++++++++++
 guix/system.scm         | 14 ++++++--------
 setup.py                |  5 +++--
 4 files changed, 37 insertions(+), 21 deletions(-)
 create mode 100644 guix/bashrc

diff --git a/config/fish/config.fish b/config/fish/config.fish
index d89c8b5..41c71fa 100644
--- a/config/fish/config.fish
+++ b/config/fish/config.fish
@@ -1,10 +1,7 @@
 # PATH Stuff
 
-# include guix paths
-for p in /home/fischerling/.guix-profile/bin /run/setuid-programs /run/current-system/profile/bin /run/current-system/profile/sbin
-	if test -d $p; and not contains $p $PATH
-		set PATH $PATH $p
-	end
+if not contains ~/.local/bin $PATH
+    set PATH ~/.local/bin $PATH
 end
 
 # export the path to our dotfiles
@@ -42,12 +39,6 @@ else
 	end
 end
 
-if not contains ~/.local/bin $PATH
-    set PATH ~/.local/bin $PATH 
-end
-
-
-
 # autoload functions and completions in .dotfiles 
 set fish_function_path $DOTFILES_LOCATION/config/fish/functions $fish_function_path
 set fish_complete_path $DOTFILES_LOCATION/config/fish/completions $fish_complete_path
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
diff --git a/setup.py b/setup.py
index 2153685..f0c8564 100755
--- a/setup.py
+++ b/setup.py
@@ -87,7 +87,8 @@ def offlineimap_warn(quiet):
 
 targets = {
         "guixsd":
-            [("guix/system.scm", "/etc/guix/system.scm")],
+            [("guix/system.scm", "/etc/guix/system.scm"),
+            ("guix/bashrc", home_dir + "/.bashrc")],
         "vimrc":
             [("vimrc", home_dir + "/.vimrc")],
         "vim.d":
@@ -131,7 +132,7 @@ targets = {
             [("msmtprc", home_dir + "/.msmtprc")],
         "FAU":
             [("FAU/wl-FAU-STUD.gpg", "/etc/netctl/wl-FAU-STUD"),
-            ("FAU/fau_stud.conf.gpg", "/etc/wpa_supplicant/fau_stud.conf"),
+            ("FAU/fau_stud.conf.gpg", ""),
             ("FAU/start_fau_wlan.sh", home_dir + "/.local/bin/start_fau_wlan")]
         }
 
-- 
cgit v1.2.3