From 4035cfd92d81e06989ae24e29b3ea2d67e252a95 Mon Sep 17 00:00:00 2001 From: Marek Paśnikowski Date: Mon, 31 Oct 2022 00:37:07 +0100 Subject: Home configuration: break out home-aliases --- home-configuration.scm | 33 ++++++++++++++++++--------------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/home-configuration.scm b/home-configuration.scm index e225996..5cd11bd 100644 --- a/home-configuration.scm +++ b/home-configuration.scm @@ -14,23 +14,26 @@ ("NVM_DIR" . "$HOME/src/nvm") ("GUILE_AUTO_COMPILE" . "0"))) +(define home-aliases + `(("grep" . "grep --color=auto") + ("ll" . "ls -l") + ("ls" . "ls -p --color=auto") + ("pull-guix" . "guix pull") + ("pull-guix-" . "pull-guix --allow-downgrades --disable-authentication") + ("reconfigure-home" . (string-append "guix home reconfigure " + ,config-prefix + "home-configuration.scm")) + ("reconfigure-home-" . "reconfigure-home --allow-downgrades") + ("reconfigure-system" . (string-append "sudo guix system reconfigure " + ,config-prefix + "system-configuration.scm")) + ("reconfigure-system-" . "reconfigure-system --allow-downgrades") + ("system-update" . "pull-guix && reconfigure-system && reconfigure-home") + ("system-update-" . "pull-guix- && reconfigure-system- && reconfigure-home-"))) + (define bash-configuration (home-bash-configuration (environment-variables home-env-vars) - (aliases `(("grep" . "grep --color=auto") - ("ll" . "ls -l") - ("ls" . "ls -p --color=auto") - ("pull-guix" . "guix pull") - ("pull-guix-" . "pull-guix --allow-downgrades --disable-authentication") - ("reconfigure-home" . (string-append "guix home reconfigure " - ,config-prefix - "home-configuration.scm")) - ("reconfigure-home-" . "reconfigure-home --allow-downgrades") - ("reconfigure-system" . (string-append "sudo guix system reconfigure " - ,config-prefix - "system-configuration.scm")) - ("reconfigure-system-" . "reconfigure-system --allow-downgrades") - ("system-update" . "pull-guix && reconfigure-system && reconfigure-home") - ("system-update-" . "pull-guix- && reconfigure-system- && reconfigure-home-"))) + (aliases home-aliases) (bash-profile `(,(local-file (string-append config-prefix ".bash_profile") "bash_profile"))) -- cgit v1.2.3