From e3d49f53289a2f0fbd9f6182487b5ee598ff0309 Mon Sep 17 00:00:00 2001 From: Evan Reichard Date: Sun, 6 Apr 2025 23:51:09 -0400 Subject: [PATCH] more --- .../graphical/wms/hyprland/config/hyprland.conf | 16 +++++++++++++--- .../programs/graphical/wms/hyprland/default.nix | 5 +++++ 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/modules/home/programs/graphical/wms/hyprland/config/hyprland.conf b/modules/home/programs/graphical/wms/hyprland/config/hyprland.conf index 7355184..53005b9 100755 --- a/modules/home/programs/graphical/wms/hyprland/config/hyprland.conf +++ b/modules/home/programs/graphical/wms/hyprland/config/hyprland.conf @@ -27,7 +27,9 @@ $menu = wofi --show drun # exec-once = $terminal # exec-once = nm-applet & -exec-once = uwsm app -- waybar & uwsm app -- $terminal & uwsm app -- firefox +exec-once = uwsm app -- waybar +exec-once = uwsm app -- $terminal +exec-once = uwsm app -- firefox ############################# @@ -193,8 +195,12 @@ gestures { # See https://wiki.hyprland.org/Configuring/Keywords/ $mainMod = SUPER # Sets "Windows" key as main modifier +bind = $mainMod_ALT, 1, exec, hyprshot -m output +bind = $mainMod_ALT, 2, exec, hyprshot -m window +bind = $mainMod_ALT, 3, exec, hyprshot -m region + # Example binds, see https://wiki.hyprland.org/Configuring/Binds/ for more -bind = $mainMod, Q, exec, $terminal +bind = $mainMod, RETURN, exec, $terminal bind = $mainMod, W, killactive, bind = $mainMod, M, exit, bind = $mainMod, E, exec, $fileManager @@ -245,7 +251,7 @@ bind = $mainMod, mouse_up, workspace, e-1 bindm = $mainMod, mouse:272, movewindow bindm = $mainMod, mouse:273, resizewindow -# Laptop multimedia keys for volume and LCD brightness +# Generic Laptop Multimedia Keys for Volume and LCD brightness bindel = ,XF86AudioRaiseVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+ bindel = ,XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%- bindel = ,XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle @@ -253,6 +259,10 @@ bindel = ,XF86AudioMicMute, exec, wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle bindel = ,XF86MonBrightnessUp, exec, brightnessctl s 10%+ bindel = ,XF86MonBrightnessDown, exec, brightnessctl s 10%- +# macOS Keyboard Brightness +bindel = ALT, XF86MonBrightnessUp, exec, brightnessctl -d kbd_backlight s 10%+ +bindel = ALT, XF86MonBrightnessDown, exec, brightnessctl -d kbd_backlight s 10%- + # Requires playerctl bindl = , XF86AudioNext, exec, playerctl next bindl = , XF86AudioPause, exec, playerctl play-pause diff --git a/modules/home/programs/graphical/wms/hyprland/default.nix b/modules/home/programs/graphical/wms/hyprland/default.nix index 2d17186..b6caf60 100755 --- a/modules/home/programs/graphical/wms/hyprland/default.nix +++ b/modules/home/programs/graphical/wms/hyprland/default.nix @@ -1,6 +1,8 @@ { lib, pkgs, config, namespace, ... }: let inherit (lib) mkIf; + inherit (lib.${namespace}) enabled; + cfg = config.${namespace}.programs.graphical.wms.hyprland; in { @@ -9,6 +11,9 @@ in }; config = mkIf cfg.enable { + services.swaync = enabled; + services.hyprpaper = enabled; + wayland.windowManager.hyprland = { enable = true; extraConfig = builtins.readFile ./config/hyprland.conf;