From 5e6d48b30a5df3e55f8522d646e5c0c22623d8e3 Mon Sep 17 00:00:00 2001 From: Nils Pukropp Date: Wed, 29 Apr 2026 13:37:25 +0200 Subject: [PATCH] added window rules and services --- hypr/lid_state.conf | 2 +- hypr/modules/autostart.conf | 1 - hypr/modules/env.conf | 4 +- hypr/modules/keybinds.conf | 13 +++-- hypr/modules/monitors.conf | 2 + hypr/modules/window_rules.conf | 2 +- systemd/user/fluxo.service | 17 ++++++ .../fluxo.service | 1 + waybar/config.jsonc | 56 +++++++++---------- 9 files changed, 59 insertions(+), 39 deletions(-) create mode 100644 systemd/user/fluxo.service create mode 120000 systemd/user/graphical-session.target.wants/fluxo.service diff --git a/hypr/lid_state.conf b/hypr/lid_state.conf index e8e4907..8b13789 100644 --- a/hypr/lid_state.conf +++ b/hypr/lid_state.conf @@ -1 +1 @@ -monitor=eDP-1, disable + diff --git a/hypr/modules/autostart.conf b/hypr/modules/autostart.conf index 5721066..bb74624 100644 --- a/hypr/modules/autostart.conf +++ b/hypr/modules/autostart.conf @@ -14,4 +14,3 @@ exec-once = uwsm app -- hyprpaper # exec-once = uwsm app -- /usr/lib/xdg-desktop-portal-hyprland exec-once = wl-paste --type text --watch cliphist store # Stores only text data exec-once = wl-paste --type image --watch cliphist store # Stores only image data -exec-once = uwsm app -- ~/.cargo/bin/fluxo-rs daemon diff --git a/hypr/modules/env.conf b/hypr/modules/env.conf index ef72db2..21d8e78 100644 --- a/hypr/modules/env.conf +++ b/hypr/modules/env.conf @@ -10,8 +10,8 @@ env = XCURSOR_THEME,Bibata-Modern-Classic env = XDG_CURRENT_DESKTOP,Hyprland # env = debug:full_cm_proto,true env = QT_QPA_PLATFORMTHEME,qt6ct -# env = LIBVA_DRIVER_NAME,radeonsi -# env = VDPAU_DRIVER,radeonsi +env = LIBVA_DRIVER_NAME,radeonsi +env = VDPAU_DRIVER,radeonsi env = MOZ_ENABLE_WAYLAND,1 env = ELECTRON_OZONE_PLATFORM_HINT,wayland env = EDITOR,nvim diff --git a/hypr/modules/keybinds.conf b/hypr/modules/keybinds.conf index 1a9450e..1cf6051 100644 --- a/hypr/modules/keybinds.conf +++ b/hypr/modules/keybinds.conf @@ -11,6 +11,7 @@ bindr = ALT, z, exec, ~/.config/hypr/scripts/replay-ctrl.sh toggle bindr = ALT SHIFT, c, exec, ~/.config/hypr/scripts/droidcam-ctrl.sh toggle # general binds +bind = $mainMod, B, exec, fluxo bt menu bind = $mainMod, RETURN, exec, $terminal bind = $mainMod SHIFT, Q, killactive, bind = $mainMod CTRL, L, exec, hyprlock @@ -77,12 +78,12 @@ bindm = $mainMod, mouse:272, movewindow bindm = $mainMod, mouse:273, resizewindow # Laptop multimedia keys for volume and LCD brightness -bindel = ,XF86AudioRaiseVolume, exec, fluxo-rs vol up 5 -bindel = ,XF86AudioLowerVolume, exec, fluxo-rs vol down 5 -bindel = ,XF86AudioMute, exec, fluxo-rs vol mute -bindel = ,XF86AudioMicMute, exec, fluxo-rs mic mute -bindel = ,XF86MonBrightnessUp, exec, brightnessctl set 5%+ -bindel = ,XF86MonBrightnessDown, exec, brightnessctl set 5%- +bindel = ,XF86AudioRaiseVolume, exec, fluxo vol up 5 +bindel = ,XF86AudioLowerVolume, exec, fluxo vol down 5 +bindel = ,XF86AudioMute, exec, fluxo vol mute +bindel = ,XF86AudioMicMute, exec, fluxo mic mute +bindel = ,XF86MonBrightnessUp, exec, brightnessctl s +10% +bindel = ,XF86MonBrightnessDown, exec, brightnessctl s 10%- # Requires playerctl bindl = , XF86AudioNext, exec, playerctl next diff --git a/hypr/modules/monitors.conf b/hypr/modules/monitors.conf index 3e75c93..555a21e 100644 --- a/hypr/modules/monitors.conf +++ b/hypr/modules/monitors.conf @@ -3,6 +3,8 @@ monitor = eDP-1, 1920x1080@60, 0x0, 1 # samsung home monitor monitor = desc:Samsung Electric Company LC27G7xT H4ZRA00734, 2560x1440@144, 0x-1440, 1 +# monitor = desc:Samsung Electric Company LC27G7xT H4ZRA00734, 1920x1080@144, 0x-1080, 1 +# monitor = desc:Samsung Electric Company LC27G7xT H4ZRA00734, 2560x1440@60, 0x-1440, 1 # lid_state fallback diff --git a/hypr/modules/window_rules.conf b/hypr/modules/window_rules.conf index 7d7af50..e62f92a 100644 --- a/hypr/modules/window_rules.conf +++ b/hypr/modules/window_rules.conf @@ -5,7 +5,7 @@ # VARIABLES # ========================================== # Dialogs and utility apps that should float in the center -$dialog_titles = ^(Open Form|Open File|Select a File|Choose a file|Open Workspace|Choose Directory|Save As|Save File|branchdialog|pinentry-gtk-2|Confirm to replace files|File Operation Progress|Open Files|Anmelden – Google Konten — Zen Browser)$ +$dialog_titles = ^(Open Form|Open File|Select a File|Choose a file|Open Workspace|Choose Directory.*|Save As.*|Save File.*|branchdialog|pinentry-gtk-2|Confirm to replace files|File Operation Progress|Open Files.*|Anmelden.*|File Upload.*)$ $dialog_classes = ^(pavucontrol|blueman-manager|nm-connection-editor|org.pulseaudio.pavucontrol)$ # App classes diff --git a/systemd/user/fluxo.service b/systemd/user/fluxo.service new file mode 100644 index 0000000..2e0fbf2 --- /dev/null +++ b/systemd/user/fluxo.service @@ -0,0 +1,17 @@ +[Unit] +Description=Fluxo — high-performance Waybar module daemon +Documentation=https://github.com/narl/fluxo-rs +PartOf=graphical-session.target +After=graphical-session.target + +[Service] +Type=simple +ExecStart=%h/.cargo/bin/fluxo daemon +Restart=on-failure +RestartSec=3 + +# Ensure the daemon can reach the user's D-Bus session and Wayland/Hyprland sockets. +Slice=app-graphical.slice + +[Install] +WantedBy=graphical-session.target diff --git a/systemd/user/graphical-session.target.wants/fluxo.service b/systemd/user/graphical-session.target.wants/fluxo.service new file mode 120000 index 0000000..3bc85a6 --- /dev/null +++ b/systemd/user/graphical-session.target.wants/fluxo.service @@ -0,0 +1 @@ +/home/narl/.config/systemd/user/fluxo.service \ No newline at end of file diff --git a/waybar/config.jsonc b/waybar/config.jsonc index d3f1765..2ce4eaa 100644 --- a/waybar/config.jsonc +++ b/waybar/config.jsonc @@ -36,7 +36,7 @@ "custom/mpris": { "format": "{}", "return-type": "json", - "exec": "fluxo-rs mpris", + "exec": "fluxo mpris", "on-click": "playerctl play-pause", "signal": 11 }, @@ -47,7 +47,7 @@ "custom/dnd": { "format": "{}", "return-type": "json", - "exec": "fluxo-rs dnd", + "exec": "fluxo dnd", "on-click": "dunstctl set-paused toggle", "signal": 13, "interval": 5 @@ -78,7 +78,7 @@ "custom/gamemode": { "format": "{}", "return-type": "json", - "exec": "fluxo-rs game", + "exec": "fluxo game", "on-click": "~/.config/hypr/scripts/gamemode.sh", "signal": 7, "interval": 5 @@ -87,7 +87,7 @@ "custom/power_status": { "format": "{} ", "return-type": "json", - "exec": "fluxo-rs power", + "exec": "fluxo power", "on-click": "~/.config/hypr/scripts/powermenu.sh & disown", "signal": 10, "interval": 5 @@ -125,86 +125,86 @@ "custom/mic" ], - // --- Fluxo-rs System & Hardware --- + // --- fluxo System & Hardware --- "custom/sys": { "format": "{}", "return-type": "json", - "exec": "fluxo-rs sys", + "exec": "fluxo sys", "signal": 5, "interval": 5 }, "custom/cpu": { "format": "{}", "return-type": "json", - "exec": "fluxo-rs cpu", + "exec": "fluxo cpu", "on-click": "zenmonitor & disown", "signal": 2 }, "custom/mem": { "format": "{}", "return-type": "json", - "exec": "fluxo-rs mem", + "exec": "fluxo mem", "signal": 3 }, "custom/gpu": { "format": "{}", "return-type": "json", - "exec": "fluxo-rs gpu", + "exec": "fluxo gpu", "signal": 4 }, "custom/network": { "format": "{}", "return-type": "json", - "exec": "fluxo-rs net", + "exec": "fluxo net", "signal": 1 }, "custom/disk-root": { "format": "{}", "return-type": "json", - "exec": "fluxo-rs disk /", + "exec": "fluxo disk /", "signal": 6 }, - // --- Fluxo-rs Audio & BT --- + // --- fluxo Audio & BT --- "custom/volume": { "format": "{}", "return-type": "json", - "exec": "fluxo-rs vol", - "on-click": "fluxo-rs vol mute", - "on-scroll-up": "fluxo-rs vol up 5", - "on-scroll-down": "fluxo-rs vol down 5", - "on-click-right": "fluxo-rs vol cycle", + "exec": "fluxo vol", + "on-click": "fluxo vol mute", + "on-scroll-up": "fluxo vol up 5", + "on-scroll-down": "fluxo vol down 5", + "on-click-right": "fluxo vol cycle", "on-click-middle": "pavucontrol", "signal": 8 }, "custom/mic": { "format": "{}", "return-type": "json", - "exec": "fluxo-rs mic", - "on-click": "fluxo-rs mic mute", - "on-scroll-up": "fluxo-rs mic up 5", - "on-scroll-down": "fluxo-rs mic down 5", - "on-click-right": "fluxo-rs mic cycle", + "exec": "fluxo mic", + "on-click": "fluxo mic mute", + "on-scroll-up": "fluxo mic up 5", + "on-scroll-down": "fluxo mic down 5", + "on-click-right": "fluxo mic cycle", "on-click-middle": "pavucontrol", "signal": 8 }, "custom/bluetooth-audio": { "format": "{}", "return-type": "json", - "exec": "fluxo-rs bt", - "on-click": "fluxo-rs bt menu", - "on-click-right": "fluxo-rs bt cycle", - "on-click-middle": "fluxo-rs bt cycle_mode", + "exec": "fluxo bt", + "on-click": "fluxo bt menu", + "on-click-right": "fluxo bt cycle", + "on-click-middle": "fluxo bt cycle_mode", "signal": 9, "tooltip": true }, "custom/backlight": { "format": "{}", "return-type": "json", - "exec": "fluxo-rs backlight", + "exec": "fluxo backlight", "on-scroll-up": "brightnessctl s +10%", - "on-scroll-down": "brightnessctl s 10%", + "on-scroll-down": "brightnessctl s 10%-", "signal": 12 } }