diff --git a/Makefile b/Makefile
index 6e50fe2..c07d959 100644
--- a/Makefile
+++ b/Makefile
@@ -3,5 +3,5 @@ reconfigure:
       cp channels.scm ~/.config/guix/channels.scm
       guix archive --authorize < signing-key.pub
       guix system reconfigure ./config.scm --substitute-urls='https://ci.guix.gnu.org https://bordeaux.guix.gnu.org https://substitutes.nonguix.org'
-      make -C /home/zilti/.guix-home/profile/lib/browserpass make hosts-firefox-user
+      make -C /home/zilti/.guix-home/profile/lib/browserpass hosts-firefox-user
       flatpak --user remote-add --if-not-exists flathub https://dl.flathub.org/repo/flathub.flatpakrepo
diff --git a/config.org b/config.org
index 8d63e09..cbc6691 100644
--- a/config.org
+++ b/config.org
@@ -15,7 +15,7 @@
 	cp channels.scm ~/.config/guix/channels.scm
 	guix archive --authorize < signing-key.pub
 	guix system reconfigure ./config.scm --substitute-urls='https://ci.guix.gnu.org https://bordeaux.guix.gnu.org https://substitutes.nonguix.org'
-	make -C /home/zilti/.guix-home/profile/lib/browserpass make hosts-firefox-user
+	make -C /home/zilti/.guix-home/profile/lib/browserpass hosts-firefox-user
 	flatpak --user remote-add --if-not-exists flathub https://dl.flathub.org/repo/flathub.flatpakrepo
 #+end_src
 
@@ -224,6 +224,26 @@ These services are unmodified, or have just few settings.
    )
 #+end_src
 
+#+NAME: guix-ci-pubkey
+#+begin_src scheme :tangle keys/guix-ci.pub :mkdirp yes
+  (public-key 
+   (ecc 
+    (curve Ed25519)
+    (q #8D156F295D24B0D9A86FA5741A840FF2D24F60F7B6C4134814AD55625971B394#)
+    )
+   )
+#+end_src
+
+#+NAME: guix-bordeaux-pubkey
+#+begin_src scheme :tangle keys/guix-bordeaux.pub :mkdirp yes
+  (public-key 
+   (ecc 
+    (curve Ed25519)
+    (q #7D602902D3A2DBB83F8A0FB98602A754C5493B0B778C8D1DD4E0F41DE14DE34F#)
+    )
+   )
+#+end_src
+
 #+NAME: root-modified-desktop-services
 #+begin_src scheme :exports none :results code :noweb no-export
   (modify-services
@@ -241,8 +261,7 @@ These services are unmodified, or have just few settings.
                                   (append (list "https://substitutes.nonguix.org")
                                           %default-substitute-urls))
                                  (authorized-keys
-                                  (append (list (plain-file "non-guix.pub"
-                                                            "<<nonguix-pubkey>>"))
+                                  (append (list (local-file "./keys/non-guix.pub"))
                                           %default-authorized-guix-keys)))))
 #+end_src
 
