From 95e519eb51080ebfc11b116db6b6482acb9b0074 Mon Sep 17 00:00:00 2001
From: Ray Miller <ray@1729.org.uk>
Date: Sat, 26 Apr 2025 12:20:52 +0100
Subject: [PATCH 1/2] Configure AWS CLI and vault

---
 dotfiles/aws/.aws/config | 14 ++++++++++++++
 home-configuration.scm   |  8 ++++++--
 2 files changed, 20 insertions(+), 2 deletions(-)
 create mode 100644 dotfiles/aws/.aws/config

diff --git a/dotfiles/aws/.aws/config b/dotfiles/aws/.aws/config
new file mode 100644
index 0000000..7ff43b0
--- /dev/null
+++ b/dotfiles/aws/.aws/config
@@ -0,0 +1,14 @@
+#
+# Metail SSO
+#
+[sso-session metail]
+sso_region=eu-west-1
+sso_start_url=https://d-93676d306a.awsapps.com/start/
+sso_registration_scopes=sso:account:access
+
+[profile testing-admin]
+sso_session=metail
+region=eu-west-1
+output=json
+sso_account_id=779362500905
+sso_role_name=AWSAdministratorAccess
diff --git a/home-configuration.scm b/home-configuration.scm
index b5b5749..64d7b88 100644
--- a/home-configuration.scm
+++ b/home-configuration.scm
@@ -19,7 +19,9 @@
 (home-environment
  ;; Below is the list of packages that will show up in your
  ;; Home profile, under ~/.guix-home/profile.
- (packages (specifications->packages (list "cmake"
+ (packages (specifications->packages (list "awscli"
+                                           "aws-vault"
+                                           "cmake"
                                            "diffstat"
                                            "emacs-no-x"
                                            "gcc-toolchain"
@@ -77,7 +79,9 @@
                   (environment-variables '(("GPG_TTY" . "$(tty)")
                                            ("ALTERNATE_EDITOR" . "")
                                            ("EDITOR" . "emacsclient --tty")
-                                           ("VISUAL" . "emacsclient")))
+                                           ("VISUAL" . "emacsclient")
+                                           ("AWS_VAULT_BACKEND" . "pass")
+                                           ("AWS_VAULT_PASS_PREFIX" . "awsvault")))
                   (aliases '())))
         (service home-dotfiles-service-type
                  (home-dotfiles-configuration

From 4c99289c01757ff31ff954cc5d241ea998ca6877 Mon Sep 17 00:00:00 2001
From: Ray Miller <ray@1729.org.uk>
Date: Sat, 26 Apr 2025 12:21:03 +0100
Subject: [PATCH 2/2] Remove doom emacs custom.el from home config

Certain emacs commands update this file which is not possible when it's
a symling to the read-only file in the gnu store.
---
 dotfiles/emacs/.config/doom/custom.el | 64 ---------------------------
 1 file changed, 64 deletions(-)
 delete mode 100644 dotfiles/emacs/.config/doom/custom.el

diff --git a/dotfiles/emacs/.config/doom/custom.el b/dotfiles/emacs/.config/doom/custom.el
deleted file mode 100644
index edb4d4b..0000000
--- a/dotfiles/emacs/.config/doom/custom.el
+++ /dev/null
@@ -1,64 +0,0 @@
-(custom-set-variables
- ;; custom-set-variables was added by Custom.
- ;; If you edit it by hand, you could mess it up, so be careful.
- ;; Your init file should contain only one such instance.
- ;; If there is more than one, they won't work right.
- '(denote-directory "/home/ray/Workspace/personal/notes")
- '(safe-local-variable-values
-   '((eval progn
-      (require 'lisp-mode)
-      (defun emacs27-lisp-fill-paragraph
-          (&optional justify)
-        (interactive "P")
-        (or
-         (fill-comment-paragraph justify)
-         (let
-             ((paragraph-start
-               (concat paragraph-start "\\|\\s-*\\([(;\"]\\|\\s-:\\|`(\\|#'(\\)"))
-              (paragraph-separate
-               (concat paragraph-separate "\\|\\s-*\".*[,\\.]$"))
-              (fill-column
-               (if
-                   (and
-                    (integerp emacs-lisp-docstring-fill-column)
-                    (derived-mode-p 'emacs-lisp-mode))
-                   emacs-lisp-docstring-fill-column fill-column)))
-           (fill-paragraph justify))
-         t))
-      (setq-local fill-paragraph-function #'emacs27-lisp-fill-paragraph))
-     (eval modify-syntax-entry 43 "'")
-     (eval modify-syntax-entry 36 "'")
-     (eval modify-syntax-entry 126 "'")
-     (geiser-repl-per-project-p . t)
-     (eval with-eval-after-load 'yasnippet
-      (let
-          ((guix-yasnippets
-            (expand-file-name "etc/snippets/yas"
-                              (locate-dominating-file default-directory ".dir-locals.el"))))
-        (unless
-            (member guix-yasnippets yas-snippet-dirs)
-          (add-to-list 'yas-snippet-dirs guix-yasnippets)
-          (yas-reload-all))))
-     (eval with-eval-after-load 'tempel
-      (if
-          (stringp tempel-path)
-          (setq tempel-path
-                (list tempel-path)))
-      (let
-          ((guix-tempel-snippets
-            (concat
-             (expand-file-name "etc/snippets/tempel"
-                               (locate-dominating-file default-directory ".dir-locals.el"))
-             "/*.eld")))
-        (unless
-            (member guix-tempel-snippets tempel-path)
-          (add-to-list 'tempel-path guix-tempel-snippets))))
-     (eval setq-local guix-directory
-      (locate-dominating-file default-directory ".dir-locals.el"))
-     (eval add-to-list 'completion-ignored-extensions ".go"))))
-(custom-set-faces
- ;; custom-set-faces was added by Custom.
- ;; If you edit it by hand, you could mess it up, so be careful.
- ;; Your init file should contain only one such instance.
- ;; If there is more than one, they won't work right.
- )