Overhaul configurations

7 files changed, 4 insertions, 28 deletions

diff --git a/nixos/.config/systemd/user/default.target.wants/mbsync-legacy.timer b/nixos/.config/systemd/user/default.target.wants/mbsync-legacy.timer
deleted file mode 120000
index d6a74a0..0000000
--- a/nixos/.config/systemd/user/default.target.wants/mbsync-legacy.timer
+++ /dev/null
@@ -1 +0,0 @@
-/home/sea/.config/systemd/user/mbsync-legacy.timer
\ No newline at end of file
diff --git a/nixos/.config/systemd/user/default.target.wants/mbsync-primary.timer b/nixos/.config/systemd/user/default.target.wants/mbsync-primary.timer
deleted file mode 120000
index fdf6883..0000000
--- a/nixos/.config/systemd/user/default.target.wants/mbsync-primary.timer
+++ /dev/null
@@ -1 +0,0 @@
-/home/sea/.config/systemd/user/mbsync-primary.timer
\ No newline at end of file
diff --git a/nixos/.config/systemd/user/default.target.wants/mbsync.timer b/nixos/.config/systemd/user/default.target.wants/mbsync.timer
new file mode 120000
index 0000000..6842d01
--- /dev/null
+++ b/nixos/.config/systemd/user/default.target.wants/mbsync.timer
@@ -0,0 +1 @@
+/home/sea/.config/systemd/user/mbsync.timer
\ No newline at end of file
diff --git a/nixos/.config/systemd/user/mbsync-legacy.service b/nixos/.config/systemd/user/mbsync-legacy.service
deleted file mode 100644
index e0954de..0000000
--- a/nixos/.config/systemd/user/mbsync-legacy.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=Synchronize IMAP and MailDir for legacy account
-Documentation=man:mbsync(1)
-ConditionPathExists=%h/.mbsyncrc
-After=network.target
-
-[Service]
-ExecStart=/usr/bin/mbsync legacy
-Type=oneshot
-
-[Install]
-WantedBy=default.target
diff --git a/nixos/.config/systemd/user/mbsync-primary.timer b/nixos/.config/systemd/user/mbsync-primary.timer
deleted file mode 100644
index a0f4151..0000000
--- a/nixos/.config/systemd/user/mbsync-primary.timer
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=Timer for primary accound mbsync
-ConditionPathExists=%h/.mbsyncrc
-After=network.target
-
-[Timer]
-OnBootSec=1m
-OnUnitInactiveSec=1m
-
-[Install]
-WantedBy=default.target
diff --git a/nixos/.config/systemd/user/mbsync-primary.service b/nixos/.config/systemd/user/mbsync.service
index 8ce0e6f..55b05b0 100644
--- a/nixos/.config/systemd/user/mbsync-primary.service
+++ b/nixos/.config/systemd/user/mbsync.service
@@ -1,11 +1,11 @@
 [Unit]
-Description=Synchronize IMAP and MailDir for primary account
+Description=Synchronize IMAP and MailDir
 Documentation=man:mbsync(1)
 ConditionPathExists=%h/.mbsyncrc
 After=network.target
 
 [Service]
-ExecStart=/usr/bin/mbsync primary
+ExecStart=/run/current-system/sw/bin/mbsync primary legacy
 Type=oneshot
 
 [Install]
diff --git a/nixos/.config/systemd/user/mbsync-legacy.timer b/nixos/.config/systemd/user/mbsync.timer
index 3ea535a..d2c980f 100644
--- a/nixos/.config/systemd/user/mbsync-legacy.timer
+++ b/nixos/.config/systemd/user/mbsync.timer
@@ -1,5 +1,5 @@
 [Unit]
-Description=Timer for legacy accound mbsync
+Description=Timer for mbsync
 ConditionPathExists=%h/.mbsyncrc
 After=network.target