6 files changed, 101 insertions, 15 deletions

diff --git a/home.nix b/home.nix
index f946df1..9880d42 100644
--- a/home.nix
+++ b/home.nix
@@ -30,7 +30,6 @@
     xclip
     ripgrep
     miniserve
-    rnix-lsp
     pfetch
     st
     cmus
@@ -54,7 +53,6 @@
 
     # gaming
     mgba
-    yuzu
 
     # sync
     rtorrent
@@ -87,7 +85,6 @@
     # input
     xinput_calibrator
     libinput
-    talon
 
     # meta
     nixpkgs-review
diff --git a/hosts/myrtle/configuration.nix b/hosts/myrtle/configuration.nix
index dd45d3b..afec6b7 100644
--- a/hosts/myrtle/configuration.nix
+++ b/hosts/myrtle/configuration.nix
@@ -71,16 +71,6 @@
 
       xdotool
     ];
-    etc = {
-      "wireplumber/bluetooth.lua.d/51-bluez-config.lua".text = ''
-        bluez_monitor.properties = {
-            ["bluez5.enable-sbc-xq"] = true,
-            ["bluez5.enable-msbc"] = true,
-            ["bluez5.enable-hw-volume"] = true,
-            ["bluez5.headset-roles"] = "[ hsp_hs hsp_ag hfp_hf hfp_ag ]"
-        }
-      '';
-    };
   };
 
 
@@ -183,6 +173,16 @@
       alsa.enable = true;
       alsa.support32Bit = true;
       pulse.enable = true;
