Compare commits

..

No commits in common. "dbe7f0ae30b3d8ba6b2d24c25f361022bf481bb9" and "986b16f78c6b04ee7e1af80bc490d4bb852de569" have entirely different histories.

10 changed files with 69 additions and 43 deletions

29
certs/gpgkey.asc Normal file
View file

@ -0,0 +1,29 @@
-----BEGIN PGP PUBLIC KEY BLOCK-----
mDMEZOu3hBYJKwYBBAHaRw8BAQdA2vMy2QY03GrTkJ5u+1933D28aJWSqFLy3vPV
h2PotU60IUZyZXlhIE11cnBoeSA8ZnJleWFAZnJleWFjYXQub3JnPoiTBBMWCAA7
AhsBBQsJCAcCBhUKCQgLAgQWAgMBAh4BAheAFiEET2vBHOuy8kIUuQ+sn/aTe4Ke
VloFAmVA+KsCGQEACgkQn/aTe4KeVlqGWQEAmm53JKWNP/EqvyAPIZG6mg3YAT5n
Et0dvaf5oBD2Ln4BAO6Q+y3T1z7lVgPQ9/6ZbEs6B71d4j7r2BpwcW1JYcUAuDME
ZbQwJBYJKwYBBAHaRw8BAQdANDr2TS2dtdDDNjRErbREUhlWUBb5no+m+jyY0/1m
UIyI9QQYFgoAJhYhBE9rwRzrsvJCFLkPrJ/2k3uCnlZaBQJltDAkAhsCBQkB4TOA
AIEJEJ/2k3uCnlZadiAEGRYKAB0WIQRtx1BmlDfxN0SCiq50SrgA44OuUgUCZbQw
JAAKCRB0SrgA44OuUhSxAP40Z0MxS2rCLveOECqaFw5iGPxuj2/vJIwPEKuYGIS+
yAEA8nqcirOU1Gz35/wOohc9lAApWt0FIrsdO+aLmtoAvQzlOwD+MOjKtIbn8vZl
NiAX7L+tBlH+GMDQb4dnQB5ZD1LWqgMBAMor6ZVHFh/ptQeihIWcDRpo9j0vf1X8
21EVnzNmW3ULuDMEZbQwMhYJKwYBBAHaRw8BAQdA9K8LXdWBm4/jSRY/zZ+e62EP
qHadeubm5GCJxk1JFMOIfgQYFgoAJhYhBE9rwRzrsvJCFLkPrJ/2k3uCnlZaBQJl
tDAyAhsgBQkB4TOAAAoJEJ/2k3uCnlZaH14BAM5rlzk6SyYw/RC0WV8TqNrsEhfF
4vrmVlGAM7pSuEAzAP0XCTglAX0gOqD5tfFGEg7YD2Vzec7TBsmR3Tlm68rKCbg4
BGW0MEISCisGAQQBl1UBBQEBB0BmIRgbKdHNE+LJyvcchhcYkSvJCAHPTBq5zSbn
151dYAMBCAeIfgQYFgoAJhYhBE9rwRzrsvJCFLkPrJ/2k3uCnlZaBQJltDBCAhsM
BQkB4TOAAAoJEJ/2k3uCnlZaWCQBAOhUcEFvQlDsGgk8uCu/VUJ0WF+WUKEE1fNO
aELmCNRZAQCGrmtATHxJKbX0kzIxEmRti9knTG9z9pU8f+4E2i0oDpgzBGW0LwcW
CSsGAQQB2kcPAQEHQOXmMS+5LUmgP5hnW8es2lYVpCxEVGhtB0Oc0O26Uw2RtCFG
cmV5YSBNdXJwaHkgPGZyZXlhQGZyZXlhY2F0Lm9yZz6IkwQTFgoAOxYhBLc/ajyD
s4yQM5eA4F1n9JmDex1gBQJltC8HAhsBBQsJCAcCAiICBhUKCQgLAgQWAgMBAh4H
AheAAAoJEF1n9JmDex1g0ZkBAI3EHj3JeVENSHEoOrTwp3s7CANt0ix+3t1BFZ6X
nGoKAP43LCopn8+bXdjx/OhTbQi7bzBatc7c68O1KgkAV4olBw==
=oGkO
-----END PGP PUBLIC KEY BLOCK-----

1
certs/gpgkey.pub Normal file
View file

@ -0,0 +1 @@
ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPSvC13VgZuP40kWP82fnuthD6h2nXrm5uRgicZNSRTD cardno:24 409 474

View file

@ -25,9 +25,9 @@
(url "https://g.freya.cat/freya/sakura")
(branch "main")
(commit
"17247cc3edc9a90acd8a30ed2f967ddaed7dd06e")
"490f9018f0de343c7192c8a2d1f3d9d66f180c8d")
(introduction
(make-channel-introduction
"8fb2f9c2fa414754c41c1c73665e3e73e12693ab"
"490f9018f0de343c7192c8a2d1f3d9d66f180c8d"
(openpgp-fingerprint
"3CD3 65F0 373C EB13 853A F568 9FBC 6FFD 6D2D BF17")))))
"4F6B C11C EBB2 F242 14B9 0FAC 9FF6 937B 829E 565A")))))

View file

@ -1,5 +1,5 @@
[user]
signingkey = D9AF0A4209B7C2DE11A884BFACBC553660D9993D
signingkey = 4F6BC11CEBB2F24214B90FAC9FF6937B829E565A
email = freya@freyacat.org
name = Freya Murphy
[commit]

View file

@ -1,5 +1,9 @@
[Default Applications]
text/html=librewolf.desktop
x-scheme-handler/http=librewolf.desktop
x-scheme-handler/https=librewolf.desktop
x-scheme-handler/about=librewolf.desktop
x-scheme-handler/unknown=librewolf.desktop
image/png=imv.desktop
image/jpeg=imv.desktop
image/webp=imv.desktop
@ -8,18 +12,39 @@ image/bmp=imv.desktop
image/gif=imv.desktop
video/mp4=mpv.desktop
video/x-msvideo=mpv.desktop
video/mkv=mpv.desktop
video/webm=mpv.desktop
audio/mp3=mpv.desktop
audio/wav=mpv.desktop
video/mkv=mpv.desktop
video/webm=mpv.desktop
application/pdf=org.pwmt.zathura.desktop
text/plain=nvim.desktop
text/markdown=nvim.desktop
text/x-makefile=nvim.desktop
text/x-c++hdr=nvim.desktop
text/x-c++src=nvim.desktop
text/x-chdr=nvim.desktop
text/x-csrc=nvim.desktop
text/x-java=nvim.desktop
text/x-moc=nvim.desktop
text/x-pascal=nvim.desktop
text/x-tcl=nvim.desktop
text/x-tex=nvim.desktop
text/x-c=nvim.desktop
text/x-c++=nvim.desktop
application/x-zerosize=nvim.desktop
application/x-shellscript=nvim.desktop
x-scheme-handler/http=librewolf.desktop
x-scheme-handler/https=librewolf.desktop
x-scheme-handler/about=librewolf.desktop
x-scheme-handler/unknown=librewolf.desktop
x-scheme-handler/msteams=teams.desktop
x-scheme-handler/mspa=unofficial-homestuck-collection.desktop
hoppscotch=hoppscotch-handler.desktop
[Added Associations]
application/x-zerosize=nvim.desktop;
x-scheme-handler/mailto=userapp-Thunderbird-E9G491.desktop;userapp-Thunderbird-4IZTA2.desktop;
x-scheme-handler/mid=userapp-Thunderbird-E9G491.desktop;userapp-Thunderbird-4IZTA2.desktop;
x-scheme-handler/webcal=userapp-Thunderbird-9WQSA2.desktop;
x-scheme-handler/webcals=userapp-Thunderbird-9WQSA2.desktop;
x-scheme-handler/mailto=userapp-Thunderbird-E9G491.desktop;userapp-Thunderbird-Y667E2.desktop;userapp-Thunderbird-2QYKF2.desktop;
message/rfc822=userapp-Thunderbird-E9G491.desktop;
x-scheme-handler/mid=userapp-Thunderbird-E9G491.desktop;userapp-Thunderbird-Y667E2.desktop;userapp-Thunderbird-2QYKF2.desktop;
x-scheme-handler/discord=discord.desktop;
x-scheme-handler/slack=slack.desktop;

View file

