alanorth/dotfiles
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: alanorth:8b23f5748e5f8c652a08f8ca2b2f462a427a88b0
Branches Tags
alanorth:master
..
compare: alanorth:79cf112ad4f93e8b061a3713e4326b3636af27d3
Branches Tags
alanorth:master

3 Commits
8b23f5748e ... 79cf112ad4

Author SHA1 Message Date
Alan Orth
79cf112ad4
dotfiles/zshrc: export Sway variables 
We need to export these from zsh in our TTY so Sway can read them
when it starts. Sigh.
 2022-11-06 21:33:39 +03:00
Alan Orth
ee09822398
dotfiles/config/sway/config: remove systemctl import-environment 
This was apparently deprecated and no longer works as intended. You
must name all variables you want to import now.
 2022-11-06 21:30:20 +03:00
Alan Orth
75ebcd48e3
Remove ~/.pam_environment 
It has been deprecated for a long time and Arch Linux finally rem-
oved support for it from pambase.

See: https://bugs.archlinux.org/task/68945
 2022-11-06 21:23:34 +03:00
4 changed files with 15 additions and 20 deletions
Show Stats Expand all files Collapse all files

5
config.yaml
View File

@ -48,9 +48,6 @@ dotfiles:
f_psqlrc: f_psqlrc:
src: psqlrc src: psqlrc
dst: ~/.psqlrc dst: ~/.psqlrc
f_pam_environment:
src: pam_environment
dst: ~/.pam_environment
f_bashrc: f_bashrc:
src: bashrc src: bashrc
dst: ~/.bashrc dst: ~/.bashrc
@ -93,7 +90,6 @@ profiles:
- f_wob.socket - f_wob.socket
- f_sway-session.target - f_sway-session.target
- f_psqlrc - f_psqlrc
- f_pam_environment
- f_xdg_desktop_portal_wlr_config - f_xdg_desktop_portal_wlr_config
- d_local_bin - d_local_bin
- f_ssh-agent.service - f_ssh-agent.service
@ -114,7 +110,6 @@ profiles:
- f_wob.socket - f_wob.socket
- f_sway-session.target - f_sway-session.target
- f_psqlrc - f_psqlrc
- f_pam_environment
- f_xdg_desktop_portal_wlr_config - f_xdg_desktop_portal_wlr_config
- f_geoclue-agent.service - f_geoclue-agent.service
- d_local_bin - d_local_bin

2
dotfiles/config/sway/config
View File

@ -281,4 +281,4 @@ bar {
include /etc/sway/config.d/* include /etc/sway/config.d/*
# Start sway-session.target, to which kanshi.service and swayidle.service bind. # Start sway-session.target, to which kanshi.service and swayidle.service bind.
exec_always "systemctl --user import-environment; systemctl --user start sway-session.target" exec_always "systemctl --user start sway-session.target"

3
dotfiles/pam_environment
View File

@ -1,3 +0,0 @@
MOZ_ENABLE_WAYLAND=1
QT_QPA_PLATFORM=wayland-egl
XDG_CURRENT_DESKTOP=sway

7
dotfiles/zshrc
View File

@ -32,7 +32,10 @@ if [[ "$OSTYPE" =~ ^linux.*$ ]]; then
# $ npm install -g bower grunt grunt-cli # $ npm install -g bower grunt grunt-cli
PATH=$PATH:~/.node_modules/bin PATH=$PATH:~/.node_modules/bin
if [[ -n $WAYLAND_DISPLAY ]]; then {%@@ if profile == "knafeh" or profile == "balozi" @@%}
# Export these variables in our TTY so that Sway can read them when it
# starts. It's not pretty, but it's all we can do since support for
# ~/.pam_environment was removed from pambase in Arch Linux recently.
export MOZ_ENABLE_WAYLAND=1 export MOZ_ENABLE_WAYLAND=1
# 2021-06-22: fix "Firefox is already running" message # 2021-06-22: fix "Firefox is already running" message
# See: https://mastransky.wordpress.com/2020/03/16/wayland-x11-how-to-run-firefox-in-mixed-environment/ # See: https://mastransky.wordpress.com/2020/03/16/wayland-x11-how-to-run-firefox-in-mixed-environment/
@ -42,7 +45,7 @@ if [[ "$OSTYPE" =~ ^linux.*$ ]]; then
# 2020-02-10: https://github.com/swaywm/sway/wiki#issues-with-java-applications # 2020-02-10: https://github.com/swaywm/sway/wiki#issues-with-java-applications
export _JAVA_AWT_WM_NONREPARENTING=1 export _JAVA_AWT_WM_NONREPARENTING=1
export SDL_VIDEODRIVER=wayland export SDL_VIDEODRIVER=wayland
fi {%@@ endif @@%}
fi fi
# Enable asdf version manager zsh completions # Enable asdf version manager zsh completions