diff --git a/home/home.nix b/home/home.nix
index c70ec2a..bdc6502 100644
--- a/home/home.nix
+++ b/home/home.nix
@@ -5,15 +5,15 @@
 
   home = {
     packages = with pkgs; [
-      eza
+      #eza
       just
-      fd
-      fzf
-      bat
+      #fd
+      #fzf
+      #bat
       jq
       yt-dlp
-      htop
-      ripgrep
+      #htop
+      # ripgrep
       erdtree
       age
       figlet
@@ -25,7 +25,7 @@
       zip
       htop
       owl
-      pass
+      #pass
       dconf
       gnupg
       gcc
@@ -66,9 +66,9 @@
       platformio-core
       borgmatic
       kanata-with-cmd
-      wezterm 
+      #wezterm
       lazygit
-      nnn
+      #nnn
       icloudpd
       jetbrains-mono
       libheif
@@ -85,7 +85,7 @@
       via
       bitwarden-cli
       bitwarden-desktop
-      rbw
+      # rbw
       tailscale
       protonplus
 
@@ -106,6 +106,7 @@
       graphite-cursors
       papers
       newsflash
+      planify
 
       wineWowPackages.stagingFull
       wineWowPackages.fonts
@@ -213,6 +214,51 @@
         epkgs.vterm
       ];
     };
+    rbw = {
+      enable = true;
+      settings = {
+        email = "matt@emenel.ca";
+        lock_timeout = 999999999;
+        pinentry = pkgs.gcr;
+      };
+    };
+    ripgrep = {
+      enable = true;
+    };
+    thefuck = {
+      enable = true;
+      enableFishIntegration = true;
+    };
+    wezterm = {
+      enable = true;
+    };
+    bat = {
+      enable = true;
+    };
+    borgmatic = {
+      enable = true;
+    };
+    eza = {
+      enable = true;
+      enableFishIntegration = true;
+    };
+    fd = {
+      enable = true;
+    };
+    fzf = {
+      enable = true;
+      enableFishIntegration = true;
+    };
+    git = {
+      enable = true;
+      lfs.enable = true;
+    };
+    htop.enable = true;
+    nnn = {
+      enable = true;
+    };
+    pandoc.enable = true;
+    password-store.enable = true;
   };
 
   dconf.settings = {
@@ -285,6 +331,7 @@
     "com.github.johnfactotum.QuickLookup"
     "com.heroicgameslauncher.hgl"
     "io.github.dyegoaurelio.simple-wireplumber-gui"
+    "io.github.dgsasha.Remembrance"
   ];
 
   home.file.".npmrc".source = ../dotfiles/dot_npmrc;
diff --git a/system/eddie/configuration.nix b/system/eddie/configuration.nix
index c5dc770..581ee28 100644
--- a/system/eddie/configuration.nix
+++ b/system/eddie/configuration.nix
@@ -217,6 +217,8 @@
     tlp
   ];
 
+  services.dbus.implementation = "broker";
+
   #programs.gnupg.enable = true;
   programs.git.enable = true;
 
@@ -267,27 +269,7 @@
   };
 
   powerManagement.enable = true;
-  services.power-profiles-daemon.enable = false;
-  services.tlp = {
-    enable = true;
-    settings = {
-      CPU_SCALING_GOVERNOR_ON_AC = "performance";
-      CPU_SCALING_GOVERNOR_ON_BAT = "powersave";
-
-      CPU_ENERGY_PERF_POLICY_ON_BAT = "power";
-      CPU_ENERGY_PERF_POLICY_ON_AC = "performance";
-
-      CPU_MIN_PERF_ON_AC = 0;
-      CPU_MAX_PERF_ON_AC = 100;
-      CPU_MIN_PERF_ON_BAT = 0;
-      CPU_MAX_PERF_ON_BAT = 20;
-
-      #Optional helps save long term battery health
-      START_CHARGE_THRESH_BAT0 = 40; # 40 and bellow it starts to charge
-      STOP_CHARGE_THRESH_BAT0 = 80; # 80 and above it stops charging
-
-    };
-  };
+  services.power-profiles-daemon.enable = true;
   # powerManagement.powertop.enable = true;
   # services.thermald.enable = true;