re-enable powertop, fix reboot on hibernate

3 files changed, 14 insertions, 4 deletions

diff --git a/hosts/myrtle/configuration.nix b/hosts/myrtle/configuration.nix
index 7986e9c..ff64e80 100644
--- a/hosts/myrtle/configuration.nix
+++ b/hosts/myrtle/configuration.nix
@@ -4,6 +4,7 @@
   imports =
     [
       ./hardware-configuration.nix
+      ../../services/suspend.nix
     ];
 
   boot.loader.systemd-boot.enable = true;
@@ -124,7 +125,16 @@
     HandlePowerKeyLongPress=poweroff
   '';
 
-  powerManagement.powertop.enable = false;
+  powerManagement.powertop.enable = true;
+  services.batteryNotifier = {
+    enable = true;
+    notifyCapacity = 20;
+    suspendCapacity = 5;
+  };
+
+  systemd.sleep.extraConfig = ''
+    HibernateMode=shutdown
+  '';
 
   users.users.np = {
     isNormalUser = true;
diff --git a/programs/default.nix b/programs/default.nix
index 2b12888..e28838b 100644
--- a/programs/default.nix
+++ b/programs/default.nix
@@ -23,13 +23,13 @@
   programs = {
     msmtp.enable = true;
     home-manager.enable = true;
-    mbsync.enable = true;
+    # mbsync.enable = true;
     direnv = {
       enable = true;
       enableBashIntegration = true;
       nix-direnv.enable = true;
     };
-    autojump = {
+    zoxide = {
       enable = true;
       enableBashIntegration = true;
     };
diff --git a/services/default.nix b/services/default.nix
index dda2992..4e51e62 100644
--- a/services/default.nix
+++ b/services/default.nix
@@ -11,7 +11,7 @@
     # ./picom.nix
     ./redshift.nix
     ./sxhkd.nix
-    ./mbsync.nix
+    # ./bsync.nix
   ];
 
   services = {