From 89b9a62b4bdc7c4113e9b4859617f0033663dc85 Mon Sep 17 00:00:00 2001
From: Marek Paśnikowski <marek@marekpasnikowski.pl>
Date: Thu, 25 Jul 2024 20:21:00 +0200
Subject: feat(marekpasnikowski): install Fish

---
 users/marekpasnikowski.scm | 33 ++++++++++++++++++++++-----------
 1 file changed, 22 insertions(+), 11 deletions(-)

diff --git a/users/marekpasnikowski.scm b/users/marekpasnikowski.scm
index d6922d1..5974dd6 100644
--- a/users/marekpasnikowski.scm
+++ b/users/marekpasnikowski.scm
@@ -1,14 +1,19 @@
 (define-module (users marekpasnikowski)
-  #:use-module (gnu home)		; home-environment
-  #:use-module (gnu home services)	; home-profile-service-type
-  #:use-module (gnu packages emacs)	; emacs
-  #:use-module (gnu packages emacs-xyz) ; emacs-org-roam emacs-paredit
-  #:use-module (gnu packages librewolf) ; librewolf
-  #:use-module (gnu services)		; simple-service
-  #:use-module (gnu system shadow)	; user-account
-  #:use-module (suweren home)		; %home-environment %suweren-home-services
+  #:use-module (gnu home)		  ; home-environment
+  #:use-module (gnu home services)	  ; home-profile-service-type
+  #:use-module (gnu home services shells) ; home-fish-service-type
+  #:use-module (gnu packages emacs)	  ; emacs
+  #:use-module (gnu packages emacs-xyz)	  ; emacs-org-roam emacs-paredit
+  #:use-module (gnu packages librewolf)	  ; librewolf
+  #:use-module (gnu packages shells)      ; fish
+  #:use-module (gnu services)		  ; service
+			                  ; simple-service
+  #:use-module (gnu system shadow)	  ; user-account
+  #:use-module (guix gexp)		  ; file-append
+  #:use-module (suweren home)		  ; %home-environment %suweren-home-services
   )
 
+;; DEPRECATED
 (define marekpasnikowski-services
   (let* ((packages (list emacs
 			 emacs-org-roam
@@ -25,6 +30,7 @@
 (define-public marekpasnikowski-username
   "marek")
 
+;; DEPRECATED
 (define-public home
   (let ((services (append %suweren-home-services
 			  marekpasnikowski-services)))
@@ -33,9 +39,14 @@
 
 ;; record user-account
 (define-public marekpasnikowski-account
-  (user-account (name marekpasnikowski-username)
-		(group "users")))
+  (let ((fish (file-append fish "/bin/fish")))
+    (user-account (name marekpasnikowski-username)
+		  (group "users")
+		  (shell fish))))
 
 ;; record home-environment
 (define-public marekpasnikowski-home-environment
-  (home-environment))
+  (let* ((fish (service home-fish-service-type))
+
+	 (services* (list fish)))
+    (home-environment (services services*))))
-- 
cgit v1.2.3