From 53d5169d111e11acea9894a58d9848feb21d6dd5 Mon Sep 17 00:00:00 2001 From: KoenDR06 Date: Mon, 10 Mar 2025 16:36:07 +0100 Subject: [PATCH] more hyprland --- config/dotfiles/.config/kitty/kitty.conf | 1 + modules/wm/hyprland/config/eww/eww.scss | 2 +- modules/wm/hyprland/config/eww/eww.yuck | 24 +++--- modules/wm/hyprland/config/hypr/hyprland.conf | 77 +------------------ modules/wm/hyprland/config/hypr/keybinds.conf | 55 +++++++++++++ modules/wm/hyprland/config/hypr/monitors.conf | 4 +- modules/wm/hyprland/default.nix | 1 + 7 files changed, 75 insertions(+), 89 deletions(-) create mode 100644 modules/wm/hyprland/config/hypr/keybinds.conf diff --git a/config/dotfiles/.config/kitty/kitty.conf b/config/dotfiles/.config/kitty/kitty.conf index 8b193eb..0775729 100644 --- a/config/dotfiles/.config/kitty/kitty.conf +++ b/config/dotfiles/.config/kitty/kitty.conf @@ -3,3 +3,4 @@ initial_window_width 80c initial_window_height 24c enable_audio_bell no +confirm_os_window_close 0 diff --git a/modules/wm/hyprland/config/eww/eww.scss b/modules/wm/hyprland/config/eww/eww.scss index bd06590..c9662ab 100644 --- a/modules/wm/hyprland/config/eww/eww.scss +++ b/modules/wm/hyprland/config/eww/eww.scss @@ -6,7 +6,7 @@ $accent-color: rgba(0, 255, 0, 1); $font-size: 2.5rem; * { - margin: 1.25rem; + margin: 0.25rem; } window { diff --git a/modules/wm/hyprland/config/eww/eww.yuck b/modules/wm/hyprland/config/eww/eww.yuck index a525fcc..b4857da 100644 --- a/modules/wm/hyprland/config/eww/eww.yuck +++ b/modules/wm/hyprland/config/eww/eww.yuck @@ -8,7 +8,14 @@ :stacking "fg" :exclusive false :focusable false - (workspaces) + (topbar) +) + +(defwidget topbar [] + (box :class "topbar" + (clock) + (workspaces) + ) ) (defwidget clock [] @@ -19,15 +26,10 @@ (defwidget workspaces [] (box :class "workspaces" - (button :class "workspace-button") - (button :class "workspace-button") - (button :class "workspace-button") - (button :class "workspace-button") - (button :class "workspace-button") - (button :class "workspace-button") - (button :class "workspace-button") - (button :class "workspace-button") - (button :class "workspace-button") - (button :class "workspace-button") + (button :class "workspace-button" "◇") + (button :class "workspace-button" "◆") + (button :class "workspace-button" "◇") + (button :class "workspace-button" "◇") + (button :class "workspace-button" "◇") ) ) diff --git a/modules/wm/hyprland/config/hypr/hyprland.conf b/modules/wm/hyprland/config/hypr/hyprland.conf index 38e517a..b23b069 100644 --- a/modules/wm/hyprland/config/hypr/hyprland.conf +++ b/modules/wm/hyprland/config/hypr/hyprland.conf @@ -1,4 +1,5 @@ source = ./monitors.conf +source = ./keybinds.conf $terminal = kitty $fileManager = dolphin @@ -148,7 +149,7 @@ input { kb_rules = repeat_rate = 50 - repeat_delay = 500 + repeat_delay = 300 follow_mouse = 1 @@ -171,80 +172,6 @@ device { sensitivity = -0.5 } - -################### -### KEYBINDINGS ### -################### - -# See https://wiki.hyprland.org/Configuring/Keywords/ -$mainMod = SUPER # Sets "Windows" key as main modifier - -# Example binds, see https://wiki.hyprland.org/Configuring/Binds/ for more -bind = $mainMod, Q, exec, $terminal -bind = $mainMod, C, killactive, -bind = $mainMod, M, exit, -bind = $mainMod, E, exec, $fileManager -bind = $mainMod, V, togglefloating, -bind = $mainMod, R, exec, $menu -bind = $mainMod, P, pseudo, # dwindle -bind = $mainMod, J, togglesplit, # dwindle - -# Move focus with mainMod + arrow keys -bind = $mainMod, left, movefocus, l -bind = $mainMod, right, movefocus, r -bind = $mainMod, up, movefocus, u -bind = $mainMod, down, movefocus, d - -# Switch workspaces with mainMod + [0-9] -bind = $mainMod, 1, workspace, 1 -bind = $mainMod, 2, workspace, 2 -bind = $mainMod, 3, workspace, 3 -bind = $mainMod, 4, workspace, 4 -bind = $mainMod, 5, workspace, 5 -bind = $mainMod, 6, workspace, 6 -bind = $mainMod, 7, workspace, 7 -bind = $mainMod, 8, workspace, 8 -bind = $mainMod, 9, workspace, 9 -bind = $mainMod, 0, workspace, 10 - -# Move active window to a workspace with mainMod + SHIFT + [0-9] -bind = $mainMod SHIFT, 1, movetoworkspace, 1 -bind = $mainMod SHIFT, 2, movetoworkspace, 2 -bind = $mainMod SHIFT, 3, movetoworkspace, 3 -bind = $mainMod SHIFT, 4, movetoworkspace, 4 -bind = $mainMod SHIFT, 5, movetoworkspace, 5 -bind = $mainMod SHIFT, 6, movetoworkspace, 6 -bind = $mainMod SHIFT, 7, movetoworkspace, 7 -bind = $mainMod SHIFT, 8, movetoworkspace, 8 -bind = $mainMod SHIFT, 9, movetoworkspace, 9 -bind = $mainMod SHIFT, 0, movetoworkspace, 10 - -# Example special workspace (scratchpad) -bind = $mainMod, S, togglespecialworkspace, magic -bind = $mainMod SHIFT, S, movetoworkspace, special:magic - -# Scroll through existing workspaces with mainMod + scroll -bind = $mainMod, mouse_down, workspace, e+1 -bind = $mainMod, mouse_up, workspace, e-1 - -# Move/resize windows with mainMod + LMB/RMB and dragging -bindm = $mainMod, mouse:272, movewindow -bindm = $mainMod, mouse:273, resizewindow - -# 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 -bindel = ,XF86AudioMicMute, exec, wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle -bindel = ,XF86MonBrightnessUp, exec, brightnessctl s 10%+ -bindel = ,XF86MonBrightnessDown, exec, brightnessctl s 10%- - -# Requires playerctl -bindl = , XF86AudioNext, exec, playerctl next -bindl = , XF86AudioPause, exec, playerctl play-pause -bindl = , XF86AudioPlay, exec, playerctl play-pause -bindl = , XF86AudioPrev, exec, playerctl previous - ############################## ### WINDOWS AND WORKSPACES ### ############################## diff --git a/modules/wm/hyprland/config/hypr/keybinds.conf b/modules/wm/hyprland/config/hypr/keybinds.conf new file mode 100644 index 0000000..923c04d --- /dev/null +++ b/modules/wm/hyprland/config/hypr/keybinds.conf @@ -0,0 +1,55 @@ +$mainMod = SUPER +$terminal = kitty +$launcher = wofi --show drun + +bind = ALT, SPACE, exec, $launcher + +bind = ALT, Q, exec, $terminal + +bind = ALT, F4, killactive +bind = CONTROL, Q, killactive + +bind = $mainMod, H, movefocus, l +bind = $mainMod, L, movefocus, r +bind = $mainMod, K, movefocus, u +bind = $mainMod, J, movefocus, d + +bind = $mainMod, 1, workspace, 1 +bind = $mainMod, 2, workspace, 2 +bind = $mainMod, 3, workspace, 3 +bind = $mainMod, 4, workspace, 4 +bind = $mainMod, 5, workspace, 5 +bind = $mainMod, 6, workspace, 6 +bind = $mainMod, 7, workspace, 7 +bind = $mainMod, 8, workspace, 8 +bind = $mainMod, 9, workspace, 9 +bind = $mainMod, 0, workspace, 10 + +bind = $mainMod SHIFT, 1, movetoworkspace, 1 +bind = $mainMod SHIFT, 2, movetoworkspace, 2 +bind = $mainMod SHIFT, 3, movetoworkspace, 3 +bind = $mainMod SHIFT, 4, movetoworkspace, 4 +bind = $mainMod SHIFT, 5, movetoworkspace, 5 +bind = $mainMod SHIFT, 6, movetoworkspace, 6 +bind = $mainMod SHIFT, 7, movetoworkspace, 7 +bind = $mainMod SHIFT, 8, movetoworkspace, 8 +bind = $mainMod SHIFT, 9, movetoworkspace, 9 +bind = $mainMod SHIFT, 0, movetoworkspace, 10 + +bind = CONTROL&$mainMod, right, workspace, e+1 +bind = CONTROL&$mainMod, left, workspace, e-1 + +# 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 = SHIFT,XF86AudioRaiseVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 1%+ +bindel = SHIFT,XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 1%- +bindel = ,XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle +bindel = ,XF86AudioMicMute, exec, wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle +bindel = ,XF86MonBrightnessUp, exec, brightnessctl s 10%+ +bindel = ,XF86MonBrightnessDown, exec, brightnessctl s 10%- + +bindl = , XF86AudioNext, exec, playerctl next +bindl = , XF86AudioPause, exec, playerctl play-pause +bindl = , XF86AudioPlay, exec, playerctl play-pause +bindl = , XF86AudioPrev, exec, playerctl previous diff --git a/modules/wm/hyprland/config/hypr/monitors.conf b/modules/wm/hyprland/config/hypr/monitors.conf index 3969ff1..11c4a26 100644 --- a/modules/wm/hyprland/config/hypr/monitors.conf +++ b/modules/wm/hyprland/config/hypr/monitors.conf @@ -2,8 +2,8 @@ monitor = eDP-1, 1920x1080@60, 0x0, 1 # terra monitors -monitor = DP-1, 2560x1440, 0x0, 1 -monitor = DP-2, 2560x1440, 2560x0, 1 +monitor = DP-1, 2560x1440@165, 0x0, 1 +monitor = DP-2, 2560x1440@165, 2560x0, 1 # default monitor config monitor=,preferred,auto,auto diff --git a/modules/wm/hyprland/default.nix b/modules/wm/hyprland/default.nix index 9b8c059..42315ed 100644 --- a/modules/wm/hyprland/default.nix +++ b/modules/wm/hyprland/default.nix @@ -28,6 +28,7 @@ in { networkmanagerapplet wofi xdg-desktop-portal-hyprland + playerctl ]; services.logind.extraConfig = ''