diff options
| -rw-r--r-- | gtk-2.0/gtkrc | 2 | ||||
| -rw-r--r-- | gtk-3.0/settings.ini | 2 | ||||
| -rw-r--r-- | hypr/hyprland.conf | 61 | ||||
| -rw-r--r-- | hypr/hyprlock.conf | 4 | ||||
| -rw-r--r-- | sh/profile | 1 | ||||
| -rw-r--r-- | waybar/config | 247 | ||||
| -rw-r--r-- | waybar/style.css | 24 |
7 files changed, 269 insertions, 72 deletions
diff --git a/gtk-2.0/gtkrc b/gtk-2.0/gtkrc index 6a23e8c..2ef9da2 100644 --- a/gtk-2.0/gtkrc +++ b/gtk-2.0/gtkrc @@ -5,7 +5,7 @@ gtk-theme-name="Flat-Remix-GTK-White-Darkest-Solid" gtk-icon-theme-name="Cosmic" gtk-font-name="Cantarell 11" gtk-cursor-theme-name="BreezeX-Black" -gtk-cursor-theme-size=32 +gtk-cursor-theme-size=36 gtk-toolbar-style=GTK_TOOLBAR_ICONS gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR gtk-button-images=0 diff --git a/gtk-3.0/settings.ini b/gtk-3.0/settings.ini index f876bba..13770ec 100644 --- a/gtk-3.0/settings.ini +++ b/gtk-3.0/settings.ini @@ -3,7 +3,7 @@ gtk-theme-name=Flat-Remix-GTK-White-Darkest-Solid gtk-icon-theme-name=Cosmic gtk-font-name=Cantarell 11 gtk-cursor-theme-name=BreezeX-Black -gtk-cursor-theme-size=32 +gtk-cursor-theme-size=36 gtk-toolbar-style=GTK_TOOLBAR_ICONS gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR gtk-button-images=0 diff --git a/hypr/hyprland.conf b/hypr/hyprland.conf index afef32a..bd2aab2 100644 --- a/hypr/hyprland.conf +++ b/hypr/hyprland.conf @@ -2,8 +2,8 @@ #{{{ Monitor config monitor = eDP-1, 1920x1080@60, 0x0, 1 monitor = , preferred, auto, 1 -monitor = HDMI-A-1, 1920x1080@60, 0x0, 1 -monitor = DP-1, 1920x1080@60, 1920x0, 1 +monitor = HDMI-A-1, 1920x1080@75, 1920x0, 1 +monitor = DP-1, 1920x1080@60, 0x0, 1 #}}} # See https://wiki.hyprland.org/Configuring/Keywords/ for more @@ -116,7 +116,7 @@ decoration { size = 3 passes = 1 new_optimizations = true - xray = true + xray = false } #}}} #{{{ Shadow options @@ -189,35 +189,32 @@ plugin { # Example windowrule v2 # windowrulev2 = float, class:^(kitty)$, title:^(kitty)$ # See https://wiki.hyprland.org/Configuring/Window-Rules/ for more -windowrule = fullscreen, ^(Xephyr)$ -windowrule = float, title:^(LibreWolf - Choose User Profile)$ -windowrule = float, ^(xdg-desktop-portal-gtk) -windowrule = float, title:^(UNDERTALE)$ -windowrule = float, ^(Tk)$ -windowrule = float, ^(lxqt-policykit-agent)$ -windowrule = float, ^(Kdenlive)$ -windowrulev2 = stayfocused, title:^()$, class:^(steam)$ -windowrulev2 = minsize 1 1, title:^()$, class:^(steam)$ -windowrulev2 = stayfocused, title:^(menu)$,class:^(yabridge-host.exe.so)$ -windowrulev2 = minsize 1 1, title:^(menu)$,class:^(yabridge-host.exe.so)$ -windowrulev2 = float, class:^(yabridge-host.exe.so)$, title:^(menu)$ -windowrulev2 = float, floating:0, title:^(menu*) -windowrule = workspace 2, title:^(REAPER .*initializing.*)$ -windowrulev2 = tile, class:^(REAPER)$, title:^(.*REAPER v[0-9.]* - Licensed for personal/small business use)$ -windowrule = tile, ^(WebApp-Qobuz[0-9]*)$ -windowrulev2 = float, title:^(menu)$ -windowrulev2 = move cursor -50% -50%, class:^(yabridge-host.exe.so)$, title:^(menu)$ -#windowrulev2 = nofocus, class:^(yabridge-host.exe.so)$, title:^(\s*)$ -#windowrulev2 = move cursor -50% -50%, class:^(REAPER)$, title:^(Snap/Grid Settings)$ -#windowrulev2 = move cursor -50% -50%, class:^(REAPER)$, title:^(Routing for track [0-9]*)$ -#windowrulev2 = move cursor -50% -50%, class:^(REAPER)$, title:^(Metronome and pre-roll settings)$ -#windowrulev2 = move cursor -50% -50%, class:^(yabridge-host.exe.so)$, title:^(menu)$ -#windowrulev2 = nofocus, class:^(yabridge-host.exe.so)$, title:^(\s*)$ -#windowrulev2 = move cursor -50% -50%, class:^(yabridge-host.exe.so)$, title:^(\s*)$ -#windowrulev2 = move cursor -50% -50%, class:^(REAPER)$, title:^(Snap/Grid Settings)$ -#windowrulev2 = move cursor -50% -50%, class:^(REAPER)$, title:^(Routing for track [0-9]*)$ -#windowrulev2 = float, floating:0, title:^(menu)$ -#windowrulev2 = forceinput, title:^(menu)$ +#windowrule = fullscreen, ^(Xephyr)$ +#windowrule = float, title:^(LibreWolf - Choose User Profile)$ +#windowrule = float, ^(xdg-desktop-portal-gtk) +#windowrulev2 = forceinput, class:^(xdg-desktop-portal-gtk) +#windowrule = float, title:^(UNDERTALE)$ +#windowrule = float, ^(Tk)$ +#windowrule = float, ^(lxqt-policykit-agent)$ +#windowrulev2 = stayfocused, title:^()$, class:^(steam)$ +#windowrulev2 = minsize 1 1, title:^()$, class:^(steam)$ +#windowrulev2 = stayfocused, title:^(menu)$, class:^(REAPER)$ +#windowrulev2 = minsize 1 1, title:^(menu)$, class:^(REAPER)$ +#windowrulev2 = stayfocused, title:^(menu)$,class:^(yabridge-host.exe.so)$ +#windowrulev2 = minsize 1 1, title:^(menu)$,class:^(yabridge-host.exe.so)$ +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)$ +#windowrule = tile, ^(WebApp-.*)$ +#windowrule = float, title:^(menu)$ +windowrulev2 = move onscreen cursor -50% -50%, title:^(menu)$ +#windowrulev2 = noinitialfocus, title:^(menu)$ +#windowrulev2 = nofocus, class:^(mldrums.exe|yabridge-host.exe)$, title:^(\s*)$ +#windowrulev2 = opacity 1.0, class:^(mldrums.exe|yabridge-host.exe)$, title:^(\s*)$ +#windowrulev2 = maxsize 1 1, class:^(mldrums.exe|yabridge-host.exe)$, title:^(\s*)$ +#windowrulev2 = float, class:^(mldrums.exe|yabridge-host.exe)$, title:^(\s*)$ +#windowrulev2 = float, class:^(mldrums.exe)$, title:^(ML Drums)$ +#windowrulev2 = nofocus, class:^(mldrums.exe|yabridge-host.exe)$, title:^(\s*)$ #}}} #{{{ Mods diff --git a/hypr/hyprlock.conf b/hypr/hyprlock.conf index 57f9fdd..dc05411 100644 --- a/hypr/hyprlock.conf +++ b/hypr/hyprlock.conf @@ -1,10 +1,10 @@ general { disable_loading_bar = true hide_cursor = true - grace = 0 + grace = 15 no_fade_in = true no_fade_out = true - ignore_empty_input = true + ignore_empty_input = false } background { @@ -116,6 +116,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 7a54e0c..146b66c 100644 --- a/waybar/config +++ b/waybar/config @@ -1,17 +1,209 @@ +[{ + "layer": "top", + "position": "top", + "height": 36, + "output": "DP-1", + "spacing": 4, + + // Choose the order of the modules + + "modules-left":[ "hyprland/workspaces", "custom/launcher", "hyprland/window"], + "modules-center":[], + "modules-right":[ "idle_inhibitor", "pulseaudio", "cpu", "memory", "network", "clock", "tray"], + + // 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": { + "DP-1": [ 1, 2, 3, 4, 5, 6, 7, 8, 9 ], + //"DP-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": "", //°C + "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')" + } +}, { "layer": "top", "position": "top", "height": 36, - //"output": "%%DISPLAY%%", + "output": "HDMI-A-1", "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":[ "mpd", "idle_inhibitor", "pulseaudio", "cpu", "memory", "temperature#cpu", "temperature#gpu", "backlight", "network", "clock", "tray", "custom/power"], + "modules-right":[ "tray", "mpd", "idle_inhibitor", "temperature#cpu0", "temperature#cpu1", "temperature#gpu0", "temperature#gpu1", "temperature#gpu2", "pulseaudio", "cpu", "memory", "network", "clock"], // Modules configuration @@ -40,7 +232,8 @@ "18": "9", }, "persistent-workspaces": { - "eDP-1": [ 1, 2, 3, 4, 5, 6, 7, 8, 9 ], + "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", @@ -103,19 +296,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": "", + "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": ["", "", ""] }, @@ -168,4 +385,4 @@ "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 88b8900..cf76ed2 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 { } #pulseaudio { - background-color: #198844; + background-color: #1b1d1c; color: #ffffff; } @@ -277,23 +276,6 @@ label:focus { background-color: #eb4d4b; } -#tray { - background-color: #198844; - color: #ffffff; -} - -#tray > .passive { - -gtk-icon-effect: dim; - background-color: #198844; - color: #ffffff; -} - -#tray > .needs-attention { - -gtk-icon-effect: highlight; - background-color: #198844; - color: #ffffff; -} - #idle_inhibitor { background-color: #1b1d1c; border-radius: 20px 0px 0px 20px; |