Merge branch 'memreyagci-remove-$HOME-.xinitrc'
This commit is contained in:
commit
9ca5877024
4 changed files with 8 additions and 5 deletions
|
@ -3,11 +3,15 @@
|
||||||
# Use neovim for vim if present.
|
# Use neovim for vim if present.
|
||||||
[ -x "$(command -v nvim)" ] && alias vim="nvim" vimdiff="nvim -d"
|
[ -x "$(command -v nvim)" ] && alias vim="nvim" vimdiff="nvim -d"
|
||||||
|
|
||||||
|
# Use $XINITRC variable if file exists.
|
||||||
|
[ -f "$XINITRC" ] && alias startx="startx $XINITRC"
|
||||||
|
|
||||||
# Verbosity and settings that you pretty much just always are going to want.
|
# Verbosity and settings that you pretty much just always are going to want.
|
||||||
alias \
|
alias \
|
||||||
cp="cp -iv" \
|
cp="cp -iv" \
|
||||||
mv="mv -iv" \
|
mv="mv -iv" \
|
||||||
rm="rm -vI" \
|
rm="rm -vI" \
|
||||||
|
bc="bc -ql" \
|
||||||
mkd="mkdir -pv" \
|
mkd="mkdir -pv" \
|
||||||
yt="youtube-dl --add-metadata -i" \
|
yt="youtube-dl --add-metadata -i" \
|
||||||
yta="yt -x -f bestaudio/best" \
|
yta="yt -x -f bestaudio/best" \
|
||||||
|
|
|
@ -19,7 +19,7 @@ export BROWSER="brave"
|
||||||
export XDG_CONFIG_HOME="$HOME/.config"
|
export XDG_CONFIG_HOME="$HOME/.config"
|
||||||
export XDG_DATA_HOME="$HOME/.local/share"
|
export XDG_DATA_HOME="$HOME/.local/share"
|
||||||
export XDG_CACHE_HOME="$HOME/.cache"
|
export XDG_CACHE_HOME="$HOME/.cache"
|
||||||
#export XINITRC="${XDG_CONFIG_HOME:-$HOME/.config}/x11/xinitrc"
|
export XINITRC="${XDG_CONFIG_HOME:-$HOME/.config}/x11/xinitrc"
|
||||||
#export XAUTHORITY="$XDG_RUNTIME_DIR/Xauthority" # This line will break some DMs.
|
#export XAUTHORITY="$XDG_RUNTIME_DIR/Xauthority" # This line will break some DMs.
|
||||||
export NOTMUCH_CONFIG="${XDG_CONFIG_HOME:-$HOME/.config}/notmuch-config"
|
export NOTMUCH_CONFIG="${XDG_CONFIG_HOME:-$HOME/.config}/notmuch-config"
|
||||||
export GTK2_RC_FILES="${XDG_CONFIG_HOME:-$HOME/.config}/gtk-2.0/gtkrc-2.0"
|
export GTK2_RC_FILES="${XDG_CONFIG_HOME:-$HOME/.config}/gtk-2.0/gtkrc-2.0"
|
||||||
|
@ -142,7 +142,7 @@ ex=🎯:\
|
||||||
|
|
||||||
if pacman -Qs libxft-bgra >/dev/null 2>&1; then
|
if pacman -Qs libxft-bgra >/dev/null 2>&1; then
|
||||||
# Start graphical server on user's current tty if not already running.
|
# Start graphical server on user's current tty if not already running.
|
||||||
[ "$(tty)" = "/dev/tty1" ] && ! pidof -s Xorg >/dev/null 2>&1 && exec startx
|
[ "$(tty)" = "/dev/tty1" ] && ! pidof -s Xorg >/dev/null 2>&1 && exec startx "$XINITRC"
|
||||||
else
|
else
|
||||||
echo "\033[31mIMPORTANT\033[0m: Note that \033[32m\`libxft-bgra\`\033[0m must be installed for this build of dwm.
|
echo "\033[31mIMPORTANT\033[0m: Note that \033[32m\`libxft-bgra\`\033[0m must be installed for this build of dwm.
|
||||||
Please run:
|
Please run:
|
||||||
|
|
|
@ -3,10 +3,10 @@
|
||||||
# This file runs when a DM logs you into a graphical session.
|
# This file runs when a DM logs you into a graphical session.
|
||||||
# If you use startx/xinit like a Chad, this file will also be sourced.
|
# If you use startx/xinit like a Chad, this file will also be sourced.
|
||||||
|
|
||||||
mpd & # music player daemon-you might prefer it as a service though
|
|
||||||
remaps & # run the remaps script, switching caps/esc and more; check it for more info
|
|
||||||
setbg & # set the background with the `setbg` script
|
setbg & # set the background with the `setbg` script
|
||||||
#xrdb ${XDG_CONFIG_HOME:-$HOME/.config}/x11/xresources & # Uncomment to use Xresources colors/settings on startup
|
#xrdb ${XDG_CONFIG_HOME:-$HOME/.config}/x11/xresources & # Uncomment to use Xresources colors/settings on startup
|
||||||
|
mpd & # music player daemon-you might prefer it as a service though
|
||||||
|
remaps & # run the remaps script, switching caps/esc and more; check it for more info
|
||||||
xcompmgr & # xcompmgr for transparency
|
xcompmgr & # xcompmgr for transparency
|
||||||
dunst & # dunst for notifications
|
dunst & # dunst for notifications
|
||||||
xset r rate 300 50 & # Speed xrate up
|
xset r rate 300 50 & # Speed xrate up
|
||||||
|
|
1
.xinitrc
1
.xinitrc
|
@ -1 +0,0 @@
|
||||||
.config/x11/xinitrc
|
|
Loading…
Reference in a new issue