From 85f2227695b9cffda4487ffa4b4dfad52ac8c532 Mon Sep 17 00:00:00 2001
From: Daniel Flanagan <daniel@lyte.dev>
Date: Fri, 18 Feb 2022 10:53:18 -0600
Subject: [PATCH] Fix pipewire stuff

---
 common/fish/functions.fish |  2 +-
 common/htop/rc             |  2 +-
 os/linux/sway/config       | 16 ++++++++--------
 os/linux/sway/init         |  8 ++++----
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/common/fish/functions.fish b/common/fish/functions.fish
index 601334a..54cd557 100644
--- a/common/fish/functions.fish
+++ b/common/fish/functions.fish
@@ -143,7 +143,7 @@ alias cdltl "cd (ltld)"
 function p
 	set ip 8.8.8.8
 	set -q argv[1] && set ip $argv[1]
-	ping $ip
+	ping $ip $argv[2..]
 end
 function pp --description "Keeps trying to ping 8.8.8.8 forever"
 	while not ping -n 1 -w 5 8.8.8.8
diff --git a/common/htop/rc b/common/htop/rc
index da3a701..7a98287 100644
--- a/common/htop/rc
+++ b/common/htop/rc
@@ -21,7 +21,7 @@ highlight_changes_delay_secs=5
 find_comm_in_cmdline=1
 strip_exe_from_cmdline=1
 show_merged_command=0
-tree_view=0
+tree_view=1
 tree_view_always_by_pid=0
 all_branches_collapsed=0
 header_margin=1
diff --git a/os/linux/sway/config b/os/linux/sway/config
index 37516e4..d62ac6b 100644
--- a/os/linux/sway/config
+++ b/os/linux/sway/config
@@ -176,19 +176,19 @@ bar {
 	swaybar_command waybar
 }
 
-exec dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP=sway
-exec systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP
 exec mako
-exec pipewire
-exec /usr/lib/kdeconnectd
 exec gammastep -t 6500:3500 -l 39.0:-94.5
-exec sway-init-tmux
-exec $term
-
 exec_always 'killall kanshi; kanshi'
-exec_always notify-send -a "sway" -i ~/.wallpaper "sway configuration loaded"
+# exec /usr/lib/kdeconnectd
+# exec sway-init-tmux
+# exec $term
 
+# exec_always notify-send -a "sway" -i ~/.wallpaper "sway configuration loaded"
+
+# prevents all windows from stealing focus
 no_focus [class=".*"]
+
 output * bg $HOME/.wallpaper fill
 
+include /etc/sway/config.d/*
 include $XDG_CONFIG_HOME/lytedev-env/*/sway/config
diff --git a/os/linux/sway/init b/os/linux/sway/init
index 97f9b27..fa40d65 100755
--- a/os/linux/sway/init
+++ b/os/linux/sway/init
@@ -14,14 +14,14 @@ end
 # set --export --universal QT_QPA_PLATFORM_PLUGIN_PATH /usr/lib/qt/plugins
 
 set --export --universal CLUTTER_BACKEND wayland
-set --export --universal SDL_VIDEODRIVER wayland
+# set --export --universal SDL_VIDEODRIVER wayland
 set --export --universal MOZ_ENABLE_WAYLAND 1
 set --export --universal XDG_CURRENT_DESKTOP sway
 set --export --universal _JAVA_AWT_WM_NONREPARENTING 1
 
-for s in $ENV_PATH/*/sway-init.d.fish
-	source $s (dirname $s)
-end
+# for s in $ENV_PATH/*/sway-init.d.fish
+# 	source $s (dirname $s)
+# end
 
 set --query SWAY_LOGGING || set SWAY_LOGGING 0