great improvements

This commit is contained in:
2026-01-26 14:53:10 +02:00
parent aabb3b1566
commit 03fab63ebf
9 changed files with 73 additions and 43 deletions

View File

@@ -64,13 +64,13 @@ set $menu fuzzel
set $filemanager thunar
# Defaults (kept here so the config still loads even if the included file is missing)
set $dp1_mode 3840x2160@165Hz
set $dp1_bar_height 40
set $dp1_bar_font pango: FontAwesome, monospace 14
set $lg_left_monitor_mode 3840x2160@165Hz
set $lg_left_monitor_bar_height 40
set $lg_left_monitor_bar_font pango: FontAwesome, monospace 14
set $dp2_x 3840
set $dp2_bar_height 24
set $dp2_bar_font pango: FontAwesome, monospace 10
set $right_monitor_x 3840
set $right_monitor_bar_height 24
set $right_monitor_bar_font pango: FontAwesome, monospace 10
# Display/bar profile overrides for 330Hz gamemode
include /home/raga/.config/sway/scripts/display-profile/display-profile.conf
@@ -87,7 +87,7 @@ include /home/raga/.config/sway/scripts/display-profile/display-profile.conf
# You can get your output names by running: swaymsg -t get_outputs
# DP-2 is the primary monitor on the left, and DP-1 is on the right.
output DP-1 {
adaptive_sync on
# adaptive_sync on
render_bit_depth 10
position 0 0
@@ -96,14 +96,21 @@ output DP-1 {
# mode 2560x1440@60Hz
# FULL
mode $dp1_mode
mode $lg_left_monitor_mode
}
output HDMI-A-1 {
position $right_monitor_x 0
mode 2560x1440@144Hz
}
output DP-2 {
position $dp2_x 0
position $right_monitor_x 0
# ECO
# mode 2560x1440@60Hz
# mode 2560x1440@120Hz
# mode 2560x1440@120Hz
# FULL
# modeline 586.59 2560 2568 2600 2640 1440 1529 1537 1543 +hsync -vsync
@@ -153,15 +160,28 @@ input type:pointer {
floating_maximum_size -1 x -1
for_window [app_id="floating_window"] floating enable
for_window [app_id="pavucontrol"] floating enable
for_window [app_id="Windscribe"] floating enable
for_window [class="steam" instance="steamwebhelper"] floating enable
for_window [class="steam" title="Steam"] floating disable
for_window [app_id="net.davidotek.pupgui2"] floating enable
for_window [app_id="blueman-manager"] floating enable
for_window [app_id="firefox" title=".*Bitwarden.*"] floating enable
# Border configuration
default_floating_border pixel 1
default_border pixel 1
set $bg #000000
set $br #FFFFFF
set $brbug #FF0000
# class border backgr. text indicator child_border
client.focused $br $br $br $brbug $br
client.focused_inactive $bg $bg $br $bg $bg
client.unfocused $bg $bg $br $bg $bg
client.urgent $br $br $br $bg $br
client.placeholder $br $br $br $bg $br
# Hiding borders adjacent to the screen edges.
hide_edge_borders smart
@@ -246,6 +266,7 @@ mode "$osrs_mode" {
bindsym q exec $osrs_scripts/osrs-drop.sh
bindsym w exec $osrs_scripts/osrs-click.sh
bindsym o exec $osrs_scripts/mouse-toggle.sh toggle
bindsym p exec $osrs_scripts/mouse-toggle.sh
bindsym a exec kitty -e $osrs_scripts/autoclicker.sh
#bindsym Escape exec $osrs_scripts/autoclicker-stop.sh
@@ -523,8 +544,8 @@ bar {
output DP-1
position bottom
mode dock
height $dp1_bar_height
font $dp1_bar_font
height $lg_left_monitor_bar_height
font $lg_left_monitor_bar_font
separator_symbol " "
strip_workspace_numbers yes
workspace_min_width 36
@@ -545,11 +566,12 @@ bar {
}
bar {
output DP-2
#output DP-2
output HDMI-A-1
position bottom
mode dock
height $dp2_bar_height
font $dp2_bar_font
height $right_monitor_bar_height
font $right_monitor_bar_font
separator_symbol " "
strip_workspace_numbers yes
workspace_min_width 36

View File

@@ -1,14 +1,14 @@
# Advanced i3status-rust configuration
# Based on the i3xrocks blocks from your i3 setup
#[[block]]
#block = "custom"
#command = "~/.config/sway/scripts/osrs/osrs-mode-status.sh"
#format = " $text "
#interval = 1
#click = [
# {button = "left", cmd = "~/.config/sway/scripts/osrs/osrs-mode-toggle.sh", update = true}
#]
[[block]]
block = "custom"
command = "~/.config/sway/scripts/osrs/osrs-mode-status.sh"
format = " $text "
interval = 1
click = [
{button = "left", cmd = "~/.config/sway/scripts/osrs/osrs-mode-toggle.sh", update = true}
]
[[block]]
block = "custom"
@@ -63,7 +63,7 @@ missing_format = ""
block = "sound"
format = " $icon $volume "
click = [
{button = "left", cmd = "pavucontrol"},
{button = "left", cmd = "pavucontrol --tab=3"},
{button = "right", cmd = "pactl set-sink-mute @DEFAULT_SINK@ toggle"},
]

View File

@@ -5,7 +5,7 @@ PROFILE_FILE="/home/raga/.config/sway/scripts/display-profile/display-profile.co
mode_str=""
if [[ -f "$PROFILE_FILE" ]]; then
mode_str="$(awk '$1=="set" && $2=="$dp1_mode" {print $3; found=1} END {if(!found) print ""}' "$PROFILE_FILE" 2>/dev/null)"
mode_str="$(awk '$1=="set" && $2=="$lg_left_monitor_mode" {print $3; found=1} END {if(!found) print ""}' "$PROFILE_FILE" 2>/dev/null)"
fi
# Display-related FontAwesome icon + a short label.

View File

@@ -28,29 +28,29 @@ get_current_profile_mode() {
return
fi
# Example line: set $dp1_mode 3840x2160@165Hz
awk '$1=="set" && $2=="$dp1_mode" {print $3; found=1} END {if(!found) exit 1}' "$PROFILE_FILE" 2>/dev/null \
# Example line: set $lg_left_monitor_mode 3840x2160@165Hz
awk '$1=="set" && $2=="$lg_left_monitor_mode" {print $3; found=1} END {if(!found) exit 1}' "$PROFILE_FILE" 2>/dev/null \
|| echo "$MODE_4K"
}
write_profile() {
local dp1_mode="$1"
local dp1_bar_height="$2"
local dp1_bar_font="$3"
local dp2_x="$4"
local lg_left_monitor_mode="$1"
local lg_left_monitor_bar_height="$2"
local lg_left_monitor_bar_font="$3"
local right_monitor_x="$4"
local tmp
tmp="$(mktemp)"
cat >"$tmp" <<EOF
# Autogenerated by display-profile-toggle.sh. Manual edits will be overwritten.
set \$dp1_mode ${dp1_mode}
set \$dp1_bar_height ${dp1_bar_height}
set \$dp1_bar_font ${dp1_bar_font}
set \$lg_left_monitor_mode ${lg_left_monitor_mode}
set \$lg_left_monitor_bar_height ${lg_left_monitor_bar_height}
set \$lg_left_monitor_bar_font ${lg_left_monitor_bar_font}
set \$dp2_x ${dp2_x}
set \$dp2_bar_height ${DP2_BAR_HEIGHT}
set \$dp2_bar_font ${DP2_BAR_FONT}
set \$right_monitor_x ${right_monitor_x}
set \$right_monitor_bar_height ${DP2_BAR_HEIGHT}
set \$right_monitor_bar_font ${DP2_BAR_FONT}
EOF
mkdir -p "$(dirname "$PROFILE_FILE")"

View File

@@ -2,11 +2,11 @@
# Rewritten and toggled in `display-profile-toggle.sh`
# DP-1 (4K / gaming output)
set $dp1_mode 3840x2160@165Hz
set $dp1_bar_height 40
set $dp1_bar_font pango: FontAwesome, monospace 14
set $lg_left_monitor_mode 3840x2160@165Hz
set $lg_left_monitor_bar_height 40
set $lg_left_monitor_bar_font pango: FontAwesome, monospace 14
# DP-2 (secondary output)
set $dp2_x 3840
set $dp2_bar_height 24
set $dp2_bar_font pango: FontAwesome, monospace 10
set $right_monitor_x 3840
set $right_monitor_bar_height 24
set $right_monitor_bar_font pango: FontAwesome, monospace 10

1
scripts/osrs/autoclicker/.gitignore vendored Normal file
View File

@@ -0,0 +1 @@
logs/

View File

@@ -26,6 +26,8 @@ LOCK_FILE="/tmp/autoclicker_lock"
LOG_DIR="/home/raga/repos/linux/sway-new-config/scripts/osrs/autoclicker/logs"
LOG_FILE="$LOG_DIR/click_timings_$(date +%Y%m%d_%H%M%S).csv"
export YDOTOOL_SOCKET="$HOME/.ydotool_socket"
# Create log directory if it doesn't exist
mkdir -p "$LOG_DIR"

View File

@@ -0,0 +1,5 @@
#!/bin/bash
sudo -b ydotoold \
--socket-path="$HOME/.ydotool_socket" \
--socket-own="$(id -u):$(id -g)"

View File

@@ -24,7 +24,7 @@ RANDOM_DELAY_LEFT=0.05
#RANDOM_DELAY_LEFT=0.3
### PRAYER BONES
MOVE_DISTANCE=120
MOVE_DISTANCE=180
#RANDOM_NUM=$((RANDOM % 101)) # Generate 0-100
#RANDOM_DELAY=$(echo "scale=3; 0.5 + $RANDOM_NUM / 1000" | bc)
RANDOM_DELAY=0.100