improve structure; move stuff to relevant folders

This commit is contained in:
2025-12-31 14:53:07 +02:00
parent e4296a3251
commit e405894cc2
34 changed files with 1452 additions and 80 deletions

View File

@@ -72,9 +72,8 @@ set $dp2_x 3840
set $dp2_bar_height 24
set $dp2_bar_font pango: FontAwesome, monospace 10
# Display/bar profile overrides (written by a toggle script).
# If this file doesn't exist, sway will just use the defaults below.
include /home/raga/.config/sway/display-profile.conf
# Display/bar profile overrides for 330Hz gamemode
include /home/raga/.config/sway/scripts/display-profile/display-profile.conf
###############################################################################
# Output configuration
@@ -82,12 +81,15 @@ include /home/raga/.config/sway/display-profile.conf
# Default wallpaper (more resolutions are available in /usr/share/backgrounds/sway/)
# output * bg /usr/share/backgrounds/sway/Sway_Wallpaper_Blue_1920x1080.png fill
output * bg /home/raga/.config/sway/wallpaper.jpg fill
# output * bg /home/raga/.config/sway/wallpaper.jpg fill
# Multi-monitor setup
# 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
render_bit_depth 10
position 0 0
# ECO
@@ -111,15 +113,9 @@ output DP-2 {
# Idle configuration
###############################################################################
# Lock screen after 900 seconds of inactivity, then turn off displays
#exec swayidle -w \
# timeout 900 'swaylock -f -c 000000' \
# timeout 1800 'swaymsg "output * power off"' resume 'swaymsg "output * power on"' \
# before-sleep 'swaylock -f -c 000000'
# Lock screen after 900 seconds of inactivity
exec swayidle -w \
timeout 900 'swaylock -f -c 000000' \
# timeout 1800 'swaymsg "output * power off"' resume 'swaymsg "output * power on"' \
before-sleep 'swaylock -f -c 000000'
###############################################################################
@@ -237,7 +233,7 @@ bindsym $mod+Shift+s exec systemctl suspend
# Custom scripts (OSRS mode)
###############################################################################
set $osrs_scripts /home/raga/repos/linux/sway-new-config
set $osrs_scripts /home/raga/repos/linux/sway-new-config/scripts/osrs
set $osrs_mode OSRS
#bindsym f12 mode "$osrs_mode"
@@ -498,9 +494,9 @@ bindsym $mod+r mode "Resize Mode"
###############################################################################
# Volume control (works with both PulseAudio and PipeWire)
bindsym --locked XF86AudioMute exec pactl set-sink-mute @DEFAULT_SINK@ toggle && ~/.config/sway/volume-notify-sway.sh
bindsym --locked XF86AudioLowerVolume exec pactl set-sink-volume @DEFAULT_SINK@ -5% && ~/.config/sway/volume-notify-sway.sh
bindsym --locked XF86AudioRaiseVolume exec pactl set-sink-volume @DEFAULT_SINK@ +5% && ~/.config/sway/volume-notify-sway.sh
bindsym --locked XF86AudioMute exec pactl set-sink-mute @DEFAULT_SINK@ toggle && ~/.config/sway/scripts/sway/volume-notify.sh
bindsym --locked XF86AudioLowerVolume exec pactl set-sink-volume @DEFAULT_SINK@ -5% && ~/.config/sway/scripts/sway/volume-notify.sh
bindsym --locked XF86AudioRaiseVolume exec pactl set-sink-volume @DEFAULT_SINK@ +5% && ~/.config/sway/scripts/sway/volume-notify.sh
bindsym --locked XF86AudioMicMute exec pactl set-source-mute @DEFAULT_SOURCE@ toggle
# Brightness control
@@ -588,7 +584,7 @@ exec lxqt-policykit-agent # Authentication agent (comment out if not needed)
exec --no-startup-id blueman-applet
exec --no-startup-id nm-applet
exec --no-startup-id home_dotfiles/.config/sway/set_random_bg.sh
exec --no-startup-id home_dotfiles/.config/sway/scripts/i3status/set-random-bg.sh
# Include additional config files if they exist
include /etc/sway/config.d/*

View File

@@ -3,20 +3,20 @@
[[block]]
block = "custom"
command = "~/.config/sway/osrs-mode-status.sh"
command = "~/.config/sway/scripts/osrs/osrs-mode-status.sh"
format = " $text "
interval = 1
click = [
{button = "left", cmd = "~/.config/sway/osrs-mode-toggle.sh", update = true}
{button = "left", cmd = "~/.config/sway/scripts/osrs/osrs-mode-toggle.sh", update = true}
]
[[block]]
block = "custom"
command = "~/.config/sway/display-profile-status.sh"
command = "~/.config/sway/scripts/display-profile/display-profile-status.sh"
format = " $text "
interval = 1
click = [
{button = "left", cmd = "~/.config/sway/display-profile-toggle.sh", update = true}
{button = "left", cmd = "~/.config/sway/scripts/display-profile/display-profile-toggle.sh", update = true}
]
[[block]]
@@ -25,12 +25,12 @@ command = "echo ''"
format = " $text "
interval = 1
click = [
{button = "left", cmd = "~/.config/sway/set_random_bg.sh", update = false},
{button = "left", cmd = "~/.config/sway/scripts/i3status/set-random-bg.sh", update = false},
]
#[[block]]
#block = "custom"
#command = "~/.config/sway/get-focused-window.sh"
#command = "~/.config/sway/scripts/i3status/get-focused-window.sh"
#format = " $text "
#interval = 5
@@ -76,7 +76,7 @@ disconnected_format = ""
# Custom Bluetooth connected devices block
[[block]]
block = "custom"
command = "~/.config/sway/bluetooth-sway.sh"
command = "~/.config/sway/scripts/i3status/bluetooth.sh"
format = " $text "
interval = 10
click = [
@@ -87,7 +87,7 @@ click = [
# Custom weather block using your wttr.in script
# [[block]]
# block = "custom"
# command = "~/.config/sway/weather-sway.sh"
# command = "~/.config/sway/scripts/i3status/wttrin-weather.sh"
# format = " 🌤 $text "
# interval = 1800
# click = [
@@ -99,7 +99,7 @@ click = [
# Uncomment and modify this block if you want weather for a different city
[[block]]
block = "custom"
command = "~/.config/sway/weather-sway.sh"
command = "~/.config/sway/scripts/i3status/wttrin-weather.sh"
format = "$text"
interval = 1800
@@ -108,7 +108,7 @@ interval = 1800
# 1 = current conditions, 2 = current + today, 3 = current + today + tomorrow, 4 = current + 3 days
# [[block]]
# block = "custom"
# command = "weather_format='2' ~/.config/sway/weather-sway.sh"
# command = "weather_format='2' ~/.config/sway/scripts/i3status/wttrin-weather.sh"
# format = " 📅 $text "
# interval = 1800

View File

@@ -1,7 +1,7 @@
#!/usr/bin/env bash
set -euo pipefail
PROFILE_FILE="/home/raga/.config/sway/display-profile.conf"
PROFILE_FILE="/home/raga/.config/sway/scripts/display-profile/display-profile.conf"
mode_str=""
if [[ -f "$PROFILE_FILE" ]]; then

View File

@@ -4,7 +4,7 @@ set -euo pipefail
# Toggle DP-1 between 4K@165 and 1080p@330 and keep DP-2 positioned flush so
# you don't get a "dead gap" for the mouse.
PROFILE_FILE="/home/raga/.config/sway/display-profile.conf"
PROFILE_FILE="/home/raga/.config/sway/scripts/display-profile/display-profile.conf"
MODE_4K="3840x2160@165Hz"
MODE_GAME="1920x1080@330Hz"

View File

@@ -1,5 +1,5 @@
# This file is intended to be rewritten by scripts (see display-profile-toggle.sh).
# Keep it small so the toggle is fast.
# Default display profile
# Rewritten and toggled in `display-profile-toggle.sh`
# DP-1 (4K / gaming output)
set $dp1_mode 3840x2160@165Hz
@@ -10,4 +10,3 @@ set $dp1_bar_font pango: FontAwesome, monospace 14
set $dp2_x 3840
set $dp2_bar_height 24
set $dp2_bar_font pango: FontAwesome, monospace 10

View File

@@ -11,4 +11,4 @@ if [ "$muted" = "yes" ]; then
notify-send -t 1000 "Volume" "Muted"
else
notify-send -t 1000 "Volume" "$volume"
fi
fi