General cleanup and flake update

modules/hm/bspwm.nix

@@ -14,6 +14,22 @@ let
   strPalette = pkgs.lib.nix-rice.palette.toRGBHex pkgs.rice.colorPalette;
 in
 {
+  imports = [
+    ./picom.nix
+    ./polybar.nix
+    ./sxhkd.nix
+    ./update_background.nix
+  ];
+
+  home.packages = builtins.attrValues {
+    inherit (pkgs)
+      arandr
+      blueman
+      dmenu
+      keyboard-switch
+      ;
+  };
+
   xsession.windowManager.bspwm = {
     enable = true;
     settings = {
@@ -46,5 +62,4 @@ in
     network-manager-applet.enable = true;
     blueman-applet.enable = true;
   };
-  home.packages = [ pkgs.blueman ];
 }