From ed9196c806f821da0b79e0b156978ed4a50d9870 Mon Sep 17 00:00:00 2001 From: Ethan Reece Date: Mon, 15 Jul 2024 08:46:27 -0500 Subject: [PATCH] Use lockfile mechanism for updating --- .config/fish/config.fish | 5 +++ Justfile | 4 +- channels.scm | 72 ++++++++++++++++++++++++++++++++ channels.scm.lock | 88 ++++++++++++++++++++++++++++++++++++++++ home-configuration.scm | 80 ++---------------------------------- 5 files changed, 171 insertions(+), 78 deletions(-) create mode 100644 channels.scm create mode 100644 channels.scm.lock diff --git a/.config/fish/config.fish b/.config/fish/config.fish index 5ca913c..e7d4b88 100644 --- a/.config/fish/config.fish +++ b/.config/fish/config.fish @@ -37,4 +37,9 @@ function home-edit emacs ~/src/guix-config/home-configuration.scm end +function home-update + cd ~/src/guix-config + just update +end + fish_add_path -g diff --git a/Justfile b/Justfile index 4d95a9a..410c0e6 100644 --- a/Justfile +++ b/Justfile @@ -1,3 +1,5 @@ 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 diff --git a/channels.scm b/channels.scm new file mode 100644 index 0000000..458d716 --- /dev/null +++ b/channels.scm @@ -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"))))) diff --git a/channels.scm.lock b/channels.scm.lock new file mode 100644 index 0000000..0602186 --- /dev/null +++ b/channels.scm.lock @@ -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"))))) diff --git a/home-configuration.scm b/home-configuration.scm index d1bba0b..829a77e 100644 --- a/home-configuration.scm +++ b/home-configuration.scm @@ -66,82 +66,7 @@ "nushell"))) (services - (list (service home-channels-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 + (list (service home-gpg-agent-service-type (home-gpg-agent-configuration (ssh-support? #t))) (service home-fish-service-type @@ -154,5 +79,6 @@ (".gitconfig" ,(local-file "./gitconfig")))) (service home-xdg-configuration-files-service-type `(("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))))