commit acb8d43a944f74737a7433935c7d6cd4ff111edd
parent 0dda6cf7c381c2d3938788d161962026b8df4453
Author: Szymon Mikulicz <szymon.mikulicz@posteo.net>
Date: Fri, 15 May 2026 17:53:34 +0200
Fix sway path
Diffstat:
7 files changed, 15 insertions(+), 52 deletions(-)
diff --git a/sway/.config/sway/config b/sway/.config/sway/config
@@ -7,12 +7,12 @@ font pango:Tamsyn 10
floating_modifier $mod
-bindsym $mod+Return exec $HOME/.usr/local/bin/mlterm-wl
+bindsym $mod+Return exec mlterm-wl
bindsym $mod+Shift+q kill
-bindsym $mod+d exec zsh -lc "$($HOME/.usr/local/bin/tofi-drun)"
-bindsym $mod+o exec find $HOME/.password-store -name '*.gpg' | sed "s@$HOME/.password-store/@@;"'s/\.gpg$//' | $HOME/.usr/local/bin/tofi | xargs -i pass "{}" -c
+bindsym $mod+d exec j4-dmenu-desktop -t mlterm-wl -I -d tofi
+bindsym $mod+o exec find $HOME/.password-store -name '*.gpg' | sed "s@$HOME/.password-store/@@;"'s/\.gpg$//' | tofi | xargs -i pass "{}" -c
bindsym $mod+h focus left
bindsym $mod+j focus down
@@ -120,7 +120,7 @@ bindsym XF86AudioStop exec --no-startup-id playerctl stop
bindsym XF86AudioNext exec --no-startup-id playerctl next
bindsym XF86AudioPrev exec --no-startup-id playerctl prev
-bindsym $mod+c exec $HOME/.usr/local/bin/mlterm-wl -g 100x30 -N com.sub.tui -e tmux new-session -A -s subtui SubTUI
+bindsym $mod+c exec mlterm-wl -g 100x30 -N com.sub.tui -e tmux new-session -A -s subtui SubTUI
# Screen brightness controls
bindsym XF86MonBrightnessDown exec brightnessctl s 10%-
@@ -169,15 +169,15 @@ for_window [instance="^octave\-gui$"] floating enable
for_window [instance="^matplotlib$"] floating enable
for_window [app_id="com.sub.tui"] floating enable
-exec $HOME/.usr/local/bin/awww-daemon
-exec zsh -c "randpaper --daemon"
+exec awww-daemon
+exec randpaper --daemon
exec mako
exec wlsunset -l 50.049683 -L 19.944544
bar {
font pango:Powerline Symbols, DejaVu Sans Mono, FontAwesome 10
position top
- status_command zsh -c "i3status-rs"
+ status_command i3status-rs
colors {
separator #666666
background #232136c8
diff --git a/sway/.config/sway/env b/sway/.config/sway/env
@@ -1,11 +1,3 @@
XDG_SESSION_TYPE=wayland
-QT_QPA_PLATFORM=wayland-egl
-QT_WAYLAND_FORCE_DPI=physical
-QT_WAYLAND_DISABLE_WINDOWDECORATION=1
-QT_QPA_PLATFORMTHEME=qt5ct
-MOZ_ENABLE_WAYLAND=1
-SAL_USE_VCLPLUGIN=gtk3
-ECORE_EVAS_ENGINE=wayland_egl
-ELM_ENGINE=wayland_egl
-SDL_VIDEODRIVER=wayland
-_JAVA_AWT_WM_NONREPARENTING=1
+XDG_DATA_DIRS=$XDG_DATA_DIRS:$HOME/.usr/local/share
+PATH=$HOME/.usr/local/bin:$HOME/.usr/local/sbin:$PATH
diff --git a/sway/.config/sway/import-gsettings.sh b/sway/.config/sway/import-gsettings.sh
@@ -1,12 +0,0 @@
-#!/bin/sh
-
-# usage: import-gsettings <gsettings key>:<settings.ini key> <gsettings key>:<settings.ini key> ...
-
-expression=""
-for pair in "$@"; do
- IFS=:; set -- $pair
- expressions="$expressions -e 's:^$2=(.*)$:gsettings set org.gnome.desktop.interface $1 \1:e'"
-done
-IFS=
-eval exec sed -E $expressions "${XDG_CONFIG_HOME:-$HOME/.config}"/gtk-3.0/settings.ini >/dev/null
-
diff --git a/sway/.config/sway/runr.sh b/sway/.config/sway/runr.sh
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-exec env DBUS_SESSION_BUS_ADDRESS='unix:path=/tmp/ssh-dbus' firefox
diff --git a/sway/.config/sway/sway-service.sh b/sway/.config/sway/sway-service.sh
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-# first import environment variables from the login manager
-systemctl --user import-environment
-# then start the service
-exec systemctl --wait --user start sway.service
diff --git a/sway/.config/systemd/user/sway.service b/sway/.config/systemd/user/sway.service
@@ -1,14 +0,0 @@
-[Unit]
-Description=sway - SirCmpwn's Wayland window manager
-Documentation=man:sway(5)
-BindsTo=graphical-session.target
-Wants=graphical-session-pre.target
-After=graphical-session-pre.target
-
-[Service]
-Type=simple
-EnvironmentFile=-%h/.config/sway/env
-ExecStart=/usr/bin/sway
-Restart=on-failure
-RestartSec=1
-TimeoutStopSec=10
diff --git a/sway/.local/share/wayland-sessions/sway-env.desktop b/sway/.local/share/wayland-sessions/sway-env.desktop
@@ -0,0 +1,6 @@
+[Desktop Entry]
+Name=Sway (Env)
+Comment=An i3-compatible Wayland compositor
+Exec=sh -c 'exec env $(envsubst < ~/.config/sway/env) sway'
+Type=Application
+DesktopNames=sway
