diff --git a/.bashrc b/.bashrc index d49fb42..6082f5b 100755 --- a/.bashrc +++ b/.bashrc @@ -14,4 +14,12 @@ export BSD_GAMES_DIR=~/.local/share/bsd-games export GCC_COLORS='error=01;31:warning=01;35:note=01;36:caret=01;32:locus=01:quote=01' export GITLAB_URL=https://git.a-lec.org export GUIX_PACKAGE_PATH=~/.config/guix/packages/defs -export PATH=$PATH:~/Projets/GNU/gnulib/build-aux +export PATH=$PATH:~/Projets/GNU/gnulib/build-aux:/home/neox/.local/bin + +source ~/.bash_secrets + +unset SSH_AGENT_PID +if [ "${gnupg_SSH_AUTH_SOCK_by:-0}" -ne $$ ]; then + export SSH_AUTH_SOCK="$(gpgconf --list-dirs agent-ssh-socket)" +fi + diff --git a/home-configuration.scm b/home-configuration.scm index d3d5803..60348fd 100644 --- a/home-configuration.scm +++ b/home-configuration.scm @@ -4,30 +4,36 @@ ;; retenir les canaux utilisés, ceux renvoyés par « guix describe ». ;; Voir la section « Répliquer Guix » dans le manuel. + (use-modules (gnu home) - (gnu packages) (gnu services) + (gnu packages) + (gnu packages gnupg) (guix gexp) - (gnu home services shells)) + (gnu home services shells) + (gnu home services gnupg)) (home-environment - ;; Voici la liste des services personnels. Pour trouver les services disponibles, - ;; lancez « guix home search MOT-CLÉ » dans un terminal. (services - (list (service home-bash-service-type - (home-bash-configuration - (aliases '(("clear" . "printf '\\033c'") - ("dir" . "dir --color=auto") - ("egrep" . "egrep --color=auto") - ("fgrep" . "fgrep --color=auto") - ("grep" . "grep --color=auto") - ("l" . "ls -CF") - ("la" . "ls -A") - ("ll" . "ls -l") - ("ls" . "ls -p --color=auto") - ("vdir" . "vdir --color=auto"))) - (bashrc (list (local-file "/home/neox/.config/guix/.bashrc" - "bashrc"))) - (bash-profile (list (local-file - "/home/neox/.config/guix/.bash_profile" - "bash_profile")))))))) + (list (service home-bash-service-type + (home-bash-configuration + (aliases '( + ("clear" . "printf '\\033c'") + ("dir" . "dir --color=auto") + ("egrep" . "egrep --color=auto") + ("fgrep" . "fgrep --color=auto") + ("grep" . "grep --color=auto") + ("la" . "ls -A") + ("ll" . "ls -l") + ("l" . "ls -CF") + ("ls" . "ls -p --color=auto") + ("vdir" . "vdir --color=auto"))) + (bashrc (list (local-file "/home/neox/.config/guix//.bashrc" "bashrc"))) + (bash-profile (list (local-file + "/home/neox/.config/guix//.bash_profile" + "bash_profile"))))) + (service home-gpg-agent-service-type + (home-gpg-agent-configuration + (pinentry-program + (file-append pinentry-gnome3 "/bin/pinentry-gnome3")) + (ssh-support? #t))))))