diff options
| -rw-r--r-- | easyeffectsrc | 2 | ||||
| -rw-r--r-- | hypr/hyprland.conf | 89 | ||||
| -rw-r--r-- | hypr/hyprscratch.conf | 9 | ||||
| -rw-r--r-- | hypr/pyprland.toml | 73 | ||||
| -rw-r--r-- | kitty/kitty.conf | 2 | ||||
| -rw-r--r-- | niri/config.kdl | 4 | ||||
| -rw-r--r-- | scroll/config | 4 | ||||
| -rw-r--r-- | sh/profile | 1 | ||||
| -rw-r--r-- | waybar/config | 71 | ||||
| -rw-r--r-- | waybar/style.css | 6 | ||||
| -rw-r--r-- | wireplumber/main.lua.d/51-custom.lua | 22 |
11 files changed, 176 insertions, 107 deletions
diff --git a/easyeffectsrc b/easyeffectsrc new file mode 100644 index 0000000..a4cbf66 --- /dev/null +++ b/easyeffectsrc @@ -0,0 +1,2 @@ +[UiSettings] +ColorScheme=BreezeDark diff --git a/hypr/hyprland.conf b/hypr/hyprland.conf index d5dc4d3..3cf64ce 100644 --- a/hypr/hyprland.conf +++ b/hypr/hyprland.conf @@ -1,7 +1,7 @@ # See https://wiki.hypr.land/Configuring/Monitors/ #{{{ Monitor config -#monitor = DP-2, 1920x1080@75, 0x0, 1 -#monitor = HDMI-A-1, 1920x1080@75, 1920x0, 1 +monitor = DP-2, 1920x1080@75, 0x0, 1 +monitor = HDMI-A-1, 1920x1080@75, 1920x0, 1 #monitor = eDP-1, 1920x1080@60, 0x0, 1 monitor = , preferred, auto, 1 #}}} @@ -22,14 +22,13 @@ exec-once = hyprpaper #exec-once = hypridle exec-once = waybar exec-once = pypr -exec-once = hyprscratch init +#exec-once = hyprscratch init exec-once = lxqt-policykit-agent exec-once = import-gsettings gtk-theme 'Flat-Remix-GTK-Green-Darkest' exec-once = import-gsettings icon-theme 'Papirus-Dark' 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 = xwayland-satellite :1 @@ -215,8 +214,18 @@ plugin { # windowrule = float, ^(kitty)$ # Example windowrule v2 # windowrule = float, class:^(kitty)$, title:^(kitty)$ +# See https://wiki.hyprland.org/Configuring/Window-Rules/ for more +windowrulev2 = float, match:class ^(lxqt-policykit-agent)$ +windowrulev2 = tile, match:class ^(REAPER)$, match:title ^(REAPER v[0-9.]* - Registered to [A-Za-z ]* \(Licensed for personal/small business use\))$ +windowrulev2 = tile, match:class ^(REAPER)$, match:title ^(reaper)$ +windowrulev2 = tile, match:class ^(REAPER)$, match:title ^(Mixer)$ +windowrulev2 = move onscreen cursor -50% -50%, match:title ^(menu)$ +windowrulev2 = move cursor, match:class REAPER, match:floating on +windowrulev2 = nofocus, match:class REAPER, match:title ^(menu)$ +windowrulev2 = nofocus, match:class REAPER, match:title ^$ # See https://wiki.hypr.land/Configuring/Window-Rules/ for more -windowrulev2 = workspace special:easyeffects silent, match: class ^(com\.github\.wwmm\.easyeffects)$ +windowrulev2 = workspace special:easyeffects silent, match:class ^(com\.github\.wwmm\.easyeffects)$ +windowrulev2 = workspace special:sonobus silent, match:class ^(SonoBus)$ # Fix brave xray menus windowrulev2 = xray 0, match:class ^(\s*), match:title ^(\s*)$ # Center floating XWayland windows @@ -235,31 +244,7 @@ windowrule = workspace +0, match:workspace name:spirss, match:title negative:spi windowrule = workspace +0, match:workspace name:spvimw, match:title negative:spvimw windowrule = workspace +0, match:workspace name:sptrmc, match:title negative:sptrmc windowrule = workspace +0, match:workspace name:helvum, match:title negative:helvum -windowrule = workspace +0, match:workspace name:easyeffects, match:title negative:easyeffects -windowrule = center on, match:title sphtop -windowrule = center on, match:title spterm -windowrule = center on, match:title sppmxr -windowrule = center on, match:title spblue -windowrule = center on, match:title spncmp -windowrule = center on, match:title spmutt -windowrule = center on, match:title spprof -windowrule = center on, match:title spirss -windowrule = center on, match:title spvimw -windowrule = center on, match:title sptrmc -windowrule = center on, match:title helvum -windowrule = center on, match:title easyeffects -windowrule = size monitor_w/2 monitor_h/2, match:title ^(sphtop)$ -windowrule = size monitor_w/2 monitor_h/2, match:title ^(spterm)$ -windowrule = size monitor_w/2 monitor_h/2, match:title ^(sppmxr)$ -windowrule = size monitor_w/2 monitor_h/2, match:title ^(spblue)$ -windowrule = size monitor_w/2 monitor_h/2, match:title ^(spncmp)$ -windowrule = size monitor_w/2 monitor_h/2, match:title ^(spmutt)$ -windowrule = size monitor_w/2 monitor_h/2, match:title ^(spprof)$ -windowrule = size monitor_w/2 monitor_h/2, match:title ^(spirss)$ -windowrule = size monitor_w/2 monitor_h/2, match:title ^(spvimw)$ -windowrule = size monitor_w/2 monitor_h/2, match:title ^(sptrmc)$ -windowrule = size monitor_w/2 monitor_h/2, match:title ^(helvum)$ -windowrule = size monitor_w/2 monitor_h/2, match:title ^(easyeffects)$ +windowrule = workspace +0, match:workspace name:easyfx, match:title negative:easyfx #}}} #{{{ Layerrules @@ -461,30 +446,18 @@ bind = $mainMod Control, M, exec, volsv -m #}}} #{{{ Scratchpads -workspace = name:sphtop, persistent:false -workspace = name:spterm, persistent:false -workspace = name:sppmxr, persistent:false -workspace = name:spblue, persistent:false -workspace = name:spncmp, persistent:false -workspace = name:spmutt, persistent:false -workspace = name:spprof, persistent:false -workspace = name:spirss, persistent:false -workspace = name:spvimw, persistent:false -workspace = name:sptrmc, persistent:false -workspace = name:helvum, persistent:false -workspace = name:easyeffects, persistent:false -bind = $mainMod CONTROL, Z, exec, hyprscratch toggle sphtop -bind = $mainMod CONTROL, X, exec, hyprscratch toggle spterm -bind = $mainMod CONTROL, C, exec, hyprscratch toggle sppmxr -bind = $mainMod CONTROL, V, exec, hyprscratch toggle spblue -bind = $mainMod CONTROL, B, exec, hyprscratch toggle spncmp -bind = $mainMod CONTROL, A, exec, hyprscratch toggle spmutt -bind = $mainMod CONTROL, S, exec, hyprscratch toggle spprof -bind = $mainMod CONTROL, D, exec, hyprscratch toggle spirss -bind = $mainMod CONTROL, F, exec, hyprscratch toggle spvimw -bind = $mainMod CONTROL, G, exec, hyprscratch toggle sptrmc -bind = $mainMod CONTROL, Q, exec, hyprscratch toggle helvum -bind = $mainMod CONTROL, E, exec, hyprscratch toggle easyeffects +bind = $mainMod CONTROL, Z, exec, pypr toggle sphtop +bind = $mainMod CONTROL, X, exec, pypr toggle spterm +bind = $mainMod CONTROL, C, exec, pypr toggle sppmxr +bind = $mainMod CONTROL, V, exec, pypr toggle spblue +bind = $mainMod CONTROL, B, exec, pypr toggle spncmp +bind = $mainMod CONTROL, A, exec, pypr toggle spmutt +bind = $mainMod CONTROL, S, exec, pypr toggle spprof +bind = $mainMod CONTROL, D, exec, pypr toggle spirss +bind = $mainMod CONTROL, F, exec, pypr toggle spvimw +bind = $mainMod CONTROL, G, exec, pypr toggle sptrmc +bind = $mainMod CONTROL, Q, exec, pypr toggle helvum +bind = $mainMod CONTROL, E, exec, pypr toggle easyfx #}}} #{{{ OBS bindings @@ -518,9 +491,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/hyprscratch.conf b/hypr/hyprscratch.conf index fe3cda6..f614cda 100644 --- a/hypr/hyprscratch.conf +++ b/hypr/hyprscratch.conf @@ -112,3 +112,12 @@ easyeffects { options = lazy } +sonobus { + # Mandatory fields + title = SonoBus + command = sonobus + + # Optional fields + options = special +} + diff --git a/hypr/pyprland.toml b/hypr/pyprland.toml index cacd7f1..3110ba5 100644 --- a/hypr/pyprland.toml +++ b/hypr/pyprland.toml @@ -1,5 +1,78 @@ [pyprland] plugins = [ "toggle_special", + "scratchpads", "expose" ] + +[scratchpads.sphtop] +animation = "fromBottom" +command = "kitty --class sphtop -e htop" +class = "sphtop" +size = "50% 50%" + +[scratchpads.spterm] +animation = "fromBottom" +command = "kitty --class spterm" +class = "spterm" +size = "50% 50%" + +[scratchpads.sppmxr] +animation = "fromBottom" +command = "kitty --class sppmxr -e pulsemixer" +class = "sppmxr" +size = "50% 50%" + +[scratchpads.spblue] +animation = "fromBottom" +command = "kitty --class spblue -e bluetoothctl" +class = "spblue" +size = "50% 50%" + +[scratchpads.spncmp] +animation = "fromBottom" +command = "kitty --class spncmp -e ncmpcpp" +class = "spncmp" +size = "50% 50%" + +[scratchpads.spmutt] +animation = "fromBottom" +command = "kitty --class spmutt -e neomutt" +class = "spmutt" +size = "50% 50%" + +[scratchpads.spprof] +animation = "fromBottom" +command = "kitty --class spprof -e profanity" +class = "spprof" +size = "50% 50%" + +[scratchpads.spirss] +animation = "fromBottom" +command = "kitty --class spirss -e irssi" +class = "spirss" +size = "50% 50%" + +[scratchpads.spvimw] +animation = "fromBottom" +command = "kitty --class spvimw -e vw" +class = "spvimw" +size = "50% 50%" + +[scratchpads.trmc] +animation = "fromBottom" +command = "kitty --class trmc -e tremc" +class = "trmc" +size = "50% 50%" + +[scratchpads.helvum] +animation = "fromBottom" +command = "helvum" +class = "org.pipewire.Helvum" +size = "50% 50%" + +[scratchpads.easyfx] +animation = "fromBottom" +command = "easyeffects" +class = "com.github.wwmm.easyeffects" +size = "50% 50%" diff --git a/kitty/kitty.conf b/kitty/kitty.conf index 7afcb30..dddd806 100644 --- a/kitty/kitty.conf +++ b/kitty/kitty.conf @@ -24,7 +24,7 @@ bold_italic_font auto #: italic_font Operator Mono Book Italic #: bold_italic_font Operator Mono Medium Italic -font_size 15.0 +font_size 12.0 #: Font size (in pts) diff --git a/niri/config.kdl b/niri/config.kdl index 8fa7330..68dead8 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 ae73c24..5af3dda 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 # @@ -121,6 +121,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 da85cd3..c29be0a 100644 --- a/waybar/config +++ b/waybar/config @@ -12,22 +12,31 @@ "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 "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": { @@ -171,19 +180,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 04a1c3e..75688fc 100644 --- a/waybar/style.css +++ b/waybar/style.css @@ -158,13 +158,13 @@ label:focus { } #cpu { - background-color: #1b1d1c; + background-color: #198844; color: #ffffff; padding-right: 18px; } #memory { - background-color: #198844; + background-color: #1b1d1c; color: #ffffff; padding-right: 18px; } @@ -191,7 +191,7 @@ label:focus { } #wireplumber { - background-color: #198844; + background-color: #1b1d1c; color: #ffffff; padding-right: 18px; } diff --git a/wireplumber/main.lua.d/51-custom.lua b/wireplumber/main.lua.d/51-custom.lua deleted file mode 100644 index 2340e94..0000000 --- a/wireplumber/main.lua.d/51-custom.lua +++ /dev/null @@ -1,22 +0,0 @@ -table.insert(alsa_monitor.rules, - { - -- Rules for matching a device or node. It is an array of - -- properties that all need to match the regexp. If any of the - -- matches work, the actions are executed for the object. - matches = { - { - { "device.name", "matches", "alsa_card.usb-Audient_Audient_iD4-00" }, - }, - }, - -- Apply properties on the matched object. - apply_properties = { - -- Use UCM instead of profile when available. Can be - -- disabled to skip trying to use the UCM profile. - ["api.alsa.use-ucm"] = false, - - -- The default active profile. Is by default set to "Off". - ["device.profile"] = "Pro Audio", - }, - } -) - |