diff --git a/.config/X11/xinitrc b/.config/X11/xinitrc index d4d237b5..30aaeb9b 100755 --- a/.config/X11/xinitrc +++ b/.config/X11/xinitrc @@ -10,7 +10,7 @@ # export STATUSBAR="i3blocks" # Uncomment this line when using i3. -. "${XDG_RUNTIME_DIR}/.xprofile" +. "$HOME/.xprofile" # Your default LARBS WM is determined in your `~/.profile` on login. Here we # run the proper command to run when the graphical environment starts. diff --git a/.config/sxhkd/sxhkdrc b/.config/sxhkd/sxhkdrc index 0a060235..baf05877 100644 --- a/.config/sxhkd/sxhkdrc +++ b/.config/sxhkd/sxhkdrc @@ -137,7 +137,7 @@ XF86MyComputer # Function keys super + shift + F1 - grep LARBSWELCOME "${XDG_RUNTIME_DIR}/.xprofile" && ( sed -i "/LARBSWELCOME/d" "${XDG_RUNTIME_DIR}/.xprofile" && notify-send "LARBS welcome message" "Welcome message disabled. Press Super+Shift+F1 again to reverse." ) || ( echo "notify-send -i "${XDG_DATA_HOME}/larbs/larbs.png" \"Welcome to LARBS\" \"Press super+F1 for the help menu.\" # LARBSWELCOME" >> "${XDG_RUNTIME_DIR}/.xprofile" && notify-send "LARBS welcome message" "Welcome message re-enabled." ) + grep LARBSWELCOME "$HOME/.xprofile" && ( sed -i "/LARBSWELCOME/d" "$HOME/.xprofile" && notify-send "LARBS welcome message" "Welcome message disabled. Press Super+Shift+F1 again to reverse." ) || ( echo "notify-send -i "${XDG_DATA_HOME}/larbs/larbs.png" \"Welcome to LARBS\" \"Press super+F1 for the help menu.\" # LARBSWELCOME" >> "$HOME/.xprofile" && notify-send "LARBS welcome message" "Welcome message re-enabled." ) # Show readme super + F1 groff -mom "${XDG_DATA_HOME}/larbs/readme.mom" -Tpdf | zathura - diff --git a/.local/bin/i3cmds/toggle-welcome b/.local/bin/i3cmds/toggle-welcome index c81ceb0c..f0789560 100755 --- a/.local/bin/i3cmds/toggle-welcome +++ b/.local/bin/i3cmds/toggle-welcome @@ -5,6 +5,6 @@ PIC="${XDG_DATA_HOME}/larbs/larbs.png" grep LARBSWELCOME "${XDG_CONFIG_HOME}/xprofile" && - ( sed -i "/LARBSWELCOME/d" "${XDG_RUNTIME_DIR}/.xprofile" && notify-send -i "$PIC" "LARBS welcome message" "Welcome message disabled. Press Super+Shift+F1 again to reverse." ) || - ( echo "notify-send -i \"$PIC\" \"Welcome to LARBS\" \"Press super+F1 for the help menu.\" # LARBSWELCOME" >> "${XDG_RUNTIME_DIR}/.xprofile" && + ( sed -i "/LARBSWELCOME/d" "$HOME/.xprofile" && notify-send -i "$PIC" "LARBS welcome message" "Welcome message disabled. Press Super+Shift+F1 again to reverse." ) || + ( echo "notify-send -i \"$PIC\" \"Welcome to LARBS\" \"Press super+F1 for the help menu.\" # LARBSWELCOME" >> "$HOME/.xprofile" && notify-send -i "$PIC" "LARBS welcome message" "Welcome message re-enabled." ) diff --git a/.profile b/.profile deleted file mode 120000 index c1abe3fd..00000000 --- a/.profile +++ /dev/null @@ -1 +0,0 @@ -.zprofile \ No newline at end of file diff --git a/.profile b/.profile new file mode 100644 index 00000000..dd4e5e32 --- /dev/null +++ b/.profile @@ -0,0 +1,128 @@ +#!/bin/zsh + +# zsh profile file. Runs on login. Environmental variables are set here. + +# If you don't plan on reverting to bash, you can remove the link in ~/.profile +# to clean up. + +# Adds `~/.local/bin` to $PATH +export PATH="$PATH:$(du "$HOME/.local/bin/" | cut -f2 | paste -sd ':')" + +# Default programs: +export EDITOR="nvim" +export TERMINAL="st" +export BROWSER="brave" +export READER="zathura" + +# ~/ Clean-up: +export XDG_CACHE_HOME="$HOME/.cache" +export XDG_CONFIG_HOME="$HOME/.config" +export XDG_DATA_HOME="$HOME/.local/share" +## configs +export ALSA_CONFIG_PATH="${XDG_CONFIG_HOME}/alsa/asoundrc" +export ANDROID_SDK_HOME="${XDG_CONFIG_HOME}/android" +export ANSIBLE_CONFIG="${XDG_CONFIG_HOME}/ansible/ansible.cfg" +export GTK2_RC_FILES="${XDG_CONFIG_HOME}/gtk-2.0/gtkrc-2.0" +export INPUTRC="${XDG_CONFIG_HOME}/readline/inputrc" +export NOTMUCH_CONFIG="${XDG_CONFIG_HOME}/notmuch-config" +export WGETRC="${XDG_CONFIG_HOME}/wget/wgetrc" +#export XAUTHORITY="$XDG_RUNTIME_DIR/Xauthority" # This line will break some DMs. +export ZDOTDIR="${XDG_CONFIG_HOME}/zsh" +## program data +export CARGO_HOME="${XDG_DATA_HOME}/cargo" +#export GNUPGHOME="$XDG_DATA_HOME/gnupg" +export GOPATH="${XDG_DATA_HOME}/go" +export KODI_DATA="${XDG_DATA_HOME}/kodi" +export PASSWORD_STORE_DIR="${XDG_DATA_HOME}/password-store" +export TMUX_TMPDIR="$HOME" +export WINEPREFIX="${XDG_DATA_HOME}/wineprefixes/default" + +# Misc. program settings: +export DICS="/usr/share/stardict/dic/" +export SUDO_ASKPASS="${HOME}/.local/bin/dmenupass" +export FZF_DEFAULT_OPTS="--layout=reverse --height 40%" +export LESS=-R +export LESSHISTFILE="-" +export LESSOPEN="| /usr/bin/highlight -O ansi %s 2>/dev/null" +export LESS_TERMCAP_mb="$(printf '%b' '')" +export LESS_TERMCAP_md="$(printf '%b' '')" +export LESS_TERMCAP_me="$(printf '%b' '')" +export LESS_TERMCAP_se="$(printf '%b' '')" +export LESS_TERMCAP_so="$(printf '%b' '')" +export LESS_TERMCAP_ue="$(printf '%b' '')" +export LESS_TERMCAP_us="$(printf '%b' '')" +export AWT_TOOLKIT="MToolkit wmname LG3D" # May have to install wmname. +export MOZ_USE_XINPUT2="1" # Mozilla smooth scrolling/touchpads. +export QT_QPA_PLATFORMTHEME="gtk2" # Have QT use gtk2 theme. +export _JAVA_AWT_WM_NONREPARENTING=1 # Fix for Java applications in dwm. + +# This is the list for lf icons: +export LF_ICONS="di=📁:\ +fi=📃:\ +tw=🤝:\ +ow=📂:\ +ln=⛓:\ +or=❌:\ +ex=🎯:\ +*.1=ℹ:\ +*.7z=📦:\ +*.R=📊:\ +*.Rmd=📊:\ +*.avi=🎥:\ +*.bib=🎓:\ +*.css=🎨:\ +*.csv=📓:\ +*.djvu=📚:\ +*.epub=📚:\ +*.flac=🎼:\ +*.ged=👪:\ +*.gif=🖼:\ +*.gpg=🔒:\ +*.html=🌎:\ +*.ico=🖼:\ +*.img=📀:\ +*.info=ℹ:\ +*.iso=📀:\ +*.jpeg=📸:\ +*.jpg=📸:\ +*.log=📙:\ +*.m4a=🎵:\ +*.md=📘:\ +*.me=✍:\ +*.mkv=🎥:\ +*.mom=✍:\ +*.mp3=🎵:\ +*.mp4=🎥:\ +*.mpeg=🎥:\ +*.ms=✍:\ +*.n64=🎮:\ +*.nfo=ℹ:\ +*.ogg=🎵:\ +*.opus=🎵:\ +*.part=💔:\ +*.pdf=📚:\ +*.png=🖼:\ +*.r=📊:\ +*.rar=📦:\ +*.rmd=📊:\ +*.svg=🗺:\ +*.tar.gz=📦:\ +*.tex=📜:\ +*.torrent=🔽:\ +*.txt=✍:\ +*.v64=🎮:\ +*.webm=🎥:\ +*.xcf=🖌:\ +*.xlsx=📓:\ +*.xml=📰:\ +*.z64=🎮:\ +*.zip=📦:\ +" + +[ ! -f "${XDG_CONFIG_HOME}/shortcutrc" ] && shortcuts >/dev/null 2>&1 & + +# Start graphical server on tty1 if not already running. +[ "$(tty)" = "/dev/tty1" ] && ! ps -e | grep -qw Xorg && exec startx "${XDG_CONFIG_HOME}/X11/xinitrc" + +# Switch escape and caps if tty and no passwd required: +sudo -n loadkeys "${XDG_DATA_HOME}/larbs/ttymaps.kmap" 2>/dev/null diff --git a/.zprofile b/.zprofile index 2de520be..dd4e5e32 100644 --- a/.zprofile +++ b/.zprofile @@ -34,7 +34,7 @@ export CARGO_HOME="${XDG_DATA_HOME}/cargo" export GOPATH="${XDG_DATA_HOME}/go" export KODI_DATA="${XDG_DATA_HOME}/kodi" export PASSWORD_STORE_DIR="${XDG_DATA_HOME}/password-store" -export TMUX_TMPDIR="${XDG_RUNTIME_DIR}" +export TMUX_TMPDIR="$HOME" export WINEPREFIX="${XDG_DATA_HOME}/wineprefixes/default" # Misc. program settings: