me
/
guix-home-laptop
1
0
Fork 0
Code

Use lockfile mechanism for updating

main
Ethan Reece 2024-07-15 08:46:27 -05:00
parent f9183383e3
commit ed9196c806
Signed by: me
GPG Key ID: 198E9EB433DB1B28
5 changed files with 171 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.config/fish/config.fish
View File

@ -37,4 +37,9 @@ function home-edit
emacs ~/src/guix-config/home-configuration.scm emacs ~/src/guix-config/home-configuration.scm
end end
function home-update
cd ~/src/guix-config
just update
end
fish_add_path -g fish_add_path -g

4
Justfile
View File

@ -1,3 +1,5 @@
default: default:
guix home reconfigure ./home-configuration.scm guix time-machine --channels=./channels.scm.lock -- home reconfigure ./home-configuration.scm
update:
guix time-machine --channels=./channels.scm -- describe --format=channels > ./channels.scm.lock

72
channels.scm 100644
View File

@ -0,0 +1,72 @@
(list (channel
(name 'guix)
(url "https://git.savannah.gnu.org/git/guix.git")
(branch "master")
(introduction
(make-channel-introduction
"9edb3f66fd807b096b48283debdcddccfea34bad"
(openpgp-fingerprint
"BBB0 2DDF 2CEA F6A8 0D1D E643 A2A0 6DF2 A33A 54FA"))))
(channel
(name 'atomized)
(url "https://codeberg.org/ieure/atomized-guix.git")
(branch "main")
(introduction
(make-channel-introduction
"bdbcd3c5815f64799e2c0d139896da83d9972bd1"
(openpgp-fingerprint
"6980 A9B9 5202 AA11 EB1D 8922 8499 AC88 F1A7 1CF2"))))
(channel
(name 'rrr)
(url "https://git.sr.ht/~akagi/rrr")
(branch "master")
(introduction
(make-channel-introduction
"794d6e5eb362bfcf81ada12b6a49a0cd55c8e031"
(openpgp-fingerprint
"FF72 877C 4F21 FC4D 467D 20C4 DCCB 5255 2098 B6C1"))))
(channel
(name 'tuziwo)
(url "https://gitlab.com/woshilapin/tuziwo-channel")
(branch "main")
(introduction
(make-channel-introduction
"0deff2a94032f2d96e82f93edeb61f35da879987"
(openpgp-fingerprint
"5554 54E7 6611 9F60 80F1 2F63 B041 63DC 7020 116A"))))
(channel
(name 'rosenthal)
(url "https://github.com/rakino/rosenthal")
(branch "trunk")
(introduction
(make-channel-introduction
"7677db76330121a901604dfbad19077893865f35"
(openpgp-fingerprint
"13E7 6CD6 E649 C28C 3385 4DF5 5E5A A665 6149 17F7"))))
(channel
(name 'saayix)
(url "https://codeberg.org/look/saayix")
(branch "main")
(introduction
(make-channel-introduction
"12540f593092e9a177eb8a974a57bb4892327752"
(openpgp-fingerprint
"3FFA 7335 973E 0A49 47FC 0A8C 38D5 96BE 07D3 34AB"))))
(channel
(name 'small-guix)
(url "https://gitlab.com/orang3/small-guix")
(branch "master")
(introduction
(make-channel-introduction
"f260da13666cd41ae3202270784e61e062a3999c"
(openpgp-fingerprint
"8D10 60B9 6BB8 292E 829B 7249 AED4 1CC1 93B7 01E2"))))
(channel
(name 'nonguix)
(url "https://gitlab.com/nonguix/nonguix")
(branch "master")
(introduction
(make-channel-introduction
"897c1a470da759236cc11798f4e0a5f7d4d59fbc"
(openpgp-fingerprint
"2A39 3FFF 68F4 EF7A 3D29 12AF 6F51 20A0 22FB B2D5")))))

88
channels.scm.lock 100644
View File

@ -0,0 +1,88 @@
(list (channel
(name 'guix)
(url "https://git.savannah.gnu.org/git/guix.git")
(branch "master")
(commit
"eb508e32d2d359c94d2cabebfe90dc32ca5dcf4f")
(introduction
(make-channel-introduction
"9edb3f66fd807b096b48283debdcddccfea34bad"
(openpgp-fingerprint
"BBB0 2DDF 2CEA F6A8 0D1D E643 A2A0 6DF2 A33A 54FA"))))
(channel
(name 'atomized)
(url "https://codeberg.org/ieure/atomized-guix.git")
(branch "main")
(commit
"2d1aba52246e0610b2c424ab580ced6bde52efbf")
(introduction
(make-channel-introduction
"bdbcd3c5815f64799e2c0d139896da83d9972bd1"
(openpgp-fingerprint
"6980 A9B9 5202 AA11 EB1D 8922 8499 AC88 F1A7 1CF2"))))
(channel
(name 'rrr)
(url "https://git.sr.ht/~akagi/rrr")
(branch "master")
(commit
"839c97b0c466e6fea84c4cde2768b62bb86af56e")
(introduction
(make-channel-introduction
"794d6e5eb362bfcf81ada12b6a49a0cd55c8e031"
(openpgp-fingerprint
"FF72 877C 4F21 FC4D 467D 20C4 DCCB 5255 2098 B6C1"))))
(channel
(name 'tuziwo)
(url "https://gitlab.com/woshilapin/tuziwo-channel")
(branch "main")
(commit
"6380b41e6aeafd965a7525a0637da9c2d8cc4440")
(introduction
(make-channel-introduction
"0deff2a94032f2d96e82f93edeb61f35da879987"
(openpgp-fingerprint
"5554 54E7 6611 9F60 80F1 2F63 B041 63DC 7020 116A"))))
(channel
(name 'rosenthal)
(url "https://github.com/rakino/rosenthal")
(branch "trunk")
(commit
"8ca24e4559bc0b9eb5c736af1e04e600101dc593")
(introduction
(make-channel-introduction
"7677db76330121a901604dfbad19077893865f35"
(openpgp-fingerprint
"13E7 6CD6 E649 C28C 3385 4DF5 5E5A A665 6149 17F7"))))
(channel
(name 'saayix)
(url "https://codeberg.org/look/saayix")
(branch "main")
(commit
"ac9e3f1da0b5cbebbdc95974d81cd53d98a1bc44")
(introduction
(make-channel-introduction
"12540f593092e9a177eb8a974a57bb4892327752"
(openpgp-fingerprint
"3FFA 7335 973E 0A49 47FC 0A8C 38D5 96BE 07D3 34AB"))))
(channel
(name 'small-guix)
(url "https://gitlab.com/orang3/small-guix")
(branch "master")
(commit
"959f4c8edd15ecb9d0c4cc061bafd0928679bbf4")
(introduction
(make-channel-introduction
"f260da13666cd41ae3202270784e61e062a3999c"
(openpgp-fingerprint
"8D10 60B9 6BB8 292E 829B 7249 AED4 1CC1 93B7 01E2"))))
(channel
(name 'nonguix)
(url "https://gitlab.com/nonguix/nonguix")
(branch "master")
(commit
"9fe6f0751bf5770ef4b2afa7bca0b7e51e1382fd")
(introduction
(make-channel-introduction
"897c1a470da759236cc11798f4e0a5f7d4d59fbc"
(openpgp-fingerprint
"2A39 3FFF 68F4 EF7A 3D29 12AF 6F51 20A0 22FB B2D5")))))

80
home-configuration.scm
View File

@ -66,82 +66,7 @@
"nushell"))) "nushell")))
(services (services
(list (service home-channels-service-type (list (service home-gpg-agent-service-type
(list (channel
(name 'guix)
(url "https://git.savannah.gnu.org/git/guix.git")
(branch "master")
(commit
"ddbbb78786e104a9a9e93cffe9f69b6c0f3bd4ed")
(introduction
(make-channel-introduction
"9edb3f66fd807b096b48283debdcddccfea34bad"
(openpgp-fingerprint
"BBB0 2DDF 2CEA F6A8 0D1D E643 A2A0 6DF2 A33A 54FA"))))
(channel
(name 'atomized)
(url "https://codeberg.org/ieure/atomized-guix.git")
(branch "main")
(introduction
(make-channel-introduction
"bdbcd3c5815f64799e2c0d139896da83d9972bd1"
(openpgp-fingerprint
"6980 A9B9 5202 AA11 EB1D 8922 8499 AC88 F1A7 1CF2"))))
(channel
(name 'rrr)
(url "https://git.sr.ht/~akagi/rrr")
(branch "master")
(introduction
(make-channel-introduction
"794d6e5eb362bfcf81ada12b6a49a0cd55c8e031"
(openpgp-fingerprint
"FF72 877C 4F21 FC4D 467D 20C4 DCCB 5255 2098 B6C1"))))
(channel
(name 'tuziwo)
(url "https://gitlab.com/woshilapin/tuziwo-channel")
(branch "main")
(introduction
(make-channel-introduction
"0deff2a94032f2d96e82f93edeb61f35da879987"
(openpgp-fingerprint
"5554 54E7 6611 9F60 80F1 2F63 B041 63DC 7020 116A"))))
(channel
(name 'rosenthal)
(url "https://github.com/rakino/rosenthal")
(branch "trunk")
(introduction
(make-channel-introduction
"7677db76330121a901604dfbad19077893865f35"
(openpgp-fingerprint
"13E7 6CD6 E649 C28C 3385 4DF5 5E5A A665 6149 17F7"))))
(channel
(name 'saayix)
(url "https://codeberg.org/look/saayix")
(branch "main")
(introduction
(make-channel-introduction
"12540f593092e9a177eb8a974a57bb4892327752"
(openpgp-fingerprint
"3FFA 7335 973E 0A49 47FC 0A8C 38D5 96BE 07D3 34AB"))))
(channel
(name 'small-guix)
(url "https://gitlab.com/orang3/small-guix")
(branch "master")
(introduction
(make-channel-introduction
"f260da13666cd41ae3202270784e61e062a3999c"
(openpgp-fingerprint
"8D10 60B9 6BB8 292E 829B 7249 AED4 1CC1 93B7 01E2"))))
(channel
(name 'nonguix)
(url "https://gitlab.com/nonguix/nonguix")
(branch "master")
(introduction
(make-channel-introduction
"897c1a470da759236cc11798f4e0a5f7d4d59fbc"
(openpgp-fingerprint
"2A39 3FFF 68F4 EF7A 3D29 12AF 6F51 20A0 22FB B2D5"))))))
(service home-gpg-agent-service-type
(home-gpg-agent-configuration (home-gpg-agent-configuration
(ssh-support? #t))) (ssh-support? #t)))
(service home-fish-service-type (service home-fish-service-type
@ -154,5 +79,6 @@
(".gitconfig" ,(local-file "./gitconfig")))) (".gitconfig" ,(local-file "./gitconfig"))))
(service home-xdg-configuration-files-service-type (service home-xdg-configuration-files-service-type
`(("weechat/weechat.conf" ,(local-file "./.config/weechat/weechat.conf")) `(("weechat/weechat.conf" ,(local-file "./.config/weechat/weechat.conf"))
("zathura/zathurarc" ,(local-file "./.config/zathura/zathurarc")))) ("zathura/zathurarc" ,(local-file "./.config/zathura/zathurarc"))
("guix/channels.scm" ,(local-file "./channels.scm.lock"))))
(service home-symlink-manager-service-type)))) (service home-symlink-manager-service-type))))