From 32346c405f8255530b2ec390860ca57f7029e2ab Mon Sep 17 00:00:00 2001
From: Arpit Chakladar <arpitchakladar@gmail.com>
Date: Wed, 16 Sep 2026 18:49:32 +0530
Subject: chore: changed font, cleaned up niri keybindings

Using a non-lingatures font. Using the in-built screenshot freature of niri,
and some other refactorings
---
 modules/desktop/niri/keybindings.nix | 67 +++++++++++++++---------------------
 modules/fonts/default.nix            |  4 +--
 2 files changed, 29 insertions(+), 42 deletions(-)

diff --git a/modules/desktop/niri/keybindings.nix b/modules/desktop/niri/keybindings.nix
index a1ae567..e8513f8 100644
--- a/modules/desktop/niri/keybindings.nix
+++ b/modules/desktop/niri/keybindings.nix
@@ -69,25 +69,7 @@ in
       _props.repeat = false;
       close-window = { };
     };
-  }
-  // workspaceBinds
-  // (lib.optionalAttrs config.desktop.enable {
-    "Mod+D" = {
-      _props.hotkey-overlay-title = "Run an Application: rofi";
-      spawn = [
-        (lib.getExe config.desktop.rofi.package)
-        "-show"
-        "drun"
-      ];
-    };
-  })
-  // (lib.optionalAttrs config.terminal.kitty.enable {
-    "Mod+Return" = {
-      _props.hotkey-overlay-title = "Open a Terminal: kitty";
-      spawn = [ (lib.getExe config.terminal.kitty.package) ];
-    };
-  })
-  // {
+
     # Column-aware directional navigation.
     "Mod+H".focus-column-left = { };
     "Mod+L".focus-column-right = { };
@@ -114,9 +96,25 @@ in
     "Mod+Ctrl+U".move-column-to-workspace-down = { };
     "Mod+Ctrl+I".move-column-to-workspace-up = { };
     "Mod+W".toggle-column-tabbed-display = { };
-  }
-  // (lib.optionalAttrs config.system.brightnessctl.enable {
-    "XF86MonBrightnessDown" = {
+
+    # Screenshots
+    "Mod+P".screenshot = { };
+    "Mod+Shift+P".screenshot-screen = { };
+
+    # Externel commnads
+    "Mod+D" = {
+      _props.hotkey-overlay-title = "Run an Application: rofi";
+      spawn = [
+        (lib.getExe config.desktop.rofi.package)
+        "-show"
+        "drun"
+      ];
+    };
+    "Mod+Return" = lib.mkIf config.terminal.kitty.enable {
+      _props.hotkey-overlay-title = "Open a Terminal: kitty";
+      spawn = [ (lib.getExe config.terminal.kitty.package) ];
+    };
+    "XF86MonBrightnessDown" = lib.mkIf config.system.brightnessctl.enable {
       _props.allow-when-locked = true;
       spawn = [
         (lib.getExe config.system.brightnessctl.package)
@@ -124,7 +122,7 @@ in
         "5%-"
       ];
     };
-    "XF86MonBrightnessUp" = {
+    "XF86MonBrightnessUp" = lib.mkIf config.system.brightnessctl.enable {
       _props.allow-when-locked = true;
       spawn = [
         (lib.getExe config.system.brightnessctl.package)
@@ -132,9 +130,7 @@ in
         "+5%"
       ];
     };
-  })
-  // (lib.optionalAttrs config.media.pamixer.enable {
-    "XF86AudioLowerVolume" = {
+    "XF86AudioLowerVolume" = lib.mkIf config.media.pamixer.enable {
       _props.allow-when-locked = true;
       spawn = [
         (lib.getExe config.media.pamixer.package)
@@ -142,7 +138,7 @@ in
         "5"
       ];
     };
-    "XF86AudioRaiseVolume" = {
+    "XF86AudioRaiseVolume" = lib.mkIf config.media.pamixer.enable {
       _props.allow-when-locked = true;
       spawn = [
         (lib.getExe config.media.pamixer.package)
@@ -150,29 +146,20 @@ in
         "5"
       ];
     };
-    "XF86AudioMute" = {
+    "XF86AudioMute" = lib.mkIf config.media.pamixer.enable {
       _props.allow-when-locked = true;
       spawn = [
         (lib.getExe config.media.pamixer.package)
         "--toggle-mute"
       ];
     };
-  })
-  // (lib.optionalAttrs config.media.playerctl.enable {
-    "XF86AudioPlay" = {
+    "XF86AudioPlay" = lib.mkIf config.media.playerctl.enable {
       _props.allow-when-locked = true;
       spawn = [
         (lib.getExe config.media.playerctl.package)
         "play-pause"
       ];
     };
-  })
-  // (lib.optionalAttrs (config.media.grim.enable && config.media.slurp.enable) {
-    "Mod+P".spawn-sh = [
-      "${lib.getExe config.media.grim.package} -g \"$(${lib.getExe config.media.slurp.package})\" - | ${lib.getExe' config.desktop.wl-clipboard.package "wl-copy"}"
-    ];
-    "Mod+Shift+P".spawn-sh = [
-      ''mkdir -p "$HOME/Pictures/Screenshots" && ${lib.getExe config.media.grim.package} -g "$(${lib.getExe config.media.slurp.package})" "$HOME/Pictures/Screenshots/screenshot-$(date +%Y%m%d-%H%M%S).png"''
-    ];
-  });
+  }
+  // workspaceBinds;
 }
diff --git a/modules/fonts/default.nix b/modules/fonts/default.nix
index c7a3ec0..2e2baf1 100644
--- a/modules/fonts/default.nix
+++ b/modules/fonts/default.nix
@@ -62,10 +62,10 @@
   };
 
   config = {
-    fonts.normal = lib.mkDefault "Fira Code Nerd Font";
+    fonts.normal = lib.mkDefault "FiraMono Nerd Font";
 
     home.packages = [
-      pkgs.nerd-fonts.fira-code
+      pkgs.nerd-fonts.fira-mono
     ];
   };
 }
-- 
cgit v1.2.3