diff --git a/hyprland/.config/hypr/hyprland.conf b/hyprland/.config/hypr/hyprland.conf index 898a5fb..04433ed 100644 --- a/hyprland/.config/hypr/hyprland.conf +++ b/hyprland/.config/hypr/hyprland.conf @@ -22,9 +22,9 @@ ################ # See https://wiki.hyprland.org/Configuring/Monitors/ -monitor= desc:Samsung Electric Company Odyssey G95SC H1AK500000, 5120x1440@120, 0x0, 1 -monitor= desc:Acer Technologies VG271U M3 1322131231233, preferred, auto-left, 1, transform, 3 - +#monitor= desc:Samsung Electric Company Odyssey G95SC H1AK500000, 5120x1440@120, 0x0, 1 +#monitor= desc:Acer Technologies VG271U M3 1322131231233, preferred, auto-left, 1, transform, 3 +monitor= eDP-1, preferred, -1920x0, 1 ################### ### MY PROGRAMS ### @@ -47,14 +47,16 @@ $powerMenu = rofi -show power-menu -modi power-menu:rofi-power-menu -theme round # Autostart necessary processes (like notifications daemons, status bars, etc.) # Or execute your favorite apps at launch like this: +exec-once = hyprpm reload exec-once = waybar exec-once = hyprpaper exec-once = hypridle exec-once = systemctl --user start hyprpolkitagent exec-once = swaync exec-once = steam -silent -exec-once = [workspace 4] flatpak run com.discordapp.Discord --start-minimized - +exec-once = flatpak run com.discordapp.Discord --start-minimized +exec-once = iio-hyprland --left-master eDP-1 +# exec-once = sysboard ############################# ### ENVIRONMENT VARIABLES ### @@ -75,16 +77,16 @@ env = PATH,$PATH:$HOME/.local/bin # https://wiki.hyprland.org/Configuring/Variables/#general general { gaps_in = 5 - gaps_out = 20 + gaps_out = 10 border_size = 2 # https://wiki.hyprland.org/Configuring/Variables/#variable-types for info about colors - col.active_border = rgba(33ccffee) rgba(00ff99ee) 45deg + col.active_border = rgba(6c0a6eee) rgba(e664e8ee) 45deg col.inactive_border = rgba(595959aa) # Set to true enable resizing windows by clicking and dragging on borders and gaps - resize_on_border = false + resize_on_border = true # Please see https://wiki.hyprland.org/Configuring/Tearing/ before you turn this on allow_tearing = false @@ -163,7 +165,7 @@ animations { # windowrulev2 = opacity 1 .9, title:(Jellyfin Media Player) # Disable idle when fullscreen app is enabled -windowrulev2 = idleinhibit fullscreen, class:.* +# windowrulev2 = idleinhibit fullscreen, class:.* # See https://wiki.hyprland.org/Configuring/Dwindle-Layout/ for more dwindle { @@ -235,10 +237,10 @@ source = ~/.config/hypr/keybinds.conf # See https://wiki.hyprland.org/Configuring/Workspace-Rules/ for workspace rules # Ignore maximize requests from apps. You'll probably like this. -windowrulev2 = suppressevent maximize, class:.* +# windowrulev2 = suppressevent maximize, class:.* # Fix some dragging issues with XWayland -windowrulev2 = nofocus,class:^$,title:^$,xwayland:1,floating:1,fullscreen:0,pinned:0 +# windowrulev2 = nofocus,class:^$,title:^$,xwayland:1,floating:1,fullscreen:0,pinned:0 #Multi-monitor Worksapces workspace = 1, monitor: DP-1 @@ -249,3 +251,44 @@ workspace = 5, monitor: DP-2 workspace = 6, monitor: DP-2 workspace = 7, monitor: DP-2 workspace = 8, monitor: DP-2 + +hyprgrass-bind = , edge:d:u, exec, sh $HOME/.config/hypr/toggle_kbd.sh +plugin { + touch_gestures { + # The default sensitivity is probably too low on tablet screens, + # I recommend turning it up to 4.0 + sensitivity = 1.0 + + # must be >= 3 + workspace_swipe_fingers = 3 + + # switching workspaces by swiping from an edge, this is separate from workspace_swipe_fingers + # and can be used at the same time + # possible values: l, r, u, or d + # to disable it set it to anything else + workspace_swipe_edge = nope + + # in milliseconds + long_press_delay = 400 + + # resize windows by long-pressing on window borders and gaps. + # If general:resize_on_border is enabled, general:extend_border_grab_area is used for floating + # windows + resize_on_border_long_press = true + + # in pixels, the distance from the edge that is considered an edge + edge_margin = 10 + + # emulates touchpad swipes when swiping in a direction that does not trigger workspace swipe. + # ONLY triggers when finger count is equal to workspace_swipe_fingers + # + # might be removed in the future in favor of event hooks + emulate_touchpad_swipe = false + + experimental { + # send proper cancel events to windows instead of hacky touch_up events, + # NOT recommended as it crashed a few times, once it's stabilized I'll make it the default + send_cancel = 0 + } + } +} diff --git a/hyprland/.config/hypr/hyprland.conf.save b/hyprland/.config/hypr/hyprland.conf.save deleted file mode 100644 index d9d525c..0000000 --- a/hyprland/.config/hypr/hyprland.conf.save +++ /dev/null @@ -1,223 +0,0 @@ - -# ####################################################################################### -# AUTOGENERATED HYPRLAND CONFIG. -# PLEASE USE THE CONFIG PROVIDED IN THE GIT REPO /examples/hyprland.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/ - -# 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= DP-1, 5120x1440@120, 0x0, 1 - - -################### -### MY PROGRAMS ### -################### - -# See https://wiki.hyprland.org/Configuring/Keywords/ - -# Set programs that you use -$terminal = kitty -$fileManager = comsic-files -$menu = rofi -show drun -theme rounded-purple-dark -$windowSwitcher = rofi -show window -theme rounded-purple-dark -$powerMenu = rofi -show power-menu -modi power-menu:rofi-power-menu -theme rounded-purple-dark - - -################# -### AUTOSTART ### -################# - -# Autostart necessary processes (like notifications daemons, status bars, etc.) -# Or execute your favorite apps at launch like this: - -exec-once = waybar -exec-once = hyprpaper -exec-once = hypridle -exec-once = systemctl --user start polkit-gnome - - -############################# -### ENVIRONMENT VARIABLES ### -############################# - -# See https://wiki.hyprland.org/Configuring/Environment-variables/ - -env = XCURSOR_SIZE,24 -env = HYPRCURSOR_SIZE,24 -env = PATH,$PATH:$HOME/.local/bin - -##################### -### LOOK AND FEEL ### -##################### - -# Refer to https://wiki.hyprland.org/Configuring/Variables/ - -# https://wiki.hyprland.org/Configuring/Variables/#general -general { - gaps_in = 5 - gaps_out = 20 - - border_size = 2 - - # https://wiki.hyprland.org/Configuring/Variables/#variable-types for info about colors - col.active_border = rgba(33ccffee) rgba(00ff99ee) 45deg - col.inactive_border = rgba(595959aa) - - # Set to true enable resizing windows by clicking and dragging on borders and gaps - resize_on_border = false - - # Please see https://wiki.hyprland.org/Configuring/Tearing/ before you turn this on - allow_tearing = false - - layout = dwindle -} - -# https://wiki.hyprland.org/Configuring/Variables/#decoration -decoration { - rounding = 10 - - # Change transparency of focused and unfocused windows - active_opacity = 1.0 - inactive_opacity = 1.0 - - shadow { - enabled = true - range = 4 - render_power = 3 - color = rgba(1a1a1aee) - } - - # https://wiki.hyprland.org/Configuring/Variables/#blur - blur { - enabled = true - size = 3 - passes = 1 - - vibrancy = 0.1696 - } -} - -# https://wiki.hyprland.org/Configuring/Variables/#animations -animations { - enabled = yes, please :) - - # Default animations, see https://wiki.hyprland.org/Configuring/Animations/ for more - - bezier = easeOutQuint,0.23,1,0.32,1 - bezier = easeInOutCubic,0.65,0.05,0.36,1 - bezier = linear,0,0,1,1 - bezier = almostLinear,0.5,0.5,0.75,1.0 - bezier = quick,0.15,0,0.1,1 - - animation = global, 1, 10, default - animation = border, 1, 5.39, easeOutQuint - animation = windows, 1, 4.79, easeOutQuint - animation = windowsIn, 1, 4.1, easeOutQuint, popin 87% - animation = windowsOut, 1, 1.49, linear, popin 87% - animation = fadeIn, 1, 1.73, almostLinear - animation = fadeOut, 1, 1.46, almostLinear - animation = fade, 1, 3.03, quick - animation = layers, 1, 3.81, easeOutQuint - animation = layersIn, 1, 4, easeOutQuint, fade - animation = layersOut, 1, 1.5, linear, fade - animation = fadeLayersIn, 1, 1.79, almostLinear - animation = fadeLayersOut, 1, 1.39, almostLinear - animation = workspaces, 1, 1.94, almostLinear, fade - animation = workspacesIn, 1, 1.21, almostLinear, fade - animation = workspacesOut, 1, 1.94, almostLinear, fade -} - -# Ref https://wiki.hyprland.org/Configuring/Workspace-Rules/ -# "Smart gaps" / "No gaps when only" -# uncomment all if you wish to use that. -# workspace = w[tv1], gapsout:0, gapsin:0 -# workspace = f[1], gapsout:0, gapsin:0 -# windowrulev2 = bordersize 0, floating:0, onworkspace:w[tv1] -# windowrulev2 = rounding 0, floating:0, onworkspace:w[tv1] -# windowrulev2 = bordersize 0, floating:0, onworkspace:f[1] -# windowrulev2 = rounding 0, floating:0, onworkspace:f[1] - -# windowrulev2 = opacity 1 .9, title:(Jellyfin Media Player) - -# See https://wiki.hyprland.org/Configuring/Dwindle-Layout/ for more -dwindle { - pseudotile = true # Master switch for pseudotiling. Enabling is bound to mainMod + P in the keybinds section below - preserve_split = true # You probably want this -} - -# See https://wiki.hyprland.org/Configuring/Master-Layout/ for more -master { - new_status = master -} - -# https://wiki.hyprland.org/Configuring/Variables/#misc -misc { - force_default_wallpaper = -1 # Set to 0 or 1 to disable the anime mascot wallpapers - disable_hyprland_logo = false # If true disables the random hyprland logo / anime girl background. :( -} - - -############# -### INPUT ### -############# - -# https://wiki.hyprland.org/Configuring/Variables/#input -input { - kb_layout = us - kb_variant = - kb_model = - kb_options = - kb_rules = - - follow_mouse = 1 - - sensitivity = 0 # -1.0 - 1.0, 0 means no modification. - - touchpad { - natural_scroll = false - } -} - -# Example per-device config -# See https://wiki.hyprland.org/Configuring/Keywords/#per-device-input-configs for more -device { - name = epic-mouse-v1 - sensitivity = -0.5 -} - - -################### -### KEYBINDINGS ### -################### - -source = ~/.config/hypr/keybinds.conf - -############################## -### WINDOWS AND WORKSPACES ### -############################## - -# See https://wiki.hyprland.org/Configuring/Window-Rules/ for more -# See https://wiki.hyprland.org/Configuring/Workspace-Rules/ for workspace rules - -# Ignore maximize requests from apps. You'll probably like this. -windowrulev2 = suppressevent maximize, class:.* - -# Fix some dragging issues with XWayland -windowrulev2 = nofocus,class:^$,title:^$,xwayland:1,floating:1,fullscreen:0,pinned:0 - diff --git a/hyprland/.config/hypr/toggle_kbd.sh b/hyprland/.config/hypr/toggle_kbd.sh new file mode 100644 index 0000000..99a1ae0 --- /dev/null +++ b/hyprland/.config/hypr/toggle_kbd.sh @@ -0,0 +1,7 @@ +pid=`pgrep wvkbd`; + +if [ $pid > '0' ]; then + `kill $pid` +else + wvkbd-mobintl +fi diff --git a/waybar/.config/waybar/config b/waybar/.config/waybar/config index 7e9d7f2..65fc700 100644 --- a/waybar/.config/waybar/config +++ b/waybar/.config/waybar/config @@ -17,6 +17,7 @@ "memory", "temperature", "clock", + "battery", "custom/notification", "custom/power", ], @@ -45,7 +46,7 @@ "format": "{:%I:%M %p | %a, %Y-%m-%d}", }, "cpu": { - "format": "{avg_frequency}GHz {usage}% 󰻠", + "format": "{usage}% 󰻠", "tooltip": false }, "memory": { @@ -84,6 +85,18 @@ "tray": { "spacing": 10 }, + "battery": { + "states": { + "warning": 30, + "critical": 10, + }, + "format": "{icon} {capacity}%", + "format-charging": "󰂄 {capacity}%", + "format-plugged": " {capacity}%", + "format-alt": "{time} {icon}", + "format-full": "󰁹 {capacity}%", + "format-icons": ["󰁺", "󰁼", "󰂁"] + }, "custom/power": { "format": "⏻", "on-click": "rofi -show power-menu -modi power-menu:rofi-power-menu -theme rounded-purple-dark",