From c2d4551f7900e0cefb5bd79f390d797cac1ff07b Mon Sep 17 00:00:00 2001 From: Ian Mancini Date: Sat, 30 May 2020 17:42:13 -0300 Subject: [PATCH] Use xinit instead of startx. Use case to select session in .xinitrc --- template/shell/.aliasrc | 6 ++++-- template/x/.xinitrc | 9 ++++++++- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/template/shell/.aliasrc b/template/shell/.aliasrc index eda4d3d..c174204 100644 --- a/template/shell/.aliasrc +++ b/template/shell/.aliasrc @@ -1,6 +1,6 @@ #!/bin/sh -# Vim a +# Neovim command -v vim >/dev/null && alias vi="vi" vim="vim" vimdiff="vimdiff" command -v nvim >/dev/null && alias vi="nvim" vim="nvim" vimdiff="nvim -d" @@ -13,7 +13,6 @@ alias \ dmesg="dmesg --ctime" \ sudo='sudo ' # https://wiki.archlinux.org/index.php/Sudo#Passing_aliases - # Color alias \ ls="ls -hN --group-directories-first --color=auto" \ @@ -21,3 +20,6 @@ alias \ grep="grep -i --color=auto" \ Grep="grep --color=auto" \ diff="diff --color=auto" \ + +# Xorg +alias startx="xinit" diff --git a/template/x/.xinitrc b/template/x/.xinitrc index c243757..a2049e0 100755 --- a/template/x/.xinitrc +++ b/template/x/.xinitrc @@ -4,4 +4,11 @@ export EDITOR="nvim" export BROWSER="chromium" export TERMINAL={{TERMINAL}} -exec i3 +# Here Xfce is kept as default +session=${1:-i3} + +case $session in + i3|i3wm ) exec i3;; + steam|steamos ) steamos-session i3;; + * ) exec $1;; +esac