1
0
mirror of https://github.com/frebib/dotfiles.git synced 2024-06-14 12:57:23 +00:00

xprofile: split xinitrc into xprofile

Finally adding "proper" display-manager support instead
of just using the xlogin shim service that isn't a proper
login session
This commit is contained in:
Joe Groocock 2018-11-04 00:23:34 +00:00
parent 56229dea13
commit 30cab7d90b
Signed by: frebib
GPG Key ID: E0B16BEACFBB6A86
2 changed files with 27 additions and 22 deletions

View File

@ -1,4 +1,4 @@
#!/bin/sh
#!/bin/bash
# Run all system xinitrc shell scripts
xinitdir="/etc/X11/xinit/xinitrc.d"
@ -11,27 +11,8 @@ if [ -d "$xinitdir" ]; then
done
fi
source $HOME/.profile
xrdb -merge $XDG_CONFIG_HOME/X11/xresources
xrandr --dpi $(xrdb -query | grep -i xft.dpi | cut -d: -f2)
setxkbmap -option caps:none
xset r rate 200 18
export TERMINAL="termite"
export BROWSER="chromium"
export _JAVA_OPTIONS="-Dawt.useSystemAAFontSettings=on -Dswing.defaultlaf=com.sun.java.swing.plaf.gtk.GTKLookAndFeel"
export QT_QPA_PLATFORMTHEME=gtk2
export QT_STYLE_OVERRIDE=gtk2
export XDG_CURRENT_DESKTOP="GNOME" # Fixes xdg-open
# Merge system clipboards
if [ -n "$DISPLAY" ] && exists autocutsel && ! pidof autocutsel 1>/dev/null; then
autocutsel -fork
autocutsel -selection PRIMARY -fork
fi
# Source generic xprofile stuff
source "$(dirname "${BASH_SOURCE[0]}")/xprofile"
# Start the gnome-keyring if it's installed
if exists gnome-keyring-daemon; then

24
.config/X11/xprofile Normal file
View File

@ -0,0 +1,24 @@
#!/bin/sh
# Graphical-specific environment variables
export TERMINAL="termite"
export BROWSER="chromium"
export _JAVA_OPTIONS="-Dawt.useSystemAAFontSettings=on -Dswing.defaultlaf=com.sun.java.swing.plaf.gtk.GTKLookAndFeel"
export QT_QPA_PLATFORMTHEME=gtk2
export QT_STYLE_OVERRIDE=gtk2
export XDG_CURRENT_DESKTOP="GNOME" # Fixes xdg-open
# Load Xorg resources and set the DPI
xrdb -merge $XDG_CONFIG_HOME/X11/xresources
xrandr --dpi $(xrdb -query | grep -i xft.dpi | cut -d: -f2)
setxkbmap -option caps:none
xset r rate 200 18
# Merge system clipboards
if [ -n "$DISPLAY" ] && exists autocutsel && ! pidof autocutsel 1>/dev/null; then
autocutsel -fork
autocutsel -selection PRIMARY -fork
fi