From a41cccb12021d6a6ae83c75edc93ab754750fc77 Mon Sep 17 00:00:00 2001 From: Sunderland93 Date: Sat, 10 Jun 2023 22:14:39 +0400 Subject: [PATCH] Revert "Swtich back from running apps with systemd" This reverts commit 6b0a66e6bec2a22255fa535c6ccd36b172aecac3. --- debian/control | 2 +- .../.config}/waybar/config.jsonc | 0 etc/skel/.config/waybar/config.jsonc.example | 5 ----- .../xdg-tileos => skel/.config}/waybar/style.css | 0 etc/skel/.config/waybar/style.css.example | 1 - etc/sway/config.d/20-waybar.conf | 9 --------- etc/sway/config.d/40-autostart-applications.conf | 4 ---- etc/sway/environment | 3 --- etc/sway/variables | 9 --------- usr/share/sway/scripts/waybar.sh | 15 --------------- 10 files changed, 1 insertion(+), 47 deletions(-) rename etc/{xdg/xdg-tileos => skel/.config}/waybar/config.jsonc (100%) delete mode 100644 etc/skel/.config/waybar/config.jsonc.example rename etc/{xdg/xdg-tileos => skel/.config}/waybar/style.css (100%) delete mode 100644 etc/skel/.config/waybar/style.css.example delete mode 100644 etc/sway/config.d/20-waybar.conf delete mode 100755 usr/share/sway/scripts/waybar.sh diff --git a/debian/control b/debian/control index 261521b..ffd8d42 100644 --- a/debian/control +++ b/debian/control @@ -8,7 +8,7 @@ Homepage: https://github.com/Tile-OS/tileos-settings-sway.git Rules-Requires-Root: no Package: tileos-settings-sway -Architecture: all +Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Conflicts: tileos-settings-river Description: default settings for Sway on TileOS diff --git a/etc/xdg/xdg-tileos/waybar/config.jsonc b/etc/skel/.config/waybar/config.jsonc similarity index 100% rename from etc/xdg/xdg-tileos/waybar/config.jsonc rename to etc/skel/.config/waybar/config.jsonc diff --git a/etc/skel/.config/waybar/config.jsonc.example b/etc/skel/.config/waybar/config.jsonc.example deleted file mode 100644 index 0ace37f..0000000 --- a/etc/skel/.config/waybar/config.jsonc.example +++ /dev/null @@ -1,5 +0,0 @@ -{ - "include": [ - "/etc/xdg/xdg-tileos/waybar/config.jsonc" - ] -} diff --git a/etc/xdg/xdg-tileos/waybar/style.css b/etc/skel/.config/waybar/style.css similarity index 100% rename from etc/xdg/xdg-tileos/waybar/style.css rename to etc/skel/.config/waybar/style.css diff --git a/etc/skel/.config/waybar/style.css.example b/etc/skel/.config/waybar/style.css.example deleted file mode 100644 index f62d5c3..0000000 --- a/etc/skel/.config/waybar/style.css.example +++ /dev/null @@ -1 +0,0 @@ -@import "/etc/xdg/xdg-tileos/waybar/style.css"; diff --git a/etc/sway/config.d/20-waybar.conf b/etc/sway/config.d/20-waybar.conf deleted file mode 100644 index f25938b..0000000 --- a/etc/sway/config.d/20-waybar.conf +++ /dev/null @@ -1,9 +0,0 @@ -# -# Status Bar: -# -# Read `man 5 sway-bar` for more information about this section. -bar { - id default - swaybar_command /usr/share/sway/scripts/waybar.sh - position top -} diff --git a/etc/sway/config.d/40-autostart-applications.conf b/etc/sway/config.d/40-autostart-applications.conf index d64b4d6..a2ddaa6 100644 --- a/etc/sway/config.d/40-autostart-applications.conf +++ b/etc/sway/config.d/40-autostart-applications.conf @@ -3,9 +3,7 @@ exec { $polkit_agent - $idle $swappy_notify - $dex_autostart $wlsunset $autotiling $term_server @@ -18,10 +16,8 @@ exec_always { $kanshi $spice_vdagent $nwg_drawer_daemon - $poweralertd $watch_playerctl $calendar_daemon $import_gsettings $update_rofi_theme - $swayr_daemon } diff --git a/etc/sway/environment b/etc/sway/environment index 056c9c6..5b05588 100644 --- a/etc/sway/environment +++ b/etc/sway/environment @@ -2,9 +2,6 @@ # from /usr/bin/start-sway script for all users of the system. # User-specific variables should be placed in $XDG_CONFIG_HOME/sway/environment -# TileOS specific config dir -export XDG_CONFIG_DIRS=/etc/xdg/xdg-tileos:/etc/xdg - # Force Wayland for Mozilla Firefox export MOZ_ENABLE_WAYLAND=1 export MOZ_DBUS_REMOTE=1 diff --git a/etc/sway/variables b/etc/sway/variables index fb2185b..8c6849a 100644 --- a/etc/sway/variables +++ b/etc/sway/variables @@ -113,15 +113,6 @@ set $kanshi '[ -x "$(command -v kanshi)" ] && pkill kanshi; exec kanshi' # Workaround for applying GTK theme set $import_gsettings '[ -f /usr/share/sway/scripts/import-gsettings.sh ] && /usr/share/sway/scripts/import-gsettings.sh' -# Dex autostart daemon -set $dex_autostart '[ -x "$(command -v dex)" ] && gdbus wait --session org.kde.StatusNotifierWatcher && dex --autostart' - -# Swayr daemon -set $swayr_daemon '[ -x "$(command -v swayrd)" ] && env RUST_BACKTRACE=1 RUST_LOG=swayr=debug swayrd &> /tmp/swayrd.log' - -# Power notifications daemon -set $poweralertd '[ -x "$(command -v poweralertd)" ] && pkill poweralertd; poweralertd -s -i "line power" &' - # Start PCmanFM as a daemon set $pcmanfm_daemon '[ -x "$(command -v pcmanfm)" ] && pcmanfm -d' diff --git a/usr/share/sway/scripts/waybar.sh b/usr/share/sway/scripts/waybar.sh deleted file mode 100755 index 17fe02b..0000000 --- a/usr/share/sway/scripts/waybar.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh -# wrapper script for waybar with args, see https://github.com/swaywm/sway/issues/5724 - -USER_CONFIG_PATH=$HOME/.config/waybar/config.jsonc -USER_STYLE_PATH=$HOME/.config/waybar/style.css - -if [ -f "$USER_CONFIG_PATH" ]; then - USER_CONFIG=$USER_CONFIG_PATH -fi - -if [ -f "$USER_STYLE_PATH" ]; then - USER_STYLE=$USER_STYLE_PATH -fi - -waybar -c "${USER_CONFIG:-"/etc/xdg/xdg-tileos/waybar/config.jsonc"}" -s "${USER_STYLE:-"/etc/xdg/xdg-tileos/waybar/style.css"}" &