summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorToby Vincent <tobyv@tobyvin.dev>2023-08-05 18:26:09 -0500
committerToby Vincent <tobyv@tobyvin.dev>2023-08-05 18:26:09 -0500
commit73a9fd28ac6008f897b99907f039257522d2b72a (patch)
tree7d1185585b03219722ffbe4ee02bfe4036f30411
parent1ca9a3ec760c4a18383e0c80443486c3a1c2a9c1 (diff)
fix(sway): more wayland fixes
-rw-r--r--sh/.profile18
-rw-r--r--wayland/.config/chromium-flags.conf2
-rw-r--r--wayland/.config/electron25-flags.conf1
-rw-r--r--wayland/.config/environment.d/50-streamlink-twitch-gui.conf1
-rw-r--r--xdg/.config/user-dirs.conf1
-rw-r--r--xdg/.config/user-dirs.dirs12
6 files changed, 7 insertions, 28 deletions
diff --git a/sh/.profile b/sh/.profile
index 658c65b..2948f6f 100644
--- a/sh/.profile
+++ b/sh/.profile
@@ -1,5 +1,5 @@
#!/bin/sh
-# shellcheck disable=2046,1090
+# shellcheck disable=1090,3001,2046
# Most of this script is a user scoped version of /etc/profile
@@ -18,12 +18,8 @@ append_path() {
# NOTE: To avoid overriding PATH, we rename it and append it separately
#
# See: https://wiki.archlinux.org/title/Environment_variables#Per_Wayland_session
-for gen in /usr/lib/systemd/user-environment-generators/*; do
- if [ -e "$gen" ]; then
- export $($gen | sed 's/^PATH=/GEN_PATH=/' | xargs)
- append_path "$GEN_PATH"
- unset GEN_PATH
- fi
+for generator in /usr/lib/systemd/user-environment-generators/*; do
+ export $($generator | xargs)
done
append_path "$HOME/.local/bin"
@@ -41,11 +37,3 @@ fi
# Unload our profile API functions
unset -f append_path
-
-# Manually parse and export XDG user directories. xdg-user-dirs-update is disabled in
-# $XDG_CONFIG_HOME/user-dirs.conf due to how it handles non-existent directories
-#
-# See: https://wiki.archlinux.org/title/XDG_user_directories
-if [ -e "$HOME/.config/user-dirs.dirs" ]; then
- export $(xargs <"$HOME/.config/user-dirs.dirs")
-fi
diff --git a/wayland/.config/chromium-flags.conf b/wayland/.config/chromium-flags.conf
new file mode 100644
index 0000000..dd938af
--- /dev/null
+++ b/wayland/.config/chromium-flags.conf
@@ -0,0 +1,2 @@
+--ozone-platform-hint=auto
+--gtk-version=4
diff --git a/wayland/.config/electron25-flags.conf b/wayland/.config/electron25-flags.conf
index da26db9..7c03993 100644
--- a/wayland/.config/electron25-flags.conf
+++ b/wayland/.config/electron25-flags.conf
@@ -1 +1,2 @@
--ozone-platform-hint=auto
+--enable-webrtc-pipewire-capturer
diff --git a/wayland/.config/environment.d/50-streamlink-twitch-gui.conf b/wayland/.config/environment.d/50-streamlink-twitch-gui.conf
new file mode 100644
index 0000000..7264a73
--- /dev/null
+++ b/wayland/.config/environment.d/50-streamlink-twitch-gui.conf
@@ -0,0 +1 @@
+NW_PRE_ARGS=--ozone-platform=wayland
diff --git a/xdg/.config/user-dirs.conf b/xdg/.config/user-dirs.conf
deleted file mode 100644
index 541deec..0000000
--- a/xdg/.config/user-dirs.conf
+++ /dev/null
@@ -1 +0,0 @@
-enabled=false
diff --git a/xdg/.config/user-dirs.dirs b/xdg/.config/user-dirs.dirs
deleted file mode 100644
index 11b32ce..0000000
--- a/xdg/.config/user-dirs.dirs
+++ /dev/null
@@ -1,12 +0,0 @@
-XDG_DESKTOP_DIR="$HOME/"
-XDG_DOCUMENTS_DIR="$HOME/doc"
-XDG_DOWNLOAD_DIR="$HOME/dl"
-XDG_MUSIC_DIR="$HOME/aud"
-XDG_PICTURES_DIR="$HOME/img"
-XDG_PUBLICSHARE_DIR="$HOME/pub"
-XDG_TEMPLATES_DIR="$HOME/templ"
-XDG_VIDEOS_DIR="$HOME/vid"
-
-XDG_SOURCE_DIR="$HOME/src"
-XDG_PACKAGE_DIR="$HOME/pkg"
-XDG_DOCKER_DIR="$HOME/dkr"