@ -1,28 +0,0 @@
-----BEGIN PGP PUBLIC KEY BLOCK-----
mDMEZbQvBxYJKwYBBAHaRw8BAQdA5eYxL7ktSaA/mGdbx6zaVhWkLERUaG0HQ5zQ
7bpTDZG0IUZyZXlhIE11cnBoeSA8ZnJleWFAZnJleWFjYXQub3JnPoiTBBMWCgA7
FiEEtz9qPIOzjJAzl4DgXWf0mYN7HWAFAmW0LwcCGwEFCwkIBwICIgIGFQoJCAsC
BBYCAwECHgcCF4AACgkQXWf0mYN7HWDRmQEAjcQePcl5UQ1IcSg6tPCnezsIA23S
LH7e3UEVnpecagoA/jcsKimfz5td2PH86FNtCLtvMFq1ztzrw7UqCQBXiiUHmDME
ZxpY/BYJKwYBBAHaRw8BAQdAqxOoScBHGwsgHibO5NYxkl5f8QeIXsIFAM20KVM/
Uo+0IUZyZXlhIE11cnBoeSA8ZnJleWFAZnJleWFjYXQub3JnPoiQBBMWCAA4FiEE
2a8KQgm3wt4RqIS/rLxVNmDZmT0FAmcaWPwCGwEFCwkIBwIGFQoJCAsCBBYCAwEC
HgECF4AACgkQrLxVNmDZmT17+gEA2QbrA+SQmgAtEwgdlQSRsdK8tfboTBnjeW9T
2j3ArW4BAJetX+1Q6pPXP4FLfZOz0Vu46JCy4DDGS37B89bmgrMOuDMEZxpZzRYJ
KwYBBAHaRw8BAQdAWf1SdS6rK+hXbEcjb0jy+bO9cDhna1khYRbsKcSDqfiI9QQY
FggAJhYhBNmvCkIJt8LeEaiEv6y8VTZg2Zk9BQJnGlnNAhsCBQkFo5qAAIEJEKy8
VTZg2Zk9diAEGRYIAB0WIQQ802XwNzzrE4U69WifvG/9bS2/FwUCZxpZzQAKCRCf
vG/9bS2/F2DHAQD11yHJC5VlyNtgPyA9SYI0M8clQjldB7O29v8gRGzbIgD/U4Sm
GnuRk2js5ITMmBdG1RGzEmmD1dVNIGGM4FiWdg/fSgEAy6dq/LVYeFRkMJ+Vbb0E
gFD7SnB/PNfrgtR6VS2KWCYA/1v6bblMoT5rNjcSt0i88SPo9n8CXDui1TOoPwLg
21EEuDMEZxpZ5hYJKwYBBAHaRw8BAQdA9NmEhp63hLFv2ftb8sl7OpvleaABdbON
L3TutR166SqIfgQYFggAJhYhBNmvCkIJt8LeEaiEv6y8VTZg2Zk9BQJnGlnmAhsg
BQkFo5qAAAoJEKy8VTZg2Zk9iQkA/iUIRSGElTdKPALKQ9Laf3xgsreEYE25zdAJ
VtvDXd/MAP4/vjrNyFw6k7EPrIx+i9Stw6hPxChH9SwgjcgZdCjWB7g4BGcaWhcS
CisGAQQBl1UBBQEBB0B3JswDVPoc4B5BRt+XNZ4Y+2cT+mzJwBvEeqdkgrJHTgMB
CAeIfgQYFggAJhYhBNmvCkIJt8LeEaiEv6y8VTZg2Zk9BQJnGloXAhsMBQkFo5qA
AAoJEKy8VTZg2Zk9rCIBALM+gv1wcpOzK1AHj2Nx+40Yf3Y3en7Py93lDK/iyWOo
AQCP9rp0XHMqNjiPStbV+cX9dgJym0L6tpuw55sSpWyIDg==
=fQIe
-----END PGP PUBLIC KEY BLOCK-----

View file

@ -1 +0,0 @@
ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPTZhIaet4Sxb9n7W/LJezqb5XmgAXWzjS907rUdeukq cardno:24 409 474

View file

@ -225,8 +225,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 "../../certs/gpgkey.pub"))
("root" ,(local-file "../../certs/gpgkey.pub"))))
(permit-root-login #t)
(allow-empty-passwords? #t)
(password-authentication? #f)
@ -243,8 +243,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 "../../certs/non-guix.pub")
(local-file "../../certs/sakura.pub"))
%default-authorized-guix-keys)))))))
(define-public %desktop-freya-services