diff options
| author | Mikhail Kirillov <w96k@runbox.com> | 2024-12-16 06:04:55 +0400 |
|---|---|---|
| committer | Mikhail Kirillov <w96k@runbox.com> | 2024-12-16 06:04:55 +0400 |
| commit | eb58262b4a37487612120656d8bb9520fc27c00e (patch) | |
| tree | b6033e42ca6b873e3c5d99ba32ad3aec6e0de331 | |
| parent | 9bc0481748255f32091a0cf95b65947fa3aafa54 (diff) | |
Update guix config
| -rw-r--r-- | guix/.dotfiles/.bash_profile | 2 | ||||
| -rw-r--r-- | guix/.dotfiles/.bashrc | 2 | ||||
| -rw-r--r-- | guix/.dotfiles/home-configuration.scm | 2 | ||||
| -rw-r--r-- | guix/config-desktop.scm | 42 |
4 files changed, 40 insertions, 8 deletions
diff --git a/guix/.dotfiles/.bash_profile b/guix/.dotfiles/.bash_profile index 88fe011..9298eef 100644 --- a/guix/.dotfiles/.bash_profile +++ b/guix/.dotfiles/.bash_profile @@ -20,5 +20,3 @@ if [ -f ~/.profile ]; then source ~/.profile; fi # Honor per-interactive-shell startup file if [ -f ~/.bashrc ]; then source ~/.bashrc; fi - -gpg-connect-agent updatestartuptty /bye diff --git a/guix/.dotfiles/.bashrc b/guix/.dotfiles/.bashrc index a9123a4..08bf2e3 100644 --- a/guix/.dotfiles/.bashrc +++ b/guix/.dotfiles/.bashrc @@ -7,3 +7,5 @@ unset SSH_AGENT_PID if [ "${gnupg_SSH_AUTH_SOCK_by:-0}" -ne $$ ]; then export SSH_AUTH_SOCK="$(gpgconf --list-dirs agent-ssh-socket)" fi + +gpg-connect-agent updatestartuptty /bye diff --git a/guix/.dotfiles/home-configuration.scm b/guix/.dotfiles/home-configuration.scm index 368cc74..c69326a 100644 --- a/guix/.dotfiles/home-configuration.scm +++ b/guix/.dotfiles/home-configuration.scm @@ -248,7 +248,7 @@ (service home-gpg-agent-service-type (home-gpg-agent-configuration (pinentry-program - (file-append pinentry-emacs "/bin/pinentry-emacs")) + (file-append pinentry "/bin/pinentry")) (extra-content "enable-ssh-support") (ssh-support? #t))) diff --git a/guix/config-desktop.scm b/guix/config-desktop.scm index f68b048..edbcf08 100644 --- a/guix/config-desktop.scm +++ b/guix/config-desktop.scm @@ -177,6 +177,18 @@ (name "xlock") (program (file-append xlockmore "/bin/xlock")))) + (service qemu-binfmt-service-type + (qemu-binfmt-configuration + (platforms (lookup-qemu-platforms "aarch64")))) + + ;; (service virtual-build-machine-service-type + ;; (virtual-build-machine + ;; (qemu "qemu") + ;; (cpu-count 8) + ;; (memory-size (* 1 8096)) + ;; (systems (list ("aarch64-linux"))) + ;; (auto-start? #t))) + (extra-special-file "/etc/qemu/host.conf" "allow br0\n") (service spice-vdagent-service-type)) @@ -193,11 +205,31 @@ (delete ntp-service-type) - ;; (guix-service-type config => (guix-configuration - ;; (inherit config) - ;; (extra-options '("--max-jobs=10")) - ;; ;; (http-proxy "http://localhost:9250") - ;; )) + (guix-service-type config => (guix-configuration + (inherit config) + (authorized-keys (append (list +"(public-key + (ecc + (curve Ed25519) + (q #784779217C0B279976C1F69C514797B26EB927EA9D0E9DE95B92983D37DF13B8#) + ) + ) +" + +;; nonguix +;; "(public-key +;; (ecc +;; (curve Ed25519) +;; (q #C1FD53E5D4CE971933EC50C9F307AE2171A2D3B52C804642A7A35F84F3A4EA98#) +;; ) +;; )" + ) %default-authorized-guix-keys)) + ;; (substitute-urls + ;; (append (list "https://substitutes.nonguix.org") + ;; %default-substitute-urls)) + ;; (extra-options '("--max-jobs=10")) + ;; (http-proxy "http://localhost:9250") + )) (delete gdm-service-type)) |