From 30ff2dbda30a04e56947ac43e7326657cf43c565 Mon Sep 17 00:00:00 2001 From: Benjamin Palko Date: Fri, 11 Jul 2025 14:02:35 -0400 Subject: [PATCH] organize hyprland configs --- hypr/config/environments/nvidia.conf | 24 ------- hypr/config/keybinds.conf | 80 --------------------- hypr/config/rules.conf | 39 ---------- hypr/config/startup.conf | 21 ------ hypr/hyprland.conf | 71 ++---------------- hypr/hyprland/animations.conf | 14 ++++ hypr/hyprland/colours.conf | 7 ++ hypr/hyprland/decorations.conf | 19 +++++ hypr/hyprland/env.conf | 19 +++++ hypr/hyprland/execs.conf | 7 +- hypr/{ => hyprland}/scripts/run-ags.sh | 0 hypr/{ => hyprland}/scripts/start-swaync.sh | 0 hypr/scripts/start-waybar.sh | 12 ---- 13 files changed, 68 insertions(+), 245 deletions(-) delete mode 100644 hypr/config/environments/nvidia.conf delete mode 100644 hypr/config/keybinds.conf delete mode 100644 hypr/config/rules.conf delete mode 100644 hypr/config/startup.conf create mode 100644 hypr/hyprland/animations.conf create mode 100644 hypr/hyprland/colours.conf create mode 100644 hypr/hyprland/decorations.conf rename hypr/{ => hyprland}/scripts/run-ags.sh (100%) rename hypr/{ => hyprland}/scripts/start-swaync.sh (100%) delete mode 100755 hypr/scripts/start-waybar.sh diff --git a/hypr/config/environments/nvidia.conf b/hypr/config/environments/nvidia.conf deleted file mode 100644 index 926b9e1..0000000 --- a/hypr/config/environments/nvidia.conf +++ /dev/null @@ -1,24 +0,0 @@ -# ----------------------------------------------------- -# Environment Variables -# name: "Nvidia" -# ----------------------------------------------------- - -# https://wiki.hyprland.org/Nvidia/ - -env = LIBVA_DRIVER_NAME,nvidia -env = __GLX_VENDOR_LIBRARY_NAME,nvidia - -env = NVD_BACKEND,direct - -env = ELECTRON_OZONE_PLATFORM_HINT,auto - -env = XDG_SESSION_TYPE,wayland -env = GBM_BACKEND,nvidia-drm -cursor { - no_hardware_cursors = true -} -env = XCURSOR_SIZE,24 -env = QT_QPA_PLATFORM,wayland -env = WLR_NO_HARDWARE_CURSORS,1 -env = __GL_VRR_ALLOWED,1 -env = WLR_DRM_NO_ATOMIC,1 diff --git a/hypr/config/keybinds.conf b/hypr/config/keybinds.conf deleted file mode 100644 index 48fef57..0000000 --- a/hypr/config/keybinds.conf +++ /dev/null @@ -1,80 +0,0 @@ - -# Example binds, see https://wiki.hyprland.org/Configuring/Binds/ for more -bind = $mainMod, T, exec, $terminal -bind = $mainMod, X, killactive, -bind = $mainMod, ESCAPE, exec, $powerMenu -bind = $mainMod, E, exec, $fileManager -bind = $mainMod, F, togglefloating, -bind = $mainMod, R, exec, $menu -bind = $mainMod, P, pseudo, # dwindle -bind = $mainMod, V, togglesplit, # dwindle -bind = $mainMod, L, exec, $lockScreen # hyprlock -bind = $mainMod, period, exec, emote -bind = $mainMod, B, exec, zen-browser -bind = $mainMod CTRL, F, fullscreen -bind = , PRINT, exec, grim -g "$(slurp)" - | swappy -f - - -# 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 - -############################################################################### -# Special workspaces -############################################################################### -# Scratchpad -bind = CTRL SHIFT, S, togglespecialworkspace, magic -bind = CTRL $mainMod, S, movetoworkspace, special:magic - -# Terminal -bind = CTRL SHIFT, T, togglespecialworkspace, terminal - -# Music -bind = CTRL SHIFT, M, togglespecialworkspace, music - -# Scroll through existing workspaces with mainMod + scroll -bind = $mainMod, mouse_down, workspace, e+1 -bind = $mainMod, mouse_up, workspace, e-1 - -# Switch workspaces -bind = CTRL ALT, right, workspace, e+1 -bind = CTRL ALT, left, workspace, e-1 - -# Move/resize windows with mainMod + LMB/RMB and dragging -bindm = $mainMod, mouse:272, movewindow -bindm = $mainMod, mouse:273, resizewindow - -# Audio keybinds -bind = , XF86AudioRaiseVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 2%+ -bind = , XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 2%- -bind = , XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle -bind = , XF86AudioPlay, exec, playerctl play-pause -bind = , XF86AudioStop, exec, -bind = , XF86AudioPrev, exec, playerctl previous -bind = , XF86AudioNext, exec, playerctl next - diff --git a/hypr/config/rules.conf b/hypr/config/rules.conf deleted file mode 100644 index a7c7c68..0000000 --- a/hypr/config/rules.conf +++ /dev/null @@ -1,39 +0,0 @@ - -# Example windowrule v1 -# windowrule = float, ^(kitty)$ -# Example windowrule v2 -# windowrulev2 = float,class:^(kitty)$,title:^(kitty)$ -# See https://wiki.hyprland.org/Configuring/Window-Rules/ for more -windowrulev2 = nomaxsize, class:.* # You'll probably like this. -# windowrulev2 = opacity 1 0.6, class:.* - - -# Apps - -windowrule = float, title:rofi - -# windowrule = workspace special:terminal, kitty -windowrule = workspace special:music, initialClass:Spotify -windowrule = opacity 0.85 0.8, initialClass:Spotify - -windowrule = workspace:1, class:thunderbird - -windowrule = workspace 2,class:(discord) - -windowrule = workspace 2,class:(signal) -windowrule = opacity:0.999, class:signal - -windowrule = workspace:3, class:firefox -windowrule = opacity:0.999, class:firefox - -windowrule = workspace 5,float,class:(steam) -windowrule = workspace 5, class:^(steam_app_*)$ - -windowrule = float, class:org.gnome.Calculator - -# Workspaces -workspace = 1, persistent:true -workspace = 2, persistent:true -workspace = 3, persistent:true -workspace = 4, persistent:true - diff --git a/hypr/config/startup.conf b/hypr/config/startup.conf deleted file mode 100644 index cf57e24..0000000 --- a/hypr/config/startup.conf +++ /dev/null @@ -1,21 +0,0 @@ -# Notification Daemon -exec-once = bash ~/.config/hypr/scripts/start-swaync.sh -# Idle Daemon -exec-once = hypridle -# Status-bar -# exec-once = bash ~/.config/hypr/scripts/start-waybar.sh -exec-once = bash ~/dotfiles/hypr/scripts/run-ags.sh -# Emotes -exec-once = emote -# Wallpaper Daemon -exec-once = swww-daemon - -exec-once = [workspace 1 silent] thunderbird -exec-once = [workspace 1 silent] proton-mail --password-store="gnome-libsecret" -exec-once = [workspace 2 silent] discord --enable-features=UseOzonePlatform --ozone-platform=wayland -exec-once = [workspace 2 silent] signal-desktop --password-store="gnome-libsecret" -exec-once = [workspace 3 silent] zen-browser -exec-once = [workspace 4 silent] kitty -exec-once = [workspace special:terminal silent] kitty -exec-once = [workspace special:music silent] deezer --enable-features=UseOzonePlatform --ozone-platform=wayland - diff --git a/hypr/hyprland.conf b/hypr/hyprland.conf index 5075ba6..c9147c7 100644 --- a/hypr/hyprland.conf +++ b/hypr/hyprland.conf @@ -7,16 +7,7 @@ monitor=DP-1,2560x1440@144,auto,auto # Laptop monitor=eDP-1,1920x1080@60,auto,1.20 -# Execute your favorite apps at launch -# exec-once = waybar & hyprpaper & firefox - -# PyWal Colors -source = ~/.cache/wal/colors-hyprland.conf - -# Source a file (multi-file configs) -# source = ~/.config/hypr/myColors.conf - -# Set programs that you use +# Programs $terminal = kitty $fileManager = Thunar $menu = ~/.config/rofi/scripts/launcher_t1 @@ -26,28 +17,11 @@ $lockScreen = hyprlock # See https://wiki.hyprland.org/Configuring/Keywords/ for more $mainMod = SUPER -exec-once=hyprctl setcursor volantes_cursors 24 -# Themes -env = GTK_THEME,WhiteSur-Dark -env = ICON_THEME,WhiteSur-Dark -env = COLOR_SCHEME,prefer-dark - -#Cursors -env = XCURSOR_THEME,Catppuccin-Macchiato-Dark -env = XCURSOR_SIZE,24 -env = HYPRCURSOR_THEME,Catppuccin-Macchiato-Dark -env = HYPRCURSOR_SIZE,24 - - -# Fonts -env = FONT_NAME,JetBrainsMono Nerd Font 24 -env = DOCUMENT_FONT_NAME,Cantarell 24 -env = MONOSPACE_FONT_NAME,JetBrainsMono Nerd Font 5 -env = FONT_ANTIALIASING,rgba -env = FONT_HINTING,full - $hypr = ~/.config/hypr/hyprland +source = $hypr/animations.conf +source = $hypr/colours.conf +source = $hypr/decorations.conf source = $hypr/env.conf source = $hypr/execs.conf source = $hypr/keybinds.conf @@ -76,8 +50,6 @@ general { gaps_in = 10 gaps_out = 10 border_size = 3 - col.active_border = $color4 $color13 45deg - col.inactive_border = $color0 layout = dwindle @@ -85,41 +57,6 @@ general { allow_tearing = true } -decoration { - # See https://wiki.hyprland.org/Configuring/Variables/ for more - - rounding = 10 - - blur { - enabled = true - size = 3 - passes = 1 - ignore_opacity = true - } - - shadow { - enabled = true - range = 4 - render_power = 3 - color = rgba(1a1a1aee) - } -} - -animations { - enabled = yes - - # Some default animations, see https://wiki.hyprland.org/Configuring/Animations/ for more - - bezier = myBezier, 0.05, 0.9, 0.1, 1.05 - - animation = windows, 1, 7, myBezier - animation = windowsOut, 1, 7, default, popin 80% - animation = border, 1, 10, default - animation = borderangle, 1, 8, default - animation = fade, 1, 7, default - animation = workspaces, 1, 6, default -} - dwindle { # See https://wiki.hyprland.org/Configuring/Dwindle-Layout/ for more pseudotile = yes # master switch for pseudotiling. Enabling is bound to mainMod + P in the keybinds section below diff --git a/hypr/hyprland/animations.conf b/hypr/hyprland/animations.conf new file mode 100644 index 0000000..83444b5 --- /dev/null +++ b/hypr/hyprland/animations.conf @@ -0,0 +1,14 @@ +animations { + enabled = yes + + # Some default animations, see https://wiki.hyprland.org/Configuring/Animations/ for more + + bezier = myBezier, 0.05, 0.9, 0.1, 1.05 + + animation = windows, 1, 7, myBezier + animation = windowsOut, 1, 7, default, popin 80% + animation = border, 1, 10, default + animation = borderangle, 1, 8, default + animation = fade, 1, 7, default + animation = workspaces, 1, 6, default +} diff --git a/hypr/hyprland/colours.conf b/hypr/hyprland/colours.conf new file mode 100644 index 0000000..caa84ef --- /dev/null +++ b/hypr/hyprland/colours.conf @@ -0,0 +1,7 @@ +# PyWal Colors +source = ~/.cache/wal/colors-hyprland.conf + +general { + col.active_border = $color4 $color13 45deg + col.inactive_border = $color0 +} diff --git a/hypr/hyprland/decorations.conf b/hypr/hyprland/decorations.conf new file mode 100644 index 0000000..0c9b896 --- /dev/null +++ b/hypr/hyprland/decorations.conf @@ -0,0 +1,19 @@ +decoration { + # See https://wiki.hyprland.org/Configuring/Variables/ for more + + rounding = 6 + + blur { + enabled = true + size = 4 + passes = 1 + ignore_opacity = true + } + + shadow { + enabled = true + range = 4 + render_power = 3 + color = rgba(1a1a1aee) + } +} diff --git a/hypr/hyprland/env.conf b/hypr/hyprland/env.conf index 926b9e1..b2cda83 100644 --- a/hypr/hyprland/env.conf +++ b/hypr/hyprland/env.conf @@ -22,3 +22,22 @@ env = QT_QPA_PLATFORM,wayland env = WLR_NO_HARDWARE_CURSORS,1 env = __GL_VRR_ALLOWED,1 env = WLR_DRM_NO_ATOMIC,1 + +# Themes +env = GTK_THEME,WhiteSur-Dark +env = ICON_THEME,WhiteSur-Dark +env = COLOR_SCHEME,prefer-dark + +#Cursors +env = XCURSOR_THEME,Catppuccin-Macchiato-Dark +env = XCURSOR_SIZE,24 +env = HYPRCURSOR_THEME,Catppuccin-Macchiato-Dark +env = HYPRCURSOR_SIZE,24 + + +# Fonts +env = FONT_NAME,JetBrainsMono Nerd Font 24 +env = DOCUMENT_FONT_NAME,Cantarell 24 +env = MONOSPACE_FONT_NAME,JetBrainsMono Nerd Font 5 +env = FONT_ANTIALIASING,rgba +env = FONT_HINTING,full diff --git a/hypr/hyprland/execs.conf b/hypr/hyprland/execs.conf index cf57e24..34abb96 100644 --- a/hypr/hyprland/execs.conf +++ b/hypr/hyprland/execs.conf @@ -1,10 +1,13 @@ +# Set cursor +exec-once=hyprctl setcursor volantes_cursors 24 + # Notification Daemon -exec-once = bash ~/.config/hypr/scripts/start-swaync.sh +exec-once = bash ~/.config/hypr/hyprland/scripts/start-swaync.sh # Idle Daemon exec-once = hypridle # Status-bar # exec-once = bash ~/.config/hypr/scripts/start-waybar.sh -exec-once = bash ~/dotfiles/hypr/scripts/run-ags.sh +exec-once = bash ~/dotfiles/hypr/hyprland/scripts/run-ags.sh # Emotes exec-once = emote # Wallpaper Daemon diff --git a/hypr/scripts/run-ags.sh b/hypr/hyprland/scripts/run-ags.sh similarity index 100% rename from hypr/scripts/run-ags.sh rename to hypr/hyprland/scripts/run-ags.sh diff --git a/hypr/scripts/start-swaync.sh b/hypr/hyprland/scripts/start-swaync.sh similarity index 100% rename from hypr/scripts/start-swaync.sh rename to hypr/hyprland/scripts/start-swaync.sh diff --git a/hypr/scripts/start-waybar.sh b/hypr/scripts/start-waybar.sh deleted file mode 100755 index da4e38b..0000000 --- a/hypr/scripts/start-waybar.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh - -CONFIG_FILES="$HOME/.config/waybar/ $HOME/.cache/wal/" - -trap "killall waybar" EXIT - -while true; do - sleep 1.6 - waybar & - inotifywait -e create,modify -r $CONFIG_FILES - killall waybar -done