summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFreya Murphy <freya@freyacat.org>2024-12-09 09:23:43 -0500
committerFreya Murphy <freya@freyacat.org>2024-12-09 09:23:43 -0500
commitb2f7c3c3b413d83966121978ea0d177068cfb82f (patch)
treefe16d0c2996cc6d548433d214ba6f8e27a2b5b47
parentfix cuirass system specification (diff)
downloaddotfiles-guix-b2f7c3c3b413d83966121978ea0d177068cfb82f.tar.gz
dotfiles-guix-b2f7c3c3b413d83966121978ea0d177068cfb82f.tar.bz2
dotfiles-guix-b2f7c3c3b413d83966121978ea0d177068cfb82f.zip
refactor keys/certs into new `files` folder
-rw-r--r--files/certs/freya_ca.crt (renamed from certs/freya_ca.crt)0
-rw-r--r--files/certs/freya_intermediate.crt (renamed from certs/freya_intermediate.crt)0
-rw-r--r--files/certs/tinternet.crt (renamed from certs/tinternet.crt)0
-rw-r--r--files/keys/freya-gpg.pub (renamed from keys/freya-gpg.pub)0
-rw-r--r--files/keys/freya-ssh.pub (renamed from keys/freya-ssh.pub)0
-rw-r--r--files/keys/nonguix.pub (renamed from keys/nonguix.pub)0
-rw-r--r--files/keys/sakura.pub (renamed from keys/sakura.pub)0
-rw-r--r--home/home.scm2
-rw-r--r--modules/freya/certs.scm2
-rw-r--r--modules/freya/system.scm8
10 files changed, 6 insertions, 6 deletions
diff --git a/certs/freya_ca.crt b/files/certs/freya_ca.crt
index bc0d55a..bc0d55a 100644
--- a/certs/freya_ca.crt
+++ b/files/certs/freya_ca.crt
diff --git a/certs/freya_intermediate.crt b/files/certs/freya_intermediate.crt
index 1313322..1313322 100644
--- a/certs/freya_intermediate.crt
+++ b/files/certs/freya_intermediate.crt
diff --git a/certs/tinternet.crt b/files/certs/tinternet.crt
index ddafb1c..ddafb1c 100644
--- a/certs/tinternet.crt
+++ b/files/certs/tinternet.crt
diff --git a/keys/freya-gpg.pub b/files/keys/freya-gpg.pub
index 0799334..0799334 100644
--- a/keys/freya-gpg.pub
+++ b/files/keys/freya-gpg.pub
diff --git a/keys/freya-ssh.pub b/files/keys/freya-ssh.pub
index fab26a7..fab26a7 100644
--- a/keys/freya-ssh.pub
+++ b/files/keys/freya-ssh.pub
diff --git a/keys/nonguix.pub b/files/keys/nonguix.pub
index 32ddac6..32ddac6 100644
--- a/keys/nonguix.pub
+++ b/files/keys/nonguix.pub
diff --git a/keys/sakura.pub b/files/keys/sakura.pub
index 9fb52ae..9fb52ae 100644
--- a/keys/sakura.pub
+++ b/files/keys/sakura.pub
diff --git a/home/home.scm b/home/home.scm
index 5e6a445..72b1d05 100644
--- a/home/home.scm
+++ b/home/home.scm
@@ -182,7 +182,7 @@
(".gtkrc-2.0" ,(local-file "config/gtk/gtk-2.0/settings"))
(".local/share/fonts" ,(local-file "local/fonts" #:recursive? #t))
(".local/share/dbus-1/services" ,(local-file "local/dbus/services" #:recursive? #t))
- (".mozilla/certificates" ,(local-file "../certs" #:recursive? #t))
+ (".mozilla/certificates" ,(local-file "../files/certs" #:recursive? #t))
(".nix-channels" ,(local-file "nix/nix-channels"))
(".gitconfig" ,(local-file "config/git/gitconfig"))))
diff --git a/modules/freya/certs.scm b/modules/freya/certs.scm
index 9ba1fa2..71fa1bd 100644
--- a/modules/freya/certs.scm
+++ b/modules/freya/certs.scm
@@ -13,7 +13,7 @@
(package
(name "freya-ca-certs")
(version "1")
- (source (local-file "../../certs"
+ (source (local-file "../../files/certs"
#:recursive? #t))
(build-system trivial-build-system)
(license license:mpl2.0)
diff --git a/modules/freya/system.scm b/modules/freya/system.scm
index 03f67b4..002a910 100644
--- a/modules/freya/system.scm
+++ b/modules/freya/system.scm
@@ -220,8 +220,8 @@
(service openssh-service-type
(openssh-configuration
(authorized-keys
- `(("freya" ,(local-file "../../keys/freya-ssh.pub"))
- ("root" ,(local-file "../../keys/freya-ssh.pub"))))
+ `(("freya" ,(local-file "../../files/keys/freya-ssh.pub"))
+ ("root" ,(local-file "../../files/keys/freya-ssh.pub"))))
(permit-root-login #t)
(allow-empty-passwords? #t)
(password-authentication? #f)
@@ -238,8 +238,8 @@
"https://substitutes.freya.cat")
%default-substitute-urls))
(authorized-keys
- (append (list (local-file "../../keys/nonguix.pub")
- (local-file "../../keys/sakura.pub"))
+ (append (list (local-file "../../files/keys/nonguix.pub")
+ (local-file "../../files/keys/sakura.pub"))
%default-authorized-guix-keys)))))))
(define-public %desktop-freya-services