diff --git a/.config/hypr/colors.conf b/.config/hypr/colors.conf index 4553b27b8..787741876 100755 --- a/.config/hypr/colors.conf +++ b/.config/hypr/colors.conf @@ -1,43 +1,44 @@ -# Auto generated color theme for image at: [Local wallpaper] +$SLURP_COMMAND="$(slurp -d -c f8daeeBB -b 55405044 -s 00000000)" + general { - col.active_border = rgba(3d1c70FF) - col.inactive_border = rgba(4b4358CC) + col.active_border = rgba(551251FF) + col.inactive_border = rgba(554050CC) } plugin { - droidbars { + droidbars { # This is my hyprbars mod that broke :( # example config bar_height = 30 - background_color = rgba(111012FF) - # background_color_active = rgba(49454eFF) # Not added yet - text_color = rgba(eadef7FF) - font_family = Lexend + background_color = rgba(120F11FF) + # background_color_active = rgba(4e444bFF) # Not added yet + text_color = rgba(f8daeeFF) + font_family = Rubik, Geist, AR One Sans, Reddit Sans, Inter, Roboto, Ubuntu, Noto Sans, sans-serif 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(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 + droidbars-button = 0, rgba(f8daeeFF), rgba(ffabf1FF), 42, 16,‎ 󰖭, normal, hyprctl dispatch killactive + droidbars-button = 0, rgba(f8daeeFF), rgba(ffabf1FF), 42, 16,‎ , normal, hyprctl dispatch fullscreen 1 + droidbars-button = 1, rgba(f8daeeFF), rgba(ffabf1FF), 16, 16,‎󰐃, pin, hyprctl dispatch pin + droidbars-button = 1, rgba(f8daeeFF), rgba(ffabf1FF), 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_text_font = Rubik, 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) + bar_color = rgb(120F11) + col.text = rgb(eae0e4) # 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 + hyprbars-button = rgb(eae0e4), 13, 󰖭, hyprctl dispatch killactive + hyprbars-button = rgb(eae0e4), 13, 󰖯, hyprctl dispatch fullscreen 1 + hyprbars-button = rgb(eae0e4), 13, 󰖰, hyprctl dispatch movetoworkspacesilent special } } diff --git a/.config/hypr/hyprland.conf b/.config/hypr/hyprland.conf index c30041a80..4b1caa952 100755 --- a/.config/hypr/hyprland.conf +++ b/.config/hypr/hyprland.conf @@ -2,35 +2,26 @@ # For Environment variables see env.conf # For Keybinds variables see keybinds.conf # For Auto-run stuff see execs.conf +# For Window/layer rules see rules.conf source=~/.config/hypr/env.conf -$mainMod = SUPER - # MONITOR CONFIG monitor=,preferred,auto,1 monitor=,addreserved, 0, 0, 0, 0 -#monitor=HDMI-A-1,1920x1080@60,1920x0,1,mirror,eDP-1 -#################### Core components (authentication, idle daemon and stuff) ############## +# monitor=HDMI-A-1,1920x1080@60,1920x0,1,mirror,eDP-1 + +# Startup executions source=~/.config/hypr/execs.conf -############################# Keybinds ############################ -source=~/.config/hypr/keybinds.conf - -############################## Input ############################## input { # Mouse - # accel_profile = adaptive force_no_accel = false - #sensitivity = 0 - # Keyboard - # Add a layout and comment kb_options for Win+Space switching shortcut + # Keyboard: Add a layout and uncomment kb_options for Win+Space switching shortcut kb_layout = us # kb_options = grp:win_space_toggle - - follow_mouse = 1 numlock_by_default = true repeat_delay = 250 repeat_rate = 35 @@ -41,31 +32,25 @@ input { clickfinger_behavior = true scroll_factor = 0.5 } - scroll_method = 2fg } binds { - # focus_window_on_workspace_change = true + # focus_window_on_workspace_c# For Auto-run stuff see execs.confhange = true scroll_event_delay = 0 } gestures { - # See https://wiki.hyprland.org/Configuring/Variables/ for more workspace_swipe = true workspace_swipe_distance = 700 workspace_swipe_fingers = 4 workspace_swipe_cancel_ratio = 0.2 workspace_swipe_min_speed_to_force = 5 - workspace_swipe_direction_lock = true - workspace_swipe_direction_lock_threshold = 0 - + workspace_swipe_direction_lock_threshold = 10 workspace_swipe_create_new = true - } general { - max_fps = 75 # Gaps and border gaps_in = 4 gaps_out = 5 @@ -76,17 +61,16 @@ general { col.active_border = rgba(0DB7D4FF) col.inactive_border = rgba(31313600) - # Functionality - # resize_on_border = true + resize_on_border = true no_focus_fallback = true layout = dwindle - #focus_to_other_workspaces = true + #focus_to_other_workspaces = true # ahhhh i still haven't properly implemented this allow_tearing = false # some guy told me tearing might make things smoother idk } dwindle { - preserve_split = true # you definitely want this + preserve_split = true # no_gaps_when_only = 1 smart_split = false smart_resizing = false @@ -100,16 +84,11 @@ decoration { xray = true special = false new_optimizations = on - size = 5 passes = 4 brightness = 1 noise = 0.01 contrast = 1 - - #vibrancy = 0.1 - #vibrancy_darkness = 0 - } # Shadow drop_shadow = true @@ -170,22 +149,10 @@ misc { } debug { - #overlay = true - #damage_tracking = 0 + # overlay = true + # damage_tracking = 0 - #damage_blink = yes -} - -#misc { -# vfr = false -#} -#debug { -# overlay = true -#} - -decoration { - #screen_shader = ~/.config/hypr/shaders/drugs.frag - #screen_shader = ~/.config/hypr/shaders/crt.frag + # damage_blink = yes } # Window and layer rules @@ -196,3 +163,7 @@ source=~/.config/hypr/rules.conf # Dynamic colors source=~/.config/hypr/colors.conf +# Keybinds +source=~/.config/hypr/keybinds.conf + + diff --git a/.config/hypr/keybinds.conf b/.config/hypr/keybinds.conf index f814ddc4b..8f401fa11 100755 --- a/.config/hypr/keybinds.conf +++ b/.config/hypr/keybinds.conf @@ -35,9 +35,9 @@ bind = ControlShiftAlt, Delete, exec, pkill wlogout || wlogout -p layer-shell bind = ControlShiftAltSuper, Delete, exec, systemctl poweroff # Screenshot, Record, OCR, Color picker, Clipboard history -bind = SuperShiftAlt, S, exec, grim -g "$(slurp -d -c D1E5F4BB -b 1B232866 -s 00000000)" - | swappy -f - +bind = SuperShiftAlt, S, exec, grim -g $SLURP_COMMAND - | swappy -f - bindl=,Print,exec,grim - | wl-copy -bind = SuperShift, S, exec, grim -g "$(slurp -d -c D1E5F4BB -b 1B232866 -s 00000000)" - | wl-copy +bind = SuperShift, S, exec, grim -g $SLURP_COMMAND - | wl-copy bind = SuperAlt, R, exec, ~/.config/ags/scripts/record-script.sh bind = ControlAlt, R, exec, ~/.config/ags/scripts/record-script.sh --fullscreen bind = SuperShiftAlt, R, exec, ~/.config/ags/scripts/record-script.sh --fullscreen-sound @@ -46,11 +46,11 @@ bind = Super, V, exec, pkill fuzzel || cliphist list | fuzzel --no-fuzzy --dmenu # Text-to-image # Normal -bind = ControlSuperShift,S,exec,grim -g "$(slurp -d -c D1E5F4BB -b 1B232866 -s 00000000)" "tmp.png" && tesseract "tmp.png" - | wl-copy && rm "tmp.png" +bind = ControlSuperShift,S,exec,grim -g $SLURP_COMMAND "tmp.png" && tesseract "tmp.png" - | wl-copy && rm "tmp.png" # English -bind = SuperShift,T,exec,grim -g "$(slurp -d -c D1E5F4BB -b 1B232866 -s 00000000)" "tmp.png" && tesseract -l eng "tmp.png" - | wl-copy && rm "tmp.png" +bind = SuperShift,T,exec,grim -g $SLURP_COMMAND "tmp.png" && tesseract -l eng "tmp.png" - | wl-copy && rm "tmp.png" # Japanese -bind = SuperShift,J,exec,grim -g "$(slurp -d -c D1E5F4BB -b 1B232866 -s 00000000)" "tmp.png" && tesseract -l jpn "tmp.png" - | wl-copy && rm "tmp.png" +bind = SuperShift,J,exec,grim -g $SLURP_COMMAND "tmp.png" && tesseract -l jpn "tmp.png" - | wl-copy && rm "tmp.png" # Media bind = SuperShift, N, exec, playerctl next || playerctl position `bc <<< "100 * $(playerctl metadata mpris:length) / 1000000 / 100"` @@ -86,14 +86,6 @@ 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 '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/rules.conf b/.config/hypr/rules.conf index fdb7b2007..f5ea624b8 100644 --- a/.config/hypr/rules.conf +++ b/.config/hypr/rules.conf @@ -14,7 +14,7 @@ windowrule=float,title:^(Select a File)(.*)$ windowrule=float,title:^(Choose wallpaper)(.*)$ windowrule=float,title:^(Open Folder)(.*)$ windowrule=float,title:^(Save As)(.*)$ -windowrule=float,title:^(Library)(.*)$ +windowrule=float,title:^(Library)(.*)$ ######## Layer rules ######## layerrule = xray 1, .* @@ -59,5 +59,3 @@ layerrule = noanim, sideleft #layerrule = ignorealpha 0.69, indicator* #layerrule = blur, osk #layerrule = ignorealpha 0.69, osk - - diff --git a/.config/swaylock/config b/.config/swaylock/config index 5fd609efd..4c5249666 100644 --- a/.config/swaylock/config +++ b/.config/swaylock/config @@ -1,13 +1,12 @@ ignore-empty-password font=sans-serif -font-size=50 +font-size=23 clock timestr=%R #datestr=%a, %e of %B -#screenshots -color=00000099 +color=000000dd #fade-in=0.1 #effect-blur=20x2 @@ -15,8 +14,8 @@ color=00000099 #effect-scale=0.3 indicator -indicator-radius=150 -indicator-thickness=12 +indicator-radius=80 +indicator-thickness=10 indicator-caps-lock key-hl-color=d4d4d4 @@ -24,7 +23,7 @@ caps-lock-key-hl-color=d4d4d4 separator-color=00000000 -inside-color=00000099 +inside-color=000000ff inside-clear-color=00000099 inside-caps-lock-color=00000099 inside-ver-color=00000099