From 158d39bb6e4ffdc3903535c4c9fcd1e9dc8cd260 Mon Sep 17 00:00:00 2001
From: Bruno BELANYI <bruno@belanyi.fr>
Date: Fri, 15 Oct 2021 17:01:40 +0200
Subject: [PATCH 1/5] pkgs: sort packages alphabetically

---
 pkgs/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/default.nix b/pkgs/default.nix
index a420a7e9..c5992470 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -22,11 +22,11 @@ pkgs.lib.makeScope pkgs.newScope (pkgs: {
 
   nolimips = pkgs.callPackage ./nolimips { };
 
-  vimix-cursors = pkgs.callPackage ./vimix-cursors { };
-
-  volantes-cursors = pkgs.callPackage ./volantes-cursors { };
-
   unbound-zones-adblock = pkgs.callPackage ./unbound-zones-adblock { };
 
   unified-hosts-lists = pkgs.callPackage ./unified-hosts-lists { };
+
+  vimix-cursors = pkgs.callPackage ./vimix-cursors { };
+
+  volantes-cursors = pkgs.callPackage ./volantes-cursors { };
 })

From 296833651a6adfe5928486a1654a242d710a2005 Mon Sep 17 00:00:00 2001
From: Bruno BELANYI <bruno@belanyi.fr>
Date: Fri, 15 Oct 2021 17:09:03 +0200
Subject: [PATCH 2/5] pkgs: add rofi-bluetooth

---
 pkgs/default.nix                |  2 ++
 pkgs/rofi-bluetooth/default.nix | 40 +++++++++++++++++++++++++++++++++
 2 files changed, 42 insertions(+)
 create mode 100644 pkgs/rofi-bluetooth/default.nix

diff --git a/pkgs/default.nix b/pkgs/default.nix
index c5992470..46fa4abc 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -22,6 +22,8 @@ pkgs.lib.makeScope pkgs.newScope (pkgs: {
 
   nolimips = pkgs.callPackage ./nolimips { };
 
+  rofi-bluetooth = pkgs.callPackage ./rofi-bluetooth { };
+
   unbound-zones-adblock = pkgs.callPackage ./unbound-zones-adblock { };
 
   unified-hosts-lists = pkgs.callPackage ./unified-hosts-lists { };
diff --git a/pkgs/rofi-bluetooth/default.nix b/pkgs/rofi-bluetooth/default.nix
new file mode 100644
index 00000000..2ff40a18
--- /dev/null
+++ b/pkgs/rofi-bluetooth/default.nix
@@ -0,0 +1,40 @@
+{ lib, bluez, fetchFromGitHub, makeWrapper, rofi, stdenvNoCC }:
+stdenvNoCC.mkDerivation rec {
+  pname = "rofi-bluetooth";
+  version = "unstable-2021-10-15";
+
+  src = fetchFromGitHub {
+    owner = "nickclyde";
+    repo = "rofi-bluetooth";
+    rev = "893db1f2b549e7bc0e9c62e7670314349a29cdf2";
+    sha256 = "sha256-3oROJKEQCuSnLfbJ+JSSc9hcmJTPrLHRQJsrUcaOMss=";
+  };
+
+  buildInputs = [
+    makeWrapper
+  ];
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp $src/rofi-bluetooth $out/bin/
+    chmod a+x $out/bin/rofi-bluetooth
+  '';
+
+  wrapperPath = lib.makeBinPath [
+    rofi
+    bluez
+  ];
+
+  fixupPhase = ''
+    patchShebangs $out/bin/${pname}
+    wrapProgram $out/bin/${pname} --prefix PATH : "${wrapperPath}"
+  '';
+
+  meta = with lib; {
+    description = "A rofi menu for managing bluetooth connections";
+    homepage = "https://github.com/nickclyde/rofi-bluetooth/commit/";
+    license = with licenses; [ gpl3Only ];
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ ambroisie ];
+  };
+}

From 9117df1e721ee7037ae6bc5f630319c561a08485 Mon Sep 17 00:00:00 2001
From: Bruno BELANYI <bruno@belanyi.fr>
Date: Fri, 15 Oct 2021 17:12:20 +0200
Subject: [PATCH 3/5] home: wm: i3: don't add 'dragger' through profile

---
 home/wm/i3/default.nix  | 1 +
 profiles/wm/default.nix | 6 ------
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/home/wm/i3/default.nix b/home/wm/i3/default.nix
index 2a99958e..a0b63be0 100644
--- a/home/wm/i3/default.nix
+++ b/home/wm/i3/default.nix
@@ -70,6 +70,7 @@ in
 {
   config = lib.mkIf isEnabled {
     home.packages = with pkgs; [
+      ambroisie.dragger # drag-and-drop from the CLI
       ambroisie.i3-get-window-criteria # little helper for i3 configuration
       arandr # Used by a mapping
       pamixer # Used by a mapping
diff --git a/profiles/wm/default.nix b/profiles/wm/default.nix
index 1eeb7a80..bf9d3f98 100644
--- a/profiles/wm/default.nix
+++ b/profiles/wm/default.nix
@@ -23,11 +23,5 @@ in
       # Auto disk mounter
       my.home.udiskie.enable = true;
     })
-
-    (lib.mkIf (cfg.windowManager != null) {
-      environment.systemPackages = with pkgs; [
-        ambroisie.dragger
-      ];
-    })
   ];
 }

From 8a8256e55569a1b23bc07fce7fcc55707788e076 Mon Sep 17 00:00:00 2001
From: Bruno BELANYI <bruno@belanyi.fr>
Date: Fri, 15 Oct 2021 17:13:02 +0200
Subject: [PATCH 4/5] home: tmux: add binding for block selection

---
 home/tmux/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/home/tmux/default.nix b/home/tmux/default.nix
index 0a8a355f..c9ccf164 100644
--- a/home/tmux/default.nix
+++ b/home/tmux/default.nix
@@ -46,6 +46,8 @@ in
       # Better vim mode
       bind-key -T copy-mode-vi 'v' send -X begin-selection
       bind-key -T copy-mode-vi 'y' send -X copy-selection-and-cancel
+      # Block selection in vim mode
+      bind-key -Tcopy-mode-vi 'C-v' send -X begin-selection \; send -X rectangle-toggle
     '';
   };
 

From 537fa5c909216ba27cfa89e5c645a90142286ea9 Mon Sep 17 00:00:00 2001
From: Bruno BELANYI <bruno@belanyi.fr>
Date: Fri, 15 Oct 2021 17:19:12 +0200
Subject: [PATCH 5/5] home: wm: i3: add 'rofi-bluetooth' binding

---
 home/wm/i3/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/home/wm/i3/default.nix b/home/wm/i3/default.nix
index a0b63be0..94cec6d2 100644
--- a/home/wm/i3/default.nix
+++ b/home/wm/i3/default.nix
@@ -198,6 +198,12 @@ in
             "${modifier}+Shift+d" = "exec rofi -show run -disable-history";
             "${modifier}+p" = "exec --no-startup-id flameshot gui";
             "${modifier}+Shift+p" = "exec rofi -show emoji";
+            "${modifier}+b" =
+              let
+                inherit (config.my.home.bluetooth) enable;
+                prog = "${pkgs.ambroisie.rofi-bluetooth}/bin/rofi-bluetooth";
+              in
+              lib.mkIf enable "exec ${prog}";
           })
           (
             # Changing container focus