From b15df10cd9a91fc7c3c088417134af478bb73730 Mon Sep 17 00:00:00 2001
From: Joel Grunbaum <joelgrun@gmail.com>
Date: Wed, 26 Oct 2022 04:24:57 +0000
Subject: [PATCH] Added login shell profiles to source configs for wayland firefox
---
zsh/zprofile | 2 ++
bash/profile | 1 +
zsh/DICT | 4 ++--
bash/DICT | 4 ++--
all-shells/commonshell | 9 +++------
5 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/all-shells/commonshell b/all-shells/commonshell
index c8a8f3a..0fc60fa 100644
--- a/all-shells/commonshell
+++ b/all-shells/commonshell
@@ -34,15 +34,12 @@
[ -r /usr/bin/ruby ] && PATH="$PATH:$(ruby -e 'puts Gem.user_dir')/bin"
[ -d ~/.cargo ] && PATH="$PATH:$HOME/.cargo/bin"
-# wsl display settings
-if [ -n "$(uname -a | grep -i 'microsoft')" ]; then
- export DISPLAY=$(ip route | awk '{print $3; exit}'):0
- export LIBGL_ALWAYS_INDIRECT=1
-fi
-
# acme.sh
[ -f "${HOME}/.acme.sh/acme.sh.env" ] && source ~/.acme.sh/acme.sh.env
+# Firefox wayland
+[ "$XDG_SESSION_TYPE" = "wayland" ] && export MOZ_ENABLE_WAYLAND=1
+
# Update dotfiles
(git -C ~/.dotfiles pull &) &>/dev/null
[ -d ~/.emacs.d ] && (git -C ~/.emacs.d pull &) &>/dev/null
diff --git a/bash/DICT b/bash/DICT
index 2355adc..ddca908 100644
--- a/bash/DICT
+++ b/bash/DICT
@@ -1,3 +1,3 @@
DEPS="all-shells"
-FILES="bashrc"
-LOCATIONS="${HOME}/.bashrc"
\ No newline at end of file
+FILES="bashrc profile"
+LOCATIONS="${HOME}/.bashrc ${HOME}/.bash_profile"
diff --git a/bash/profile b/bash/profile
new file mode 100644
index 0000000..86795d7
--- /dev/null
+++ b/bash/profile
@@ -0,0 +1 @@
+source ~/.bashrc
diff --git a/zsh/DICT b/zsh/DICT
index ce2d5ba..30f9b21 100644
--- a/zsh/DICT
+++ b/zsh/DICT
@@ -1,6 +1,6 @@
DEPS="all-shells"
-FILES="zshrc p10k.zsh antigen"
-LOCATIONS="${HOME}/.zshrc ${HOME}/.zsh/p10k.zsh ${HOME}/.zsh/antigen"
+FILES="zshrc p10k.zsh antigen zprofile"
+LOCATIONS="${HOME}/.zshrc ${HOME}/.zsh/p10k.zsh ${HOME}/.zsh/antigen ${HOME}/.zprofile"
custom() {
git submodule update --init
}
diff --git a/zsh/zprofile b/zsh/zprofile
new file mode 100644
index 0000000..208cd09
--- /dev/null
+++ b/zsh/zprofile
@@ -0,0 +1,2 @@
+source ~/.zshrc
+
--
Gitblit v1.9.3