diff --git a/lappy/builds/utils/pimsync b/lappy/builds/utils/pimsync
index 7b6c335..d2d1c5d 100755
--- a/lappy/builds/utils/pimsync
+++ b/lappy/builds/utils/pimsync
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-mkdir -p ~/Mail/main
+mkdir -p ~/pim/mail/main
 mbsync -c ~/.config/isync/config main
 
 vdirsyncer sync
diff --git a/lappy/config/isync/config b/lappy/config/isync/config
index 16994ab..5309255 100644
--- a/lappy/config/isync/config
+++ b/lappy/config/isync/config
@@ -7,8 +7,8 @@ SSLType IMAPS
 CertificateFile /etc/ssl/certs/ca-certificates.crt
 
 MaildirStore main-local
-Path ~/Mail/main/
-Inbox ~/Mail/main/INBOX
+Path ~/pim/mail/main/
+Inbox ~/pim/mail/main/INBOX
 Subfolders Verbatim
 
 Channel main
diff --git a/lappy/config/khal/config b/lappy/config/khal/config
index 12abda8..50d0648 100644
--- a/lappy/config/khal/config
+++ b/lappy/config/khal/config
@@ -1,18 +1,18 @@
 [calendars]
 [[home]]
-path = "~/vdir/calendar/personal/edfbeaf1-e9f3-4d94-a512-40cdafdbc7a0"
+path = "~/pim/calendar/personal/edfbeaf1-e9f3-4d94-a512-40cdafdbc7a0"
 color = dark green
 
 [[band]]
-path = "~/vdir/calendar/band"
+path = "~/pim/calendar/band"
 color = light cyan
 
 [[pco]]
-path = "~/vdir/calendar/pco"
+path = "~/pim/calendar/pco"
 color = yellow
 
 [[school]]
-path = "~/vdir/calendar/school"
+path = "~/pim/calendar/school"
 color = dark red
 
 [locale]
diff --git a/lappy/config/khard/khard.conf b/lappy/config/khard/khard.conf
index 4e57eb3..8d0b5d1 100644
--- a/lappy/config/khard/khard.conf
+++ b/lappy/config/khard/khard.conf
@@ -1,6 +1,6 @@
 [addressbooks]
 [[main]]
-path = ~/vdir/people/main/20cda0dd-5922-4905-8956-859c989a6519
+path = ~/pim/people/main/20cda0dd-5922-4905-8956-859c989a6519
 [general]
 default_action = list
 editor = nvim
diff --git a/lappy/config/neomutt/neomuttrc b/lappy/config/neomutt/neomuttrc
index d76cc68..7b3c0d2 100644
--- a/lappy/config/neomutt/neomuttrc
+++ b/lappy/config/neomutt/neomuttrc
@@ -4,7 +4,7 @@ set my_name = "Ryan Marina"
 set fast_reply
 
 set mbox_type = Maildir
-set folder = "~/Mail/main"
+set folder = "~/pim/mail/main"
 
 set sidebar_visible
 set sidebar_format = "%B%<F? [%F}>%* %<N?%N/>%S"
diff --git a/lappy/config/vdirsyncer/config b/lappy/config/vdirsyncer/config
index 51efbab..574506f 100644
--- a/lappy/config/vdirsyncer/config
+++ b/lappy/config/vdirsyncer/config
@@ -1,5 +1,5 @@
 [general]
-status_path = "~/vdir/status"
+status_path = "~/pim/status"
 
 [pair contacts]
 a = "contacts_local"
@@ -28,27 +28,27 @@ collections = null
 
 [storage contacts_local]
 type = "filesystem"
-path = "~/vdir/people/main"
+path = "~/pim/people/main"
 fileext = ".vcf"
 
 [storage calendar_local]
 type = "filesystem"
-path = "~/vdir/calendar/personal"
+path = "~/pim/calendar/personal"
 fileext = ".ics"
 
 [storage band_calendar_local]
 type = "filesystem"
-path = "~/vdir/calendar/band"
+path = "~/pim/calendar/band"
 fileext = ".ics"
 
 [storage pco_local]
 type = "filesystem"
-path = "~/vdir/calendar/pco"
+path = "~/pim/calendar/pco"
 fileext = ".ics"
 
 [storage school_local]
 type = "filesystem"
-path = "~/vdir/calendar/school"
+path = "~/pim/calendar/school"
 fileext = ".ics"
 
 [storage contacts_remote]
diff --git a/lappy/configuration.nix b/lappy/configuration.nix
index 3deac70..d2ebad5 100644
--- a/lappy/configuration.nix
+++ b/lappy/configuration.nix
@@ -16,6 +16,7 @@
   networking = {
     hostName = "aristotle";
     networkmanager.enable = true;
+    firewall.allowedTCPPorts = [ 24800 ];
   };
   hardware = {
     pulseaudio.enable = true;
@@ -89,5 +90,7 @@
     tlp.enable = true;
   };
 
+  powerManagement.powertop.enable = true;
+
   system.stateVersion = "24.05";
 }