From 7bcecff8d165d4d374fb832caab988e10e276bce Mon Sep 17 00:00:00 2001 From: Dante <150515748+xsghetti@users.noreply.github.com> Date: Fri, 1 Mar 2024 12:51:45 -0500 Subject: [PATCH] Did a bunch of shit last night I dont really remember but dont wanna lose. --- .config/hypr/animations.conf | 2 +- .config/hypr/hyprland.conf | 16 ++--- .config/hypr/hyprlock.conf | 92 +++++++++++++--------------- .config/hypr/keybindings.conf | 21 +++++-- .config/hypr/pyprland.toml | 2 +- .config/hypr/scripts/systemupdate.sh | 41 +++++++++++++ .config/hypr/windowrule.conf | 25 +++----- 7 files changed, 113 insertions(+), 86 deletions(-) create mode 100644 .config/hypr/scripts/systemupdate.sh diff --git a/.config/hypr/animations.conf b/.config/hypr/animations.conf index 72f39dac..6738a0bf 100644 --- a/.config/hypr/animations.conf +++ b/.config/hypr/animations.conf @@ -2,7 +2,7 @@ decoration { # See https://wiki.hyprland.org/Configuring/Variables/ for more - rounding = 0 + rounding = 1 blur { enabled = true diff --git a/.config/hypr/hyprland.conf b/.config/hypr/hyprland.conf index c32c63e1..6a3d1fcd 100644 --- a/.config/hypr/hyprland.conf +++ b/.config/hypr/hyprland.conf @@ -14,9 +14,10 @@ monitor = HDMI-A-1, transform, 3 workspace = DP-1,1 workspace = HDMI-A-1,6 -#Laptop Config -monitor = eDP-1, 1920x1080@144, auto, 1 -workspace = eDP-1,1 +#Laptop + +# monitor = eDP-1, 1920x1080@144, auto, 1 +# workspace = eDP-1,1 # See https://wiki.hyprland.org/Configuring/Keywords/ for more @@ -33,7 +34,6 @@ $menu = rofi -show drun $browser = firefox $discord = discord --enable-features=UseOzonePlatform --ozone-platform=wayland - # Some default env vars. env = XCURSOR_SIZE,24 env = QT_QPA_PLATFORMTHEME,qt5ct # change to qt6ct if you have that @@ -127,15 +127,7 @@ misc { # See https://wiki.hyprland.org/Configuring/Keywords/#executing for more -# Plugins -# When entering overview mode, you can use left-button to jump, right-button to kill or use keybind - -# If you are installing hycov with hyprpm, you should comment out this -# plugin = /usr/lib/libhycov.so - -# If you are installing hycov by manually compile , you should comment out this -exec-once = hyprpm reload plugin { diff --git a/.config/hypr/hyprlock.conf b/.config/hypr/hyprlock.conf index dc08cc25..3d8b5aae 100644 --- a/.config/hypr/hyprlock.conf +++ b/.config/hypr/hyprlock.conf @@ -1,83 +1,73 @@ -# Hyprlock - general { - hide_cursor = true - disable_loading_bar = false grace = 1 - no_fade_in = false } background { monitor = - path = /home/crux/.config/wallpapers/wallhaven-o5jv65.png - color = rgba(20, 20, 20, 0.9) + path = $HOME/.config/rofi/.current_wallpaper # only png supported for now + color = $color7 - # Blur - - blur_passes = 1 # 0 disables blurring - blur_size = 3 + # all these options are taken from hyprland, see https://wiki.hyprland.org/Configuring/Variables/#blur for explanations + blur_size = 4 + blur_passes = 3 # 0 disables blurring noise = 0.0117 - contrast = 0.8916 - brightness = 0.8172 - vibrancy = 0.1696 + contrast = 1.3000 # Vibrant!!! + brightness = 0.8000 + vibrancy = 0.2100 vibrancy_darkness = 0.0 } input-field { - monitor = DP-1 - size = 200, 50 - outline_thickness = 0 - dots_size = 0.33 # Scale of input-field height, 0.2 - 0.8 - dots_spacing = 0.15 # Scale of dots' absolute size, 0.0 - 1.0 + monitor = + size = 250, 50 + outline_thickness = 3 + dots_size = 0.2 # Scale of input-field height, 0.2 - 0.8 + dots_spacing = 0.64 # Scale of dots' absolute size, 0.0 - 1.0 dots_center = true - outer_color = rgba(20, 20, 20, 0.3) - inner_color = rgb(200, 200, 200) - font_color = rgb(20, 20, 20) - fade_on_empty = false - placeholder_text = Password # Text rendered in the input box when it's empty. + outer_color = $color1 + inner_color = $color0 + font_color = $color7 + fade_on_empty = true + placeholder_text = Password... # Text rendered in the input box when it's empty. hide_input = false - - position = 0, -20 + position = 0, 50 halign = center - valign = center + valign = bottom } -# Labels - +# Current time label { monitor = DP-1 - text = Welcome back, $USER! The void eagerly awaits your command. - color = rgba(200, 200, 200, 1) - font_size = 25 - font_family = Inter - - position = 0, 80 + text = cmd[update:1000] echo "$TIME" + color = $color0 + font_size = 64 + font_family = JetBrains Mono Nerd Font 10 + position = 0, 16 halign = center valign = center } +# User label label { monitor = - text = $TIME - color = rgb(200, 200, 200) - font_family = Inter bold - font_size = 40 - - position = 0, -150 + text = Hey $USER + color = $color0 + font_size = 20 + font_family = JetBrains Mono Nerd Font 10 + position = 0, -10 halign = center - valign = top + valign = center } - +# Type to unlock label { monitor = - text = 
- color = rgb(19, 200, 206) - font_size = 40 - font_family = Inter bold - - position = -100, -150 + text = Type to unlock! + color = $color0 + font_size = 16 + font_family = JetBrains Mono Nerd Font 10 + position = 0, 30 halign = center - valign = top -} + valign = bottom +} \ No newline at end of file diff --git a/.config/hypr/keybindings.conf b/.config/hypr/keybindings.conf index 8c101739..f1f9e4ec 100644 --- a/.config/hypr/keybindings.conf +++ b/.config/hypr/keybindings.conf @@ -8,8 +8,6 @@ bind = $mainMod, ESCAPE, exec, killall waybar || waybar bind = $mainMod, D, exec, $discord bind = $mainMod SHIFT, W, exec, wp bind = $mainMod SHIFT, F, fullscreen -bind = $mainMod CTRL, F, exec, hyprctl dispatch workspaceopt allfloat -bind = $mainMod, B, exec, pypr expose bind = $mainMod, N, exec, swaync-client -t -sw bind = $mainMod, L, exec, hyprlock bind = $mainMod SHIFT, W, exec, ~/.config/hypr/scripts/wallpaperselect.sh @@ -55,6 +53,18 @@ bind = $mainMod SHIFT, 8, movetoworkspace, 8 bind = $mainMod SHIFT, 9, movetoworkspace, 9 bind = $mainMod SHIFT, 0, movetoworkspace, 10 +# Move window silently to workspace Super + Alt + [0-9] +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 +bind = $mainMod ALT, 7, movetoworkspacesilent, 7 +bind = $mainMod ALT, 8, movetoworkspacesilent, 8 +bind = $mainMod ALT, 9, movetoworkspacesilent, 9 +bind = $mainMod ALT, 0, movetoworkspacesilent, 10 + # Move active window to a relative workspace with mainMod + CTRL + ALT + [←→] bind = $mainMod CTRL ALT, right, movetoworkspace, r+1 bind = $mainMod CTRL ALT, left, movetoworkspace, r-1 @@ -105,7 +115,7 @@ bind = $mainMod, V, exec, pkill -x rofi || $scrPath/cliphist.sh c # open Pasteb bind = $mainMod, K, exec, $scrPath/keyboardswitch.sh # change keyboard layout # bind key to toggle overview (normal) -bind = ALT,tab,hycov:toggleoverview +bind = ALT,tab,hycov:toggleoverview,` # bind key to toggle overview (force mode, not affected by `only_active_workspace` or `only_active_monitor`) bind = ALT,grave,hycov:toggleoverview,forceall #grave key is the '~' key @@ -125,4 +135,7 @@ bind = ALT,g,hycov:toggleoverview,forceallinone # bind=ALT,left,hycov:movefocus,leftcross # bind=ALT,right,hycov:movefocus,rightcross # bind=ALT,up,hycov:movefocus,upcross -# bind=ALT,down,hycov:movefocus,downcross \ No newline at end of file +# bind=ALT,down,hycov:movefocus,downcross + + + diff --git a/.config/hypr/pyprland.toml b/.config/hypr/pyprland.toml index a773266e..f09bad86 100644 --- a/.config/hypr/pyprland.toml +++ b/.config/hypr/pyprland.toml @@ -5,6 +5,6 @@ plugins = ["scratchpads"] animation = "fromTop" command = "kitty --class kitty-dropterm" class = "kitty-dropterm" -size = "60% 20%" +size = "60% 30%" max_size = "1920px 40%" margin = 50 \ No newline at end of file diff --git a/.config/hypr/scripts/systemupdate.sh b/.config/hypr/scripts/systemupdate.sh new file mode 100644 index 00000000..202e4b9b --- /dev/null +++ b/.config/hypr/scripts/systemupdate.sh @@ -0,0 +1,41 @@ +!/usr/bin/env bash + +# Check release +if [ ! -f /etc/arch-release ] ; then + exit 0 +fi + +# source variables +ScrDir=`dirname "$(realpath "$0")"` +source $ScrDir/globalcontrol.sh + +# Check for updates +get_aurhlpr +aur=`${aurhlpr} -Qua | wc -l` +ofc=`checkupdates | wc -l` + +# Check for flatpak updates +if pkg_installed flatpak ; then + fpk=`flatpak remote-ls --updates | wc -l` + fpk_disp="\n󰏓 Flatpak $fpk" + fpk_exup="; flatpak update" +else + fpk=0 + fpk_disp="" +fi + +# Calculate total available updates +upd=$(( ofc + aur + fpk )) + +# Show tooltip +if [ $upd -eq 0 ] ; then + echo "{\"text\":\"$upd\", \"tooltip\":\" Packages are up to date\"}" +else + echo "{\"text\":\"$upd\", \"tooltip\":\"󱓽 Official $ofc\n󱓾 AUR $aur$fpk_disp\"}" +fi + +# Trigger upgrade +if [ "$1" == "up" ] ; then + kitty --title systemupdate sh -c "${aurhlpr} -Syu $fpk_exup" +fi + diff --git a/.config/hypr/windowrule.conf b/.config/hypr/windowrule.conf index 49e8f09e..b70990e8 100644 --- a/.config/hypr/windowrule.conf +++ b/.config/hypr/windowrule.conf @@ -3,38 +3,29 @@ # Example windowrule v2 # windowrulev2 = float,class:^(kitty)$,title:^(kitty)$ # See https://wiki.hyprland.org/Configuring/Window-Rules/ for more -# windowrulev2 = nomaximizerequest, class:.* # You'll probably like this. +windowrulev2 = nomaximizerequest, class:.* # You'll probably like this. windowrule = move 1250 50,^(blueman-manager)$ windowrulev2= opacity 0.70 0.70,class:^(Spotify)$ windowrulev2= opacity 0.80 0.80,class:^(Code)$ windowrulev2= opacity 0.80 0.80,class:^(waypaper)$ windowrulev2= opacity 0.80 0.80,class:^(dolphin)$ windowrulev2= opacity 0.80 0.80,class:^(discord)$ -windowrulev2= opacity 0.80 0.80,class:^($discord2)$ windowrulev2= opacity 0.80 0.80,class:^(lutris)$ windowrulev2= opacity 0.80 0.80,class:^(firefox)$ -windowrulev2 = float,class:^(qt5ct)$ +windowrulev2= opacity 0.80 0.80,class:^(steam)$ windowrulev2 = float,class:^(nwg-look)$ windowrulev2 = float,class:^(org.kde.ark)$ -windowrulev2 = float,class:^(Signal)$ #Signal-Gtk -windowrulev2 = float,class:^(com.github.rafostar.Clapper)$ #Clapper-Gtk -windowrulev2 = float,class:^(app.drey.Warp)$ #Warp-Gtk -windowrulev2 = float,class:^(net.davidotek.pupgui2)$ #ProtonUp-Qt -windowrulev2 = float,class:^(yad)$ #Protontricks-Gtk windowrulev2 = float,class:^(eog)$ #Imageviewer-Gtk -windowrulev2 = float,class:^(io.gitlab.theevilskeleton.Upscaler)$ #Upscaler-Gtk windowrulev2 = float,class:^(pavucontrol)$ windowrulev2 = float,class:^(blueman-manager)$ windowrulev2 = float,class:^(nm-applet)$ windowrulev2 = float,class:^(nm-connection-editor)$ windowrulev2 = float,class:^(org.kde.polkit-kde-authentication-agent-1)$ -windowrulev2 = float,class:^(steam)$ windowrulev2 = stayfocused, title:^()$,class:^(steam)$ -windowrulev2 = minsize 1 1, title:^()$,class:^(steam)$ -layerrule = unset,class:^([Rr]ofi)$ -layerrule = blur,class:^([Rr]ofi)$ -layerrule = ignorezero, -windowrule = float, rofi -# Blur Waybar +windowrulev2 = minsize 1 1, title:^()$,class:^(steam)$ + +# Blur Waybar & Rofi + layerrule=blur, rofi -layerrule=blur, waybar \ No newline at end of file +# layerrule=blur, waybar +layerrule = ignorezero, rofi \ No newline at end of file