summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarek Paśnikowski <marekpasnikowski@protonmail.com>2022-10-31 00:28:31 +0100
committerMarek Paśnikowski <marekpasnikowski@protonmail.com>2022-10-31 00:28:31 +0100
commit8f0d0c0c27ccae29889679e5333762b3af08d6f6 (patch)
tree39ca1871633147dcf008043f086a6528d59e5f2e
parentd1e47bffad9a6136a94b862e39b146c28bcffd76 (diff)
Home configuration: break out bash-configuration
-rw-r--r--home-configuration.scm51
1 files changed, 27 insertions, 24 deletions
diff --git a/home-configuration.scm b/home-configuration.scm
index 6812908..d25720c 100644
--- a/home-configuration.scm
+++ b/home-configuration.scm
@@ -9,32 +9,35 @@
(define config-prefix
"/home/marek/src/guix-config/")
+(define bash-configuration
+ (home-bash-configuration (environment-variables '(("EDITOR" . "emacs")
+ ("NVM_DIR" . "$HOME/src/nvm")
+ ("GUILE_AUTO_COMPILE" . "0")))
+ (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-")))
+ (bash-profile `(,(local-file (string-append config-prefix
+ ".bash_profile")
+ "bash_profile")))
+ (bashrc `(,(local-file (string-append config-prefix
+ ".bashrc")
+ "bashrc")))))
+
(define home-bash-service
(service home-bash-service-type
- (home-bash-configuration (environment-variables '(("EDITOR" . "emacs")
- ("NVM_DIR" . "$HOME/src/nvm")
- ("GUILE_AUTO_COMPILE" . "0")))
- (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-")))
- (bash-profile `(,(local-file (string-append config-prefix
- ".bash_profile")
- "bash_profile")))
- (bashrc `(,(local-file (string-append config-prefix
- ".bashrc")
- "bashrc"))))))
+ bash-configuration))
(define home-files
`((".config/guix/shell-authorized-directories" ,(local-file "g-sh-auth-dir"))