From cbd4278c77b72c45a5b71adcfb3e549cc8fb8ff9 Mon Sep 17 00:00:00 2001
From: Filippo Berto <berto.f@protonmail.com>
Date: Thu, 13 May 2021 00:00:26 +0200
Subject: [PATCH] FZF + better sxhkd

---
 home.nix          |  1 +
 modules/fzf.nix   |  8 ++++++++
 modules/sxhkd.nix | 43 ++++++++++++++++++++++++++++---------------
 3 files changed, 37 insertions(+), 15 deletions(-)
 create mode 100644 modules/fzf.nix

diff --git a/home.nix b/home.nix
index eeaabc2..ed70fe4 100644
--- a/home.nix
+++ b/home.nix
@@ -37,6 +37,7 @@ in {
 		./modules/rofi.nix
 		./modules/sxhkd.nix
 		./modules/terminator.nix
+		./modules/fzf.nix
 	];
 
   programs = {
diff --git a/modules/fzf.nix b/modules/fzf.nix
new file mode 100644
index 0000000..53accd0
--- /dev/null
+++ b/modules/fzf.nix
@@ -0,0 +1,8 @@
+{
+  programs.fzf = {
+		enable = true;
+		tmux.enableShellIntegration = true;
+		enableBashIntegration = true;
+		enableZshIntegration = true;
+  };
+}
diff --git a/modules/sxhkd.nix b/modules/sxhkd.nix
index 787d3be..19a36e7 100644
--- a/modules/sxhkd.nix
+++ b/modules/sxhkd.nix
@@ -1,24 +1,37 @@
 { config, pkgs, lib, ... }:
-let
-  sxhkd = "${pkgs.sxhkd}/bin/sxhkd";
-  bspc = "${pkgs.bspwm}/bin/bspc";
-  xarg = "${pkgs.xarg}/bin/xargs";
-  nautilus = "${pkgs.gnome3.nautilus}/bin/nautilus";
-  pulseaudioCtl = "${pkgs.pulseaudio-ctl}/bin/pulseaudio-ctl";
-  playerctl = "${pkgs.playerctl}/bin/playerctl";
-  alacritty = "${pkgs.alacritty}/bin/alacritty";
-  terminator= "${pkgs.terminator}/bin/terminator";
-  rofi = "${pkgs.rofi}/bin/rofi";
-  bash = "${pkgs.bash}/bin/bash";
-in
-
 {
-	services.sxhkd = {
-    enable = true;
+  home.packages = with pkgs; [
+  	bspwm
+  	findutils
+  	gnome3.nautilus
+  	pulseaudio-ctl
+  	playerctl
+  	alacritty
+  	terminator
+  	rofi
+  	bash
+  	betterlockscreen
+  ];
+
+	services.sxhkd = let
+    sxhkd = "${pkgs.sxhkd}/bin/sxhkd";
+    bspc = "${pkgs.bspwm}/bin/bspc";
+    xarg = "${pkgs.findutils}/bin/xargs";
+    nautilus = "${pkgs.gnome3.nautilus}/bin/nautilus";
+    pulseaudioCtl = "${pkgs.pulseaudio-ctl}/bin/pulseaudio-ctl";
+    playerctl = "${pkgs.playerctl}/bin/playerctl";
+    alacritty = "${pkgs.alacritty}/bin/alacritty";
+    terminator= "${pkgs.terminator}/bin/terminator";
+    rofi = "${pkgs.rofi}/bin/rofi";
+    bash = "${pkgs.bash}/bin/bash";
+    betterlockscreen = "${pkgs.betterlockscreen}/bin/betterlockscreen";
+  in {
+  	enable = true;
     keybindings = {
       "super + Return" = "${bash} -c ${alacritty} || ${terminator}";
       "super + @space" = "${rofi} -show drun";
       "super + e" = "${nautilus} -w";
+      "super + alt + m" = ''${betterlockscreen} -l -t "Welcome back $USER"'';
       "super + Escape" = "pkill -USR1 -x sxhkd";
       "super + alt + {q,r}" = "${bspc} {quit,wm -r}";
       "super + {_,shift + }w" = "${bspc} node -{c,k}";