From 72b6a76d9a4e455251dfffd67ee45a0ce475a57b Mon Sep 17 00:00:00 2001 From: Thomas Forgione Date: Sun, 6 Apr 2025 00:01:51 +0200 Subject: [PATCH] Working on hypr --- hypr/hyprland.conf | 84 +++++++++++------ hypr/waybar.jsonc | 220 --------------------------------------------- waybar/config | 215 +++++++++++++++++++++++--------------------- waybar/style.css | 33 ++++--- 4 files changed, 185 insertions(+), 367 deletions(-) delete mode 100644 hypr/waybar.jsonc diff --git a/hypr/hyprland.conf b/hypr/hyprland.conf index b4ea34c..954f8d1 100644 --- a/hypr/hyprland.conf +++ b/hypr/hyprland.conf @@ -15,7 +15,30 @@ ################ # See https://wiki.hyprland.org/Configuring/Monitors/ -monitor=,preferred,auto,1 +monitor=DP-3, 2560x1440@59.95100, 0x0, 1 +# monitor=DP-2, 1920x1080@60.00, 2561x0, 1 +monitor=DP-2, disable +monitor=HDMI-A-1, disable + +workspace = 11, monitor:DP-3, default:true +workspace = 12, monitor:DP-3 +workspace = 13, monitor:DP-3 +workspace = 14, monitor:DP-3 +workspace = 15, monitor:DP-3 +workspace = 16, monitor:DP-3 +workspace = 17, monitor:DP-3 +workspace = 18, monitor:DP-3 +workspace = 19, monitor:DP-3 + +workspace = 21, monitor:DP-2, default:true +workspace = 22, monitor:DP-2 +workspace = 23, monitor:DP-2 +workspace = 24, monitor:DP-2 +workspace = 25, monitor:DP-2 +workspace = 26, monitor:DP-2 +workspace = 27, monitor:DP-2 +workspace = 28, monitor:DP-2 +workspace = 29, monitor:DP-2 ################### @@ -27,7 +50,7 @@ monitor=,preferred,auto,1 # Set programs that you use $terminal = alacritty $fileManager = dolphin -$menu = wofi --show drun +$menu = rofi -show drun -theme ~/.config/rofi/theme.rasi ################# @@ -44,7 +67,6 @@ exec-once = nm-applet & exec-once = flameshot & exec-once = blueberry-tray & exec-once = nextcloud --background & -exec-once = numlockx on ############################# @@ -164,6 +186,7 @@ master { 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. :( + focus_on_activate = true } @@ -182,6 +205,7 @@ input { follow_mouse = 1 sensitivity = 0 # -1.0 - 1.0, 0 means no modification. + numlock_by_default = true touchpad { natural_scroll = false @@ -210,17 +234,27 @@ $mainMod = SUPER # Sets "Windows" key as main modifier # Example binds, see https://wiki.hyprland.org/Configuring/Binds/ for more bind = $mainMod, return, exec, $terminal -bind = $mainMod SHIFT, E, exec, /home/thomas/.config/dotfiles/bin/clone-terminal +bind = $mainMod SHIFT, E, exec, $terminal bind = $mainMod, A, exec, firefox bind = $mainMod SHIFT, C, killactive, -bind = $mainMod SHIFT, Q, exec, hyprctl dispatch exit -bind = $mainMod, M, exit, bind = $mainMod, E, exec, $fileManager bind = $mainMod, V, togglefloating, bind = $mainMod, R, exec, $menu bind = $mainMod, P, pseudo, # dwindle bind = $mainMod, J, togglesplit, # dwindle +bind = $mainMod SHIFT, Right, movewindow,mon:r +bind = $mainMod SHIFT, Left, movewindow,mon:l +bind = $mainMod, Tab, cyclenext + + +bind = $mainMod SHIFT, Q, exit +bind = $mainMod CTRL, R, exec, hyprctl reload + +bind = $mainMod, Z, exec, firefox http://jdb.localhost/todo.html https://web.telegram.org https://web.whatsapp.com/ https://discord.com/app https://nuage.polymny.studio/index.php/apps/calendar/ https://mail.infomaniak.com/2 https://mail.infomaniak.com/0 + +bind = $mainMod, E, exec, firefox ext+container:name=Yuzzit&url=https://yip.atlassian.net/ ext+container:name=Yuzzit&url=https://app.slack.com/client/T03UFFGJK/D07KS0S1LDT ext+container:name=Yuzzit&url=https://app.gather.town/app/bZRkf3gh7MIximOa/ytopenspace + # Move focus with mainMod + arrow keys # bind = $mainMod, left, movefocus, l # bind = $mainMod, right, movefocus, r @@ -231,28 +265,26 @@ bind = $mainMod, left, workspace, e-1 bind = $mainMod, right, workspace, e+1 # Switch workspaces with mainMod + [0-9] -bind = $mainMod, code:10, workspace, 1 -bind = $mainMod, code:11, workspace, 2 -bind = $mainMod, code:12, workspace, 3 -bind = $mainMod, code:13, workspace, 4 -bind = $mainMod, code:14, workspace, 5 -bind = $mainMod, code:15, workspace, 6 -bind = $mainMod, code:16, workspace, 7 -bind = $mainMod, code:17, workspace, 8 -bind = $mainMod, code:18, workspace, 9 -bind = $mainMod, code:19, workspace, 10 +bind = $mainMod, code:10, exec, hyprsome workspace 1 +bind = $mainMod, code:11, exec, hyprsome workspace 2 +bind = $mainMod, code:12, exec, hyprsome workspace 3 +bind = $mainMod, code:13, exec, hyprsome workspace 4 +bind = $mainMod, code:14, exec, hyprsome workspace 5 +bind = $mainMod, code:15, exec, hyprsome workspace 6 +bind = $mainMod, code:16, exec, hyprsome workspace 7 +bind = $mainMod, code:17, exec, hyprsome workspace 8 +bind = $mainMod, code:18, exec, hyprsome workspace 9 # Move active window to a workspace with mainMod + SHIFT + [0-9] -bind = $mainMod SHIFT, code:10, movetoworkspace, 1 -bind = $mainMod SHIFT, code:11, movetoworkspace, 2 -bind = $mainMod SHIFT, code:12, movetoworkspace, 3 -bind = $mainMod SHIFT, code:13, movetoworkspace, 4 -bind = $mainMod SHIFT, code:14, movetoworkspace, 5 -bind = $mainMod SHIFT, code:15, movetoworkspace, 6 -bind = $mainMod SHIFT, code:16, movetoworkspace, 7 -bind = $mainMod SHIFT, code:17, movetoworkspace, 8 -bind = $mainMod SHIFT, code:18, movetoworkspace, 9 -bind = $mainMod SHIFT, code:19, movetoworkspace, 10 +bind = $mainMod SHIFT, code:10, exec, hyprsome movefocus 1 +bind = $mainMod SHIFT, code:11, exec, hyprsome movefocus 2 +bind = $mainMod SHIFT, code:12, exec, hyprsome movefocus 3 +bind = $mainMod SHIFT, code:13, exec, hyprsome movefocus 4 +bind = $mainMod SHIFT, code:14, exec, hyprsome movefocus 5 +bind = $mainMod SHIFT, code:15, exec, hyprsome movefocus 6 +bind = $mainMod SHIFT, code:16, exec, hyprsome movefocus 7 +bind = $mainMod SHIFT, code:17, exec, hyprsome movefocus 8 +bind = $mainMod SHIFT, code:18, exec, hyprsome movefocus 9 # Example special workspace (scratchpad) bind = $mainMod, S, togglespecialworkspace, magic diff --git a/hypr/waybar.jsonc b/hypr/waybar.jsonc deleted file mode 100644 index f7fab79..0000000 --- a/hypr/waybar.jsonc +++ /dev/null @@ -1,220 +0,0 @@ -// -*- mode: jsonc -*- -{ - // "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": [ - "sway/workspaces", - "sway/mode", - "sway/scratchpad", - "custom/media" - ], - "modules-center": [ - "sway/window" - ], - "modules-right": [ - "mpd", - "idle_inhibitor", - "pulseaudio", - "network", - "power-profiles-daemon", - "cpu", - "memory", - "temperature", - "backlight", - "keyboard-state", - "sway/language", - "battery", - "battery#bat2", - "clock", - "tray", - "custom/power" - ], - // 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": "" - // } - // }, - "keyboard-state": { - "numlock": true, - "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": 5, - "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, - // "icons": { - // "blueman": "bluetooth", - // "TelegramDesktop": "$HOME/.local/share/icons/hicolor/16x16/apps/telegram.png" - // } - }, - "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-full": "{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": ["", "", "", "", ""] - }, - "battery#bat2": { - "bat": "BAT2" - }, - "power-profiles-daemon": { - "format": "{icon}", - "tooltip-format": "Power profile: {profile}\nDriver: {driver}", - "tooltip": true, - "format-icons": { - "default": "", - "performance": "", - "balanced": "", - "power-saver": "" - } - }, - "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}" - }, - "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} {text}", - "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/power": { - "format" : "⏻ ", - "tooltip": false, - "menu": "on-click", - "menu-file": "$HOME/.config/waybar/power_menu.xml", // Menu file in resources folder - "menu-actions": { - "shutdown": "shutdown", - "reboot": "reboot", - "suspend": "systemctl suspend", - "hibernate": "systemctl hibernate" - } - } -} - diff --git a/waybar/config b/waybar/config index 44acc28..acb3c9a 100644 --- a/waybar/config +++ b/waybar/config @@ -1,107 +1,114 @@ { - "margin-top" : 0, - "margin-left": 0, - "margin-right": 0, - "height" : 10, - "modules-left": [ - ], - "modules-center": [ - "hyprland/workspaces", - ], - "modules-right": [ - "tray", - "battery", - "clock", - ], - "hyprland/window": { - "format": "{}", - "max-length": 35, - "rewrite": { - "": "Harsh" - }, - "separate-outputs": true, - }, - "hyprland/workspaces": { - "format": "{icon}", - "on-click": "activate", - "format-icons": { - "active": " ", - }, - "sort-by-number": true, - "persistent-workspaces": { - "*": 10, // 10 workspaces by default on every monitor - }, - }, - "clock": { - "format": "{:%d/%m/%Y %H:%M}", - "tooltip-format": "{:%Y %B}\n{calendar}", - "format-alt": "{}", - "interval": 1 - }, - "battery": { - "states": { - "warning": 30, - "critical": 15 - }, - "format": "{capacity}% {icon}", - "format-full": "{icon} {capacity}%", - "format-charging": " {capacity}%", - "format-plugged": " {capacity}%", - "format-alt": "{time} {icon}", - "format-icons": ["", "", "", "", ""] - }, - "pulseaudio#1": { - "format": "{volume}% {icon}", - "format-bluetooth": "{volume}% {icon} {format_source}", - "format-bluetooth-muted": " {icon} {format_source}", - "format-muted": "", - "format-icons": { - "headphone": "", - "hands-free": "", - "headset": "", - "phone": "", - "portable": "", - "car": "", - "default": ["", "", ""] - }, - "on-click-right": "pavucontrol", - "on-click": "wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle", - "on-scroll-up": "wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+", - "on-scroll-down": "wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-" - }, - "pulseaudio#2": { - "format": "{format_source}", - "format-bluetooth": "{volume}% {icon}", - "format-muted": "{format_source}", - "format-source": "{volume}% ", - "format-source-muted": "", - "format-icons": { - "headphones": "", - "handsfree": "", - "headset": "", - "phone": "", - "portable": "", - "car": "", - "default": [ - "", - "", - "" - ] - }, - "on-click-right": "pavucontrol", - "on-click": "wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle", - "on-scroll-up": "wpctl set-volume @DEFAULT_AUDIO_SOURCE@ 5%+", - "on-scroll-down": "wpctl set-volume @DEFAULT_AUDIO_SOURCE@ 5%-" - }, - "idle_inhibitor": { - "format": "{icon}", - "format-icons": { - "activated": "", - "deactivated": "" + "name": "float", + "layer": "top", + "position": "bottom", + "height": 75, + "exclusive": false, + "passthrough": false, + "gtk-layer-shell": true, + "margin-right": 10, + "margin-bottom": 0, + "margin-top" : 0, + "margin-left": 0, + "margin-right": 0, + "height" : 10, + "modules-left": [ + ], + "modules-center": [ + ], + "modules-right": [ + "hyprland/workspaces", + "tray", + "battery", + "clock", + ], + "hyprland/window": { + "format": "{}", + "max-length": 35, + "rewrite": { + "": "Harsh" + }, + "separate-outputs": true, + }, + "hyprland/workspaces": { + "format": "{icon}", + "on-click": "activate", + "sort-by-number": true, + "persistent-workspaces": { + "DP-3": [11, 12, 13, 14, 15, 16, 17, 18, 19], + "DP-2": [21, 22, 23, 24, 25, 26, 27, 28, 29] + }, + }, + "clock": { + "format": "{:%d/%m/%Y %H:%M}", + "tooltip-format": "{:%Y %B}\n{calendar}", + "format-alt": "{}", + "interval": 1 + }, + "battery": { + "states": { + "warning": 30, + "critical": 15 + }, + "format": "{capacity}% {icon}", + "format-full": "{icon} {capacity}%", + "format-charging": " {capacity}%", + "format-plugged": " {capacity}%", + "format-alt": "{time} {icon}", + "format-icons": ["", "", "", "", ""] + }, + "pulseaudio#1": { + "format": "{volume}% {icon}", + "format-bluetooth": "{volume}% {icon} {format_source}", + "format-bluetooth-muted": " {icon} {format_source}", + "format-muted": "", + "format-icons": { + "headphone": "", + "hands-free": "", + "headset": "", + "phone": "", + "portable": "", + "car": "", + "default": ["", "", ""] + }, + "on-click-right": "pavucontrol", + "on-click": "wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle", + "on-scroll-up": "wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+", + "on-scroll-down": "wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-" + }, + "pulseaudio#2": { + "format": "{format_source}", + "format-bluetooth": "{volume}% {icon}", + "format-muted": "{format_source}", + "format-source": "{volume}% ", + "format-source-muted": "", + "format-icons": { + "headphones": "", + "handsfree": "", + "headset": "", + "phone": "", + "portable": "", + "car": "", + "default": [ + "", + "", + "" + ] + }, + "on-click-right": "pavucontrol", + "on-click": "wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle", + "on-scroll-up": "wpctl set-volume @DEFAULT_AUDIO_SOURCE@ 5%+", + "on-scroll-down": "wpctl set-volume @DEFAULT_AUDIO_SOURCE@ 5%-" + }, + "idle_inhibitor": { + "format": "{icon}", + "format-icons": { + "activated": "", + "deactivated": "" + } + }, + "tray": { + "icon-size": 15, + "spacing": 10 } - }, - "tray": { - "icon-size": 15, - "spacing": 10 - } } diff --git a/waybar/style.css b/waybar/style.css index a3b1175..aa5982a 100644 --- a/waybar/style.css +++ b/waybar/style.css @@ -1,12 +1,17 @@ @import "macchiato.css"; -window { - position: absolute; +window#waybar.full { + background: @bar-bg; +} + +window#waybar.float { + background-color: transparent; } * { font-family: "JetBrainsMono Nerd Font", Roboto, Helvetica, Arial, sans-serif; font-size: 16px; + opacity: 0.9; } window#waybar { @@ -31,7 +36,7 @@ button:hover { } #workspaces button { - padding: 0 5px; + padding: 2px 5px; background-color: transparent; color: #ffffff; } @@ -42,12 +47,19 @@ button:hover { #workspaces button.active { color: #ffffff; + font-weight: bold; + background-color: @green; + border-radius: 50px; } #workspaces button:hover { background: rgba(0, 0, 0, 0.2); } +#workspaces button.active:hover { + background-color: @green; +} + #workspaces button.focused { background-color: @lavender; box-shadow: inset 0 -3px #ffffff; @@ -101,24 +113,11 @@ button:hover { color: @teal; } -.modules-right, -.modules-center { +.modules-right { background-color: @base; border-radius: 15px; } -.modules-right { - padding: 0 10px; -} - -.modules-left { - padding: 0 20px; -} - -.modules-center { - padding: 0 10px; -} - #battery.charging, #battery.plugged { color: @sapphire;