From e102a548bac504edad3abddcc17861e888806bd7 Mon Sep 17 00:00:00 2001
From: Filippo Berto <berto.f@protonmail.com>
Date: Wed, 1 Jun 2022 16:19:47 +0200
Subject: [PATCH] Better bspwm focus commands

---
 home_manager/modules/sxhkd.nix | 2 +-
 home_manager/odin.nix          | 1 +
 home_manager/thor.nix          | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/home_manager/modules/sxhkd.nix b/home_manager/modules/sxhkd.nix
index 11c324c..b09b771 100644
--- a/home_manager/modules/sxhkd.nix
+++ b/home_manager/modules/sxhkd.nix
@@ -42,7 +42,7 @@
         "super + {_,shift + } Return" = "{${primaryTerminal} , ${secondaryTerminal}}";
         "super + {_,shift + }{1-9,0}" = "bspc {desktop -f,node -d} 'focused:^{1-9,10}'";
         "super + {_,shift + }c" = "bspc node -f {next,prev}.local";
-        "super + {h,j,k,l}" = "bspc node -f {west,south,north,east}";
+        "super + {h,j,k,l}" = "dir={west,south,north,east}; bspc node -f $dir || bspc monitor -f $dir";
         "super + shift + {h,j,k,l}" = ''dir={west,south,north,east}; bspc node -s "$dir.local" --follow || bspc node -m "$dir" --follow'';
         "super + {_,shift + }w" = "bspc node -{c,k}";
         "super + {_,shift + }@space " = "rofi -show {drun,run}";
diff --git a/home_manager/odin.nix b/home_manager/odin.nix
index 641f6de..55215a3 100644
--- a/home_manager/odin.nix
+++ b/home_manager/odin.nix
@@ -30,6 +30,7 @@
       gnome.file-roller
       gnome.geary
       gnome.gnome-calendar
+      gnome.gnome-font-viewer
       gnome.gnome-screenshot
       # gnome.gnome-sound-recorder
       gnome.gnome-sound-recorder
diff --git a/home_manager/thor.nix b/home_manager/thor.nix
index 9419519..c10ba0f 100644
--- a/home_manager/thor.nix
+++ b/home_manager/thor.nix
@@ -28,6 +28,7 @@
       freecad
       gallery-dl
       gnome.file-roller
+      gnome.gnome-font-viewer
       gnome.geary
       gnome.gnome-calendar
       gnome.gnome-screenshot