+      wireplumber.configPackages = [
+        (pkgs.writeTextDir "share/wireplumber/bluetooth.lua.d/51-bluez-config.lua" ''
+            bluez_monitor.properties = {
+          ["bluez5.enable-sbc-xq"] = true,
+          ["bluez5.enable-msbc"] = true,
+          ["bluez5.enable-hw-volume"] = true,
+          ["bluez5.headset-roles"] = "[ hsp_hs hsp_ag hfp_hf hfp_ag ]"
+            }
+        '')
+      ];
     };
 
     signald = {
diff --git a/programs/bash.nix b/programs/bash.nix
index e2b825a..7d3c25e 100644
--- a/programs/bash.nix
+++ b/programs/bash.nix
@@ -30,7 +30,8 @@
       gb = "git branch -v";
       gc = "git commit --verbose";
       gd = "git diff --minimal";
-      ggp = "git push";
+      gp = "git push";
+      gpf = "git push --force-with-lease";
       gl = "git log -p --abbrev-commit --pretty=medium";
       glo = "git log --pretty=oneline --abbrev-commit";
       gst = "git status --short";
diff --git a/scripts/default.nix b/scripts/default.nix
index 616be1c..c7a485c 100644
--- a/scripts/default.nix
+++ b/scripts/default.nix
@@ -39,6 +39,9 @@ let
   # run-on-gpu script
   nvidia-offload = import ./nvidia-offload.nix pkgs;
 
+  # move window to next monitor
+  m2m = import ./monitor-to-monitor.nix pkgs;
+
   # fzf script to switch between tmux sessions
   tmux-fzf = pkgs.writeScriptBin "tmux-fzf" ''
     LIST_DATA="#{session_name}/#{window_name}/#{pane_current_command} @ #{pane_current_path}"
@@ -67,6 +70,8 @@ let
     ${pkgs.xorg.xinput}/bin/xinput set-prop "${stylus}" --type=float "Coordinate Transformation Matrix" ${landscape-transform}
   '';
 
+
+
 in
 [
   webcam
@@ -79,4 +84,5 @@ in
   portrait
   landscape
   nvidia-offload
+  m2m
 ]
diff --git a/scripts/monitor-to-monitor.nix b/scripts/monitor-to-monitor.nix
new file mode 100644
index 0000000..fa03916
--- /dev/null
+++ b/scripts/monitor-to-monitor.nix
@@ -0,0 +1,82 @@
+{ pkgs, ... }:
+
+let
+  name = "m2m";
+in
+pkgs.writeShellScriptBin name ''
+  #
+  # Move the current window to the next monitor.
+  #
+  # Also works only on one X screen (which is the most common case).
+  #
+  # Props to
+  # http://icyrock.com/blog/2012/05/xubuntu-moving-windows-between-monitors/
+  #
+  # Unfortunately, both "xdotool getwindowgeometry --shell $window_id" and
+  # checking "-geometry" of "xwininfo -id $window_id" are not sufficient, as
+  # the first command does not respect panel/decoration offsets and the second
+  # will sometimes give a "-0-0" geometry. This is why we resort to "xwininfo".
+
+  screen_width=$(xdpyinfo | awk '/dimensions:/ { print $2; exit }' | cut -d"x" -f1)
+  screen_height=$(xdpyinfo | awk '/dimensions:/ { print $2; exit }' | cut -d"x" -f2)
+  display_width=$(xdotool getdisplaygeometry | cut -d" " -f1)
+  display_height=$(xdotool getdisplaygeometry | cut -d" " -f2)
+  window_id=$(xdotool getactivewindow)
+
+  # Remember if it was maximized.
+  window_horz_maxed=$(xprop -id "$window_id" _NET_WM_STATE | grep '_NET_WM_STATE_MAXIMIZED_HORZ')
+  window_vert_maxed=$(xprop -id "$window_id" _NET_WM_STATE | grep '_NET_WM_STATE_MAXIMIZED_VERT')
+
+  # Un-maximize current window so that we can move it
+  wmctrl -ir "$window_id" -b remove,maximized_vert,maximized_horz
+
+  # Read window position
+  x=$(xwininfo -id "$window_id" | awk '/Absolute upper-left X:/ { print $4 }')
+  y=$(xwininfo -id "$window_id" | awk '/Absolute upper-left Y:/ { print $4 }')
+
+  # Subtract any offsets caused by panels or window decorations
+  x_offset=$(xwininfo -id "$window_id" | awk '/Relative upper-left X:/ { print $4 }')
+  y_offset=$(xwininfo -id "$window_id" | awk '/Relative upper-left Y:/ { print $4 }')
+  x=$(( x - x_offset))
+  y=$(( y - y_offset))
+
+  # Compute new X position
+  new_x=$((x + display_width))
+  # Compute new Y position
+  new_y=$((y + display_height))
+
+  # If we would move off the right-most monitor, we set it to the left one.
+  # We also respect the window's width here: moving a window off more than half its width won't happen.
+  width=$(xdotool getwindowgeometry "$window_id" | awk '/Geometry:/ { print $2 }'|cut -d"x" -f1)
+  if [ "$(( new_x + width / 2))" -gt "$screen_width" ]; then
+      new_x=$((new_x - screen_width))
+  fi
+
+  height=$(xdotool getwindowgeometry "$window_id" | awk '/Geometry:/ { print $2 }'|cut -d"x" -f2)
+  if [ "$((new_y + height / 2))" -gt "$screen_height" ]; then
+      new_y=$((new_y - screen_height))
+  fi
+
+  # Don't move off the left side.
+  if [ "$new_x" -lt 0 ]; then
+      new_x=0
+  fi
+
+  # Don't move off the bottom
+  if [ "$new_y" -lt 0 ]; then
+      new_y=0
+  fi
+
+  # Move the window
+  xdotool windowmove "$window_id" "$new_x" "$new_y"
+
+  # Maximize window again, if it was before
+  if [ -n "''${window_horz_maxed}" ] && [ -n "''${window_vert_maxed}" ]; then
+      wmctrl -ir "$window_id" -b add,maximized_vert,maximized_horz
+  elif [ -n  "''${window_horz_maxed}" ]; then
+      wmctrl -ir "$window_id" -b add,maximized_horz
+  elif [ -n  "''${window_vert_maxed}" ]; then
+      wmctrl -ir "$window_id" -b add,maximized_vert
+  fi
+''
+
diff --git a/services/default.nix b/services/default.nix
index 0a3977d..bef7c85 100644
--- a/services/default.nix
+++ b/services/default.nix
@@ -21,7 +21,7 @@
       enable = true;
       defaultCacheTtl = 60 * 60 * 24 * 7;
       maxCacheTtl = 60 * 60 * 24 * 7;
-      pinentryFlavor = "curses";
+      pinentryPackage = pkgs.pinentry-tty;
     };
   };