From 189177f6bc565e051b2a6ec493dad781b01059b9 Mon Sep 17 00:00:00 2001 From: k4rli Date: Sun, 12 Apr 2026 20:20:35 +0300 Subject: [PATCH] updates --- home_dotfiles/.config/sway/config | 135 +++++++----------- home_dotfiles/.config/sway/i3status-rust.toml | 9 +- install-arch-sway-requirements.sh | 4 +- install-arch-sway.sh | 1 + scripts/video-chop.sh | 6 + 5 files changed, 70 insertions(+), 85 deletions(-) diff --git a/home_dotfiles/.config/sway/config b/home_dotfiles/.config/sway/config index ca1091b..79d9623 100644 --- a/home_dotfiles/.config/sway/config +++ b/home_dotfiles/.config/sway/config @@ -65,6 +65,7 @@ set $filemanager thunar # Defaults (kept here so the config still loads even if the included file is missing) set $lg_left_monitor_mode 3840x2160@165Hz +set $samsung_right_monitor_mode 2560x1440@144Hz set $lg_left_monitor_bar_height 40 set $lg_left_monitor_bar_font pango: FontAwesome, monospace 14 @@ -72,11 +73,28 @@ set $right_monitor_x 3840 set $right_monitor_bar_height 24 set $right_monitor_bar_font pango: FontAwesome, monospace 10 +set $bar_output_1 "DP-1" +set $bar_output_2 "HDMI-A-1" +set $bar_position bottom +set $bar_separator_symbol " - " +set $bar_workspace_min_width 36 +set $bar_color_main "#000000" +set $bar_color_text "#ffffff" +set $bar_color_urgent "#ff0000" +set $bar_color_separator "#666666" + +set $cursor_hide_timeout_ms 5000 + +set $lockscreen_seconds 1500 +set $lockscreen_bg "000000" + +set $keyboard_layout "ee,it" + # Display/bar profile overrides for 330Hz gamemode include /home/raga/.config/sway/scripts/display-profile/display-profile.conf ############################################################################### -# Output configuration +# Outputs ############################################################################### # Default wallpaper (more resolutions are available in /usr/share/backgrounds/sway/) @@ -84,64 +102,36 @@ include /home/raga/.config/sway/scripts/display-profile/display-profile.conf # 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. +# swaymsg -t get_outputs output DP-1 { -# adaptive_sync on - render_bit_depth 10 - position 0 0 - - # ECO - # mode 2560x1440@60Hz - - # FULL mode $lg_left_monitor_mode + render_bit_depth 10 +# adaptive_sync on } output HDMI-A-1 { position $right_monitor_x 0 - mode 2560x1440@144Hz -} - -output DP-2 { - position 0 0 - mode $lg_left_monitor_mode -# 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 + mode $samsung_right_monitor_mode } ############################################################################### -# Idle configuration +# Lockscreen ############################################################################### exec swayidle -w \ - timeout 1500 'swaylock -f -c 000000' \ + timeout $lockscreen_seconds 'swaylock -f -c $lockscreen_bg' \ # timeout 1800 'swaymsg "output * power off"' resume 'swaymsg "output * power on"' \ - before-sleep 'swaylock -f -c 000000' + before-sleep 'swaylock -f -c $lockscreen_bg' ############################################################################### -# Input configuration +# Inputs ############################################################################### -# Estonian keyboard layout configuration -# input type:keyboard { -# xkb_layout "ee" -# xkb_variant "nodeadkeys" -# } input * { xkb_layout "ee,it" -# xkb_options "grp:alt_shift_toggle" } -# Enable touchpad tap, natural scroll input type:touchpad { dwt enabled tap enabled @@ -149,7 +139,7 @@ input type:touchpad { middle_emulation enabled } -# Disable mouse acceleration for all pointer devices +# Disable mouse acceleration input type:pointer { accel_profile flat } @@ -251,7 +241,7 @@ bindsym $mod+Shift+e exec swaynag -t warning -m 'Do you really want to exit sway #bindsym $mod+Shift+p exec systemctl poweroff ## Session // Lock Screen // <> Escape ## -bindsym $mod+Escape exec swaylock -f -c 000000 +bindsym $mod+Escape exec swaylock -f -c $lockscreen_bg ## Session // Sleep // <> s ## #bindsym $mod+Shift+s exec systemctl suspend @@ -282,18 +272,9 @@ mode "$osrs_mode" { # System Management (Arch Linux alternatives) ############################################################################### -## Modify // Settings // <> c ## -#bindsym $mod+c exec env XDG_CURRENT_DESKTOP=GNOME gnome-control-center - -## Modify // Display Settings // <> d ## -#bindsym $mod+d exec wdisplays - ## Modify // Wifi Settings // <> w ## bindsym $mod+w exec nm-connection-editor -## Modify // Bluetooth Settings // <> b ## -bindsym $mod+b exec blueman-manager - ## Launch // File Browser // <> n ## bindsym $mod+Shift+n exec $filemanager @@ -543,54 +524,52 @@ bindsym $mod+i bar mode toggle ############################################################################### bar { - output DP-1 - #output DP-2 - position bottom + output $bar_output_1 + position $bar_position mode dock height $lg_left_monitor_bar_height font $lg_left_monitor_bar_font - separator_symbol " " + separator_symbol $bar_separator_symbol strip_workspace_numbers yes - workspace_min_width 36 + workspace_min_width $bar_workspace_min_width status_command i3status-rs ~/.config/sway/i3status-rust.toml || while date +'%Y-%m-%d %l:%M:%S %p'; do sleep 1; done colors { - background #000000 - statusline #ffffff - separator #666666 + background $bar_color_main + statusline $bar_color_text + separator $bar_color_separator - # border backgr. text - focused_workspace #000000 #ffffff #000000 - active_workspace #ffffff #000000 #ffffff - inactive_workspace #000000 #000000 #ffffff - urgent_workspace #000000 #ff0000 #ffffff + # border backgr. text + focused_workspace $bar_color_main $bar_color_text $bar_color_main + active_workspace $bar_color_text $bar_color_main $bar_color_text + inactive_workspace $bar_color_main $bar_color_main $bar_color_text + urgent_workspace $bar_color_main $bar_color_urgent $bar_color_text } } bar { - #output DP-2 - output HDMI-A-1 - position bottom + output $bar_output_2 + position $bar_position mode dock height $right_monitor_bar_height font $right_monitor_bar_font - separator_symbol " " + separator_symbol $separator_symbol strip_workspace_numbers yes - workspace_min_width 36 + workspace_min_width $bar_workspace_min_width status_command i3status-rs ~/.config/sway/i3status-rust.toml || while date +'%Y-%m-%d %l:%M:%S %p'; do sleep 1; done colors { - background #000000 - statusline #ffffff - separator #666666 + background $bar_color_main + statusline $bar_color_text + separator $bar_color_separator - # border backgr. text - focused_workspace #000000 #ffffff #000000 - active_workspace #ffffff #000000 #ffffff - inactive_workspace #000000 #000000 #ffffff - urgent_workspace #000000 #ff0000 #ffffff + # border backgr. text + focused_workspace $bar_color_main $bar_color_text $bar_color_main + active_workspace $bar_color_text $bar_color_main $bar_color_text + inactive_workspace $bar_color_main $bar_color_main $bar_color_text + urgent_workspace $bar_color_main $bar_color_urgent $bar_color_text } } @@ -598,12 +577,10 @@ bar { # Autostart Applications ############################################################################### -# Start background applications exec --no-startup-id systemctl --user import-environment XDG_CURRENT_DESKTOP DISPLAY WAYLAND_DISPLAY exec --no-startup-id hash dbus-update-activation-environment 2>/dev/null && \ dbus-update-activation-environment --systemd XDG_CURRENT_DESKTOP DISPLAY WAYLAND_DISPLAY -# Start essential services (Arch Linux) exec mako # Notification daemon exec lxqt-policykit-agent # Authentication agent (comment out if not needed) @@ -611,9 +588,7 @@ exec --no-startup-id blueman-applet exec --no-startup-id nm-applet exec --no-startup-id home_dotfiles/.config/sway/scripts/i3status/set-random-bg.sh +seat seat0 hide_cursor $cursor_hide_timeout_ms + # Include additional config files if they exist include /etc/sway/config.d/* - -#bindsym $mod+x exec "$(file="/tmp/click"; if test "0" = "$(cat "$file")"; then printf '1\n' > "$file"; else printf '0\n' > "$file"; fi)" - -seat seat0 hide_cursor 3000 diff --git a/home_dotfiles/.config/sway/i3status-rust.toml b/home_dotfiles/.config/sway/i3status-rust.toml index 689fb32..747f693 100644 --- a/home_dotfiles/.config/sway/i3status-rust.toml +++ b/home_dotfiles/.config/sway/i3status-rust.toml @@ -1,5 +1,11 @@ # Advanced i3status-rust configuration # Based on the i3xrocks blocks from your i3 setup +# https://github.com/greshake/i3status-rust/blob/v0.36.1/examples/config.toml + +icons_format = "{icon}" + +[icons] +icons = "awesome6" [[block]] block = "custom" @@ -120,6 +126,3 @@ interval = 1800 block = "time" format = " $icon $timestamp.datetime(f:'%Y-%m-%d %H:%M:%S%z') " interval = 1 - -[icons] -icons = "awesome6" diff --git a/install-arch-sway-requirements.sh b/install-arch-sway-requirements.sh index 5b4adb9..9099195 100755 --- a/install-arch-sway-requirements.sh +++ b/install-arch-sway-requirements.sh @@ -21,8 +21,8 @@ echo "" # === ESSENTIAL SYSTEM PACKAGES === # Comment out this section if you don't want these system packages echo "=== Installing Essential System Packages ===" -echo "Installing: file manager, screenshots, brightness, display config" -sudo pacman -S --needed thunar grim slurp brightnessctl wdisplays +echo "Installing: file manager, screenshots, brightness, display config, terminal" +sudo pacman -S --needed thunar grim slurp brightnessctl wdisplays kitty echo "✓ Essential system packages installed" echo "" diff --git a/install-arch-sway.sh b/install-arch-sway.sh index 7cca589..47fd077 100755 --- a/install-arch-sway.sh +++ b/install-arch-sway.sh @@ -37,6 +37,7 @@ echo "✓ Sway config installed to ~/.config/sway/config" # === SWAYIMG CONFIG === echo "" echo "Installing swayimg config..." +mkdir -p ~/.config/swayimg cp $SCRIPT_DIR/home_dotfiles/.config/swayimg/swayimgrc ~/.config/swayimg/swayimgrc echo "✓ Swayimg config installed to ~/.config/swayimg/swayimgrc" diff --git a/scripts/video-chop.sh b/scripts/video-chop.sh index 062e294..9a0c610 100755 --- a/scripts/video-chop.sh +++ b/scripts/video-chop.sh @@ -53,6 +53,7 @@ TIMESTAMP=$(date +"%Y%m%d_%H%M%S") # Create output filename with timestamp prefix OUTPUT_FILE="${DIRNAME}/${TIMESTAMP}_${FILENAME}.${EXTENSION}" +AUDIO_OUTPUT_FILE="${DIRNAME}/${TIMESTAMP}_${FILENAME}.mp3" # Calculate duration DURATION=$(echo "$END_SECONDS - $START_SECONDS" | bc) @@ -62,11 +63,16 @@ echo "Start: ${START_SECONDS}s" echo "End: ${END_SECONDS}s" echo "Duration: ${DURATION}s" echo "Output file: $OUTPUT_FILE" +echo "Audio output file: $AUDIO_OUTPUT_FILE" echo "" # Run ffmpeg to extract the portion # Using -ss before -i for fast seeking, and -t for duration ffmpeg -y -ss "$START_SECONDS" -i "$VIDEO_FILE" -t "$DURATION" -c copy "$OUTPUT_FILE" +# Extract audio only +ffmpeg -y -ss "$START_SECONDS" -i "$VIDEO_FILE" -t "$DURATION" -vn -q:a 2 "$AUDIO_OUTPUT_FILE" + echo "" echo "Done! Output saved to: $OUTPUT_FILE" +echo "Audio saved to: $AUDIO_OUTPUT_FILE"