diff options
| -rw-r--r-- | hypr/hyprland.conf | 36 | ||||
| -rw-r--r-- | hypr/pyprland.toml | 20 | ||||
| -rw-r--r-- | sh/profile | 1 | ||||
| -rw-r--r-- | waybar/config | 249 | ||||
| -rw-r--r-- | waybar/style.css | 7 |
5 files changed, 271 insertions, 42 deletions
diff --git a/hypr/hyprland.conf b/hypr/hyprland.conf index 6c893e8..2ce53ed 100644 --- a/hypr/hyprland.conf +++ b/hypr/hyprland.conf @@ -1,5 +1,7 @@ # See https://wiki.hyprland.org/Configuring/Monitors/ #{{{ Monitor config +monitor = DP-2, 1920x1080@75, 0x0, 1 +monitor = HDMI-A-1, 1920x1080@75, 1920x0, 1 monitor = , preferred, auto, 1 #}}} @@ -21,8 +23,10 @@ exec-once = import-gsettings cursor-theme 'BreezeX-Black' exec-once = gsettings set org.gnome.desktop.interface color-scheme 'prefer-dark' exec-once = xrdb -load "$XDG_CONFIG_HOME"/X11/xresources exec-once = com.github.wwmm.easyeffects -exec-once = systemctl --user start dunst -exec-once = systemctl --user start hypridle +#exec-once = systemctl --user start dunst +#exec-once = systemctl --user start hypridle +exec-once = dunst +exec-once = hypridle #exec-once = mpd #}}} @@ -104,7 +108,7 @@ misc { disable_hyprland_logo = true disable_splash_rendering = true enable_swallow = true - swallow_regex = ^(kitty)$ + swallow_regex = ^(st-256color)$ swallow_exception_regex = ^(wev|.*ueberzug|n?vi?m? .*)$ vfr = true vrr = 3 @@ -121,7 +125,7 @@ decoration { size = 3 passes = 1 new_optimizations = true - xray = true + xray = false } #}}} #{{{ Shadow options @@ -202,10 +206,18 @@ plugin { #{{{ Windowrules # Example windowrule v1 -# windowrule = float, ^(kitty)$ +# windowrule = float, ^(st)$ # Example windowrule v2 -# windowrule = float, class:^(kitty)$, title:^(kitty)$ +# windowrule = float, class:^(st)$, title:^(st)$ # See https://wiki.hyprland.org/Configuring/Window-Rules/ for more +windowrulev2 = float, class:^(lxqt-policykit-agent)$ +windowrulev2 = tile, class:^(REAPER)$, title:^(REAPER v[0-9.]* - Registered to [A-Za-z ]* \(Licensed for personal/small business use\))$ +windowrulev2 = tile, class:^(REAPER)$, title:^(reaper)$ +windowrulev2 = tile, class:^(REAPER)$, title:^(Mixer)$ +windowrulev2 = move onscreen cursor -50% -50%, title:^(menu)$ +windowrulev2 = move cursor,class:REAPER,floating:1 +windowrulev2 = nofocus,class:REAPER,title:^(menu)$ +windowrulev2 = nofocus,class:REAPER,title:^$ #}}} #{{{ Mods @@ -383,8 +395,8 @@ bind = $mainMod $secdMod, P, exec, passmenu #}}} #{{{ Misc bindings -bind = $mainMod, Return, exec, kitty -bind = $mainMod $secdMod, F, exec, kitty -e lf +bind = $mainMod, Return, exec, st +bind = $mainMod $secdMod, F, exec, st lf bind = $mainMod, W, exec, pkill -USR1 waybar bind = $mainMod, Q, exec, loginctl lock-session bind = $mainMod $secdMod CONTROL, Q, exec, systemctl suspend @@ -502,9 +514,9 @@ bind = , XF86AudioNext, exec, playerctl next bind = , XF86AudioMute, exec, volsv -t #bindl = , XF86AudioMicMute, exec, volsv -m bind = , XF86AudioMicMute, exec, volsv -m -bindel = , XF86MonBrightnessUp, exec, bl -i -bindel = , XF86MonBrightnessDown, exec, bl -d -bindl = $mainMod, XF86MonBrightnessUp, exec, bl -I 1 -bindl = $mainMod, XF86MonBrightnessDown, exec, bl -D 1 +bindel = , XF86MonBrightnessUp, exec, bl -x -i +bindel = , XF86MonBrightnessDown, exec, bl -x -d +bindl = $mainMod, XF86MonBrightnessUp, exec, bl -x -I 1 +bindl = $mainMod, XF86MonBrightnessDown, exec, bl -x -D 1 bind = , Print, exec, scrshot #}}} diff --git a/hypr/pyprland.toml b/hypr/pyprland.toml index 2ac36a0..5c1d343 100644 --- a/hypr/pyprland.toml +++ b/hypr/pyprland.toml @@ -7,7 +7,7 @@ plugins = [ [scratchpads.sphtop] animation = "" -command = "kitty --class sphtop htop" +command = "st -c sphtop htop" class = "sphtop" lazy = true size = "50% 50%" @@ -15,7 +15,7 @@ position = "25% 25%" [scratchpads.spterm] animation = "" -command = "kitty --class spterm" +command = "st -c spterm" class = "spterm" lazy = true size = "50% 50%" @@ -23,7 +23,7 @@ position = "25% 25%" [scratchpads.sppmxr] animation = "" -command = "kitty --class sppmxr pulsemixer" +command = "st -c sppmxr pulsemixer" class = "sppmxr" lazy = true size = "50% 50%" @@ -31,7 +31,7 @@ position = "25% 25%" [scratchpads.spblue] animation = "" -command = "kitty --class spblue bluetoothctl" +command = "st -c spblue bluetoothctl" class = "spblue" lazy = true size = "50% 50%" @@ -39,7 +39,7 @@ position = "25% 25%" [scratchpads.spncmp] animation = "" -command = "kitty --class spncmp ncmpcpp" +command = "st -c spncmp ncmpcpp" class = "spncmp" lazy = true size = "50% 50%" @@ -47,7 +47,7 @@ position = "25% 25%" [scratchpads.spmutt] animation = "" -command = "kitty --class spmutt neomutt" +command = "st -c spmutt neomutt" class = "spmutt" lazy = true size = "50% 50%" @@ -55,7 +55,7 @@ position = "25% 25%" [scratchpads.spprof] animation = "" -command = "kitty --class spprof profanity" +command = "st -c spprof profanity" class = "spprof" lazy = true size = "50% 50%" @@ -63,7 +63,7 @@ position = "25% 25%" [scratchpads.spirss] animation = "" -command = "kitty --class spirss irssi" +command = "st -c spirss irssi" class = "spirss" lazy = true size = "50% 50%" @@ -71,7 +71,7 @@ position = "25% 25%" [scratchpads.sptodo] animation = "" -command = "kitty --class sptodo todo" +command = "st -c sptodo todo" class = "sptodo" lazy = true size = "50% 50%" @@ -79,7 +79,7 @@ position = "25% 25%" [scratchpads.sptrmc] animation = "" -command = "kitty --class sptrmc tremc" +command = "st -c sptrmc tremc" class = "sptremc" lazy = true size = "50% 50%" @@ -120,6 +120,7 @@ addtopath "$HOME/.local/bin/blocks" addtopath "$HOME/.local/bin/ignore" addtopath "$HOME/.local/bin/volsv" addtopath "$HOME/.local/bin" +addtopath "$HOME/Downloads/Grayjay.Desktop-linux-x64-v2" addtopath "$HOME/.local/bin/flatpak-sc" addtopath "$HOME/.local/share/flatpak/exports/bin/" addtopath "$CARGO_HOME/bin" diff --git a/waybar/config b/waybar/config index 77f7386..ef53a12 100644 --- a/waybar/config +++ b/waybar/config @@ -1,17 +1,15 @@ -{ +[{ "layer": "bottom", "position": "top", "height": 36, - //"output": "%%DISPLAY%%", + "output": "DP-2", "spacing": 4, - //"margin-top": 5, - //"margin-bottom":5, // Choose the order of the modules "modules-left":[ "hyprland/workspaces", "custom/launcher", "hyprland/window"], "modules-center":[], - "modules-right":[ "tray", "mpd", "idle_inhibitor", "wireplumber", "cpu", "memory", "temperature#cpu", "temperature#gpu", "backlight", "network", "clock", "custom/power"], + "modules-right":[ "tray", "mpd", "idle_inhibitor", "temperature#cpu0", "temperature#cpu1", "temperature#gpu0", "temperature#gpu1", "temperature#gpu2", "wireplumber", "cpu", "memory", "network", "clock", "custom/power"], // Modules configuration @@ -40,7 +38,8 @@ "18": "9", }, "persistent-workspaces": { - "eDP-1": [ 1, 2, 3, 4, 5, 6, 7, 8, 9 ], + "DP-2": [ 1, 2, 3, 4, 5, 6, 7, 8, 9 ], + //"DP-2": [ 10, 11, 12, 13, 14, 15, 16, 17, 18 ], }, "on-scroll-up": "hyprctl dispatch split-workspace e+1", "on-scroll-down": "hyprctl dispatch split-workspace e-1", @@ -103,19 +102,43 @@ "format": "{capacity}%", "max-length": 25 }, - "temperature#cpu": { - "thermal-zone": 0, - // "hwmon-path": "cat /sys/class/hwmon/hwmon5/temp1_input", + "temperature#cpu0": { + // "thermal-zone": 2, + "hwmon-path": "/sys/class/hwmon/hwmon3/temp1_input", + "critical-threshold": 80, + "format-critical": "CPU TCT {temperatureC}°C {icon}", + "format": "", + "format-icons": ["", "", ""] + }, + "temperature#cpu1": { + // "thermal-zone": 2, + "hwmon-path": "/sys/class/hwmon/hwmon3/temp3_input", + "critical-threshold": 80, + "format-critical": "CPU TCC {temperatureC}°C {icon}", + "format": "", + "format-icons": ["", "", ""] + }, + "temperature#gpu0": { + // "thermal-zone": 2, + "hwmon-path": "/sys/class/hwmon/hwmon2/temp1_input", + "critical-threshold": 100, + "format-critical": "GPU EDG {temperatureC}°C {icon}", + "format": "", //°C + "format-icons": ["", "", ""] + }, + "temperature#gpu1": { + // "thermal-zone": 2, + "hwmon-path": "/sys/class/hwmon/hwmon2/temp2_input", "critical-threshold": 110, - "format-critical": "{temperatureC}°C", + "format-critical": "GPU JUN {temperatureC}°C {icon}", "format": "", "format-icons": ["", "", ""] }, - "temperature#gpu": { - "thermal-zone": 1, - // "hwmon-path": "/sys/class/hwmon/hwmon4/temp1_input", - "critical-threshold": 126, - "format-critical": "{temperatureC}°C", + "temperature#gpu2": { + // "thermal-zone": 2, + "hwmon-path": "/sys/class/hwmon/hwmon2/temp3_input", + "critical-threshold": 105, + "format-critical": "GPU MEM {temperatureC}°C {icon}", "format": "", "format-icons": ["", "", ""] }, @@ -157,4 +180,198 @@ "format": " ", "on-click": "grimshot --notify save area $HOME/Pictures/$(zenity --entry --text 'Set filename:' --entry-text '.png')" } -} +}, +{ + "layer": "bottom", + "position": "top", + "height": 36, + "output": "HDMI-A-1", + "spacing": 4, + + // Choose the order of the modules + + "modules-left":[ "hyprland/workspaces", "custom/launcher", "hyprland/window"], + "modules-center":[], + "modules-right":[ "tray", "mpd", "idle_inhibitor", "temperature#cpu0", "temperature#cpu1", "temperature#gpu0", "temperature#gpu1", "temperature#gpu2", "wireplumber", "cpu", "memory", "network", "clock", "custom/power"], + + // Modules configuration + + "hyprland/workspaces": { + "format": "{icon}", + "active-only": false, + "all-outputs": false, + "format-icons": { + "1": "1", + "2": "2", + "3": "3", + "4": "4", + "5": "5", + "6": "6", + "7": "7", + "8": "8", + "9": "9", + "10": "1", + "11": "2", + "12": "3", + "13": "4", + "14": "5", + "15": "6", + "16": "7", + "17": "8", + "18": "9", + }, + "persistent-workspaces": { + //"HDMI-A-1": [ 1, 2, 3, 4, 5, 6, 7, 8, 9 ], + "HDMI-A-1": [ 10, 11, 12, 13, 14, 15, 16, 17, 18 ], + }, + "on-scroll-up": "hyprctl dispatch split-workspace e+1", + "on-scroll-down": "hyprctl dispatch split-workspace e-1", + "on-click": "activate" + }, + "hyprland/window": { + "separate-outputs": true, + "format": "{}" + }, + "keyboard-state": { + "numlock": true, + "capslock": true, + "format": " {name} {icon}", + "format-icons": { + "locked": "", + "unlocked": "" + } + }, + "mpd": { + "format": "{artist} - {title}", + "format-stopped": "", + "format-paused": "{artist} - {title}", + "format-disconnected": "", + "artist-len": 15, + "title-len": 15, + //"album-len": 15, + //"max-length": 200, + "on-click": "mpc toggle" + }, + "idle_inhibitor": { + "format": "{icon}", + "format-icons": { + "activated": "", + "deactivated": "" + } + }, + "tray": { + "icon-size": 20, + "spacing": 10 + }, + "clock": { + // "timezone": "America/New_York", + "tooltip-format": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>", + "format-alt": "{:%Y-%m-%d}" + }, + "cpu": { + "format": "{usage}% ", + "tooltip": false + }, + "memory": { + "format": "{}% " + }, + "battery": { + "bat": "BAT0", + "interval": 60, + "state": { + "warning": 30, + "critical": 15 + }, + "format": "{capacity}%", + "max-length": 25 + }, + "temperature#cpu0": { + // "thermal-zone": 2, + "hwmon-path": "/sys/class/hwmon/hwmon3/temp1_input", + "critical-threshold": 80, + "format-critical": "CPU TCT {temperatureC}°C {icon}", + "format": "", + "format-icons": ["", "", ""] + }, + "temperature#cpu1": { + // "thermal-zone": 2, + "hwmon-path": "/sys/class/hwmon/hwmon3/temp3_input", + "critical-threshold": 80, + "format-critical": "CPU TCC {temperatureC}°C {icon}", + "format": "", + "format-icons": ["", "", ""] + }, + "temperature#gpu0": { + // "thermal-zone": 2, + "hwmon-path": "/sys/class/hwmon/hwmon2/temp1_input", + "critical-threshold": 100, + "format-critical": "GPU EDG {temperatureC}°C {icon}", + "format": "", + "format-icons": ["", "", ""] + }, + "temperature#gpu1": { + // "thermal-zone": 2, + "hwmon-path": "/sys/class/hwmon/hwmon2/temp2_input", + "critical-threshold": 110, + "format-critical": "GPU JUN {temperatureC}°C {icon}", + "format": "", + "format-icons": ["", "", ""] + }, + "temperature#gpu2": { + // "thermal-zone": 2, + "hwmon-path": "/sys/class/hwmon/hwmon2/temp3_input", + "critical-threshold": 105, + "format-critical": "GPU MEM {temperatureC}°C {icon}", + "format": "", + "format-icons": ["", "", ""] + }, + "backlight": { + // "device": "acpi_video1", + "format": "{percent}%" + //"format-icons": ["", ""] + }, + "network": { + // "interface": "wlp2*", // (Optional) To force the use of this interface + "format-wifi": "{essid} ({signalStrength}%) ", + "format-ethernet": "Connected ", + "tooltip-format": "{ifname} via {gwaddr} ", + "format-linked": "{ifname} (No IP) ", + "format-disconnected": "Disconnected ⚠", + "format-alt": "{ifname}: {ipaddr}/{cidr}", + "max-length": 22, + "on-click-right": "bash ~/.config/rofi/wifi_menu/rofi_wifi_menu" + }, + "pulseaudio": { + // "scroll-step": 1, // %, can be a float + "format": "{volume}% {icon}", + "format-bluetooth": "{volume}% {icon}", + "format-bluetooth-muted": "{icon} {format_source}", + "format-muted": "{format_source}", + "format-source": "", + "format-source-muted": "", + "format-icons": { + "headphone": "", + "hands-free": "", + "headset": "", + "phone": "", + "portable": "", + "car": "", + "default": ["", "", ""] + }, + "on-click": "pavucontrol" + }, + "custom/launcher":{ + "format": "", + "on-click": "exec $(tofi-drun)", + "on-click-right": "killall tofi" + }, + "custom/power":{ + "format": " ", + "on-click": "nwg-bar", + "on-click-right": "killall nwg-bar" + }, + "custom/snip":{ + "format": " ", + "on-click": "grimshot --notify save area $HOME/Pictures/$(zenity --entry --text 'Set filename:' --entry-text '.png')" + } +}] diff --git a/waybar/style.css b/waybar/style.css index fefb890..c340c3f 100644 --- a/waybar/style.css +++ b/waybar/style.css @@ -91,7 +91,6 @@ window#waybar.hidden { #custom-wallpaper, #tags, #taskbar, -#tray, #mode, #idle_inhibitor, #mpd { @@ -152,12 +151,12 @@ label:focus { } #cpu { - background-color: #1b1d1c; + background-color: #198844; color: #ffffff; } #memory { - background-color: #198844; + background-color: #1b1d1c; color: #ffffff; } @@ -182,7 +181,7 @@ label:focus { } #wireplumber { - background-color: #198844; + background-color: #1b1d1c; color: #ffffff; } |