From d1cec54b3f5f0a9ee87b966433999cdf39c39525 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.
---
 guix/system.scm | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

(limited to 'guix/system.scm')

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
-- 
cgit v1.2.3