diff --git a/home-manager/all.nix b/home-manager/all.nix
index 6133741..83e1f51 100644
--- a/home-manager/all.nix
+++ b/home-manager/all.nix
@@ -47,13 +47,15 @@
     viAlias = true;
     vimAlias = true;
     extraConfig = ''
-                  syntax enable
-                  set wrap
-                  set linebreak
-                  set number
-                  set relativenumber
-                  set splitbelow
-                  set splitright
+      syntax enable
+      set nowrap
+      set linebreak
+      set number
+      set relativenumber
+      set splitbelow
+      set splitright
+      set tabstop=4
+      set shiftwidth=4
     '';
   };
   programs.lf = {
@@ -68,7 +70,6 @@
     };
   };
   programs.tmux = {
-    enable = true;
     baseIndex = 1;
     clock24 = true;
     keyMode = "vi";
@@ -123,6 +124,7 @@
     '';
     plugins = with pkgs; [
       tmuxPlugins.urlview
+      tmuxPlugins.yank
     ];
     prefix = "C-b";
   };
diff --git a/home-manager/dots/sxhkd/sxhkdrc b/home-manager/dots/sxhkd/sxhkdrc
index 968d865..b34ef65 100644
--- a/home-manager/dots/sxhkd/sxhkdrc
+++ b/home-manager/dots/sxhkd/sxhkdrc
@@ -24,9 +24,9 @@ super + v
 
 # volume controls
 super + shift + comma
-	amixer sset Master 5%- && notify-desktop "Volume is now $(amixer sget Master | awk -F '[][]' '/Right:/ { print $2 }')"
+	notify-desktop "Volume is now $(amixer sset Master 5%- | awk -F '[][]' '/Right:/ \{ print $2 \}')"
 super + shift + period
-	amixer sset Master 5%+ && notify-desktop "Volume is now $(amixer sget Master | awk -F '[][]' '/Right:/ { print $2 }')"
+	notify-desktop "Volume is now $(amixer sset Master 5%+ | awk -F '[][]' '/Right:/ \{ print $2 \}')"
 
 # make sxhkd reload its configuration files:
 super + shift + r
diff --git a/hosts/buckwheat/configuration.nix b/hosts/buckwheat/configuration.nix
index f2ee511..7e72b8b 100644
--- a/hosts/buckwheat/configuration.nix
+++ b/hosts/buckwheat/configuration.nix
@@ -41,8 +41,6 @@ in
   users.users.${user.name} = {
     extraGroups = [ "libvirtd" "transmission" "davfs2" ];
     packages = [
-      pkgs.rss2email
-      pkgs.goeland
     ];
   };
   services = {