diff options
| -rw-r--r-- | hypr/hyprland.conf | 22 | ||||
| -rw-r--r-- | niri/config.kdl | 4 | ||||
| -rw-r--r-- | scroll/config | 4 | ||||
| -rw-r--r-- | scroll/scripts/scratchpad.lua | 6 | ||||
| -rw-r--r-- | sh/profile | 1 | ||||
| -rw-r--r-- | waybar/config | 76 | ||||
| -rw-r--r-- | waybar/style.css | 6 |
7 files changed, 82 insertions, 37 deletions
diff --git a/hypr/hyprland.conf b/hypr/hyprland.conf index 68948f5..6dbbef6 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,7 +23,7 @@ exec-once = import-gsettings icon-theme 'COSMIC' 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 = easyeffects exec-once = systemctl --user start dunst exec-once = systemctl --user start hypridle #exec-once = mpd @@ -122,7 +124,7 @@ decoration { size = 3 passes = 1 new_optimizations = true - xray = true + xray = false } #}}} #{{{ Shadow options @@ -205,6 +207,14 @@ plugin { # Example windowrule v2 # windowrule = float, class:^(kitty)$, title:^(kitty)$ # 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:^$ windowrulev2 = workspace special:easyeffects silent, class: ^(com\.github\.wwmm\.easyeffects)$ # Fix brave xray menus windowrulev2 = xray 0, class: ^(\s*), title: ^(\s*)$ @@ -454,9 +464,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/niri/config.kdl b/niri/config.kdl index 16e8c11..8248563 100644 --- a/niri/config.kdl +++ b/niri/config.kdl @@ -102,14 +102,14 @@ input { position x=0 y=0 } -/-output "DP-2" { +output "DP-2" { mode "1920x1080@75.000" scale 1 transform "normal" position x=0 y=0 } -/-output "HDMI-A-1" { +output "HDMI-A-1" { mode "1920x1080@75.000" scale 1 transform "normal" diff --git a/scroll/config b/scroll/config index 15c9f1d..29c8cab 100644 --- a/scroll/config +++ b/scroll/config @@ -47,8 +47,8 @@ exec hyprpaper # You can get the names of your outputs by running: scrollmsg -t get_outputs #output eDP-1 resolution 1920x1080 position 0 0 -#output HDMI-A-1 resolution 1920x1080 position 1920 0 -#output DP-2 resolution 1920x1080 position 0 0 +output HDMI-A-1 resolution 1920x1080 position 1920 0 +output DP-2 resolution 1920x1080 position 0 0 ### Idle configuration # diff --git a/scroll/scripts/scratchpad.lua b/scroll/scripts/scratchpad.lua index e581cc1..0afaa97 100644 --- a/scroll/scripts/scratchpad.lua +++ b/scroll/scripts/scratchpad.lua @@ -24,18 +24,18 @@ end command = command or "kitty" local function exists(id) - local is_in_array = false + local is_in_scratchpad = false local cons = scroll.scratchpad_get_containers() for _, con in ipairs(cons) do local views = scroll.container_get_views(con) for _, view in ipairs(views) do local app_id = scroll.view_get_app_id(view) if (app_id == id) then - is_in_array = true + is_in_scratchpad = true end end end - return is_in_array + return is_in_scratchpad end local function is_focused(id) @@ -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 25fb4dc..c6cb9f5 100644 --- a/waybar/config +++ b/waybar/config @@ -9,24 +9,33 @@ // Choose the order of the modules - "modules-left":[ "hyprland/workspaces", "custom/launcher", "hyprland/window"], + "modules-left":[ "sway/workspaces", "custom/launcher", "sway/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 "sway/workspaces": { "all-outputs": false, "persistent-workspaces": { - "11": ["eDP-1"], - "12": ["eDP-1"], - "13": ["eDP-1"], - "14": ["eDP-1"], - "15": ["eDP-1"], - "16": ["eDP-1"], - "17": ["eDP-1"], - "18": ["eDP-1"], - "19": ["eDP-1"], + "11": ["DP-2"], + "12": ["DP-2"], + "13": ["DP-2"], + "14": ["DP-2"], + "15": ["DP-2"], + "16": ["DP-2"], + "17": ["DP-2"], + "18": ["DP-2"], + "19": ["DP-2"], + "21": ["HDMI-A-1"], + "22": ["HDMI-A-1"], + "23": ["HDMI-A-1"], + "24": ["HDMI-A-1"], + "25": ["HDMI-A-1"], + "26": ["HDMI-A-1"], + "27": ["HDMI-A-1"], + "28": ["HDMI-A-1"], + "29": ["HDMI-A-1"], }, "format": "{icon}", "format-icons": { @@ -91,7 +100,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 ], + "HDMI-A-1": [ 10, 11, 12, 13, 14, 15, 16, 17, 18 ], }, "on-scroll-up": "hyprctl dispatch split:workspace r+1", "on-scroll-down": "hyprctl dispatch split:workspace r-1", @@ -168,19 +178,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": ["", "", ""] }, diff --git a/waybar/style.css b/waybar/style.css index 9398381..f8fec13 100644 --- a/waybar/style.css +++ b/waybar/style.css @@ -156,12 +156,12 @@ label:focus { } #cpu { - background-color: #1b1d1c; + background-color: #198844; color: #ffffff; } #memory { - background-color: #198844; + background-color: #1b1d1c; color: #ffffff; } @@ -186,7 +186,7 @@ label:focus { } #wireplumber { - background-color: #198844; + background-color: #1b1d1c; color: #ffffff; } |