From 28a9c3632334c9f87eef53bdf130b47067601c8a Mon Sep 17 00:00:00 2001 From: VectorKappa Date: Fri, 24 Nov 2023 11:37:12 +0100 Subject: [PATCH] Hyprland config + touchscreen mode for my new laptop --- bin/touch-mode | 12 ++ hyprland/.config/hypr/autostart.sh | 7 + hyprland/.config/hypr/hyprland.conf | 41 +++- waybar/.config/waybar/config | 177 ++++++++++++++++ waybar/.config/waybar/launcher.sh | 10 + waybar/.config/waybar/style.css | 305 ++++++++++++++++++++++++++++ 6 files changed, 547 insertions(+), 5 deletions(-) create mode 100755 bin/touch-mode create mode 100755 hyprland/.config/hypr/autostart.sh create mode 100644 waybar/.config/waybar/config create mode 100755 waybar/.config/waybar/launcher.sh create mode 100644 waybar/.config/waybar/style.css diff --git a/bin/touch-mode b/bin/touch-mode new file mode 100755 index 0000000..f21044e --- /dev/null +++ b/bin/touch-mode @@ -0,0 +1,12 @@ +#!/bin/zsh +if [ -e /tmp/.touchmode.lock ]; then + # disable touchmode + hyprctl keyword monitor "eDP-1,1920x1080@60,0x0,1" + pkill nwg-dock-hyprl + rm /tmp/.touchmode.lock +else + # enable touchmode + hyprctl keyword monitor "eDP-1,1920x1080@60,0x0,1.5" + nwg-dock-hyprland & disown; + touch /tmp/.touchmode.lock +fi diff --git a/hyprland/.config/hypr/autostart.sh b/hyprland/.config/hypr/autostart.sh new file mode 100755 index 0000000..99daa3f --- /dev/null +++ b/hyprland/.config/hypr/autostart.sh @@ -0,0 +1,7 @@ +#!/bin/dash +xhost + local: ; +swww init; +flameshot & disown; +/usr/lib/mate-polkit/polkit-mate-authentication-agent-1 & +wayvnc & disown; +$HOME/.config/waybar/launcher.sh diff --git a/hyprland/.config/hypr/hyprland.conf b/hyprland/.config/hypr/hyprland.conf index 9e8cf88..4013ee0 100644 --- a/hyprland/.config/hypr/hyprland.conf +++ b/hyprland/.config/hypr/hyprland.conf @@ -5,6 +5,7 @@ monitor=DP-1,1920x1080@60,0x0,1 monitor=DP-3,1920x1080@60,1920x0,1 +monitor=eDP-1,1920x1080@60,0x0,1 #workspace=DP-1,1 workspace=1, m:DP-1 workspace=2, m:DP-1 @@ -26,6 +27,9 @@ input { kb_rules= numlock_by_default=true follow_mouse=1 + touchpad { + natural_scroll=true + } } general { @@ -67,12 +71,17 @@ dwindle { #windowrule=pseudo,abc #windowrule=monitor 0,xyz +exec-once=$HOME/.local/share/hyprload/hyprload.sh # example binds bind=SUPER,Z,exec,alacritty +bind=SUPERSHIFT,Z,exec,kitty bind=SUPER,X,killactive, bind=SUPER_SHIFT,Q,exit, bind=SUPER,E,exec,nemo -bind=SUPER,F,togglefloating, +bind=SUPER,F,fullscreen,1 +bind=SUPERSHIFT,F,fullscreen,0 +bind=SUPERSHIFT,L,exec,gtklock +bind=SUPER,T,togglefloating, bind=SUPER,R,exec,wofi --show drun -o DP-3 bind=SUPER,P,pseudo, bind=SUPER,SPACE,exec,rofi -modi drun,run,window,calc -show drun @@ -86,6 +95,9 @@ bind=SUPER,right,movefocus,r bind=SUPER,up,movefocus,u bind=SUPER,down,movefocus,d +bindm = SUPER, mouse:272, movewindow +bindm = SUPER, mouse:273, resizewindow + bind=SUPER,1,workspace,1 bind=SUPER,2,workspace,2 bind=SUPER,3,workspace,3 @@ -108,13 +120,33 @@ bind=SUPER_SHIFT,8,movetoworkspace,8 bind=SUPER_SHIFT,9,movetoworkspace,9 bind=SUPER_SHIFT,0,movetoworkspace,10 -exec-once=/usr/lib/mate-polkit/polkit-mate-authentication-agent-1 -exec-once=/bin/eww open bar +bind=SUPERSHIFT,S,exec,flameshot gui + +# T14gen2 FN KEYS + +bind=,XF86AudioMicMute,exec,amixer set Capture toggle +bind=,XF86AudioMute,exec,amixer set Master toggle +bind=,XF86AudioRaiseVolume,exec,amixer set Master playback 5%+ +bind=,XF86AudioLowerVolume,exec,amixer set Master playback 5%- +bind=,XF86MonBrightnessUp,exec,xbacklight -inc 5 +bind=,XF86MonBrightnessDown,exec,xbacklight -dec 5 +bind=,XF86Launch2,exec,touch-mode +bind=CTRL,XF86Launch2,exec,hyprctl keyword monitor "eDP-1,1920x1080@60,0x0,1" +bind=SHIFT,XF86Launch2,exec,hyprctl keyword monitor "eDP-1,1920x1080@60,0x0,1.5" +bind=SHIFT,XF86MonBrightnessDown,exec,xbacklight -set 0.01 +bind=SHIFT,XF86MonBrightnessUp,exec,xbacklight -set 100 + +exec-once=dash $HOME/.config/hypr/autostart.sh +exec-once=hyprctl setcursor Vimix-white-cursors 24 +exec-once=dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP windowrulev2 = opacity 0.0 override 0.0 override,class:^(xwaylandvideobridge)$ windowrulev2 = nofocus,class:^(xwaylandvideobridge)$ windowrulev2 = noinitialfocus,class:^(xwaylandvideobridge)$ +windowrulev2 = pin,class:^(scrcpy)$ +windowrulev2 = move onscreen 100%-30,class:^(scrcpy)$ + plugin:hyprfocus { enabled = yes @@ -135,7 +167,7 @@ plugin:hyprfocus { } shrink { - shrink_percentage = 0.9 + shrink_percentage = 0.98 in_bezier = bezIn in_speed = 0.5 @@ -145,4 +177,3 @@ plugin:hyprfocus { } } -exec-once=$HOME/.local/share/hyprload/hyprload.sh diff --git a/waybar/.config/waybar/config b/waybar/.config/waybar/config new file mode 100644 index 0000000..81d0bac --- /dev/null +++ b/waybar/.config/waybar/config @@ -0,0 +1,177 @@ +{ + "layer": "top", // Waybar at top layer + // "position": "bottom", // Waybar position (top|bottom|left|right) + "height": 30, // Waybar height (to be removed for auto height) + // "width": 1280, // Waybar width + "spacing": 4, // Gaps between modules (4px) + // Choose the order of the modules + "modules-left": ["custom/archicon","hyprland/workspaces", "sway/mode", "sway/scratchpad", "custom/media"], + "modules-center": ["hyprland/window"], + "modules-right": ["mpd", "idle_inhibitor", "pulseaudio", "network", "cpu", "memory", "temperature", "backlight", "keyboard-state", "sway/language", "battery", "clock", "tray"], + // Modules configuration + // "sway/workspaces": { + // "disable-scroll": true, + // "all-outputs": true, + // "warp-on-scroll": false, + // "format": "{name}: {icon}", + // "format-icons": { + // "1": "", + // "2": "", + // "3": "", + // "4": "", + // "5": "", + // "urgent": "", + // "focused": "", + // "default": "" + // } + // }, + "hyprland/workspaces":{ + "active-only":false, + "format":"{name}", + "persistent-workspaces": { + "*":10, + }, + }, + "keyboard-state": { + "numlock": false, + "capslock": true, + "format": "{name} {icon}", + "format-icons": { + "locked": "", + "unlocked": "" + } + }, + "sway/mode": { + "format": "{}" + }, + "sway/scratchpad": { + "format": "{icon} {count}", + "show-empty": false, + "format-icons": ["", ""], + "tooltip": true, + "tooltip-format": "{app}: {title}" + }, + "mpd": { + "format": "{stateIcon} {consumeIcon}{randomIcon}{repeatIcon}{singleIcon}{artist} - {album} - {title} ({elapsedTime:%M:%S}/{totalTime:%M:%S}) ⸨{songPosition}|{queueLength}⸩ {volume}% ", + "format-disconnected": "Disconnected ", + "format-stopped": "{consumeIcon}{randomIcon}{repeatIcon}{singleIcon}Stopped ", + "unknown-tag": "N/A", + "interval": 2, + "consume-icons": { + "on": " " + }, + "random-icons": { + "off": " ", + "on": " " + }, + "repeat-icons": { + "on": " " + }, + "single-icons": { + "on": "1 " + }, + "state-icons": { + "paused": "", + "playing": "" + }, + "tooltip-format": "MPD (connected)", + "tooltip-format-disconnected": "MPD (disconnected)" + }, + "idle_inhibitor": { + "format": "{icon}", + "format-icons": { + "activated": "", + "deactivated": "" + } + }, + "tray": { + // "icon-size": 21, + "spacing": 10 + }, + "clock": { + // "timezone": "America/New_York", + "tooltip-format": "{:%Y %B}\n{calendar}", + "format-alt": "{:%Y-%m-%d}" + }, + "cpu": { + "format": "{usage}% ", + "tooltip": false + }, + "memory": { + "format": "{}% " + }, + "temperature": { + // "thermal-zone": 2, + // "hwmon-path": "/sys/class/hwmon/hwmon2/temp1_input", + "critical-threshold": 80, + // "format-critical": "{temperatureC}°C {icon}", + "format": "{temperatureC}°C {icon}", + "format-icons": ["", "", " "] + }, + "backlight": { + // "device": "acpi_video1", + "format": "{percent}% {icon}", + "format-icons": ["", "", "", "", "", "", "", "", ""] + }, + "battery": { + "states": { + // "good": 95, + "warning": 30, + "critical": 15 + }, + "format": "{capacity}% {icon}", + "format-charging": "{capacity}% ", + "format-plugged": "{capacity}% ", + "format-alt": "{time} {icon}", + // "format-good": "", // An empty format will hide the module + // "format-full": "", + "format-icons": ["", "", "", "", ""] + }, + "network": { + // "interface": "wlp2*", // (Optional) To force the use of this interface + "format-wifi": "{essid} ({signalStrength}%) ", + "format-ethernet": "{ipaddr}/{cidr} 󰈀", + "tooltip-format": "{ifname} via {gwaddr} ", + "format-linked": "{ifname} (No IP) ", + "format-disconnected": "Disconnected ⚠", + "format-alt": "{ifname}: {ipaddr}/{cidr}", + "on-click-right": "kitty nmtui" + }, + "pulseaudio": { + // "scroll-step": 1, // %, can be a float + "format": "{volume}% {icon} {format_source}", + "format-bluetooth": "{volume}% {icon} {format_source}", + "format-bluetooth-muted": "󰝟 {icon} {format_source}", + "format-muted": "󰝟 {format_source}", + "format-source": "{volume}% ", + "format-source-muted": "", + "format-icons": { + "headphone": "", + "hands-free": "", + "headset": "", + "phone": "", + "portable": "", + "car": "", + "default": ["", "", ""] + }, + "on-click": "pavucontrol" + }, + "custom/media": { + "format": "{icon} {}", + "return-type": "json", + "max-length": 40, + "format-icons": { + "spotify": "", + "default": "🎜" + }, + "escape": true, + "exec": "$HOME/.config/waybar/mediaplayer.py 2> /dev/null" // Script in resources folder + // "exec": "$HOME/.config/waybar/mediaplayer.py --player spotify 2> /dev/null" // Filter player based on name + }, + "custom/archicon": { + "format":"󰣇", + "on-click":"nwg-menu -d -fm nemo -cmd-lock gtklock -va top", + "tooltip":false, + } + +} diff --git a/waybar/.config/waybar/launcher.sh b/waybar/.config/waybar/launcher.sh new file mode 100755 index 0000000..130cf19 --- /dev/null +++ b/waybar/.config/waybar/launcher.sh @@ -0,0 +1,10 @@ +#!/bin/dash +CONFIG_FILES="$HOME/.config/waybar/config $HOME/.config/waybar/style.css" + +trap "killall waybar" EXIT + +while true; do + waybar & + inotifywait -e create,modify $CONFIG_FILES + killall waybar +done diff --git a/waybar/.config/waybar/style.css b/waybar/.config/waybar/style.css new file mode 100644 index 0000000..2c3c38e --- /dev/null +++ b/waybar/.config/waybar/style.css @@ -0,0 +1,305 @@ +* { + /* `otf-font-awesome` is required to be installed for icons */ + font-family: "NotoSans NFP", FontAwesome, Roboto, Helvetica, Arial, sans-serif; + font-size: 13px; +} + +window#waybar { + background-color: rgba(43, 48, 59, 0.5); + border-bottom: 3px solid rgba(100, 114, 125, 0.5); + color: #ffffff; + transition-property: background-color; + transition-duration: .5s; +} + +window#waybar.hidden { + opacity: 0.2; +} + +/* +window#waybar.empty { + background-color: transparent; +} +window#waybar.solo { + background-color: #FFFFFF; +} +*/ + +window#waybar.termite { + background-color: #3F3F3F; +} + +window#waybar.chromium { + background-color: #000000; + border: none; +} + +button { + /* Use box-shadow instead of border so the text isn't offset */ + box-shadow: inset 0 -3px transparent; + /* Avoid rounded borders under each button name */ + border: none; + border-radius: 0; +} + +/* https://github.com/Alexays/Waybar/wiki/FAQ#the-workspace-buttons-have-a-strange-hover-effect */ +button:hover { + background: inherit; + box-shadow: inset 0 -3px #ffffff; +} + +#workspaces button { + padding: 0 5px; + background-color: transparent; + color: #ffffff; +} + +#workspaces button:hover { + background: rgba(0, 0, 0, 0.2); +} + +#workspaces button.active { + background-color: #64727D; + box-shadow: inset 0 -3px #ffffff; +} + +#workspaces button.urgent { + background-color: #eb4d4b; +} + +#mode { + background-color: #64727D; + border-bottom: 3px solid #ffffff; +} + +#clock, +#battery, +#cpu, +#memory, +#disk, +#temperature, +#backlight, +#network, +#pulseaudio, +#wireplumber, +#custom-media, +#tray, +#mode, +#idle_inhibitor, +#scratchpad, +#mpd { + padding: 0 10px; + color: #ffffff; +} + +#window, +#workspaces { + margin: 0 4px; +} + +/* If workspaces is the leftmost module, omit left margin */ +.modules-left > widget:first-child > #workspaces { + margin-left: 0; +} + +/* If workspaces is the rightmost module, omit right margin */ +.modules-right > widget:last-child > #workspaces { + margin-right: 0; +} + +#clock { + background-color: #64727D; +} + +#battery { + background-color: #ffffff; + color: #000000; +} + +#battery.charging, #battery.plugged { + color: #ffffff; + background-color: #26A65B; +} + +@keyframes blink { + to { + background-color: #ffffff; + color: #000000; + } +} + +#battery.critical:not(.charging) { + background-color: #f53c3c; + color: #ffffff; + animation-name: blink; + animation-duration: 0.5s; + animation-timing-function: linear; + animation-iteration-count: infinite; + animation-direction: alternate; +} + +label:focus { + background-color: #000000; +} + +#cpu { + background-color: #2ecc71; + color: #000000; +} + +#memory { + background-color: #9b59b6; +} + +#disk { + background-color: #964B00; +} + +#backlight { + background-color: #90b1b1; +} + +#network { + background-color: #2980b9; +} + +#network.disconnected { + background-color: #f53c3c; +} + +#pulseaudio { + background-color: #f1c40f; + color: #000000; +} + +#pulseaudio.muted { + background-color: #90b1b1; + color: #2a5c45; +} + +#wireplumber { + background-color: #fff0f5; + color: #000000; +} + +#wireplumber.muted { + background-color: #f53c3c; +} + +#custom-media { + background-color: #66cc99; + color: #2a5c45; + min-width: 100px; +} + +#custom-media.custom-spotify { + background-color: #66cc99; +} + +#custom-media.custom-vlc { + background-color: #ffa000; +} + +#temperature { + background-color: #f0932b; +} + +#temperature.critical { + background-color: #eb4d4b; +} + +#tray { + background-color: #2980b9; +} + +#tray > .passive { + -gtk-icon-effect: dim; +} + +#tray > .needs-attention { + -gtk-icon-effect: highlight; + background-color: #eb4d4b; +} + +#idle_inhibitor { + background-color: #2d3436; +} + +#idle_inhibitor.activated { + background-color: #ecf0f1; + color: #2d3436; +} + +#mpd { + background-color: #66cc99; + color: #2a5c45; +} + +#mpd.disconnected { + background-color: #f53c3c; +} + +#mpd.stopped { + background-color: #90b1b1; +} + +#mpd.paused { + background-color: #51a37a; +} + +#language { + background: #00b093; + color: #740864; + padding: 0 5px; + margin: 0 5px; + min-width: 16px; +} + +#keyboard-state { + background: #97e1ad; + color: #000000; + padding: 0 0px; + margin: 0 5px; + min-width: 16px; +} + +#keyboard-state > label { + padding: 0 5px; +} + +#keyboard-state > label.locked { + background: rgba(0, 0, 0, 0.2); +} + +#scratchpad { + background: rgba(0, 0, 0, 0.2); +} + +#scratchpad.empty { + background-color: transparent; +} + +#privacy { + padding: 0; +} + +#privacy-item { + padding: 0 5px; + color: white; +} + +#privacy-item.screenshare { + background-color: #cf5700; +} + +#privacy-item.audio-in { + background-color: #1ca000; +} + +#privacy-item.audio-out { + background-color: #0069d4; +} +#custom-archicon { + background-color: #ff0000; + min-width: 40px; +}