From b242822ee5a646b14abb72ca2421980d082d831b Mon Sep 17 00:00:00 2001
From: Mikaela Suomalainen <mikaela+git@mikaela.info>
Date: Sun, 17 Feb 2019 21:58:53 +0200
Subject: [PATCH] update PATH & make xinitrc source /etc/profile

Fixes flatpaks & snaps with dmenu
---
 rc/bashrc  | 2 +-
 rc/profile | 2 +-
 rc/xinitrc | 2 ++
 rc/zshrc   | 2 +-
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/rc/bashrc b/rc/bashrc
index d1b18afc..7b0e93a7 100644
--- a/rc/bashrc
+++ b/rc/bashrc
@@ -187,7 +187,7 @@ fi
 TZ=$(date +%Z)
 
 # Sets PATH. To add another path, add :</path/to/new/path> to string below. 
-PATH=$HOME/.local/bin:$HOME/bin:/snap/bin:$HOME/go/bin:/usr/local/bin:/usr/local/sbin:/usr/local/games:/usr/bin:/usr/sbin:/usr/games:/bin:/sbin:/games:$PATH
+PATH=$HOME/.local/bin:$HOME/bin:$HOME/go/bin:$HOME/.local/share/flatpak/exports/bin:/var/lib/flatpak/exports/bin:/snap/bin:/usr/local/bin:/usr/local/sbin:/usr/local/games:/usr/bin:/usr/sbin:/usr/games:/bin:/sbin:/games:$PATH
 
 # Add RubyGems to PATH
 if hash ruby 2>/dev/null; then
diff --git a/rc/profile b/rc/profile
index f067a33d..7071e53c 100644
--- a/rc/profile
+++ b/rc/profile
@@ -1,5 +1,5 @@
 # Set PATH properly
-PATH=$HOME/.local/bin:$HOME/bin:$HOME/go/bin:/snap/bin:/usr/local/bin:/usr/local/sbin:/usr/local/games:/usr/bin:/usr/sbin:/usr/games:/bin:/sbin:/games:$PATH
+PATH=$HOME/.local/bin:$HOME/bin:$HOME/go/bin:$HOME/.local/share/flatpak/exports/bin:/var/lib/flatpak/exports/bin:/snap/bin:/usr/local/bin:/usr/local/sbin:/usr/local/games:/usr/bin:/usr/sbin:/usr/games:/bin:/sbin:/games:$PATH
 
 # Add RubyGems to PATH
 if hash ruby 2>/dev/null; then
diff --git a/rc/xinitrc b/rc/xinitrc
index 4cd13124..93a613bd 100644
--- a/rc/xinitrc
+++ b/rc/xinitrc
@@ -1,3 +1,5 @@
+# flatpak & snap & co.
+. /etc/profile
 # Using dbus-launch seems to be necessary here to get dbus up, otherwise
 # there are errors about it missing and pasystray & nm-applet cannot be
 # interacted with.
diff --git a/rc/zshrc b/rc/zshrc
index c1b5cd38..b8172eae 100644
--- a/rc/zshrc
+++ b/rc/zshrc
@@ -145,7 +145,7 @@ fi
 TZ=$(date +%Z)
 
 # Sets PATH. To add another path, add :</path/to/new/path> to string below. 
-PATH=$HOME/.local/bin:$HOME/bin:$HOME/go/bin:/snap/bin:/usr/local/bin:/usr/local/sbin:/usr/local/games:/usr/bin:/usr/sbin:/usr/games:/bin:/sbin:/games:$PATH
+PATH=$HOME/.local/bin:$HOME/bin:$HOME/go/bin:$HOME/.local/share/flatpak/exports/bin:/var/lib/flatpak/exports/bin:/snap/bin:/usr/local/bin:/usr/local/sbin:/usr/local/games:/usr/bin:/usr/sbin:/usr/games:/bin:/sbin:/games:$PATH
 
 # Add RubyGems to PATH
 if hash ruby 2>/dev/null; then