diff options
| author | Marek Paśnikowski <marek@marekpasnikowski.pl> | 2024-07-25 20:21:00 +0200 |
|---|---|---|
| committer | Marek Paśnikowski <marek@marekpasnikowski.pl> | 2024-07-26 08:02:24 +0200 |
| commit | 89b9a62b4bdc7c4113e9b4859617f0033663dc85 (patch) | |
| tree | 4867f344e1f74309d4b5148b61948a68fd671e13 | |
| parent | 68b8bf062a8cd08136849fb588a67ef83c03b52f (diff) | |
feat(marekpasnikowski): install Fish
| -rw-r--r-- | users/marekpasnikowski.scm | 33 |
1 files 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*)))) |