From f756c287a901d89d89dd65392fde1457b06d9245 Mon Sep 17 00:00:00 2001 From: nydragon Date: Thu, 20 Mar 2025 20:46:10 +0100 Subject: [PATCH] feat: add hyprland grouping keybinds --- home/hyprland/default.nix | 41 +++++++++++------- modules/nix/overlays.nix | 2 +- {home => modules}/scripts/default.nix | 60 +++++++++++++++++++-------- {home => modules}/scripts/list.nix | 0 {home => modules}/scripts/logo.fish | 0 users/ny/default.nix | 1 + 6 files changed, 70 insertions(+), 34 deletions(-) rename {home => modules}/scripts/default.nix (76%) rename {home => modules}/scripts/list.nix (100%) rename {home => modules}/scripts/logo.fish (100%) diff --git a/home/hyprland/default.nix b/home/hyprland/default.nix index 5fcbd9e..5be3ac5 100644 --- a/home/hyprland/default.nix +++ b/home/hyprland/default.nix @@ -49,13 +49,14 @@ mkIf osConfig.programs.hyprland.enable { "col.active_border" = "rgba(33ccffee) rgba(00ff99ee) 45deg"; "col.inactive_border" = "rgba(595959aa)"; - # Set to true enable resizing windows by clicking and dragging on borders and gaps - resize_on_border = false; - # Please see https://wiki.hyprland.org/Configuring/Tearing/ before you turn this on allow_tearing = false; - + hover_icon_on_border = true; + resize_on_border = true; layout = "dwindle"; + snap = { + enabled = true; + }; }; input = { @@ -144,6 +145,15 @@ mkIf osConfig.programs.hyprland.enable { gestures = { workspace_swipe = true; }; + group = { + + "col.border_active" = "0xff601393"; + + groupbar = { + "col.active" = "0x66601393"; + "col.inactive" = "0xff340851"; + }; + }; # https://wiki.hyprland.org/Configuring/Variables/#misc misc = { force_default_wallpaper = 0; @@ -179,7 +189,8 @@ mkIf osConfig.programs.hyprland.enable { "$mod, right, movefocus, r" "$mod, up, movefocus, u" "$mod, down, movefocus, d" - + "CTRL, G, togglegroup" + "ALT, Tab, changegroupactive" # Example special workspace (scratchpad) "$mod, W, togglespecialworkspace, magic" "$mod SHIFT, W, movetoworkspace, special:magic" @@ -190,16 +201,16 @@ mkIf osConfig.programs.hyprland.enable { "$mod, S, exec, ${cliphist} list | ${desktop.runner.dmenu} | ${cliphist} decode | ${copy}" #: Brightness and Media {{{ - ",XF86MonBrightnessUp, exec, ${pkgs.brightnessctl}/bin/brightnessctl s +10%" - ",XF86MonBrightnessDown, exec, ${pkgs.brightnessctl}/bin/brightnessctl s 10%-" - ",XF86AudioRaiseVolume, exec, ${getExe pkgs.pamixer} -u && ${pkgs.pamixer}/bin/pamixer -i 5" - ",XF86AudioLowerVolume, exec, ${getExe pkgs.pamixer} -u && ${pkgs.pamixer}/bin/pamixer -d 5" - ",XF86AudioMicMute, exec, ${pkgs.pamixer}/bin/pamixer --default-source -m" - ",XF86AudioMute, exec, ${pkgs.pamixer}/bin/pamixer -t" - ",XF86AudioPlay, exec, ${pkgs.playerctl}/bin/playerctl play-pause" - ",XF86AudioPause, exec, ${pkgs.playerctl}/bin/playerctl play-pause" - ",XF86AudioNext, exec, ${pkgs.playerctl}/bin/playerctl next" - ",XF86AudioPrev, exec, ${pkgs.playerctl}/bin/playerctl previous" + ",XF86MonBrightnessUp, exec, ${getExe pkgs.brightnessctl} s +10%" + ",XF86MonBrightnessDown, exec, ${getExe pkgs.brightnessctl} s 10%-" + ",XF86AudioRaiseVolume, exec, ${getExe pkgs.pamixer} -u && ${getExe pkgs.pamixer} -i 5" + ",XF86AudioLowerVolume, exec, ${getExe pkgs.pamixer} -u && ${getExe pkgs.pamixer} -d 5" + ",XF86AudioMicMute, exec, ${getExe pkgs.pamixer} --default-source -m" + ",XF86AudioMute, exec, ${getExe pkgs.pamixer} -t" + ",XF86AudioPlay, exec, ${getExe pkgs.playerctl} play-pause" + ",XF86AudioPause, exec, ${getExe pkgs.playerctl} play-pause" + ",XF86AudioNext, exec, ${getExe pkgs.playerctl} next" + ",XF86AudioPrev, exec, ${getExe pkgs.playerctl} previous" #: }}} # Workspaces diff --git a/modules/nix/overlays.nix b/modules/nix/overlays.nix index e2ecb8f..420343f 100644 --- a/modules/nix/overlays.nix +++ b/modules/nix/overlays.nix @@ -7,7 +7,7 @@ { nixpkgs.overlays = [ (final: prev: { - scripts = import ../../home/scripts { + scripts = import ../scripts { inherit lib config; pkgs = prev.pkgs; }; diff --git a/home/scripts/default.nix b/modules/scripts/default.nix similarity index 76% rename from home/scripts/default.nix rename to modules/scripts/default.nix index 6815637..95fea17 100644 --- a/home/scripts/default.nix +++ b/modules/scripts/default.nix @@ -7,7 +7,9 @@ let inherit (pkgs.writers) writeFishBin writeBashBin; inherit (lib.my) getExe; + runner = config.modules.system.roles.desktop.runner; + nixos-rebuild = name: word: writeFishBin name '' @@ -18,24 +20,47 @@ let ''; in { - screenshot = - with pkgs; - writeShellApplication { - name = "screenshot"; - runtimeInputs = [ - slurp - wl-clipboard - libnotify - ]; - text = '' - location="$HOME/Pictures/Screenshots/$(date +%Y-%m-%d-%H%M%S)-screenshot.png"; + screenshot = pkgs.writeShellApplication { + name = "screenshot"; + runtimeInputs = with pkgs; [ + wl-clipboard + libnotify + hyprshot + xdg-utils + ]; + text = '' + set -e + location="$XDG_PICTURES_DIR/screenshots/$(date +%Y-%m-%d-%H%M%S)-screenshot.png"; - if zone=$(slurp); then - grim -t png -g "$zone" - | wl-copy --type image/png && wl-paste > "$location" \ - && notify-send --app-name Screenshot -i "$location" --urgency=low "Screenshot copied to clipboard" "Screenshot created at $location"; - fi - ''; - }; + hyprshot -r -z -m region | tee "$location" | wl-copy --type image/png; + + body="" + + response=$( + notify-send \ + "Copied to clipboard" \ + "$body" \ + --app-name Screenshot \ + -i "$location" \ + --urgency=low \ + --action=COPY=Copy \ + --action=OPEN=Open \ + --action=DELETE=Delete + ) + + case "$response" in + "DELETE") + rm "$location" + ;; + "COPY") + wl-copy <"$location" + ;; + "OPEN") + xdg-open "$location" + ;; + esac + ''; + }; set-background = writeFishBin "set-background" '' argparse 'f/file=!test -e "$_flag_value"' -- $argv; or return @@ -122,5 +147,4 @@ in Lock) exec loginctl lock-session "$${XDG_SESSION_ID-}" ;; esac ''; - } diff --git a/home/scripts/list.nix b/modules/scripts/list.nix similarity index 100% rename from home/scripts/list.nix rename to modules/scripts/list.nix diff --git a/home/scripts/logo.fish b/modules/scripts/logo.fish similarity index 100% rename from home/scripts/logo.fish rename to modules/scripts/logo.fish diff --git a/users/ny/default.nix b/users/ny/default.nix index 0e1615d..187789e 100644 --- a/users/ny/default.nix +++ b/users/ny/default.nix @@ -71,5 +71,6 @@ in scripts.editsym scripts.deployswitch scripts.deploytest + scripts.screenshot ]); }