diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..a3736ec --- /dev/null +++ b/Makefile @@ -0,0 +1,15 @@ +# +# NOTE: Makefile's target name should not be the same as one of the file or directory in the current directory, +# otherwise the target will not be executed! +# + + +deploy: + sudo guix system reconfigure ./config.scm + +pull: + echo "Pulling all channel's git repositories..." + echo "Based on the gap between the current commit and the latest commit of guix's official repo, this operation may take a while..." + guix pull --channels=./channels.scm + guix describe --format=channels > ./channels.scm + diff --git a/README.md b/README.md index f1c3914..ce68352 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,3 @@ # guix-config + My dotfiles for GNU Guix diff --git a/channels.scm b/channels.scm index bcd92b7..31d5d72 100644 --- a/channels.scm +++ b/channels.scm @@ -1,16 +1,18 @@ -(cons* +(list ;; packages some non-free software which cannot be included in the official distribution (channel (name 'nonguix) - (url "https://gitlab.com/nonguix/nonguix") + (url "https://github.com/nonguix/nonguix") ;; Enable signature verification: (introduction (make-channel-introduction "897c1a470da759236cc11798f4e0a5f7d4d59fbc" (openpgp-fingerprint "2A39 3FFF 68F4 EF7A 3D29 12AF 6F51 20A0 22FB B2D5")))) - ;; default guix channel(Mirror in China) + ;; default guix channel + ;; https://git.savannah.gnu.org/cgit/guix.git/refs/heads (channel (inherit (car %default-channels)) - (url "https://mirror.guix.org.cn/git/guix.git"))) + ;; Stay on the version 1.4.0 to avoid too much update + (branch "version-1.4.0"))) diff --git a/config.scm b/config.scm index 8dca58e..58b8c1b 100644 --- a/config.scm +++ b/config.scm @@ -57,16 +57,14 @@ (set-xorg-configuration (xorg-configuration (keyboard-layout keyboard-layout)))) + ;; This is the default list of services we ;; Using the substitute server of SJTU to speed up the download. (modify-services %desktop-services (guix-service-type config => (guix-configuration (inherit config) - (substitute-urls '("https://mirror.sjtu.edu.cn/guix/" "https://ci.guix.gnu.org"))))) + (substitute-urls '("https://mirror.sjtu.edu.cn/guix/" "https://ci.guix.gnu.org"))))))) - ;; This is the default list of services we - ;; are appending to. - %desktop-services)) (bootloader (bootloader-configuration (bootloader grub-bootloader) (targets (list "/dev/sda"))