From d9eec48e77b1933663bc6f07b7bee4ccd8e5c603 Mon Sep 17 00:00:00 2001 From: littleblack111 Date: Fri, 6 Sep 2024 10:34:46 +0800 Subject: updates, fixed keybinds --- dot-config/hypr/binds.conf | 79 ++++++++++++++++++------------------------- dot-config/hypr/env.conf | 7 ++++ dot-config/hypr/hyprland.conf | 54 +++++++++++++---------------- dot-config/hypr/hyprlock.conf | 32 ++---------------- dot-config/hypr/rules.conf | 52 ++++++++++++++++++++++------ dot-config/hypr/xdph.conf | 3 ++ 6 files changed, 111 insertions(+), 116 deletions(-) create mode 100644 dot-config/hypr/xdph.conf diff --git a/dot-config/hypr/binds.conf b/dot-config/hypr/binds.conf index fe578d8c..1c4d5bb6 100644 --- a/dot-config/hypr/binds.conf +++ b/dot-config/hypr/binds.conf @@ -10,35 +10,36 @@ binds { $mainMod = SUPER # Sets "Windows" key as main modifier # Launching... -bind = $mainMod, return, exec, $terminal start -bind = $mainMod shift, return, exec, $terminal start --class float +bind = $mainMod, return, exec, $terminal +bind = $mainMod shift, return, exec, $terminal --class "alacritty-float,alacritty-float" # bind = $mainMod space, return, exec, $terminal start --class pseudo -# bind = super alt, Delete, exec, rofi_powermenu -# bind = alt, F1, exec, rofi_launcher -# bind = alt, F2, exec, rofi_runner -bind = $mainMod, c, exec, rofi_configs -bind = $mainMod, m, exec, rofi_music +bind = super alt, Delete, exec, $rofiexec/rofi_powermenu +bind = alt, F1, exec, $rofiexec/rofi_launcher +bind = alt, F2, exec, $rofiexec/rofi_runner +# utils +bind = $mainMod, c, exec, $rofiexec/rofi_configs +bind = $mainMod, m, exec, $rofiexec/rofi_music bind = $mainMod, n, exec, nmd -bind = $mainMod, r, exec, rofi_asroot -bind = $mainMod, s, exec, rofi_screenshot -bind = $mainMod, v, exec, cliphist list | wofi --dmenu | cliphist decode | wl-copy -bind = $mainMod, w, exec, rofi_windows -bind = $mainMod, x, exec, rofi_powermenu -bind = $mainMod, b, exec, rofi_bluetooth +bind = $mainMod, r, exec, $rofiexec/rofi_asroot +bind = $mainMod, s, exec, $rofiexec/rofi_screenshot +bind = $mainMod, v, exec, cliphist list | $menu | cliphist decode | wl-copy +bind = $mainMod, w, exec, $rofiexec/rofi_windows +bind = $mainMod, x, exec, $rofiexec/rofi_powermenu +bind = $mainMod, b, exec, $rofiexec/rofi_bluetooth # GUI bind = $mainMod shift, f, exec, $fileManager bind = $mainMod shift, w, exec, $browser --restore-last-session bind = $mainMod shift, e, exec, code -bind = $mainMod shift, d, exec, discord --enable-features=WaylandWindowDecorations --ozone-platform-hint=auto -bind = $mainMod shift, b, exec, beeper --enable-features=WaylandWindowDecorations --ozone-platform-hint=auto +bind = $mainMod shift, d, exec, discord $waylandarg +bind = $mainMod shift, b, exec, beeper $waylandarg # CLI -bind = ctrl alt, a, exec, pulsemixer -bind = ctrl alt, v, exec, $editor -bind = ctrl alt, r, exec, ranger -bind = ctrl alt, b, exec, sudo nice -n -20 sudo btop +bind = ctrl alt, a, exec, $termfloat -e pulsemixer +bind = ctrl alt, v, exec, $termfloat -e $editor +bind = ctrl alt, r, exec, $termfloat -e ranger +bind = ctrl alt, b, exec, $termfloat -e sudo nice -n -20 sudo btop # Emergency -bind = ctrl shift, escape, exec, sudo btop # fix this -bind = ctrl alt, delete, exec, rofi_shutdown_menu +bind = ctrl shift, escape, exec, $termfloat -e sudo nice -n -20 sudo btop # fix this +bind = ctrl alt, delete, exec, $rofiexec/rofi_shutdown_menu bind = $mainMod, p, exec, hyprpicker --autocopy # More # bind = ctrl alt, m, exec, music @@ -51,39 +52,25 @@ bind = $mainMod shift, g, exec, gtk-launch shortwave.desktop bind = ,XF86Print, exec, $HOME/scripts/sysutil.sh screenshot --now bind = alt, XF86AudioMute, exec, $HOME/scripts/sysutil.sh screenshot --in5sec bind = $mainMod shift, s, exec, $HOME/scripts/sysutil.sh screenshot --area -# bind into hyprland configs -# XF86Audio{RaiseVolume,LowerVolume} -# bspvolume{ --inc, --dec} -# # Mic Volume control -# XF86Audio{Mute,MicMute} -# bspvolume{ --toggle, --toggle-mic} -# -# # Music control -# XF86Audio{Next,Prev,Play,Stop} -# {playerctl -p spotify next, playerctl -p spotifyprevious,bsppp,playerctl -p spotify stop} - -# super + XF86PowerOff -# $HOME/.config/rofi/scripts/rofi_shutdown - -# XF86PowerOff -# $HOME/.config/rofi/scripts/rofi_shutdown -# bind = ,XF86AudioRaiseVolume, exec, bspvolume --inc -# bind = ,XF86AudioLowerVolume, exec, bspvolume --dec -# bind = ,XF86AudioMute, exec, bspvolume --toggle -# bind = ,XF86AudioMicMute, exec, bspvolume --toggle-mic +# Music +bind = ,XF86AudioRaiseVolume, exec, $HOME/scripts/sysutil.sh volume --inc +bind = ,XF86AudioLowerVolume, exec, $HOME/scripts/sysutil.sh volume --dec +bind = ,XF86AudioMute, exec, $HOME/scripts/sysutil.sh volume --toggle +bind = ,XF86AudioMicMute, exec, $HOME/scripts/sysutil.sh volume --toggle-mic bind = ,XF86AudioNext, exec, playerctl -p spotify next bind = ,XF86AudioPrev, exec, playerctl -p spotify previous bind = ,XF86AudioPlay, exec, playerctl -p spotify play-pause bind = ,XF86AudioStop, exec, playerctl -p spotify stop -# bind = XF86PowerOff, exec, $HOME/.config/rofi/scripts/rofi_shutdown +bind = ,XF86PowerOff, exec, $rofiexec/rofi_shutdown # Window management -# bind = $mainMod, d, exec, HIDE_UNHIDE_WINDOW -bind = $mainMod, q, killactive, -# bind = $mainMod shift, q, FORCEkillactive, -# bind = ctrl alt, escape, exec , mousekill +bind = $mainMod, d, exec, $HOME/scripts/hyprhide h +bind = $mainMod, i, exec, $HOME/scripts/hyprhide s +bind = $mainMod, q, killactive +bind = $mainMod shift, q, exec, kill -9 $(hyprctl activewindow | grep pid | tail -1 | awk '{print$2}') +bind = ctrl alt, escape, exec, hyprctl kill bind = ctrl $mainMod shift, r, exec, systemctl restart $sessionManager bind = ctrl $mainMod, escape, exec, killall waybar; waybar # restart bar diff --git a/dot-config/hypr/env.conf b/dot-config/hypr/env.conf index e7240338..85238583 100644 --- a/dot-config/hypr/env.conf +++ b/dot-config/hypr/env.conf @@ -32,9 +32,16 @@ env = _JAVA_AWT_WM_NONREPARENTING,1 env = QT_AUTO_SCREEN_SCALE_FACTOR,1 # env = GDK_DPI_SCALE,1.5 # env = QT_SCALE_FACTOR,2 +env = ELECTRON_OZONE_PLATFORM_HINT,auto # Input method env = GTK_IM_MODULE,fcitx env = QT_IM_MODULE,fcitx env = XMODIFIERS,@im=fcitx env = SDL_IM_MODULE,fcitx +env = GLFW_IM_MODULE,fcitx +env = GTK_IM_MODULE, fcitx +env = INPUT_METHOD,fcitx +env = XMODIFIERS,fcitx +env = IMSETTINGS_MODULE,fcitx +env = QT_IM_MODULE,fcitx diff --git a/dot-config/hypr/hyprland.conf b/dot-config/hypr/hyprland.conf index 5a6483d5..fa06338a 100644 --- a/dot-config/hypr/hyprland.conf +++ b/dot-config/hypr/hyprland.conf @@ -1,28 +1,10 @@ - -# ####################################################################################### -# AUTOGENERATED HYPR CONFIG. -# PLEASE USE THE CONFIG PROVIDED IN THE GIT REPO /examples/hypr.conf AND EDIT IT, -# OR EDIT THIS ONE ACCORDING TO THE WIKI INSTRUCTIONS. -# ####################################################################################### - -# This is an example Hyprland config file. -# Refer to the wiki for more information. -# https://wiki.hyprland.org/Configuring/Configuring-Hyprland/ - -# Please note not all available settings / options are set here. -# For a full list, see the wiki - -# You can split this configuration into multiple files -# Create your files separately and then link them to this file like this: -# source = ~/.config/hypr/myColors.conf - - ################ ### MONITORS ### ################ # See https://wiki.hyprland.org/Configuring/Monitors/ monitor=,highres@160,auto,auto,bitdepth,10 +# monitor=,preferred,auto,auto,bitdepth,10 ################### @@ -30,17 +12,22 @@ monitor=,highres@160,auto,auto,bitdepth,10 ################### # Program defaults -$terminal = wezterm +$terminal = alacritty +$termfloat = alacritty --class 'alacritty-float,alacritty-float' $editor = lvim $browser = thorium-browser $fileManager = thunar $sessionManager = sddm -$menu = wofi --show drun +$menu = rofi -dmenu -theme $HOME/.config/rofi/configs.rasi # Dirs $HYPRDIR = $HOME/.config/hypr $WAYBARDIR = $HOME/.config/waybar $SCRIPTSDIR = $HOME/scripts +$rofiexec = $HOME/.config/rofi/scripts + +# misc +$waylandarg = --enable-features=WaylandWindowDecorations --ozone-platform-hint=auto ##################### @@ -93,10 +80,10 @@ decoration { # https://wiki.hyprland.org/Configuring/Variables/#blur blur { enabled = true - size = 10 + size = 5 passes = 3 - vibrancy = 0.1696 + vibrancy = 1 } } @@ -106,14 +93,14 @@ animations { # Default animations, see https://wiki.hyprland.org/Configuring/Animations/ for more - bezier = myBezier, 0.05, 0.9, 0.1, 1.05 + bezier = windowovershot, 1, 1, 0, 1.05 + bezier = slow-fast, 1, 0.33, 0.3, 1 + bezier = fast-slow, 0.33, 0.8, 0, 1 - 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 + animation = windows, 1, 3, windowovershot, popin 20% + animation = windowsOut, 1, 2, slow-fast, popin 15% + animation = workspaces, 1, 6, fast-slow, slide #fade + animation = workspacesIn, 1, 6, fast-slow, slidefade # dunno why but no such animation? } # See https://wiki.hyprland.org/Configuring/Dwindle-Layout/ for more @@ -127,7 +114,7 @@ misc { force_default_wallpaper = 1 # Set to 0 or 1 to disable the anime mascot wallpapers focus_on_activate = true disable_hyprland_logo = true # If true disables the random hyprland logo / anime girl background. :( - vfr = true + vfr = false } @@ -152,9 +139,14 @@ input { # } } +cursor { + allow_dumb_copy = true +} + source = ~/.config/hypr/env.conf source = ~/.config/hypr/rules.conf source = ~/.config/hypr/binds.conf source = ~/.config/hypr/autostart.conf +render:explicit_sync = 1 diff --git a/dot-config/hypr/hyprlock.conf b/dot-config/hypr/hyprlock.conf index 816def9f..7ef51575 100644 --- a/dot-config/hypr/hyprlock.conf +++ b/dot-config/hypr/hyprlock.conf @@ -59,7 +59,7 @@ label { label { monitor = - text = cmd[update:1000] echo "$(~/scripts/network-status)‎" + text = cmd[update:1000] echo "$(~/scripts/network-status)" color = rgba(242, 243, 244, 0.75) font_size = 16 font_family = SF Pro Text @@ -70,7 +70,7 @@ label { label { monitor = - text = cmd[update:1000] echo "$(~/scripts/layout-status)‎" + text = cmd[update:1000] echo "$(~/scripts/layout-status)" color = rgba(242, 243, 244, 0.75) font_size = 15 font_family = SF Pro Text @@ -104,18 +104,7 @@ label { label { monitor = - text = Pratik Gayen - color = rgba(242, 243, 244, 0.75) - font_size = 12 - font_family = SF Pro Display Bold - position = 0, -407 - halign = center - valign = center -} - -label { - monitor = - text = Touch ID or Enter Password + text = Password: color = rgba(242, 243, 244, 0.75) font_size = 10 font_family = SF Pro Display @@ -123,18 +112,3 @@ label { halign = center valign = center } - -image { - monitor = - path = ~/Pictures/fullpfp.png - border_color = 0xffdddddd - border_size = 0 - size = 73 - rounding = -1 - rotate = 0 - reload_time = -1 - reload_cmd = - position = 0, -353 - halign = center - valign = center -} diff --git a/dot-config/hypr/rules.conf b/dot-config/hypr/rules.conf index 1f58710a..c0899da0 100644 --- a/dot-config/hypr/rules.conf +++ b/dot-config/hypr/rules.conf @@ -14,7 +14,7 @@ windowrulev2 = suppressevent maximize, class:.* # You'll probably like this. # Terminal applications on workspace 1 -windowrulev2 = workspace 1, class:($terminal|Alacritty|Xfce4-terminal|Kitty) +windowrulev2 = workspace 1, class:(Alacritty|Xfce4-terminal|Kitty) # Web browsers on workspace 2 windowrulev2 = workspace 2, class:($browser|Thorium-browser|Brave-browser|chromium|firefox) @@ -29,7 +29,7 @@ windowrulev2 = workspace 4, class:(Geany|code-oss|Code - OSS|install4j-burp-Star windowrulev2 = workspace 5, class:(Gucharmap|Atril|Evince|libreoffice-writer|libreoffice-calc|libreoffice-impress|libreoffice|Soffice|Typora|obsidian|figma-linux|anytype|craft-nativefier-e0958b) # Communication apps on workspace 6 -windowrulev2 = workspace 6, class:(Thunderbird|TelegramDesktop|Hexchat|discord|vesktop|beeper|Beeper|VencordDesktop|Chat-gpt|Whatsapp-for-linux|Chatbox) +windowrulev2 = workspace 6, class:(Thunderbird|TelegramDesktop|Hexchat|discord|vesktop|VencordDesktop|Chat-gpt|Whatsapp-for-linux|Chatbox) # Media applications on workspace 7 windowrulev2 = workspace 7, class:(Audacity|Music|MPlayer|Lxmusic|Inkscape|Gimp|Blender|obs|zoom|Zoom|Pitivi|kdenlive|openshot|vlc|Spotify|Spotify Premium|cider|Cider|shotwell|Shotwell) @@ -38,7 +38,7 @@ windowrulev2 = workspace 7, class:(Audacity|Music|MPlayer|Lxmusic|Inkscape|Gimp| windowrulev2 = workspace 8, class:(Minecraft|Badlion|War|steam_proton|csgo_linux64|minecraft-launcher|Lutris|genshinimpact.exe|moe.launcher.an-anime-game-launcher) # System applications on workspace 9 -windowrulev2 = workspace 9, class:(Virt-manager|blueman-adapters|GParted|Xdm-app|timeshift-gtk|Nextcloud|gearlever) +windowrulev2 = workspace 9, class:(Virt-manager|blueman-adapters|GParted|Xdm-app|timeshift-gtk|com.nextcloud.desktopclient.nextcloud|gearlever) # Settings applications on workspace 9 windowrulev2 = workspace 9, class:(Lxappearance|Lxtask|Lxrandr|Arandr|System-config-printer.py|Pavucontrol|Exo-helper-1|Protonvpn|Xfce4-power-manager-settings|Mysql-workbench-bin|Grub-customizer|Nitrogen|archlinux-tweak-tool.py|pamac-manager|helvum|Vmware|Btrfs Assistant|Bitwarden|wootility-lekker) @@ -47,15 +47,48 @@ windowrulev2 = workspace 9, class:(Lxappearance|Lxtask|Lxrandr|Arandr|System-con windowrulev2 = workspace 10, class:(maxautoclicker|os_server|Os_server) # floating applications -windowrulev2 = float, class:(alacritty-float|Pcmanfm|Onboard|Yad|zoom|Xdm-app|wechat|WeChat|sxiv|Sxiv|Firefox:Places|Viewnior|feh|Nm-connection-editor|install4j-burp-StartBurp|thorium-app.shortwave.com__-Default|thorium-mdpkiolbdkhdjpekfbkbmhigcaggjagi-Profile_1|float|thorium-lnachpgegbbmnnlgpokibfjlmppeciah-Default|xdg-desktop-portal-gtk) +windowrulev2 = float, class:(alacritty-float|Pcmanfm|Onboard|Yad|zoom|Xdm-app|wechat|WeChat|sxiv|Sxiv|Firefox:Places|Viewnior|feh|Nm-connection-editor|install4j-burp-StartBurp|thorium-app.shortwave.com__-Default|thorium-mdpkiolbdkhdjpekfbkbmhigcaggjagi-Profile_1|float|thorium-lnachpgegbbmnnlgpokibfjlmppeciah-Default|xdg-desktop-portal-gtk|Beeper) -# Sticky applications -windowrulev2 = pin, class:(thorium-app.shortwave.com__-Default|thorium-mdpkiolbdkhdjpekfbkbmhigcaggjagi-Profile_1|thorium-lnachpgegbbmnnlgpokibfjlmppeciah-Default) +# specificly sized +windowrulev2 = size 40% 40%, class:(alacritty-float) + +# Sticky applicationsp + +# App that have menu on top for stayfocused +windowrulev2 = stayfocused, title:(menu) + + +# GUI Utils applications +windowrulev2 = opacity 0.85 0.75, class:^Beeper$ +windowrulev2 = opacity 0.85 0.75, class:(thorium-app.shortwave.com__-Default|thorium-mdpkiolbdkhdjpekfbkbmhigcaggjagi-Profile_1|thorium-lnachpgegbbmnnlgpokibfjlmppeciah-Default|Beeper) +windowrulev2 = pin, class:(thorium-app.shortwave.com__-Default|thorium-mdpkiolbdkhdjpekfbkbmhigcaggjagi-Profile_1|thorium-lnachpgegbbmnnlgpokibfjlmppeciah-Default|Beeper) +windowrulev2 = size 53% 60%, class:(thorium-app.shortwave.com__-Default|thorium-mdpkiolbdkhdjpekfbkbmhigcaggjagi-Profile_1|thorium-lnachpgegbbmnnlgpokibfjlmppeciah-Default|Beeper) # custom animation +windowrulev2 = move 46.5% 5%, class:(thorium-app.shortwave.com__-Default|thorium-mdpkiolbdkhdjpekfbkbmhigcaggjagi-Profile_1|thorium-lnachpgegbbmnnlgpokibfjlmppeciah-Default|Beeper) +windowrulev2 = animation slide right top, class:(thorium-app.shortwave.com__-Default|thorium-mdpkiolbdkhdjpekfbkbmhigcaggjagi-Profile_1|thorium-lnachpgegbbmnnlgpokibfjlmppeciah-Default|Beeper) + +# bitwarden chrome extension popup +windowrulev2 = pin, class:(thorium-nngceckbapebfimnlniiiahkandclblb-Default) +windowrulev2 = float, class:(thorium-nngceckbapebfimnlniiiahkandclblb-Default) +windowrulev2 = stayfocused, class:(thorium-nngceckbapebfimnlniiiahkandclblb-Default) + + +# removes title/border +windowrulev2 = fullscreenstate 0 2, class:(thorium-mdpkiolbdkhdjpekfbkbmhigcaggjagi-Profile_1|thorium-lnachpgegbbmnnlgpokibfjlmppeciah-Default) + +# Full screen applications + +# Games +windowrulev2 = fullscreen, class:(genshinimpact.exe) # Special rules for Conky and stalonetray windowrulev2 = float, class:(Conky), manage=off windowrulev2 = float, class:(stalonetray), manage=off +# util apps +windowrulev2 = float, title:(nmd|cliphist|pulsemixer|ranger|btop) +windowrulev2 = stayfocused, title:(btop) +windowrulev2 = pin, title:(btop) + # PIP windowrulev2 = float, initialClass:^()$, title:^(Picture in picture)$ windowrulev2 = pin, initialClass:^()$, title:^(Picture in picture)$ @@ -73,20 +106,18 @@ windowrulev2 = stayfocused, class:^(xdg-desktop-portal-gtk)$ # Opacity rules windowrulev2 = opacity 1.00 0.90, class:^Bar$ windowrulev2 = opacity 1.00 0.90, class:^slop$ -windowrulev2 = opacity 0.85 0.75, class:^Alacritty$ && focused -windowrulev2 = opacity 0.75 0.65, class:^Alacritty$ && !focused windowrulev2 = opacity 0.85 0.75, class:^code-oss$ windowrulev2 = opacity 0.85 0.75, class:^Code$ -windowrulev2 = opacity 0.85 0.75, class:^Beeper$ windowrulev2 = opacity 1.00 0.90, class:^TelegramDesktop$ windowrulev2 = opacity 0.90 0.80, class:^Spotify$ windowrulev2 = opacity 0.90 0.80, class:^Cider$ windowrulev2 = opacity 0.50 0.40, class:^fcitx$ windowrulev2 = opacity 0.90 0.80, class:^Brave-browser$ windowrulev2 = opacity 0.80 0.70, class:^Thunar$ -windowrulev2 = opacity 0.65 0.55, class:^discord$ +windowrulev2 = opacity 0.85 0.75, class:^discord$ windowrulev2 = opacity 0.90 0.80, class:^Caja$ windowrulev2 = opacity 0.80 0.70, class:^polkit-gnome-authentication-agent-1$ +windowrulev2 = opacity 0.8 0.5, title:New Tab # Layer rules/blur @@ -100,6 +131,7 @@ layerrule = blur,swaync-control-center layerrule = ignorezero,swaync-control-center layerrule = blur,logout_dialog layerrule = blur,waybar +layerrule = ignorealpha 0, waybar # xwaylandvideobridge windowrulev2 = opacity 0.0 override, class:^(xwaylandvideobridge)$ diff --git a/dot-config/hypr/xdph.conf b/dot-config/hypr/xdph.conf new file mode 100644 index 00000000..14b10608 --- /dev/null +++ b/dot-config/hypr/xdph.conf @@ -0,0 +1,3 @@ +screencopy { + max_fps = 0 +} -- cgit v1.2.3