diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2018-07-24 19:56:35 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2018-07-24 19:56:35 +0200 |
| commit | 706ae8e15c8d36b0aee7c19c54c143d3e17f5784 (patch) | |
| tree | e9fe8ebfb1417d30979b5413165599f066a1c504 /etc | |
| parent | 3e95125e9bd0676d4a9add9105217ad3eaef3ff0 (diff) | |
| parent | 8440db459a10daa24282038f35bc0b6771bd51ab (diff) | |
| download | guix-706ae8e15c8d36b0aee7c19c54c143d3e17f5784.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/completion/bash/guix | 12 | ||||
| -rw-r--r-- | etc/snippets/scheme-mode/guix-package | 4 | ||||
| -rw-r--r-- | etc/snippets/text-mode/guix-commit-message-use-https-home-page | 9 |
3 files changed, 24 insertions, 1 deletions
diff --git a/etc/completion/bash/guix b/etc/completion/bash/guix index 70430c5c95..a593b8112c 100644 --- a/etc/completion/bash/guix +++ b/etc/completion/bash/guix @@ -167,6 +167,12 @@ _guix_complete () else _guix_complete_available_package "$word_at_point" fi + elif _guix_is_command "build" + then + if _guix_is_dash_L + then + _guix_complete_file + fi elif _guix_is_command "download" then _guix_complete_file @@ -189,6 +195,12 @@ _guix_complete () elif _guix_is_command "hash" || _guix_is_command "gc" then _guix_complete_file + elif _guix_is_command "weather" + then + if _guix_is_dash_m + then + _guix_complete_file + fi else _guix_complete_available_package "$word_at_point" fi diff --git a/etc/snippets/scheme-mode/guix-package b/etc/snippets/scheme-mode/guix-package index d392e82093..48b87e3599 100644 --- a/etc/snippets/scheme-mode/guix-package +++ b/etc/snippets/scheme-mode/guix-package @@ -7,7 +7,8 @@ (name "$1") (version "$2") (source origin...$0) - (build-system ${3:$$(yas-choose-value "ant-build-system" + (build-system ${3:$$(yas-choose-value "android-ndk-build-system" + "ant-build-system" "asdf-build-system" "cargo-build-system" "cmake-build-system" @@ -25,6 +26,7 @@ "python-build-system" "r-build-system" "ruby-build-system" + "scons-build-system" "texlive-build-system" "trivial-build-system" "waf-build-system")}) diff --git a/etc/snippets/text-mode/guix-commit-message-use-https-home-page b/etc/snippets/text-mode/guix-commit-message-use-https-home-page new file mode 100644 index 0000000000..df20d31a80 --- /dev/null +++ b/etc/snippets/text-mode/guix-commit-message-use-https-home-page @@ -0,0 +1,9 @@ +# -*- mode: snippet -*- +# name: guix-commit-message-use-https-home-page +# key: https +# condition: git-commit-mode +# -- +gnu: $1: Use HTTPS home page URI. + +* `(car (magit-staged-files))` ($1)[home-page]: Use HTTPS URI. +`(mapconcat (lambda (file) (concat "* " file)) (cdr (magit-staged-files)) "\n")` \ No newline at end of file |