diff --git a/common/home-manager.nix b/common/home-manager.nix
index 008e3ec..947d881 100644
--- a/common/home-manager.nix
+++ b/common/home-manager.nix
@@ -81,6 +81,7 @@
       home-manager.enable = true;
       mbsync.enable = true;
       password-store.enable = true;
+      msmtp.enable = true;
 
       bash = {
         enable = true;
@@ -88,17 +89,8 @@
           source ${pkgs.fetchurl { url = "https://raw.githubusercontent.com/rupa/z/v1.11/z.sh"; sha256 = "f24e0791ba10f6a8301461da3fc50333eee2e009a19e5d0e9f3661f0d0446767"; }}
         '';
       };
-
-      notmuch = {
-        enable = true;
-        hooks = {
-          preNew = "mbsync --all";
-        };
-      };
     };
 
-    services.keybase.enable = true;
-
     accounts.email.accounts.Personal = {
       primary = true;
 
@@ -119,7 +111,7 @@
         create = "maildir";
       };
 
-      notmuch.enable = true;
+      msmtp.enable = true;
     };
   };
 }
diff --git a/common/home-manager/home.nix b/common/home-manager/home.nix
index 2bd068d..0164168 100644
--- a/common/home-manager/home.nix
+++ b/common/home-manager/home.nix
@@ -10,6 +10,7 @@
       # Programming
       bacon
       drone-cli
+      ghidra
       sublime-merge
       tig
       vscode-fhs
@@ -30,17 +31,21 @@
       mpv
       spotify
 
+      # Gaming
+      pcsxr
+      mednafen
+      mednaffe
+      polymc
+
       # System Tools
       borgbackup
       fd
-      gnome.gnome-tweaks
-      gnomeExtensions.openweather
       htop
       iotop
       killall
       lsof
-      p7zip
       pika-backup
+      powertop
       s-tui
       screen
       silver-searcher
@@ -48,11 +53,18 @@
       sysstat
       tmux
       tree
-      unrar
-      unzip
+      usbutils
       virt-manager
       vulkan-tools
       wl-clipboard
+
+      gnome.gnome-tweaks
+      gnomeExtensions.openweather
+
+      libarchive
+      p7zip
+      unrar
+      unzip
       zip
     ];
 
@@ -80,8 +92,9 @@
 
       ga = "git add";
       gc = "git commit";
-      gcl = "git clone";
       gcm = "git commit -m";
+      gcan = "git commit --amend --no-edit";
+      gcl = "git clone";
       gl = "git pull";
       gla = "git pull --autostash";
       gp = "git push";