From 0f91b010a66aa70b1b76f39ba34fa302e82588b5 Mon Sep 17 00:00:00 2001 From: end-4 <97237370+end-4@users.noreply.github.com> Date: Fri, 29 Dec 2023 16:26:22 +0700 Subject: [PATCH] update hyprland stuff --- .config/hypr/colors.conf | 37 +++++++++++++++++++++------- .config/hypr/hyprland.conf | 8 +++--- .config/hypr/keybinds.conf | 19 +++++++------- .config/hypr/shaders/bluefilter.frag | 20 --------------- 4 files changed, 41 insertions(+), 43 deletions(-) delete mode 100755 .config/hypr/shaders/bluefilter.frag diff --git a/.config/hypr/colors.conf b/.config/hypr/colors.conf index 3f24d1b0f..4553b27b8 100755 --- a/.config/hypr/colors.conf +++ b/.config/hypr/colors.conf @@ -1,24 +1,43 @@ # Auto generated color theme for image at: [Local wallpaper] general { - col.active_border = rgba(36399fFF) - col.inactive_border = rgba(454559AA) + col.active_border = rgba(3d1c70FF) + col.inactive_border = rgba(4b4358CC) } plugin { droidbars { # example config bar_height = 30 - background_color = rgba(1b1b1fFF) - # background_color_active = rgba(47464fFF) # Not added yet - text_color = rgba(e2e0f9FF) + background_color = rgba(111012FF) + # background_color_active = rgba(49454eFF) # Not added yet + text_color = rgba(eadef7FF) font_family = Lexend button_font_fmily = JetBrainsMono NF # example buttons (R -> L) # droidbars-button = [0]isLeft(0/1), [1]color, [2]color2, [3]width, [4]height, [5]icon, [6]buttonType, [7]on-click - droidbars-button = 0, rgba(e2e0f9FF), rgba(bfc2ffFF), 42, 16,‎ 󰖭, normal, hyprctl dispatch killactive - droidbars-button = 0, rgba(e2e0f9FF), rgba(bfc2ffFF), 42, 16,‎ , normal, hyprctl dispatch fullscreen 1 - droidbars-button = 1, rgba(e2e0f9FF), rgba(bfc2ffFF), 16, 16,‎󰐃, pin, hyprctl dispatch pin - droidbars-button = 1, rgba(e2e0f9FF), rgba(bfc2ffFF), 16, 16,󰗘, float, hyprctl dispatch togglefloating + droidbars-button = 0, rgba(eadef7FF), rgba(d6baffFF), 42, 16,‎ 󰖭, normal, hyprctl dispatch killactive + droidbars-button = 0, rgba(eadef7FF), rgba(d6baffFF), 42, 16,‎ , normal, hyprctl dispatch fullscreen 1 + droidbars-button = 1, rgba(eadef7FF), rgba(d6baffFF), 16, 16,‎󰐃, pin, hyprctl dispatch pin + droidbars-button = 1, rgba(eadef7FF), rgba(d6baffFF), 16, 16,󰗘, float, hyprctl dispatch togglefloating + } + hyprbars { + # Honestly idk if it works like css, but well, why not + bar_text_font = Geist, AR One Sans, Reddit Sans, Inter, Roboto, Ubuntu, Noto Sans, sans-serif + bar_height = 30 + bar_padding = 10 + bar_button_padding = 5 + bar_precedence_over_border = true + bar_part_of_window = true + + bar_color = rgb(111012) + col.text = rgb(e7e1e6) + + + # example buttons (R -> L) + # hyprbars-button = color, size, on-click + hyprbars-button = rgb(e7e1e6), 13, 󰖭, hyprctl dispatch killactive + hyprbars-button = rgb(e7e1e6), 13, 󰖯, hyprctl dispatch fullscreen 1 + hyprbars-button = rgb(e7e1e6), 13, 󰖰, hyprctl dispatch movetoworkspacesilent special } } diff --git a/.config/hypr/hyprland.conf b/.config/hypr/hyprland.conf index fd0d748a0..c30041a80 100755 --- a/.config/hypr/hyprland.conf +++ b/.config/hypr/hyprland.conf @@ -5,10 +5,6 @@ source=~/.config/hypr/env.conf -# Window and layer rules -source=~/.config/hypr/rules.conf - - $mainMod = SUPER # MONITOR CONFIG @@ -192,9 +188,11 @@ decoration { #screen_shader = ~/.config/hypr/shaders/crt.frag } +# Window and layer rules +layerrule = noanim, selection +source=~/.config/hypr/rules.conf # Dynamic colors source=~/.config/hypr/colors.conf - diff --git a/.config/hypr/keybinds.conf b/.config/hypr/keybinds.conf index 1c40b2d76..f814ddc4b 100755 --- a/.config/hypr/keybinds.conf +++ b/.config/hypr/keybinds.conf @@ -39,7 +39,7 @@ bind = SuperShiftAlt, S, exec, grim -g "$(slurp -d -c D1E5F4BB -b 1B232866 -s 00 bindl=,Print,exec,grim - | wl-copy bind = SuperShift, S, exec, grim -g "$(slurp -d -c D1E5F4BB -b 1B232866 -s 00000000)" - | wl-copy bind = SuperAlt, R, exec, ~/.config/ags/scripts/record-script.sh -bind = ControlAlt, R, exec, ~/.config/ags/scripts/record-script.sh --sound +bind = ControlAlt, R, exec, ~/.config/ags/scripts/record-script.sh --fullscreen bind = SuperShiftAlt, R, exec, ~/.config/ags/scripts/record-script.sh --fullscreen-sound bind = SuperShift, C, exec, hyprpicker -a bind = Super, V, exec, pkill fuzzel || cliphist list | fuzzel --no-fuzzy --dmenu | cliphist decode | wl-copy @@ -75,24 +75,25 @@ bindir = Super, Super_L, exec, ags -t 'overview' bind = Super, Tab, exec, ags -t 'overview' bind = Super, Slash, exec, ags -t 'cheatsheet' bind = Super, B, exec, ags -t 'sideleft' +bind = Super, A, exec, ags -t 'sideleft' bind = Super, O, exec, ags -t 'sideleft' # blame osu for this keybinding bind = Super, N, exec, ags -t 'sideright' bind = Super, M, exec, ags run-js 'openMusicControls.value = (!Mpris.getPlayer() ? false : !openMusicControls.value);' bind = Super, Comma, exec, ags run-js 'openColorScheme.value = true; Utils.timeout(2000, () => openColorScheme.value = false);' bind = Super, K, exec, ags -t 'osk' bind = ControlAlt, Delete, exec, ags -t 'session' -bindr = Control, Control_R, exec, ags run-js 'indicator.popup(-1);' -bindr = Control, Control_R, exec, ags run-js 'Notifications.notifications.forEach((notif) => notif.dismiss())' bindle = , XF86AudioRaiseVolume, exec, ags run-js 'indicator.popup(1);' bindle = , XF86AudioLowerVolume, exec, ags run-js 'indicator.popup(1);' bindle = , XF86MonBrightnessUp, exec, ags run-js 'indicator.popup(1);' bindle = , XF86MonBrightnessDown, exec, ags run-js 'indicator.popup(1);' -bindr = Control, Control_R, exec, ags run-js 'App.closeWindow("sideright");' -bindr = Control, Control_R, exec, ags run-js 'App.closeWindow("cheatsheet");' -bindr = Control, Control_R, exec, ags run-js 'App.closeWindow("osk");' -bindr = Control, Control_R, exec, ags run-js 'App.closeWindow("session");' -bindr = Control, Control_R, exec, ags run-js 'openMusicControls.value = false' -bindr = Control, Control_R, exec, ags run-js 'openColorScheme.value = false' +#bindr = Control, Control_R, exec, ags run-js 'indicator.popup(-1);' +#bindr = Control, Control_R, exec, ags run-js 'Notifications.notifications.forEach((notif) => notif.dismiss())' +#bindr = Control, Control_R, exec, ags run-js 'App.closeWindow("sideright");' +#bindr = Control, Control_R, exec, ags run-js 'App.closeWindow("cheatsheet");' +#bindr = Control, Control_R, exec, ags run-js 'App.closeWindow("osk");' +#bindr = Control, Control_R, exec, ags run-js 'App.closeWindow("session");' +#bindr = Control, Control_R, exec, ags run-js 'openMusicControls.value = false' +#bindr = Control, Control_R, exec, ags run-js 'openColorScheme.value = false' ###################################### Plugins ######################################### bind = ControlSuper, P, exec, hyprctl plugin load "~/.config/hypr/plugins/droidbars.so" diff --git a/.config/hypr/shaders/bluefilter.frag b/.config/hypr/shaders/bluefilter.frag deleted file mode 100755 index 5469af9c6..000000000 --- a/.config/hypr/shaders/bluefilter.frag +++ /dev/null @@ -1,20 +0,0 @@ -// vim: set ft=glsl: -// blue light filter shader -// values from https://reshade.me/forum/shader-discussion/3673-blue-light-filter-similar-to-f-lux - -precision mediump float; -varying vec2 v_texcoord; -uniform sampler2D tex; - -void main() { - - vec4 pixColor = texture2D(tex, v_texcoord); - - // green - pixColor[1] *= 0.855; - - // blue - pixColor[2] *= 0.725; - - gl_FragColor = pixColor; -}