.

8 files changed, 39 insertions, 11 deletions

diff --git a/install.sh b/install.sh
index f6c5be0..3b3ee08 100755
--- a/install.sh
+++ b/install.sh
@@ -175,6 +175,9 @@ symlink $DOTFILES_DIR/nvim/init.lua $CONFIG_DIR/nvim/init.lua
 # waybar
 symlink $DOTFILES_DIR/waybar $CONFIG_DIR/waybar
 
+# wofi
+symlink $DOTFILES_DIR/wofi $CONFIG_DIR/wofi
+
 # xorg
 symlink $DOTFILES_DIR/xorg/.xinitrc $HOME/.xinitrc
 symlink $DOTFILES_DIR/xorg/.Xresources $HOME/.Xresources
diff --git a/shell/.profile b/shell/.profile
index 5872256..42f1fad 100644
--- a/shell/.profile
+++ b/shell/.profile
@@ -25,14 +25,15 @@ append_lua_path() {
 
 # export CHICKEN_INSTALL_REPOSITORY=~/.local/opt/chicken
 # export GDK_BACKEND=wayland
+# export LIBGL_ALWAYS_SOFTWARE=1
 # export QT_AUTO_SCREEN_SCALE_FACTOR=1
 # export QT_ENABLE_HIGHDPI_SCALING=1
 # export QT_QPA_PLATFORM=wayland
+# export QT_QPA_PLATFORMTHEME=kde
 # export QT_WAYLAND_FORCE_DPI=120
 # export SDL_VIDEODRIVER=wayland
 # export SWEETHOME3D_JAVA3D=1.6
 # export WLR_DRM_NO_MODIFIERS=1
-# export LIBGL_ALWAYS_SOFTWARE=1
 export EDITOR=nvim
 export QT_QPA_PLATFORMTHEME=qt5ct
 export VISUAL=nvim
diff --git a/sway/config b/sway/config
index 61ad468..a3b8270 100644
--- a/sway/config
+++ b/sway/config
@@ -16,7 +16,7 @@ exec ~/.config/sway/init.sh
 
 bindsym {
     $mod+Return exec foot
-    $mod+space exec ~/.dotfiles/wofi/run.sh
+    $mod+space exec wofi
     $mod+Tab layout toggle
 
     $mod+Shift+q kill
diff --git a/sway/init.sh b/sway/init.sh
index b478aaa..903d4ea 100755
--- a/sway/init.sh
+++ b/sway/init.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # export GDK_DPI_SCALE=0.95
-if command -v gsettings > /dev/null; then
+if command -v gsettings >/dev/null; then
     gsettings set org.gnome.desktop.interface scaling-factor 1
     gsettings set org.gnome.desktop.interface text-scaling-factor 1
     gsettings set org.gnome.desktop.interface cursor-size 32
@@ -10,7 +10,9 @@ fi
 export QT_QPA_PLATFORM=wayland
 export XDG_CURRENT_DESKTOP=sway
 
-if command -v systemctl > /dev/null; then
+os_id=$(. /etc/os-release && echo $ID)
+
+if command -v systemctl >/dev/null; then
     systemctl --user import-environment \
         QT_QPA_PLATFORM \
         SWAYSOCK \
@@ -23,12 +25,18 @@ if command -v systemctl > /dev/null; then
     systemctl --user restart xdg-desktop-portal-wlr
     systemctl --user restart xdg-desktop-portal-gtk
     systemctl --user restart plasma-kactivitymanagerd
+
 else
     dbus-update-activation-environment WAYLAND_DISPLAY \
                                        XDG_CURRENT_DESKTOP
 
-    /usr/libexec/pipewire-launcher &
-    /usr/libexec/xdg-desktop-portal-wlr &
+    if [ "$os_id" = "alpine" ]; then
+        /usr/libexec/pipewire-launcher &
+        /usr/libexec/xdg-desktop-portal-wlr &
+
+    elif [ "$os_id" = "void" ]; then
+        pipewire &
+    fi
 fi
 
 ~/.config/sway/swayidle.sh &
diff --git a/sway/run-sway.sh b/sway/run-sway.sh
index 763d83f..9141b8e 100755
--- a/sway/run-sway.sh
+++ b/sway/run-sway.sh
@@ -1,9 +1,9 @@
 #!/bin/sh
 
-exec > ~/.sway.log 2>&1
+exec >~/.sway.log 2>&1
 
 if ( ( command -v systemctl && systemctl --user is-system-running ) ||
-     pgrep -U $(id -u) dbus-daemon ) > /dev/null; then
+     pgrep -U $(id -u) dbus-daemon ) >/dev/null; then
     exec sway
 else
     exec dbus-run-session -- sway
diff --git a/wofi/config b/wofi/config
new file mode 100644
index 0000000..05a7417
--- /dev/null
+++ b/wofi/config
@@ -0,0 +1,4 @@
+show=drun
+allow_images=true
+allow_markup=true
+gtk_dark=true
diff --git a/wofi/run.sh b/wofi/run.sh
deleted file mode 100755
index c6378b5..0000000
--- a/wofi/run.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-exec wofi --show drun --allow-images --allow-markup --gtk-dark
diff --git a/wofi/style.css b/wofi/style.css
new file mode 100644
index 0000000..2747793
--- /dev/null
+++ b/wofi/style.css
@@ -0,0 +1,15 @@
+window {
+    background: rgba(50, 50, 50, 0.9);
+}
+
+#img {
+    margin: 0 0.5rem;
+}
+
+#entry > .entry {
+    margin-left: 1rem;
+}
+
+#entry > expander > .entry {
+    margin-left: 0rem;
+}