From a3e50c4ced50ef6a38763222729b633a1df03fa6 Mon Sep 17 00:00:00 2001
From: George Rawlinson <george@rawlinson.net.nz>
Date: Mon, 7 Nov 2016 17:45:58 +1300
Subject: [PATCH] Move system related files to own directory

---
 system/etc/pacman.conf                        | 100 ++++++++++++++++++
 system/etc/security/pam_env.conf              |   4 +
 .../etc/systemd/system}/mbsync@.service       |   1 +
 .../etc/systemd/system}/mbsync@.timer         |   0
 .../etc/systemd/system}/mpd.service           |   0
 .../etc/systemd/system}/mpdas.service         |   0
 6 files changed, 105 insertions(+)
 create mode 100644 system/etc/pacman.conf
 create mode 100644 system/etc/security/pam_env.conf
 rename {mail/.config/systemd/user => system/etc/systemd/system}/mbsync@.service (82%)
 rename {mail/.config/systemd/user => system/etc/systemd/system}/mbsync@.timer (100%)
 rename {mpd/.config/systemd/user => system/etc/systemd/system}/mpd.service (100%)
 rename {mpd/.config/systemd/user => system/etc/systemd/system}/mpdas.service (100%)

diff --git a/system/etc/pacman.conf b/system/etc/pacman.conf
new file mode 100644
index 0000000..85b6515
--- /dev/null
+++ b/system/etc/pacman.conf
@@ -0,0 +1,100 @@
+#
+# /etc/pacman.conf
+#
+# See the pacman.conf(5) manpage for option and repository directives
+
+#
+# GENERAL OPTIONS
+#
+[options]
+# The following paths are commented out with their default values listed.
+# If you wish to use different paths, uncomment and update the paths.
+#RootDir     = /
+#DBPath      = /var/lib/pacman/
+#CacheDir    = /var/cache/pacman/pkg/
+#LogFile     = /var/log/pacman.log
+#GPGDir      = /etc/pacman.d/gnupg/
+#HookDir     = /etc/pacman.d/hooks/
+HoldPkg     = pacman glibc
+#XferCommand = /usr/bin/curl -C - -f %u > %o
+#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
+#CleanMethod = KeepInstalled
+#UseDelta    = 0.7
+Architecture = auto
+
+# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
+#IgnorePkg   =
+#IgnoreGroup =
+
+#NoUpgrade   =
+#NoExtract   =
+
+# Misc options
+#UseSyslog
+Color
+#TotalDownload
+CheckSpace
+#VerbosePkgLists
+
+# By default, pacman accepts packages signed by keys that its local keyring
+# trusts (see pacman-key and its man page), as well as unsigned packages.
+SigLevel    = Required DatabaseOptional
+LocalFileSigLevel = Optional
+#RemoteFileSigLevel = Required
+
+# NOTE: You must run `pacman-key --init` before first using pacman; the local
+# keyring can then be populated with the keys of all official Arch Linux
+# packagers with `pacman-key --populate archlinux`.
+
+#
+# REPOSITORIES
+#   - can be defined here or included from another file
+#   - pacman will search repositories in the order defined here
+#   - local/custom mirrors can be added here or in separate files
+#   - repositories listed first will take precedence when packages
+#     have identical names, regardless of version number
+#   - URLs will have $repo replaced by the name of the current repo
+#   - URLs will have $arch replaced by the name of the architecture
+#
+# Repository entries are of the format:
+#       [repo-name]
+#       Server = ServerName
+#       Include = IncludePath
+#
+# The header [repo-name] is crucial - it must be present and
+# uncommented to enable the repo.
+#
+
+# The testing repositories are disabled by default. To enable, uncomment the
+# repo name header and Include lines. You can add preferred servers immediately
+# after the header, and they will be used before the default mirrors.
+
+[testing]
+Include = /etc/pacman.d/mirrorlist
+
+[core]
+Include = /etc/pacman.d/mirrorlist
+
+[extra]
+Include = /etc/pacman.d/mirrorlist
+
+[community-testing]
+Include = /etc/pacman.d/mirrorlist
+
+[community]
+Include = /etc/pacman.d/mirrorlist
+
+# If you want to run 32 bit applications on your x86_64 system,
+# enable the multilib repositories as required here.
+
+[multilib-testing]
+Include = /etc/pacman.d/mirrorlist
+
+[multilib]
+Include = /etc/pacman.d/mirrorlist
+
+# An example of a custom package repository.  See the pacman manpage for
+# tips on creating your own repositories.
+#[custom]
+#SigLevel = Optional TrustAll
+#Server = file:///home/custompkgs
diff --git a/system/etc/security/pam_env.conf b/system/etc/security/pam_env.conf
new file mode 100644
index 0000000..9917d81
--- /dev/null
+++ b/system/etc/security/pam_env.conf
@@ -0,0 +1,4 @@
+# This config file is from /etc/security/pam_env.conf
+XDG_DATA_HOME DEFAULT=@{HOME}/.local/share
+XDG_CONFIG_HOME DEFAULT=@{HOME}/.config
+XDG_CACHE_HOME DEFAULT=@{HOME}/.cache
diff --git a/mail/.config/systemd/user/mbsync@.service b/system/etc/systemd/system/mbsync@.service
similarity index 82%
rename from mail/.config/systemd/user/mbsync@.service
rename to system/etc/systemd/system/mbsync@.service
index 75bcf42..4e6c9bb 100644
--- a/mail/.config/systemd/user/mbsync@.service
+++ b/system/etc/systemd/system/mbsync@.service
@@ -4,6 +4,7 @@ Description=Mailbox synchronization service for user %I
 [Service]
 Type=oneshot
 ExecStart=/usr/bin/mbsync -Va
+ExecStartPost=/usr/bin/notmuch new
 User=%i
 StandardOutput=syslog
 StandardError=syslog
diff --git a/mail/.config/systemd/user/mbsync@.timer b/system/etc/systemd/system/mbsync@.timer
similarity index 100%
rename from mail/.config/systemd/user/mbsync@.timer
rename to system/etc/systemd/system/mbsync@.timer
diff --git a/mpd/.config/systemd/user/mpd.service b/system/etc/systemd/system/mpd.service
similarity index 100%
rename from mpd/.config/systemd/user/mpd.service
rename to system/etc/systemd/system/mpd.service
diff --git a/mpd/.config/systemd/user/mpdas.service b/system/etc/systemd/system/mpdas.service
similarity index 100%
rename from mpd/.config/systemd/user/mpdas.service
rename to system/etc/systemd/system/mpdas.service