diff --git a/alacritty/alacritty.toml b/alacritty/alacritty.toml index a50a519..4b4cc0e 100644 --- a/alacritty/alacritty.toml +++ b/alacritty/alacritty.toml @@ -7,7 +7,7 @@ shape = "Underline" TERM = "xterm-256color" [font] -size = 13 +size = 10 [colors] footer_bar = { foreground = "#181818", background = "#d8d8d8" } @@ -44,6 +44,6 @@ args = ["--login"] program = "/bin/zsh" [window] -opacity = 0.5 -padding = {x = 25, y = 25} +#opacity = 0.5 +padding = {x = 0, y = 0} diff --git a/dunst/dunstrc b/dunst/dunstrc index 225f6af..f5443ca 100644 --- a/dunst/dunstrc +++ b/dunst/dunstrc @@ -448,6 +448,7 @@ foreground = "#CDD6F4" frame_color = "#FAB387" icon = "~/.config/dunst/icons/critical.svg" timeout = 0 +script = ~/.config/dunst/scripts/alert.sh # Icon for notifications with critical urgency, uncomment to enable #default_icon = /path/to/icon @@ -465,6 +466,5 @@ frame_color = "#575C5B" icon = "~/.config/dunst/icons/hyprdots.svg" timeout = 10 -[play_sound] -summary = "*" -script = ~/.config/dunst/scripts/alert.sh +#[play_sound] +#summary = "*" diff --git a/dunst/scripts/alert.sh b/dunst/scripts/alert.sh index f5886ab..5ef3f8b 100755 --- a/dunst/scripts/alert.sh +++ b/dunst/scripts/alert.sh @@ -1,2 +1,2 @@ #!/bin/bash -pw-play --volume=1.1 ~/audio/alert.mp3 +pw-play --volume=1.8 ~/.alert/generic.mp3 diff --git a/hypr/hyprland.conf b/hypr/hyprland.conf index 09f787a..6967dd7 100755 --- a/hypr/hyprland.conf +++ b/hypr/hyprland.conf @@ -1,31 +1,32 @@ -# █▀▄▀█ █▀█ █▄░█ █ ▀█▀ █▀█ █▀█ -# █░▀░█ █▄█ █░▀█ █ ░█░ █▄█ █▀▄ +source = ~/.config/hypr/mocha.conf # Catppuccin colorscheme + +# < Start Section > +# monitors # Single -monitor=DP-3, highrr, 0x0, 1, vrr, 0 -monitor=DP-1, disable +monitor=DP-1, 3440x1440@160, 0x0, 1, vrr, 1, bitdepth, 10 +monitor=DP-2, disable # Double -#monitor=DP-3, highrr, 0x1080, 1, vrr, 0 -#monitor=DP-1, highrr, 760x0, 1, vrr, 0 +#monitor=DP-1, 3440x1440@160, 1920x0, 1, vrr, 1, bitdepth, 8 +#monitor=DP-2, 1920x1080@120, 0x180, 1, vrr, 0 + +# < End Section > -# █░░ ▄▀█ █░█ █▄░█ █▀▀ █░█ -# █▄▄ █▀█ █▄█ █░▀█ █▄▄ █▀█ +# < Start Section > +# startup applications +# environment launches $scrPath = ~/.config/hypr/scripts - -# reset XDPH for screenshare -exec-once = $scrPath/resetxdgportal.sh - -# for XDPH -exec-once = dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP +exec-once = $scrPath/resetxdgportal.sh # reset XDPH for screenshare +exec-once = dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP # for XDPH exec-once = dbus-update-activation-environment --systemd --all exec-once = systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP - -# authentication dialogue for GUI apps -exec-once = /usr/lib/polkit-kde-authentication-agent-1 +exec-once = /usr/lib/polkit-kde-authentication-agent-1 # authentication dialogue for GUI apps +exec-once = gsettings set org.gnome.desktop.interface gtk-theme 'Catppuccin-Mocha' +exec-once = gsettings set org.gnome.desktop.interface color-scheme 'prefer-dark' # xrandr settings exec-once = $scrPath/xrandr.sh @@ -34,34 +35,105 @@ exec-once = waybar -c ~/.config/waybar/config exec-once = dunst exec-once = swww init exec-once = syncthing --no-browser +exec-once = xwaylandvideobridge -# Main applications -exec-once = discord +# main applications +#exec-once = discord --enable-features=UseOzonePlatform --ozone-platform=wayland exec-once = spotify --disable-gpu exec-once = alacritty exec-once = firefox -exec-once = taskset -c 1-7 mangohud steam-runtime -#exec-once = mangohud steam-runtime +exec-once = taskset -c 1-7 steam +#exec-once = taskset -c 1-7 gamescope -W 3200 -H 1100 -b -- steam +exec-once = bolt + +# < End Section > -# █░░ ▄▀█ █▄█ █▀█ █░█ ▀█▀ █▀ -# █▄▄ █▀█ ░█░ █▄█ █▄█ ░█░ ▄█ +# < Start Section > +# workspace rules -workspace = 1, monitor:DP-3, persistent:true, gapsout:0 440 0 440, default:true -workspace = 2, monitor:DP-3, persistent:true, gapsout:0 440 0 440 -workspace = 3, monitor:DP-3, persistent:true, gapsout:0 440 0 440 -workspace = 4, monitor:DP-3, persistent:true -workspace = 5, monitor:DP-3, persistent:true +workspace = 1, monitor:DP-1, persistent:true, gapsout:0 440 0 440, default:true +workspace = 2, monitor:DP-1, persistent:true, gapsout:126 756 180 756 +workspace = 3, monitor:DP-1, persistent:true, gapsout:0 440 0 440 +workspace = 4, monitor:DP-1, persistent:true, gapsout:0 0 40 0 + +# Workspaces swapped for ease of use workspace = 6, monitor:DP-1, persistent:true +workspace = 5, monitor:DP-1, persistent:true -dwindle { - pseudotile = yes - preserve_split = yes +# < End Section > + + + +# < Start Section > +# variables + +general { + gaps_in = 0 + border_size = 3 + col.active_border = $peach + #col.inactive_border = $peach + layout = dwindle + resize_on_border = false } -master { - new_is_master = true +decoration { + rounding = 6 + drop_shadow = false + dim_special = 0.3 + fullscreen_opacity = 1.0 + + blur { + enabled = yes + special = true + size = 6 + passes = 3 + new_optimizations = on + ignore_opacity = on + xray = false + } +} + +animations { + enabled = yes + bezier = wind, 0.05, 0.9, 0.1, 1.05 + bezier = winIn, 0.1, 1.1, 0.1, 1.1 + bezier = winOut, 0.3, -0.3, 0, 1 + bezier = liner, 1, 1, 1, 1 + animation = windows, 1, 6, wind, slide + animation = windowsIn, 1, 6, winIn, slide + animation = windowsOut, 1, 5, winOut, slide + animation = windowsMove, 1, 5, wind, slide + animation = border, 1, 1, liner + animation = borderangle, 1, 30, liner, loop + animation = fade, 1, 10, default + animation = workspaces, 1, 5, wind +} + +input { + kb_layout = us + follow_mouse = 2 + #follow_mouse = 3 + mouse_refocus = false; + + sensitivity = -.75 # -1.0 - 1.0, 0 means no modification. + force_no_accel = 1 +} + +group { + col.border_active = rgba(ca9ee6ff) rgba(f2d5cfff) 45deg + col.border_inactive = rgba(b4befecc) rgba(6c7086cc) 45deg + col.border_locked_active = rgba(ca9ee6ff) rgba(f2d5cfff) 45deg + col.border_locked_inactive = rgba(b4befecc) rgba(6c7086cc) 45deg +} + +misc { + disable_hyprland_logo = true + disable_splash_rendering = true + force_default_wallpaper = 0 + vrr = 1 + vfr = true } xwayland { @@ -69,36 +141,215 @@ xwayland { # use_nearset_neighbor = true # force_zero_scaling = true # current configuration - use_nearest_neighbor = false + use_nearest_neighbor = true force_zero_scaling = false } - - -# █ █▄░█ █▀█ █░█ ▀█▀ -# █ █░▀█ █▀▀ █▄█ ░█░ - -input { - kb_layout = us - follow_mouse = 2 - mouse_refocus = false; - - sensitivity = -.75 # -1.0 - 1.0, 0 means no modification. - force_no_accel = 1 +cursor { + no_hardware_cursors = true + inactive_timeout = 2 + no_warps = false + default_monitor = DP-1 } -device { - name = opentabletdriver-virtual-tablet - enabled = yes +debug { + disable_logs = true + #disable_logs = false } +#device { +# name = opentabletdriver-virtual-tablet +# enabled = yes +#} + +# < End Section > -# █▀ █▀█ █░█ █▀█ █▀▀ █▀▀ -# ▄█ █▄█ █▄█ █▀▄ █▄▄ ██▄ -source = ~/.config/hypr/keybindings.conf -source = ~/.config/hypr/windowrules.conf -source = ~/.config/hypr/theme.conf -source = ~/.config/hypr/nvidia.conf # auto sourced vars for nvidia +# < Start Section > +# dwindle layout +dwindle { + pseudotile = yes + preserve_split = yes +} + +# < End Section > + + + +# < Start Section > +# master layout + +master { + new_status = master +} + +# < End Section > + + + +# < Start Section > +# window rules + +# core +windowrulev2 = opacity 0.80 0.80,class:^(.*)$ +windowrulev2 = opacity 0.80 0.70,class:^(pavucontrol)$ +windowrulev2 = opacity 0.80 0.70,class:^(org.kde.polkit-kde-authentication-agent-1)$ +windowrulev2 = float, class:^(qt5ct)$ +windowrulev2 = float, class:^(nwg-look)$ +windowrulev2 = float, class:^(pavucontrol)$ +windowrulev2 = float, class:^(org.kde.polkit-kde-authentication-agent-1)$ +#windowrulev2 = float, class:^(steam)$ + +# main +windowrulev2 = workspace 1 silent, class:^(discord)$ +windowrulev2 = workspace 1 silent, class:^(Spotify)$ +windowrulev2 = workspace 2 silent, class:^(Alacritty)$ +windowrulev2 = workspace 3 silent, class:^(firefox)$ +windowrulev2 = workspace 4 silent, class:^(steam)$ +windowrulev2 = workspace 4 silent, title:^(Minecraft.*)$ +windowrulev2 = workspace 4 silent, class:^(steam_app_.*)$ +windowrulev2 = workspace 4 silent, class:^(steam_proton)$ +windowrulev2 = workspace 4 silent, class:^(hl2_linux)$ +windowrulev2 = workspace 4 silent, class:^(gamescope)$ +windowrulev2 = workspace 5 silent, class:^(Bolt.*)$ + +# development +windowrulev2 = pseudo, title:^(SnakePlusPlus)$ +windowrulev2 = center, title:^(SnakePlusPlus)$ +windowrulev2 = opacity 0.4, title:^(SnakePlusPlus)$ +windowrulev2 = float, title:^(TetrisPlusPlus)$ +windowrulev2 = center, title:^(TetrisPlusPlus)$ + +# games +# 16:9 windowed - 1920 1080 +# 21:9 windowed - 2560 1080 +# 32:9 windowed - 3200 900 +# theoretical mix - 3200 1100 +# runelite +windowrulev2 = opacity 1.00 override 1.00 override, class:^(net-runelite-client-RuneLite)$ +windowrulev2 = pseudo, class:^(net-runelite-client-RuneLite)$ +windowrulev2 = size 825 520, class:^(net-runelite-client-RuneLite)$ +# minecraft +windowrulev2 = opacity 1.00 override 1.00 override, title:^(Minecraft.*)$ +windowrulev2 = pseudo, title:^(Minecraft.*)$ +windowrulev2 = size 3200 1100, title:^(Minecraft.*)$ +# native +windowrulev2 = opacity 1.00 override 1.00 override, class:^(steam_app_.*)$ +windowrulev2 = pseudo, class:^(steam_app_.*)$ +#windowrulev2 = size 3200 900, class:^(steam_app_.*)$ +# proton +windowrulev2 = opacity 1.00 override 1.00 override, class:^(steam_proton)$ +windowrulev2 = pseudo, class:^(steam_proton)$ +#windowrulev2 = size 3200 900, class:^(steam_proton)$ +# hl2 (css, etc) +windowrulev2 = opacity 1.00 override 1.00 override, class:^(hl2_linux)$ +# gamescope +windowrulev2 = opacity 1.00 override 1.00 override, class:^(gamescope)$ +windowrulev2 = pseudo, class:^(gamescope)$ +windowrulev2 = size 3200 1100, class:^(gamescope)$ + +# layer rules +layerrule = blur,waybar +layerrule = ignorezero, waybar + +# xwaylandvideobridge +windowrulev2 = opacity 0.0 override,class:^(xwaylandvideobridge)$ +windowrulev2 = noanim,class:^(xwaylandvideobridge)$ +windowrulev2 = noinitialfocus,class:^(xwaylandvideobridge)$ +windowrulev2 = maxsize 1 1,class:^(xwaylandvideobridge)$ +windowrulev2 = noblur,class:^(xwaylandvideobridge)$ + +# < End Section > + + + +# < Start Section > +# keybinds + +# main modifier +$mainMod = SUPER + +# passthrough +bind = , mouse:275, pass, ^(discord)$ +bind = SHIFT, mouse:275, pass, ^(discord)$ + +# core binds +bind = $mainMod SHIFT, Q, killactive, +bind = $mainMod SHIFT, M, exit +bind = $mainMod, SPACE, togglefloating, +bind = $mainMod, F, fullscreen, +bind = $mainMod SHIFT, L, exec, hyprlock +bind = $mainMod $CONTROL, ESCAPE, exec, killall waybar || waybar # toggle waybar +bind = $mainMod SHIFT, J, togglesplit, # dwindle +bind = $mainMod SHIFT, SPACE, pseudo, # dwindle + +# main application shortcuts +bind = $mainMod, RETURN, exec, alacritty +bind = $mainMod SHIFT, S, exec, grim -g "$(slurp)" - | wl-copy +bind = $mainMod SHIFT, 7, exec, taskset -c 1-7 prismlauncher +bind = $mainMod, S, exec, pkill -x rofi || rofi -show drun + +# generic audio control +binde = , XF86AudioPlay, exec, playerctl play-pause +binde = , XF86AudioStop, exec, playerctl stop +binde = , XF86AudioPrev, exec, playerctl previous +binde = , XF86AudioNext, exec, playerctl next +binde = , XF86AudioMute, exec, pactl set-sink-mute @DEFAULT_SINK@ toggle +binde = , XF86AudioLowerVolume, exec, pactl set-sink-volume @DEFAULT_SINK@ -5% +binde = , XF86AudioRaiseVolume, exec, pactl set-sink-volume @DEFAULT_SINK@ +5% + +# custom audio control +binde = $mainMod, F1, exec, playerctl play-pause +binde = $mainMod, F2, exec, playerctl previous +binde = $mainMod, F3, exec, playerctl next + +# move focus +bind = $mainMod, h, movefocus, l +bind = $mainMod, l, movefocus, r +bind = $mainMod, k, movefocus, u +bind = $mainMod, j, movefocus, d + +# workspaces +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 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 ALT, 1, movetoworkspacesilent, 1 +bind = $mainMod ALT, 2, movetoworkspacesilent, 2 +bind = $mainMod ALT, 3, movetoworkspacesilent, 3 +bind = $mainMod ALT, 4, movetoworkspacesilent, 4 +bind = $mainMod ALT, 5, movetoworkspacesilent, 5 +bind = $mainMod ALT, 6, movetoworkspacesilent, 6 + +# resizing windows +binde = $mainMod, right, resizeactive, 5 0 +binde = $mainMod, left, resizeactive, -5 0 +binde = $mainMod, up, resizeactive, 0 -5 +binde = $mainMod, down, resizeactive, 0 5 +bindm = $mainMod, mouse:272, movewindow +bindm = $mainMod, mouse:273, resizewindow + +# < End Section > + + + +# < Start Section > +# environment variables + +env = XDG_CURRENT_DESKTOP,Hyprland +env = XDG_SESSION_DESKTOP,Hyprland +env = MOZ_ENABLE_WAYLAND,1 +env = HYPRCURSOR_THEME, rose-pine-hyprcursor +env = HYPRCURSOR_SIZE, 24 + +# < End Section > diff --git a/hypr/hyprlandd.conf b/hypr/hyprlandd.conf new file mode 100644 index 0000000..e66c3aa --- /dev/null +++ b/hypr/hyprlandd.conf @@ -0,0 +1,341 @@ +source = ~/.config/hypr/mocha.conf # Catppuccin colorscheme + +# < Start Section > +# monitors + +# Single +#monitor=DP-1, 3440x1440@160, 0x0, 1, vrr, 1, bitdepth, 10 +#monitor=DP-2, disable + +# Double +monitor=DP-1, 3440x1440@160, 1920x0, 1, vrr, 1, bitdepth, 10 +monitor=DP-2, 1920x1080@144, 0x180, 1, vrr, 0 + +# < End Section > + + + +# < Start Section > +# startup applications + +# environment launches +$scrPath = ~/.config/hypr/scripts +exec-once = $scrPath/resetxdgportal.sh # reset XDPH for screenshare +exec-once = dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP # for XDPH +exec-once = dbus-update-activation-environment --systemd --all +exec-once = systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP +exec-once = /usr/lib/polkit-kde-authentication-agent-1 # authentication dialogue for GUI apps +exec-once = gsettings set org.gnome.desktop.interface gtk-theme 'Catppuccin-Mocha' +exec-once = gsettings set org.gnome.desktop.interface color-scheme 'prefer-dark' + +# xrandr settings +exec-once = $scrPath/xrandr.sh + +exec-once = waybar -c ~/.config/waybar/config +exec-once = dunst +exec-once = swww init +exec-once = syncthing --no-browser + +# main applications +#exec-once = discord +exec-once = spotify --disable-gpu +exec-once = alacritty +exec-once = firefox +exec-once = taskset -c 1-7 steam-runtime +#exec-once = mangohud steam-runtime +exec-once = bolt + +# < End Section > + + + +# < Start Section > +# workspace rules + +workspace = 1, monitor:DP-1, persistent:true, gapsout:0 440 0 440, default:true +workspace = 2, monitor:DP-1, persistent:true, gapsout:126 756 180 756 +workspace = 3, monitor:DP-1, persistent:true, gapsout:0 440 0 440 +workspace = 4, monitor:DP-1, persistent:true +workspace = 5, monitor:DP-1, persistent:true +workspace = 6, monitor:DP-2, persistent:true + +# < End Section > + + + +# < Start Section > +# variables + +general { + #gaps_in = 15 + #gaps_out = 40, 160, 40, 160 + gaps_in = 0 + gaps_out = 12 + border_size = 4 + #border_size = 0 + col.active_border = $peach + #col.inactive_border = $peach + layout = dwindle + resize_on_border = false + #cursor_inactive_timeout = 2 + #no_cursor_warps = false +} + +decoration { + rounding = 6 + drop_shadow = false + dim_special = 0.3 + #active_opacity = 1.0 + #inactive_opacity = 0.8 + fullscreen_opacity = 1.0 + + blur { + enabled = yes + special = true + size = 6 + passes = 3 + new_optimizations = on + ignore_opacity = on + xray = false + } +} + +animations { + enabled = yes + bezier = wind, 0.05, 0.9, 0.1, 1.05 + bezier = winIn, 0.1, 1.1, 0.1, 1.1 + bezier = winOut, 0.3, -0.3, 0, 1 + bezier = liner, 1, 1, 1, 1 + animation = windows, 1, 6, wind, slide + animation = windowsIn, 1, 6, winIn, slide + animation = windowsOut, 1, 5, winOut, slide + animation = windowsMove, 1, 5, wind, slide + animation = border, 1, 1, liner + animation = borderangle, 1, 30, liner, loop + animation = fade, 1, 10, default + animation = workspaces, 1, 5, wind +} + +input { + kb_layout = us + follow_mouse = 2 + mouse_refocus = false; + + sensitivity = -.75 # -1.0 - 1.0, 0 means no modification. + force_no_accel = 1 +} + +group { + col.border_active = rgba(ca9ee6ff) rgba(f2d5cfff) 45deg + col.border_inactive = rgba(b4befecc) rgba(6c7086cc) 45deg + col.border_locked_active = rgba(ca9ee6ff) rgba(f2d5cfff) 45deg + col.border_locked_inactive = rgba(b4befecc) rgba(6c7086cc) 45deg +} + +misc { + disable_hyprland_logo = true + disable_splash_rendering = true + force_default_wallpaper = 0 + vrr = 1 + vfr = true +} + +xwayland { + # latest configuration + # use_nearset_neighbor = true + # force_zero_scaling = true + # current configuration + use_nearest_neighbor = true + force_zero_scaling = false +} + +cursor { + no_hardware_cursors = true + inactive_timeout = 2 + no_warps = false + default_monitor = DP-1 +} + +debug { + disable_logs = false +} + +#device { +# name = opentabletdriver-virtual-tablet +# enabled = yes +#} + +# < End Section > + + + +# < Start Section > +# dwindle layout + +dwindle { + pseudotile = yes + preserve_split = yes +} + +# < End Section > + + + +# < Start Section > +# master layout + +master { + new_is_master = true +} + +# < End Section > + + + +# < Start Section > +# window rules + +# Core +windowrulev2 = opacity 0.80 0.80,class:^(.*)$ +windowrulev2 = opacity 0.80 0.70,class:^(pavucontrol)$ +windowrulev2 = opacity 0.80 0.70,class:^(org.kde.polkit-kde-authentication-agent-1)$ +windowrulev2 = float, class:^(qt5ct)$ +windowrulev2 = float, class:^(nwg-look)$ +windowrulev2 = float, class:^(pavucontrol)$ +windowrulev2 = float, class:^(org.kde.polkit-kde-authentication-agent-1)$ +#windowrulev2 = float, class:^(steam)$ + +# Main +windowrulev2 = workspace 1 silent, class:^(discord)$ +windowrulev2 = workspace 1 silent, class:^(Spotify)$ +windowrulev2 = workspace 2 silent, class:^(Alacritty)$ +windowrulev2 = workspace 3 silent, class:^(firefox)$ +windowrulev2 = workspace 4 silent, class:^(steam)$ +windowrulev2 = workspace 5 silent, class:^(Bolt.*)$ + +# Development +windowrulev2 = pseudo, title:^(SnakePlusPlus)$ +windowrulev2 = center, title:^(SnakePlusPlus)$ +windowrulev2 = opacity 0.4, title:^(SnakePlusPlus)$ +windowrulev2 = float, title:^(TetrisPlusPlus)$ +windowrulev2 = center, title:^(TetrisPlusPlus)$ + +# Games +# 16:9 windowed - 1920 1080 +# 21:9 windowed - 2560 1080 +# 32:9 windowed - 3200 900 +# Theoretical mix - 3200 1100 +windowrulev2 = opacity 1.00 override 1.00 override, class:^(net-runelite-client-RuneLite)$ +windowrulev2 = pseudo, class:^(net-runelite-client-RuneLite)$ +windowrulev2 = size 825 520, class:^(net-runelite-client-RuneLite)$ +windowrulev2 = opacity 1.00 override 1.00 override, class:^(Minecraft.*)$ +windowrulev2 = pseudo, class:^(Minecraft.*)$ +windowrulev2 = size 2560 1080, class:^(Minecraft.*)$ +windowrulev2 = opacity 1.00 override 1.00 override, class:^(steam_app_.*)$ +windowrulev2 = pseudo, class:^(steam_app_.*)$ +#windowrulev2 = size 3200 900, class:^(steam_app_.*)$ +windowrulev2 = opacity 1.00 override 1.00 override, class:^(steam_proton)$ +windowrulev2 = pseudo, class:^(steam_proton)$ +#windowrulev2 = size 3200 900, class:^(steam_proton)$ +windowrulev2 = opacity 1.00 override 1.00 override, class:^(hl2_linux)$ +windowrulev2 = workspace 4 silent, class:^(Minecraft.*)$ +windowrulev2 = workspace 4 silent, class:^(steam_app_.*)$ +windowrulev2 = workspace 4 silent, class:^(steam_proton)$ +windowrulev2 = workspace 4 silent, class:^(hl2_linux)$ + +# layer rules +layerrule = blur,waybar +layerrule = ignorezero, waybar + +# < End Section > + + + +# < Start Section > +# binds + +# main modifier +$mainMod = SUPER + +# passthrough +bind = , mouse:275, pass, ^(discord)$ +bind = SHIFT, mouse:275, pass, ^(discord)$ + +# core binds +bind = $mainMod SHIFT, Q, killactive, +bind = $mainMod SHIFT, M, exit +bind = $mainMod, SPACE, togglefloating, +bind = $mainMod, F, fullscreen, +bind = $mainMod SHIFT, L, exec, hyprlock +bind = $mainMod $CONTROL, ESCAPE, exec, killall waybar || waybar # toggle waybar +bind = $mainMod SHIFT, J, togglesplit, # dwindle +bind = $mainMod SHIFT, SPACE, pseudo, # dwindle + +# main application shortcuts +bind = $mainMod, RETURN, exec, alacritty +bind = $mainMod SHIFT, S, exec, grim -g "$(slurp)" - | wl-copy +bind = $mainMod SHIFT, 7, exec, taskset -c 1-7 prismlauncher +bind = $mainMod, S, exec, pkill -x rofi || rofi -show drun + +# generic audio control +binde = , XF86AudioPlay, exec, playerctl play-pause +binde = , XF86AudioStop, exec, playerctl stop +binde = , XF86AudioPrev, exec, playerctl previous +binde = , XF86AudioNext, exec, playerctl next +binde = , XF86AudioMute, exec, pactl set-sink-mute @DEFAULT_SINK@ toggle +binde = , XF86AudioLowerVolume, exec, pactl set-sink-volume @DEFAULT_SINK@ -5% +binde = , XF86AudioRaiseVolume, exec, pactl set-sink-volume @DEFAULT_SINK@ +5% + +# custom audio control +binde = $mainMod, F1, exec, playerctl play-pause +binde = $mainMod, F2, exec, playerctl previous +binde = $mainMod, F3, exec, playerctl next + +# move focus +bind = $mainMod, h, movefocus, l +bind = $mainMod, l, movefocus, r +bind = $mainMod, k, movefocus, u +bind = $mainMod, j, movefocus, d + +# workspaces +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 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 ALT, 1, movetoworkspacesilent, 1 +bind = $mainMod ALT, 2, movetoworkspacesilent, 2 +bind = $mainMod ALT, 3, movetoworkspacesilent, 3 +bind = $mainMod ALT, 4, movetoworkspacesilent, 4 +bind = $mainMod ALT, 5, movetoworkspacesilent, 5 +bind = $mainMod ALT, 6, movetoworkspacesilent, 6 + +# resizing windows +binde = $mainMod, right, resizeactive, 5 0 +binde = $mainMod, left, resizeactive, -5 0 +binde = $mainMod, up, resizeactive, 0 -5 +binde = $mainMod, down, resizeactive, 0 5 +bindm = $mainMod, mouse:272, movewindow +bindm = $mainMod, mouse:273, resizewindow + +# < End Section > + + + +# < Start Section > +# environment variables + +env = XDG_CURRENT_DESKTOP,Hyprland +env = XDG_SESSION_DESKTOP,Hyprland +env = MOZ_ENABLE_WAYLAND,1 +env = HYPRCURSOR_THEME, rose-pine-hyprcursor +env = HYPRCURSOR_SIZE, 24 + +# < End Section > diff --git a/hypr/hyprlock.conf b/hypr/hyprlock.conf index 1b8391f..c87ff03 100644 --- a/hypr/hyprlock.conf +++ b/hypr/hyprlock.conf @@ -12,20 +12,20 @@ general { # BACKGROUND background { - monitor = DP-3 - path = ~/pics/dharmx/spam/a_city_with_neon_lights.png + monitor = DP-1 + path = ~/.profile/wallpaper-locked.png blur_passes = 0 color = $base } background { - monitor = DP-1 + monitor = DP-2 blur_passes = 0 color = $base } # TIME label { - monitor = DP-3 + monitor = DP-1 text = cmd[update:30000] echo "$(date +"%R")" color = $text font_size = 90 @@ -37,7 +37,7 @@ label { # DATE label { - monitor = DP-3 + monitor = DP-1 text = cmd[update:43200000] echo "$(date +"%A, %d %B %Y")" color = $text font_size = 25 @@ -50,8 +50,8 @@ label { # USER AVATAR image { - monitor = DP-3 - path = ~/pics/fox-dying.png + monitor = DP-1 + path = ~/.profile/pfp.png size = 100 border_color = $accent @@ -62,7 +62,7 @@ image { # INPUT FIELD input-field { - monitor = DP-3 + monitor = DP-1 size = 300, 60 outline_thickness = 4 dots_size = 0.2 diff --git a/hypr/keybindings.conf b/hypr/keybindings.conf deleted file mode 100644 index df0fac7..0000000 --- a/hypr/keybindings.conf +++ /dev/null @@ -1,77 +0,0 @@ - -# █▄▀ █▀▀ █▄█ █▄▄ █ █▄░█ █▀▄ █ █▄░█ █▀▀ █▀ -# █░█ ██▄ ░█░ █▄█ █ █░▀█ █▄▀ █ █░▀█ █▄█ ▄█ - -# Main modifier -$mainMod = SUPER - -# Passthrough -bind = , mouse:275, pass, ^(discord)$ -bind = SHIFT, mouse:275, pass, ^(discord)$ - -# Core binds -bind = $mainMod SHIFT, Q, killactive, -bind = $mainMod SHIFT, M, exit -bind = $mainMod, SPACE, togglefloating, -bind = $mainMod, F, fullscreen, -bind = $mainMod SHIFT, L, exec, hyprlock -bind = $mainMod $CONTROL, ESCAPE, exec, killall waybar || waybar # toggle waybar -bind = $mainMod SHIFT, J, togglesplit, # dwindle -bind = $mainMod SHIFT, SPACE, pseudo, # dwindle - -# Main application shortcuts -bind = $mainMod, RETURN, exec, alacritty -bind = $mainMod SHIFT, S, exec, grim -g "$(slurp)" - | wl-copy -bind = $mainMod SHIFT, 7, exec, taskset -c 1-7 mangohud steamtinkerlaunch mo2 start -bind = $mainMod, S, exec, pkill -x rofi || rofi -show drun - -# Audio control -binde = , XF86AudioPlay, exec, playerctl play-pause -binde = , XF86AudioStop, exec, playerctl stop -binde = , XF86AudioPrev, exec, playerctl previous -binde = , XF86AudioNext, exec, playerctl next -binde = , XF86AudioMute, exec, pactl set-sink-mute @DEFAULT_SINK@ toggle -binde = , XF86AudioLowerVolume, exec, pactl set-sink-volume @DEFAULT_SINK@ -5% -binde = , XF86AudioRaiseVolume, exec, pactl set-sink-volume @DEFAULT_SINK@ +5% - -# Custom audio control -binde = $mainMod, F1, exec, playerctl play-pause -binde = $mainMod, F2, exec, playerctl previous -binde = $mainMod, F3, exec, playerctl next - -# Move focus -bind = $mainMod, h, movefocus, l -bind = $mainMod, l, movefocus, r -bind = $mainMod, k, movefocus, u -bind = $mainMod, j, movefocus, d - -# Workspaces -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 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 ALT, 1, movetoworkspacesilent, 1 -bind = $mainMod ALT, 2, movetoworkspacesilent, 2 -bind = $mainMod ALT, 3, movetoworkspacesilent, 3 -bind = $mainMod ALT, 4, movetoworkspacesilent, 4 -bind = $mainMod ALT, 5, movetoworkspacesilent, 5 -bind = $mainMod ALT, 6, movetoworkspacesilent, 6 - -# Resize windows -binde = $mainMod, right, resizeactive, 5 0 -binde = $mainMod, left, resizeactive, -5 0 -binde = $mainMod, up, resizeactive, 0 -5 -binde = $mainMod, down, resizeactive, 0 5 - -# Move/Resize windows with mainMod + LMB/RMB and dragging -bindm = $mainMod, mouse:272, movewindow -bindm = $mainMod, mouse:273, resizewindow - diff --git a/hypr/nvidia.conf b/hypr/nvidia.conf deleted file mode 100644 index 3864511..0000000 --- a/hypr/nvidia.conf +++ /dev/null @@ -1,26 +0,0 @@ - -# █▄░█ █░█ █ █▀▄ █ ▄▀█ -# █░▀█ ▀▄▀ █ █▄▀ █ █▀█ - - -# See https://wiki.hyprland.org/Nvidia/ for more - -env = LIBVA_DRIVER_NAME,nvidia -env = XDG_SESSION_TYPE,wayland -env = GBM_BACKEND,nvidia-drm -env = __GLX_VENDOR_LIBRARY_NAME,nvidia -#env = WLR_NO_HARDWARE_CURSORS,1 -#env = __GL_VRR_ALLOWED,1 -#env = __GL_GSYNC_ALLOWED,1 -#env = WLR_DRM_NO_ATOMIC,1 - -#env = ELECTRON_OZONE_PLATFORM_HINT,auto -env = XDG_CURRENT_DESKTOP,Hyprland -env = XDG_SESSION_DESKTOP,Hyprland -#env = QT_QPA_PLATFORM,wayland;xcb -#env = QT_STYLE_OVERRIDE,kvantum -#env = QT_QPA_PLATFORMTHEME,qt5ct -#env = QT_WAYLAND_DISABLE_WINDOWDECORATION,1 -#env = QT_AUTO_SCREEN_SCALE_FACTOR,1 -env = MOZ_ENABLE_WAYLAND,1 - diff --git a/hypr/scripts/xrandr.sh b/hypr/scripts/xrandr.sh index 2d8ce45..0ac2b61 100755 --- a/hypr/scripts/xrandr.sh +++ b/hypr/scripts/xrandr.sh @@ -2,14 +2,14 @@ # Custom resolution through xrandr xrandr --newmode "2560x1080" 677.75 2560 2784 3064 3568 1080 1083 1093 1188 -hsync +vsync -xrandr --addmode DP-3 2560x1080 +xrandr --addmode DP-1 2560x1080 # 3200x900 suggestion xrandr --newmode "3200x900" 704.50 3200 3472 3824 4448 900 903 913 991 -hsync +vsync -xrandr --addmode DP-3 3200x900 +xrandr --addmode DP-1 3200x900 # 3200x1100 suggestion xrandr --newmode "3200x1100" 863.75 3200 3480 3832 4464 1100 1103 1113 1210 -hsync +vsync -xrandr --addmode DP-3 3200x1100 +xrandr --addmode DP-1 3200x1100 -sleep 2 && xrandr --output DP-3 --primary # Set primary monitor for xwayland +sleep 2 && xrandr --output DP-1 --primary # Set primary monitor for xwayland diff --git a/hypr/theme.conf b/hypr/theme.conf deleted file mode 100644 index adaad9a..0000000 --- a/hypr/theme.conf +++ /dev/null @@ -1,92 +0,0 @@ -exec = gsettings set org.gnome.desktop.interface gtk-theme 'Catppuccin-Mocha' -exec = gsettings set org.gnome.desktop.interface color-scheme 'prefer-dark' -layerrule = blur,waybar -layerrule = ignorezero, waybar - -# Catppuccin colorscheme -source = ~/.config/hypr/mocha.conf - -# Hyprcursor -env = HYPRCURSOR_THEME, rose-pine-hyprcursor -env = HYPRCURSOR_SIZE, 24 - -# Variables -# Hyprland options - -general { - #gaps_in = 15 - #gaps_out = 40, 160, 40, 160 - gaps_in = 0 - gaps_out = 0 - border_size = 4 - #border_size = 0 - col.active_border = $peach - #col.inactive_border = $peach - layout = dwindle - resize_on_border = false -} - -cursor { - inactive_timeout = 2 - no_warps = false -} - -group { - col.border_active = rgba(ca9ee6ff) rgba(f2d5cfff) 45deg - col.border_inactive = rgba(b4befecc) rgba(6c7086cc) 45deg - col.border_locked_active = rgba(ca9ee6ff) rgba(f2d5cfff) 45deg - col.border_locked_inactive = rgba(b4befecc) rgba(6c7086cc) 45deg -} - -decoration { - rounding = 0 - drop_shadow = false - dim_special = 0.3 - #active_opacity = 1.0 - #inactive_opacity = 0.8 - fullscreen_opacity = 1.0 - - blur { - enabled = yes - special = true - size = 6 - passes = 3 - new_optimizations = on - ignore_opacity = on - xray = false - } -} - -misc { - disable_hyprland_logo = true - disable_splash_rendering = true - force_default_wallpaper = 0 - vrr = 2 - vfr = true -} - - - -# Animations -# Config options for Hyprland's various animations - -animations { - enabled = yes - - # Hyprdots - bezier = wind, 0.05, 0.9, 0.1, 1.05 - bezier = winIn, 0.1, 1.1, 0.1, 1.1 - bezier = winOut, 0.3, -0.3, 0, 1 - bezier = liner, 1, 1, 1, 1 - animation = windows, 1, 6, wind, slide - animation = windowsIn, 1, 6, winIn, slide - animation = windowsOut, 1, 5, winOut, slide - animation = windowsMove, 1, 5, wind, slide - animation = border, 1, 1, liner - animation = borderangle, 1, 30, liner, loop - animation = fade, 1, 10, default - animation = workspaces, 1, 5, wind -} - - - diff --git a/hypr/windowrules.conf b/hypr/windowrules.conf deleted file mode 100644 index ed9598b..0000000 --- a/hypr/windowrules.conf +++ /dev/null @@ -1,51 +0,0 @@ - -# █░█░█ █ █▄░█ █▀▄ █▀█ █░█░█   █▀█ █░█ █░░ █▀▀ █▀ -# ▀▄▀▄▀ █ █░▀█ █▄▀ █▄█ ▀▄▀▄▀   █▀▄ █▄█ █▄▄ ██▄ ▄█ - - -# Core -windowrulev2 = opacity 0.80 0.80,class:^(.*)$ -windowrulev2 = opacity 0.80 0.70,class:^(pavucontrol)$ -windowrulev2 = opacity 0.80 0.70,class:^(org.kde.polkit-kde-authentication-agent-1)$ -windowrulev2 = float, class:^(qt5ct)$ -windowrulev2 = float, class:^(nwg-look)$ -windowrulev2 = float, class:^(pavucontrol)$ -windowrulev2 = float, class:^(org.kde.polkit-kde-authentication-agent-1)$ -#windowrulev2 = float, class:^(steam)$ - -# Main -windowrulev2 = workspace 1 silent, class:^(discord)$ -windowrulev2 = workspace 1 silent, class:^(Spotify)$ -windowrulev2 = workspace 2 silent, class:^(Alacritty)$ -windowrulev2 = workspace 3 silent, class:^(firefox)$ -windowrulev2 = workspace 4 silent, class:^(steam)$ - -# Development -windowrulev2 = pseudo, title:^(SnakePlusPlus)$ -windowrulev2 = center, title:^(SnakePlusPlus)$ -windowrulev2 = opacity 0.4, title:^(SnakePlusPlus)$ -windowrulev2 = float, title:^(TetrisPlusPlus)$ -windowrulev2 = center, title:^(TetrisPlusPlus)$ - -# Games -# 16:9 windowed - 1920 1080 -# 21:9 windowed - 2560 1080 -# 32:9 windowed - 3200 900 -# Theoretical mix - 3200 1100 -windowrulev2 = opacity 1.00 override 1.00 override, class:^(net-runelite-client-RuneLite)$ -windowrulev2 = pseudo, class:^(net-runelite-client-RuneLite)$ -windowrulev2 = size 825 520, class:^(net-runelite-client-RuneLite)$ -windowrulev2 = opacity 1.00 override 1.00 override, class:^(Minecraft.*)$ -windowrulev2 = pseudo, class:^(Minecraft.*)$ -windowrulev2 = size 2560 1080, class:^(Minecraft.*)$ -windowrulev2 = opacity 1.00 override 1.00 override, class:^(steam_app_.*)$ -windowrulev2 = pseudo, class:^(steam_app_.*)$ -windowrulev2 = size 3200 900, class:^(steam_app_.*)$ -windowrulev2 = opacity 1.00 override 1.00 override, class:^(steam_proton)$ -windowrulev2 = pseudo, class:^(steam_proton)$ -windowrulev2 = size 3200 900, class:^(steam_proton)$ -windowrulev2 = opacity 1.00 override 1.00 override, class:^(hl2_linux)$ -windowrulev2 = workspace 4 silent, class:^(Minecraft.*)$ -windowrulev2 = workspace 4 silent, class:^(steam_app_.*)$ -windowrulev2 = workspace 4 silent, class:^(steam_proton)$ -windowrulev2 = workspace 4 silent, class:^(hl2_linux)$ diff --git a/waybar/config b/waybar/config index 9332728..ca64fcb 100755 --- a/waybar/config +++ b/waybar/config @@ -5,12 +5,12 @@ "position": "top", "height": 38, "spacing": 0, - "output": "DP-3", + "output": "DP-1", "reload_style_on_change": true, - "margin-left": 940, - "margin-right": 940, - "margin-top": 4, - "margin-bottom": 4, + "margin-left": 12, + "margin-right": 12, + "margin-top": 6, + "margin-bottom": 6, "modules-left": [ "wireplumber", "disk", @@ -22,7 +22,6 @@ "modules-center": ["hyprland/workspaces"], "modules-right": [ "tray", - "custom/weather", "network#ethernet", "clock", "custom/poweroff" @@ -114,12 +113,5 @@ "format": " ", "on-click": "bash $HOME/.config/waybar/scripts/poweroff.sh" }, - "custom/weather": { - "exec": "$HOME/.config/waybar/scripts/get_weather.sh Belleville+Illinois", - "return-type": "json", - "format": "{}", - "tooltip": true, - "interval": 3600 - } } ] diff --git a/waybar/scripts/get_weather.sh b/waybar/scripts/get_weather.sh deleted file mode 100755 index 7278b23..0000000 --- a/waybar/scripts/get_weather.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/usr/bin/env bash -# get_weather.sh -for i in {1..5} -do - text=$(curl -s "https://wttr.in/$1?format=1") - if [[ $? == 0 ]] - then - text=$(echo "$text" | sed -E "s/\s+/ /g") - tooltip=$(curl -s "https://wttr.in/$1?format=4") - if [[ $? == 0 ]] - then - tooltip=$(echo "$tooltip" | sed -E "s/\s+/ /g") - echo "{\"text\":\"$text\", \"tooltip\":\"$tooltip\"}" - exit - fi - fi - sleep 2 -done -echo "{\"text\":\"error\", \"tooltip\":\"error\"}" diff --git a/waybar/style.css b/waybar/style.css index 7e72f21..f58a240 100755 --- a/waybar/style.css +++ b/waybar/style.css @@ -10,8 +10,8 @@ } window#waybar { - background-color: alpha(@surface0, 0.3); - border-radius: 4px; + background-color: alpha(@base, 0.6); + border-radius: 6px; border: 0px solid @overlay0; padding-top: 2px; padding-bottom: 6px;