From 6ffca5dfda45ef1b841fe8c7394363192c8862ef Mon Sep 17 00:00:00 2001 From: Robby Zambito Date: Sun, 5 Apr 2026 16:37:48 -0400 Subject: refactor: move git config to separate package --- config/git.scm | 23 +++++++++++++++++++++++ home.scm | 19 ++----------------- 2 files changed, 25 insertions(+), 17 deletions(-) create mode 100644 config/git.scm diff --git a/config/git.scm b/config/git.scm new file mode 100644 index 0000000..7dddd97 --- /dev/null +++ b/config/git.scm @@ -0,0 +1,23 @@ +(define-library (config git) + (export git-config) + (import (scheme base) + (ini)) + (begin + (define git-config + (parameterize + ((current-output-port + (open-output-string))) + (scm->ini + '((init + ("defaultBranch" . "master")) + (core + ("editor" . "emacsclient -c")) + (user + ("email" . "contact@robbyzambito.me") + ("name" . "Robby Zambito")) + ;; see push.autoSetupRemote in git help config + (push + ("autoSetupRemote" . "true")) + ("url \"rad://\"" + ("insteadOf" . "https://rad.go/")))) + (get-output-string (current-output-port)))))) diff --git a/home.scm b/home.scm index f529e47..104f616 100644 --- a/home.scm +++ b/home.scm @@ -42,6 +42,7 @@ (rename (config packages) (home home-packages)) (rename (config sway) (sway-config rz/sway-config)) (config foot) + (rename (config git) (git-config rz/git-config)) (rename (config emacs) (emacs-config rz/emacs-config)) (ini)) @@ -50,22 +51,6 @@ (define rz/terminal-emulator "foot") -(define git-config - (with-output-to-string - (lambda () - (scm->ini - `((init - ("defaultBranch" . "master")) - (core - ("editor" . "emacsclient -c")) - (user - ("email" . "contact@robbyzambito.me") - ("name" . "Robby Zambito")) - ;; see push.autoSetupRemote in git help config - (push - ("autoSetupRemote" . "true")) - ("url \"rad://\"" - ("insteadOf" . "https://rad.go/"))))))) (define bat-config (string-append "--theme=Nord\n" @@ -147,7 +132,7 @@ ("foot/foot.ini" ,(plain-file "foot.ini" foot-config)) ("wofi/config" ,(local-file "wofi/config")) ("wofi/style.css" ,(local-file "wofi/style.css")) - ("git/config" ,(plain-file "git-config" git-config)) + ("git/config" ,(plain-file "git-config" rz/git-config)) ("bat/config" ,(plain-file "bat-config" bat-config)) ("guix-gaming-channels/games.scm" ,(plain-file "guix-gaming-config" guix-gaming-config)))) (service home-files-service-type -- cgit