mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-02-10 14:14:20 +00:00
85 lines
2.6 KiB
Diff
85 lines
2.6 KiB
Diff
diff --git i/config/aerc.conf w/config/aerc.conf
|
|
index 05ebbf4..db6877b 100644
|
|
--- i/config/aerc.conf
|
|
+++ w/config/aerc.conf
|
|
@@ -152,8 +152,7 @@
|
|
#
|
|
# ${XDG_CONFIG_HOME:-~/.config}/aerc/stylesets
|
|
# ${XDG_DATA_HOME:-~/.local/share}/aerc/stylesets
|
|
-# /usr/local/share/aerc/stylesets
|
|
-# /usr/share/aerc/stylesets
|
|
+# @out@/share/aerc/stylesets
|
|
#
|
|
#stylesets-dirs=
|
|
|
|
@@ -445,8 +444,7 @@ message/rfc822=colorize
|
|
#
|
|
# ${XDG_CONFIG_HOME:-~/.config}/aerc/templates
|
|
# ${XDG_DATA_HOME:-~/.local/share}/aerc/templates
|
|
-# /usr/local/share/aerc/templates
|
|
-# /usr/share/aerc/templates
|
|
+# @out@/share/aerc/templates
|
|
#
|
|
#template-dirs=
|
|
|
|
diff --git i/config/config.go w/config/config.go
|
|
index 09fb5ef..c73a7ee 100644
|
|
--- i/config/config.go
|
|
+++ w/config/config.go
|
|
@@ -60,8 +60,7 @@ func buildDefaultDirs() []string {
|
|
}
|
|
|
|
// Add fixed fallback locations
|
|
- defaultDirs = append(defaultDirs, "/usr/local/share/aerc")
|
|
- defaultDirs = append(defaultDirs, "/usr/share/aerc")
|
|
+ defaultDirs = append(defaultDirs, "@out@/share/aerc")
|
|
|
|
return defaultDirs
|
|
}
|
|
diff --git i/doc/aerc-config.5.scd w/doc/aerc-config.5.scd
|
|
index d48e38a..39784c4 100644
|
|
--- i/doc/aerc-config.5.scd
|
|
+++ w/doc/aerc-config.5.scd
|
|
@@ -279,8 +279,7 @@ These options are configured in the *[ui]* section of _aerc.conf_.
|
|
```
|
|
${XDG_CONFIG_HOME:-~/.config}/aerc/stylesets
|
|
${XDG_DATA_HOME:-~/.local/share}/aerc/stylesets
|
|
- /usr/local/share/aerc/stylesets
|
|
- /usr/share/aerc/stylesets
|
|
+ @out@/share/aerc/stylesets
|
|
```
|
|
|
|
*styleset-name* = _<string>_
|
|
@@ -822,8 +821,7 @@ These options are configured in the *[templates]* section of _aerc.conf_.
|
|
```
|
|
${XDG_CONFIG_HOME:-~/.config}/aerc/templates
|
|
${XDG_DATA_HOME:-~/.local/share}/aerc/templates
|
|
- /usr/local/share/aerc/templates
|
|
- /usr/share/aerc/templates
|
|
+ @out@/share/aerc/templates
|
|
```
|
|
|
|
*new-message* = _<template_name>_
|
|
diff --git i/doc/aerc-templates.7.scd w/doc/aerc-templates.7.scd
|
|
index 6c9e319..0ef97ce 100644
|
|
--- i/doc/aerc-templates.7.scd
|
|
+++ w/doc/aerc-templates.7.scd
|
|
@@ -111,7 +111,7 @@ aerc provides the following additional functions:
|
|
Execute external command, provide the second argument to its stdin.
|
|
|
|
```
|
|
- {{exec `/usr/local/share/aerc/filters/html` .OriginalText}}
|
|
+ {{exec `@out@/share/aerc/filters/html` .OriginalText}}
|
|
```
|
|
|
|
*toLocal*
|
|
@@ -142,7 +142,7 @@ aerc provides the following additional functions:
|
|
Example: Automatic HTML parsing for text/html mime type messages
|
|
```
|
|
{{if eq .OriginalMIMEType "text/html"}}
|
|
- {{exec `/usr/local/share/aerc/filters/html` .OriginalText | wrap 72 | quote}}
|
|
+ {{exec `@out@/share/aerc/filters/html` .OriginalText | wrap 72 | quote}}
|
|
{{else}}
|
|
{{wrap 72 .OriginalText | quote}}
|
|
{{end}}
|