From dc0369137bacfc2688c77df9ef65be3506299061 Mon Sep 17 00:00:00 2001 From: Evan Reichard Date: Fri, 17 Jul 2026 07:36:23 -0400 Subject: [PATCH] fix(mba): scale & hyprland kitty --- .../programs/graphical/wms/hyprland/config/hyprland.lua | 7 +++---- modules/home/programs/graphical/wms/hyprland/default.nix | 6 ++++++ modules/nixos/programs/graphical/wms/hyprland/default.nix | 1 + 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/modules/home/programs/graphical/wms/hyprland/config/hyprland.lua b/modules/home/programs/graphical/wms/hyprland/config/hyprland.lua index 288fbbd..d1bec76 100644 --- a/modules/home/programs/graphical/wms/hyprland/config/hyprland.lua +++ b/modules/home/programs/graphical/wms/hyprland/config/hyprland.lua @@ -1,8 +1,7 @@ -- Hyprland config (lua backend, Hyprland 0.55+). --- `mainMod`, `menuMod`, and the monitor(s) are injected by Nix above this file. +-- `mainMod`, `menuMod`, `terminal`, and the monitor(s) are injected by Nix above this file. -- See https://wiki.hypr.land/Configuring/Start/ -local terminal = "ghostty" local menu = "wofi --show drun" ------------------- @@ -11,7 +10,7 @@ local menu = "wofi --show drun" hl.on("hyprland.start", function() hl.exec_cmd("uwsm app -- waybar") - hl.exec_cmd("uwsm app -- " .. terminal) + if terminal then hl.exec_cmd("uwsm app -- " .. terminal) end hl.exec_cmd("uwsm app -- firefox") end) @@ -147,7 +146,7 @@ hl.bind(menuMod .. " + SHIFT + 3", hl.dsp.exec_cmd("hyprshot -m region")) hl.bind(menuMod .. " + Q", hl.dsp.window.close()) -- Primary Bindings -hl.bind(mainMod .. " + RETURN", hl.dsp.exec_cmd(terminal)) +if terminal then hl.bind(mainMod .. " + RETURN", hl.dsp.exec_cmd(terminal)) end hl.bind(mainMod .. " + M", hl.dsp.exec_cmd("uwsm stop")) hl.bind(mainMod .. " + V", hl.dsp.window.float({ action = "toggle" })) hl.bind(mainMod .. " + P", hl.dsp.window.pin()) diff --git a/modules/home/programs/graphical/wms/hyprland/default.nix b/modules/home/programs/graphical/wms/hyprland/default.nix index e357c5a..2454db5 100755 --- a/modules/home/programs/graphical/wms/hyprland/default.nix +++ b/modules/home/programs/graphical/wms/hyprland/default.nix @@ -10,6 +10,11 @@ let inherit (lib.${namespace}) mkOpt enabled; cfg = config.${namespace}.programs.graphical.wms.hyprland; + graphical = config.${namespace}.programs.graphical; + terminal = + if graphical.ghostty.enable then "ghostty" + else if graphical.kitty.enable then "kitty" + else null; in { options.${namespace}.programs.graphical.wms.hyprland = { @@ -41,6 +46,7 @@ in '' local mainMod = "${cfg.mainMod}" local menuMod = "${cfg.menuMod}" + local terminal = ${if terminal == null then "nil" else ''"${terminal}"''} ${lib.concatMapStringsSep "\n" mkMonitor cfg.monitors} '' diff --git a/modules/nixos/programs/graphical/wms/hyprland/default.nix b/modules/nixos/programs/graphical/wms/hyprland/default.nix index a9949e1..2226f94 100644 --- a/modules/nixos/programs/graphical/wms/hyprland/default.nix +++ b/modules/nixos/programs/graphical/wms/hyprland/default.nix @@ -30,6 +30,7 @@ in display-managers = { sddm = { enable = true; + scale = "1.25"; }; }; };