diff --git a/config.scm b/config.scm
index 50b7df5..1e98b1d 100644
--- a/config.scm
+++ b/config.scm
@@ -157,13 +157,7 @@
                                     (append (list "https://substitutes.nonguix.org")
                                             %default-substitute-urls))
                                    (authorized-keys
-                                    (append (list (plain-file "non-guix.pub"
-                                                              "(public-key 
-                                                               (ecc 
-                                                                (curve Ed25519)
-                                                                (q #C1FD53E5D4CE971933EC50C9F307AE2171A2D3B52C804642A7A35F84F3A4EA98#)
-                                                                )
-                                                               )"))
+                                    (append (list (local-file "./keys/non-guix.pub"))
                                             %default-authorized-guix-keys)))))
     (list (service tlp-service-type (tlp-configuration))
           (service
diff --git a/home/emacs/init.el b/home/emacs/init.el
index 992b1db..2e94075 100644
--- a/home/emacs/init.el
+++ b/home/emacs/init.el
@@ -113,7 +113,6 @@
 ;;;; Emacs
 (use-package emacs
   :elpaca nil
-  :delight (eldoc-mode " 󰙎")
   :custom
   (completion-cycle-threshold 10)
   (display-time-mode t)
@@ -142,6 +141,9 @@
 
 ;;;; Org Mode
 (use-package org
+  :preface
+  (define (cc/org-local-stuff)
+          (setq-local visual-fill-column-center-text t))
   :elpaca (:repo "https://git.savannah.gnu.org/git/emacs/org-mode.git" :branch "emacs-sync")
   :after visual-fill-column
   :ensure t
@@ -149,7 +151,6 @@
   (org-babel-load-languages '((emacs-lisp . t)
                               (scheme . t)
                               (shell . t)))
-  (visual-fill-column-center-text t)
   :hook
   (org-mode . org-indent-mode)
   (org-src-mode . hack-local-variables)
@@ -720,7 +721,9 @@ Point must be at the beginning of balanced expression (sexp)."
     "Renames the symbol at point."
     (interactive "sRename: \nsRename %s to: ")
     (funcall-interactively #'eglot-rename to))
-
+  (defun (cc/clojure-local-stuff)
+      (setq-local sesman-system 'CIDER
+                  prettify-symbols-alist '(("fn" . "λ"))))
   :delight ""
   :after (tree-sitter embark)
   :config
@@ -733,9 +736,7 @@ Point must be at the beginning of balanced expression (sexp)."
   :hook
   ((clojure-ts-mode . eglot-ensure)
    (clojure-ts-mode . prettify-symbols-mode)
-   (clojure-ts-mode . (lambda ()
-                        (setq-local sesman-system 'CIDER)
-                        (setq-local prettify-symbols-alist '(("fn" . "λ")))))
+   (clojure-ts-mode . #'cc/clojure-local-stuff)
    (clojure-ts-mode . (lambda ()
                         (sesman-install-menu clojure-mode-map)))
    (clojurec-ts-mode . (lambda ()
diff --git a/home/home-configuration.scm b/home/home-configuration.scm
index 216982e..c871eb3 100644
--- a/home/home-configuration.scm
+++ b/home/home-configuration.scm
@@ -153,6 +153,7 @@
                           "make"
                           "nm-tray"
                           "nnn"
+                          "nwg-displays"
                           #;"nss-certs" ; This package is broken
                           "openssh"
                           "password-store"
@@ -181,6 +182,11 @@
             (home-openssh-configuration
              (hosts
               (list
+               (openssh-host
+                (name "gitlab.com")
+                (host-name "gitlab.com")
+                (user "git")
+                (identity-file "~/.ssh/personal_ed"))
                (openssh-host
                 (name "github.com")
                 (host-name "github.com")
diff --git a/keys/guix-bordeaux.pub b/keys/guix-bordeaux.pub
new file mode 100644
index 0000000..e54532b
--- /dev/null
+++ b/keys/guix-bordeaux.pub
@@ -0,0 +1,12 @@
+
+
+;; #+NAME: guix-bordeaux-pubkey
+
+;; [[file:../config.org::guix-bordeaux-pubkey][guix-bordeaux-pubkey]]
+(public-key 
+ (ecc 
+  (curve Ed25519)
+  (q #7D602902D3A2DBB83F8A0FB98602A754C5493B0B778C8D1DD4E0F41DE14DE34F#)
+  )
+ )
+;; guix-bordeaux-pubkey ends here
diff --git a/keys/guix-ci.pub b/keys/guix-ci.pub
new file mode 100644
index 0000000..c8ee830
--- /dev/null
+++ b/keys/guix-ci.pub
@@ -0,0 +1,12 @@
+
+
+;; #+NAME: guix-ci-pubkey
+
+;; [[file:../config.org::guix-ci-pubkey][guix-ci-pubkey]]
+(public-key 
+ (ecc 
+  (curve Ed25519)
+  (q #8D156F295D24B0D9A86FA5741A840FF2D24F60F7B6C4134814AD55625971B394#)
+  )
+ )
+;; guix-ci-pubkey ends here