From d0b6fcd6dc078710482ba1eb591292b31d94dd41 Mon Sep 17 00:00:00 2001 From: Luca Matei Pintilie Date: Thu, 5 Sep 2024 20:39:34 +0200 Subject: fixup! fixup! fixup! fixup! WIP add guix config --- home-configuration.scm | 39 +++++++-------------------------------- 1 file changed, 7 insertions(+), 32 deletions(-) diff --git a/home-configuration.scm b/home-configuration.scm index 42fb790..92f64a4 100644 --- a/home-configuration.scm +++ b/home-configuration.scm @@ -6,6 +6,7 @@ (use-modules (gnu home) (ice-9 match) (ice-9 ftw) + (ice-9 string-fun) (gnu home services) (gnu home services shells) (gnu services) @@ -54,35 +55,13 @@ (gnu packages freedesktop) (gnu packages pdf) (guix gexp) + (guix build utils) (guix channels)) -;;; Define Channels -(define guix-channel - (channel - (name 'guix) - (url "https://git.savannah.gnu.org/git/guix.git") - (introduction - (make-channel-introduction "9edb3f66fd807b096b48283debdcddccfea34bad" - (openpgp-fingerprint - "BBB0 2DDF 2CEA F6A8 0D1D E643 A2A0 6DF2 A33A 54FA"))))) - -(define nonguix-channel - (channel - (name 'nonguix) - (url "https://gitlab.com/nonguix/nonguix") - (introduction - (make-channel-introduction "897c1a470da759236cc11798f4e0a5f7d4d59fbc" - (openpgp-fingerprint - "2A39 3FFF 68F4 EF7A 3D29 12AF 6F51 20A0 22FB B2D5"))))) - -(define match-files-in-tree-to-local-file - (match-lambda - ((name stat) - name - (local-file name)) - ((name stat children ...) - (list name - (map match-files-in-tree-to-local-file children))))) +(define (match-files-in-tree-to-local-file name) + (list name + (local-file name + (string-replace-substring home "." "-")))) (home-environment ;; Below is the list of packages that will show up in your @@ -184,8 +163,4 @@ (bash-logout (list (local-file ".bash_logout" "bash_logout"))))) (service home-files-service-type (map match-files-in-tree-to-local-file - (file-system-tree "./.config"))) - ;; `( - ;; ;(".config" ,(local-file "./.config" "user-config-folder" #:recursive? #t)) - ;; ) - ))) + (find-files "./.config")))))) -- cgit v1.2.3