unify fonts

2 files changed, 4 insertions, 8 deletions

diff --git a/services/dunst.nix b/services/dunst.nix
index 407820f..b0b1e67 100644
--- a/services/dunst.nix
+++ b/services/dunst.nix
@@ -1,6 +1,7 @@
 { config
 , pkgs
 , theme
+, font
 , ...
 }:
 
@@ -10,7 +11,7 @@ with theme;
     enable = true;
     settings = {
       global = {
-        font = "Nerd Input 10";
+        font = "${font.name} 10";
         allow_markup = "no";
         format = ''%s\n%b'';
         sort = "yes";
diff --git a/services/sxhkd.nix b/services/sxhkd.nix
index 3bb3da8..d8678af 100644
--- a/services/sxhkd.nix
+++ b/services/sxhkd.nix
@@ -9,11 +9,6 @@ let
     ''
       ${pkgs.libnotify}/bin/notify-send ${text} -h int:value:${value} -h string:synchronous:volume -h string:hlcolor:"${theme.base0C}"
     '';
-  brightness = pkgs.writeScriptBin "brightness" ''
-    ${pkgs.light}/bin/light $@
-    v=$(${pkgs.light}/bin/light -G)
-    ${progress "brightness" "$v"}
-  '';
   volume = pkgs.writeScriptBin "volume" ''
     ${pkgs.alsaUtils}/bin/amixer $@
     v=$(${pkgs.alsaUtils}/bin/amixer sget Master | ${pkgs.gawk}/bin/awk -F"[][%]" '/Left:/ {print $2}')
@@ -25,8 +20,8 @@ in
   services.sxhkd = {
     enable = true;
     keybindings = {
-      "super + slash" = "${brightness}/bin/brightness -A 2";
-      "super + shift + slash" = "${brightness}/bin/brightness -U 2";
+      "super + slash" = "${pkgs.light}/bin/light -A 2";
+      "super + shift + slash" = "${pkgs.light}/bin/light -U 2";
       "super + semicolon" = "${volume}/bin/volume sset Master 2%+";
       "super + shift + semicolon" = "${volume}/bin/volume sset Master 2%-";
       "super + ctrl  + space" = "${pkgs.dunst}/bin/dunstctl close";